Merge branch '4.x' into 4.next

src/Core/functions.php

@@ -261,7 +261,12 @@ function deprecationWarning(string $message, int $stackFrame = 1): void
         $frame = $trace[$stackFrame];
         $frame += ['file' => '[internal]', 'line' => '??'];
 
-        $relative = str_replace(DIRECTORY_SEPARATOR, '/', substr($frame['file'], strlen(ROOT) + 1));
+        // Assuming we're installed in vendor/cakephp/cakephp/src/Core/functions.php
+        $root = dirname(__DIR__, 5);
+        if (defined('ROOT')) {
+            $root = ROOT;
+        }
+        $relative = str_replace(DIRECTORY_SEPARATOR, '/', substr($frame['file'], strlen($root) + 1));
         $patterns = (array)Configure::read('Error.ignoredDeprecationPaths');
         foreach ($patterns as $pattern) {
             $pattern = str_replace(DIRECTORY_SEPARATOR, '/', $pattern);

src/Http/composer.json

@@ -36,7 +36,7 @@
     },
     "provide": {
         "psr/http-client-implementation": "^1.0",
-        "psr/http-server-server-implementation": "^1.0",
+        "psr/http-server-implementation": "^1.0",
         "psr/http-server-middleware-implementation": "^1.0"
     },
     "suggest": {