[HttpFoundation] Behaviour change in PHP7 for substr

In PHP7 the behaviour of substr() changed. To resume: "Truncating an entire string should result in a string." See: https://bugs.php.net/bug.php?id=62922
symfony · Jul 15, 2015 · ba6000b · GromNaN · Jul 19, 2015 · ba6000b
1 parent 9962f36
commit ba6000b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1790,7 +1790,8 @@ protected function preparePathInfo()
             $requestUri = substr($requestUri, 0, $pos);
         }
 
-        if (null !== $baseUrl && false === $pathInfo = substr($requestUri, strlen($baseUrl))) {
+        $pathInfo = substr($requestUri, strlen($baseUrl));
+        if (null !== $baseUrl && (false === $pathInfo || '' === $pathInfo)) {
             // If substr() returns false then PATH_INFO is set to an empty string
             return '/';
         } elseif (null === $baseUrl) {