Fix tests

GuilhemN · GuilhemN · commit 882a360e7028 · 2017-08-09T13:56:16.000+02:00
diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
@@ -127,7 +127,7 @@ HttpKernel
    services:
        # ...
 
-       # implicit commands registration
+       # implicit registration of all commands in the `Command` folder
    ```
 
    After:
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/doctrine.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/doctrine.yml
@@ -0,0 +1,5 @@
+# to be removed once https://github.com/doctrine/DoctrineBundle/pull/684 is merged
+services:
+    Doctrine\Bundle\DoctrineBundle\Command\:
+        resource: "@DoctrineBundle/Command/*"
+        tags: [console.command]
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\SecurityBundle\Tests\Functional\app;
 
+use Doctrine\ORM\Version;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpKernel\Kernel;
@@ -82,6 +83,11 @@ public function getLogDir()
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
         $loader->load($this->rootConfig);
+
+        // to be removed once https://github.com/doctrine/DoctrineBundle/pull/684 is merged
+        if ('Acl' === $this->testCase && class_exists(Version::class)) {
+            $loader->load(__DIR__.'/app/Acl/doctrine.yml');
+        }
     }
 
     public function serialize()
