Merge pull request QafooLabs#46 from AdrianSchneider/fixTests

Directory no longer returning duplicate entries

Author: beberlei

src/main/QafooLabs/Refactoring/Domain/Model/Directory.php

@@ -19,6 +19,7 @@
 use RecursiveIteratorIterator;
 use SplFileInfo;
 use AppendIterator;
+use CallbackFilterIterator as StandardCallbackFilterIterator;
 
 /**
  * A directory in a project.
@@ -73,7 +74,10 @@ function ($file) use ($workingDirectory) {
             );
         }
 
-        return $iterator;
+        $files = iterator_to_array($iterator);
+        return new StandardCallbackFilterIterator($iterator, function($file, $filename) use ($files) {
+            return !in_array($filename, $files);
+        });
     }
 }
 

src/test/QafooLabs/Refactoring/Domain/Model/DirectoryTest.php

@@ -2,6 +2,9 @@
 
 namespace QafooLabs\Refactoring\Domain\Model;
 
+use org\bovigo\vfs\vfsStream;
+use org\bovigo\vfs\vfsStreamWrapper;
+
 class DirectoryTest extends \PHPUnit_Framework_TestCase
 {
     public function testFindAllPhpFilesRecursivly()
@@ -11,4 +14,33 @@ public function testFindAllPhpFilesRecursivly()
 
         $this->assertContainsOnly('QafooLabs\Refactoring\Domain\Model\File', $files);
     }
+
+    public function testRemovesDuplicates()
+    {
+        vfsStreamWrapper::register();
+
+        $structure = array(
+            'src' => array(
+                'src' => array(),
+                'Foo' => array(
+                    'src' => array(),
+                    'Foo' => array(),
+                    'Bar.php' => '<?php'
+                ),
+            )
+        );
+
+        vfsStream::create($structure, VfsStream::setup('project'));
+        $dir = VfsStream::url('project/src');
+
+        $directory = new Directory($dir, $dir);
+        $files = $directory->findAllPhpFilesRecursivly();
+
+        $foundFiles = array();
+        foreach ($files as $f => $file) {
+            $foundFiles[] = $f;
+        }
+
+        $this->assertEquals(array('vfs://project/src/Foo/Bar.php'), $foundFiles);
+    }
 }