Merge branch 'codeigniter4:develop' into fix/xml-export-zero-value

Author: gr8man

composer.json

@@ -17,7 +17,7 @@
         "psr/log": "^3.0"
     },
     "require-dev": {
-        "boundwize/structarmed": "0.14.6",
+        "boundwize/structarmed": "0.14.7",
         "codeigniter/phpstan-codeigniter": "^2.1",
         "fakerphp/faker": "^1.24",
         "kint-php/kint": "^6.1",

system/Common.php

@@ -185,13 +185,21 @@ function command(string $command)
             $params[$arg] = $value;
         }
 
+        $bufferLevel = ob_get_level();
+
         try {
             ob_start();
             service('commands')->run($command, $params);
 
+            if (ob_get_level() <= $bufferLevel) {
+                return false;
+            }
+
             return ob_get_contents();
         } finally {
-            ob_end_clean();
+            while (ob_get_level() > $bufferLevel) {
+                ob_end_clean();
+            }
         }
     }
 }

tests/system/CommonFunctionsSendTest.php

@@ -58,9 +58,7 @@ public function testRedirectResponseCookiesSent(): void
         // send it
         ob_start();
         $response->send();
-        if (ob_get_level() > 0) {
-            ob_end_clean();
-        }
+        ob_end_clean();
 
         // and what actually got sent?
         $this->assertHeaderEmitted('Set-Cookie: foo=onething;');

tests/system/HTTP/DownloadResponseTest.php

@@ -377,9 +377,7 @@ public function testRealOutput(): void
         // send it
         ob_start();
         $response->send();
-        if (ob_get_level() > 0) {
-            ob_end_clean();
-        }
+        ob_end_clean();
 
         // and what actually got sent?
         $this->assertHeaderEmitted('Content-Length: ' . filesize(__FILE__));

tests/system/HTTP/ResponseSendTest.php

@@ -67,9 +67,7 @@ public function testHeadersMissingDate(): void
         // send it
         ob_start();
         $response->send();
-        if (ob_get_level() > 0) {
-            ob_end_clean();
-        }
+        ob_end_clean();
 
         // and what actually got sent?
         $this->assertHeaderEmitted('Date:');
@@ -102,9 +100,7 @@ public function testHeadersWithCSP(): void
         // send it
         ob_start();
         $response->send();
-        if (ob_get_level() > 0) {
-            ob_end_clean();
-        }
+        ob_end_clean();
 
         // and what actually got sent?; test both ways
         $this->assertHeaderEmitted('Content-Security-Policy:');
@@ -140,9 +136,7 @@ public function testRedirectResponseCookies(): void
         // send it
         ob_start();
         $response->send();
-        if (ob_get_level() > 0) {
-            ob_end_clean();
-        }
+        ob_end_clean();
 
         // and what actually got sent?
         $this->assertHeaderEmitted('Set-Cookie: foo=bar;');
@@ -213,9 +207,7 @@ public function testHeaderOverride(): void
         header('Access-Control-Expose-Headers: Content-Encoding');
         header('Allow: GET, POST');
         $response->send();
-        if (ob_get_level() > 0) {
-            ob_end_clean();
-        }
+        ob_end_clean();
 
         // single header
         $this->assertHeaderEmitted('Vary: Accept-Encoding');

tests/system/Test/BootstrapFCPATHTest.php

@@ -100,7 +100,7 @@ private function fileContents(): string
         return $fileContents . 'echo FCPATH;' . PHP_EOL;
     }
 
-    private function readOutput(string $file): false|string
+    private function readOutput(string $file): string
     {
         ob_start();
         system('php -f ' . $file);

tests/system/Test/TestCaseEmissionsTest.php

@@ -62,9 +62,7 @@ public function testHeadersEmitted(): void
         // send it
         ob_start();
         $response->send();
-        if (ob_get_level() > 0) {
-            ob_end_clean();
-        }
+        ob_end_clean();
 
         // and what actually got sent?; test both ways
         $this->assertHeaderEmitted('Set-Cookie: foo=bar;');
@@ -90,9 +88,7 @@ public function testHeadersNotEmitted(): void
         // send it
         ob_start();
         $response->send(); // what really was sent
-        if (ob_get_level() > 0) {
-            ob_end_clean();
-        }
+        ob_end_clean();
 
         $this->assertHeaderNotEmitted('Set-Cookie: pop=corn', true);
     }