Merge pull request #47 from ElectricMaxxx/master

add sonata_admin_orm and sonata_admin_phpcr bundle sets

Author: wouterj

CHANGELOG.md

@@ -4,6 +4,7 @@ Changelog
 1.1.0-RC2
 ---------
 
+* **2014-04-24**: add bundle sets: sonata_admin_orm and sonata_admin_phpcr
 * **2014-04-11**: drop Symfony 2.2 compatibility
 
 1.1.0-RC1

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

@@ -37,28 +37,48 @@ abstract class TestKernel extends Kernel
     public function init()
     {
         $this->registerBundleSet('default', array(
-            '\Symfony\Bundle\FrameworkBundle\FrameworkBundle',
-            '\Symfony\Bundle\SecurityBundle\SecurityBundle',
-            '\Symfony\Bundle\TwigBundle\TwigBundle',
-            '\Symfony\Bundle\MonologBundle\MonologBundle',
+            'Symfony\Bundle\FrameworkBundle\FrameworkBundle',
+            'Symfony\Bundle\SecurityBundle\SecurityBundle',
+            'Symfony\Bundle\TwigBundle\TwigBundle',
+            'Symfony\Bundle\MonologBundle\MonologBundle',
         ));
 
         $this->registerBundleSet('phpcr_odm', array(
-            '\Doctrine\Bundle\DoctrineBundle\DoctrineBundle',
-            '\Doctrine\Bundle\PHPCRBundle\DoctrinePHPCRBundle',
+            'Doctrine\Bundle\DoctrineBundle\DoctrineBundle',
+            'Doctrine\Bundle\PHPCRBundle\DoctrinePHPCRBundle',
         ));
 
         $this->registerBundleSet('doctrine_orm', array(
-            '\Doctrine\Bundle\DoctrineBundle\DoctrineBundle',
+            'Doctrine\Bundle\DoctrineBundle\DoctrineBundle',
         ));
 
         $this->registerBundleSet('sonata_admin', array(
-            '\Sonata\BlockBundle\SonataBlockBundle',
-            '\Sonata\CoreBundle\SonataCoreBundle',
-            '\Sonata\AdminBundle\SonataAdminBundle',
-            '\Sonata\jQueryBundle\SonatajQueryBundle',
+            'Sonata\BlockBundle\SonataBlockBundle',
+            'Sonata\CoreBundle\SonataCoreBundle',
+            'Sonata\AdminBundle\SonataAdminBundle',
+            'Sonata\jQueryBundle\SonatajQueryBundle',
             'Knp\Bundle\MenuBundle\KnpMenuBundle',
-            '\Sonata\DoctrinePHPCRAdminBundle\SonataDoctrinePHPCRAdminBundle',
+            'Sonata\DoctrinePHPCRAdminBundle\SonataDoctrinePHPCRAdminBundle',
+            'Symfony\Cmf\Bundle\TreeBrowserBundle\CmfTreeBrowserBundle',
+            'FOS\JsRoutingBundle\FOSJsRoutingBundle',
+        ));
+
+        $this->registerBundleSet('sonata_admin_orm', array(
+            'Sonata\BlockBundle\SonataBlockBundle',
+            'Sonata\CoreBundle\SonataCoreBundle',
+            'Sonata\AdminBundle\SonataAdminBundle',
+            'Sonata\jQueryBundle\SonatajQueryBundle',
+            'Knp\Bundle\MenuBundle\KnpMenuBundle',
+            'FOS\JsRoutingBundle\FOSJsRoutingBundle',
+        ));
+
+        $this->registerBundleSet('sonata_admin_phpcr', array(
+            'Sonata\BlockBundle\SonataBlockBundle',
+            'Sonata\CoreBundle\SonataCoreBundle',
+            'Sonata\AdminBundle\SonataAdminBundle',
+            'Sonata\jQueryBundle\SonatajQueryBundle',
+            'Knp\Bundle\MenuBundle\KnpMenuBundle',
+            'Sonata\DoctrinePHPCRAdminBundle\SonataDoctrinePHPCRAdminBundle',
             'Symfony\Cmf\Bundle\TreeBrowserBundle\CmfTreeBrowserBundle',
             'FOS\JsRoutingBundle\FOSJsRoutingBundle',
         ));

tests/HttpKernel/TestKernelTest.php

@@ -27,14 +27,23 @@ public function setUp()
         );
     }
 
-    public function testBundleSetRequire()
+    /**
+     * @dataProvider bundleSetProvider
+     */
+    public function testBundleSetRequire(array $bundleSets, $count)
     {
         $this->kernel->init();
-        $this->kernel->requireBundleSets(array(
-            'default', 'phpcr_odm'
-        ));
+        $this->kernel->requireBundleSets($bundleSets);
         $bundles = $this->kernel->registerBundles();
-        $this->assertCount(6, $bundles);
+        $this->assertCount($count, $bundles);
+    }
+
+    public function bundleSetProvider()
+    {
+        return array(
+            array(array('default', 'phpcr_odm'), 6),
+            array(array('default', 'doctrine_orm'), 5),
+        );
     }
 
     public function testBundleAdd()