Fix issue where RouterBuilder::scope() would not allow 2 arguments.

cakephp · Aug 22, 2014 · 817cc77 · 817cc77
1 parent a106f21
commit 817cc77
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Routing/RouteBuilder.php b/src/Routing/RouteBuilder.php
@@ -484,7 +484,7 @@ public function plugin($name, $options = [], $callback = null) {
  * @return void
  * @throws \InvalidArgumentException when there is no callable parameter.
  */
-	public function scope($path, $params, $callback) {
+	public function scope($path, $params, $callback = null) {
 		if ($callback === null) {
 			$callback = $params;
 			$params = [];

diff --git a/tests/TestCase/Routing/RouteBuilderTest.php b/tests/TestCase/Routing/RouteBuilderTest.php
@@ -419,6 +419,12 @@ public function testScope() {
 			$this->assertEquals('/api/v1', $routes->path());
 			$this->assertEquals(['prefix' => 'api', 'version' => 1], $routes->params());
 		});
+
+		$routes = new RouteBuilder($this->collection, '/api', ['prefix' => 'api']);
+		$routes->scope('/v1', function($routes) {
+			$this->assertEquals('/api/v1', $routes->path());
+			$this->assertEquals(['prefix' => 'api'], $routes->params());
+		});
 	}
 
 }