symfony
diff --git a/‎src/Symfony/Component/Finder/Iterator/FilecontentFilterIterator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Finder/Iterator/FilecontentFilterIterator.php
+5-1Lines changed: 5 additions & 1 deletion b/‎src/Symfony/Component/Finder/Iterator/FilecontentFilterIterator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Finder/Iterator/FilecontentFilterIterator.php
+5-1Lines changed: 5 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Finder/Tests/FinderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Finder/Tests/FinderTest.php
+20Lines changed: 20 additions & 0 deletions b/‎src/Symfony/Component/Finder/Tests/FinderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Finder/Tests/FinderTest.php
+20Lines changed: 20 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Finder/Tests/Iterator/FilecontentFilterIteratorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Finder/Tests/Iterator/FilecontentFilterIteratorTest.php
+48-2Lines changed: 48 additions & 2 deletions b/‎src/Symfony/Component/Finder/Tests/Iterator/FilecontentFilterIteratorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Finder/Tests/Iterator/FilecontentFilterIteratorTest.php
+48-2Lines changed: 48 additions & 2 deletions
@@ -30,7 +30,11 @@ public function accept()
             return true;
         }
 
-        $content = file_get_contents($this->getRealpath());
+        if ($this->isDir() || !$this->isReadable()) {
+            return false;
+        }
+
+        $content = @file_get_contents($filename = $this->getRealpath());
         if (false === $content) {
             throw new \RuntimeException(sprintf('Error reading file "%s".', $this->getRealpath()));
         }
 
@@ -372,4 +372,24 @@ public function getContainsTestData()
         );
     }
 
+    public function testContainsOnDirectory()
+    {
+        $finder = new Finder();
+        $finder->in(__DIR__)
+            ->directories()
+            ->name('Fixtures')
+            ->contains('abc');
+        $this->assertIterator(array(), $finder);
+    }
+
+    public function testNotContainsOnDirectory()
+    {
+        $finder = new Finder();
+        $finder->in(__DIR__)
+            ->directories()
+            ->name('Fixtures')
+            ->notContains('abc');
+        $this->assertIterator(array(), $finder);
+    }
+
 }
@@ -19,12 +19,34 @@ class FilecontentFilterIteratorTest extends IteratorTestCase
     public function testAccept()
     {
         $inner = new ContentInnerNameIterator(array('test.txt'));
-
         $iterator = new FilecontentFilterIterator($inner, array(), array());
-
         $this->assertIterator(array('test.txt'), $iterator);
     }
 
+    public function testDirectory()
+    {
+        $inner = new ContentInnerNameIterator(array('directory'));
+        $iterator = new FilecontentFilterIterator($inner, array('directory'), array());
+        $this->assertIterator(array(), $iterator);
+    }
+
+    public function testUnreadableFile()
+    {
+        $inner = new ContentInnerNameIterator(array('file r-'));
+        $iterator = new FilecontentFilterIterator($inner, array('file r-'), array());
+        $this->assertIterator(array(), $iterator);
+    }
+
+    /**
+     * @expectedException RuntimeException
+     */
+    public function testFileGetContents()
+    {
+        $inner = new ContentInnerNameIterator(array('file r+'));
+        $iterator = new FilecontentFilterIterator($inner, array('file r+'), array());
+        $array = iterator_to_array($iterator);
+    }
+
 }
 
 class ContentInnerNameIterator extends \ArrayIterator
@@ -38,4 +60,28 @@ public function getFilename()
     {
         return parent::current();
     }
+
+    public function isFile()
+    {
+        $name = parent::current();
+        return preg_match('/file/', $name);
+    }
+
+    public function isDir()
+    {
+        $name = parent::current();
+        return preg_match('/directory/', $name);
+    }
+
+    public function getRealpath()
+    {
+        return parent::current();
+    }
+
+    public function isReadable()
+    {
+        $name = parent::current();
+        return preg_match('/r\+/', $name);
+    }
+
 }
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,11 @@ public function accept()`
`30`	`30`	`return true;`
`31`	`31`	`}`
`32`	`32`
`33`		`- $content = file_get_contents($this->getRealpath());`
	`33`	`+ if ($this->isDir() \|\| !$this->isReadable()) {`
	`34`	`+ return false;`
	`35`	`+ }`
	`36`	`+`
	`37`	`+ $content = @file_get_contents($filename = $this->getRealpath());`
`34`	`38`	`if (false === $content) {`
`35`	`39`	`throw new \RuntimeException(sprintf('Error reading file "%s".', $this->getRealpath()));`
`36`	`40`	`}`