Merge pull request #4 from dicoding-dev/feature/implements-route-redirect-method

Backport `Route::redirect()` method

Author: rizqyhi

src/Illuminate/Routing/RedirectController.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Illuminate\Routing;
+
+use Illuminate\Http\RedirectResponse;
+
+class RedirectController extends Controller
+{
+    public function action($destination, $status)
+    {
+        return new RedirectResponse($destination, $status);
+    }
+}

src/Illuminate/Routing/Route.php

@@ -142,7 +142,7 @@ protected function compileRoute()
 		$uri = preg_replace('/\{(\w+?)\?\}/', '{$1}', $this->uri);
 
 		$this->compiled = (
-			new SymfonyRoute($uri, $optionals, $this->wheres, array(), $this->domain() ?: '')
+			new SymfonyRoute($uri, $optionals, $this->wheres, ['utf8' => true], $this->domain() ?: '')
 		)->compile();
 	}
 
@@ -455,11 +455,16 @@ protected function matchToKeys(array $matches)
 	 */
 	protected function replaceDefaults(array $parameters)
 	{
-		foreach ($parameters as $key => &$value)
-		{
-			$value = isset($value) ? $value : array_get($this->defaults, $key);
+		foreach ($parameters as $key => $value) {
+			$parameters[$key] = $value ?? array_get($this->defaults, $key);
 		}
 
+        foreach ($this->defaults as $key => $value) {
+            if (! isset($parameters[$key])) {
+                $parameters[$key] = $value;
+            }
+        }
+
 		return $parameters;
 	}
 

src/Illuminate/Routing/Router.php

@@ -220,6 +220,21 @@ public function any($uri, $action)
 		return $this->addRoute($verbs, $uri, $action);
 	}
 
+    /**
+     * Create a redirect from one URI to another.
+     *
+     * @param  string  $uri
+     * @param  string  $destination
+     * @param  int  $status
+     * @return \Illuminate\Routing\Route
+     */
+    public function redirect($uri, $destination, $status = 301)
+    {
+        return $this->any($uri, '\Illuminate\Routing\RedirectController@action')
+            ->defaults('destination', $destination)
+            ->defaults('status', $status);
+    }
+
 	/**
 	 * Register a new route with the given verbs.
 	 *

tests/Routing/RoutingRouteTest.php

@@ -89,10 +89,9 @@ public function testBasicDispatchingOfRoutes(): void
 		$router->get('foo/bar', fn() => 'second');
 		$this->assertEquals('second', $router->dispatch(Request::create('foo/bar', 'GET'))->getContent());
 
-		// @todo fix this thest onnce you understand it
-//		$router = $this->getRouter();
-//		$router->get('foo/bar/åαф', function() { return 'hello'; });
-//		$this->assertEquals('hello', $router->dispatch(Request::create('foo/bar/%C3%A5%CE%B1%D1%84', 'GET'))->getContent());
+		$router = $this->getRouter();
+		$router->get('foo/bar/åαф', function() { return 'hello'; });
+		$this->assertEquals('hello', $router->dispatch(Request::create('foo/bar/%C3%A5%CE%B1%D1%84', 'GET'))->getContent());
 	}
 
 
@@ -868,6 +867,37 @@ public function testRouterPatternSetting(): void
 	}
 
 
+    public function testRouteParametersDefaultValue()
+    {
+        $router = $this->getRouter();
+
+        $router->get('foo/{bar?}', function ($bar = '') {
+            return $bar;
+        })->defaults('bar', 'foo');
+        $this->assertEquals('foo', $router->dispatch(Request::create('foo', 'GET'))->getContent());
+
+
+        $router->get('foo/{bar?}', function ($bar = '') {
+            return $bar;
+        })->defaults('bar', 'foo');
+        $this->assertEquals('bar', $router->dispatch(Request::create('foo/bar', 'GET'))->getContent());
+    }
+
+
+    public function testRouteRedirect()
+    {
+        $router = $this->getRouter();
+        $router->get('contact_us', function () {
+            throw new \Exception('Route should not be reachable.');
+        });
+        $router->redirect('contact_us', 'contact', 302);
+
+        $response = $router->dispatch(Request::create('contact_us', 'GET'));
+        $this->assertTrue($response->isRedirect('contact'));
+        $this->assertEquals(302, $response->getStatusCode());
+    }
+
+
 	protected function getRouter(): Router
     {
 		return new Router(new Illuminate\Events\Dispatcher);