minor #28683 Remove redundant path check (colinodell)

fabpot · fabpot · commit 55e3db6ac5bc · 2018-10-03T09:48:08.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- Remove redundant path check | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | maybe? | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commit 0ec852d79fb introduced this new method. As you can see, the code I'm removing always evaluates to `true` thanks to the first `if` statement in this method: ![image](https://user-images.githubusercontent.com/202034/46349212-70968a80-c61f-11e8-8360-7d6abc4d7414.png) (I'm not sure if redundant code technically counts as a "bug", so I've assumed "yes it does" and targeted 2.8.) Commits ------- 10795cf096 Remove redundant path check
diff --git a/Request.php b/Request.php
@@ -1120,7 +1120,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
`@@ -1120,7 +1120,7 @@ public function getRelativeUriForPath($path)`
`1120`	`1120`	`}`
`1121`	`1121`
`1122`	`1122`	`$sourceDirs = explode('/', isset($basePath[0]) && '/' === $basePath[0] ? substr($basePath, 1) : $basePath);`
`1123`		`- $targetDirs = explode('/', isset($path[0]) && '/' === $path[0] ? substr($path, 1) : $path);`
	`1123`	`+ $targetDirs = explode('/', substr($path, 1));`
`1124`	`1124`	`array_pop($sourceDirs);`
`1125`	`1125`	`$targetFile = array_pop($targetDirs);`
`1126`	`1126`