bug symfony#15282 [HttpFoundation] Behaviour change in PHP7 for substr (Nicofuma)

fabpot · fabpot · commit d6af4ad7bf29 · 2015-07-16T01:29:21.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [HttpFoundation] Behaviour change in PHP7 for substr | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT 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 Commits ------- ba6000b [HttpFoundation] Behaviour change in PHP7 for substr
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) {

Original file line number	Diff line number	Diff line change
`@@ -1790,7 +1790,8 @@ protected function preparePathInfo()`
`1790`	`1790`	`$requestUri = substr($requestUri, 0, $pos);`
`1791`	`1791`	`}`
`1792`	`1792`
`1793`		`- if (null !== $baseUrl && false === $pathInfo = substr($requestUri, strlen($baseUrl))) {`
	`1793`	`+ $pathInfo = substr($requestUri, strlen($baseUrl));`
	`1794`	`+ if (null !== $baseUrl && (false === $pathInfo \|\| '' === $pathInfo)) {`
`1794`	`1795`	`// If substr() returns false then PATH_INFO is set to an empty string`
`1795`	`1796`	`return '/';`
`1796`	`1797`	`} elseif (null === $baseUrl) {`