Merge branch '2.3' into 2.7

* 2.3:
  [Finder] Fix recursive filter iterator
  Improve the structure of the Finder testsuite

Conflicts:
	src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php
	src/Symfony/Component/Finder/Tests/FinderTest.php
	src/Symfony/Component/Finder/Tests/Iterator/DateRangeFilterIteratorTest.php

Author: nicolas-grekas

Iterator/ExcludeDirectoryFilterIterator.php

@@ -16,8 +16,9 @@
  *
  * @author Fabien Potencier <[email protected]>
  */
-class ExcludeDirectoryFilterIterator extends FilterIterator
+class ExcludeDirectoryFilterIterator extends FilterIterator implements \RecursiveIterator
 {
+    private $isRecursive;
     private $patterns = array();
 
     /**
@@ -28,6 +29,7 @@ class ExcludeDirectoryFilterIterator extends FilterIterator
      */
     public function __construct(\Iterator $iterator, array $directories)
     {
+        $this->isRecursive = $iterator instanceof \RecursiveIterator;
         foreach ($directories as $directory) {
             $this->patterns[] = '#(^|/)'.preg_quote($directory, '#').'(/|$)#';
         }
@@ -52,4 +54,17 @@ public function accept()
 
         return true;
     }
+
+    public function hasChildren()
+    {
+        return $this->isRecursive && $this->getInnerIterator()->hasChildren();
+    }
+
+    public function getChildren()
+    {
+        $children = new self($this->getInnerIterator()->getChildren(), array());
+        $children->patterns = $this->patterns;
+
+        return $children;
+    }
 }

Iterator/FilterIterator.php

@@ -18,18 +18,8 @@
  *
  * @author Alex Bogomazov
  */
-abstract class FilterIterator extends \FilterIterator implements \RecursiveIterator
+abstract class FilterIterator extends \FilterIterator
 {
-    public function hasChildren()
-    {
-        return $this->getInnerIterator() instanceof \RecursiveIterator && $this->getInnerIterator()->hasChildren();
-    }
-
-    public function getChildren()
-    {
-        return $this->getInnerIterator()->getChildren();
-    }
-
     /**
      * This is a workaround for the problem with \FilterIterator leaving inner \FilesystemIterator in wrong state after
      * rewind in some cases.

Tests/BsdFinderTest.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests;
+
+use Symfony\Component\Finder\Adapter\BsdFindAdapter;
+
+class BsdFinderTest extends FinderTest
+{
+    protected function getAdapter()
+    {
+        $adapter = new BsdFindAdapter();
+
+        if (!$adapter->isSupported()) {
+            $this->markTestSkipped(get_class($adapter).' is not supported.');
+        }
+
+        return $adapter;
+    }
+}