Fix error in Router::redirect().

Type warnings would be emitted when redirect() was called with a string target.
cakephp · Jun 29, 2014 · 74c7273 · 74c7273
1 parent 982b696
commit 74c7273
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/Routing/Router.php b/src/Routing/Router.php
@@ -361,6 +361,9 @@ public static function connect($route, $defaults = [], $options = []) {
  */
 	public static function redirect($route, $url, $options = []) {
 		$options['routeClass'] = 'Cake\Routing\Route\RedirectRoute';
+		if (is_string($url)) {
+			$url = ['redirect' => $url];
+		}
 		return static::connect($route, $url, $options);
 	}
 

diff --git a/tests/TestCase/Routing/RouterTest.php b/tests/TestCase/Routing/RouterTest.php
@@ -2676,6 +2676,18 @@ public function testPatternOnAction() {
 		$this->assertFalse($result);
 	}
 
+/**
+ * Test that redirect() works.
+ *
+ * @return void
+ */
+	public function testRedirect() {
+		Router::redirect('/mobile', '/', ['status' => 301]);
+		$scope = Router::scope('/');
+		$route = $scope->routes()[0];
+		$this->assertInstanceOf('Cake\Routing\Route\RedirectRoute', $route);
+	}
+
 /**
  * Tests resourceMap as getter and setter.
  *