[WIP] orm - entities and configuration

CmfRoutingBundle.php

@@ -3,6 +3,7 @@
 namespace Symfony\Cmf\Bundle\RoutingBundle;
 
 use Doctrine\Bundle\PHPCRBundle\DependencyInjection\Compiler\DoctrinePhpcrMappingsPass;
+use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -37,6 +38,34 @@ public function build(ContainerBuilder $container)
                 )
             );
         }
+
+        if (class_exists('Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass')) {
+            $container->addCompilerPass($this->buildBaseOrmCompilerPass());
+            $container->addCompilerPass(
+                DoctrineOrmMappingsPass::createXmlMappingDriver(
+                    array(
+                        realpath(__DIR__ . '/Resources/config/doctrine-model') => 'Symfony\Cmf\Bundle\RoutingBundle\Model',
+                        realpath(__DIR__ . '/Resources/config/doctrine-orm') => 'Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm',
+                    ),
+                    array('cmf_routing.dynamic.persistence.orm.manager_name'),
+                    'cmf_routing.persistence.orm.enabled'
+                )
+            );
+        }
+    }
+
+    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'
+        );
     }
 
     /**

DependencyInjection/CmfRoutingExtension.php

@@ -93,6 +93,12 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
             $hasProvider = true;
             $hasContentRepository = true;
         }
+
+        if (!empty($config['persistence']['orm']['enabled'])) {
+            $this->loadOrmProvider($config['persistence']['orm'], $loader, $container);
+            $hasProvider = true;
+        }
+
         if (isset($config['route_provider_service_id'])) {
             $container->setAlias('cmf_routing.route_provider', $config['route_provider_service_id']);
             $hasProvider = true;
@@ -171,6 +177,13 @@ public function loadSonataPhpcrAdmin($config, XmlFileLoader $loader, ContainerBu
         $loader->load('admin_phpcr.xml');
     }
 
+    public function loadOrmProvider($config, XmlFileLoader $loader, ContainerBuilder $container)
+    {
+        $container->setParameter($this->getAlias() . '.persistence.orm.manager_name', $config['manager_name']);
+        $container->setParameter($this->getAlias() . '.persistence.orm.enabled', $config['enabled']);
+        $loader->load('provider_orm.xml');
+    }
+
     /**
      * Returns the base path for the XSD files.
      *

DependencyInjection/Configuration.php

@@ -72,6 +72,12 @@ public function getConfigTreeBuilder()
                                         ->end()
                                     ->end()
                                 ->end()
+                                ->arrayNode('orm')
+                                    ->children()
+                                        ->scalarNode('enabled')->defaultNull()->end()
+                                        ->scalarNode('manager_name')->defaultNull()->end()
+                                    ->end()
+                                ->end()
                             ->end()
                         ->end()
                         ->scalarNode('uri_filter_regexp')->defaultValue('')->end()

Doctrine/DoctrineProvider.php

@@ -40,6 +40,7 @@ abstract class DoctrineProvider
     public function __construct(ManagerRegistry $managerRegistry, $className = null)
     {
         $this->managerRegistry = $managerRegistry;
+        $this->className = $className;
     }
 
     /**

Doctrine/Orm/ContentRepository.php

@@ -2,8 +2,11 @@
 
 namespace Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm;
 
+use Symfony\Cmf\Component\Routing\ContentRepositoryInterface;
+use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\DoctrineProvider;
+
 /**
- * Abstract content repository for PHPCR-ODM
+ * Abstract content repository for ORM
  *
  * @author teito
  */
@@ -46,6 +49,7 @@ public function getContentId($content)
             if (0 !== count($ids)) {
                 throw new \Exception('Multi identifier values not supported in ' . get_class($content));
             }
+
             return implode(':', array(
                 get_class($content),
                 reset($ids)

Doctrine/Orm/Route.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm;
+
+use Symfony\Cmf\Bundle\RoutingBundle\Model\Route as RouteModel;
+
+/**
+ * ORM route version.
+ * @author matteo caberlotto [email protected]
+ */
+class Route extends RouteModel
+{
+    /**
+     * {@inheritDoc}
+     */
+    protected $name;
+
+    /**
+     * {@inheritDoc}
+     */
+    protected $position;
+
+    /**
+     * {@inheritDoc}
+     */
+    protected $addTrailingSlash;
+}

Doctrine/Orm/RouteProvider.php

@@ -2,13 +2,13 @@
 
 namespace Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm;
 
-use Symfony\Component\Routing\Route as SymfonyRoute;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
 
 use Symfony\Component\HttpFoundation\Request;
 
 use Symfony\Cmf\Component\Routing\RouteProviderInterface;
+use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\DoctrineProvider;
 
 /**
  * Provider loading routes from Doctrine
@@ -47,9 +47,57 @@ protected function getCandidates($url)
      */
     public function getRouteByName($name, $parameters = array())
     {
+        $route = $this->getRoutesRepository()->findBy(array('name' => $name));
+        if (!$route) {
+            throw new RouteNotFoundException("No route found for name '$name'");
+        }
+
+        return $route;
     }
 
     public function getRoutesByNames($names, $parameters = array())
     {
     }
+
+    public function getRouteCollectionForRequest(Request $request)
+    {
+        $url = $request->getPathInfo();
+
+        $candidates = $this->getCandidates($url);
+
+        $collection = new RouteCollection();
+
+        if (empty($candidates)) {
+            return $collection;
+        }
+
+        try {
+            $routes = $this->getRoutesRepository()->findByStaticPrefix($candidates, array('position' => 'ASC'));
+
+            foreach ($routes as $key => $route) {
+                if (preg_match('/.+\.([a-z]+)$/i', $url, $matches)) {
+                    if ($route->getDefault('_format') === $matches[1]) {
+                        continue;
+                    }
+
+                    $route->setDefault('_format', $matches[1]);
+                }
+                // SYMFONY 2.1 COMPATIBILITY: tweak route name
+                $key = trim(preg_replace('/[^a-z0-9A-Z_.]/', '_', $key), '_');
+                $collection->add($key, $route);
+            }
+        } catch (RepositoryException $e) {
+            // TODO: how to determine whether this is a relevant exception or not?
+            // for example, getting /my//test (note the double /) is just an invalid path
+            // and means another router might handle this.
+            // but if the PHPCR backend is down for example, we want to alert the user
+        }
+
+        return $collection;
+    }
+
+    protected function getRoutesRepository()
+    {
+        return $this->getObjectManager()->getRepository($this->className);
+    }
 }

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-model/Route.orm.xml

@@ -0,0 +1,10 @@
+<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\Cmf\Bundle\RoutingBundle\Model\Route" referenceable="true">
+        <field name="variablePattern" type="string"/>
+        <field name="addFormatPattern" type="boolean"/>
+    </mapped-superclass>
+
+</doctrine-mapping>

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

@@ -0,0 +1,23 @@
+<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">
+
+    <entity name="Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm\Route" table="orm_routes">
+
+        <id name="id" type="integer" column="id">
+            <generator strategy="AUTO"/>
+        </id>
+
+        <field name="name" type="string" unique="true"/>
+        <field name="staticPrefix" type="string"/>
+        <field name="position" type="integer"/>
+        <field name="addTrailingSlash" type="boolean"/>
+
+        <indexes>
+            <index name="name_idx" columns="name"/>
+            <index name="prefix_idx" columns="staticPrefix"/>
+        </indexes>
+
+    </entity>
+
+</doctrine-mapping>

Resources/config/provider_orm.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <parameters>
+        <parameter key="cmf_routing.route_entity_class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm\Route</parameter>
+        <parameter key="cmf_routing.route_entity_provider">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm\RouteProvider</parameter>
+        <parameter key="cmf_routing.orm.content_repository_class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm\ContentRepository</parameter>
+    </parameters>
+
+    <services>
+
+        <service id="cmf_routing.content_repository" class="%cmf_routing.orm.content_repository_class%">
+            <argument type="service" id="doctrine.orm.default_entity_manager" />
+        </service>
+
+        <service id="cmf_routing.route_provider" class="%cmf_routing.route_entity_provider%">
+            <argument type="service" id="doctrine"/>
+            <argument>%cmf_routing.route_entity_class%</argument>
+            <call method="setManagerName"><argument>%cmf_routing.persistence.orm.manager_name%</argument></call>
+        </service>
+    </services>
+</container>