Merge pull request #1036 from CoditoNet/annotation_format_overriding

lsmith77 · lsmith77 · commit 28853daaf36e · 2015-05-13T14:05:19.000+02:00
Setting default format in RestRouteCollection.php only if not set already
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);
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,10 @@ public function prependRouteControllersWithPrefix($prefix)`
`62`	`62`	`public function setDefaultFormat($format)`
`63`	`63`	`{`
`64`	`64`	`foreach (parent::all() as $route) {`
`65`		`- $route->setDefault('_format', $format);`
	`65`	`+ // Set default format only if not set already (could be defined in annotation)`
	`66`	`+ if (!$route->getDefault('_format')) {`
	`67`	`+ $route->setDefault('_format', $format);`
	`68`	`+ }`
`66`	`69`	`}`
`67`	`70`	`}`
`68`	`71`