Instead of classes and functions of Hyperf\Utils (#5674)

Co-authored-by: 李铭昕 <[email protected]>

Author: huangdijia

composer.json

@@ -29,6 +29,7 @@
         "hyperf/macroable": "~3.0.0",
         "hyperf/tappable": "~3.0.0",
         "hyperf/translation": "~3.0.0",
+        "hyperf/support": "~3.0.0",
         "hyperf/utils": "~3.0.0",
         "nesbot/carbon": "^2.21",
         "psr/container": "^1.0|^2.0",

src/Concerns/FormatsMessages.php

@@ -17,6 +17,8 @@
 use Hyperf\Stringable\Str;
 use Hyperf\Validation\Validator;
 
+use function Hyperf\Support\make;
+
 trait FormatsMessages
 {
     use ReplacesAttributes;

src/DatabasePresenceVerifierFactory.php

@@ -14,6 +14,8 @@
 use Hyperf\Database\ConnectionResolverInterface;
 use Psr\Container\ContainerInterface;
 
+use function Hyperf\Support\make;
+
 class DatabasePresenceVerifierFactory
 {
     public function __invoke(ContainerInterface $container)

src/Validator.php

@@ -19,8 +19,8 @@
 use Hyperf\Contract\ValidatorInterface as ValidatorContract;
 use Hyperf\HttpMessage\Upload\UploadedFile;
 use Hyperf\Stringable\Str;
-use Hyperf\Utils\Fluent;
-use Hyperf\Utils\MessageBag;
+use Hyperf\Support\Fluent;
+use Hyperf\Support\MessageBag;
 use Hyperf\Validation\Contract\ImplicitRule;
 use Hyperf\Validation\Contract\PresenceVerifierInterface;
 use Hyperf\Validation\Contract\Rule as RuleContract;
@@ -30,6 +30,7 @@
 
 use function Hyperf\Collection\collect;
 use function Hyperf\Collection\data_get;
+use function Hyperf\Support\make;
 use function Hyperf\Tappable\tap;
 
 class Validator implements ValidatorContract

src/ValidatorFactoryFactory.php

@@ -18,6 +18,8 @@
 use Psr\Container\ContainerInterface;
 use Psr\EventDispatcher\EventDispatcherInterface;
 
+use function Hyperf\Support\make;
+
 class ValidatorFactoryFactory
 {
     public function __invoke(ContainerInterface $container)

tests/Cases/ValidationExceptionTest.php

@@ -15,7 +15,7 @@
 use Hyperf\Contract\TranslatorInterface;
 use Hyperf\Contract\ValidatorInterface;
 use Hyperf\HttpMessage\Base\Response;
-use Hyperf\Utils\MessageBag;
+use Hyperf\Support\MessageBag;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use Hyperf\Validation\ValidationException;
 use Hyperf\Validation\ValidationExceptionHandler;