Merge branch '3.4' into 4.1

* 3.4:
  Remove redundant path check
This commit is contained in:
Fabien Potencier 2018-10-03 10:48:45 +02:00
commit 7a2a4d94bf
1 changed files with 1 additions and 1 deletions

View File

@ -1059,7 +1059,7 @@ class Request
}
$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);