Merge pull request #52 from ElectricMaxxx/master

avoid double bundle registration

Author: dantleech

.travis.yml

@@ -14,7 +14,7 @@ before_script:
   - composer self-update
   - composer require symfony/symfony:${SYMFONY_VERSION} --prefer-source
 
-script: phpunit --coverage-text
+script: vendor/bin/phpunit -c phpunit.xml.dist --coverage-text
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"

composer.json

@@ -18,7 +18,8 @@
         "doctrine/phpcr-bundle": "1.*",
         "doctrine/data-fixtures": "1.0.*",
         "jackalope/jackalope": "1.*",
-        "jackalope/jackalope-doctrine-dbal": "1.*"
+        "jackalope/jackalope-doctrine-dbal": "1.*",
+        "phpunit/phpunit": "3.7.*"
     },
     "autoload": {
         "psr-0": { "Symfony\\Cmf\\Component\\Testing": "src/" }

src/Symfony/Cmf/Component/Testing/HttpKernel/TestKernel.php

@@ -145,7 +145,7 @@ public function requireBundleSet($name)
                 ));
             }
 
-            $this->requiredBundles[] = new $bundle;
+            $this->requiredBundles[$bundle] = new $bundle;
         }
     }
 

tests/HttpKernel/TestKernelTest.php

@@ -43,6 +43,7 @@ public function bundleSetProvider()
         return array(
             array(array('default', 'phpcr_odm'), 6),
             array(array('default', 'doctrine_orm'), 5),
+            array(array('default', 'doctrine_orm', 'phpcr_odm'), 6),
         );
     }