From 4c88729902c66f9d5800b34df1b588f11ec31a47 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Thu, 12 Sep 2013 17:50:58 +0200 Subject: [PATCH 1/4] fix coding style: true is lower case --- url.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/url.php b/url.php index 897f3529b9..935c2bca95 100644 --- a/url.php +++ b/url.php @@ -9,7 +9,7 @@ /** * Gets core libraries and defines some variables */ -define('PMA_MINIMUM_COMMON', True); +define('PMA_MINIMUM_COMMON', true); require_once './libraries/common.inc.php'; if (! PMA_isValid($_GET['url']) From 5d999114b85746dc5ba0ada8b0d068d0bd86cd21 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Thu, 12 Sep 2013 17:58:21 +0200 Subject: [PATCH 2/4] fix DocBlock --- libraries/tbl_gis_visualization.lib.php | 26 ++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libraries/tbl_gis_visualization.lib.php b/libraries/tbl_gis_visualization.lib.php index 2d41182ba9..426c88ae2d 100644 --- a/libraries/tbl_gis_visualization.lib.php +++ b/libraries/tbl_gis_visualization.lib.php @@ -242,11 +242,11 @@ function PMA_getHtmlForColumn($column, $columnCandidates, $visualizationSettings } /** - * Function to get html for the option of using oprn street maps + * Function to get HTML for the option of using open street maps * - * @param boolean $isSelected the default value + * @param boolean $isSelected the default value * - * @return string $html + * @return string HTML string */ function PMA_getHtmlForUseOpenStreetMaps($isSelected) { @@ -266,18 +266,18 @@ function PMA_getHtmlForUseOpenStreetMaps($isSelected) } /** - * Function to generate html for the GIS visualization page + * Function to generate HTML for the GIS visualization page * - * @param array $url_params url parameters - * @param array $labelCandidates list of candidates for the label - * @param array $spatialCandidates list of candidates for the spatial column - * @param array $visualizationSettings visualization settings - * @param String $sql_query the sql query - * @param String $visualization html and js code for the visualization - * @param boolean $svg_support whether svg download format is supported - * @param array $data array of visualizing data + * @param array $url_params url parameters + * @param array $labelCandidates list of candidates for the label + * @param array $spatialCandidates list of candidates for the spatial column + * @param array $visualizationSettings visualization settings + * @param String $sql_query the sql query + * @param String $visualization HTML and js code for the visualization + * @param boolean $svg_support whether svg download format is supported + * @param array $data array of visualizing data * - * @return string $html html code for the GIS visualization + * @return string HTML code for the GIS visualization */ function PMA_getHtmlForGisVisualization( $url_params, $labelCandidates, $spatialCandidates, $visualizationSettings, From e3ca94efae9b15347d5bcdeb432725386046f3fc Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Thu, 12 Sep 2013 18:01:10 +0200 Subject: [PATCH 3/4] wrap long lines --- libraries/tbl_gis_visualization.lib.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/tbl_gis_visualization.lib.php b/libraries/tbl_gis_visualization.lib.php index 426c88ae2d..b377d4d3e6 100644 --- a/libraries/tbl_gis_visualization.lib.php +++ b/libraries/tbl_gis_visualization.lib.php @@ -301,7 +301,8 @@ function PMA_getHtmlForGisVisualization( ); $html .= ''; - $html .= ' Date: Thu, 12 Sep 2013 18:07:11 +0200 Subject: [PATCH 4/4] fix docblock : newline between parameterlist and description --- test/engines/PMA_StorageEngine_pbxt_test.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/engines/PMA_StorageEngine_pbxt_test.php b/test/engines/PMA_StorageEngine_pbxt_test.php index f2610abc23..2215fbbd68 100644 --- a/test/engines/PMA_StorageEngine_pbxt_test.php +++ b/test/engines/PMA_StorageEngine_pbxt_test.php @@ -122,6 +122,7 @@ class PMA_StorageEngine_pbxt_Test extends PHPUnit_Framework_TestCase /** * Test for resolveTypeSize + * * @param string $formatted_size the size expression (for example 8MB) * * @dataProvider providerFortTestResolveTypeSize @@ -136,6 +137,7 @@ class PMA_StorageEngine_pbxt_Test extends PHPUnit_Framework_TestCase /** * Provider for testResolveTypeSize + * * @return array */ public function providerFortTestResolveTypeSize()