From c38b78defbcc15bcac84fc4678d5d4f1adffdc28 Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Sat, 15 Mar 2014 11:46:16 +0100
Subject: [PATCH] PHPCS updates.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 db_search.php                                 |  7 +-
 .../plugins/auth/swekey/swekey.auth.lib.php   |  3 +-
 pmd_general.php                               | 11 ++-
 test/engines/PMA_StorageEngine_pbxt_test.php  |  5 ++
 test/libraries/PMA_GIS_modifyQuery_test.php   |  5 ++
 test/libraries/PMA_SQL_validator_test.php     | 42 ++++++++-
 test/libraries/PMA_bookmark_test.php          |  6 +-
 test/libraries/PMA_build_html_for_db_test.php |  5 ++
 test/libraries/PMA_escapeJsString_test.php    |  5 ++
 test/libraries/PMA_generateCommonUrl_test.php |  5 ++
 test/libraries/PMA_js_escape_test.php         |  5 ++
 test/libraries/PMA_prettyPrint_test.php       |  5 ++
 test/libraries/PMA_sanitize_test.php          |  5 ++
 .../common/PMA_browseUploadFile_test.php      | 12 ++-
 .../common/PMA_buildActionTitles_test.php     | 17 +++-
 .../common/PMA_checkParameters_test.php       | 21 +++++
 .../PMA_contains_nonprintable_ascii_test.php  |  4 +-
 .../PMA_convert_bit_default_value_test.php    | 15 +++-
 ...PMA_extractValueFromFormattedSize_test.php | 54 +++++++-----
 test/libraries/common/PMA_formatSql_test.php  | 16 ++++
 .../PMA_generateHiddenMaxFileSize_test.php    | 17 +++-
 .../libraries/common/PMA_getCheckbox_test.php | 42 ++++++++-
 .../common/PMA_getDivForSliderEffect_test.php | 27 +++++-
 .../libraries/common/PMA_getDropdown_test.php | 30 ++++++-
 ...PMA_getFormattedMaximumUploadSize_test.php |  6 ++
 test/libraries/common/PMA_getIcon_test.php    | 37 +++++++-
 .../common/PMA_getRadioFields_test.php        | 88 ++++++++++++++++---
 .../common/PMA_getTitleForTarget_test.php     | 19 +++-
 test/libraries/common/PMA_pow_test.php        | 41 +++++++++
 test/libraries/common/PMA_showDocu_test.php   | 16 ++++
 .../common/PMA_showMessage_test_disabled.php  | 16 ++++
 .../libraries/common/PMA_showPHPDocu_test.php | 21 ++++-
 .../common/PMA_unsupportedDatatypes_test.php  | 12 ++-
 test/libraries/core/PMA_array_test.php        |  7 ++
 .../core/PMA_checkPageValidity_test.php       | 59 +++++++------
 test/libraries/core/PMA_fatalError_test.php   | 24 +++++
 test/libraries/core/PMA_getLinks_test.php     |  5 ++
 .../core/PMA_getTableCount_test_dis.php       | 17 +++-
 .../libraries/core/PMA_get_real_size_test.php | 54 +++++++-----
 .../core/PMA_headerLocation_test.php          |  5 ++
 test/libraries/core/PMA_ifSetOr_test.php      | 28 ++++++
 test/libraries/core/PMA_isValid_test.php      |  5 ++
 .../core/PMA_warnMissingExtension_test.php    | 21 +++++
 .../rte/PMA_RTN_getEditorForm_test.php        |  5 ++
 .../select_lang/PMA_langList_test.php         | 25 +++++-
 .../select_lang/PMA_langName_test.php         | 29 +++++-
 46 files changed, 772 insertions(+), 132 deletions(-)

diff --git a/db_search.php b/db_search.php
index fe80d4ea8e..8d5d80f346 100644
--- a/db_search.php
+++ b/db_search.php
@@ -54,9 +54,10 @@ if ($GLOBALS['is_ajax_request'] == true && empty($_REQUEST['ajax_page_request'])
 }
 
 // Display the search form
-$response->addHTML('<div id="togglesearchresultsdiv">'
-    . '<a id="togglesearchresultlink"></a></div>'
-    . '<br class="clearfloat" />');
+$response->addHTML(
+    '<div id="togglesearchresultsdiv"><a id="togglesearchresultlink"></a></div>'
+    . '<br class="clearfloat" />'
+);
 $response->addHTML($db_search->getSelectionForm($url_params));
 $response->addHTML($db_search->_getResultDivs());
 ?>
diff --git a/libraries/plugins/auth/swekey/swekey.auth.lib.php b/libraries/plugins/auth/swekey/swekey.auth.lib.php
index 05d02f4abb..7464f030f2 100644
--- a/libraries/plugins/auth/swekey/swekey.auth.lib.php
+++ b/libraries/plugins/auth/swekey/swekey.auth.lib.php
@@ -172,7 +172,8 @@ function Swekey_Auth_error()
     if (file_exists($caFile)) {
         Swekey_SetCAFile($caFile);
     } elseif (! empty($caFile)
-        && (substr($_SESSION['SWEKEY']['CONF_SERVER_CHECK'], 0, 8) == "https://")) {
+        && (substr($_SESSION['SWEKEY']['CONF_SERVER_CHECK'], 0, 8) == "https://")
+    ) {
         return "Internal Error: CA File $caFile not found";
     }
 
diff --git a/pmd_general.php b/pmd_general.php
index b041bbbbee..3abe218d4a 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -241,7 +241,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <input name="t_h[<?php echo $t_n_url ?>]" type="hidden" id="t_h_<?php echo $t_n_url ?>_" />
 
 <table id="<?php echo $t_n_url ?>" cellpadding="0" cellspacing="0" class="pmd_tab"
-   style="position: absolute;
+    style="position: absolute;
           left: <?php
           echo isset($tab_pos[$t_n]) ? $tab_pos[$t_n]["X"] : rand(20, 700); ?>px;
           top: <?php
@@ -284,11 +284,10 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
         onmouseover="Table_onover('<?php echo $t_n_url ?>',0,<?php echo (isset($_REQUEST['query'])? 1 : 0 )?> )"
         onmouseout="Table_onover('<?php echo $t_n_url ?>',1,<?php echo (isset($_REQUEST['query']) ? 1 : 0 )?>)">
         <span class='owner'>
-        <?php
-        echo $GLOBALS['PMD_OUT']["OWNER"][$i];
-        echo '.</span>';
-        echo $GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i];
-        ?></td>
+            <?php echo $GLOBALS['PMD_OUT']["OWNER"][$i]; ?>.
+        </span>
+        <?php echo $GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]; ?>
+    </td>
     <?php
     if (isset($_REQUEST['query'])) {
         echo '<td class="tab_zag"  onmouseover="Table_onover(\''
diff --git a/test/engines/PMA_StorageEngine_pbxt_test.php b/test/engines/PMA_StorageEngine_pbxt_test.php
index cc643dabb9..3f55510b39 100644
--- a/test/engines/PMA_StorageEngine_pbxt_test.php
+++ b/test/engines/PMA_StorageEngine_pbxt_test.php
@@ -18,6 +18,11 @@ require_once 'libraries/core.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/Tracker.class.php';
 
+/**
+ * Tests for PMA_StorageEngine_pbxt
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_StorageEngine_Pbxt_Test extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/test/libraries/PMA_GIS_modifyQuery_test.php b/test/libraries/PMA_GIS_modifyQuery_test.php
index 83d557af48..a03322a265 100644
--- a/test/libraries/PMA_GIS_modifyQuery_test.php
+++ b/test/libraries/PMA_GIS_modifyQuery_test.php
@@ -13,6 +13,11 @@ require_once 'libraries/Util.class.php';
  */
 require_once 'libraries/tbl_gis_visualization.lib.php';
 
+/**
+ * Tests for PMA_GIS_modifyQuery method
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_GIS_ModifyQueryTest extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/test/libraries/PMA_SQL_validator_test.php b/test/libraries/PMA_SQL_validator_test.php
index 24586a16b7..f2955168a9 100644
--- a/test/libraries/PMA_SQL_validator_test.php
+++ b/test/libraries/PMA_SQL_validator_test.php
@@ -22,6 +22,11 @@ require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/sqlvalidator.class.php';
 require_once 'libraries/sqlvalidator.lib.php';
 
+/**
+ * Tests for correctness of SQL validator
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_SQLValidator_Test extends PHPUnit_Framework_TestCase
 {
     /**
@@ -93,13 +98,33 @@ class PMA_SQLValidator_Test extends PHPUnit_Framework_TestCase
     }
 }
 
-//Mock the SOAP_Client
+/**
+ * Mock the SOAP_Client
+ *
+ * @package PhpMyAdmin-test
+ */
 class SOAP_Client
 {
+    /**
+     * Mock the SOAP_Client::call method
+     *
+     * @param string $name      Name
+     * @param array  $arguments Arguments
+     *
+     * @return mixed
+     */
     public function call($name, $arguments)
     {
         return $this->{$name}($arguments);
     }
+
+    /**
+     * Mock the SOAP_Client::openSession method
+     *
+     * @param array $args Arguments
+     *
+     * @return Session
+     */
     public function openSession($args)
     {
         $session = new Session;
@@ -111,6 +136,14 @@ class SOAP_Client
         $session->sessionKey = "sessionKey";
         return $session;
     }
+
+    /**
+     * Mock the SOAP_Client::validateSQL method
+     *
+     * @param array $args Arguments
+     *
+     * @return Session
+     */
     public function validateSQL($args)
     {
         $session = new Session;
@@ -126,7 +159,12 @@ class SOAP_Client
     }
 }
 
-//Mock return Session class
+
+/**
+ * Mock return Session class
+ *
+ * @package PhpMyAdmin-test
+ */
 class Session
 {
     var $target          = null;
diff --git a/test/libraries/PMA_bookmark_test.php b/test/libraries/PMA_bookmark_test.php
index f298609913..0e6335a76a 100644
--- a/test/libraries/PMA_bookmark_test.php
+++ b/test/libraries/PMA_bookmark_test.php
@@ -15,6 +15,11 @@ require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/Tracker.class.php';
 require_once 'libraries/relation.lib.php';
 
+/**
+ * tests for bookmark.lib.php
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_Bookmark_Test extends PHPUnit_Framework_TestCase
 {
     /**
@@ -26,7 +31,6 @@ class PMA_Bookmark_Test extends PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-
         $GLOBALS['cfg']['Server']['user'] = 'root';
         $GLOBALS['cfg']['Server']['pmadb'] = 'phpmyadmin';
         $GLOBALS['cfg']['Server']['bookmarktable'] = 'pma_bookmark';
diff --git a/test/libraries/PMA_build_html_for_db_test.php b/test/libraries/PMA_build_html_for_db_test.php
index 62a63bcf17..a2a03f5c34 100644
--- a/test/libraries/PMA_build_html_for_db_test.php
+++ b/test/libraries/PMA_build_html_for_db_test.php
@@ -21,6 +21,11 @@ require_once 'libraries/Tracker.class.php';
 require_once 'libraries/Types.class.php';
 require_once 'libraries/mysql_charsets.inc.php';
 
+/**
+ * tests for build_html_for_db.lib.php
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_BuildHtmlForDb_Test extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/test/libraries/PMA_escapeJsString_test.php b/test/libraries/PMA_escapeJsString_test.php
index a96b12f9bd..91cb02f2f3 100644
--- a/test/libraries/PMA_escapeJsString_test.php
+++ b/test/libraries/PMA_escapeJsString_test.php
@@ -11,6 +11,11 @@
  */
 require_once 'libraries/js_escape.lib.php';
 
+/**
+ * Test for javascript escaping.
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_EscapeJsString_Test extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/test/libraries/PMA_generateCommonUrl_test.php b/test/libraries/PMA_generateCommonUrl_test.php
index 10a30ca2fe..23929691c4 100644
--- a/test/libraries/PMA_generateCommonUrl_test.php
+++ b/test/libraries/PMA_generateCommonUrl_test.php
@@ -12,6 +12,11 @@
 require_once 'libraries/core.lib.php';
 require_once 'libraries/url_generating.lib.php';
 
+/**
+ * tests for PMA_URL_getCommon()
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
 {
 
diff --git a/test/libraries/PMA_js_escape_test.php b/test/libraries/PMA_js_escape_test.php
index 30e762fc3d..4ae369f0cc 100644
--- a/test/libraries/PMA_js_escape_test.php
+++ b/test/libraries/PMA_js_escape_test.php
@@ -12,6 +12,11 @@
 require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/Util.class.php';
 
+/**
+ * tests for JS variable formatting
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_JS_Escape_Test extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/test/libraries/PMA_prettyPrint_test.php b/test/libraries/PMA_prettyPrint_test.php
index da401e540c..6c0ebc53d5 100644
--- a/test/libraries/PMA_prettyPrint_test.php
+++ b/test/libraries/PMA_prettyPrint_test.php
@@ -11,6 +11,11 @@
  */
 require_once 'libraries/error_report.lib.php';
 
+/**
+ * tests for PMA_prettyPrint()
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_PrettyPrint_Test extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/test/libraries/PMA_sanitize_test.php b/test/libraries/PMA_sanitize_test.php
index 1cfb339438..6836d32ad8 100644
--- a/test/libraries/PMA_sanitize_test.php
+++ b/test/libraries/PMA_sanitize_test.php
@@ -14,6 +14,11 @@ require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/core.lib.php';
 require_once 'libraries/Util.class.php';
 
+/**
+ * tests for PMA_sanitize()
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_Sanitize_Test extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/test/libraries/common/PMA_browseUploadFile_test.php b/test/libraries/common/PMA_browseUploadFile_test.php
index cbe9a9f747..a79777397a 100644
--- a/test/libraries/common/PMA_browseUploadFile_test.php
+++ b/test/libraries/common/PMA_browseUploadFile_test.php
@@ -13,9 +13,19 @@
 require_once 'libraries/Util.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
 
+/**
+ * Test for PMA_Util::getBrowseUploadFileBlock from common.lib
+ *
+ * @package PhpMyAdmin-test
+ * @group common.lib-tests
+ */
 class PMA_GetBrowseUploadFileBlock_Test extends PHPUnit_Framework_TestCase
 {
-
+    /**
+     * Set up
+     *
+     * @return void
+     */
     protected function setUp()
     {
         $GLOBALS['is_upload'] = false;
diff --git a/test/libraries/common/PMA_buildActionTitles_test.php b/test/libraries/common/PMA_buildActionTitles_test.php
index b0d479c77e..7c2c82291d 100644
--- a/test/libraries/common/PMA_buildActionTitles_test.php
+++ b/test/libraries/common/PMA_buildActionTitles_test.php
@@ -14,9 +14,19 @@ require_once 'libraries/Util.class.php';
 require_once 'libraries/Theme.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
 
+/**
+ * Test for PMA_Util::buildActionTitles from common.lib
+ *
+ * @package PhpMyAdmin-test
+ * @group common.lib-tests
+ */
 class PMA_BuildActionTitles_Test extends PHPUnit_Framework_TestCase
 {
-
+    /**
+     * Set up
+     *
+     * @return void
+     */
     function setup()
     {
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
@@ -24,6 +34,11 @@ class PMA_BuildActionTitles_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['pmaThemeImage'] = 'theme/';
     }
 
+    /**
+     * Test for buildActionTitles
+     *
+     * @return void
+     */
     function testBuildActionTitles()
     {
         $titles = array();
diff --git a/test/libraries/common/PMA_checkParameters_test.php b/test/libraries/common/PMA_checkParameters_test.php
index 24df9fe632..8d34eca547 100644
--- a/test/libraries/common/PMA_checkParameters_test.php
+++ b/test/libraries/common/PMA_checkParameters_test.php
@@ -17,8 +17,19 @@ require_once 'libraries/Config.class.php';
 require_once 'libraries/select_lang.lib.php';
 require_once 'libraries/sanitizing.lib.php';
 
+/**
+ ** Test for PMA_Util::checkParameters from Util.class.php
+ *
+ * @package PhpMyAdmin-test
+ * @group common.lib-tests
+ */
 class PMA_CheckParameters_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Set up
+     *
+     * @return void
+     */
     function setup()
     {
         $GLOBALS['PMA_Config'] = new PMA_Config();
@@ -28,6 +39,11 @@ class PMA_CheckParameters_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['text_dir'] = 'ltr';
     }
 
+    /**
+     * Test for checkParameters
+     *
+     * @return void
+     */
     function testCheckParameterMissing()
     {
         $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
@@ -40,6 +56,11 @@ class PMA_CheckParameters_Test extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * Test for checkParameters
+     *
+     * @return void
+     */
     function testCheckParameter()
     {
         $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
diff --git a/test/libraries/common/PMA_contains_nonprintable_ascii_test.php b/test/libraries/common/PMA_contains_nonprintable_ascii_test.php
index ab7fc59aad..080576a863 100644
--- a/test/libraries/common/PMA_contains_nonprintable_ascii_test.php
+++ b/test/libraries/common/PMA_contains_nonprintable_ascii_test.php
@@ -25,7 +25,7 @@ class PMA_ContainsNonPrintableAsciiTest extends PHPUnit_Framework_TestCase
      *
      * @return array
      */
-    function dataProvider()
+    public function dataProvider()
     {
         return array(
             array("normal string", 0),
@@ -46,7 +46,7 @@ class PMA_ContainsNonPrintableAsciiTest extends PHPUnit_Framework_TestCase
      *
      * @dataProvider dataProvider
      */
-    function testContainsNonPrintableAscii($str, $res)
+    public function testContainsNonPrintableAscii($str, $res)
     {
         $this->assertEquals(
             $res, PMA_Util::containsNonPrintableAscii($str)
diff --git a/test/libraries/common/PMA_convert_bit_default_value_test.php b/test/libraries/common/PMA_convert_bit_default_value_test.php
index 81810742fe..628fcd76cd 100644
--- a/test/libraries/common/PMA_convert_bit_default_value_test.php
+++ b/test/libraries/common/PMA_convert_bit_default_value_test.php
@@ -12,17 +12,23 @@
  */
 require_once 'libraries/Util.class.php';
 
+/**
+ ** Test for PMA_Util::convertBitDefaultValue from common.lib
+ *
+ * @package PhpMyAdmin-test
+ * @group common.lib-tests
+ */
 class PMA_ConvertBitDefaultValueTest extends PHPUnit_Framework_TestCase
 {
 
     /**
      * Provider for testConvertBitDefaultValueTest
      *
-     * @return array 
+     * @return array
      *
      * @dataProvider dataProvider
      */
-    function dataProvider()
+    public function dataProvider()
     {
         return array(
             array("b'",""),
@@ -34,11 +40,14 @@ class PMA_ConvertBitDefaultValueTest extends PHPUnit_Framework_TestCase
     /**
      * Test for convertBitDefaultValue
      *
+     * @param string $bit Value
+     * @param string $val Expected value
+     *
      * @return void
      *
      * @dataProvider dataProvider
      */
-    function testConvertBitDefaultValueTest($bit, $val)
+    public function testConvertBitDefaultValueTest($bit, $val)
     {
         $this->assertEquals(
             $val, PMA_Util::convertBitDefaultValue($bit)
diff --git a/test/libraries/common/PMA_extractValueFromFormattedSize_test.php b/test/libraries/common/PMA_extractValueFromFormattedSize_test.php
index ee8c12c92a..6999bc04e8 100644
--- a/test/libraries/common/PMA_extractValueFromFormattedSize_test.php
+++ b/test/libraries/common/PMA_extractValueFromFormattedSize_test.php
@@ -12,38 +12,44 @@
  */
 require_once 'libraries/Util.class.php';
 
+/**
+ ** Test for PMA_Util::extractValueFromFormattedSize from common.lib
+ *
+ * @package PhpMyAdmin-test
+ * @group common.lib-tests
+ */
 class PMA_ExtractValueFromFormattedSize_Test extends PHPUnit_Framework_TestCase
 {
-
-    function testExtractValueFromFormattedSizeNoFormat()
+    /**
+     * Test for extractValueFromFormattedSize
+     *
+     * @param int|string $size     Size
+     * @param int        $expected Expected value
+     *
+     * @return void
+     *
+     * @dataProvider provider
+     */
+    function testExtractValueFromFormattedSize($size, $expected)
     {
         $this->assertEquals(
-            -1,
-            PMA_Util::extractValueFromFormattedSize(100)
+            $expected,
+            PMA_Util::extractValueFromFormattedSize($size)
         );
     }
 
-    function testExtractValueFromFormattedSizeGB()
+    /**
+     * Data provider for testExtractValueFromFormattedSize
+     *
+     * @return array
+     */
+    public function provider()
     {
-        $this->assertEquals(
-            10737418240,
-            PMA_Util::extractValueFromFormattedSize("10GB")
-        );
-    }
-
-    function testExtractValueFromFormattedSizeMB()
-    {
-        $this->assertEquals(
-            15728640,
-            PMA_Util::extractValueFromFormattedSize("15MB")
-        );
-    }
-
-    function testExtractValueFromFormattedSizeK()
-    {
-        $this->assertEquals(
-            262144,
-            PMA_Util::extractValueFromFormattedSize("256K")
+        return array(
+            array(100, -1),
+            array("10GB", 10737418240),
+            array("15MB", 15728640),
+            array("256K", 262144)
         );
     }
 }
diff --git a/test/libraries/common/PMA_formatSql_test.php b/test/libraries/common/PMA_formatSql_test.php
index fc4f329210..7aa9d5e998 100644
--- a/test/libraries/common/PMA_formatSql_test.php
+++ b/test/libraries/common/PMA_formatSql_test.php
@@ -13,8 +13,19 @@
 require_once 'libraries/Util.class.php';
 require_once 'libraries/sqlparser.lib.php';
 
+/**
+ ** Test for PMA_Util::formatSql from Util.class.php
+ *
+ * @package PhpMyAdmin-test
+ * @group common.lib-tests
+ */
 class PMA_FormatSql_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Test for formatSql
+     *
+     * @return void
+     */
     function testFormatSQL()
     {
 
@@ -26,6 +37,11 @@ class PMA_FormatSql_Test extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * Test for formatSql
+     *
+     * @return void
+     */
     function testFormatSQLTruncate()
     {
         $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 6;
diff --git a/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php b/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
index 8f682cc1f3..3926c3feb1 100644
--- a/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
+++ b/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
@@ -12,11 +12,19 @@
  */
 require_once 'libraries/Util.class.php';
 
+/**
+ ** Test for PMA_Util::generateHiddenMaxFileSize from Util.class.php
+ *
+ * @package PhpMyAdmin-test
+ * @group common.lib-tests
+ */
 class PMA_GenerateHiddenMaxFileSize_Test extends PHPUnit_Framework_TestCase
 {
 
-    /*
+    /**
      * Data provider for test
+     *
+     * @return array
      */
     public function dataProvider()
     {
@@ -31,8 +39,13 @@ class PMA_GenerateHiddenMaxFileSize_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * @dataProvider dataProvider
+     * Test for generateHiddenMaxFileSize
+     *
+     * @param int $size Size
+     *
      * @return void
+     *
+     * @dataProvider dataProvider
      */
     function test_generateHiddenMaxFileSize($size)
     {
diff --git a/test/libraries/common/PMA_getCheckbox_test.php b/test/libraries/common/PMA_getCheckbox_test.php
index 988c04d0ad..340c3b61de 100644
--- a/test/libraries/common/PMA_getCheckbox_test.php
+++ b/test/libraries/common/PMA_getCheckbox_test.php
@@ -12,8 +12,19 @@
  */
 require_once 'libraries/Util.class.php';
 
+/**
+ ** Test for PMA_Util::getCheckbox from Util.class.php
+ *
+ * @package PhpMyAdmin-test
+ * @group common.lib-tests
+ */
 class PMA_GetCheckboxTest extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Test for getCheckbox
+     *
+     * @return void
+     */
     function testGetCheckbox()
     {
         $name = "test_display_html_checkbox";
@@ -21,10 +32,17 @@ class PMA_GetCheckboxTest extends PHPUnit_Framework_TestCase
 
         $this->assertEquals(
             PMA_Util::getCheckbox($name, $label, false, false),
-            '<input type="checkbox" name="' . $name . '" id="' . $name . '" /><label for="' . $name . '">' . $label . '</label>'
+            '<input type="checkbox" name="' . $name . '" id="' . $name
+            . '" /><label for="' . $name . '">' . $label
+            . '</label>'
         );
     }
 
+    /**
+     * Test for getCheckbox
+     *
+     * @return void
+     */
     function testGetCheckboxChecked()
     {
         $name = "test_display_html_checkbox";
@@ -32,10 +50,17 @@ class PMA_GetCheckboxTest extends PHPUnit_Framework_TestCase
 
         $this->assertEquals(
             PMA_Util::getCheckbox($name, $label, true, false),
-            '<input type="checkbox" name="' . $name . '" id="' . $name . '" checked="checked" /><label for="' . $name . '">' . $label . '</label>'
+            '<input type="checkbox" name="' . $name . '" id="' . $name
+            . '" checked="checked" /><label for="' . $name . '">' . $label
+            . '</label>'
         );
     }
 
+    /**
+     * Test for getCheckbox
+     *
+     * @return void
+     */
     function testGetCheckboxOnclick()
     {
         $name = "test_display_html_checkbox";
@@ -43,10 +68,17 @@ class PMA_GetCheckboxTest extends PHPUnit_Framework_TestCase
 
         $this->assertEquals(
             PMA_Util::getCheckbox($name, $label, false, true),
-            '<input type="checkbox" name="' . $name . '" id="' . $name . '" class="autosubmit" /><label for="' . $name . '">' . $label . '</label>'
+            '<input type="checkbox" name="' . $name . '" id="' . $name
+            . '" class="autosubmit" /><label for="' . $name . '">' . $label
+            . '</label>'
         );
     }
 
+    /**
+     * Test for getCheckbox
+     *
+     * @return void
+     */
     function testGetCheckboxCheckedOnclick()
     {
         $name = "test_display_html_checkbox";
@@ -54,7 +86,9 @@ class PMA_GetCheckboxTest extends PHPUnit_Framework_TestCase
 
         $this->assertEquals(
             PMA_Util::getCheckbox($name, $label, true, true),
-            '<input type="checkbox" name="' . $name . '" id="' . $name . '" checked="checked" class="autosubmit" /><label for="' . $name . '">' . $label . '</label>'
+            '<input type="checkbox" name="' . $name . '" id="' . $name
+            . '" checked="checked" class="autosubmit" /><label for="' . $name
+            . '">' . $label . '</label>'
         );
     }
 }
diff --git a/test/libraries/common/PMA_getDivForSliderEffect_test.php b/test/libraries/common/PMA_getDivForSliderEffect_test.php
index 93c2796b30..79867f275d 100644
--- a/test/libraries/common/PMA_getDivForSliderEffect_test.php
+++ b/test/libraries/common/PMA_getDivForSliderEffect_test.php
@@ -12,8 +12,19 @@
  */
 require_once 'libraries/Util.class.php';
 
+/**
+ ** Test for PMA_Util::getDivForSliderEffect from Util.class.php
+ *
+ * @package PhpMyAdmin-test
+ * @group common.lib-tests
+ */
 class PMA_GetDivForSliderEffectTest extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Test for getDivForSliderEffect
+     *
+     * @return void
+     */
     function testGetDivForSliderEffectTest()
     {
         global $cfg;
@@ -24,10 +35,16 @@ class PMA_GetDivForSliderEffectTest extends PHPUnit_Framework_TestCase
 
         $this->assertEquals(
             PMA_Util::getDivForSliderEffect($id, $message),
-            '<div id="' . $id . '" class="pma_auto_slider" title="' . htmlspecialchars($message) . '">'
+            '<div id="' . $id . '" class="pma_auto_slider" title="'
+            . htmlspecialchars($message) . '">'
         );
     }
 
+    /**
+     * Test for getDivForSliderEffect
+     *
+     * @return void
+     */
     function testGetDivForSliderEffectTestClosed()
     {
         global $cfg;
@@ -38,11 +55,17 @@ class PMA_GetDivForSliderEffectTest extends PHPUnit_Framework_TestCase
 
         $this->assertEquals(
             PMA_Util::getDivForSliderEffect($id, $message),
-            '<div id="' . $id . '" style="display: none; overflow:auto;" class="pma_auto_slider" title="' . htmlspecialchars($message) . '">'
+            '<div id="' . $id . '" style="display: none; overflow:auto;" '
+            . 'class="pma_auto_slider" title="' . htmlspecialchars($message) . '">'
         );
 
     }
 
+    /**
+     * Test for getDivForSliderEffect
+     *
+     * @return void
+     */
     function testGetDivForSliderEffectTestDisabled()
     {
         global $cfg;
diff --git a/test/libraries/common/PMA_getDropdown_test.php b/test/libraries/common/PMA_getDropdown_test.php
index cbe277e4a3..fc4b3fd4e4 100644
--- a/test/libraries/common/PMA_getDropdown_test.php
+++ b/test/libraries/common/PMA_getDropdown_test.php
@@ -12,8 +12,19 @@
  */
 require_once 'libraries/Util.class.php';
 
+/**
+ ** Test for PMA_Util::getDropdown from Util.class.php
+ *
+ * @package PhpMyAdmin-test
+ * @group common.lib-tests
+ */
 class PMA_GetDropdownTest extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Test for getDropdown
+     *
+     * @return void
+     */
     function testGetDropdownEmpty()
     {
         $name = "test_dropdown_name";
@@ -21,7 +32,8 @@ class PMA_GetDropdownTest extends PHPUnit_Framework_TestCase
         $active_choice = null;
         $id = "test_&lt;dropdown&gt;_name";
 
-        $result = '<select name="' . htmlspecialchars($name) . '" id="' . htmlspecialchars($id) . '"></select>';
+        $result = '<select name="' . htmlspecialchars($name) . '" id="'
+            . htmlspecialchars($id) . '"></select>';
 
         $this->assertEquals(
             $result,
@@ -31,6 +43,11 @@ class PMA_GetDropdownTest extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * Test for getDropdown
+     *
+     * @return void
+     */
     function testGetDropdown()
     {
         $name = "&test_dropdown_name";
@@ -38,7 +55,8 @@ class PMA_GetDropdownTest extends PHPUnit_Framework_TestCase
         $active_choice = null;
         $id = "test_&lt;dropdown&gt;_name";
 
-        $result = '<select name="' . htmlspecialchars($name) . '" id="' . htmlspecialchars($id) . '">';
+        $result = '<select name="' . htmlspecialchars($name) . '" id="'
+            . htmlspecialchars($id) . '">';
         foreach ($choices as $one_choice_value => $one_choice_label) {
             $result .= '<option value="' . htmlspecialchars($one_choice_value) . '"';
             if ($one_choice_value == $active_choice) {
@@ -56,6 +74,11 @@ class PMA_GetDropdownTest extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * Test for getDropdown
+     *
+     * @return void
+     */
     function testGetDropdownWithActive()
     {
         $name = "&test_dropdown_name";
@@ -63,7 +86,8 @@ class PMA_GetDropdownTest extends PHPUnit_Framework_TestCase
         $active_choice = "value&_2\"";
         $id = "test_&lt;dropdown&gt;_name";
 
-        $result = '<select name="' . htmlspecialchars($name) . '" id="' . htmlspecialchars($id) . '">';
+        $result = '<select name="' . htmlspecialchars($name) . '" id="'
+            . htmlspecialchars($id) . '">';
         foreach ($choices as $one_choice_value => $one_choice_label) {
             $result .= '<option value="' . htmlspecialchars($one_choice_value) . '"';
             if ($one_choice_value == $active_choice) {
diff --git a/test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php b/test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
index c99717e6ce..6d7286f75a 100644
--- a/test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
+++ b/test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
@@ -13,6 +13,12 @@
 require_once 'libraries/Util.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
 
+/**
+ ** Test for PMA_Util::getFormattedMaximumUploadSize from Util.class.php
+ *
+ * @package PhpMyAdmin-test
+ * @group common.lib-tests
+ */
 class PMA_GetFormattedMaximumUploadSize_Test extends PHPUnit_Framework_TestCase
 {
 
diff --git a/test/libraries/common/PMA_getIcon_test.php b/test/libraries/common/PMA_getIcon_test.php
index f9b79d746a..463eff642e 100644
--- a/test/libraries/common/PMA_getIcon_test.php
+++ b/test/libraries/common/PMA_getIcon_test.php
@@ -13,13 +13,29 @@
 require_once 'libraries/Util.class.php';
 require_once 'libraries/Theme.class.php';
 
+/**
+ ** Test for PMA_Util::getIcon() from Util.class.php
+ *
+ * @package PhpMyAdmin-test
+ * @group common.lib-tests
+ */
 class PMA_GetIcon_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Set up
+     *
+     * @return void
+     */
     function setup()
     {
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
     }
 
+    /**
+     * Test for getIcon
+     *
+     * @return void
+     */
     function testGetIconWithoutActionLinksMode()
     {
         $GLOBALS['cfg']['ActionLinksMode'] = 'text';
@@ -30,6 +46,11 @@ class PMA_GetIcon_Test extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * Test for getIcon
+     *
+     * @return void
+     */
     function testGetIconWithActionLinksMode()
     {
         $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
@@ -40,18 +61,29 @@ class PMA_GetIcon_Test extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * Test for getIcon
+     *
+     * @return void
+     */
     function testGetIconAlternate()
     {
         $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
         $alternate_text = 'alt_str';
 
         $this->assertEquals(
-            '<span class="nowrap"><img src="themes/dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text
+            '<span class="nowrap"><img src="themes/dot.gif" title="'
+            . $alternate_text . '" alt="' . $alternate_text
             . '" class="icon ic_b_comment" /></span>',
             PMA_Util::getIcon('b_comment.png', $alternate_text)
         );
     }
 
+    /**
+     * Test for getIcon
+     *
+     * @return void
+     */
     function testGetIconWithForceText()
     {
         $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
@@ -60,7 +92,8 @@ class PMA_GetIcon_Test extends PHPUnit_Framework_TestCase
         // Here we are checking for an icon embeded inside a span (i.e not a menu
         // bar icon
         $this->assertEquals(
-            '<span class="nowrap"><img src="themes/dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text
+            '<span class="nowrap"><img src="themes/dot.gif" title="'
+            . $alternate_text . '" alt="' . $alternate_text
             . '" class="icon ic_b_comment" /> ' . $alternate_text . '</span>',
             PMA_Util::getIcon('b_comment.png', $alternate_text, true, false)
         );
diff --git a/test/libraries/common/PMA_getRadioFields_test.php b/test/libraries/common/PMA_getRadioFields_test.php
index 68591018f8..c5cc336fd5 100644
--- a/test/libraries/common/PMA_getRadioFields_test.php
+++ b/test/libraries/common/PMA_getRadioFields_test.php
@@ -12,8 +12,19 @@
  */
 require_once 'libraries/Util.class.php';
 
+/**
+ ** Test for PMA_Util::getRadioFields from Util.class.php
+ *
+ * @package PhpMyAdmin-test
+ * @group common.lib-tests
+ */
 class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Test for getRadioFields
+     *
+     * @return void
+     */
     function testGetRadioFieldsEmpty()
     {
         $name = "test_display_radio";
@@ -25,6 +36,11 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * Test for getRadioFields
+     *
+     * @return void
+     */
     function testGetRadioFields()
     {
         $name = "test_display_radio";
@@ -33,9 +49,11 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         $out = "";
         foreach ($choices as $choice_value => $choice_label) {
             $html_field_id = $name . '_' . $choice_value;
-            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"';
+            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id
+                . '" value="' . htmlspecialchars($choice_value) . '"';
             $out .= ' />' . "\n";
-            $out .= '<label for="' . $html_field_id . '">' . $choice_label . '</label>';
+            $out .= '<label for="' . $html_field_id . '">' . $choice_label
+                . '</label>';
             $out .= '<br />';
             $out .= "\n";
         }
@@ -46,6 +64,11 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * Test for getRadioFields
+     *
+     * @return void
+     */
     function testGetRadioFieldsWithChecked()
     {
         $name = "test_display_radio";
@@ -55,12 +78,14 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         $out = "";
         foreach ($choices as $choice_value => $choice_label) {
             $html_field_id = $name . '_' . $choice_value;
-            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"';
+            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id
+                . '" value="' . htmlspecialchars($choice_value) . '"';
             if ($choice_value == $checked_choice) {
                 $out .= ' checked="checked"';
             }
             $out .= ' />' . "\n";
-            $out .= '<label for="' . $html_field_id . '">' . $choice_label . '</label>';
+            $out .= '<label for="' . $html_field_id . '">' . $choice_label
+                . '</label>';
             $out .= '<br />';
             $out .= "\n";
         }
@@ -73,6 +98,11 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * Test for getRadioFields
+     *
+     * @return void
+     */
     function testGetRadioFieldsWithCheckedWithClass()
     {
         $name = "test_display_radio";
@@ -84,12 +114,14 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         foreach ($choices as $choice_value => $choice_label) {
             $html_field_id = $name . '_' . $choice_value;
             $out .= '<div class="' . $class . '">';
-            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"';
+            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id
+                . '" value="' . htmlspecialchars($choice_value) . '"';
             if ($choice_value == $checked_choice) {
                 $out .= ' checked="checked"';
             }
             $out .= ' />' . "\n";
-            $out .= '<label for="' . $html_field_id . '">' . $choice_label . '</label>';
+            $out .= '<label for="' . $html_field_id . '">' . $choice_label
+                . '</label>';
             $out .= '<br />';
             $out .= '</div>';
             $out .= "\n";
@@ -103,6 +135,11 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * Test for getRadioFields
+     *
+     * @return void
+     */
     function testGetRadioFieldsWithoutBR()
     {
         $name = "test_display_radio";
@@ -112,12 +149,14 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         $out = "";
         foreach ($choices as $choice_value => $choice_label) {
             $html_field_id = $name . '_' . $choice_value;
-            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"';
+            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id
+                . '" value="' . htmlspecialchars($choice_value) . '"';
             if ($choice_value == $checked_choice) {
                 $out .= ' checked="checked"';
             }
             $out .= ' />' . "\n";
-            $out .= '<label for="' . $html_field_id . '">' . $choice_label . '</label>';
+            $out .= '<label for="' . $html_field_id . '">' . $choice_label
+                . '</label>';
             $out .= "\n";
         }
 
@@ -129,6 +168,11 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * Test for getRadioFields
+     *
+     * @return void
+     */
     function testGetRadioFieldsEscapeLabelEscapeLabel()
     {
         $name = "test_display_radio";
@@ -138,12 +182,14 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         $out = "";
         foreach ($choices as $choice_value => $choice_label) {
             $html_field_id = $name . '_' . $choice_value;
-            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"';
+            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id
+                . '" value="' . htmlspecialchars($choice_value) . '"';
             if ($choice_value == $checked_choice) {
                 $out .= ' checked="checked"';
             }
             $out .= ' />' . "\n";
-            $out .= '<label for="' . $html_field_id . '">' . htmlspecialchars($choice_label) . '</label>';
+            $out .= '<label for="' . $html_field_id . '">'
+                . htmlspecialchars($choice_label) . '</label>';
             $out .= '<br />';
             $out .= "\n";
         }
@@ -156,6 +202,11 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * Test for getRadioFields
+     *
+     * @return void
+     */
     function testGetRadioFieldsEscapeLabelNotEscapeLabel()
     {
         $name = "test_display_radio";
@@ -165,12 +216,14 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         $out = "";
         foreach ($choices as $choice_value => $choice_label) {
             $html_field_id = $name . '_' . $choice_value;
-            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"';
+            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id
+                . '" value="' . htmlspecialchars($choice_value) . '"';
             if ($choice_value == $checked_choice) {
                 $out .= ' checked="checked"';
             }
             $out .= ' />' . "\n";
-            $out .= '<label for="' . $html_field_id . '">' . $choice_label . '</label>';
+            $out .= '<label for="' . $html_field_id . '">' . $choice_label
+                . '</label>';
             $out .= '<br />';
             $out .= "\n";
         }
@@ -183,6 +236,11 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * Test for getRadioFields
+     *
+     * @return void
+     */
     function testGetRadioFieldsEscapeLabelEscapeLabelWithClass()
     {
         $name = "test_display_radio";
@@ -194,12 +252,14 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         foreach ($choices as $choice_value => $choice_label) {
             $html_field_id = $name . '_' . $choice_value;
             $out .= '<div class="' . $class . '">';
-            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"';
+            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id
+                . '" value="' . htmlspecialchars($choice_value) . '"';
             if ($choice_value == $checked_choice) {
                 $out .= ' checked="checked"';
             }
             $out .= ' />' . "\n";
-            $out .= '<label for="' . $html_field_id . '">' . htmlspecialchars($choice_label) . '</label>';
+            $out .= '<label for="' . $html_field_id . '">'
+                . htmlspecialchars($choice_label) . '</label>';
             $out .= '<br />';
             $out .= '</div>';
             $out .= "\n";
diff --git a/test/libraries/common/PMA_getTitleForTarget_test.php b/test/libraries/common/PMA_getTitleForTarget_test.php
index ef23c66ce2..02ac706bfb 100644
--- a/test/libraries/common/PMA_getTitleForTarget_test.php
+++ b/test/libraries/common/PMA_getTitleForTarget_test.php
@@ -13,9 +13,19 @@
 require_once 'libraries/Util.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
 
+/**
+ ** Test for PMA_Util::getTitleForTarget from common.lib
+ *
+ * @package PhpMyAdmin-test
+ * @group common.lib-tests
+ */
 class PMA_GetTitleForTarget_Test extends PHPUnit_Framework_TestCase
 {
-
+    /**
+     * Data provider for testGetTitleForTarget
+     *
+     * @return array
+     */
     function dataProvider()
     {
         return array(
@@ -32,6 +42,13 @@ class PMA_GetTitleForTarget_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
+     * Test for
+     *
+     * @param string $target Target
+     * @param array  $result Expected value
+     *
+     * @return void
+     *
      * @dataProvider dataProvider
      * @return void
      */
diff --git a/test/libraries/common/PMA_pow_test.php b/test/libraries/common/PMA_pow_test.php
index 33adb1c549..1630645e30 100644
--- a/test/libraries/common/PMA_pow_test.php
+++ b/test/libraries/common/PMA_pow_test.php
@@ -12,8 +12,19 @@
  */
 require_once 'libraries/Util.class.php';
 
+/**
+ * Tests for PMA_Util::pow() function from Util.class.php
+ *
+ * @package PhpMyAdmin-test
+ * @group common.lib-tests
+ */
 class PMA_Pow_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Test forpow
+     *
+     * @return void
+     */
     public function testIntOverflow()
     {
         $this->assertEquals(
@@ -22,6 +33,11 @@ class PMA_Pow_Test extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * Test forpow
+     *
+     * @return void
+     */
     public function testBcpow()
     {
         if (function_exists('bcpow')) {
@@ -34,6 +50,11 @@ class PMA_Pow_Test extends PHPUnit_Framework_TestCase
         }
     }
 
+    /**
+     * Test forpow
+     *
+     * @return void
+     */
     public function testGmppow()
     {
         if (function_exists('gmp_pow')) {
@@ -46,6 +67,11 @@ class PMA_Pow_Test extends PHPUnit_Framework_TestCase
         }
     }
 
+    /**
+     * Test forpow
+     *
+     * @return void
+     */
     public function testNegativeExp()
     {
         $this->assertEquals(
@@ -54,6 +80,11 @@ class PMA_Pow_Test extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * Test forpow
+     *
+     * @return void
+     */
     public function testNegativeExpPow()
     {
         if (function_exists('pow')) {
@@ -66,6 +97,11 @@ class PMA_Pow_Test extends PHPUnit_Framework_TestCase
         }
     }
 
+    /**
+     * Test forpow
+     *
+     * @return void
+     */
     public function testNegativeExpBcpow()
     {
         if (function_exists('bcpow')) {
@@ -78,6 +114,11 @@ class PMA_Pow_Test extends PHPUnit_Framework_TestCase
         }
     }
 
+    /**
+     * Test forpow
+     *
+     * @return void
+     */
     public function testNegativeExpGmppow()
     {
         if (function_exists('gmp_pow')) {
diff --git a/test/libraries/common/PMA_showDocu_test.php b/test/libraries/common/PMA_showDocu_test.php
index bd84d85f8c..df0a519358 100644
--- a/test/libraries/common/PMA_showDocu_test.php
+++ b/test/libraries/common/PMA_showDocu_test.php
@@ -14,8 +14,19 @@ require_once 'libraries/Util.class.php';
 require_once 'libraries/Theme.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
 
+/**
+ ** Test for PMA_Util::showDocu from Util.class.php
+ *
+ * @package PhpMyAdmin-test
+ * @group common.lib-tests
+ */
 class PMA_ShowDocu_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Set up
+     *
+     * @return void
+     */
     function setup()
     {
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
@@ -23,6 +34,11 @@ class PMA_ShowDocu_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['ServerDefault'] = 1;
     }
 
+    /**
+     * Test for showDocu
+     *
+     * @return void
+     */
     function testShowDocu()
     {
         $this->assertEquals(
diff --git a/test/libraries/common/PMA_showMessage_test_disabled.php b/test/libraries/common/PMA_showMessage_test_disabled.php
index ed1afcc1e4..c4176baa24 100644
--- a/test/libraries/common/PMA_showMessage_test_disabled.php
+++ b/test/libraries/common/PMA_showMessage_test_disabled.php
@@ -16,8 +16,19 @@ require_once 'libraries/Util.class.php';
 require_once 'libraries/Table.class.php';
 require_once 'libraries/js_escape.lib.php';
 
+/**
+ ** Test for PMA_Util::getMessage from common.lib
+ *
+ * @package PhpMyAdmin-test
+ * @group common.lib-tests
+ */
 class PMA_ShowMessage_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Set up
+     *
+     * @return void
+     */
     function setUp()
     {
         global $cfg;
@@ -28,6 +39,11 @@ class PMA_ShowMessage_Test extends PHPUnit_Framework_TestCase
         include 'libraries/config.default.php';
     }
 
+    /**
+     * Test for getMessage
+     *
+     * @return void
+     */
     function testShowMessageNotAjax()
     {
         global $cfg;
diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php
index 537d80e884..ddbc100cf3 100644
--- a/test/libraries/common/PMA_showPHPDocu_test.php
+++ b/test/libraries/common/PMA_showPHPDocu_test.php
@@ -15,8 +15,19 @@ require_once 'libraries/Util.class.php';
 require_once 'libraries/Theme.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
 
+/**
+ ** Test for PMA_Util::showPHPDocu from Util.class.php
+ *
+ * @package PhpMyAdmin-test
+ * @group common.lib-tests
+ */
 class PMA_ShowPHPDocu_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Set up
+     *
+     * @return void
+     */
     function setup()
     {
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
@@ -24,13 +35,19 @@ class PMA_ShowPHPDocu_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['ServerDefault'] = 0;
     }
 
+    /**
+     * Test for showPHPDocu
+     *
+     * @return void
+     */
     function testShowPHPDocu()
     {
         $target = "docu";
         $lang = _pgettext('PHP documentation language', 'en');
         $expected = '<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang
-            . '%2F' . $target . '" target="documentation"><img src="themes/dot.gif" title="'
-            . __('Documentation') . '" alt="' . __('Documentation') . '" class="icon ic_b_help" /></a>';
+            . '%2F' . $target . '" target="documentation">'
+            . '<img src="themes/dot.gif" title="' . __('Documentation') . '" alt="'
+            . __('Documentation') . '" class="icon ic_b_help" /></a>';
 
         $this->assertEquals(
             $expected, PMA_Util::showPHPDocu($target)
diff --git a/test/libraries/common/PMA_unsupportedDatatypes_test.php b/test/libraries/common/PMA_unsupportedDatatypes_test.php
index 4c2e945e1b..8e3d9916c4 100644
--- a/test/libraries/common/PMA_unsupportedDatatypes_test.php
+++ b/test/libraries/common/PMA_unsupportedDatatypes_test.php
@@ -12,9 +12,19 @@
  */
 require_once 'libraries/Util.class.php';
 
+/**
+ ** Test for PMA_Util::unsupportedDatatypes from common.lib
+ *
+ * @package PhpMyAdmin-test
+ * @group common.lib-tests
+ */
 class PMA_UnsupportedDatatypes_Test extends PHPUnit_Framework_TestCase
 {
-
+    /**
+     * Test for unsupportedDatatypes
+     *
+     * @return void
+     */
     function testNotSupportedDataTypes()
     {
         $no_support_types = array();
diff --git a/test/libraries/core/PMA_array_test.php b/test/libraries/core/PMA_array_test.php
index 86ffcf2c3c..64a1bc013b 100644
--- a/test/libraries/core/PMA_array_test.php
+++ b/test/libraries/core/PMA_array_test.php
@@ -13,6 +13,13 @@
  */
 require_once 'libraries/core.lib.php';
 
+/**
+ * Test for PMA_arrayRead(), PMA_arrayWrite(), PMA_arrayRemove(),
+ * PMA_arrayMergeRecursive(),
+ * PMA_arrayWalkRecursive() from libraries/core.lib.php
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_Array_Test extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/test/libraries/core/PMA_checkPageValidity_test.php b/test/libraries/core/PMA_checkPageValidity_test.php
index 95e8dfa767..2e1572be5f 100644
--- a/test/libraries/core/PMA_checkPageValidity_test.php
+++ b/test/libraries/core/PMA_checkPageValidity_test.php
@@ -11,6 +11,11 @@
  */
 require_once 'libraries/core.lib.php';
 
+/**
+ * Tests for PMA_checkPageValidity() from libraries/core.lib.php
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_CheckPageValidity_Test extends PHPUnit_Framework_TestCase
 {
     protected $goto_whitelist = array(
@@ -34,38 +39,34 @@ class PMA_CheckPageValidity_Test extends PHPUnit_Framework_TestCase
         'user_password.php',
     );
 
-    function testGotoNowhere()
+    /**
+     * Test for PMA_checkPageValidity
+     *
+     * @param string     $page      Page
+     * @param array|null $whiteList White list
+     *
+     * @return void
+     *
+     * @dataProvider provider
+     */
+    function testGotoNowhere($page, $whiteList)
     {
-        $page = null;
-        $this->assertFalse(PMA_checkPageValidity($page, null));
+        $this->assertFalse(PMA_checkPageValidity($page, $whiteList));
     }
 
-    function testGotoWhitelist()
+    /**
+     * Data provider for testGotoNowhere
+     *
+     * @return array
+     */
+    public function provider()
     {
-        $page = 'export.php';
-
-        $this->assertTrue(PMA_checkPageValidity($page, $this->goto_whitelist));
+        return array(
+            array(null, null),
+            array('export.php', $this->goto_whitelist),
+            array('shell.php', $this->goto_whitelist),
+            array('index.php?sql.php&test=true', $this->goto_whitelist),
+            array('index.php%3Fsql.php%26test%3Dtrue', $this->goto_whitelist),
+        );
     }
-
-    function testGotoNotInWhitelist()
-    {
-        $page = 'shell.php';
-
-        $this->assertFalse(PMA_checkPageValidity($page, $this->goto_whitelist));
-    }
-
-    function testGotoWhitelistPage()
-    {
-        $page = 'index.php?sql.php&test=true';
-
-        $this->assertTrue(PMA_checkPageValidity($page, $this->goto_whitelist));
-    }
-
-    function testGotoWhitelistEncodedPage()
-    {
-        $page = 'index.php%3Fsql.php%26test%3Dtrue';
-
-        $this->assertTrue(PMA_checkPageValidity($page, $this->goto_whitelist));
-    }
-
 }
diff --git a/test/libraries/core/PMA_fatalError_test.php b/test/libraries/core/PMA_fatalError_test.php
index 9fa44e689e..8233b68536 100644
--- a/test/libraries/core/PMA_fatalError_test.php
+++ b/test/libraries/core/PMA_fatalError_test.php
@@ -25,8 +25,22 @@ require_once 'libraries/Theme.class.php';
 require_once 'libraries/Table.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
 
+/**
+ * Test for PMA_fatalError() from libraries/core.lib.php
+ *
+ * PMA_fatalError() displays the given error message on phpMyAdmin error page in
+ * foreign language
+ * and ends script execution and closes session
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_FatalError_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Set up
+     *
+     * @return void
+     */
     public function setup()
     {
         $GLOBALS['PMA_Config'] = new PMA_Config();
@@ -44,12 +58,22 @@ class PMA_FatalError_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['table'] = '';
     }
 
+    /**
+     * Test for PMA_fatalError
+     *
+     * @return void
+     */
     public function testFatalErrorMessage()
     {
         $this->expectOutputRegex("/FatalError!/");
         PMA_fatalError("FatalError!");
     }
 
+    /**
+     * Test for PMA_fatalError
+     *
+     * @return void
+     */
     public function testFatalErrorMessageWithArgs()
     {
         $message = "Fatal error #%d in file %s.";
diff --git a/test/libraries/core/PMA_getLinks_test.php b/test/libraries/core/PMA_getLinks_test.php
index 643a164d27..f946c78a12 100644
--- a/test/libraries/core/PMA_getLinks_test.php
+++ b/test/libraries/core/PMA_getLinks_test.php
@@ -13,6 +13,11 @@ require_once 'libraries/core.lib.php';
 require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/php-gettext/gettext.inc';
 
+/**
+ * Test for PMA_getPHPDocLink, PMA_linkURL  from libraries/core.lib.php
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_GetLinks_Test extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/test/libraries/core/PMA_getTableCount_test_dis.php b/test/libraries/core/PMA_getTableCount_test_dis.php
index 11dda57438..6ca894d591 100644
--- a/test/libraries/core/PMA_getTableCount_test_dis.php
+++ b/test/libraries/core/PMA_getTableCount_test_dis.php
@@ -30,8 +30,19 @@ require_once 'libraries/php-gettext/gettext.inc';
 
 require_once 'config.sample.inc.php';
 
+/**
+ * Test for PMA_getTableCount_test from core.lib.php
+ * PMA_getTableCount_test returns count of tables in given db
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_GetTableCount_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Set up
+     *
+     * @return void
+     */
     public function setUp()
     {
         $GLOBALS['PMA_Config'] = new PMA_Config();
@@ -45,12 +56,16 @@ class PMA_GetTableCount_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['table'] = '';
     }
 
+    /**
+     * Test for PMA_getTableCount
+     *
+     * @return void
+     */
     function testTableCount()
     {
         $GLOBALS['cfg']['Server']['host'] = 'localhost';
         $GLOBALS['cfg']['Server']['user'] = 'root';
 
         $this->assertEquals(5, PMA_getTableCount('meddb'));
-        $this->assertTrue(true);
     }
 }
diff --git a/test/libraries/core/PMA_get_real_size_test.php b/test/libraries/core/PMA_get_real_size_test.php
index 1f25ea5a60..df3c8cc9af 100644
--- a/test/libraries/core/PMA_get_real_size_test.php
+++ b/test/libraries/core/PMA_get_real_size_test.php
@@ -11,36 +11,44 @@
  */
 require_once 'libraries/core.lib.php';
 
+/**
+ * Test for PMA_getRealSize()  from libraries/core.lib.php
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_GetRealSize_Test extends PHPUnit_Framework_TestCase
 {
-    public function testNull()
+    /**
+     * Test for
+     *
+     * @param string $size     Size
+     * @param int    $expected Expected value
+     *
+     * @return void
+     *
+     * @dataProvider provider
+     */
+    public function testNull($size, $expected)
     {
-        $this->assertEquals(0, PMA_getRealSize('0'));
+        $this->assertEquals($expected, PMA_getRealSize($size));
     }
 
-    public function testKilobyte()
+    /**
+     * Data provider for testExtractValueFromFormattedSize
+     *
+     * @return array
+     */
+    public function provider()
     {
-        $this->assertEquals(1024, PMA_getRealSize('1kb'));
+        return array(
+            array('0', 0),
+            array('1kb', 1024),
+            array('1024k', 1024 * 1024),
+            array('8m', 8 * 1024 * 1024),
+            array('12gb', 12 * 1024 * 1024 * 1024),
+            array('1024', 1024),
+        );
     }
 
-    public function testKilobyte2()
-    {
-        $this->assertEquals(1024 * 1024, PMA_getRealSize('1024k'));
-    }
-
-    public function testMegabyte()
-    {
-        $this->assertEquals(8 * 1024 * 1024, PMA_getRealSize('8m'));
-    }
-
-    public function testGigabyte()
-    {
-        $this->assertEquals(12 * 1024 * 1024 * 1024, PMA_getRealSize('12gb'));
-    }
-
-    public function testUnspecified()
-    {
-        $this->assertEquals(1024, PMA_getRealSize('1024'));
-    }
 }
 ?>
diff --git a/test/libraries/core/PMA_headerLocation_test.php b/test/libraries/core/PMA_headerLocation_test.php
index f147d15d44..873b135744 100644
--- a/test/libraries/core/PMA_headerLocation_test.php
+++ b/test/libraries/core/PMA_headerLocation_test.php
@@ -50,6 +50,11 @@ class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase
     protected $runkitExt;
     protected $apdExt;
 
+    /**
+     * Set up
+     *
+     * @return void
+     */
     public function setUp()
     {
         //session_start();
diff --git a/test/libraries/core/PMA_ifSetOr_test.php b/test/libraries/core/PMA_ifSetOr_test.php
index 21a77c8dfe..a48ef9b561 100644
--- a/test/libraries/core/PMA_ifSetOr_test.php
+++ b/test/libraries/core/PMA_ifSetOr_test.php
@@ -11,8 +11,18 @@
  */
 require_once 'libraries/core.lib.php';
 
+/**
+ * Tests for PMA_ifSetOr() from libraries/core.lib.php
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_IfSetOr_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Test for PMA_ifSetOr
+     *
+     * @return void
+     */
     public function testVarSet()
     {
         $default = 'foo';
@@ -20,6 +30,12 @@ class PMA_IfSetOr_Test extends PHPUnit_Framework_TestCase
         $out = PMA_ifSetOr($in, $default);
         $this->assertEquals($in, $out);
     }
+
+    /**
+     * Test for PMA_ifSetOr
+     *
+     * @return void
+     */
     public function testVarSetWrongType()
     {
         $default = 'foo';
@@ -27,6 +43,12 @@ class PMA_IfSetOr_Test extends PHPUnit_Framework_TestCase
         $out = PMA_ifSetOr($in, $default, 'boolean');
         $this->assertEquals($out, $default);
     }
+
+    /**
+     * Test for PMA_ifSetOr
+     *
+     * @return void
+     */
     public function testVarNotSet()
     {
         $default = 'foo';
@@ -34,6 +56,12 @@ class PMA_IfSetOr_Test extends PHPUnit_Framework_TestCase
         $out = PMA_ifSetOr($in, $default);
         $this->assertEquals($out, $default);
     }
+
+    /**
+     * Test for PMA_ifSetOr
+     *
+     * @return void
+     */
     public function testVarNotSetNoDefault()
     {
         // $in is not set!
diff --git a/test/libraries/core/PMA_isValid_test.php b/test/libraries/core/PMA_isValid_test.php
index b88be86535..49d56c988d 100644
--- a/test/libraries/core/PMA_isValid_test.php
+++ b/test/libraries/core/PMA_isValid_test.php
@@ -295,6 +295,11 @@ class PMA_IsValid_Test extends PHPUnit_Framework_TestCase
         $this->assertFalse(PMA_isValid($var, 'identic', $compare));
     }
 
+    /**
+     * Data provider for testSimilarType
+     *
+     * @return array
+     */
     public function providerSimilarType()
     {
         return array(
diff --git a/test/libraries/core/PMA_warnMissingExtension_test.php b/test/libraries/core/PMA_warnMissingExtension_test.php
index 02a6cd5edb..9eff0f11d7 100644
--- a/test/libraries/core/PMA_warnMissingExtension_test.php
+++ b/test/libraries/core/PMA_warnMissingExtension_test.php
@@ -19,8 +19,19 @@ require_once 'libraries/Util.class.php';
 require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/sanitizing.lib.php';
 
+/**
+ * Test for PMA_warnMissingExtension() from libraries/core.lib.php
+ * PMA_warnMissingExtension warns or fails on missing extension.
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_WarnMissingExtension_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Set up
+     *
+     * @return void
+     */
     public function setUp()
     {
         $GLOBALS['PMA_Config'] = new PMA_Config();
@@ -41,6 +52,11 @@ class PMA_WarnMissingExtension_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['error_handler'] = new PMA_Error_Handler();
     }
 
+    /**
+     * Test for PMA_warnMissingExtension
+     *
+     * @return void
+     */
     function testMissingExtensionFatal()
     {
         $ext = 'php_ext';
@@ -53,6 +69,11 @@ class PMA_WarnMissingExtension_Test extends PHPUnit_Framework_TestCase
         PMA_warnMissingExtension($ext, true);
     }
 
+    /**
+     * Test for PMA_warnMissingExtension
+     *
+     * @return void
+     */
     function testMissingExtensionFatalWithExtra()
     {
         $ext = 'php_ext';
diff --git a/test/libraries/rte/PMA_RTN_getEditorForm_test.php b/test/libraries/rte/PMA_RTN_getEditorForm_test.php
index 3f6b8cc2d0..220ce15be4 100644
--- a/test/libraries/rte/PMA_RTN_getEditorForm_test.php
+++ b/test/libraries/rte/PMA_RTN_getEditorForm_test.php
@@ -47,6 +47,11 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
 
     }
 
+    /**
+     * Test for PMA_RTN_getParameterRow
+     *
+     * @return void
+     */
     public function testgetParameterRow_empty()
     {
         $GLOBALS['is_ajax_request'] = false;
diff --git a/test/libraries/select_lang/PMA_langList_test.php b/test/libraries/select_lang/PMA_langList_test.php
index a8159efac6..4f9e803e0a 100644
--- a/test/libraries/select_lang/PMA_langList_test.php
+++ b/test/libraries/select_lang/PMA_langList_test.php
@@ -14,8 +14,19 @@ require_once 'libraries/core.lib.php';
 require_once 'libraries/vendor_config.php';
 require_once 'libraries/select_lang.lib.php';
 
+/**
+ * Test for PMA_langList from select_lang.lib.php
+ *
+ * @package PhpMyAdmin-test
+ * @group select_lang.lib-tests
+ */
 class PMA_LangList_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Test for PMA_langList
+     *
+     * @return void
+     */
     function testLangList()
     {
         $GLOBALS['lang_path'] = '';
@@ -24,6 +35,11 @@ class PMA_LangList_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals($expected, PMA_langList());
     }
 
+    /**
+     * Test for PMA_langList
+     *
+     * @return void
+     */
     function testLangListWithDir()
     {
         $GLOBALS['lang_path'] = './locale/';
@@ -35,7 +51,9 @@ class PMA_LangList_Test extends PHPUnit_Framework_TestCase
         }
 
         while (false !== ($file = readdir($handle))) {
-            if ($file != "." && $file != ".." && file_exists($GLOBALS['lang_path'] . '/' . $file . '/LC_MESSAGES/phpmyadmin.mo')) {
+            $path = $GLOBALS['lang_path'] . '/' . $file
+                . '/LC_MESSAGES/phpmyadmin.mo';
+            if ($file != "." && $file != ".." && file_exists($path)) {
                 $expected[$file] = PMA_langDetails($file);
             }
         }
@@ -43,6 +61,11 @@ class PMA_LangList_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals($expected, PMA_langList());
     }
 
+    /**
+     * Test for PMA_langList
+     *
+     * @return void
+     */
     function testLangListWithWrongDir()
     {
         $GLOBALS['lang_path'] = '/root/';
diff --git a/test/libraries/select_lang/PMA_langName_test.php b/test/libraries/select_lang/PMA_langName_test.php
index 8b5c41d486..1aad721a8d 100644
--- a/test/libraries/select_lang/PMA_langName_test.php
+++ b/test/libraries/select_lang/PMA_langName_test.php
@@ -12,20 +12,43 @@
  */
 require_once 'libraries/select_lang.lib.php';
 
+/**
+ * Test for PMA_languageName from select_lang.lib.php
+ *
+ * @package PhpMyAdmin-test
+ * @group select_lang.lib-tests
+ */
 class PMA_LangName_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Data provider for testLangName
+     *
+     * @return array
+     */
     function dataProvider()
     {
         return array(
             array(array('en|english', 'en', ''),'English'),
-            array(array('fr|french', 'fr', 'Fran&ccedil;ais'), 'Fran&ccedil;ais - French'),
-            array(array('zh|chinese simplified', 'zh', '&#20013;&#25991;'), '&#20013;&#25991; - Chinese simplified'),
+            array(
+                array('fr|french', 'fr', 'Fran&ccedil;ais'),
+                'Fran&ccedil;ais - French'
+            ),
+            array(
+                array('zh|chinese simplified', 'zh', '&#20013;&#25991;'),
+                '&#20013;&#25991; - Chinese simplified'
+            ),
         );
     }
 
     /**
-     * @dataProvider dataProvider
+     * Test for
+     *
+     * @param string $test   Language code
+     * @param string $result Expected value
+     *
      * @return void
+     *
+     * @dataProvider dataProvider
      */
     function testLangName($test, $result)
     {