Merge remote-tracking branch 'origin/master'

libraries/error_report.lib.php

@@ -160,16 +160,15 @@ function PMA_sendErrorReport($report) {
  *
  * uses the $LINE_COUNT global array of file names and line numbers
  *
- * @param Array $filenames list of files in order of concatenation
+ * @param Array   $filenames         list of files in order of concatenation
  * @param Integer $cumulative_number the cumulative line number in the
- *    concatenated files
+ *                                   concatenated files
  *
- * returns two variables in an array:
+ * @return Array the filename and linenumber
+ * Returns two variables in an array:
  * - A String $filename the filename where the requested cumulative number
  *   exists
  * - Integer $linenumber the translated line number in the returned file
- *
- * @return Array the filename and linenumber
  */
 function PMA_getLineNumber($filenames, $cumulative_number) {
   global $LINE_COUNT;

libraries/import.lib.php

@@ -77,7 +77,7 @@ function PMA_detectCompression($filepath)
  * @param string $sql         query to run
  * @param string $full        query to display, this might be commented
  * @param bool   $controluser whether to use control user for queries
- * @param array  &$sql_data
+ * @param array  &$sql_data   SQL parse data storage
  *
  * @return void
  * @access public

test/libraries/core/PMA_array_test.php

@@ -15,7 +15,7 @@ require_once 'libraries/core.lib.php';
 
 class PMA_Array_Test extends PHPUnit_Framework_TestCase
 {
-    function testPMA_arrayRead()
+    function testRead()
     {
         $arr = array(
             "int" => 1,
@@ -98,7 +98,7 @@ class PMA_Array_Test extends PHPUnit_Framework_TestCase
         );
     }
 
-    function testPMA_arrayWrite()
+    function testWrite()
     {
         $arr = array(
             "int" => 1,
@@ -147,7 +147,7 @@ class PMA_Array_Test extends PHPUnit_Framework_TestCase
         $this->assertNull($arr['sarr'][0][2]);
     }
 
-    function testPMA_arrayRemove()
+    function testRemove()
     {
         $arr = array(
             "int" => 1,
@@ -204,7 +204,7 @@ class PMA_Array_Test extends PHPUnit_Framework_TestCase
         $this->assertEmpty($arr);
     }
 
-    function testPMA_arrayMergeRecursive()
+    function testMergeRecursive()
     {
         $arr1 = array('key1' => 1, 'key2' => 2.3, 'key3' => 'str3');
         $arr2 = array('key1' => 4, 'key2' => 5, 'key3' => 6);
@@ -252,7 +252,7 @@ class PMA_Array_Test extends PHPUnit_Framework_TestCase
     }
 
 
-    function testPMA_arrayWalkRecursive()
+    function testWalkRecursive()
     {
         function fConcat($var)
         {
@@ -272,9 +272,9 @@ class PMA_Array_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * @depends testPMA_arrayWalkRecursive
+     * @depends testWalkRecursive
      */
-    function testPMA_arrayWalkRecursiveNotProcessIntKeys()
+    function testWalkRecursiveNotProcessIntKeys()
     {
         function fAdd($var)
         {
@@ -289,9 +289,9 @@ class PMA_Array_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * @depends testPMA_arrayWalkRecursiveNotProcessIntKeys
+     * @depends testWalkRecursiveNotProcessIntKeys
      */
-    function testPMA_arrayWalkRecursiveSubArray()
+    function testWalkRecursiveSubArray()
     {
         $arr = array(
             "key1"=>'val1',
@@ -310,7 +310,7 @@ class PMA_Array_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals($arr, $target);
     }
 
-    function testPMA_arrayWalkRecursiveApplyToKeysStripSlashes()
+    function testWalkRecursiveApplyToKeysStripSlashes()
     {
         $arr = array(
             "key\\1"=>'v\\\\al1',

user_password.php

@@ -120,8 +120,8 @@ function PMA_setChangePasswordMsg()
 /**
  * Change the password
  *
- * @param string $password
- * @param string $message
+ * @param string $password                New password
+ * @param string $message                 Message
  * @param array  $change_password_message Message to show
  *
  * @return void