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

fixed paths/notPaths regex for shell adapters

Browse Source
This commit is contained in:
Jean-François Simon 2013-02-26 09:35:03 +01:00 committed by Fabien Potencier
parent 32c5bf7b91
commit 83a61cfb2b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php
View File

@ -210,7 +210,7 @@ abstract class AbstractFindAdapter extends AbstractAdapter
// Fixes 'not search' regex problems. // Fixes 'not search' regex problems.
if ($expr->isRegex()) { if ($expr->isRegex()) {
$regex = $expr->getRegex(); $regex = $expr->getRegex();
$regex->prepend($regex->hasStartFlag() ? '' : '.*')->setEndJoker(!$regex->hasEndFlag()); $regex->prepend($regex->hasStartFlag() ? $dir.DIRECTORY_SEPARATOR : '.*')->setEndJoker(!$regex->hasEndFlag());
} else { } else {
$expr->prepend('*')->append('*'); $expr->prepend('*')->append('*');
} }
@ -221,7 +221,7 @@ abstract class AbstractFindAdapter extends AbstractAdapter
? ($expr->isCaseSensitive() ? '-regex' : '-iregex') ? ($expr->isCaseSensitive() ? '-regex' : '-iregex')
: ($expr->isCaseSensitive() ? '-path' : '-ipath') : ($expr->isCaseSensitive() ? '-path' : '-ipath')
) )
->arg($expr->prepend($dir.DIRECTORY_SEPARATOR)->renderPattern()); ->arg($expr->renderPattern());
} }
$command->cmd(')'); $command->cmd(')');