Format

Author: huangzhhui

src/Concerns/ValidatesAttributes.php

@@ -37,7 +37,6 @@ trait ValidatesAttributes
      * Validate that an attribute was "accepted".
      *
      * This validation rule implies the attribute is "required".
-     *
      * @param mixed $value
      */
     public function validateAccepted(string $attribute, $value): bool

src/ConfigProvider.php

@@ -12,8 +12,8 @@
 
 namespace Hyperf\Validation;
 
-use Hyperf\Validation\Contract\ValidatorFactoryInterface as FactoryInterface;
 use Hyperf\Validation\Contract\PresenceVerifierInterface;
+use Hyperf\Validation\Contract\ValidatorFactoryInterface as FactoryInterface;
 
 class ConfigProvider
 {

src/Contract/ImplicitRule.php

@@ -12,8 +12,6 @@
 
 namespace Hyperf\Validation\Contract;
 
-use Hyperf\Validation\Contract\Rule;
-
 interface ImplicitRule extends Rule
 {
 }

src/Middleware/ValidationMiddleware.php

@@ -19,17 +19,14 @@
 use Hyperf\Utils\Context;
 use Hyperf\Validation\Contract\ValidatesWhenResolved;
 use Hyperf\Validation\UnauthorizedException;
-use Hyperf\Validation\ValidationException;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Hyperf\HttpServer\Contract\ResponseInterface as HyperfResponseInterface;
 
 class ValidationMiddleware implements MiddlewareInterface
 {
-
     /**
      * @var \Psr\Container\ContainerInterface
      */

src/Request/FormRequest.php

@@ -15,8 +15,8 @@
 use Hyperf\Contract\ValidatorInterface;
 use Hyperf\HttpServer\Request;
 use Hyperf\Utils\Context;
-use Hyperf\Validation\Contract\ValidatorFactoryInterface as ValidationFactory;
 use Hyperf\Validation\Contract\ValidatesWhenResolved;
+use Hyperf\Validation\Contract\ValidatorFactoryInterface as ValidationFactory;
 use Hyperf\Validation\UnauthorizedException;
 use Hyperf\Validation\ValidatesWhenResolvedTrait;
 use Hyperf\Validation\ValidationException;

src/Validator.php

@@ -224,7 +224,7 @@ public function __construct(
      *
      * @param mixed $method
      * @param mixed $parameters
-     * @throws \BadMethodCallException
+     * @throws \BadMethodCallException when method does not exist
      */
     public function __call($method, $parameters)
     {
@@ -708,9 +708,8 @@ public function setFallbackMessages(array $messages)
      * Get the Presence Verifier implementation.
      *
      *@throws \RuntimeException
-     * @return \Hyperf\Validation\Contract\PresenceVerifierInterface
      */
-    public function getPresenceVerifier()
+    public function getPresenceVerifier(): PresenceVerifierInterface
     {
         if (! isset($this->presenceVerifier)) {
             throw new RuntimeException('Presence verifier has not been set.');
@@ -723,9 +722,8 @@ public function getPresenceVerifier()
      * Get the Presence Verifier implementation.
      *
      * @throws \RuntimeException
-     * @return \Hyperf\Validation\Contract\PresenceVerifierInterface
      */
-    public function getPresenceVerifierFor(?string $connection)
+    public function getPresenceVerifierFor(?string $connection): PresenceVerifierInterface
     {
         return tap($this->getPresenceVerifier(), function ($verifier) use ($connection) {
             $verifier->setConnection($connection);
@@ -954,11 +952,9 @@ protected function hasNotFailedPreviousRuleIfPresenceRule($rule, string $attribu
 
     /**
      * Validate an attribute using a custom rule object.
-     *
-     * @param \Hyperf\Validation\Contract\Rule $rule
      * @param mixed $value
      */
-    protected function validateUsingCustomRule(string $attribute, $value, $rule)
+    protected function validateUsingCustomRule(string $attribute, $value, RuleContract $rule)
     {
         if (! $rule->passes($attribute, $value)) {
             $this->failedRules[$attribute][get_class($rule)] = [];
@@ -1012,12 +1008,11 @@ protected function attributesThatHaveMessages(): array
      * Get a rule and its parameters for a given attribute.
      *
      * @param array|string $rules
-     * @return null|array
      */
-    protected function getRule(string $attribute, $rules)
+    protected function getRule(string $attribute, $rules): ?array
     {
         if (! array_key_exists($attribute, $this->rules)) {
-            return;
+            return null;
         }
 
         $rules = (array) $rules;
@@ -1029,12 +1024,11 @@ protected function getRule(string $attribute, $rules)
                 return [$rule, $parameters];
             }
         }
+        return null;
     }
 
     /**
      * Get the value of a given attribute.
-     *
-     * @return mixed
      */
     protected function getValue(string $attribute)
     {
@@ -1043,10 +1037,8 @@ protected function getValue(string $attribute)
 
     /**
      * Call a custom validator extension.
-     *
-     * @return null|bool
      */
-    protected function callExtension(string $rule, array $parameters)
+    protected function callExtension(string $rule, array $parameters): ?bool
     {
         $callback = $this->extensions[$rule];
 
@@ -1060,10 +1052,8 @@ protected function callExtension(string $rule, array $parameters)
 
     /**
      * Call a class based validator extension.
-     *
-     * @return bool
      */
-    protected function callClassBasedExtension(string $callback, array $parameters)
+    protected function callClassBasedExtension(string $callback, array $parameters): bool
     {
         [$class, $method] = Str::parseCallback($callback, 'validate');
 

src/ValidatorFactory.php

@@ -16,8 +16,8 @@
 use Hyperf\Contract\TranslatorInterface;
 use Hyperf\Contract\ValidatorInterface;
 use Hyperf\Utils\Str;
-use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use Hyperf\Validation\Contract\PresenceVerifierInterface;
+use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use Psr\Container\ContainerInterface;
 
 class ValidatorFactory implements ValidatorFactoryInterface

tests/Cases/ValidationFactoryTest.php

@@ -13,9 +13,9 @@
 namespace HyperfTest\Validation\Cases;
 
 use Hyperf\Contract\TranslatorInterface;
-use Hyperf\Validation\ValidatorFactory;
 use Hyperf\Validation\Contract\PresenceVerifierInterface;
 use Hyperf\Validation\Validator;
+use Hyperf\Validation\ValidatorFactory;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
 

tests/Cases/ValidationValidatorTest.php

@@ -24,8 +24,8 @@
 use Hyperf\Utils\ApplicationContext;
 use Hyperf\Utils\Arr;
 use Hyperf\Validation\Contract\ImplicitRule;
-use Hyperf\Validation\Contract\Rule;
 use Hyperf\Validation\Contract\PresenceVerifierInterface;
+use Hyperf\Validation\Contract\Rule;
 use Hyperf\Validation\Rules\Exists;
 use Hyperf\Validation\Rules\Unique;
 use Hyperf\Validation\ValidationData;