From ecf4f42885581988a3fda7b74e074f58d230afb2 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 26 Mar 2013 13:09:37 +0100 Subject: [PATCH] Use a FilterIterator rather than a modified IteratorIterator, simpler --- .../Package/Archiver/ArchivableFilesFinder.php | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/Composer/Package/Archiver/ArchivableFilesFinder.php b/src/Composer/Package/Archiver/ArchivableFilesFinder.php index f2c6aad5f..616b9540e 100644 --- a/src/Composer/Package/Archiver/ArchivableFilesFinder.php +++ b/src/Composer/Package/Archiver/ArchivableFilesFinder.php @@ -25,7 +25,7 @@ use Symfony\Component\Finder; * * @author Nils Adermann */ -class ArchivableFilesFinder extends \IteratorIterator +class ArchivableFilesFinder extends \FilterIterator { /** * @var Symfony\Component\Finder\Finder @@ -70,20 +70,8 @@ class ArchivableFilesFinder extends \IteratorIterator 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(); } }