From e81a6022d77afc7b68611a40cb5c732077c5e7de Mon Sep 17 00:00:00 2001 From: Jaume Alemany Date: Fri, 21 Jul 2017 12:36:22 +0200 Subject: [PATCH 1/3] Fix `sfPatternRouting->getRoutes()` sometimes returning serialized routes --- lib/routing/sfPatternRouting.class.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/routing/sfPatternRouting.class.php b/lib/routing/sfPatternRouting.class.php index 58c69685c..470d34f3f 100644 --- a/lib/routing/sfPatternRouting.class.php +++ b/lib/routing/sfPatternRouting.class.php @@ -151,6 +151,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; } From da1ab310f2b8fa713e4a4b11940c642da486d900 Mon Sep 17 00:00:00 2001 From: Hugo Chinchilla Carbonell Date: Tue, 27 Aug 2019 12:29:31 +0200 Subject: [PATCH 2/3] fix test --- test/unit/routing/sfPatternRoutingTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/routing/sfPatternRoutingTest.php b/test/unit/routing/sfPatternRoutingTest.php index 20398fbe6..b38d82f1a 100644 --- a/test/unit/routing/sfPatternRoutingTest.php +++ b/test/unit/routing/sfPatternRoutingTest.php @@ -640,7 +640,7 @@ function configureRouting($event) $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'); +$t->ok(is_object($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'); $t->is_deeply($r->parse('/'), array('module' => 'default', 'action' => 'index'), '->parse() Default parameters are applied to serialized routes'); From 60a4840b6f77cf389c3f21fb85a94388eec56d3c Mon Sep 17 00:00:00 2001 From: Hugo Chinchilla Carbonell Date: Tue, 27 Aug 2019 12:30:02 +0200 Subject: [PATCH 3/3] change test order so it really checks what is suposed to check --- test/unit/routing/sfPatternRoutingTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/routing/sfPatternRoutingTest.php b/test/unit/routing/sfPatternRoutingTest.php index b38d82f1a..394d6a90c 100644 --- a/test/unit/routing/sfPatternRoutingTest.php +++ b/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_object($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');