Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

libraries/Util.class.php

@@ -3071,7 +3071,7 @@ class PMA_Util
     /**
      * Converts GIS data to Well Known Text format
      *
-     * @param binary $data        GIS data
+     * @param string $data        GIS data
      * @param bool   $includeSRID Add SRID to the WKT
      *
      * @return string GIS data in Well Know Text format

libraries/insert_edit.lib.php

@@ -848,17 +848,17 @@ function PMA_getTextarea($column, $backup_field, $column_name_appendix,
 /**
  * Get HTML for enum type
  *
- * @param type $column               description of column in given table
- * @param type $backup_field         hidden input field
- * @param type $column_name_appendix the name atttibute
- * @param type $extracted_columnspec associative array containing type,
- *                                   spec_in_brackets and possibly
- *                                   enum_set_values (another array)
- * @param type $unnullify_trigger    validation string
- * @param type $tabindex             tab index
- * @param type $tabindex_for_value   offset for the values tabindex
- * @param type $idindex              id index
- * @param type $data                 data to edit
+ * @param string  $column               description of column in given table
+ * @param string  $backup_field         hidden input field
+ * @param string  $column_name_appendix the name atttibute
+ * @param array   $extracted_columnspec associative array containing type,
+ *                                      spec_in_brackets and possibly
+ *                                      enum_set_values (another array)
+ * @param string  $unnullify_trigger    validation string
+ * @param integer $tabindex             tab index
+ * @param integer $tabindex_for_value   offset for the values tabindex
+ * @param integer $idindex              id index
+ * @param mixed   $data                 data to edit
  *
  * @return string an html snippet
  */
@@ -1294,7 +1294,7 @@ function PMA_getMaxUploadSize($column, $biggest_max_file_size)
  * @param string  $text_dir              text direction
  * @param array   $special_chars_encoded replaced char if the string starts
  *                                       with a \r\n pair (0x0d0a) add an extra \n
- * @param strign  $data                  data to edit
+ * @param string  $data                  data to edit
  * @param array   $extracted_columnspec  associative array containing type,
  *                                       spec_in_brackets and possibly
  *                                       enum_set_values (another array)
@@ -1741,7 +1741,7 @@ function PMA_getSpecialCharsAndBackupFieldForExistingRow(
 /**
  * display default values
  *
- * @param type    $column          description of column in given table
+ * @param string  $column          description of column in given table
  * @param boolean $real_null_value whether column value null or not null
  *
  * @return array $real_null_value, $data, $special_chars,

test/classes/PMA_Table_test.php

@@ -412,7 +412,7 @@ class PMA_Table_Test extends PHPUnit_Framework_TestCase
      * Test name validation
      *
      * @param string  $name   name to test
-     * @param boolena $result expected result
+     * @param boolean $result expected result
      *
      * @return void
      *

test/classes/gis/PMA_GIS_Polygon_test.php

@@ -179,7 +179,7 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest
      * test for Area
      *
      * @param array $ring array of points forming the ring
-     * @param fload $area area of the ring
+     * @param float $area area of the ring
      *
      * @dataProvider providerForTestArea
      * @return void

test/libraries/PMA_display_export_test.php

@@ -125,7 +125,7 @@ class PMA_DisplayExport_Test extends PHPUnit_Framework_TestCase
     /**
      * Test for PMA_getHtmlForExportOptions
      *
-     * @return vgetUserValue
+     * @return void
      */
     public function testPMAGetHtmlForExportOptions()
     {