symfony
diff --git a/‎src/Symfony/Component/Console/Helper/DialogHelper.php‎
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Console/Helper/DialogHelper.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Compiler/ExtensionCompilerPass.php‎
Lines changed: 28 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Compiler/ExtensionCompilerPass.php‎
Lines changed: 28 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php‎
Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ExtensionCompilerPassTest.php‎
Lines changed: 46 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ExtensionCompilerPassTest.php‎
Lines changed: 46 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Finder/Adapter/PhpAdapter.php‎
Lines changed: 11 additions & 12 deletions b/‎src/Symfony/Component/Finder/Adapter/PhpAdapter.php‎
Lines changed: 11 additions & 12 deletions
diff --git a/‎src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php‎
Lines changed: 16 additions & 1 deletion b/‎src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php‎
Lines changed: 16 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Finder/Tests/BsdFinderTest.php‎
Lines changed: 28 additions & 0 deletions b/‎src/Symfony/Component/Finder/Tests/BsdFinderTest.php‎
Lines changed: 28 additions & 0 deletions
@@ -399,7 +399,7 @@ public function setInputStream($stream)
     /**
      * Returns the helper's input stream.
      *
-     * @return string
+     * @return resource|null The input stream or null if the default STDIN is used
      */
     public function getInputStream()
     {
 
@@ -0,0 +1,28 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * A pass to automatically process extensions if they implement 
+ * CompilerPassInterface.
+ *
+ * @author Wouter J <wouter@wouterj.nl>
+ */
+class ExtensionCompilerPass implements CompilerPassInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        foreach ($container->getExtensions() as $extension) {
+            if (!$extension instanceof CompilerPassInterface) {
+                continue;
+            }
+
+            $extension->process($container);
+        }
+    }
+}
@@ -45,6 +45,7 @@ public function __construct()
         $this->mergePass = new MergeExtensionConfigurationPass();
 
         $this->optimizationPasses = array(
+            new ExtensionCompilerPass(),
             new ResolveDefinitionTemplatesPass(),
             new DecoratorServicePass(),
             new ResolveParameterPlaceHoldersPass(),
 
@@ -0,0 +1,46 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\ExtensionCompilerPass;
+
+/**
+ * @author Wouter J <wouter@wouterj.nl>
+ */
+class ExtensionCompilerPassTest extends \PHPUnit_Framework_TestCase
+{
+    private $container;
+    private $pass;
+
+    public function setUp()
+    {
+        $this->container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
+        $this->pass = new ExtensionCompilerPass();
+    }
+
+    public function testProcess()
+    {
+        $extension1 = $this->createExtensionMock(true);
+        $extension1->expects($this->once())->method('process');
+        $extension2 = $this->createExtensionMock(false);
+        $extension3 = $this->createExtensionMock(false);
+        $extension4 = $this->createExtensionMock(true);
+        $extension4->expects($this->once())->method('process');
+
+        $this->container->expects($this->any())
+            ->method('getExtensions')
+            ->will($this->returnValue(array($extension1, $extension2, $extension3, $extension4)))
+        ;
+
+        $this->pass->process($this->container);
+    }
+
+    private function createExtensionMock($hasInlineCompile)
+    {
+        return $this->getMock('Symfony\Component\DependencyInjection\\'.(
+            $hasInlineCompile
+            ? 'Compiler\CompilerPassInterface'
+            : 'Extension\ExtensionInterface'
+        ));
+    }
+}
@@ -31,10 +31,13 @@ public function searchInDirectory($dir)
             $flags |= \RecursiveDirectoryIterator::FOLLOW_SYMLINKS;
         }
 
-        $iterator = new \RecursiveIteratorIterator(
-            new Iterator\RecursiveDirectoryIterator($dir, $flags, $this->ignoreUnreadableDirs),
-            \RecursiveIteratorIterator::SELF_FIRST
-        );
+        $iterator = new Iterator\RecursiveDirectoryIterator($dir, $flags, $this->ignoreUnreadableDirs);
+
+        if ($this->exclude) {
+            $iterator = new Iterator\ExcludeDirectoryFilterIterator($iterator, $this->exclude);
+        }
+
+        $iterator = new \RecursiveIteratorIterator($iterator, \RecursiveIteratorIterator::SELF_FIRST);
 
         if ($this->minDepth > 0 || $this->maxDepth < PHP_INT_MAX) {
             $iterator = new Iterator\DepthRangeFilterIterator($iterator, $this->minDepth, $this->maxDepth);
@@ -44,10 +47,6 @@ public function searchInDirectory($dir)
             $iterator = new Iterator\FileTypeFilterIterator($iterator, $this->mode);
         }
 
-        if ($this->exclude) {
-            $iterator = new Iterator\ExcludeDirectoryFilterIterator($iterator, $this->exclu
6367
de);
-        }
-
         if ($this->names || $this->notNames) {
             $iterator = new Iterator\FilenameFilterIterator($iterator, $this->names, $this->notNames);
         }
@@ -68,15 +67,15 @@ public function searchInDirectory($dir)
             $iterator = new Iterator\CustomFilterIterator($iterator, $this->filters);
         }
 
+        if ($this->paths || $this->notPaths) {
+            $iterator = new Iterator\PathFilterIterator($iterator, $this->paths, $this->notPaths);
+        }
+
         if ($this->sort) {
             $iteratorAggregate = new Iterator\SortableIterator($iterator, $this->sort);
             $iterator = $iteratorAggregate->getIterator();
         }
 
-        if ($this->paths || $this->notPaths) {
-            $iterator = new Iterator\PathFilterIterator($iterator, $this->paths, $this->notPaths);
-        }
-
         return $iterator;
     }
 
 
@@ -16,8 +16,9 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-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;
+    }
 }
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * 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;
+    }
+}
Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ public function setInputStream($stream)`
`399`	`399`	`/**`
`400`	`400`	`* Returns the helper's input stream.`
`401`	`401`	`*`
`402`		`- * @return string`
	`402`	`+ * @return resource\|null The input stream or null if the default STDIN is used`
`403`	`403`	`*/`
`404`	`404`	`public function getInputStream()`
`405`	`405`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,9 @@`
`16`	`16`	`*`
`17`	`17`	`* @author Fabien Potencier <fabien@symfony.com>`
`18`	`18`	`*/`
`19`		`-class ExcludeDirectoryFilterIterator extends FilterIterator`
	`19`	`+class ExcludeDirectoryFilterIterator extends FilterIterator implements \RecursiveIterator`
`20`	`20`	`{`
	`21`	`+ private $isRecursive;`
`21`	`22`	`private $patterns = array();`
`22`	`23`
`23`	`24`	`/**`
`@@ -28,6 +29,7 @@ class ExcludeDirectoryFilterIterator extends FilterIterator`
`28`	`29`	`*/`
`29`	`30`	`public function __construct(\Iterator $iterator, array $directories)`
`30`	`31`	`{`
	`32`	`+ $this->isRecursive = $iterator instanceof \RecursiveIterator;`
`31`	`33`	`foreach ($directories as $directory) {`
`32`	`34`	`$this->patterns[] = '#(^\|/)'.preg_quote($directory, '#').'(/\|$)#';`
`33`	`35`	`}`
`@@ -52,4 +54,17 @@ public function accept()`
`52`	`54`
`53`	`55`	`return true;`
`54`	`56`	`}`
	`57`	`+`
	`58`	`+ public function hasChildren()`
	`59`	`+ {`
	`60`	`+ return $this->isRecursive && $this->getInnerIterator()->hasChildren();`
	`61`	`+ }`
	`62`	`+`
	`63`	`+ public function getChildren()`
	`64`	`+ {`
	`65`	`+ $children = new self($this->getInnerIterator()->getChildren(), array());`
	`66`	`+ $children->patterns = $this->patterns;`
	`67`	`+`
	`68`	`+ return $children;`
	`69`	`+ }`
`55`	`70`	`}`