¨4.0.1¨

Modules/Core/Http/Middleware/AdminMiddleware.php

@@ -3,6 +3,8 @@
 namespace Modules\Core\Http\Middleware;
 
 use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 
 class AdminMiddleware
 {
@@ -16,12 +18,14 @@ class AdminMiddleware
         'admin.reset.*',
     ];
 
+
     /**
      * Handle an incoming request.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure $next
-     * @return \Illuminate\Http\Response
+     * @param Request $request
+     * @param Closure $next
+     *
+     * @return Response
      */
     public function handle($request, Closure $next)
     {
@@ -36,10 +40,12 @@ class AdminMiddleware
         return redirect()->guest(route('admin.login'));
     }
 
+
     /**
      * Determine if the request URI is in except array.
      *
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
+     *
      * @return bool
      */
     protected function inExceptArray($request)

Modules/Core/Http/Middleware/Authenticate.php

@@ -3,15 +3,18 @@
 namespace Modules\Core\Http\Middleware;
 
 use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 
 class Authenticate
 {
     /**
      * Handle an incoming request.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure $next
-     * @return \Illuminate\Http\Response
+     * @param Request $request
+     * @param Closure $next
+     *
+     * @return Response
      */
     public function handle($request, Closure $next)
     {
@@ -21,7 +24,7 @@ class Authenticate
 
         $url = url()->full();
 
-        if (! $request->isMethod('get')) {
+        if (!$request->isMethod('get')) {
             $url = url()->previous();
         }
 

Modules/Core/Http/Middleware/Authorization.php

@@ -4,29 +4,33 @@ namespace Modules\Core\Http\Middleware;
 
 use Closure;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 
 class Authorization
 {
     /**
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure $next
+     * @param Request $request
+     * @param Closure $next
      * @param string $permission
      * @param string $to
-     * @return \Illuminate\Http\Response
+     *
+     * @return Response
      */
     public function handle(Request $request, Closure $next, $permission, $to = '')
     {
-        if (! auth()->user()->hasAccess($permission)) {
+        if (!auth()->user()->hasAccess($permission)) {
             return $this->handleUnauthorizedRequest($request, $permission);
         }
 
         return $next($request);
     }
 
+
     /**
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
      * @param string $permission
-     * @return \Illuminate\Http\Response
+     *
+     * @return Response
      */
     private function handleUnauthorizedRequest(Request $request, $permission)
     {

Modules/Core/Http/Middleware/GuestMiddleware.php

@@ -4,15 +4,17 @@ namespace Modules\Core\Http\Middleware;
 
 use Closure;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 
 class GuestMiddleware
 {
     /**
      * Handle an incoming request.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure $next
-     * @return \Illuminate\Http\Response
+     * @param Request $request
+     * @param Closure $next
+     *
+     * @return Response
      */
     public function handle(Request $request, Closure $next)
     {

Modules/Core/Http/Requests/Request.php

@@ -3,6 +3,7 @@
 namespace Modules\Core\Http\Requests;
 
 use Closure;
+use Illuminate\Contracts\Validation\Rule;
 use Illuminate\Foundation\Http\FormRequest;
 
 abstract class Request extends FormRequest
@@ -21,20 +22,12 @@ abstract class Request extends FormRequest
      */
     protected $localeKey;
 
+
     public function authorize()
     {
         return true;
     }
 
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [];
-    }
 
     /**
      * Get custom attributes for validator errors.
@@ -45,13 +38,14 @@ abstract class Request extends FormRequest
     {
         $attributes = trans($this->availableAttributes) ?: [];
 
-        if (! is_array($attributes)) {
+        if (!is_array($attributes)) {
             return [];
         }
 
         return array_map('mb_strtolower', array_dot($attributes));
     }
 
+
     /**
      * Get custom messages for validator errors.
      *
@@ -72,6 +66,18 @@ abstract class Request extends FormRequest
         return $messages;
     }
 
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [];
+    }
+
+
     /**
      * Parse rules for the given attributes.
      *
@@ -87,6 +93,7 @@ abstract class Request extends FormRequest
      * ]
      *
      * @param array $rules
+     *
      * @return array
      */
     protected function parseRules(array $rules)
@@ -94,17 +101,17 @@ abstract class Request extends FormRequest
         $attributesAndRules = [];
 
         foreach ($rules as $attribute => $rulesList) {
-            if (! is_array($rulesList)) {
+            if (!is_array($rulesList)) {
                 $rulesList = explode('|', $rulesList);
             }
 
             foreach ($rulesList as $rule) {
-                if ($rule instanceof Closure) {
+                if ($rule instanceof Closure || $rule instanceof Rule) {
                     continue;
                 }
 
-                if (strpos($rule, ':') !== false) {
-                    list($rule) = explode(':', $rule, 2);
+                if (str_contains($rule, ':')) {
+                    [$rule] = explode(':', $rule, 2);
                 }
 
                 $attributesAndRules[] = "{$attribute}.{$rule}";