From 6e6c513eedc0dd2415d2cb0e3585ff4cd095f59a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 8 May 2014 17:56:22 +0200 Subject: [PATCH 1/4] Fix typo in type name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/insert_edit.lib.php | 2 +- test/classes/PMA_Table_test.php | 2 +- test/classes/gis/PMA_GIS_Polygon_test.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index e40ba135b3..93f0784e10 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -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) diff --git a/test/classes/PMA_Table_test.php b/test/classes/PMA_Table_test.php index 40e91a9bf5..e1e50465cc 100644 --- a/test/classes/PMA_Table_test.php +++ b/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 * diff --git a/test/classes/gis/PMA_GIS_Polygon_test.php b/test/classes/gis/PMA_GIS_Polygon_test.php index ccd3d6c243..f7239b9cf1 100644 --- a/test/classes/gis/PMA_GIS_Polygon_test.php +++ b/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 From 7f564b6f9a6b558ce0ad15406c5b5f92e32ecb15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 8 May 2014 18:01:12 +0200 Subject: [PATCH 2/4] Correctly specify types in docblock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/insert_edit.lib.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 93f0784e10..02020ba77b 100644 --- a/libraries/insert_edit.lib.php +++ b/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 */ @@ -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, From 25bfa05e1b0b7c7581e9675d53cf18d2e5125301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 8 May 2014 18:02:43 +0200 Subject: [PATCH 3/4] This is actually a string MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/Util.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/Util.class.php b/libraries/Util.class.php index e63a6e994b..f3fa1ddf73 100644 --- a/libraries/Util.class.php +++ b/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 From ebefbfa1260faa98ab9cda2927b82ec91acfb462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 8 May 2014 18:03:50 +0200 Subject: [PATCH 4/4] Fix return type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- test/libraries/PMA_display_export_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/libraries/PMA_display_export_test.php b/test/libraries/PMA_display_export_test.php index 06d5166d3b..845efe211e 100644 --- a/test/libraries/PMA_display_export_test.php +++ b/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() {