Adapter now converts Generic in AutoRoute if needed

Author: mmenozzi

Adapter/PhpcrOdmAdapter.php

@@ -115,6 +115,7 @@ public function removeAutoRoute(AutoRouteInterface $autoRoute)
     public function createAutoRoute(UriContext $uriContext, $contentDocument, $autoRouteTag)
     {
         $path = $this->baseRoutePath;
+        $routeType = AutoRouteInterface::TYPE_PRIMARY;
         $document = $parentDocument = $this->dm->find(null, $path);
         if (null === $parentDocument) {
             throw new \RuntimeException(sprintf('The "route_basepath" configuration points to a non-existant path "%s".',
@@ -137,12 +138,24 @@ public function createAutoRoute(UriContext $uriContext, $contentDocument, $autoR
             $parentDocument = $document;
         }
 
+        $finalAutoRoutePath = $path . '/' . $headName;
+        $node = $this->dm->find(null, $finalAutoRoutePath);
+        if ($node) {
+            if ($node instanceof Generic) {
+                return $this->convertGenericNodeInAutoRouteNode($node, $contentDocument, $autoRouteTag, $routeType);
+            }
+            $nodeClass = get_class($node);
+            $genericFqcn = 'Doctrine\ODM\PHPCR\Document\Generic';
+            throw new \RuntimeException(
+                "Unexpected node class '$nodeClass' at path '$finalAutoRoutePath'. Only '$genericFqcn' expected."
+            );
+        }
         $headRoute = new $this->autoRouteFqcn();
         $headRoute->setContent($contentDocument);
         $headRoute->setName($headName);
         $headRoute->setParent($document);
         $headRoute->setAutoRouteTag($autoRouteTag);
-        $headRoute->setType(AutoRouteInterface::TYPE_PRIMARY);
+        $headRoute->setType($routeType);
 
         return $headRoute;
     }
@@ -201,4 +214,31 @@ private function getPathFromUri($uri)
     {
         return $this->baseRoutePath . $uri;
     }
+
+    /**
+     * @param Generic $node
+     * @param object $contentDocument
+     * @param string $autoRouteTag
+     * @param string $routeType
+     * @return AutoRouteInterface
+     */
+    private function convertGenericNodeInAutoRouteNode(Generic $node, $contentDocument, $autoRouteTag, $routeType)
+    {
+        $autoRouteClassName = $this->autoRouteFqcn;
+        $mapper = $this->dm->getConfiguration()->getDocumentClassMapper();
+        $mapper->writeMetadata($this->dm, $node->getNode(), $autoRouteClassName);
+        $this->dm->getPhpcrSession()->save();
+        // Detach is needed to force Doctrine to re-load the node
+        $this->dm->detach($node);
+        $autoRoute = $this->dm->find(null, $node->getId());
+        if (!$autoRoute instanceof $autoRouteClassName) {
+            throw new \RuntimeException(
+                "Something went wrong converting Generic node into an AutoRouteInterface node."
+            );
+        }
+        $autoRoute->setContent($contentDocument);
+        $autoRoute->setAutoRouteTag($autoRouteTag);
+        $autoRoute->setType($routeType);
+        return $autoRoute;
+    }
 }

Tests/Functional/EventListener/AutoRouteListenerTest.php

@@ -552,4 +552,40 @@ public function testConflictResolverDefaultThrowException()
         $this->getDm()->persist($blog);
         $this->getDm()->flush();
     }
+
+    public function testGenericNodeShouldBeConvertedInAnAutoRouteNode()
+    {
+        $this->assertNull($this->getDm()->find(null, '/test/auto-route/blog'));
+        $this->assertNull($this->getDm()->find(null, '/test/auto-route/blog/my-post'));
+
+        $blog = new Blog;
+        $blog->path = '/test/my-post';
+        $blog->title = 'My Post';
+        $this->getDm()->persist($blog);
+        $this->getDm()->flush();
+
+        $this->assertInstanceOf(
+            'Doctrine\ODM\PHPCR\Document\Generic',
+            $this->getDm()->find(null, '/test/auto-route/blog')
+        );
+        $blogRoute = $this->getDm()->find(null, '/test/auto-route/blog/my-post');
+        $this->assertInstanceOf('Symfony\Cmf\Component\RoutingAuto\Model\AutoRouteInterface', $blogRoute);
+        $this->assertSame($blog, $blogRoute->getContent());
+
+        $page = new Page;
+        $page->path = '/test/blog';
+        $page->title = 'Blog';
+
+        $this->getDm()->persist($page);
+        $this->getDm()->flush();
+
+        $this->assertInstanceOf(
+            'Symfony\Cmf\Component\RoutingAuto\Model\AutoRouteInterface',
+            $this->getDm()->find(null, '/test/auto-route/blog')
+        );
+        $this->assertInstanceOf(
+            'Symfony\Cmf\Component\RoutingAuto\Model\AutoRouteInterface',
+            $this->getDm()->find(null, '/test/auto-route/blog/my-post')
+        );
+    }
 }

Tests/Unit/Adapter/PhpcrOdmAdapterTest.php

@@ -109,6 +109,8 @@ public function testCreateAutoRoute($path, $expectedParentPath, $expectedName, $
         if ($parentPathExists) {
             $this->dm->find(null, $expectedParentPath)
                 ->willReturn($this->parentRoute);
+            $this->dm->find(null, $expectedParentPath . '/' . $expectedName)
+                ->willReturn(null);
         } else {
             $this->dm->find(null, $expectedParentPath)
                 ->willReturn(null);