Merge branch '2.8' into 3.4

fabpot · fabpot · commit ef2f66b28fe0 · 2018-10-03T10:48:18.000+02:00
* 2.8:
  Remove redundant path check
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1186,7 +1186,7 @@ public function getRelativeUriForPath($path)
         }
 
         $sourceDirs = explode('/', isset($basePath[0]) && '/' === $basePath[0] ? substr($basePath, 1) : $basePath);
-        $targetDirs = explode('/', isset($path[0]) && '/' === $path[0] ? substr($path, 1) : $path);
+        $targetDirs = explode('/', substr($path, 1));
         array_pop($sourceDirs);
         $targetFile = array_pop($targetDirs);
 

Original file line number	Diff line number	Diff line change
`@@ -1186,7 +1186,7 @@ public function getRelativeUriForPath($path)`
`1186`	`1186`	`}`
`1187`	`1187`
`1188`	`1188`	`$sourceDirs = explode('/', isset($basePath[0]) && '/' === $basePath[0] ? substr($basePath, 1) : $basePath);`
`1189`		`- $targetDirs = explode('/', isset($path[0]) && '/' === $path[0] ? substr($path, 1) : $path);`
	`1189`	`+ $targetDirs = explode('/', substr($path, 1));`
`1190`	`1190`	`array_pop($sourceDirs);`
`1191`	`1191`	`$targetFile = array_pop($targetDirs);`
`1192`	`1192`