Upgrade the minimum php version to 8.0 for validation. (#4516)

Author: limingxinleo

composer.json

@@ -18,7 +18,7 @@
         }
     },
     "require": {
-        "php": ">=7.2",
+        "php": ">=8.0",
         "egulias/email-validator": "^3.0",
         "hyperf/contract": "~3.0.0",
         "hyperf/database": "~3.0.0",

src/ClosureValidationRule.php

@@ -11,48 +11,35 @@
  */
 namespace Hyperf\Validation;
 
+use Closure;
 use Hyperf\Validation\Contract\Rule;
 use Hyperf\Validation\Contract\Rule as RuleContract;
 
 class ClosureValidationRule implements RuleContract
 {
-    /**
-     * The callback that validates the attribute.
-     *
-     * @var \Closure
-     */
-    public $callback;
-
     /**
      * Indicates if the validation callback failed.
-     *
-     * @var bool
      */
-    public $failed = false;
+    public bool $failed = false;
 
     /**
      * The validation error message.
-     *
-     * @var null|string
      */
-    public $message;
+    public ?string $message = null;
 
     /**
      * Create a new Closure based validation rule.
      *
-     * @param \Closure $callback
+     * @param Closure $callback the callback that validates the attribute
      */
-    public function __construct($callback)
+    public function __construct(public Closure $callback)
     {
-        $this->callback = $callback;
     }
 
     /**
      * Determine if the validation rule passes.
-     *
-     * @param mixed $value
      */
-    public function passes(string $attribute, $value): bool
+    public function passes(string $attribute, mixed $value): bool
     {
         $this->failed = false;
 

src/Concerns/ValidatesAttributes.php

@@ -13,7 +13,6 @@
 
 use Carbon\Carbon;
 use Carbon\Carbon as Date;
-use Countable;
 use DateTime;
 use DateTimeInterface;
 use DateTimeZone;
@@ -59,7 +58,7 @@ public function validateActiveUrl(string $attribute, $value): bool
         if ($url = parse_url($value, PHP_URL_HOST)) {
             try {
                 return count(dns_get_record($url . '.', DNS_A | DNS_AAAA)) > 0;
-            } catch (Exception $e) {
+            } catch (Exception) {
                 return false;
             }
         }
@@ -646,9 +645,7 @@ public function validateInArray(string $attribute, $value, array $parameters): b
 
         $attributeData = ValidationData::extractDataFromPath($explicitPath, $this->data);
 
-        $otherValues = Arr::where(Arr::dot($attributeData), function ($value, $key) use ($parameters) {
-            return Str::is($parameters[0], $key);
-        });
+        $otherValues = Arr::where(Arr::dot($attributeData), fn ($value, $key) => Str::is($parameters[0], $key));
 
         return in_array($value, $otherValues);
     }
@@ -872,7 +869,7 @@ public function validateRequired(string $attribute, $value): bool
         if (is_string($value) && trim($value) === '') {
             return false;
         }
-        if ((is_array($value) || $value instanceof Countable) && count($value) < 1) {
+        if ((is_countable($value)) && count($value) < 1) {
             return false;
         }
         if ($value instanceof SplFileInfo) {
@@ -1057,7 +1054,7 @@ public function validateTimezone(string $attribute, $value): bool
     {
         try {
             new DateTimeZone($value);
-        } catch (Throwable $e) {
+        } catch (Throwable) {
             return false;
         }
 
@@ -1177,9 +1174,8 @@ protected function getDateFormat(string $attribute)
      * Get the date timestamp.
      *
      * @param mixed $value
-     * @return bool|int
      */
-    protected function getDateTimestamp($value)
+    protected function getDateTimestamp($value): bool|int
     {
         if ($value instanceof DateTimeInterface) {
             return $value->getTimestamp();
@@ -1240,7 +1236,7 @@ protected function getDateTime(string $value)
             }
 
             return new DateTime($value);
-        } catch (Exception $e) {
+        } catch (Exception) {
         }
     }
 
@@ -1318,9 +1314,7 @@ protected function extractDistinctValues(string $attribute): array
 
         $pattern = str_replace('\*', '[^.]+', preg_quote($attribute, '#'));
 
-        return Arr::where(Arr::dot($attributeData), function ($value, $key) use ($pattern) {
-            return (bool) preg_match('#^' . $pattern . '\z#u', $key);
-        });
+        return Arr::where(Arr::dot($attributeData), fn ($value, $key) => (bool) preg_match('#^' . $pattern . '\z#u', $key));
     }
 
     /**
@@ -1474,9 +1468,8 @@ protected function allFailingRequired(array $attributes): bool
      * Get the size of an attribute.
      *
      * @param mixed $value
-     * @return float|int
      */
-    protected function getSize(string $attribute, $value)
+    protected function getSize(string $attribute, $value): float|int|string
     {
         $hasNumeric = $this->hasRule($attribute, $this->numericRules);
 
@@ -1506,20 +1499,14 @@ protected function getSize(string $attribute, $value)
      */
     protected function compare($first, $second, string $operator): bool
     {
-        switch ($operator) {
-            case '<':
-                return $first < $second;
-            case '>':
-                return $first > $second;
-            case '<=':
-                return $first <= $second;
-            case '>=':
-                return $first >= $second;
-            case '=':
-                return $first == $second;
-            default:
-                throw new InvalidArgumentException();
-        }
+        return match ($operator) {
+            '<' => $first < $second,
+            '>' => $first > $second,
+            '<=' => $first <= $second,
+            '>=' => $first >= $second,
+            '=' => $first == $second,
+            default => throw new InvalidArgumentException(),
+        };
     }
 
     /**

src/Contract/Rule.php

@@ -15,15 +15,11 @@ interface Rule
 {
     /**
      * Determine if the validation rule passes.
-     *
-     * @param mixed $value
      */
-    public function passes(string $attribute, $value): bool;
+    public function passes(string $attribute, mixed $value): bool;
 
     /**
      * Get the validation error message.
-     *
-     * @return array|string
      */
-    public function message();
+    public function message(): array|string;
 }

src/Contract/ValidatorFactoryInterface.php

@@ -22,22 +22,16 @@ public function make(array $data, array $rules, array $messages = [], array $cus
 
     /**
      * Register a custom validator extension.
-     *
-     * @param \Closure|string $extension
      */
-    public function extend(string $rule, $extension, ?string $message = null);
+    public function extend(string $rule, \Closure|string $extension, ?string $message = null);
 
     /**
      * Register a custom implicit validator extension.
-     *
-     * @param \Closure|string $extension
      */
-    public function extendImplicit(string $rule, $extension, ?string $message = null);
+    public function extendImplicit(string $rule, \Closure|string $extension, ?string $message = null);
 
     /**
      * Register a custom implicit validator message replacer.
-     *
-     * @param \Closure|string $replacer
      */
-    public function replacer(string $rule, $replacer);
+    public function replacer(string $rule, \Closure|string $replacer);
 }

src/DatabasePresenceVerifier.php

@@ -18,13 +18,6 @@
 
 class DatabasePresenceVerifier implements PresenceVerifierInterface
 {
-    /**
-     * The database connection instance.
-     *
-     * @var \Hyperf\Database\ConnectionResolverInterface
-     */
-    protected $db;
-
     /**
      * The database connection to use.
      *
@@ -34,10 +27,11 @@ class DatabasePresenceVerifier implements PresenceVerifierInterface
 
     /**
      * Create a new database presence verifier.
+     *
+     * @param ConnectionResolverInterface $db the database connection instance
      */
-    public function __construct(ConnectionResolverInterface $db)
+    public function __construct(protected ConnectionResolverInterface $db)
     {
-        $this->db = $db;
     }
 
     /**

src/Event/ValidatorFactoryResolved.php

@@ -15,13 +15,7 @@
 
 class ValidatorFactoryResolved
 {
-    /**
-     * @var ValidatorFactoryInterface
-     */
-    public $validatorFactory;
-
-    public function __construct(ValidatorFactoryInterface $validatorFactory)
+    public function __construct(public ValidatorFactoryInterface $validatorFactory)
     {
-        $this->validatorFactory = $validatorFactory;
     }
 }

src/Middleware/ValidationMiddleware.php

@@ -27,19 +27,10 @@
 
 class ValidationMiddleware implements MiddlewareInterface
 {
-    /**
-     * @var \Psr\Container\ContainerInterface
-     */
-    private $container;
-
-    /**
-     * @var array
-     */
-    private $implements = [];
+    private array $implements = [];
 
-    public function __construct(ContainerInterface $container)
+    public function __construct(private ContainerInterface $container)
     {
-        $this->container = $container;
     }
 
     /**
@@ -98,9 +89,7 @@ public function isImplementedValidatesWhenResolved(string $classname): bool
      */
     protected function handleUnauthorizedException(UnauthorizedException $exception): ResponseInterface
     {
-        return Context::override(ResponseInterface::class, function (ResponseInterface $response) {
-            return $response->withStatus(403);
-        });
+        return Context::override(ResponseInterface::class, fn (ResponseInterface $response) => $response->withStatus(403));
     }
 
     protected function shouldHandle(Dispatched $dispatched): bool
@@ -110,12 +99,11 @@ protected function shouldHandle(Dispatched $dispatched): bool
 
     /**
      * @see \Hyperf\HttpServer\CoreMiddleware::prepareHandler()
-     * @param array|string $handler
      */
-    protected function prepareHandler($handler): array
+    protected function prepareHandler(array|string $handler): array
     {
         if (is_string($handler)) {
-            if (strpos($handler, '@') !== false) {
+            if (str_contains($handler, '@')) {
                 return explode('@', $handler);
             }
             $array = explode('::', $handler);

src/Request/FormRequest.php

@@ -26,26 +26,15 @@ class FormRequest extends Request implements ValidatesWhenResolved
 {
     use ValidatesWhenResolvedTrait;
 
-    /**
-     * The container instance.
-     *
-     * @var ContainerInterface
-     */
-    protected $container;
-
     /**
      * The key to be used for the view error bag.
-     *
-     * @var string
      */
-    protected $errorBag = 'default';
+    protected string $errorBag = 'default';
 
     /**
      * The scenes defined by developer.
-     *
-     * @var array
      */
-    protected $scenes = [];
+    protected array $scenes = [];
 
     /**
      * The input keys that should not be flashed on redirect.
@@ -54,15 +43,11 @@ class FormRequest extends Request implements ValidatesWhenResolved
      */
     protected $dontFlash = ['password', 'password_confirmation'];
 
-    public function __construct(ContainerInterface $container)
+    public function __construct(protected ContainerInterface $container)
     {
-        $this->setContainer($container);
     }
 
-    /**
-     * @return $this
-     */
-    public function scene(string $scene)
+    public function scene(string $scene): static
     {
         Context::set($this->getContextValidatorKey('scene'), $scene);
         return $this;
@@ -110,10 +95,8 @@ public function attributes(): array
 
     /**
      * Set the container implementation.
-     *
-     * @return $this
      */
-    public function setContainer(ContainerInterface $container)
+    public function setContainer(ContainerInterface $container): static
     {
         $this->container = $container;
 
@@ -212,7 +195,7 @@ protected function getContextValidatorKey(string $key): string
     /**
      * Get scene rules.
      */
-    protected function getRules()
+    protected function getRules(): array
     {
         $rules = call_user_func_array([$this, 'rules'], []);
         $scene = $this->getScene();