From c11155e74479264b05fe6ac40e8b01d8a39b672a Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Sat, 25 Jul 2015 22:50:54 +0200 Subject: [PATCH 1/2] Update PHPDoc. Signed-off-by: Hugues Peccatte --- .../TableRelationController.class.php | 10 ++++----- .../TableSearchController.class.php | 11 ++++++---- test/libraries/PMA_GIS_modifyQuery_test.php | 21 ++++++++++--------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/libraries/controllers/TableRelationController.class.php b/libraries/controllers/TableRelationController.class.php index 4942ff1de2..892e5250a5 100644 --- a/libraries/controllers/TableRelationController.class.php +++ b/libraries/controllers/TableRelationController.class.php @@ -70,13 +70,13 @@ class TableRelationController extends TableController /** * Constructor * - * @param array $options_array - * @param array $cfgRelation - * @param string $tbl_storage_engine - * @param array $existrel + * @param array $options_array Options + * @param array $cfgRelation Config relation + * @param string $tbl_storage_engine Table storage engine + * @param array $existrel * @param array $existrel_foreign * @param string $disp - * @param string $upd_query + * @param string $upd_query Update query */ public function __construct($options_array, $cfgRelation, $tbl_storage_engine, $existrel, $existrel_foreign, $disp, $upd_query diff --git a/libraries/controllers/TableSearchController.class.php b/libraries/controllers/TableSearchController.class.php index cfe6e33380..5e036c8e26 100644 --- a/libraries/controllers/TableSearchController.class.php +++ b/libraries/controllers/TableSearchController.class.php @@ -90,10 +90,10 @@ class TableSearchController extends TableController /** * Constructor * - * @param string $db - * @param string $table - * @param string $searchType - * @param string $url_query + * @param string $db DB name + * @param string $table Table name + * @param string $searchType Search type + * @param string $url_query URL query */ public function __construct($db, $table, $searchType, $url_query) { @@ -385,6 +385,9 @@ class TableSearchController extends TableController /** * Zoom submit action * + * @param string $dataLabel Data label + * @param string $goto Goto + * * @return void */ public function zoomSubmitAction($dataLabel, $goto) diff --git a/test/libraries/PMA_GIS_modifyQuery_test.php b/test/libraries/PMA_GIS_modifyQuery_test.php index 7451af526e..ad45d40ccc 100644 --- a/test/libraries/PMA_GIS_modifyQuery_test.php +++ b/test/libraries/PMA_GIS_modifyQuery_test.php @@ -20,16 +20,17 @@ require_once 'libraries/Util.class.php'; class PMA_GIS_ModifyQueryTest extends PHPUnit_Framework_TestCase { //@todo: Move this test to GIS_Visualization's - /** - * Test PMA_GIS_modifyQuery method - * - * @param string $sql_query query to modify - * @param array $settings visualization settings - * @param string $modified_query modified query - * - * @dataProvider provider - * @return void - */ + /** + * Test PMA_GIS_modifyQuery method + * + * @internal param string $sql_query query to modify + * @internal param array $settings visualization settings + * @internal param string $modified_query modified query + * + * @return void + * + * @dataProvider provider + */ public function testModifyQuery(/*$sql_query, $settings, $modified_query*/) { // $this->assertEquals( From 56c07e6f35059d7314685fbbb6b006ea278c0a64 Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Sat, 25 Jul 2015 22:51:02 +0200 Subject: [PATCH 2/2] Make PHPCS happy. Signed-off-by: Hugues Peccatte --- libraries/relation.lib.php | 7 +- libraries/replication_gui.lib.php | 10 +- libraries/server_privileges.lib.php | 20 ++-- libraries/server_status_processes.lib.php | 2 +- libraries/server_variables.lib.php | 20 ++-- libraries/sql.lib.php | 7 +- libraries/sql_query_form.lib.php | 4 +- libraries/structure.lib.php | 23 +++-- libraries/tbl_columns_definition_form.inc.php | 96 ++++++++++++++----- libraries/tracking.lib.php | 3 +- 10 files changed, 136 insertions(+), 56 deletions(-) diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 7c8f3d5b0a..07b0edf614 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -747,7 +747,9 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') * @var CreateStatement $stmt */ $stmt = $parser->statements[0]; - $foreign['foreign_keys_data'] = SqlParser\Utils\Table::getForeignKeys($stmt); + $foreign['foreign_keys_data'] = SqlParser\Utils\Table::getForeignKeys( + $stmt + ); } } @@ -1329,7 +1331,8 @@ function PMA_getForeignData( // We could also do the SELECT anyway, with a LIMIT, and ensure that // the current value of the field is one of the choices. - $the_total = $GLOBALS['dbi']->getTable($foreign_db, $foreign_table)->countRecords(true); + $the_total = $GLOBALS['dbi']->getTable($foreign_db, $foreign_table) + ->countRecords(true); if ($override_total == true || $the_total < $GLOBALS['cfg']['ForeignKeyMaxLimit'] diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index d85149fa90..2ffd20a9f2 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -152,8 +152,9 @@ function PMA_getHtmlForSlaveConfiguration( $html .= ' '; @@ -228,7 +229,10 @@ function PMA_getHtmlForSlaveConfiguration( $reconfiguremaster_link = 'server_replication.php' . PMA_URL_getCommon($_url_params); - $html .= __('Server is configured as slave in a replication process. Would you like to:'); + $html .= __( + 'Server is configured as slave in a replication process. Would you ' . + 'like to:' + ); $html .= '
'; $html .= '