move document to model

CHANGELOG.md

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+* **2013-06-15**: [Model] Separated database agnostic, doctrine generic and
+  PHPCR-ODM specific code to prepare for Doctrine ORM support. Deprecated
+  RoutingBundle\Document\Route and RedirectRoute in favor of
+  RoutingBundle\Doctrine\Phpcr\Route resp. RedirectRoute and also moved the
+  PHPCR-ODM specific listeners and repository implementations to Doctrine\Phpcr
+
+1.1.0-beta1
+-----------
+
 * **2013-05-28**: [Bundle] Only include Doctrine PHPCR compiler pass if PHPCR-ODM is present
 * **2013-05-25**: [Bundle] Drop symfony_ from symfony_cmf prefix
 * **2013-05-24**: [Document] ContentRepository now requires ManagerRegistry in the constructor and provides `setManagerName()` in the same way as RouteProvider

CmfRoutingBundle.php

@@ -27,6 +27,15 @@ public function build(ContainerBuilder $container)
 
         if (class_exists('Doctrine\Bundle\PHPCRBundle\DependencyInjection\Compiler\DoctrinePhpcrMappingsPass')) {
             $container->addCompilerPass($this->buildBasePhpcrCompilerPass());
+            $container->addCompilerPass(
+                DoctrinePhpcrMappingsPass::createXmlMappingDriver(
+                    array(
+                        realpath(__DIR__ . '/Resources/config/doctrine-model') => 'Symfony\Cmf\Bundle\RoutingBundle\Model',
+                        realpath(__DIR__ . '/Resources/config/doctrine-phpcr') => 'Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr',
+                    ),
+                    array('cmf_routing.manager_name')
+                )
+            );
         }
     }
 

Doctrine/DoctrineProvider.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Symfony\Cmf\Bundle\RoutingBundle\Doctrine;
+
+use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Common\Persistence\ObjectManager;
+
+/**
+ * Abstract class for doctrine based content repository and route provider
+ * implementations.
+ *
+ * @author Uwe Jäger
+ * @author David Buchmann <mail@davidbu.ch>
+ */
+abstract class DoctrineProvider
+{
+    /**
+     * If this is null, the manager registry will return the default manager.
+     *
+     * @var string|null Name of object manager to use
+     */
+    protected $managerName;
+
+    /**
+     * @var ManagerRegistry
+     */
+    protected $managerRegistry;
+
+    /**
+     * Class name of the object class to find, null for PHPCR-ODM as it can
+     * determine the class on its own.
+     *
+     * @var string|null
+     */
+    protected $className;
+
+    /**
+     * @param ManagerRegistry $managerRegistry
+     */
+    public function __construct(ManagerRegistry $managerRegistry, $className = null)
+    {
+        $this->managerRegistry = $managerRegistry;
+    }
+
+    /**
+     * Set the object manager name to use for this loader. If not set, the
+     * default manager as decided by the manager registry will be used.
+     *
+     * @param string|null $managerName
+     */
+    public function setManagerName($managerName)
+    {
+        $this->managerName = $managerName;
+    }
+
+    /**
+     * Get the object manager named $managerName from the registry.
+     *
+     * @return ObjectManager
+     */
+    protected function getObjectManager()
+    {
+        return $this->managerRegistry->getManager($this->managerName);
+    }
+}

Doctrine/Phpcr/ContentRepository.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr;
+
+use Symfony\Cmf\Component\Routing\ContentRepositoryInterface;
+use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\DoctrineProvider;
+
+/**
+ * Implement ContentRepositoryInterface for PHPCR-ODM
+ *
+ * This is <strong>NOT</strong> not a doctrine repository but just the content
+ * provider for the NestedMatcher. (you could of course implement this
+ * interface in a repository class, if you need that)
+ *
+ * @author Uwe Jäger
+ */
+class ContentRepository extends DoctrineProvider implements ContentRepositoryInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function findById($id)
+    {
+        return $this->getObjectManager()->find(null, $id);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getContentId($content)
+    {
+        if (! is_object($content)) {
+            return null;
+        }
+        try {
+            return $this->getObjectManager()->getUnitOfWork()->getDocumentId($content);
+        } catch (\Exception $e) {
+            return null;
+        }
+    }
+}

Listener/IdPrefix.php → Doctrine/Phpcr/IdPrefixListener.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingBundle\Listener;
+namespace Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr;
 
-use Symfony\Cmf\Bundle\RoutingBundle\Document\Route;
+use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
 use Doctrine\Common\Persistence\Event\LifecycleEventArgs;
 
 /**
- * Doctrine PHPCR-ODM listener to set the idPrefix on new routes
+ * Doctrine PHPCR-ODM listener to set the idPrefix on routes
  *
- * @author david.buchmann@liip.ch
+ * @author David Buchmann <mail@davidbu.ch>
  */
-class IdPrefix
+class IdPrefixListener
 {
     /**
      * The prefix to add to the url to create the repository path
@@ -48,7 +48,7 @@ protected function updateId(LifecycleEventArgs $args)
 
         // only update route objects and only if the prefix can match, to allow
         // for more than one listener and more than one route root
-        if ($doc instanceof Route
+        if (($doc instanceof Route || $doc instanceof RedirectRoute)
             && ! strncmp($this->idPrefix, $doc->getId(), strlen($this->idPrefix))
         ) {
             $doc->setPrefix($this->idPrefix);

Listener/LocaleUpdater.php → Doctrine/Phpcr/LocaleListener.php

@@ -1,21 +1,22 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingBundle\Listener;
+namespace Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr;
 
-use Symfony\Cmf\Bundle\RoutingBundle\Document\Route;
 use Doctrine\ODM\PHPCR\Event\MoveEventArgs;
 use Doctrine\Common\Persistence\Event\LifecycleEventArgs;
 
+use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
+
 /**
  * Doctrine PHPCR-ODM listener to update the locale on routes based on the URL.
  *
  * It uses the idPrefix and looks at the path segment right after the prefix to
  * determine if that segment matches one of the configured locales and if so
  * sets a requirement and default named _locale for that locale.
  *
- * @author David Buchmann <david@liip.ch>
+ * @author David Buchmann <mail@davidbu.ch>
  */
-class LocaleUpdater
+class LocaleListener
 {
     /**
      * The prefix to add to the url to create the repository path