Merge pull request #192 from damienflament/patch-1

Follow naming changes made in component.

Author: wouterj

src/Adapter/PhpcrOdmAdapter.php

@@ -109,7 +109,7 @@ public function removeAutoRoute(AutoRouteInterface $autoRoute)
     /**
      * {@inheritdoc}
      */
-    public function createAutoRoute(UriContext $uriContext, $contentDocument, $autoRouteTag)
+    public function createAutoRoute(UriContext $uriContext, $contentDocument, $locale)
     {
         $basePath = $this->baseRoutePath;
         $document = $parentDocument = $this->dm->find(null, $basePath);
@@ -142,7 +142,7 @@ public function createAutoRoute(UriContext $uriContext, $contentDocument, $autoR
                 return $this->migrateGenericToAutoRoute(
                     $existingDocument,
                     $contentDocument,
-                    $autoRouteTag,
+                    $locale,
                     AutoRouteInterface::TYPE_PRIMARY
                 );
             }
@@ -161,7 +161,7 @@ public function createAutoRoute(UriContext $uriContext, $contentDocument, $autoR
         $headRoute->setContent($contentDocument);
         $headRoute->setName($headName);
         $headRoute->setParentDocument($document);
-        $headRoute->setAutoRouteTag($autoRouteTag);
+        $headRoute->setLocale($locale);
         $headRoute->setType(AutoRouteInterface::TYPE_PRIMARY);
 
         foreach ($uriContext->getDefaults() as $key => $value) {
@@ -229,12 +229,12 @@ private function getPathFromUri($uri)
      *
      * @param Generic $document
      * @param object  $contentDocument
-     * @param string  $autoRouteTag
+     * @param string  $locale
      * @param string  $routeType
      *
      * @return AutoRouteInterface
      */
-    private function migrateGenericToAutoRoute(Generic $document, $contentDocument, $autoRouteTag, $routeType)
+    private function migrateGenericToAutoRoute(Generic $document, $contentDocument, $locale, $routeType)
     {
         $autoRouteClassName = $this->autoRouteFqcn;
         $mapper = $this->dm->getConfiguration()->getDocumentClassMapper();
@@ -256,7 +256,7 @@ private function migrateGenericToAutoRoute(Generic $document, $contentDocument,
         }
 
         $autoRoute->setContent($contentDocument);
-        $autoRoute->setAutoRouteTag($autoRouteTag);
+        $autoRoute->setLocale($locale);
         $autoRoute->setType($routeType);
 
         return $autoRoute;

src/Model/AutoRoute.php

@@ -22,7 +22,7 @@
  */
 class AutoRoute extends Route implements AutoRouteInterface
 {
-    const DEFAULT_KEY_AUTO_ROUTE_TAG = '_auto_route_tag';
+    const DEFAULT_KEY_AUTO_ROUTE_LOCALE = '_auto_route_tag';
 
     /**
      * @var AutoRouteInterface
@@ -32,17 +32,17 @@ class AutoRoute extends Route implements AutoRouteInterface
     /**
      * {@inheritdoc}
      */
-    public function setAutoRouteTag($autoRouteTag)
+    public function setLocale($locale)
     {
-        $this->setDefault(self::DEFAULT_KEY_AUTO_ROUTE_TAG, $autoRouteTag);
+        $this->setDefault(self::DEFAULT_KEY_AUTO_ROUTE_LOCALE, $locale);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getAutoRouteTag()
+    public function getLocale()
     {
-        return $this->getDefault(self::DEFAULT_KEY_AUTO_ROUTE_TAG);
+        return $this->getDefault(self::DEFAULT_KEY_AUTO_ROUTE_LOCALE);
     }
 
     /**

tests/Functional/EventListener/AutoRouteListenerTest.php

@@ -65,7 +65,7 @@ public function testPersistBlog()
         $this->assertCount(1, $routes);
         $this->assertInstanceOf('Symfony\Cmf\Bundle\RoutingAutoBundle\Model\AutoRoute', $routes[0]);
         $this->assertEquals('unit-testing-blog', $routes[0]->getName());
-        $this->assertEquals(PhpcrOdmAdapter::TAG_NO_MULTILANG, $routes[0]->getAutoRouteTag());
+        $this->assertEquals(PhpcrOdmAdapter::TAG_NO_MULTILANG, $routes[0]->getLocale());
         $this->assertEquals(array(
             '_auto_route_tag' => 'no-multilang',
             'type' => 'cmf_routing_auto.primary',
@@ -257,7 +257,7 @@ public function testMultilangArticle($data, $expectedPaths)
 
             $this->assertNotNull($route, 'Route: '.$expectedPath);
             $this->assertInstanceOf('Symfony\Cmf\Bundle\RoutingAutoBundle\Model\AutoRoute', $route);
-            $this->assertEquals($expectedLocale, $route->getAutoRouteTag());
+            $this->assertEquals($expectedLocale, $route->getLocale());
 
             $content = $route->getContent();