Merge pull request #381 from symfony-cmf/mappings-pass

we don't need the mapping pass from core bundle anymore

Author: dbu

composer.json

@@ -36,7 +36,7 @@
     "suggest": {
         "doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents (^1.3)",
         "doctrine/phpcr-bundle": "To enable support for the PHPCR ODM documents",
-        "doctrine/orm": "To enable support for the ORM entities (^2.3)",
+        "doctrine/orm": "To enable support for the ORM entities (^2.5)",
 
         "symfony-cmf/content-bundle": "To optionally use the configured value for 'content_basepath' from the CoreBundle",
         "symfony-cmf/core-bundle": "To use the provided Doctrine\\Phpcr documents and for easier configuration (^1.1)",

src/CmfRoutingBundle.php

@@ -18,7 +18,6 @@
 use Doctrine\ODM\PHPCR\Version as PHPCRVersion;
 use Doctrine\ORM\Mapping\Driver\XmlDriver as ORMXmlDriver;
 use Doctrine\ORM\Version as ORMVersion;
-use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterMappingsPass;
 use Symfony\Cmf\Bundle\RoutingBundle\DependencyInjection\Compiler\ValidationPass;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Definition;
@@ -27,7 +26,6 @@
 use Symfony\Cmf\Component\Routing\DependencyInjection\Compiler\RegisterRoutersPass;
 use Symfony\Cmf\Component\Routing\DependencyInjection\Compiler\RegisterRouteEnhancersPass;
 use Symfony\Cmf\Bundle\RoutingBundle\DependencyInjection\Compiler\SetRouterPass;
-use Symfony\Cmf\Bundle\CoreBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass as CmfDoctrineOrmMappingsPass;
 
 /**
  * Bundle class.
@@ -57,9 +55,7 @@ public function build(ContainerBuilder $container)
      */
     private function buildPhpcrCompilerPass(ContainerBuilder $container)
     {
-        if (!class_exists(DoctrinePhpcrMappingsPass::class)
-            || !class_exists(PHPCRVersion::class)
-        ) {
+        if (!class_exists(PHPCRVersion::class)) {
             return;
         }
 
@@ -91,16 +87,11 @@ private function buildOrmCompilerPass(ContainerBuilder $container)
             return;
         }
 
-        $doctrineOrmCompiler = $this->findDoctrineOrmCompiler();
-        if (!$doctrineOrmCompiler) {
-            return;
-        }
-
         $container->addCompilerPass(
-            $this->buildBaseCompilerPass($doctrineOrmCompiler, ORMXmlDriver::class, 'orm')
+            $this->buildBaseCompilerPass(DoctrineOrmMappingsPass::class, ORMXmlDriver::class, 'orm')
         );
         $container->addCompilerPass(
-            $doctrineOrmCompiler::createXmlMappingDriver(
+            DoctrineOrmMappingsPass::createXmlMappingDriver(
                 [
                     realpath(__DIR__.'/Resources/config/doctrine-model') => 'Symfony\Cmf\Bundle\RoutingBundle\Model',
                     realpath(__DIR__.'/Resources/config/doctrine-orm') => 'Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm',
@@ -112,7 +103,7 @@ private function buildOrmCompilerPass(ContainerBuilder $container)
         );
 
         $container->addCompilerPass(
-            $doctrineOrmCompiler::createXmlMappingDriver(
+            DoctrineOrmMappingsPass::createXmlMappingDriver(
                 [
                     realpath(__DIR__.'/Resources/config/doctrine-model') => 'Symfony\Cmf\Bundle\RoutingBundle\Model',
                 ],
@@ -123,29 +114,6 @@ private function buildOrmCompilerPass(ContainerBuilder $container)
         );
     }
 
-    /**
-     * Looks for a mapping compiler pass. If available, use the one from
-     * DoctrineBundle (available only since DoctrineBundle 2.4 and Symfony 2.3)
-     * Otherwise use the standalone one from CmfCoreBundle.
-     *
-     * @return bool|string the compiler pass to use or false if no suitable
-     *                     one was found
-     */
-    private function findDoctrineOrmCompiler()
-    {
-        if (class_exists(RegisterMappingsPass::class)
-            && class_exists(DoctrineOrmMappingsPass::class)
-        ) {
-            return DoctrineOrmMappingsPass::class;
-        }
-
-        if (class_exists(CmfDoctrineOrmMappingsPass::class)) {
-            return CmfDoctrineOrmMappingsPass::class;
-        }
-
-        return false;
-    }
-
     /**
      * Builds the compiler pass for the symfony core routing component. The
      * compiler pass factory method uses the SymfonyFileLocator which does