Changeset 11202

Timestamp:

08/27/08 17:08:56 (10 months ago)

Author:

fabien

Message:

[1.2] added the possibility to pass an array to url_for() and link_to() with the route name

Files:

• branches/1.2/lib/controller/sfWebController.class.php (modified) (3 diffs)
• branches/1.2/test/unit/controller/sfWebControllerTest.php (modified) (2 diffs)

branches/1.2/lib/controller/sfWebController.class.php

@@ -32 +32 @@
-  {
-    // absolute URL or symfony URL?
-!is_array
+is_string
-    {
-      return $parameters;
-    }
-
-!is_array
+is_string
-    {
-      return $parameters;
@@ -53 +53 @@
-    $fragment = '';
-
-!is_array
+is_string
-    {
-      // strip fragment
@@ -63 +63 @@
-
-      list($route_name, $parameters) = $this->convertUrlStringToParameters($parameters);
+    }
+    else if (is_array($parameters))
+    {
+      if (isset($parameters['sf_route']))
+      {
+        $route_name = $parameters['sf_route'];
+        unset($parameters['sf_route']);
+      }
-    }
-

branches/1.2/test/unit/controller/sfWebControllerTest.php

@@ -170 +170 @@
-// ->genUrl()
-$t->diag('->genUrl()');
-
-$r = $context->getRouting();
-$t->is($controller->genUrl('module/action?id=4'), $controller->genUrl(array('action' => 'action', 'module' => 'module', 'id' => 4)), '->genUrl() accepts a string or an array as its first argument');
-
@@ -203 +201 @@
-$t->is($controller->genUrl('module/action'), $relativeUrlRoot.$_SERVER['SCRIPT_NAME'].$referenceUrl, '->genUrl() with a relative_url_root set and no_script_name==false');
-$t->is($controller->genUrl('@test'), $relativeUrlRoot.$_SERVER['SCRIPT_NAME'].$referenceRootUrl, '->genUrl() with a relative_url_root set and no_script_name==false (root url)');
-