fixed paths/notPaths regex for shell adapters

jfsimon · fabpot · commit 83a61cfb2b1a · 2013-02-26T17:36:31.000+01:00
diff --git a/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php b/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php
@@ -210,7 +210,7 @@ private function buildPathsFiltering(Command $command, $dir, array $paths, $not
             // 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 @@ private function buildPathsFiltering(Command $command, $dir, array $paths, $not
                     ? ($expr->isCaseSensitive() ? '-regex' : '-iregex')
                     : ($expr->isCaseSensitive() ? '-path' : '-ipath')
                 )
-                ->arg($expr->prepend($dir.DIRECTORY_SEPARATOR)->renderPattern());
+                ->arg($expr->renderPattern());
         }
 
         $command->cmd(')');

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ private function buildPathsFiltering(Command $command, $dir, array $paths, $not`
`210`	`210`	`// Fixes 'not search' regex problems.`
`211`	`211`	`if ($expr->isRegex()) {`
`212`	`212`	`$regex = $expr->getRegex();`
`213`		`- $regex->prepend($regex->hasStartFlag() ? '' : '.*')->setEndJoker(!$regex->hasEndFlag());`
	`213`	`+ $regex->prepend($regex->hasStartFlag() ? $dir.DIRECTORY_SEPARATOR : '.*')->setEndJoker(!$regex->hasEndFlag());`
`214`	`214`	`} else {`
`215`	`215`	`$expr->prepend('')->append('');`
`216`	`216`	`}`
`@@ -221,7 +221,7 @@ private function buildPathsFiltering(Command $command, $dir, array $paths, $not`
`221`	`221`	`? ($expr->isCaseSensitive() ? '-regex' : '-iregex')`
`222`	`222`	`: ($expr->isCaseSensitive() ? '-path' : '-ipath')`
`223`	`223`	`)`
`224`		`- ->arg($expr->prepend($dir.DIRECTORY_SEPARATOR)->renderPattern());`
	`224`	`+ ->arg($expr->renderPattern());`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`$command->cmd(')');`