From b8f3dd6265b4bfd318eab98ef65887203a809173 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Mon, 6 Oct 2014 15:46:34 -0500
Subject: [PATCH] Working on middle wares.

---
 app/Http/Middleware/AuthMiddleware.php        |  4 ++--
 app/Http/Middleware/BasicAuthMiddleware.php   |  4 ++--
 app/Http/Middleware/CsrfMiddleware.php        |  6 +++---
 app/Http/Middleware/GuestMiddleware.php       |  4 ++--
 app/Http/Middleware/MaintenanceMiddleware.php |  4 ++--
 app/Providers/AppServiceProvider.php          | 17 +++++++++++++++++
 6 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/app/Http/Middleware/AuthMiddleware.php b/app/Http/Middleware/AuthMiddleware.php
index 108f27d4..15bb7762 100644
--- a/app/Http/Middleware/AuthMiddleware.php
+++ b/app/Http/Middleware/AuthMiddleware.php
@@ -39,9 +39,9 @@ public function __construct(Authenticator $auth,
 	/**
 	 * Handle an incoming request.
 	 *
-	 * @param  \Symfony\Component\HttpFoundation\Request  $request
+	 * @param  \Illuminate\Http\Request  $request
 	 * @param  \Closure  $next
-	 * @return \Symfony\Component\HttpFoundation\Response
+	 * @return mixed
 	 */
 	public function handle($request, Closure $next)
 	{
diff --git a/app/Http/Middleware/BasicAuthMiddleware.php b/app/Http/Middleware/BasicAuthMiddleware.php
index 9c566ff9..5ca55ebb 100644
--- a/app/Http/Middleware/BasicAuthMiddleware.php
+++ b/app/Http/Middleware/BasicAuthMiddleware.php
@@ -27,9 +27,9 @@ public function __construct(Authenticator $auth)
 	/**
 	 * Handle an incoming request.
 	 *
-	 * @param  \Symfony\Component\HttpFoundation\Request  $request
+	 * @param  \Illuminate\Http\Request  $request
 	 * @param  \Closure  $next
-	 * @return \Symfony\Component\HttpFoundation\Response
+	 * @return mixed
 	 */
 	public function handle($request, Closure $next)
 	{
diff --git a/app/Http/Middleware/CsrfMiddleware.php b/app/Http/Middleware/CsrfMiddleware.php
index 4cbef12e..0b81362e 100644
--- a/app/Http/Middleware/CsrfMiddleware.php
+++ b/app/Http/Middleware/CsrfMiddleware.php
@@ -9,13 +9,13 @@ class CsrfMiddleware implements Middleware {
 	/**
 	 * Handle an incoming request.
 	 *
-	 * @param  \Symfony\Component\HttpFoundation\Request  $request
+	 * @param  \Illuminate\Http\Request  $request
 	 * @param  \Closure  $next
-	 * @return \Symfony\Component\HttpFoundation\Response
+	 * @return mixed
 	 */
 	public function handle($request, Closure $next)
 	{
-		if ($request->getSession()->token() != $request->input('_token'))
+		if ($request->session()->token() != $request->input('_token'))
 		{
 			throw new TokenMismatchException;
 		}
diff --git a/app/Http/Middleware/GuestMiddleware.php b/app/Http/Middleware/GuestMiddleware.php
index 10293607..4e5c6c1e 100644
--- a/app/Http/Middleware/GuestMiddleware.php
+++ b/app/Http/Middleware/GuestMiddleware.php
@@ -28,9 +28,9 @@ public function __construct(Authenticator $auth)
 	/**
 	 * Handle an incoming request.
 	 *
-	 * @param  \Symfony\Component\HttpFoundation\Request  $request
+	 * @param  \Illuminate\Http\Request  $request
 	 * @param  \Closure  $next
-	 * @return \Symfony\Component\HttpFoundation\Response
+	 * @return mixed
 	 */
 	public function handle($request, Closure $next)
 	{
diff --git a/app/Http/Middleware/MaintenanceMiddleware.php b/app/Http/Middleware/MaintenanceMiddleware.php
index 02fa6b27..3afb959c 100644
--- a/app/Http/Middleware/MaintenanceMiddleware.php
+++ b/app/Http/Middleware/MaintenanceMiddleware.php
@@ -28,9 +28,9 @@ public function __construct(Application $app)
 	/**
 	 * Handle an incoming request.
 	 *
-	 * @param  \Symfony\Component\HttpFoundation\Request  $request
+	 * @param  \Illuminate\Http\Request  $request
 	 * @param  \Closure  $next
-	 * @return \Symfony\Component\HttpFoundation\Response
+	 * @return mixed
 	 */
 	public function handle($request, Closure $next)
 	{
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 8fe36ab8..218b52f6 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -31,4 +31,21 @@ class AppServiceProvider extends ServiceProvider {
 		'Illuminate\Session\Middleware\Writer',
 	];
 
+	/**
+	 * Build the application stack based on the provider properties.
+	 *
+	 * @return void
+	 */
+	public function stack()
+	{
+		$this->app->stack(function(Stack $stack, Router $router)
+		{
+			return $stack
+				->middleware($this->stack)->then(function($request) use ($router)
+				{
+					return $router->dispatch($request);
+				});
+			});
+	}
+
 }