fix

pmaxs · Sep 5, 2021 · 95d064a · 95d064a
1 parent f24493a
commit 95d064a
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/Router/Path2QueryRouter.php b/src/Router/Path2QueryRouter.php
@@ -44,8 +44,10 @@ public function getPath2QueryRouteCollection()
 
     public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH)
     {
+        $routes = $this->getPath2QueryRouteCollection();
+
         if ('JMS' == self::ROUTER_ORIGIN) {
-            $route = $this->getPath2QueryRouteCollection()->get($name);
+            $route = $routes->get($name);
         } else {
             $generator = $this->getGenerator();
             $locale = $parameters['_locale']
@@ -54,20 +56,22 @@ public function generate($name, $parameters = array(), $referenceType = self::AB
             $route = null;
 
             if (null !== $locale) {
-                $routes = $this->getPath2QueryRouteCollection();
-
                 do {
                     if (null !== ($route = $routes->get($name.'.'.$locale)) && $route->getDefault('_canonical_route') === $name) {
                         break;
                     }
                 } while (false !== $locale = strstr($locale, '_', true));
             }
 
-            if (empty($route) || empty($route->getDefault(self::ENABLED_PARAM)) || isset($parameters[self::QUERY_PARAM])) {
-                return parent::generate($name, $parameters, $referenceType);
+            if (empty($route)) {
+                $route = $routes->get($name);
             }
         }
 
+        if (empty($route) || empty($route->getDefault(self::ENABLED_PARAM)) || isset($parameters[self::QUERY_PARAM])) {
+            return parent::generate($name, $parameters, $referenceType);
+        }
+
         $routeVars = $route->compile()->getVariables();
         $queryVars = [];