Attempt to remove yiisoft/strings (#480)

darkdef · web-flow · commit ec14da31854b · 2023-01-14T16:58:05.000+03:00
* Attempt to remove yiisoft/strings

* Remove yiisoft/strings

* remove unused code

* styleci

* mini fix

* psalm fix
diff --git a/composer.json b/composer.json
@@ -26,9 +26,7 @@
         "ext-pdo": "*",
         "psr/log": "^2.0|^3.0",
         "yiisoft/arrays": "^2.0",
-        "yiisoft/cache": "^2.0",
-        "yiisoft/log": "^2.0",
-        "yiisoft/strings": "^2.0"
+        "yiisoft/cache": "^2.0"
     },
     "require-dev": {
         "maglnet/composer-require-checker": "^4.2",
@@ -41,7 +39,8 @@
         "yiisoft/cache-file": "^2.0",
         "yiisoft/di": "^1.0",
         "yiisoft/event-dispatcher": "^1.0",
-        "yiisoft/json": "^1.0"
+        "yiisoft/json": "^1.0",
+        "yiisoft/log": "^2.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Helper/NumericHelper.php b/src/Helper/NumericHelper.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Helper;
+
+final class NumericHelper
+{
+    /**
+     * Returns string representation of a number value without thousands separators and with dot as decimal separator.
+     *
+     * @param float|string $value
+     *
+     * @return string
+     */
+    public static function normalizeFloat(float|string $value): string
+    {
+        if (is_float($value)) {
+            $value = (string)$value;
+        }
+
+        $value = str_replace([' ', ','], ['', '.'], $value);
+        return preg_replace('/\.(?=.*\.)/', '', $value);
+    }
+}
diff --git a/src/Schema/AbstractColumnSchema.php b/src/Schema/AbstractColumnSchema.php
@@ -7,7 +7,7 @@
 use PDO;
 use Yiisoft\Db\Command\Param;
 use Yiisoft\Db\Expression\ExpressionInterface;
-use Yiisoft\Strings\NumericHelper;
+use Yiisoft\Db\Helper\NumericHelper;
 
 /**
  * The ColumnSchema class represents the metadata of a column in a database table. It provides information about the
@@ -278,7 +278,7 @@ protected function typecast(mixed $value): mixed
 
                 if (is_float($value)) {
                     /* ensure type cast always has . as decimal separator in all locales */
-                    return NumericHelper::normalize((string) $value);
+                    return NumericHelper::normalizeFloat($value);
                 }
 
                 if (is_bool($value)) {
diff --git a/src/Schema/AbstractColumnSchemaBuilder.php b/src/Schema/AbstractColumnSchemaBuilder.php
@@ -5,7 +5,7 @@
 namespace Yiisoft\Db\Schema;
 
 use Yiisoft\Db\Expression\Expression;
-use Yiisoft\Strings\NumericHelper;
+use Yiisoft\Db\Helper\NumericHelper;
 
 use function gettype;
 use function strtr;
@@ -232,7 +232,7 @@ protected function buildDefaultString(): string
 
         $string .= match (gettype($this->default)) {
             'object', 'integer' => (string)$this->default,
-            'double' => NumericHelper::normalize((string)$this->default),
+            'double' => NumericHelper::normalizeFloat((string)$this->default),
             'boolean' => $this->default ? 'TRUE' : 'FALSE',
             default => "'$this->default'",
         };
