Optimized

Author: huangzhhui

src/ClosureValidationRule.php

@@ -12,7 +12,8 @@
 
 namespace Hyperf\Validation;
 
-use Hyperf\Validation\Contracts\Validation\Rule as RuleContract;
+use Hyperf\Validation\Contract\Rule;
+use Hyperf\Validation\Contract\Rule as RuleContract;
 
 class ClosureValidationRule implements RuleContract
 {

src/ConfigProvider.php

@@ -12,7 +12,8 @@
 
 namespace Hyperf\Validation;
 
-use Hyperf\Validation\Contracts\Validation\Factory as FactoryInterface;
+use Hyperf\Validation\Contract\ValidatorFactoryInterface as FactoryInterface;
+use Hyperf\Validation\Contract\PresenceVerifierInterface;
 
 class ConfigProvider
 {
@@ -21,7 +22,7 @@ public function __invoke(): array
         return [
             'dependencies' => [
                 PresenceVerifierInterface::class => DatabasePresenceVerifierFactory::class,
-                FactoryInterface::class => ValidatorFactory::class,
+                FactoryInterface::class => ValidatorFactoryFactory::class,
             ],
             'scan' => [
                 'paths' => [

src/Contracts/Validation/ImplicitRule.php src/Contract/ImplicitRule.phpsrc/Contracts/Validation/ImplicitRule.php renamed to src/Contract/ImplicitRule.php

@@ -10,7 +10,9 @@
  * @license  https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
  */
 
-namespace Hyperf\Validation\Contracts\Validation;
+namespace Hyperf\Validation\Contract;
+
+use Hyperf\Validation\Contract\Rule;
 
 interface ImplicitRule extends Rule
 {

src/PresenceVerifierInterface.php …c/Contract/PresenceVerifierInterface.phpsrc/PresenceVerifierInterface.php renamed to src/Contract/PresenceVerifierInterface.php src/PresenceVerifierInterface.php renamed to src/Contract/PresenceVerifierInterface.php

@@ -10,7 +10,7 @@
  * @license  https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
  */
 
-namespace Hyperf\Validation;
+namespace Hyperf\Validation\Contract;
 
 interface PresenceVerifierInterface
 {

src/Contracts/Validation/Rule.php src/Contract/Rule.phpsrc/Contracts/Validation/Rule.php renamed to src/Contract/Rule.php

@@ -10,7 +10,7 @@
  * @license  https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
  */
 
-namespace Hyperf\Validation\Contracts\Validation;
+namespace Hyperf\Validation\Contract;
 
 interface Rule
 {

…cts/Validation/ValidatesWhenResolved.php src/Contract/ValidatesWhenResolved.phpsrc/Contracts/Validation/ValidatesWhenResolved.php renamed to src/Contract/ValidatesWhenResolved.php src/Contracts/Validation/ValidatesWhenResolved.php renamed to src/Contract/ValidatesWhenResolved.php

@@ -10,7 +10,7 @@
  * @license  https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
  */
 
-namespace Hyperf\Validation\Contracts\Validation;
+namespace Hyperf\Validation\Contract;
 
 interface ValidatesWhenResolved
 {

src/Contracts/Validation/Factory.php …c/Contract/ValidatorFactoryInterface.phpsrc/Contracts/Validation/Factory.php renamed to src/Contract/ValidatorFactoryInterface.php src/Contracts/Validation/Factory.php renamed to src/Contract/ValidatorFactoryInterface.php

@@ -10,32 +10,30 @@
  * @license  https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
  */
 
-namespace Hyperf\Validation\Contracts\Validation;
+namespace Hyperf\Validation\Contract;
 
-interface Factory
+use Hyperf\Contract\ValidatorInterface;
+
+interface ValidatorFactoryInterface
 {
     /**
      * Create a new Validator instance.
-     *
-     * @return \Hyperf\Contract\ValidatorInterface
      */
-    public function make(array $data, array $rules, array $messages = [], array $customAttributes = []);
+    public function make(array $data, array $rules, array $messages = [], array $customAttributes = []): ValidatorInterface;
 
     /**
      * Register a custom validator extension.
      *
      * @param \Closure|string $extension
-     * @param null|string $message
      */
-    public function extend(string $rule, $extension, $message = null);
+    public function extend(string $rule, $extension, ?string $message = null);
 
     /**
      * Register a custom implicit validator extension.
      *
      * @param \Closure|string $extension
-     * @param null|string $message
      */
-    public function extendImplicit(string $rule, $extension, $message = null);
+    public function extendImplicit(string $rule, $extension, ?string $message = null);
 
     /**
      * Register a custom implicit validator message replacer.

src/DatabasePresenceVerifier.php

@@ -15,6 +15,7 @@
 use Closure;
 use Hyperf\Database\ConnectionResolverInterface;
 use Hyperf\Utils\Str;
+use Hyperf\Validation\Contract\PresenceVerifierInterface;
 
 class DatabasePresenceVerifier implements PresenceVerifierInterface
 {

src/Factory.php

@@ -17,8 +17,9 @@
 use Hyperf\HttpServer\Router\Dispatched;
 use Hyperf\Server\Exception\ServerException;
 use Hyperf\Utils\Context;
-use Hyperf\Validation\Contracts\Validation\ValidatesWhenResolved;
+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;
@@ -67,7 +68,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 $classname = $parameter->getType()->getName();
                 $implements = $this->getClassImplements($classname);
                 if (in_array(ValidatesWhenResolved::class, $implements, true)) {
-                    /** @var ValidatesWhenResolved $parameterInstance */
+                    /** @var \Hyperf\Validation\Contract\ValidatesWhenResolved $parameterInstance */
                     $parameterInstance = $this->container->get($classname);
                     $parameterInstance->validateResolved();
                 }