Merge branch '3.4' into 4.1

fabpot · fabpot · commit 7a2a4d94bfe9 · 2018-10-03T10:48:45.000+02:00
* 3.4:
  Remove redundant path check
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1059,7 +1059,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
`@@ -1059,7 +1059,7 @@ public function getRelativeUriForPath($path)`
`1059`	`1059`	`}`
`1060`	`1060`
`1061`	`1061`	`$sourceDirs = explode('/', isset($basePath[0]) && '/' === $basePath[0] ? substr($basePath, 1) : $basePath);`
`1062`		`- $targetDirs = explode('/', isset($path[0]) && '/' === $path[0] ? substr($path, 1) : $path);`
	`1062`	`+ $targetDirs = explode('/', substr($path, 1));`
`1063`	`1063`	`array_pop($sourceDirs);`
`1064`	`1064`	`$targetFile = array_pop($targetDirs);`
`1065`	`1065`