Merge pull request #1036 from CoditoNet/annotation_format_overriding

Setting default format in RestRouteCollection.php only if not set already
FriendsOfSymfony · May 13, 2015 · 28853da · 28853da
2 parents ceb10f9 + 785373d
commit 28853da
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Routing/RestRouteCollection.php b/Routing/RestRouteCollection.php
@@ -62,7 +62,10 @@ public function prependRouteControllersWithPrefix($prefix)
     public function setDefaultFormat($format)
     {
         foreach (parent::all() as $route) {
-            $route->setDefault('_format', $format);
+            // Set default format only if not set already (could be defined in annotation)
+            if (!$route->getDefault('_format')) {
+                $route->setDefault('_format', $format);
+            }
         }
     }