Improve the Nova\Routing\RouteCompiler

nova-framework · Dec 12, 2019 · e0f043f · e0f043f
1 parent e34daa2
commit e0f043f
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/Routing/RouteCompiler.php b/src/Routing/RouteCompiler.php
@@ -40,9 +40,9 @@ public function compile()
             $domain = '';
         }
 
-        $path = preg_replace('/\{(\w+?)\?\}/', '{$1}', $uri = $route->uri());
+        $optionals = $this->extractOptionalParameters($uri = $route->uri());
 
-        $optionals = $this->extractOptionalParameters($uri);
+        $path = preg_replace('/\{(\w+?)\?\}/', '{$1}', $uri);
 
         return with(
             new SymfonyRoute($path, $optionals, $route->patterns(), array(), $domain)
@@ -61,11 +61,7 @@ protected function extractOptionalParameters($uri)
     {
         preg_match_all('/\{(\w+?)\?\}/', $uri, $matches);
 
-        if (! isset($matches[1])) {
-            return array();
-        }
-
-        return array_fill_keys($matches[1], null);
+        return isset($matches[1]) ? array_fill_keys($matches[1], null) : array();
     }
 
     /**