Format code (#5172)

limingxinleo · web-flow · commit f9618c4e3543 · 2022-11-01T10:50:54.000+08:00
diff --git a/src/Concerns/ValidatesAttributes.php b/src/Concerns/ValidatesAttributes.php
@@ -1135,7 +1135,7 @@ public function isValidFileInstance($value): bool
     /**
      * Require a certain number of parameters to be present.
      *
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function requireParameterCount(int $count, array $parameters, string $rule)
     {
@@ -1217,7 +1217,7 @@ protected function checkDateTimeOrder(string $format, string $first, string $sec
     /**
      * Get a DateTime instance from a string.
      *
-     * @return null|\DateTime
+     * @return null|DateTime
      */
     protected function getDateTimeWithOptionalFormat(string $format, ?string $value)
     {
@@ -1234,7 +1234,7 @@ protected function getDateTimeWithOptionalFormat(string $format, ?string $value)
     /**
      * Get a DateTime instance from a string with no format.
      *
-     * @return null|\DateTime
+     * @return null|DateTime
      */
     protected function getDateTime(string $value)
     {
@@ -1503,7 +1503,7 @@ protected function getSize(string $attribute, $value): float|int|string
      *
      * @param mixed $first
      * @param mixed $second
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     protected function compare($first, $second, string $operator): bool
     {
diff --git a/src/Contract/ValidatorFactoryInterface.php b/src/Contract/ValidatorFactoryInterface.php
@@ -11,6 +11,7 @@
  */
 namespace Hyperf\Validation\Contract;
 
+use Closure;
 use Hyperf\Contract\ValidatorInterface;
 
 interface ValidatorFactoryInterface
@@ -23,15 +24,15 @@ public function make(array $data, array $rules, array $messages = [], array $cus
     /**
      * Register a custom validator extension.
      */
-    public function extend(string $rule, \Closure|string $extension, ?string $message = null);
+    public function extend(string $rule, Closure|string $extension, ?string $message = null);
 
     /**
      * Register a custom implicit validator extension.
      */
-    public function extendImplicit(string $rule, \Closure|string $extension, ?string $message = null);
+    public function extendImplicit(string $rule, Closure|string $extension, ?string $message = null);
 
     /**
      * Register a custom implicit validator message replacer.
      */
-    public function replacer(string $rule, \Closure|string $replacer);
+    public function replacer(string $rule, Closure|string $replacer);
 }
diff --git a/src/Middleware/ValidationMiddleware.php b/src/Middleware/ValidationMiddleware.php
@@ -28,6 +28,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use RuntimeException;
 
 class ValidationMiddleware implements MiddlewareInterface
 {
@@ -141,6 +142,6 @@ protected function prepareHandler(array|string $handler): array
         if (is_array($handler) && isset($handler[0], $handler[1])) {
             return $handler;
         }
-        throw new \RuntimeException('Handler not exist.');
+        throw new RuntimeException('Handler not exist.');
     }
 }
diff --git a/src/Rules/Dimensions.php b/src/Rules/Dimensions.php
@@ -11,7 +11,9 @@
  */
 namespace Hyperf\Validation\Rules;
 
-class Dimensions implements \Stringable
+use Stringable;
+
+class Dimensions implements Stringable
 {
     /**
      * Create a new dimensions rule instance.
diff --git a/src/Rules/Exists.php b/src/Rules/Exists.php
@@ -11,7 +11,9 @@
  */
 namespace Hyperf\Validation\Rules;
 
-class Exists implements \Stringable
+use Stringable;
+
+class Exists implements Stringable
 {
     use DatabaseRule;
 
diff --git a/src/Rules/In.php b/src/Rules/In.php
@@ -11,7 +11,9 @@
  */
 namespace Hyperf\Validation\Rules;
 
-class In implements \Stringable
+use Stringable;
+
+class In implements Stringable
 {
     /**
      * The name of the rule.
diff --git a/src/Rules/NotIn.php b/src/Rules/NotIn.php
@@ -11,7 +11,9 @@
  */
 namespace Hyperf\Validation\Rules;
 
-class NotIn implements \Stringable
+use Stringable;
+
+class NotIn implements Stringable
 {
     /**
      * The name of the rule.
diff --git a/src/Rules/RequiredIf.php b/src/Rules/RequiredIf.php
@@ -11,7 +11,9 @@
  */
 namespace Hyperf\Validation\Rules;
 
-class RequiredIf implements \Stringable
+use Stringable;
+
+class RequiredIf implements Stringable
 {
     /**
      * The condition that validates the attribute.
diff --git a/src/Rules/Unique.php b/src/Rules/Unique.php
@@ -12,8 +12,9 @@
 namespace Hyperf\Validation\Rules;
 
 use Hyperf\Database\Model\Model;
+use Stringable;
 
-class Unique implements \Stringable
+class Unique implements Stringable
 {
     use DatabaseRule;
 
diff --git a/src/ValidationRuleParser.php b/src/ValidationRuleParser.php
@@ -17,6 +17,8 @@
 use Hyperf\Validation\Contract\Rule as RuleContract;
 use Hyperf\Validation\Rules\Exists;
 use Hyperf\Validation\Rules\Unique;
+use stdClass;
+use Stringable;
 
 class ValidationRuleParser
 {
@@ -37,7 +39,7 @@ public function __construct(public array $data)
     /**
      * Parse the human-friendly rules into a full rules array for the validator.
      *
-     * @return \stdClass
+     * @return stdClass
      */
     public function explode(array $rules)
     {
@@ -54,7 +56,7 @@ public function explode(array $rules)
     /**
      * Merge additional rules into a given attribute(s).
      *
-     * @param array|string|\Stringable $rules
+     * @param array|string|Stringable $rules
      */
     public function mergeRules(array $results, array|string $attribute, mixed $rules = []): array
     {
@@ -155,7 +157,7 @@ protected function prepareRule($rule)
     /**
      * Define a set of rules that apply to each element in an array attribute.
      *
-     * @param array|string|\Stringable $rules
+     * @param array|string|Stringable $rules
      */
     protected function explodeWildcardRules(array $results, string $attribute, mixed $rules): array
     {
@@ -179,7 +181,7 @@ protected function explodeWildcardRules(array $results, string $attribute, mixed
     /**
      * Merge additional rules into a given attribute.
      *
-     * @param array|string|\Stringable $rules
+     * @param array|string|Stringable $rules
      */
     protected function mergeRulesForAttribute(array $results, string $attribute, mixed $rules): array
     {
diff --git a/src/Validator.php b/src/Validator.php
@@ -12,6 +12,7 @@
 namespace Hyperf\Validation;
 
 use BadMethodCallException;
+use Closure;
 use Hyperf\Contract\MessageBag as MessageBagContract;
 use Hyperf\Contract\TranslatorInterface;
 use Hyperf\Contract\ValidatorInterface as ValidatorContract;
@@ -25,6 +26,7 @@
 use Hyperf\Validation\Contract\Rule as RuleContract;
 use Psr\Container\ContainerInterface;
 use RuntimeException;
+use Stringable;
 
 class Validator implements ValidatorContract
 {
@@ -84,7 +86,7 @@ class Validator implements ValidatorContract
     /**
      * The current rule that is validating.
      *
-     * @var string|\Stringable
+     * @var string|Stringable
      */
     protected mixed $currentRule;
 
@@ -161,7 +163,7 @@ public function __construct(
      *
      * @param mixed $method
      * @param mixed $parameters
-     * @throws \BadMethodCallException when method does not exist
+     * @throws BadMethodCallException when method does not exist
      */
     public function __call($method, $parameters)
     {
@@ -387,7 +389,7 @@ public function getMessageBag(): MessageBagContract
     /**
      * Determine if the given attribute has a rule in the given set.
      *
-     * @param array|string|\Stringable $rules
+     * @param array|string|Stringable $rules
      */
     public function hasRule(string $attribute, mixed $rules): bool
     {
@@ -526,15 +528,15 @@ public function addDependentExtensions(array $extensions)
     /**
      * Register a custom validator extension.
      */
-    public function addExtension(string $rule, \Closure|string $extension)
+    public function addExtension(string $rule, Closure|string $extension)
     {
         $this->extensions[Str::snake($rule)] = $extension;
     }
 
     /**
      * Register a custom implicit validator extension.
      */
-    public function addImplicitExtension(string $rule, \Closure|string $extension)
+    public function addImplicitExtension(string $rule, Closure|string $extension)
     {
         $this->addExtension($rule, $extension);
 
@@ -544,7 +546,7 @@ public function addImplicitExtension(string $rule, \Closure|string $extension)
     /**
      * Register a custom dependent validator extension.
      */
-    public function addDependentExtension(string $rule, \Closure|string $extension)
+    public function addDependentExtension(string $rule, Closure|string $extension)
     {
         $this->addExtension($rule, $extension);
 
@@ -568,7 +570,7 @@ public function addReplacers(array $replacers)
     /**
      * Register a custom validator message replacer.
      */
-    public function addReplacer(string $rule, \Closure|string $replacer)
+    public function addReplacer(string $rule, Closure|string $replacer)
     {
         $this->replacers[Str::snake($rule)] = $replacer;
     }
@@ -634,7 +636,7 @@ public function setFallbackMessages(array $messages)
     /**
      * Get the Presence Verifier implementation.
      *
-     *@throws \RuntimeException
+     *@throws RuntimeException
      */
     public function getPresenceVerifier(): PresenceVerifierInterface
     {
@@ -648,7 +650,7 @@ public function getPresenceVerifier(): PresenceVerifierInterface
     /**
      * Get the Presence Verifier implementation.
      *
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public function getPresenceVerifierFor(?string $connection): PresenceVerifierInterface
     {
@@ -930,7 +932,7 @@ protected function attributesThatHaveMessages(): array
     /**
      * Get a rule and its parameters for a given attribute.
      *
-     * @param array|string|\Stringable $rules
+     * @param array|string|Stringable $rules
      */
     protected function getRule(string $attribute, mixed $rules): ?array
     {
diff --git a/src/ValidatorFactory.php b/src/ValidatorFactory.php
@@ -66,7 +66,7 @@ class ValidatorFactory implements ValidatorFactoryInterface
     /**
      * The Validator resolver instance.
      *
-     * @var \Closure
+     * @var Closure
      */
     protected $resolver;
 
diff --git a/tests/Cases/FormRequestTest.php b/tests/Cases/FormRequestTest.php
@@ -27,6 +27,7 @@
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Throwable;
 
 /**
  * @internal
@@ -100,7 +101,7 @@ public function testRewriteGetRules()
             $request = new BarSceneRequest($container);
             $request->validateResolved();
             $this->assertTrue(false);
-        } catch (\Throwable $exception) {
+        } catch (Throwable $exception) {
             $this->assertInstanceOf(ValidationException::class, $exception);
             $this->assertSame('validation.integer', $exception->validator->errors()->first());
         }
@@ -131,7 +132,7 @@ public function testSceneForFormRequest()
             try {
                 $request->validateResolved();
                 $this->assertTrue(false);
-            } catch (\Throwable $exception) {
+            } catch (Throwable $exception) {
                 $this->assertInstanceOf(ValidationException::class, $exception);
             }
         });
@@ -140,7 +141,7 @@ public function testSceneForFormRequest()
             $request = new FooSceneRequest($container);
             $request->validateResolved();
             $this->assertTrue(false);
-        } catch (\Throwable $exception) {
+        } catch (Throwable $exception) {
             $this->assertInstanceOf(ValidationException::class, $exception);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1135,7 +1135,7 @@ public function isValidFileInstance($value): bool`
`1135`	`1135`	`/**`
`1136`	`1136`	`* Require a certain number of parameters to be present.`
`1137`	`1137`	`*`
`1138`		`- * @throws \InvalidArgumentException`
	`1138`	`+ * @throws InvalidArgumentException`
`1139`	`1139`	`*/`
`1140`	`1140`	`public function requireParameterCount(int $count, array $parameters, string $rule)`
`1141`	`1141`	`{`
`@@ -1217,7 +1217,7 @@ protected function checkDateTimeOrder(string $format, string $first, string $sec`
`1217`	`1217`	`/**`
`1218`	`1218`	`* Get a DateTime instance from a string.`
`1219`	`1219`	`*`
`1220`		`- * @return null\|\DateTime`
	`1220`	`+ * @return null\|DateTime`
`1221`	`1221`	`*/`
`1222`	`1222`	`protected function getDateTimeWithOptionalFormat(string $format, ?string $value)`
`1223`	`1223`	`{`
`@@ -1234,7 +1234,7 @@ protected function getDateTimeWithOptionalFormat(string $format, ?string $value)`
`1234`	`1234`	`/**`
`1235`	`1235`	`* Get a DateTime instance from a string with no format.`
`1236`	`1236`	`*`
`1237`		`- * @return null\|\DateTime`
	`1237`	`+ * @return null\|DateTime`
`1238`	`1238`	`*/`
`1239`	`1239`	`protected function getDateTime(string $value)`
`1240`	`1240`	`{`
`@@ -1503,7 +1503,7 @@ protected function getSize(string $attribute, $value): float\|int\|string`
`1503`	`1503`	`*`
`1504`	`1504`	`* @param mixed $first`
`1505`	`1505`	`* @param mixed $second`
`1506`		`- * @throws \InvalidArgumentException`
	`1506`	`+ * @throws InvalidArgumentException`
`1507`	`1507`	`*/`
`1508`	`1508`	`protected function compare($first, $second, string $operator): bool`
`1509`	`1509`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`use Psr\Http\Message\ServerRequestInterface;`
`29`	`29`	`use Psr\Http\Server\MiddlewareInterface;`
`30`	`30`	`use Psr\Http\Server\RequestHandlerInterface;`
	`31`	`+use RuntimeException;`
`31`	`32`
`32`	`33`	`class ValidationMiddleware implements MiddlewareInterface`
`33`	`34`	`{`
`@@ -141,6 +142,6 @@ protected function prepareHandler(array\|string $handler): array`
`141`	`142`	`if (is_array($handler) && isset($handler[0], $handler[1])) {`
`142`	`143`	`return $handler;`
`143`	`144`	`}`
`144`		`- throw new \RuntimeException('Handler not exist.');`
	`145`	`+ throw new RuntimeException('Handler not exist.');`
`145`	`146`	`}`
`146`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,9 @@`
`11`	`11`	`*/`
`12`	`12`	`namespace Hyperf\Validation\Rules;`
`13`	`13`
`14`		`-class Exists implements \Stringable`
	`14`	`+use Stringable;`
	`15`	`+`
	`16`	`+class Exists implements Stringable`
`15`	`17`	`{`
`16`	`18`	`use DatabaseRule;`
`17`	`19`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,9 @@`
`12`	`12`	`namespace Hyperf\Validation\Rules;`
`13`	`13`
`14`	`14`	`use Hyperf\Database\Model\Model;`
	`15`	`+use Stringable;`
`15`	`16`
`16`		`-class Unique implements \Stringable`
	`17`	`+class Unique implements Stringable`
`17`	`18`	`{`
`18`	`19`	`use DatabaseRule;`
`19`	`20`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`use Hyperf\Validation\Contract\Rule as RuleContract;`
`18`	`18`	`use Hyperf\Validation\Rules\Exists;`
`19`	`19`	`use Hyperf\Validation\Rules\Unique;`
	`20`	`+use stdClass;`
	`21`	`+use Stringable;`
`20`	`22`
`21`	`23`	`class ValidationRuleParser`
`22`	`24`	`{`
`@@ -37,7 +39,7 @@ public function __construct(public array $data)`
`37`	`39`	`/**`
`38`	`40`	`* Parse the human-friendly rules into a full rules array for the validator.`
`39`	`41`	`*`
`40`		`- * @return \stdClass`
	`42`	`+ * @return stdClass`
`41`	`43`	`*/`
`42`	`44`	`public function explode(array $rules)`
`43`	`45`	`{`
`@@ -54,7 +56,7 @@ public function explode(array $rules)`
`54`	`56`	`/**`
`55`	`57`	`* Merge additional rules into a given attribute(s).`
`56`	`58`	`*`
`57`		`- * @param array\|string\|\Stringable $rules`
	`59`	`+ * @param array\|string\|Stringable $rules`
`58`	`60`	`*/`
`59`	`61`	`public function mergeRules(array $results, array\|string $attribute, mixed $rules = []): array`
`60`	`62`	`{`
`@@ -155,7 +157,7 @@ protected function prepareRule($rule)`
`155`	`157`	`/**`
`156`	`158`	`* Define a set of rules that apply to each element in an array attribute.`
`157`	`159`	`*`
`158`		`- * @param array\|string\|\Stringable $rules`
	`160`	`+ * @param array\|string\|Stringable $rules`
`159`	`161`	`*/`
`160`	`162`	`protected function explodeWildcardRules(array $results, string $attribute, mixed $rules): array`
`161`	`163`	`{`
`@@ -179,7 +181,7 @@ protected function explodeWildcardRules(array $results, string $attribute, mixed`
`179`	`181`	`/**`
`180`	`182`	`* Merge additional rules into a given attribute.`
`181`	`183`	`*`
`182`		`- * @param array\|string\|\Stringable $rules`
	`184`	`+ * @param array\|string\|Stringable $rules`
`183`	`185`	`*/`
`184`	`186`	`protected function mergeRulesForAttribute(array $results, string $attribute, mixed $rules): array`
`185`	`187`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace Hyperf\Validation;`
`13`	`13`
`14`	`14`	`use BadMethodCallException;`
	`15`	`+use Closure;`
`15`	`16`	`use Hyperf\Contract\MessageBag as MessageBagContract;`
`16`	`17`	`use Hyperf\Contract\TranslatorInterface;`
`17`	`18`	`use Hyperf\Contract\ValidatorInterface as ValidatorContract;`
`@@ -25,6 +26,7 @@`
`25`	`26`	`use Hyperf\Validation\Contract\Rule as RuleContract;`
`26`	`27`	`use Psr\Container\ContainerInterface;`
`27`	`28`	`use RuntimeException;`
	`29`	`+use Stringable;`
`28`	`30`
`29`	`31`	`class Validator implements ValidatorContract`
`30`	`32`	`{`
`@@ -84,7 +86,7 @@ class Validator implements ValidatorContract`
`84`	`86`	`/**`
`85`	`87`	`* The current rule that is validating.`
`86`	`88`	`*`
`87`		`- * @var string\|\Stringable`
	`89`	`+ * @var string\|Stringable`
`88`	`90`	`*/`
`89`	`91`	`protected mixed $currentRule;`
`90`	`92`
`@@ -161,7 +163,7 @@ public function __construct(`
`161`	`163`	`*`
`162`	`164`	`* @param mixed $method`
`163`	`165`	`* @param mixed $parameters`
`164`		`- * @throws \BadMethodCallException when method does not exist`
	`166`	`+ * @throws BadMethodCallException when method does not exist`
`165`	`167`	`*/`
`166`	`168`	`public function __call($method, $parameters)`
`167`	`169`	`{`
`@@ -387,7 +389,7 @@ public function getMessageBag(): MessageBagContract`
`387`	`389`	`/**`
`388`	`390`	`* Determine if the given attribute has a rule in the given set.`
`389`	`391`	`*`
`390`		`- * @param array\|string\|\Stringable $rules`
	`392`	`+ * @param array\|string\|Stringable $rules`
`391`	`393`	`*/`
`392`	`394`	`public function hasRule(string $attribute, mixed $rules): bool`
`393`	`395`	`{`
`@@ -526,15 +528,15 @@ public function addDependentExtensions(array $extensions)`
`526`	`528`	`/**`
`527`	`529`	`* Register a custom validator extension.`
`528`	`530`	`*/`
`529`		`- public function addExtension(string $rule, \Closure\|string $extension)`
	`531`	`+ public function addExtension(string $rule, Closure\|string $extension)`
`530`	`532`	`{`
`531`	`533`	`$this->extensions[Str::snake($rule)] = $extension;`
`532`	`534`	`}`
`533`	`535`
`534`	`536`	`/**`
`535`	`537`	`* Register a custom implicit validator extension.`
`536`	`538`	`*/`
`537`		`- public function addImplicitExtension(string $rule, \Closure\|string $extension)`
	`539`	`+ public function addImplicitExtension(string $rule, Closure\|string $extension)`
`538`	`540`	`{`
`539`	`541`	`$this->addExtension($rule, $extension);`
`540`	`542`
`@@ -544,7 +546,7 @@ public function addImplicitExtension(string $rule, \Closure\|string $extension)`
`544`	`546`	`/**`
`545`	`547`	`* Register a custom dependent validator extension.`
`546`	`548`	`*/`
`547`		`- public function addDependentExtension(string $rule, \Closure\|string $extension)`
	`549`	`+ public function addDependentExtension(string $rule, Closure\|string $extension)`
`548`	`550`	`{`
`549`	`551`	`$this->addExtension($rule, $extension);`
`550`	`552`
`@@ -568,7 +570,7 @@ public function addReplacers(array $replacers)`
`568`	`570`	`/**`
`569`	`571`	`* Register a custom validator message replacer.`
`570`	`572`	`*/`
`571`		`- public function addReplacer(string $rule, \Closure\|string $replacer)`
	`573`	`+ public function addReplacer(string $rule, Closure\|string $replacer)`
`572`	`574`	`{`
`573`	`575`	`$this->replacers[Str::snake($rule)] = $replacer;`
`574`	`576`	`}`
`@@ -634,7 +636,7 @@ public function setFallbackMessages(array $messages)`
`634`	`636`	`/**`
`635`	`637`	`* Get the Presence Verifier implementation.`
`636`	`638`	`*`
`637`		`- *@throws \RuntimeException`
	`639`	`+ *@throws RuntimeException`
`638`	`640`	`*/`
`639`	`641`	`public function getPresenceVerifier(): PresenceVerifierInterface`
`640`	`642`	`{`
`@@ -648,7 +650,7 @@ public function getPresenceVerifier(): PresenceVerifierInterface`
`648`	`650`	`/**`
`649`	`651`	`* Get the Presence Verifier implementation.`
`650`	`652`	`*`
`651`		`- * @throws \RuntimeException`
	`653`	`+ * @throws RuntimeException`
`652`	`654`	`*/`
`653`	`655`	`public function getPresenceVerifierFor(?string $connection): PresenceVerifierInterface`
`654`	`656`	`{`
`@@ -930,7 +932,7 @@ protected function attributesThatHaveMessages(): array`
`930`	`932`	`/**`
`931`	`933`	`* Get a rule and its parameters for a given attribute.`
`932`	`934`	`*`
`933`		`- * @param array\|string\|\Stringable $rules`
	`935`	`+ * @param array\|string\|Stringable $rules`
`934`	`936`	`*/`
`935`	`937`	`protected function getRule(string $attribute, mixed $rules): ?array`
`936`	`938`	`{`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ class ValidatorFactory implements ValidatorFactoryInterface`
`66`	`66`	`/**`
`67`	`67`	`* The Validator resolver instance.`
`68`	`68`	`*`
`69`		`- * @var \Closure`
	`69`	`+ * @var Closure`
`70`	`70`	`*/`
`71`	`71`	`protected $resolver;`
`72`	`72`