[Finder] Fix the BSD adapter

symfony · Nov 1, 2012 · b550677 · b550677
1 parent 2401274
commit b550677
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php b/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php
@@ -53,13 +53,7 @@ public function searchInDirectory($dir)
         }
 
         $command = Command::create();
-
-        $find = $command
-            ->ins('find')
-            ->add('find ')
-            ->arg($dir)
-            ->add('-noleaf') // -noleaf option is required for filesystems who doesn't follow '.' and '..' convention
-            ->add('-regextype posix-extended');
+        $find = $this->buildFindCommand($command, $dir);
 
         if ($this->followLinks) {
             $find->add('-follow');
@@ -129,6 +123,20 @@ public function isSupported()
         return $this->shell->testCommand('find');
     }
 
+    /**
+     * @param Command $command
+     *
+     * @return Command
+     */
+    protected function buildFindCommand(Command $command, $dir)
+    {
+        return $command
+            ->ins('find')
+            ->add('find ')
+            ->arg($dir)
+            ->add('-noleaf'); // the -noleaf option is required for filesystems that don't follow the '.' and '..' conventions
+    }
+
     /**
      * @param Command  $command
      * @param string[] $names

diff --git a/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php b/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php
@@ -48,4 +48,12 @@ protected function buildFormatSorting(Command $command, $format)
         $command->get('find')->add('-printf')->arg($format.' %h/%f\\n')
             ->add('| sort | cut')->arg('-d ')->arg('-f2-');
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function buildFindCommand(Command $command, $dir)
+    {
+      return parent::buildFindCommand($command, $dir)->add('-regextype posix-extended');
+    }
 }
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -202,7 +202,7 @@ public function testIgnoreDotFiles($adapter)
         $this->assertSame($finder, $finder->ignoreDotFiles(false)->ignoreVCS(false));
         $this->assertIterator($this->toAbsolute(array('.git', '.bar', '.foo', '.foo/.bar', 'foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', 'foo bar')), $finder->in(self::$tmpDir)->getIterator());
 
-        $finder = new Finder();
+        $finder = $this->buildFinder($adapter);
         $finder->ignoreDotFiles(false)->ignoreDotFiles(false)->ignoreVCS(false);
         $this->assertIterator($this->toAbsolute(array('.git', '.bar', '.foo', '.foo/.bar', 'foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', 'foo bar')), $finder->in(self::$tmpDir)->getIterator());