Use symfony/finder instead of phpunit/php-file-iterator

Author: sebastianbergmann

composer.json

@@ -22,11 +22,11 @@
     },
     "require": {
         "php": ">=5.3.3",
-        "phpunit/php-file-iterator": "~1.3",
         "phpunit/php-token-stream": "~1.3",
         "phpunit/php-text-template": "~1.2",
         "sebastian/environment": "~1.0",
-        "sebastian/version": "~1.0"
+        "sebastian/version": "~1.0",
+        "symfony/finder": "~2.3"
     },
     "require-dev": {
         "phpunit/phpunit": "~4",

src/CodeCoverage/Filter.php

@@ -8,6 +8,8 @@
  * file that was distributed with this source code.
  */
 
+use Symfony\Component\Finder\Finder;
+
 /**
  * Filter for blacklisting and whitelisting of code coverage information.
  *
@@ -44,10 +46,7 @@ class PHP_CodeCoverage_Filter
      */
     public function addDirectoryToBlacklist($directory, $suffix = '.php', $prefix = '')
     {
-        $facade = new File_Iterator_Facade;
-        $files  = $facade->getFilesAsArray($directory, $suffix, $prefix);
-
-        foreach ($files as $file) {
+        foreach ($this->findFiles($directory, $prefix, $suffix) as $file) {
             $this->addFileToBlacklist($file);
         }
     }
@@ -83,10 +82,7 @@ public function addFilesToBlacklist(array $files)
      */
     public function removeDirectoryFromBlacklist($directory, $suffix = '.php', $prefix = '')
     {
-        $facade = new File_Iterator_Facade;
-        $files  = $facade->getFilesAsArray($directory, $suffix, $prefix);
-
-        foreach ($files as $file) {
+        foreach ($this->findFiles($directory, $prefix, $suffix) as $file) {
             $this->removeFileFromBlacklist($file);
         }
     }
@@ -114,10 +110,7 @@ public function removeFileFromBlacklist($filename)
      */
     public function addDirectoryToWhitelist($directory, $suffix = '.php', $prefix = '')
     {
-        $facade = new File_Iterator_Facade;
-        $files  = $facade->getFilesAsArray($directory, $suffix, $prefix);
-
-        foreach ($files as $file) {
+        foreach ($this->findFiles($directory, $prefix, $suffix) as $file) {
             $this->addFileToWhitelist($file);
         }
     }
@@ -153,10 +146,7 @@ public function addFilesToWhitelist(array $files)
      */
     public function removeDirectoryFromWhitelist($directory, $suffix = '.php', $prefix = '')
     {
-        $facade = new File_Iterator_Facade;
-        $files  = $facade->getFilesAsArray($directory, $suffix, $prefix);
-
-        foreach ($files as $file) {
+        foreach ($this->findFiles($directory, $prefix, $suffix) as $file) {
             $this->removeFileFromWhitelist($file);
         }
     }
@@ -295,4 +285,32 @@ public function setWhitelistedFiles($whitelistedFiles)
     {
         $this->whitelistedFiles = $whitelistedFiles;
     }
+
+    /**
+     * @param  string $directory
+     * @param  string $prefix
+     * @param  string $suffix
+     * @return array
+     */
+    private function findFiles($directory, $prefix, $suffix)
+    {
+        $finder = new Finder;
+        $finder->in($directory);
+
+        if (!empty($prefix)) {
+            $finder->name($prefix . '*');
+        }
+
+        if (!empty($suffix)) {
+            $finder->name('*' . $suffix);
+        }
+
+        $files = array();
+
+        foreach ($finder as $file) {
+            $files[] = $file->getRealpath();
+        }
+
+        return $files;
+    }
 }