Changeset 7625

Timestamp:

02/27/08 08:12:30 (1 year ago)

Author:

fabien

Message:

added sfPatternRouting::insertRouteBefore() (based on a patch from francois)

Files:

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

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

@@ -241 +241 @@
-
-  /**
+   * Adds a new route before a given one in the current list of routes.
+   *
+   * @see connect
+   */
+  public function insertRouteBefore($pivot, $name, $route, $default = array(), $requirements = array())
+  {
+    if (!isset($this->routes[$pivot]))
+    {
+      throw new sfConfigurationException(sprintf('Unable to insert route "%s" before inexistent route "%s".', $name, $pivot));
+    }
+
+    $routes = $this->routes;
+    $this->routes = array();
+    $newroutes = array();
+    foreach ($routes as $key => $value)
+    {
+      if ($key == $pivot)
+      {
+        $newroutes = array_merge($newroutes, $this->connect($name, $route, $default, $requirements));
+      }
+      $newroutes[$key] = $value;
+    }
+
+    return $this->routes = $newroutes;
+  }
+
+  /**
-   * Adds a new route at the end of the current list of routes.
-   *

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

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-3
+5
-
-class sfPatternRoutingTest extends sfPatternRouting
@@ -409 +409 @@
-$t->is(implode('-', $p_route_names), implode('-', array_reverse($route_names)), '->prependRoute() adds new routes at the beginning of the existings ones');
-
+// ->addRouteBefore()
+$t->diag('->insertRouteBefore()');
+$r->clearRoutes();
+$r->connect('test1', '/:module', array('action' => 'index'));
+$r->connect('test3', '/:module/:action/*', array());
+$r->insertRouteBefore('test3', 'test2', '/:module/:action', array('module' => 'default'));
+$route_names = array_keys($r->getRoutes());
+$r->clearRoutes();
+$r->connect('test1', '/:module', array('action' => 'index'));
+$r->connect('test2', '/:module/:action', array('module' => 'default'));
+$r->connect('test3', '/:module/:action/*', array());
+$test_route_names = array_keys($r->getRoutes());
+$t->is(implode('-', $test_route_names), implode('-', $route_names), '->insertRouteBefore() adds a new route before another existings one');
+$r->clearRoutes();
+$msg = '->insertRouteBefore() throws an sfConfigurationException when trying to insert a route before a non existent one';
+try
+{
+  $r->insertRouteBefore('test2', 'test', '/index.php/:module/:action', array('module' => 'default', 'action' => 'index'));
+  $t->fail($msg);
+}
+catch (sfConfigurationException $e)
+{
+  $t->pass($msg);
+}
+
-// ->getCurrentInternalUri()
-$t->diag('->getCurrentInternalUri()');