Fix some coding standard issues on tests

MauricioFauth · MauricioFauth · commit b95aca909033 · 2023-03-26T12:54:23.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/test/classes/AbstractTestCase.php b/test/classes/AbstractTestCase.php
@@ -238,7 +238,7 @@ protected function callFunction(object|null $object, string $className, string $
      * @param mixed       $value        The parameters for the invocation
      * @phpstan-param class-string $className
      */
-    protected function setProperty($object, string $className, string $propertyName, mixed $value): void
+    protected function setProperty(object|null $object, string $className, string $propertyName, mixed $value): void
     {
         $class = new ReflectionClass($className);
         $property = $class->getProperty($propertyName);
diff --git a/test/classes/Advisory/AdvisorTest.php b/test/classes/Advisory/AdvisorTest.php
@@ -82,7 +82,7 @@ public function testAddRule(array $rule, array $expected, string|null $error): v
             $this->assertEquals([$error], $runResult['errors']);
         }
 
-        if ($runResult['fired'] === [] && $expected == []) {
+        if ($runResult['fired'] === [] && $expected === []) {
             return;
         }
 
diff --git a/test/classes/Config/DescriptionTest.php b/test/classes/Config/DescriptionTest.php
@@ -123,12 +123,12 @@ public function testAll(): void
 
         foreach ($cfg as $key => $value) {
             $this->assertGet($key);
-            if ($key == 'Servers') {
+            if ($key === 'Servers') {
                 $this->assertIsArray($value);
                 $this->assertIsArray($value[1]);
                 foreach ($value[1] as $item => $val) {
                     $this->assertGet($key . '/1/' . $item);
-                    if ($item != 'AllowDeny') {
+                    if ($item !== 'AllowDeny') {
                         continue;
                     }
 
diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php
@@ -223,14 +223,9 @@ public function testCheckClient(
         $_SERVER['HTTP_USER_AGENT'] = $agent;
         $this->object->checkClient();
         $this->assertEquals($os, $this->object->get('PMA_USR_OS'));
-        if ($os != null) {
-            $this->assertEquals(
-                $browser,
-                $this->object->get('PMA_USR_BROWSER_AGENT'),
-            );
-        }
+        $this->assertEquals($browser, $this->object->get('PMA_USR_BROWSER_AGENT'));
 
-        if ($version == null) {
+        if ($version === null) {
             return;
         }
 
diff --git a/test/classes/Plugins/Auth/AuthenticationHttpTest.php b/test/classes/Plugins/Auth/AuthenticationHttpTest.php
@@ -52,8 +52,7 @@ protected function tearDown(): void
         unset($this->object);
     }
 
-    /** @param mixed ...$headers */
-    public function doMockResponse(int $set_minimal, int $body_id, int $set_title, ...$headers): void
+    public function doMockResponse(int $set_minimal, int $body_id, int $set_title, mixed ...$headers): void
     {
         $mockHeader = $this->getMockBuilder(Header::class)
             ->disableOriginalConstructor()
diff --git a/test/classes/Stubs/DbiDummy.php b/test/classes/Stubs/DbiDummy.php
@@ -107,7 +107,7 @@ public function connect(string $user, string $password, Server $server): Connect
      *
      * @param string|DatabaseName $databaseName name of db to select
      */
-    public function selectDb($databaseName, Connection $connection): bool
+    public function selectDb(string|DatabaseName $databaseName, Connection $connection): bool
     {
         $databaseName = $databaseName instanceof DatabaseName
                         ? $databaseName->getName() : $databaseName;
@@ -220,7 +220,7 @@ public function realQuery(string $query, Connection $connection, int $options):
      *
      * @param string $query multi query statement to execute
      */
-    public function realMultiQuery(Connection $connection, $query): bool
+    public function realMultiQuery(Connection $connection, string $query): bool
     {
         return false;
     }
@@ -439,7 +439,7 @@ public function numFields(int $result): int
      *
      * @return string a MySQL escaped string
      */
-    public function escapeString(Connection $connection, $string): string
+    public function escapeString(Connection $connection, string $string): string
     {
         return addslashes($string);
     }
diff --git a/test/classes/Stubs/ResponseRenderer.php b/test/classes/Stubs/ResponseRenderer.php
@@ -67,7 +67,7 @@ public function addHTML(string $content): void
      * @param mixed|null                        $value Null, if passing an array in $json otherwise
      *                                                 it's a string value to the key
      */
-    public function addJSON(string|int|array $json, $value = null): void
+    public function addJSON(string|int|array $json, mixed $value = null): void
     {
         if (is_array($json)) {
             foreach ($json as $key => $value) {

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ protected function callFunction(object\|null $object, string $className, string $`
`238`	`238`	`* @param mixed $value The parameters for the invocation`
`239`	`239`	`* @phpstan-param class-string $className`
`240`	`240`	`*/`
`241`		`- protected function setProperty($object, string $className, string $propertyName, mixed $value): void`
	`241`	`+ protected function setProperty(object\|null $object, string $className, string $propertyName, mixed $value): void`
`242`	`242`	`{`
`243`	`243`	`$class = new ReflectionClass($className);`
`244`	`244`	`$property = $class->getProperty($propertyName);`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public function testAddRule(array $rule, array $expected, string\|null $error): v`
`82`	`82`	`$this->assertEquals([$error], $runResult['errors']);`
`83`	`83`	`}`
`84`	`84`
`85`		`- if ($runResult['fired'] === [] && $expected == []) {`
	`85`	`+ if ($runResult['fired'] === [] && $expected === []) {`
`86`	`86`	`return;`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,7 @@ protected function tearDown(): void`
`52`	`52`	`unset($this->object);`
`53`	`53`	`}`
`54`	`54`
`55`		`- /** @param mixed ...$headers */`
`56`		`- public function doMockResponse(int $set_minimal, int $body_id, int $set_title, ...$headers): void`
	`55`	`+ public function doMockResponse(int $set_minimal, int $body_id, int $set_title, mixed ...$headers): void`
`57`	`56`	`{`
`58`	`57`	`$mockHeader = $this->getMockBuilder(Header::class)`
`59`	`58`	`->disableOriginalConstructor()`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public function connect(string $user, string $password, Server $server): Connect`
`107`	`107`	`*`
`108`	`108`	`* @param string\|DatabaseName $databaseName name of db to select`
`109`	`109`	`*/`
`110`		`- public function selectDb($databaseName, Connection $connection): bool`
	`110`	`+ public function selectDb(string\|DatabaseName $databaseName, Connection $connection): bool`
`111`	`111`	`{`
`112`	`112`	`$databaseName = $databaseName instanceof DatabaseName`
`113`	`113`	`? $databaseName->getName() : $databaseName;`
`@@ -220,7 +220,7 @@ public function realQuery(string $query, Connection $connection, int $options):`
`220`	`220`	`*`
`221`	`221`	`* @param string $query multi query statement to execute`
`222`	`222`	`*/`
`223`		`- public function realMultiQuery(Connection $connection, $query): bool`
	`223`	`+ public function realMultiQuery(Connection $connection, string $query): bool`
`224`	`224`	`{`
`225`	`225`	`return false;`
`226`	`226`	`}`
`@@ -439,7 +439,7 @@ public function numFields(int $result): int`
`439`	`439`	`*`
`440`	`440`	`* @return string a MySQL escaped string`
`441`	`441`	`*/`
`442`		`- public function escapeString(Connection $connection, $string): string`
	`442`	`+ public function escapeString(Connection $connection, string $string): string`
`443`	`443`	`{`
`444`	`444`	`return addslashes($string);`
`445`	`445`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function addHTML(string $content): void`
`67`	`67`	`* @param mixed\|null $value Null, if passing an array in $json otherwise`
`68`	`68`	`* it's a string value to the key`
`69`	`69`	`*/`
`70`		`- public function addJSON(string\|int\|array $json, $value = null): void`
	`70`	`+ public function addJSON(string\|int\|array $json, mixed $value = null): void`
`71`	`71`	`{`
`72`	`72`	`if (is_array($json)) {`
`73`	`73`	`foreach ($json as $key => $value) {`