瀏覽代碼

Use a FilterIterator rather than a modified IteratorIterator, simpler

Nils Adermann 12 年之前
父節點
當前提交
ecf4f42885
共有 1 個文件被更改,包括 3 次插入15 次删除
  1. 3 15
      src/Composer/Package/Archiver/ArchivableFilesFinder.php

+ 3 - 15
src/Composer/Package/Archiver/ArchivableFilesFinder.php

@@ -25,7 +25,7 @@ use Symfony\Component\Finder;
  *
  *
  * @author Nils Adermann <naderman@naderman.de>
  * @author Nils Adermann <naderman@naderman.de>
  */
  */
-class ArchivableFilesFinder extends \IteratorIterator
+class ArchivableFilesFinder extends \FilterIterator
 {
 {
     /**
     /**
      * @var Symfony\Component\Finder\Finder
      * @var Symfony\Component\Finder\Finder
@@ -70,20 +70,8 @@ class ArchivableFilesFinder extends \IteratorIterator
         parent::__construct($this->finder->getIterator());
         parent::__construct($this->finder->getIterator());
     }
     }
 
 
-    public function next()
+    public function accept()
     {
     {
-        do {
-            $this->getInnerIterator()->next();
-        } while ($this->getInnerIterator()->valid() && $this->getInnerIterator()->current()->isDir());
-    }
-
-    public function current()
-    {
-        return $this->getInnerIterator()->current();
-    }
-
-    public function valid()
-    {
-        return $this->getInnerIterator()->valid();
+        return !$this->getInnerIterator()->current()->isDir();
     }
     }
 }
 }