Merge branch '5.4' into 6.4

* 5.4:
  [HttpFoundation] Fix parsing pathinfo with no leading slash

Author: nicolas-grekas

Request.php

@@ -1933,9 +1933,8 @@ protected function preparePathInfo(): string
         }
 
         $pathInfo = substr($requestUri, \strlen($baseUrl));
-        if (false === $pathInfo || '' === $pathInfo) {
-            // If substr() returns false then PATH_INFO is set to an empty string
-            return '/';
+        if (false === $pathInfo || '' === $pathInfo || '/' !== $pathInfo[0]) {
+            return '/'.$pathInfo;
         }
 
         return $pathInfo;

Tests/RequestTest.php

@@ -1904,6 +1904,16 @@ public static function getBaseUrlData()
                 '',
                 '/foo/api/bar',
             ],
+            [
+                '/api/index.phpfoo',
+                [
+                    'SCRIPT_FILENAME' => '/var/www/api/index.php',
+                    'SCRIPT_NAME' => '/api/index.php',
+                    'PHP_SELF' => '/api/index.php',
+                ],
+                '/api/index.php',
+                '/foo',
+            ],
         ];
     }