From 525a4361621c7227030b70c2e894fef73860f879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Tue, 19 Mar 2019 16:48:54 -0300 Subject: [PATCH] Fix some PHPStan errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- .../Controllers/Table/StructureController.php | 12 ------------ libraries/classes/DatabaseInterface.php | 9 +++++++-- libraries/classes/Dbi/DbiDummy.php | 4 +++- libraries/classes/Dbi/DbiExtension.php | 4 +++- libraries/classes/Dbi/DbiMysqli.php | 6 ++++-- libraries/classes/Plugins/ImportPlugin.php | 4 +++- phpstan.neon.dist | 4 ---- test/classes/Gis/GisGeomTestCase.php | 1 + 8 files changed, 21 insertions(+), 23 deletions(-) diff --git a/libraries/classes/Controllers/Table/StructureController.php b/libraries/classes/Controllers/Table/StructureController.php index 20a65c3b0718..0509126a5315 100644 --- a/libraries/classes/Controllers/Table/StructureController.php +++ b/libraries/classes/Controllers/Table/StructureController.php @@ -91,13 +91,7 @@ class StructureController extends AbstractController * @param \PhpMyAdmin\DatabaseInterface $dbi DatabaseInterface object * @param string $db Database name * @param string $table Table name - * @param string $type Indicate the db_structure or tbl_structure - * @param int $num_tables Number of tables - * @param int $pos Current position in the list * @param bool $db_is_system_schema DB is information_schema - * @param int $total_num_tables Number of tables - * @param array $tables Tables in the DB - * @param bool $is_show_stats Whether stats show or not * @param bool $tbl_is_view Table is a view * @param string $tbl_storage_engine Table storage engine * @param int $table_info_num_rows Number of rows @@ -109,13 +103,7 @@ public function __construct( $dbi, $db, $table, - $type, - $num_tables, - $pos, $db_is_system_schema, - $total_num_tables, - $tables, - $is_show_stats, $tbl_is_view, $tbl_storage_engine, $table_info_num_rows, diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php index 70e6b9d82124..113511414b97 100644 --- a/libraries/classes/DatabaseInterface.php +++ b/libraries/classes/DatabaseInterface.php @@ -2806,11 +2806,16 @@ public function getProtoInfo($link = DatabaseInterface::CONNECT_USER) /** * returns a string that represents the client library version * + * @param integer $link link type + * * @return string MySQL client library version */ - public function getClientInfo(): string + public function getClientInfo($link = DatabaseInterface::CONNECT_USER): string { - return $this->_extension->getClientInfo(); + if (! isset($this->_links[$link])) { + return ''; + } + return $this->_extension->getClientInfo($this->_links[$link]); } /** diff --git a/libraries/classes/Dbi/DbiDummy.php b/libraries/classes/Dbi/DbiDummy.php index e1863b27c9f1..73bc0b5d8b8e 100644 --- a/libraries/classes/Dbi/DbiDummy.php +++ b/libraries/classes/Dbi/DbiDummy.php @@ -302,9 +302,11 @@ public function getProtoInfo($link) /** * returns a string that represents the client library version * + * @param resource $link connection link + * * @return string MySQL client library version */ - public function getClientInfo() + public function getClientInfo($link) { return ''; } diff --git a/libraries/classes/Dbi/DbiExtension.php b/libraries/classes/Dbi/DbiExtension.php index 947d8bebc504..8cfa9fcd31d8 100644 --- a/libraries/classes/Dbi/DbiExtension.php +++ b/libraries/classes/Dbi/DbiExtension.php @@ -155,9 +155,11 @@ public function getProtoInfo($link); /** * returns a string that represents the client library version * + * @param resource $link mysql link + * * @return string MySQL client library version */ - public function getClientInfo(); + public function getClientInfo($link); /** * returns last error message or false if no errors occurred diff --git a/libraries/classes/Dbi/DbiMysqli.php b/libraries/classes/Dbi/DbiMysqli.php index 0575690661cc..71227d878b8a 100644 --- a/libraries/classes/Dbi/DbiMysqli.php +++ b/libraries/classes/Dbi/DbiMysqli.php @@ -328,11 +328,13 @@ public function getProtoInfo($mysqli) /** * returns a string that represents the client library version * + * @param \mysqli $mysqli mysql link + * * @return string MySQL client library version */ - public function getClientInfo() + public function getClientInfo($mysqli) { - return mysqli_get_client_info(); + return $mysqli->get_client_info(); } /** diff --git a/libraries/classes/Plugins/ImportPlugin.php b/libraries/classes/Plugins/ImportPlugin.php index a5df087a0541..9d3fec308535 100644 --- a/libraries/classes/Plugins/ImportPlugin.php +++ b/libraries/classes/Plugins/ImportPlugin.php @@ -43,9 +43,11 @@ public function __construct() /** * Handles the whole import logic * + * @param array $sql_data 2-element array with sql data + * * @return void */ - abstract public function doImport(); + abstract public function doImport(array &$sql_data = []); /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */ diff --git a/phpstan.neon.dist b/phpstan.neon.dist index cbe2b17dffa0..de9efb197757 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -7,16 +7,13 @@ parameters: ignoreErrors: - '#Function (get_login_credentials|uploadprogress_get_info) not found#' - '#Instantiated class COM not found#' - - '#Method PhpMyAdmin\\Plugins\\ImportPlugin\:\:doImport\(\) invoked with 1 parameter, 0 required#'# Normal - '#Call to method ([a-zA-Z\(\)]+) on an unknown class COM#' - - '#Table\\StructureController has an unused parameter#' - '#NodeTrans::__construct\(\) does not call parent constructor#' - '#Call to an undefined method PHPUnit\\Framework\\MockObject\\MockBuilder#' - '#Call to an undefined method PHPUnit\\Framework\\MockObject\\MockObject#' - '#Access to an undefined property PHPUnit\\Framework\\MockObject\\MockObject#' - '#Access to an undefined property PhpMyAdmin\\TwoFactor\:\:\$(backend|showSubmit|available|writable)#' - '#Call to an undefined method PhpMyAdmin\\Navigation\\Nodes\\Node\:\:getHiddenCount#' - - '#GisGeomTestCase::\$object#' - '#Undefined variable: \$array#' - '#Undefined variable: \$(cfg|db|table|url_query|text_dir|server|pmaThemeImage|action|sql_query|lang|export_type|err_url|collation_connection|filename_template|transform_key|cn|goto|partitionDetails|token_mismatch|auth_plugin|username|hostname|display_query|where_clause)#'#Others - '#Undefined variable: \$(dir|error_header|error_message)#'#error.inc.php @@ -33,7 +30,6 @@ parameters: - '#Variable \$(routine|mode|title|message|output|nbResultsetToDisplay|item) might not be defined#'# Rte - '#Variable \$time might not be defined#'#DatabaseInterface.php - '#Variable \$contentPath in isset\(\) always exists and is not nullable#'#DatabaseInterface.php - - '#Function mysqli_get_client_info invoked with 0 parameters, 1 required#'#libraries/classes/Dbi/DbiMysqli.php - '#Variable \$default_fk_check_value might not be defined#'#libraries/mult_submits.inc.php - '#Variable \$http_response_header in isset\(\) always exists and is not nullable#' - '#Variable \$(escape_class|escape_method|iconLinks|icons|where_clause|where_clause_html|condition_array|pos_next|pos_prev) might not be defined#' diff --git a/test/classes/Gis/GisGeomTestCase.php b/test/classes/Gis/GisGeomTestCase.php index 0690c7b0543f..31a9e0c08f41 100644 --- a/test/classes/Gis/GisGeomTestCase.php +++ b/test/classes/Gis/GisGeomTestCase.php @@ -18,6 +18,7 @@ */ abstract class GisGeomTestCase extends TestCase { + protected $object; /** * test generateParams method