LeaveRedirect "works"

But needs an additional flush

Author: dantleech

AutoRoute/Adapter/PhpcrOdmAdapter.php

@@ -18,6 +18,7 @@
 use PHPCR\InvalidItemStateException;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\Model\AutoRouteInterface;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\UrlContext;
+use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute;
 
 /**
  * Adapter for PHPCR-ODM
@@ -122,7 +123,6 @@ public function createAutoRoute($url, $contentDocument, $autoRouteTag)
     {
         $path = $this->baseRoutePath;
         $parentDocument = $this->dm->find(null, $path);
-
         $segments = preg_split('#/#', $url, null, PREG_SPLIT_NO_EMPTY);
         $headName = array_pop($segments);
         foreach ($segments as $segment) {
@@ -147,9 +147,22 @@ public function createAutoRoute($url, $contentDocument, $autoRouteTag)
         return $headRoute;
     }
 
+    private function buildParentPathForUrl($url)
+    {
+
+        return $document;
+    }
+
     public function createRedirectRoute($referringAutoRoute, $newRoute)
     {
-        throw new \Exception('IMPLMENT ME');
+        $parentDocument = $referringAutoRoute->getParent();
+
+        $redirectRoute = new RedirectRoute();
+        $redirectRoute->setName($referringAutoRoute->getName());
+        $redirectRoute->setRouteTarget($newRoute);
+        $redirectRoute->setParent($parentDocument);
+
+        $this->dm->persist($redirectRoute);
     }
 
     /**

AutoRoute/Mapping/ClassMetadata.php

@@ -31,7 +31,7 @@ class ClassMetadata extends MergeableClassMetadata
      *
      * @var array
      */
-    protected $defunctRouteHandler = array('remove', array());
+    protected $defunctRouteHandler = array('name' => 'remove');
 
     protected $extend;
 

Doctrine/Phpcr/AutoRouteListener.php

@@ -17,6 +17,7 @@
 use Symfony\Cmf\Bundle\RoutingAutoBundle\Model\AutoRoute;
 use Doctrine\Common\Util\ClassUtils;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\UrlContextCollection;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\Mapping\Exception\ClassNotMappedException;
 
 /**
  * Doctrine PHPCR ODM listener for maintaining automatic routes.
@@ -90,14 +91,19 @@ public function onFlush(ManagerEventArgs $args)
         }
     }
 
-    public function postFlush()
+    public function postFlush(ManagerEventArgs $args)
     {
+        $dm = $args->getObjectManager();
         $arm = $this->getAutoRouteManager();
         $arm->handleDefunctRoutes();
     }
 
     private function isAutoRouteable($document)
     {
-        return $this->getMetadataFactory()->getMetadataForClass(get_class($document));
+        try {
+            return (boolean) $this->getMetadataFactory()->getMetadataForClass(get_class($document));
+        } catch (ClassNotMappedException $e) {
+            return false;
+        }
     }
 }

Tests/Functional/EventListener/AutoRouteListenerTest.php

@@ -328,10 +328,16 @@ public function provideLeaveRedirect()
                     'es' => 'Adios todo el mundo',
                 ),
                 array(
-                    'test/auto-route/seo-articles/en/goodbye-everybody',
-                    'test/auto-route/seo-articles/fr/aurevoir-le-monde',
-                    'test/auto-route/seo-articles/de/aud-weidersehn',
-                    'test/auto-route/seo-articles/es/adios-todo-el-mundo',
+                    'test/auto-route/articles/en/hello-everybody',
+                    'test/auto-route/articles/fr/bonjour-le-monde',
+                    'test/auto-route/articles/de/gutentag',
+                    'test/auto-route/articles/es/hola-todo-el-mundo',
+                ),
+                array(
+                    'test/auto-route/articles/en/goodbye-everybody',
+                    'test/auto-route/articles/fr/aurevoir-le-monde',
+                    'test/auto-route/articles/de/aud-weidersehn',
+                    'test/auto-route/articles/es/adios-todo-el-mundo',
                 ),
             ),
         );
@@ -340,9 +346,10 @@ public function provideLeaveRedirect()
     /**
      * @dataProvider provideLeaveRedirect
      */
-    public function testLeaveRedirect($data, $updatedData, $expectedRedirectRoutePaths)
+    public function testLeaveRedirect($data, $updatedData, $expectedRedirectRoutePaths, $expectedAutoRoutePaths)
     {
         $article = new SeoArticle;
+        $article->title = 'Hai';
         $article->path = '/test/article-1';
         $this->getDm()->persist($article);
 
@@ -361,6 +368,19 @@ public function testLeaveRedirect($data, $updatedData, $expectedRedirectRoutePat
 
         $this->getDm()->persist($article);
         $this->getDm()->flush();
+
+        // additional flush -- maybe we should handle this with an event listener of some sort?
+        $this->getDm()->flush();
+
+        foreach ($expectedRedirectRoutePaths as $originalPath) {
+            $redirectRoute = $this->getDm()->find('Symfony\Cmf\Bundle\RoutingBundle\Model\RedirectRoute', $originalPath);
+            $this->assertNotNull($redirectRoute, 'Redirect exists for: ' . $originalPath);
+        }
+
+        foreach ($expectedAutoRoutePaths as $newPath) {
+            $autoRoute = $this->getDm()->find('Symfony\Cmf\Bundle\RoutingAutoBundle\Model\AutoRoute', $newPath);
+            $this->assertNotNull($redirectRoute, 'Autoroute exists for: ' . $originalPath);
+        }
     }
 
     /**