From eaaef8eda5f34ff70ef3ff7cb7c4d8856a313ed9 Mon Sep 17 00:00:00 2001
From: Toni Uebernickel <tuebernickel@gmail.com>
Date: Tue, 30 Oct 2012 15:07:34 +0100
Subject: [PATCH] fix StreamWrapper not containing filesystems

---
 FilesystemMap.php                      | 13 +++++++++++--
 KnpGaufretteBundle.php                 | 15 +++++++++++----
 Tests/Functional/ConfigurationTest.php | 11 ++++++++---
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/FilesystemMap.php b/FilesystemMap.php
index d64117d..e43791f 100644
--- a/FilesystemMap.php
+++ b/FilesystemMap.php
@@ -6,7 +6,7 @@ namespace Knp\Bundle\GaufretteBundle;
  * Holds references to all declared filesystems
  * and allows to access them through their name
  */
-class FilesystemMap
+class FilesystemMap implements \IteratorAggregate
 {
     /**
      * Map of filesystems indexed by their name
@@ -26,9 +26,13 @@ class FilesystemMap
     }
 
     /**
+     * Retrieves a filesystem by its name.
+     *
      * @param string $name name of a filesystem
+     *
+     * @return \Gaufrette\Filesystem
+     *
      * @throw \InvalidArgumentException if the filesystem does not exist
-     * @return Filesystem
      */
     public function get($name)
     {
@@ -38,4 +42,9 @@ class FilesystemMap
 
         return $this->map[$name];
     }
+
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->map);
+    }
 }
diff --git a/KnpGaufretteBundle.php b/KnpGaufretteBundle.php
index 37baba3..b0306ee 100644
--- a/KnpGaufretteBundle.php
+++ b/KnpGaufretteBundle.php
@@ -27,12 +27,19 @@ class KnpGaufretteBundle extends Bundle
 
         $fileSystems = $this->container->getParameter('knp_gaufrette.stream_wrapper.filesystems');
 
+        /*
+         * If there are no filesystems configured to be wrapped,
+         * all filesystems within the map will be wrapped.
+         */
         if (empty($fileSystems)) {
             $fileSystems = $this->container->get('knp_gaufrette.filesystem_map');
-        }
-
-        foreach ($fileSystems as $domain => $fileSystem) {
-            $wrapperFsMap->set($domain, $this->container->get('knp_gaufrette.filesystem_map')->get($fileSystem));
+            foreach ($fileSystems as $domain => $fileSystem) {
+                $wrapperFsMap->set($domain, $fileSystem);
+            }
+        } else {
+            foreach ($fileSystems as $domain => $fileSystem) {
+                $wrapperFsMap->set($domain, $this->container->get('knp_gaufrette.filesystem_map')->get($fileSystem));
+            }
         }
     }
 }
diff --git a/Tests/Functional/ConfigurationTest.php b/Tests/Functional/ConfigurationTest.php
index e2f628d..47602c3 100644
--- a/Tests/Functional/ConfigurationTest.php
+++ b/Tests/Functional/ConfigurationTest.php
@@ -113,10 +113,15 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('gaufrette', $container->getParameter('knp_gaufrette.stream_wrapper.protocol'));
 
         $wrapperFsMap = StreamWrapper::getFilesystemMap();
-        $fileSystems = $this->kernel->getContainer()->get('knp_gaufrette.filesystem_map');
 
-        foreach($fileSystems as $fs) {
-            $this->assertTrue($wrapperFsMap->has($fs));
+        $expectedDomains = array(
+            'foo',
+            'cache',
+            'ftp',
+        );
+
+        foreach ($expectedDomains as $eachExpectedDomain) {
+            $this->assertTrue($wrapperFsMap->has($eachExpectedDomain));
         }
     }