fix: added orm mapping for Symfony\Component\Routing\Route

Author: matteocaberlotto

CmfRoutingBundle.php

@@ -40,6 +40,7 @@ public function build(ContainerBuilder $container)
         }
 
         if (class_exists('Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass')) {
+            $container->addCompilerPass($this->buildBaseOrmCompilerPass());
             $container->addCompilerPass(
                 DoctrineOrmMappingsPass::createXmlMappingDriver(
                     array(
@@ -53,6 +54,20 @@ public function build(ContainerBuilder $container)
         }
     }
 
+    private function buildBaseOrmCompilerPass()
+    {
+        $arguments = array(array(realpath(__DIR__ . '/Resources/config/doctrine-base')), '.orm.xml');
+        $locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\DefaultFileLocator', $arguments);
+        $driver = new Definition('Doctrine\ORM\Mapping\Driver\XmlDriver', array($locator));
+
+        return new DoctrineOrmMappingsPass(
+            $driver,
+            array('Symfony\Component\Routing'),
+            array('cmf_routing.dynamic.persistence.orm.manager_name'),
+            'cmf_routing.persistence.orm.enabled'
+        );
+    }
+
     /**
      * Build the compiler pass for the symfony core routing component. The
      * factory method uses the SymfonyFileLocator which will look at the

Doctrine/Orm/Route.php

@@ -24,24 +24,4 @@ class Route extends RouteModel
      * {@inheritDoc}
      */
     protected $addTrailingSlash;
-
-    /**
-     * {@inheritDoc}
-     */
-    protected $host;
-
-    /**
-     * {@inheritDoc}
-     */
-    protected $defaults;
-
-    /**
-     * {@inheritDoc}
-     */
-    protected $requirements;
-
-    /**
-     * {@inheritDoc}
-     */
-    protected $options;
 }

Model/Route.php

@@ -259,16 +259,6 @@ public function compile()
         return parent::compile();
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * Required by orm
-     */
-    public function getDefaults()
-    {
-        return $this->defaults;
-    }
-
     public function __toString()
     {
         return (string) $this->id;

Resources/config/doctrine-base/Symfony.Component.Routing.Route.orm.xml

@@ -0,0 +1,12 @@
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="https://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
+
+    <mapped-superclass name="Symfony\Component\Routing\Route">
+        <field name="host" type="string"/>
+        <field name="defaults" type="array"/>
+        <field name="requirements" type="array"/>
+        <field name="options" type="array"/>
+    </mapped-superclass>
+
+</doctrine-mapping>

Resources/config/doctrine-orm/Route.orm.xml

@@ -10,16 +10,9 @@
 
         <field name="name" type="string" unique="true"/>
         <field name="staticPrefix" type="string"/>
-
         <field name="position" type="integer"/>
-
         <field name="addTrailingSlash" type="boolean"/>
 
-        <field name="host" type="string"/>
-        <field name="defaults" type="array"/>
-        <field name="requirements" type="array"/>
-        <field name="options" type="array"/>
-
         <indexes>
             <index name="name_idx" columns="name"/>
             <index name="prefix_idx" columns="staticPrefix"/>