Merge pull request phpmyadmin#19055 from kamil-tekiela/curl_close

Remove curl_close from TestBase
liviuconcioiu · Mar 15, 2024 · 3ed4124 · 3ed4124
2 parents 4d691ea + 4c39978
commit 3ed4124
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -15140,6 +15140,11 @@ parameters:
 			count: 2
 			path: tests/end-to-end/TestBase.php
 
+		-
+			message: "#^Only booleans are allowed in a negated boolean, int given\\.$#"
+			count: 2
+			path: tests/end-to-end/TestBase.php
+
 		-
 			message: "#^Only booleans are allowed in a negated boolean, int\\|false given\\.$#"
 			count: 1
@@ -15155,11 +15160,6 @@ parameters:
 			count: 1
 			path: tests/end-to-end/TestBase.php
 
-		-
-			message: "#^Only booleans are allowed in an if condition, int given\\.$#"
-			count: 2
-			path: tests/end-to-end/TestBase.php
-
 		-
 			message: "#^Only booleans are allowed in an if condition, string\\|false given\\.$#"
 			count: 2

diff --git a/tests/end-to-end/TestBase.php b/tests/end-to-end/TestBase.php
@@ -22,7 +22,6 @@
 use Throwable;
 
 use function bin2hex;
-use function curl_close;
 use function curl_errno;
 use function curl_error;
 use function curl_exec;
@@ -1139,11 +1138,11 @@ private function markTestAs(string $status, string $message): void
         curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
 
         curl_exec($ch);
-        if (curl_errno($ch)) {
-            echo 'Error: ' . curl_error($ch) . "\n";
+        if (! curl_errno($ch)) {
+            return;
         }
 
-        curl_close($ch);
+        echo 'Error: ' . curl_error($ch) . "\n";
     }
 
     private function getErrorVideoUrl(): void
@@ -1173,11 +1172,11 @@ private function getErrorVideoUrl(): void
             echo 'Test failed, get more information here: ' . $proj->automation_session->public_url . "\n";
         }
 
-        if (curl_errno($ch)) {
-            echo 'Error: ' . curl_error($ch) . "\n";
+        if (! curl_errno($ch)) {
+            return;
         }
 
-        curl_close($ch);
+        echo 'Error: ' . curl_error($ch) . "\n";
     }
 
     /**