merged branch havvg/hotfix/finder-spaces-in-dir (PR #7302)

fabpot · fabpot · commit b7a85e0093e1 · 2013-03-08T17:54:58.000+01:00
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #7302). Commits ------- 3f3cf0c fix xargs pipe to work with spaces in dir names Discussion ---------- [Finder] fix xargs pipe to work with spaces in dir names | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT .. otherwise grep fails: ```` grep: : No such file or directory grep: /Users/havvg/Web: No such file or directory grep: Development/symfony2/src/Symfony/Component/Finder/Tests/Fixtures/dolor.txt: No such file or directory ```
diff --git a/src/Symfony/Component/Finder/Adapter/BsdFindAdapter.php b/src/Symfony/Component/Finder/Adapter/BsdFindAdapter.php
@@ -92,10 +92,12 @@ protected function buildContentFiltering(Command $command, array $contains, $not
             // todo: avoid forking process for each $pattern by using multiple -e options
             $command
                 ->add('| grep -v \'^$\'')
-                ->add('| xargs grep -I')
+                ->add('| xargs -I{} grep -I')
                 ->add($expr->isCaseSensitive() ? null : '-i')
                 ->add($not ? '-L' : '-l')
-                ->add('-Ee')->arg($expr->renderPattern());
+                ->add('-Ee')->arg($expr->renderPattern())
+                ->add('{}')
+            ;
         }
     }
 }
diff --git a/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php b/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php
@@ -93,10 +93,12 @@ protected function buildContentFiltering(Command $command, array $contains, $not
 
             // todo: avoid forking process for each $pattern by using multiple -e options
             $command
-                ->add('| xargs -r grep -I')
+                ->add('| xargs -I{} -r grep -I')
                 ->add($expr->isCaseSensitive() ? null : '-i')
                 ->add($not ? '-L' : '-l')
-                ->add('-Ee')->arg($expr->renderPattern());
+                ->add('-Ee')->arg($expr->renderPattern())
+                ->add('{}')
+            ;
         }
     }
 }
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -707,6 +707,11 @@ public function getTestPathData()
                     'copy'.DIRECTORY_SEPARATOR.'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'C'.DIRECTORY_SEPARATOR.'abc.dat.copy',
                 )
             ),
+            array('/^with space\//', 'foobar',
+                array(
+                    'with space'.DIRECTORY_SEPARATOR.'foo.txt',
+                )
+            ),
         );
 
         return $this->buildTestData($tests);
diff --git a/src/Symfony/Component/Finder/Tests/Fixtures/with space/foo.txt b/src/Symfony/Component/Finder/Tests/Fixtures/with space/foo.txt

Original file line number	Diff line number	Diff line change
`@@ -92,10 +92,12 @@ protected function buildContentFiltering(Command $command, array $contains, $not`
`92`	`92`	`// todo: avoid forking process for each $pattern by using multiple -e options`
`93`	`93`	`$command`
`94`	`94`	`->add('\| grep -v \'^$\'')`
`95`		`- ->add('\| xargs grep -I')`
	`95`	`+ ->add('\| xargs -I{} grep -I')`
`96`	`96`	`->add($expr->isCaseSensitive() ? null : '-i')`
`97`	`97`	`->add($not ? '-L' : '-l')`
`98`		`- ->add('-Ee')->arg($expr->renderPattern());`
	`98`	`+ ->add('-Ee')->arg($expr->renderPattern())`
	`99`	`+ ->add('{}')`
	`100`	`+ ;`
`99`	`101`	`}`
`100`	`102`	`}`
`101`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,10 +93,12 @@ protected function buildContentFiltering(Command $command, array $contains, $not`
`93`	`93`
`94`	`94`	`// todo: avoid forking process for each $pattern by using multiple -e options`
`95`	`95`	`$command`
`96`		`- ->add('\| xargs -r grep -I')`
	`96`	`+ ->add('\| xargs -I{} -r grep -I')`
`97`	`97`	`->add($expr->isCaseSensitive() ? null : '-i')`
`98`	`98`	`->add($not ? '-L' : '-l')`
`99`		`- ->add('-Ee')->arg($expr->renderPattern());`
	`99`	`+ ->add('-Ee')->arg($expr->renderPattern())`
	`100`	`+ ->add('{}')`
	`101`	`+ ;`
`100`	`102`	`}`
`101`	`103`	`}`
`102`	`104`	`}`