Added Laravel 10 support

Author: professor93

composer.json

@@ -17,22 +17,23 @@
     ],
     "require": {
         "php": "^8.1",
-        "illuminate/contracts": "^9.0",
-        "spatie/laravel-package-tools": "^1.13",
-        "uzbek/laravel-attribute-scanner": "^0.1.5"
+        "illuminate/contracts": "^9.0|^10.0",
+        "spatie/laravel-package-tools": "^1.14",
+        "uzbek/laravel-attribute-scanner": "^0.1"
     },
     "require-dev": {
-        "laravel/pint": "^1.1",
-        "nunomaduro/collision": "^6.2",
-        "orchestra/testbench": "^7.6",
-        "pestphp/pest": "^1.21",
-        "pestphp/pest-plugin-laravel": "^1.2",
-        "phpunit/phpunit": "^9.5"
+        "laravel/pint": "^1.7",
+        "nunomaduro/collision": "^6.4",
+        "orchestra/testbench": "^7.24",
+        "pestphp/pest": "^1.22",
+        "pestphp/pest-plugin-laravel": "^1.4",
+        "phpunit/phpunit": "^9.6"
     },
     "autoload": {
         "psr-4": {
             "Uzbek\\LaravelValidationAttributes\\": "src"
-        }
+        },
+        "files": ["src/helpers.php"]
     },
     "autoload-dev": {
         "psr-4": {

src/Attributes/Validators.php

@@ -9,8 +9,15 @@ class Validators
 {
     public array $items = [];
 
-    public function __construct(array $rules)
+    public function __construct(array|string $key, array|string|null $rules = null)
     {
+        if(is_array($key)){
+            $rules = $key;
+        } elseif (is_string($key) && $rules !== null) {
+            $rules = [$key => $rules];
+        } else {
+            $rules = [];
+        }
         if (count($rules) > 0) {
             foreach ($rules as $key => $rule) {
                 if (is_string($key) && (is_string($rule) || (is_array($rule) && count($rule) > 0))) {

src/LaravelValidationAttributes.php

@@ -11,6 +11,8 @@
 
 class LaravelValidationAttributes
 {
+    public static array $validated = [];
+    public static array $rules = [];
     public function validationsList(): array
     {
         return Cache::remember(config('validation-attributes.cache_name', 'laravel-validation-attributes'), config('validation-attributes.cache_time', 60), function () {

src/ValidationAttributesMiddleware.php

@@ -13,7 +13,7 @@ class ValidationAttributesMiddleware
     /**
      * Handle an incoming request.
      *
-     * @param  Request  $request
+     * @param Request $request
      * @param \Closure(Request): (Response|RedirectResponse) $next
      * @return Response|RedirectResponse
      */
@@ -22,8 +22,8 @@ public function handle(Request $request, Closure $next)
         if (config('validation-attributes.enabled', false) === true) {
             $validations = ValidationAttributes::validationsList();
             if (isset($validations[$request->route()->getActionName()])) {
-                $rules = $validations[$request->route()->getActionName()];
-                $request->validate($rules);
+                LaravelValidationAttributes::$rules = $validations[$request->route()->getActionName()];
+                LaravelValidationAttributes::$validated = $request->validate(LaravelValidationAttributes::$rules);
             }
         }
 

src/helpers.php

@@ -0,0 +1,23 @@
+<?php
+
+use Uzbek\LaravelValidationAttributes\LaravelValidationAttributes;
+
+if (!function_exists('validated')) {
+    function validated(string $key = null, $default = null)
+    {
+        if ($key === null) {
+            return LaravelValidationAttributes::$validated;
+        }
+
+        return LaravelValidationAttributes::$validated[$key] ?? $default;
+    }
+}
+
+
+if (!function_exists('attribute_rules')) {
+    function attribute_rules(): array
+    {
+        return LaravelValidationAttributes::$rules;
+    }
+}
+