Merge pull request #1483 from CachetHQ/middelware-typehinting

Typehint middlewares

app/Http/Middleware/Acceptable.php

@@ -12,6 +12,7 @@
 namespace CachetHQ\Cachet\Http\Middleware;
 
 use Closure;
+use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException;
 
 class Acceptable
@@ -25,7 +26,7 @@ class Acceptable
      *
      * @return mixed
      */
-    public function handle($request, Closure $next, $type = null)
+    public function handle(Request $request, Closure $next, $type = null)
     {
         if (!$request->accepts($type ?: 'accept:application/json')) {
             throw new NotAcceptableHttpException();

app/Http/Middleware/Admin.php

@@ -13,6 +13,7 @@ namespace CachetHQ\Cachet\Http\Middleware;
 
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class Admin
@@ -44,7 +45,7 @@ class Admin
      *
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
     {
         if (!$this->auth->check() || ($this->auth->check() && !$this->auth->user()->isAdmin)) {
             throw new HttpException(401);

app/Http/Middleware/ApiAuthentication.php

@@ -15,6 +15,7 @@ use CachetHQ\Cachet\Models\User;
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class ApiAuthentication
@@ -47,7 +48,7 @@ class ApiAuthentication
      *
      * @return mixed
      */
-    public function handle($request, Closure $next, $required = false)
+    public function handle(Request $request, Closure $next, $required = false)
     {
         if ($this->auth->guest()) {
             if ($apiToken = $request->header('X-Cachet-Token')) {

app/Http/Middleware/Authenticate.php

@@ -13,6 +13,7 @@ namespace CachetHQ\Cachet\Http\Middleware;
 
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class Authenticate
@@ -44,7 +45,7 @@ class Authenticate
      *
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
     {
         if ($this->auth->guest()) {
             throw new HttpException(401);

app/Http/Middleware/Localize.php

@@ -13,6 +13,7 @@ namespace CachetHQ\Cachet\Http\Middleware;
 
 use Closure;
 use Illuminate\Config\Repository;
+use Illuminate\Http\Request;
 use Jenssegers\Date\Date;
 
 class Localize
@@ -52,7 +53,7 @@ class Localize
      *
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
     {
         $supportedLanguages = $request->getLanguages();
         $userLanguage = $this->config->get('app.locale');

app/Http/Middleware/ReadyForUse.php

@@ -13,6 +13,7 @@ namespace CachetHQ\Cachet\Http\Middleware;
 
 use Closure;
 use Exception;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Redirect;
 
@@ -26,7 +27,7 @@ class ReadyForUse
      *
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
     {
         try {
             if (!Config::get('setting.app_name')) {

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -14,6 +14,7 @@ namespace CachetHQ\Cachet\Http\Middleware;
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
 
 class RedirectIfAuthenticated
 {
@@ -44,7 +45,7 @@ class RedirectIfAuthenticated
      *
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
     {
         if ($this->auth->check()) {
             return new RedirectResponse(route('dashboard.index'));

app/Http/Middleware/SetupAlreadyCompleted.php

@@ -12,6 +12,7 @@
 namespace CachetHQ\Cachet\Http\Middleware;
 
 use Closure;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Redirect;
 
@@ -25,7 +26,7 @@ class SetupAlreadyCompleted
      *
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
     {
         if (Config::get('setting.app_name')) {
             return Redirect::to('dashboard');

app/Http/Middleware/SubscribersConfigured.php

@@ -12,6 +12,7 @@
 namespace CachetHQ\Cachet\Http\Middleware;
 
 use Closure;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Redirect;
 
 class SubscribersConfigured
@@ -24,7 +25,7 @@ class SubscribersConfigured
      *
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
     {
         if (!subscribers_enabled()) {
             return Redirect::route('status-page');

app/Http/Middleware/Timezone.php

@@ -13,6 +13,7 @@ namespace CachetHQ\Cachet\Http\Middleware;
 
 use Closure;
 use Illuminate\Contracts\Config\Repository;
+use Illuminate\Http\Request;
 
 class Timezone
 {
@@ -43,7 +44,7 @@ class Timezone
      *
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
     {
         if ($tz = $request->header('Time-Zone')) {
             $this->config->set('cachet.timezone', $tz);