Update File_Iterator usage.

Author: sebastianbergmann

PHP/CodeCoverage/Filter.php

@@ -80,12 +80,13 @@ class PHP_CodeCoverage_Filter
      */
     public function addDirectoryToBlacklist($directory, $suffix = '.php', $prefix = '')
     {
-        $files = File_Iterator_Factory::getFileIterator(
+        $facade = new File_Iterator_Facade;
+        $files  = $facade->getFilesAsArray(
           $directory, $suffix, $prefix
         );
 
         foreach ($files as $file) {
-            $this->addFileToBlacklist($file->getPathName());
+            $this->addFileToBlacklist($file);
         }
     }
 
@@ -120,12 +121,13 @@ public function addFilesToBlacklist(array $files)
      */
     public function removeDirectoryFromBlacklist($directory, $suffix = '.php', $prefix = '')
     {
-        $files = File_Iterator_Factory::getFileIterator(
+        $facade = new File_Iterator_Facade;
+        $files  = $facade->getFilesAsArray(
           $directory, $suffix, $prefix
         );
 
         foreach ($files as $file) {
-            $this->removeFileFromBlacklist($file->getPathName());
+            $this->removeFileFromBlacklist($file);
         }
     }
 
@@ -152,12 +154,13 @@ public function removeFileFromBlacklist($filename)
      */
     public function addDirectoryToWhitelist($directory, $suffix = '.php', $prefix = '')
     {
-        $files = File_Iterator_Factory::getFileIterator(
+        $facade = new File_Iterator_Facade;
+        $files  = $facade->getFilesAsArray(
           $directory, $suffix, $prefix
         );
 
         foreach ($files as $file) {
-            $this->addFileToWhitelist($file->getPathName(), FALSE);
+            $this->addFileToWhitelist($file, FALSE);
         }
     }
 
@@ -195,12 +198,13 @@ public function addFilesToWhitelist(array $files)
      */
     public function removeDirectoryFromWhitelist($directory, $suffix = '.php', $prefix = '')
     {
-        $files = File_Iterator_Factory::getFileIterator(
+        $facade = new File_Iterator_Facade;
+        $files  = $facade->getFilesAsArray(
           $directory, $suffix, $prefix
         );
 
         foreach ($files as $file) {
-            $this->removeFileFromWhitelist($file->getPathName());
+            $this->removeFileFromWhitelist($file);
         }
     }
 

PHP/CodeCoverage/TextUI/Command.php

@@ -209,7 +209,8 @@ public static function main()
 
                 $coverage->stop();
             } else {
-                $files = File_Iterator_Factory::getFilesAsArray(
+                $facade = new File_Iterator_Facade;
+                $result = $facade->getFilesAsArray(
                   $arguments[0], '.cov'
                 );
 

Tests/PHP/CodeCoverage/FilterTest.php

@@ -154,12 +154,13 @@ public function testAddingADirectoryToTheBlacklistWorks()
      */
     public function testAddingFilesToTheBlacklistWorks()
     {
-        $this->filter->addFilesToBlacklist(
-          File_Iterator_Factory::getFilesAsArray(
-            TEST_FILES_PATH, $suffixes = '.php'
-          )
+        $facade = new File_Iterator_Facade;
+        $files  = $facade->getFilesAsArray(
+          TEST_FILES_PATH, $suffixes = '.php'
         );
 
+        $this->filter->addFilesToBlacklist($files);
+
         $blacklist = $this->filter->getBlacklist();
         sort($blacklist);
 
@@ -225,12 +226,13 @@ public function testAddingADirectoryToTheWhitelistWorks()
      */
     public function testAddingFilesToTheWhitelistWorks()
     {
-        $this->filter->addFilesToWhitelist(
-          File_Iterator_Factory::getFilesAsArray(
-            TEST_FILES_PATH, $suffixes = '.php'
-          )
+        $facade = new File_Iterator_Facade;
+        $files  = $facade->getFilesAsArray(
+          TEST_FILES_PATH, $suffixes = '.php'
         );
 
+        $this->filter->addFilesToWhitelist($files);
+
         $whitelist = $this->filter->getWhitelist();
         sort($whitelist);