Merge pull request pdepend#329 from KacerCZ/iterator-directory-fix

Fix Iterator so it will not return directories

src/main/php/PDepend/Input/Iterator.php

@@ -87,6 +87,9 @@ public function __construct(\Iterator $iterator, Filter $filter, $rootPath = nul
      */
     public function accept()
     {
+        if ($this->getInnerIterator()->current()->isDir()) {
+            return false;
+        }
         return $this->filter->accept($this->getLocalPath(), $this->getFullPath());
     }
 

src/test/php/PDepend/Input/IteratorTest.php

@@ -81,6 +81,32 @@ public function testIteratorWithMultipleFileExtensions()
         $this->assertEquals($expected, $actual);
     }
 
+    /**
+     * Tests that iterator returns only files.
+     * 
+     * @return void
+     */
+    public function testIteratorReturnsOnlyFiles()
+    {
+        $directory=$this->createCodeResourceUriForTest();
+        $pattern = $directory . DIRECTORY_SEPARATOR . 'Ignored';
+
+        $files  = new Iterator(
+            new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($directory)),
+            new ExcludePathFilter(array($pattern))
+        );
+
+        $actual = array();
+        foreach ($files as $file) {
+            $actual[] = $file->getFilename();
+        }
+        sort($actual);
+
+        $expected = array('file.php', 'file_process.php');
+
+        $this->assertEquals($expected,$actual);
+    }
+
     /**
      * testIteratorPassesLocalPathToFilterWhenRootIsPresent
      *

src/test/resources/files/Input/Iterator/testIteratorReturnsOnlyFiles/Ignored/file_ignore.php

@@ -0,0 +1,3 @@
+<?php
+
+// Empty file

src/test/resources/files/Input/Iterator/testIteratorReturnsOnlyFiles/Processed/file_process.php

@@ -0,0 +1,3 @@
+<?php
+
+// Empty file

src/test/resources/files/Input/Iterator/testIteratorReturnsOnlyFiles/file.php

@@ -0,0 +1,3 @@
+<?php
+
+// Empty file