diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent empty value in isAbsolutePath, use rtrim in mirror

Browse Source
This commit is contained in:
stealth35 2012-06-13 14:39:17 +02:00
parent f5c99d2421
commit abab929516
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Symfony/Component/Filesystem/Filesystem.php
View File

@ -226,13 +226,8 @@ class Filesystem
$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($originDir, $flags), \RecursiveIteratorIterator::SELF_FIRST); $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($originDir, $flags), \RecursiveIteratorIterator::SELF_FIRST);
} }
if ('/' === substr($targetDir, -1) || '\\' === substr($targetDir, -1)) { $targetDir = rtrim($targetDir, '/\\');
$targetDir = substr($targetDir, 0, -1); $originDir = rtrim($originDir, '/\\');
}
if ('/' === substr($originDir, -1) || '\\' === substr($originDir, -1)) {
$originDir = substr($originDir, 0, -1);
}
foreach ($iterator as $file) { foreach ($iterator as $file) {
$target = str_replace($originDir, $targetDir, $file->getPathname()); $target = str_replace($originDir, $targetDir, $file->getPathname());
@ -258,10 +253,10 @@ class Filesystem
*/ */
public function isAbsolutePath($file) public function isAbsolutePath($file)
{ {
if ($file[0] == '/' || $file[0] == '\\' if (strspn($file, '/\\', 0, 1)
|| (strlen($file) > 3 && ctype_alpha($file[0]) || (strlen($file) > 3 && ctype_alpha($file[0])
&& $file[1] == ':' && substr($file, 1, 1) === ':'
&& ($file[2] == '\\' || $file[2] == '/') && (strspn($file, '/\\', 2, 1))
) )
|| null !== parse_url($file, PHP_URL_SCHEME) || null !== parse_url($file, PHP_URL_SCHEME)
) { ) {

4
src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
View File

@ -564,7 +564,9 @@ class FilesystemTest extends \PHPUnit_Framework_TestCase
array('c:\\\\var\\lib', true), array('c:\\\\var\\lib', true),
array('\\var\\lib', true), array('\\var\\lib', true),
array('var/lib', false), array('var/lib', false),
array('../var/lib', false) array('../var/lib', false),
array('', false),
array(null, false)
); );
} }