Browse Source

Simplifying some filters.

Taylor Otwell 9 years ago
parent
commit
076d86bf26
2 changed files with 6 additions and 23 deletions
  1. 3 12
      app/Http/Filters/GuestFilter.php
  2. 3 11
      app/Http/Filters/MaintenanceFilter.php

+ 3 - 12
app/Http/Filters/GuestFilter.php

@@ -1,6 +1,6 @@
 <?php namespace App\Http\Filters;
 
-use Illuminate\Contracts\Routing\ResponseFactory;
+use Illuminate\Http\RedirectResponse;
 
 class GuestFilter {
 
@@ -11,24 +11,15 @@ class GuestFilter {
 	 */
 	protected $auth;
 
-	/**
-	 * The response factory implementation.
-	 *
-	 * @var ResponseFactory
-	 */
-	protected $response;
-
 	/**
 	 * Create a new filter instance.
 	 *
 	 * @param  Authenticator  $auth
 	 * @return void
 	 */
-	public function __construct(Authenticator $auth,
-								ResponseFacotry $response)
+	public function __construct(Authenticator $auth)
 	{
 		$this->auth = $auth;
-		$this->response = $response;
 	}
 
 	/**
@@ -40,7 +31,7 @@ class GuestFilter {
 	{
 		if ($this->auth->check())
 		{
-			return $this->response->redirectTo('/');
+			return new RedirectResponse(url('/'));
 		}
 	}
 

+ 3 - 11
app/Http/Filters/MaintenanceFilter.php

@@ -1,7 +1,7 @@
 <?php namespace App\Http\Filters;
 
+use Illuminate\Http\Response;
 use Illuminate\Contracts\Foundation\Application;
-use Illuminate\Contracts\Routing\ResponseFactory;
 
 class MaintenanceFilter {
 
@@ -12,23 +12,15 @@ class MaintenanceFilter {
 	 */
 	protected $app;
 
-	/**
-	 * The response factory implementation.
-	 *
-	 * @var ResponseFactory
-	 */
-	protected $response;
-
 	/**
 	 * Create a new filter instance.
 	 *
 	 * @param  Application  $app
 	 * @return void
 	 */
-	public function __construct(Application $app, ResponseFactory $response)
+	public function __construct(Application $app)
 	{
 		$this->app = $app;
-		$this->response = $response;
 	}
 
 	/**
@@ -40,7 +32,7 @@ class MaintenanceFilter {
 	{
 		if ($this->app->isDownForMaintenance())
 		{
-			return $this->response->make('Be right back!', 503);
+			return new Response('Be right back!', 503);
 		}
 	}