From 1a2cef1ae14f74d499549a5d95e8a5bd41342c77 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Mon, 21 Oct 2019 09:57:06 -0300 Subject: [PATCH] Fix some coding standard issues detected by PHPCS MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: MaurĂ­cio Meneghini Fauth --- libraries/classes/Core.php | 2 +- libraries/classes/Database/Designer/Common.php | 3 +-- libraries/classes/Database/Designer/DesignerTable.php | 6 +++--- libraries/classes/Util.php | 4 ++-- test/classes/ConfigTest.php | 3 --- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php index 0d5a7ed634..bf5edde41a 100644 --- a/libraries/classes/Core.php +++ b/libraries/classes/Core.php @@ -1306,7 +1306,7 @@ class Core /** * Check that the sql query has a valid hmac signature * - * @param string $sqlQuery The sql query + * @param string $sqlQuery The sql query * @param string $signature The Signature to check * @return bool */ diff --git a/libraries/classes/Database/Designer/Common.php b/libraries/classes/Database/Designer/Common.php index 2fec226b36..29157c7974 100644 --- a/libraries/classes/Database/Designer/Common.php +++ b/libraries/classes/Database/Designer/Common.php @@ -53,7 +53,6 @@ class Common $tables = $GLOBALS['dbi']->getTablesFull($db, $table); } - foreach ($tables as $one_table) { $DF = $this->relation->getDisplayField($db, $one_table['TABLE_NAME']); $DF = is_string($DF) ? $DF : ''; @@ -199,7 +198,7 @@ class Common * Returns all indices * * @param DesignerTable[] $designerTables The designer tables - * @param bool $unique_only whether to include only unique ones + * @param bool $unique_only whether to include only unique ones * * @return array indices */ diff --git a/libraries/classes/Database/Designer/DesignerTable.php b/libraries/classes/Database/Designer/DesignerTable.php index bfdd48f04e..7cd14dc67b 100644 --- a/libraries/classes/Database/Designer/DesignerTable.php +++ b/libraries/classes/Database/Designer/DesignerTable.php @@ -24,9 +24,9 @@ class DesignerTable /** * Create a new DesignerTable * - * @param string $databaseName The database name - * @param string $tableName The table name - * @param string $tableEngine The table engine + * @param string $databaseName The database name + * @param string $tableName The table name + * @param string $tableEngine The table engine * @param string|null $displayField The display field if available */ public function __construct( diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php index 8816d03ce9..223e1c9b1e 100644 --- a/libraries/classes/Util.php +++ b/libraries/classes/Util.php @@ -3482,8 +3482,8 @@ class Util /** * Generates GIS data based on the string passed. * - * @param string $gis_string GIS string - * @param int $mysqlVersion The mysql version as int + * @param string $gis_string GIS string + * @param int $mysqlVersion The mysql version as int * * @return string GIS data enclosed in 'ST_GeomFromText' or 'GeomFromText' function */ diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php index a0335e8553..1ae79ec012 100644 --- a/test/classes/ConfigTest.php +++ b/test/classes/ConfigTest.php @@ -1084,7 +1084,6 @@ class ConfigTest extends PmaTestCase $this->object->get('PMA_VERSION_GIT_COMMITHASH') ); - file_put_contents('.git/HEAD','ref: refs/remotes/origin/master'); $this->object->checkGitRevision(); $this->assertEmpty( @@ -1148,7 +1147,6 @@ class ConfigTest extends PmaTestCase $this->object->get('PMA_VERSION_GIT_COMMITHASH') ); - file_put_contents('.git/HEAD','ref: refs/remotes/origin/master'); mkdir('.git/refs/remotes/origin', 0777, true); file_put_contents('.git/refs/remotes/origin/master','c1f2ff2eb0c3fda741f859913fd589379f4e4a8f'); @@ -1204,7 +1202,6 @@ class ConfigTest extends PmaTestCase $this->object->get('PMA_VERSION_GIT_COMMITHASH') ); - file_put_contents('.git/HEAD','ref: refs/remotes/origin/master'); $this->object->checkGitRevision(); $this->assertEmpty( -- 2.11.4.GIT