moved logic to an internal method

silexphp · Aug 3, 2015 · b510e5a · b510e5a · aeoris · Jan 7, 2016
1 parent 401674e
commit b510e5a
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/Silex/ControllerCollection.php b/src/Silex/ControllerCollection.php
@@ -186,16 +186,17 @@ public function __call($method, $arguments)
      *
      * @return RouteCollection A RouteCollection instance
      */
-    public function flush($prefix = '', $routes = null)
+    public function flush($prefix = '')
+    {
+        return $this->doFlush($prefix, new RouteCollection());
+    }
+
+    private function doFlush($prefix, RouteCollection $routes)
     {
         if ($prefix !== '') {
             $prefix = '/'.trim(trim($prefix), '/');
         }
 
-        if (null === $routes) {
-            $routes = new RouteCollection(); 
-        }
-
         foreach ($this->controllers as $controller) {
             if ($controller instanceof Controller) {
                 $controller->getRoute()->setPath($prefix.$controller->getRoute()->getPath());
@@ -209,7 +210,7 @@ public function flush($prefix = '', $routes = null)
                 $routes->add($name, $controller->getRoute());
                 $controller->freeze();
             } else {
-                $routes->addCollection($controller->flush($prefix.$controller->prefix, $routes));
+                $routes->addCollection($controller->doFlush($prefix.$controller->prefix, $routes));
             }
         }