Changeset 17466

Timestamp:

04/21/09 08:17:10 (4 years ago)

Author:

fabien

Message:

[1.2, 1.3] fixed default parameters management for routes (refs #6309)

Files:

• branches/1.2/lib/routing/sfPatternRouting.class.php (modified) (5 diffs)
• branches/1.3/lib/routing/sfPatternRouting.class.php (modified) (5 diffs)

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

@@ -360 +360 @@
-
-  /**
+   * Sets a default parameter.
+   *
+   * @param string $key    The key
+   * @param string $value  The value
+   */
+/*
+  public function setDefaultParameter($key, $value)
+  {
+    parent::setDefaultParameter($key, $value);
+    foreach ($this->routes as $name => $route)
+    {
+      if (is_string($route))
+      {
+        $route = $this->loadRoute($name);
+      }
+      $route->setDefaultParameters($this->defaultParameters);
+    }
+  }
+*/
+  /**
+   * Sets the default parameters for URL generation.
+   *
+   * @param array $parameters  An array of default parameters
+   */
+/*
+  public function setDefaultParameters($parameters)
+  {
+    parent::setDefaultParameters($parameters);
+    foreach ($this->routes as $name => $route)
+    {
+      if (is_string($route))
+      {
+        $route = $this->loadRoute($name);
+      }
+      $route->setDefaultParameters($this->defaultParameters);
+    }
+  }
+*/
+
+  /**
-   * @see sfRouting
-   */
@@ -392 +432 @@
-        $route = $this->loadRoute($name);
-      }
+      $route->setDefaultParameters($this->defaultParameters);
-    }
-    else
@@ -448 +489 @@
-      $route = $this->loadRoute($info['name']);
-    }
+    $route->setDefaultParameters($this->defaultParameters);
-
-    $route->bind($this->options['context'], $info['parameters']);
@@ -555 +597 @@
-        $route = $this->loadRoute($name);
-      }
+      $route->setDefaultParameters($this->defaultParameters);
-
-      if (false === $parameters = $route->matchesUrl($url, $this->options['context']))
@@ -575 +618 @@
-        $route = $this->loadRoute($name);
-      }
+      $route->setDefaultParameters($this->defaultParameters);
-
-      if ($route->matchesParameters($parameters, $this->options['context']))

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

@@ -334 +334 @@
-
-  /**
+   * Sets a default parameter.
+   *
+   * @param string $key    The key
+   * @param string $value  The value
+   */
+/*
+  public function setDefaultParameter($key, $value)
+  {
+    parent::setDefaultParameter($key, $value);
+    foreach ($this->routes as $name => $route)
+    {
+      if (is_string($route))
+      {
+        $route = $this->loadRoute($name);
+      }
+      $route->setDefaultParameters($this->defaultParameters);
+    }
+  }
+*/
+  /**
+   * Sets the default parameters for URL generation.
+   *
+   * @param array $parameters  An array of default parameters
+   */
+/*
+  public function setDefaultParameters($parameters)
+  {
+    parent::setDefaultParameters($parameters);
+    foreach ($this->routes as $name => $route)
+    {
+      if (is_string($route))
+      {
+        $route = $this->loadRoute($name);
+      }
+      $route->setDefaultParameters($this->defaultParameters);
+    }
+  }
+*/
+
+  /**
-   * @see sfRouting
-   */
@@ -366 +406 @@
-        $route = $this->loadRoute($name);
-      }
+      $route->setDefaultParameters($this->defaultParameters);
-    }
-    else
@@ -422 +463 @@
-      $route = $this->loadRoute($info['name']);
-    }
+    $route->setDefaultParameters($this->defaultParameters);
-
-    $route->bind($this->options['context'], $info['parameters']);
@@ -529 +571 @@
-        $route = $this->loadRoute($name);
-      }
+      $route->setDefaultParameters($this->defaultParameters);
-
-      if (false === $parameters = $route->matchesUrl($url, $this->options['context']))
@@ -549 +592 @@
-        $route = $this->loadRoute($name);
-      }
+      $route->setDefaultParameters($this->defaultParameters);
-
-      if ($route->matchesParameters($parameters, $this->options['context']))