Fix some issues reported by Scrutinizer

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Feb 14, 2020 · 9d595f8 · 9d595f8
1 parent 8f0d7d3
commit 9d595f8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php
@@ -701,7 +701,6 @@ public function testGenerateFieldSpec()
             $query
         );
 
-        $type = 'INT';
         $default_type = 'NONE';
         $move_to = '-first';
         $query = Table::generateFieldSpec(
@@ -727,7 +726,6 @@ public function testGenerateFieldSpec()
             $query
         );
 
-        $type = 'INT';
         $default_type = 'NONE';
         $move_to = '-first';
         $query = Table::generateFieldSpec(
@@ -754,7 +752,6 @@ public function testGenerateFieldSpec()
             $query
         );
 
-        $type = 'INT';
         $default_type = 'NONE';
         $move_to = '-first';
         $query = Table::generateFieldSpec(
@@ -781,7 +778,6 @@ public function testGenerateFieldSpec()
             $query
         );
 
-        $type = 'INT';
         $default_type = 'NONE';
         $move_to = '-first';
         $query = Table::generateFieldSpec(
@@ -808,7 +804,6 @@ public function testGenerateFieldSpec()
             $query
         );
 
-        $type = 'INT';
         $default_type = 'NONE';
         $move_to = '-first';
         $query = Table::generateFieldSpec(
@@ -835,7 +830,6 @@ public function testGenerateFieldSpec()
             $query
         );
 
-        $type = 'INT';
         $default_type = 'NONE';
         $move_to = '-first';
         $query = Table::generateFieldSpec(

diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php
@@ -1032,7 +1032,7 @@ public function onNotSuccessfulTest(Throwable $t): void
             curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
 
             $result = curl_exec($ch);
-            if (curl_errno($ch)) {
+            if ($ch !== false && curl_errno($ch)) {
                 echo 'Error: ' . curl_error($ch) . PHP_EOL;
             }
             curl_close($ch);
@@ -1058,7 +1058,7 @@ public function onNotSuccessfulTest(Throwable $t): void
                 if (isset($proj->automation_session)) {
                     echo 'Test failed, get more information here: ' . $proj->automation_session->public_url . PHP_EOL;
                 }
-                if (curl_errno($ch)) {
+                if ($ch !== false && curl_errno($ch)) {
                     echo 'Error: ' . curl_error($ch) . PHP_EOL;
                 }
                 curl_close($ch);