Reflected Testing changes

Author: wouterj

Tests/Resources/app/AppKernel.php

@@ -7,11 +7,16 @@ class AppKernel extends TestKernel
 {
     public function configure()
     {
-        $this->requireBundleSets(array(
-            'default',
-            'sonata_admin',
-            'phpcr_odm',
-        ));
+        $this->requireBundleSet('default');
+
+        if ('phpcr' === $this->environment) {
+            $this->requireBundleSets(array(
+                'phpcr_odm',
+                'sonata_admin',
+            ));
+        } elseif ('orm' === $this->environment) {
+            $this->requireBundleSet('doctrine_orm');
+        }
 
         $this->addBundles(array(
             new \Symfony\Cmf\Bundle\RoutingBundle\CmfRoutingBundle(),

Tests/Resources/app/config/config_orm.php

@@ -1,8 +1,6 @@
 <?php
 
 $loader->import(CMF_TEST_CONFIG_DIR.'/default.php');
-$loader->import(CMF_TEST_CONFIG_DIR.'/phpcr_odm.php'); // todo find some way to don't have this in the ORM config
 $loader->import(CMF_TEST_CONFIG_DIR.'/doctrine_orm.php');
-$loader->import(CMF_TEST_CONFIG_DIR.'/sonata_admin.php');
 $loader->import(__DIR__.'/cmf_routing.yml');
 $loader->import(__DIR__.'/cmf_routing.orm.yml');

composer.json

@@ -20,7 +20,7 @@
     },
     "require-dev": {
         "symfony-cmf/core-bundle": "1.0.*",
-        "symfony-cmf/testing": "1.0.*",
+        "symfony-cmf/testing": "1.1.*",
         "sonata-project/doctrine-phpcr-admin-bundle": "1.0.*",
         "symfony/monolog-bundle": "2.2.*",
         "doctrine/orm": "2.3.*"

phpunit.xml.dist

@@ -37,4 +37,8 @@
         <server name="KERNEL_DIR" value="Tests/Resources/app" />
     </php>
 
+    <listeners>
+        <listener class="Symfony\Cmf\Component\Testing\Phpunit\DatabaseTestListener" />
+    </listeners>
+
 </phpunit>