fixed paths/notPaths regex for shell adapters

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

View File

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