Refs #531 - add iterator support to DirSet/FileSet

phingofficial · Jan 16, 2017 · a646caa · a646caa
1 parent 06580be
commit a646caa
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/classes/phing/types/AbstractFileSet.php b/classes/phing/types/AbstractFileSet.php
@@ -69,7 +69,7 @@
  * @see        ProjectComponent
  * @package    phing.types
  */
-class AbstractFileSet extends DataType implements SelectorContainer
+abstract class AbstractFileSet extends DataType implements SelectorContainer, IteratorAggregate
 {
 
     // These vars are public for cloning purposes
@@ -749,4 +749,6 @@ public function createDifferent()
 
         return $o;
     }
+
+    abstract public function getIterator();
 }
diff --git a/classes/phing/types/DirSet.php b/classes/phing/types/DirSet.php
@@ -28,7 +28,7 @@
  *
  * @package phing.types
  */
-class DirSet extends AbstractFileSet
+class DirSet extends AbstractFileSet implements IteratorAggregate
 {
 
     /**
@@ -52,4 +52,11 @@ public function __clone()
         }
     }
 
+    /**
+     * @return array
+     */
+    public function getIterator()
+    {
+        return $this->getDirectoryScanner($this->getProject())->getIncludedDirectories();
+    }
 }
diff --git a/classes/phing/types/FileSet.php b/classes/phing/types/FileSet.php
@@ -34,7 +34,7 @@
  * @author  Stefan Bodewig <stefan.bodewig@epost.de> (Ant)
  * @author  Magesh Umasankar (Ant)
  */
-class FileSet extends AbstractFileSet
+class FileSet extends AbstractFileSet implements IteratorAggregate
 {
     /**
      * Return a FileSet that has the same basedir and same patternsets as this one.
@@ -47,4 +47,13 @@ public function __clone()
             return new FileSet($this);
         }
     }
+
+    /**
+     * @return array
+     */
+    public function getIterator()
+    {
+        $ds = $this->getDirectoryScanner($this->getProject());
+        return $ds->getIncludedFiles() + $ds->getIncludedDirectories();
+    }
 }