(fixed #4438) Fix sfPatternRouting->getRoutes() sometimes returning…

… serialized routes FriendsOfSymfony1/symfony1#169 参照
nishizoe · Jun 1, 2020 · e38257f · e38257f
1 parent 92106c5
commit e38257f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/vendor/symfony/lib/routing/sfPatternRouting.class.php b/lib/vendor/symfony/lib/routing/sfPatternRouting.class.php
@@ -144,6 +144,14 @@ public function getCurrentRouteName()
    */
   public function getRoutes()
   {
+    foreach ($this->routes as $name => $route) {
+      if (is_string($route)) {
+        $route = unserialize($route);
+        $route->setDefaultParameters($this->defaultParameters);
+        $this->routes[$name] = $route;
+      }
+    }
+
     return $this->routes;
   }
 

diff --git a/lib/vendor/symfony/test/unit/routing/sfPatternRoutingTest.php b/lib/vendor/symfony/test/unit/routing/sfPatternRoutingTest.php
@@ -639,8 +639,8 @@ function configureRouting($event)
 // see fixtures/config_routing.yml.php
 $r = new sfPatternRoutingTest(new sfEventDispatcher(), new sfNoCache(), array('load_configuration' => true));
 $t->ok($r->hasRouteName('test1'), '->loadConfiguration() Config file is loaded');
-$routes = $r->getRoutes();
-$t->ok(is_string($routes['test1']), '->loadConfiguration() Route objects are not serialized in cache');
 $route = $r->getRoute('test1');
 $t->ok(is_object($route), '->loadConfiguration() Route objects are unserialized on demand');
+$routes = $r->getRoutes();
+$t->ok(is_object($routes['test1']), '->loadConfiguration() Route objects are not serialized in cache');
 $t->is_deeply($r->parse('/'), array('module' => 'default', 'action' => 'index'), '->parse() Default parameters are applied to serialized routes');