Use Hyperf\Collection\Arr instead of Hyperf\Utils\Arr. (#5594)

Author: limingxinleo

src/Concerns/FormatsMessages.php

@@ -12,8 +12,8 @@
 namespace Hyperf\Validation\Concerns;
 
 use Closure;
+use Hyperf\Collection\Arr;
 use Hyperf\HttpMessage\Upload\UploadedFile;
-use Hyperf\Utils\Arr;
 use Hyperf\Utils\Str;
 use Hyperf\Validation\Validator;
 

src/Concerns/ReplacesAttributes.php

@@ -11,7 +11,7 @@
  */
 namespace Hyperf\Validation\Concerns;
 
-use Hyperf\Utils\Arr;
+use Hyperf\Collection\Arr;
 
 trait ReplacesAttributes
 {

src/Concerns/ValidatesAttributes.php

@@ -19,8 +19,8 @@
 use Egulias\EmailValidator\EmailValidator;
 use Egulias\EmailValidator\Validation\RFCValidation;
 use Exception;
+use Hyperf\Collection\Arr;
 use Hyperf\HttpMessage\Upload\UploadedFile;
-use Hyperf\Utils\Arr;
 use Hyperf\Utils\Str;
 use Hyperf\Validation\Rules\Exists;
 use Hyperf\Validation\Rules\Unique;

src/Request/FormRequest.php

@@ -11,10 +11,10 @@
  */
 namespace Hyperf\Validation\Request;
 
+use Hyperf\Collection\Arr;
 use Hyperf\Context\Context;
 use Hyperf\Contract\ValidatorInterface;
 use Hyperf\HttpServer\Request;
-use Hyperf\Utils\Arr;
 use Hyperf\Validation\Contract\ValidatesWhenResolved;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface as ValidationFactory;
 use Hyperf\Validation\UnauthorizedException;

src/ValidationData.php

@@ -11,7 +11,7 @@
  */
 namespace Hyperf\Validation;
 
-use Hyperf\Utils\Arr;
+use Hyperf\Collection\Arr;
 use Hyperf\Utils\Str;
 
 class ValidationData

src/ValidationException.php

@@ -11,10 +11,10 @@
  */
 namespace Hyperf\Validation;
 
+use Hyperf\Collection\Arr;
 use Hyperf\Contract\ValidatorInterface;
 use Hyperf\Server\Exception\ServerException;
 use Hyperf\Utils\ApplicationContext;
-use Hyperf\Utils\Arr;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 

src/ValidationRuleParser.php

@@ -12,7 +12,7 @@
 namespace Hyperf\Validation;
 
 use Closure;
-use Hyperf\Utils\Arr;
+use Hyperf\Collection\Arr;
 use Hyperf\Utils\Str;
 use Hyperf\Validation\Contract\Rule as RuleContract;
 use Hyperf\Validation\Rules\Exists;

src/Validator.php

@@ -13,11 +13,11 @@
 
 use BadMethodCallException;
 use Closure;
+use Hyperf\Collection\Arr;
 use Hyperf\Contract\MessageBag as MessageBagContract;
 use Hyperf\Contract\TranslatorInterface;
 use Hyperf\Contract\ValidatorInterface as ValidatorContract;
 use Hyperf\HttpMessage\Upload\UploadedFile;
-use Hyperf\Utils\Arr;
 use Hyperf\Utils\Fluent;
 use Hyperf\Utils\MessageBag;
 use Hyperf\Utils\Str;

tests/Cases/ValidationValidatorTest.php

@@ -14,14 +14,14 @@
 use Carbon\Carbon;
 use DateTime;
 use DateTimeImmutable;
+use Hyperf\Collection\Arr;
 use Hyperf\Contract\TranslatorInterface as TranslatorContract;
 use Hyperf\Di\Container;
 use Hyperf\Di\Definition\DefinitionSourceInterface;
 use Hyperf\HttpMessage\Upload\UploadedFile;
 use Hyperf\Translation\ArrayLoader;
 use Hyperf\Translation\Translator;
 use Hyperf\Utils\ApplicationContext;
-use Hyperf\Utils\Arr;
 use Hyperf\Validation\Contract\ImplicitRule;
 use Hyperf\Validation\Contract\PresenceVerifierInterface;
 use Hyperf\Validation\Contract\Rule;