¨4.0.1¨

app/Http/Middleware/CheckForMaintenanceMode.php

@@ -3,6 +3,9 @@
 namespace FleetCart\Http\Middleware;
 
 use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+use Illuminate\Foundation\Http\Exceptions\MaintenanceModeException;
 use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode as BaseCheckForMaintenanceMode;
 
 class CheckForMaintenanceMode extends BaseCheckForMaintenanceMode
@@ -16,17 +19,19 @@ class CheckForMaintenanceMode extends BaseCheckForMaintenanceMode
         '*/admin*',
     ];
 
+
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param Request $request
+     * @param Closure $next
+     *
      * @return mixed
      *
-     * @throws \Symfony\Component\HttpKernel\Exception\HttpException
-     * @throws \Illuminate\Foundation\Http\Exceptions\MaintenanceModeException
+     * @throws HttpException
+     * @throws MaintenanceModeException
      */
-    public function handle($request, Closure $next)
+    public function handle($request, Closure $next): mixed
     {
         if (
             config('app.installed')

app/Http/Middleware/ConvertStringBooleans.php

@@ -9,11 +9,12 @@ class ConvertStringBooleans extends TransformsRequest
     /**
      * Transform the given value.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure $next
+     * @param $key
+     * @param $value
+     *
      * @return mixed
      */
-    protected function transform($key, $value)
+    protected function transform($key, $value): mixed
     {
         if ($value === 'true' || $value === 'TRUE') {
             return true;

app/Http/Middleware/LicenseChecker.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace FleetCart\Http\Middleware;
+
+use Closure;
+use FleetCart\License;
+
+class LicenseChecker
+{
+    private $license;
+
+
+    public function __construct(License $license)
+    {
+        $this->license = $license;
+    }
+
+
+    public function handle($request, Closure $next)
+    {
+        if ($this->license->shouldRecheck()) {
+            $this->license->recheck();
+        } else if ($this->license->shouldCreateLicense()) {
+            return redirect()->route('license.create');
+        }
+
+        return $next($request);
+    }
+}

app/Http/Middleware/RedirectIfInstalled.php

@@ -3,17 +3,19 @@
 namespace FleetCart\Http\Middleware;
 
 use Closure;
+use Illuminate\Http\Request;
 
 class RedirectIfInstalled
 {
     /**
      * Handle an incoming request.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure $next
+     * @param Request $request
+     * @param Closure $next
+     *
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle($request, Closure $next): mixed
     {
         if (config('app.installed')) {
             return redirect()->route('home');

app/Http/Middleware/RedirectIfShouldNotCreateLicense.php

@@ -4,26 +4,30 @@ namespace FleetCart\Http\Middleware;
 
 use Closure;
 use FleetCart\License;
+use Illuminate\Http\Request;
 
 class RedirectIfShouldNotCreateLicense
 {
     private $license;
 
+
     public function __construct(License $license)
     {
         $this->license = $license;
     }
 
+
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param Request $request
+     * @param Closure $next
+     *
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle($request, Closure $next): mixed
     {
-        if ($this->license->valid() || ! $this->license->shouldCreateLicense()) {
+        if ($this->license->valid() || !$this->license->shouldCreateLicense()) {
             return redirect()->intended('/admin');
         }
 

app/Http/Middleware/RedirectToInstallerIfNotInstalled.php

@@ -3,20 +3,22 @@
 namespace FleetCart\Http\Middleware;
 
 use Closure;
+use Illuminate\Http\Request;
 
 class RedirectToInstallerIfNotInstalled
 {
     /**
      * Handle an incoming request.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure $next
+     * @param Request $request
+     * @param Closure $next
+     *
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle($request, Closure $next): mixed
     {
-        if (! config('app.installed') && ! $request->is('install/*')) {
-            return redirect()->route('install.pre_installation');
+        if (!config('app.installed') && !$request->is('install')) {
+            return redirect()->route('install.show');
         }
 
         return $next($request);

app/Http/Middleware/RunUpdater.php

@@ -4,17 +4,19 @@ namespace FleetCart\Http\Middleware;
 
 use Closure;
 use FleetCart\Updater;
+use Illuminate\Http\Request;
 
 class RunUpdater
 {
     /**
      * Handle an incoming request.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure $next
+     * @param Request $request
+     * @param Closure $next
+     *
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next): mixed
     {
         if (config('app.installed') && file_exists(storage_path('app/update'))) {
             Updater::run();