From 83a61cfb2b1a0557e09ec74f3cf0a6ace56dfb45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= Date: Tue, 26 Feb 2013 09:35:03 +0100 Subject: [PATCH] fixed paths/notPaths regex for shell adapters --- src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php b/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php index 1e3117fd51..b0aef4d0cf 100644 --- a/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php +++ b/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php @@ -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(')');