From 24a3cd35406f2c8e9b57146857d01f1223af82ad Mon Sep 17 00:00:00 2001
From: Pavel Campr <pavel@campr.cz>
Date: Fri, 24 Feb 2012 01:10:57 +0100
Subject: [PATCH 1/2] Finder - allow sorting when searching in multiple
 directories

---
 src/Symfony/Component/Finder/Finder.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
index 826de17937..ee03832267 100644
--- a/src/Symfony/Component/Finder/Finder.php
+++ b/src/Symfony/Component/Finder/Finder.php
@@ -502,7 +502,8 @@ class Finder implements \IteratorAggregate
         }
 
         if ($this->sort) {
-            $iterator = new Iterator\SortableIterator($iterator, $this->sort);
+            $iterator_aggregate = new Iterator\SortableIterator($iterator, $this->sort);
+            $iterator = $iterator_aggregate->getIterator();
         }
 
         return $iterator;

From 15910a015b6355a21598d4b1dbe3d9f921253e7b Mon Sep 17 00:00:00 2001
From: Pavel Campr <pavel@campr.cz>
Date: Fri, 24 Feb 2012 09:04:00 +0100
Subject: [PATCH 2/2] fixed coding standards

---
 src/Symfony/Component/Finder/Finder.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
index ee03832267..d2feef080c 100644
--- a/src/Symfony/Component/Finder/Finder.php
+++ b/src/Symfony/Component/Finder/Finder.php
@@ -502,8 +502,8 @@ class Finder implements \IteratorAggregate
         }
 
         if ($this->sort) {
-            $iterator_aggregate = new Iterator\SortableIterator($iterator, $this->sort);
-            $iterator = $iterator_aggregate->getIterator();
+            $iteratorAggregate = new Iterator\SortableIterator($iterator, $this->sort);
+            $iterator = $iteratorAggregate->getIterator();
         }
 
         return $iterator;