1.1 Release

Author: dantleech

Adapter/PhpcrOdmAdapter.php

@@ -109,7 +109,7 @@ public function removeAutoRoute(AutoRouteInterface $autoRoute)
     /**
      * {@inheritdoc}
      */
-    public function createAutoRoute(UriContext $uriContext, $contentDocument, $autoRouteTag)
+    public function createAutoRoute($uri, $contentDocument, $autoRouteTag)
     {
         $basePath = $this->baseRoutePath;
         $document = $parentDocument = $this->dm->find(null, $basePath);
@@ -119,8 +119,7 @@ public function createAutoRoute(UriContext $uriContext, $contentDocument, $autoR
                 $basePath
             ));
         }
-
-        $segments = preg_split('#/#', $uriContext->getUri(), null, PREG_SPLIT_NO_EMPTY);
+        $segments = preg_split('#/#', $uri, null, PREG_SPLIT_NO_EMPTY);
         $headName = array_pop($segments);
         foreach ($segments as $segment) {
             $basePath .= '/'.$segment;
@@ -208,7 +207,7 @@ public function getReferringAutoRoutes($contentDocument)
     /**
      * {@inheritdoc}
      */
-    public function findRouteForUri($uri, UriContext $uriContext)
+    public function findRouteForUri($uri)
     {
         return $this->dm->find(
             'Symfony\Cmf\Component\RoutingAuto\Model\AutoRouteInterface',

Command/RefreshCommand.php

@@ -25,7 +25,7 @@ public function configure()
         $this
             ->setName('cmf:routing:auto:refresh')
             ->setDescription('Refresh auto-routeable documents')
-            ->setHelp(<<<HERE
+            ->setHelp(<<<'HERE'
 WARNING: Experimental!
 
 This command iterates over all Documents that are mapped by the auto

Doctrine/Phpcr/AutoRouteListener.php

@@ -115,7 +115,7 @@ public function endFlush(ManagerEventArgs $args)
     private function isAutoRouteable($document)
     {
         try {
-            return (boolean) $this->getMetadataFactory()->getMetadataForClass(get_class($document));
+            return (bool) $this->getMetadataFactory()->getMetadataForClass(get_class($document));
         } catch (ClassNotMappedException $e) {
             return false;
         }

Model/AutoRoute.php

@@ -56,7 +56,7 @@ public function setType($type)
     /**
      * {@inheritdoc}
      */
-    public function setRedirectTarget($redirectRoute)
+    public function setRedirectTarget(AutoRouteInterface $redirectRoute)
     {
         $this->redirectRoute = $redirectRoute;
     }

Tests/Functional/EventListener/AutoRouteListenerTest.php

@@ -462,6 +462,33 @@ public function testLeaveRedirectChildrenMigrations()
         $this->assertCount(1, $this->getDm()->getChildren($newRoute));
     }
 
+    /**
+     * It should leave redirect routes in their original parent directories if the
+     * schema is updated to change the parent directory/path.
+     */
+    public function testMaintainRedirectParentPath()
+    {
+        $article1 = new SeoArticle();
+        $article1->title = 'Hai';
+        $article1->path = '/test/article-1';
+        $this->getDm()->persist($article1);
+        $this->getDm()->flush();
+
+        $parentRoute = $this->getDm()->find(null, '/test/auto-route');
+        $autoRoute = $this->getDm()->find(null, '/test/auto-route/seo-articles/hai');
+        $autoRoute->setParent($parentRoute);
+        $this->getDm()->persist($autoRoute);
+        $this->getDm()->flush();
+
+        $article1->title = 'Hoff';
+        $this->getDm()->persist($article1);
+        $this->getDm()->flush();
+
+        $autoRoute = $this->getDm()->find(null, '/test/auto-route/hai');
+        $this->assertNotNull($autoRoute);
+        $this->assertEquals(AutoRouteInterface::TYPE_REDIRECT, $autoRoute->getDefault('type'));
+    }
+
     /**
      * Ensure that we can map parent classes: #56.
      */

Tests/Unit/Adapter/PhpcrOdmAdapterTest.php

@@ -116,8 +116,7 @@ public function testCreateAutoRoute($path, $expectedParentPath, $expectedName, $
                 ->willReturn(null);
         }
 
-        $this->uriContext->getUri()->willReturn($path);
-        $res = $this->adapter->createAutoRoute($this->uriContext->reveal(), $this->contentDocument, 'fr');
+        $res = $this->adapter->createAutoRoute($path, $this->contentDocument, 'fr');
         $this->assertNotNull($res);
         $this->assertInstanceOf('Symfony\Cmf\Bundle\RoutingAutoBundle\Model\AutoRoute', $res);
         $this->assertEquals($expectedName, $res->getName());
@@ -147,8 +146,7 @@ public function testCreateAutoRouteThrowsExceptionIfItCannotMigrateExistingGener
             $genericDocument->reveal(),
             new \stdClass()
         );
-        $this->uriContext->getUri()->willReturn($uri);
-        $this->adapter->createAutoRoute($this->uriContext->reveal(), $this->contentDocument, 'it');
+        $this->adapter->createAutoRoute($uri, $this->contentDocument, 'it');
     }
 
     /**