Merge remote-tracking branch 'upstream/develop' into 4.3

Author: kenjis

admin/framework/composer.json

@@ -17,7 +17,7 @@
         "kint-php/kint": "^4.2",
         "codeigniter/coding-standard": "^1.5",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "~3.12.0",
+        "friendsofphp/php-cs-fixer": "~3.13.0",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",
         "phpunit/phpunit": "^9.1",
@@ -38,6 +38,7 @@
         "ext-redis": "If you use Cache class RedisHandler",
         "ext-dom": "If you use TestResponse",
         "ext-libxml": "If you use TestResponse",
+        "ext-xdebug": "If you use CIUnitTestCase::assertHeaderEmitted()",
         "ext-fileinfo": "Improves mime type detection for files",
         "ext-readline": "Improves CLI::input() usability"
     },

composer.json

@@ -17,7 +17,7 @@
         "kint-php/kint": "^4.2",
         "codeigniter/coding-standard": "^1.5",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "~3.12.0",
+        "friendsofphp/php-cs-fixer": "~3.13.0",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",
         "nexusphp/tachycardia": "^1.0",
@@ -44,6 +44,7 @@
         "ext-redis": "If you use Cache class RedisHandler",
         "ext-dom": "If you use TestResponse",
         "ext-libxml": "If you use TestResponse",
+        "ext-xdebug": "If you use CIUnitTestCase::assertHeaderEmitted()",
         "ext-fileinfo": "Improves mime type detection for files",
         "ext-readline": "Improves CLI::input() usability"
     },

system/Debug/Toolbar.php

@@ -400,6 +400,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
             $kintScript         = @Kint::dump('');
             Kint::$mode_default = $oldKintMode;
             $kintScript         = substr($kintScript, 0, strpos($kintScript, '</style>') + 8);
+            $kintScript         = ($kintScript === '0') ? '' : $kintScript;
 
             $script = PHP_EOL
                 . '<script ' . csp_script_nonce() . ' id="debugbar_loader" '

system/Test/CIUnitTestCase.php

@@ -405,60 +405,31 @@ public function assertEventTriggered(string $eventName): bool
     }
 
     /**
-     * Hooks into xdebug's headers capture, looking for a specific header
-     * emitted
+     * Hooks into xdebug's headers capture, looking for presence of
+     * a specific header emitted.
      *
      * @param string $header The leading portion of the header we are looking for
-     *
-     * @throws Exception
      */
     public function assertHeaderEmitted(string $header, bool $ignoreCase = false): void
     {
-        $found = false;
-
-        if (! function_exists('xdebug_get_headers')) {
-            $this->markTestSkipped('XDebug not found.');
-        }
-
-        foreach (xdebug_get_headers() as $emitted) {
-            $found = $ignoreCase ?
-                    (stripos($emitted, $header) === 0) :
-                    (strpos($emitted, $header) === 0);
-            if ($found) {
-                break;
-            }
-        }
-
-        $this->assertTrue($found, "Didn't find header for {$header}");
+        $this->assertNotNull(
+            $this->getHeaderEmitted($header, $ignoreCase, __METHOD__),
+            "Didn't find header for {$header}"
+        );
     }
 
     /**
-     * Hooks into xdebug's headers capture, looking for a specific header
-     * emitted
+     * Hooks into xdebug's headers capture, looking for absence of
+     * a specific header emitted.
      *
      * @param string $header The leading portion of the header we don't want to find
-     *
-     * @throws Exception
      */
     public function assertHeaderNotEmitted(string $header, bool $ignoreCase = false): void
     {
-        $found = false;
-
-        if (! function_exists('xdebug_get_headers')) {
-            $this->markTestSkipped('XDebug not found.');
-        }
-
-        foreach (xdebug_get_headers() as $emitted) {
-            $found = $ignoreCase ?
-                    (stripos($emitted, $header) === 0) :
-                    (strpos($emitted, $header) === 0);
-            if ($found) {
-                break;
-            }
-        }
-
-        $success = ! $found;
-        $this->assertTrue($success, "Found header for {$header}");
+        $this->assertNull(
+            $this->getHeaderEmitted($header, $ignoreCase, __METHOD__),
+            "Found header for {$header}"
+        );
     }
 
     /**
@@ -533,23 +504,20 @@ protected function createApplication()
 
     /**
      * Return first matching emitted header.
-     *
-     * @param string $header Identifier of the header of interest
-     *
-     * @return string|null The value of the header found, null if not found
      */
-    protected function getHeaderEmitted(string $header, bool $ignoreCase = false): ?string
+    protected function getHeaderEmitted(string $header, bool $ignoreCase = false, string $method = __METHOD__): ?string
     {
         if (! function_exists('xdebug_get_headers')) {
-            $this->markTestSkipped('XDebug not found.');
+            $this->markTestSkipped($method . '() requires xdebug.');
         }
 
-        foreach (xdebug_get_headers() as $emitted) {
-            $found = $ignoreCase ?
-                    (stripos($emitted, $header) === 0) :
-                    (strpos($emitted, $header) === 0);
+        foreach (xdebug_get_headers() as $emittedHeader) {
+            $found = $ignoreCase
+                ? (stripos($emittedHeader, $header) === 0)
+                : (strpos($emittedHeader, $header) === 0);
+
             if ($found) {
-                return $emitted;
+                return $emittedHeader;
             }
         }