Changeset 7901

Timestamp:

03/15/08 13:56:27 (2 years ago)

Author:

fabien

Message:

fixed sf1.1 has changed routing (closes #3090)

Files:

• branches/1.1/lib/routing/sfPatternRouting.class.php (modified) (3 diffs)
• branches/1.1/test/unit/routing/sfPatternRoutingTest.php (modified) (2 diffs)

branches/1.1/lib/routing/sfPatternRouting.class.php

@@ -315 +315 @@
-      }
-    }
+    $givenDefaults = $defaults;
-    $defaults = $this->fixDefaults($defaults);
-
@@ -335 +336 @@
-    if (!empty($route) && '/' == $route[0])
-    {
- 
+
-    }
-
@@ -387 +388 @@
-          $currentSeparator = '';
-
+          // for 1.0 BC, we don't take into account the default module and action variable
+          // for 1.2, remove the $givenDefaults var and move the $firstOptional setting to
+          // the condition below
+          if (!isset($givenDefaults[$variable]))
+          {
+            $firstOptional = count($segments);
+          }
+
-          if (!isset($defaults[$variable]))
-          {

branches/1.1/test/unit/routing/sfPatternRoutingTest.php

@@ -119 +119 @@
-$r->connect('test', '/:module/:action/test/:id/:test', array('module' => 'default', 'action' => 'index'));
-$r->connect('test1', '/:module/:action/test/:id', array('module' => 'default', 'action' => 'index', 'id' => 'foo'));
-, 'test' => null
+
-$url = '/default/index/test/foo';
-$t->is($r->parse($url), $params, '->parse()    takes the first matching route');
@@ -510 +510 @@
-$t->is($r->parse('/test1/value/test%26foo%3Dbar%2Bfoo'), array('module' => 'default', 'action' => 'index', 'value' => 'test&foo=bar+foo'), '->parse() decodes parameter values');
-
-
-// feature change bug from sf1.0 - ticket #3090
-$r->clearRoutes();