Use Hyperf\Stringable\Str instead of Hyperf\Utils\Str (#5634)

Author: huangdijia

src/Concerns/FormatsMessages.php

@@ -14,7 +14,7 @@
 use Closure;
 use Hyperf\Collection\Arr;
 use Hyperf\HttpMessage\Upload\UploadedFile;
-use Hyperf\Utils\Str;
+use Hyperf\Stringable\Str;
 use Hyperf\Validation\Validator;
 
 trait FormatsMessages

src/Concerns/ValidatesAttributes.php

@@ -21,7 +21,7 @@
 use Exception;
 use Hyperf\Collection\Arr;
 use Hyperf\HttpMessage\Upload\UploadedFile;
-use Hyperf\Utils\Str;
+use Hyperf\Stringable\Str;
 use Hyperf\Validation\Rules\Exists;
 use Hyperf\Validation\Rules\Unique;
 use Hyperf\Validation\ValidationData;

src/DatabasePresenceVerifier.php

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

src/ValidationData.php

@@ -12,7 +12,7 @@
 namespace Hyperf\Validation;
 
 use Hyperf\Collection\Arr;
-use Hyperf\Utils\Str;
+use Hyperf\Stringable\Str;
 
 class ValidationData
 {

src/ValidationRuleParser.php

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

src/Validator.php

@@ -18,9 +18,9 @@
 use Hyperf\Contract\TranslatorInterface;
 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\Utils\Str;
 use Hyperf\Validation\Contract\ImplicitRule;
 use Hyperf\Validation\Contract\PresenceVerifierInterface;
 use Hyperf\Validation\Contract\Rule as RuleContract;
@@ -495,7 +495,7 @@ public function sometimes($attribute, $rules, callable $callback): self
     public function addExtensions(array $extensions)
     {
         if ($extensions) {
-            $keys = array_map('\Hyperf\Utils\Str::snake', array_keys($extensions));
+            $keys = array_map('\Hyperf\Stringable\Str::snake', array_keys($extensions));
 
             $extensions = array_combine($keys, array_values($extensions));
         }
@@ -561,7 +561,7 @@ public function addDependentExtension(string $rule, Closure|string $extension)
     public function addReplacers(array $replacers)
     {
         if ($replacers) {
-            $keys = array_map('\Hyperf\Utils\Str::snake', array_keys($replacers));
+            $keys = array_map('\Hyperf\Stringable\Str::snake', array_keys($replacers));
 
             $replacers = array_combine($keys, array_values($replacers));
         }

src/ValidatorFactory.php

@@ -14,7 +14,7 @@
 use Closure;
 use Hyperf\Contract\TranslatorInterface;
 use Hyperf\Contract\ValidatorInterface;
-use Hyperf\Utils\Str;
+use Hyperf\Stringable\Str;
 use Hyperf\Validation\Contract\PresenceVerifierInterface;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use Psr\Container\ContainerInterface;