remove forcing a default format

Author: lsmith77

CHANGELOG.md

@@ -4,6 +4,8 @@ Changelog
 1.1.0-RC3
 ---------
 
+* **2013-09-04**: If the route matched a pattern with a format extension, the format
+  extension is no longer set as route a default
 * **2013-09-04**: Marked ContentAwareGenerator as obsolete, use ContentAwareGenerator
    from the CMF routing component directly instead. This class will be removed in 1.2
 * **2013-08-09**: dynamic.generic_controller is now defaulting to null instead

Doctrine/Phpcr/RouteProvider.php

@@ -56,16 +56,11 @@ public function getRouteCollectionForRequest(Request $request)
             return $collection;
         }
 
-        $format = preg_match('/.+\.([a-z]+)$/i', $url, $matches) ? $matches[1] : false;
-
         try {
             $routes = $this->getObjectManager()->findMany($this->className, $candidates);
             // filter for valid route objects
             foreach ($routes as $key => $route) {
                 if ($route instanceof SymfonyRoute) {
-                    if ($format && null === $route->getDefault('_format')) {
-                        $route->setDefault('_format', $format);
-                    }
                     $collection->add($key, $route);
                 }
             }
@@ -112,6 +107,7 @@ public function getRouteByName($name, $parameters = array())
         if (!$route) {
             throw new RouteNotFoundException(sprintf('No route found for path "%s"', $name));
         }
+
         if (!$route instanceof SymfonyRoute) {
             throw new RouteNotFoundException(sprintf('Document at path "%s" is no route', $name));
         }
@@ -125,7 +121,7 @@ public function getRouteByName($name, $parameters = array())
     public function getRoutesByNames($names, $parameters = array())
     {
         $collection = $this->getObjectManager()->findMany($this->className, $names);
-        foreach($collection as $key => $document) {
+        foreach ($collection as $key => $document) {
             if (!$document instanceof SymfonyRoute) {
                 // we follow the logic of DocumentManager::findMany and do not throw an exception
                 unset($collection[$key]);

Tests/Functional/Doctrine/Phpcr/RouteProviderTest.php

@@ -86,7 +86,7 @@ public function testGetRouteCollectionForRequestFormat()
         $this->assertEquals('html', $testroute->getDefault('_format'));
         list($key, $root) = each($routes);
         $this->assertEquals(self::ROUTE_ROOT, $key);
-        $this->assertEquals('html', $root->getDefault('_format'));
+        $this->assertEquals(null, $root->getDefault('_format'));
     }
 
     public function testGetRouteCollectionForRequestNophpcrUrl()

Tests/Functional/Routing/DynamicRouterTest.php

@@ -60,6 +60,18 @@ public function setUp()
         $formatroute->setDefault(RouteObjectInterface::CONTROLLER_NAME, 'testController');
         $this->getDm()->persist($formatroute);
 
+        $format2jsonroute = new Route(true);
+        $format2jsonroute->setPosition($root, 'format2.json');
+        $format2jsonroute->setDefault('_format', 'json');
+        $format2jsonroute->setRequirement('_format', 'json');
+        $format2jsonroute->setDefault(RouteObjectInterface::CONTROLLER_NAME, 'testJsonController');
+        $this->getDm()->persist($format2jsonroute);
+
+        $format2route = new Route(true);
+        $format2route->setPosition($root, 'format2');
+        $format2route->setDefault(RouteObjectInterface::CONTROLLER_NAME, 'testController');
+        $this->getDm()->persist($format2route);
+
         $this->getDm()->flush();
     }
 
@@ -153,6 +165,30 @@ public function testMatchFormat()
 
         $this->assertTrue($request->attributes->has(DynamicRouter::ROUTE_KEY));
         $this->assertEquals($expected, $matches);
+
+        $expected = array(
+            '_controller' => 'testController',
+            '_format'     => 'html',
+            RouteObjectInterface::ROUTE_NAME => '/test/routing/format2',
+        );
+        $request = Request::create('/format2.html');
+        $matches = $this->router->matchRequest($request);
+        ksort($matches);
+
+        $this->assertTrue($request->attributes->has(DynamicRouter::ROUTE_KEY));
+        $this->assertEquals($expected, $matches);
+
+        $expected = array(
+            '_controller' => 'testJsonController',
+            '_format'     => 'json',
+            RouteObjectInterface::ROUTE_NAME => '/test/routing/format2.json',
+        );
+        $request = Request::create('/format2.json');
+        $matches = $this->router->matchRequest($request);
+        ksort($matches);
+
+        $this->assertTrue($request->attributes->has(DynamicRouter::ROUTE_KEY));
+        $this->assertEquals($expected, $matches);
     }
 
     /**

composer.json

@@ -19,7 +19,7 @@
         "symfony/framework-bundle": "~2.2"
     },
     "require-dev": {
-        "symfony-cmf/core-bundle": "~1.0.0-alpha1",
+        "symfony-cmf/core-bundle": "1.0.*",
         "symfony-cmf/testing": "1.0.*",
         "sonata-project/doctrine-phpcr-admin-bundle": "1.0.*",
         "symfony/monolog-bundle": "2.2.*",
@@ -31,7 +31,7 @@
         "doctrine/orm": "To enable support for the ORM entities",
 
         "symfony-cmf/content-bundle": "To optionally use the configured value for 'content_basepath' from the CoreBundle",
-        "symfony-cmf/core-bundle": "For compatibility with Symfony 2.2",
+        "symfony-cmf/core-bundle": "For compatibility with Symfony 2.2 and easier configuration",
 
         "sonata-project/doctrine-phpcr-admin-bundle": "To provide an admin interface for the PHPCR ODM documents"
     },