Remove ext-mbstring from require section of composer.json (#937)

Tigrov · web-flow · commit e2835d576b1f · 2025-03-14T16:40:51.000+07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -65,8 +65,9 @@
 - Bug #933: Explicitly mark nullable parameters (@vjik)
 - Chg #911: Change supported PHP versions to `8.1 - 8.4` (@Tigrov)
 - Enh #911: Minor refactoring (@Tigrov)
-- Chg #938, #936: Remove `ext-json`, `ext-ctype` from `require` section of `composer.json` (@Tigrov) 
+- Chg #938, #936, #937: Remove `ext-json`, `ext-ctype`, `ext-mbstring` from `require` section of `composer.json` (@Tigrov) 
 - Chg #936: Remove `hasLimit()` and `hasOffset()` methods from `AbstractDQLQueryBuilder` class (@Tigrov)
+- Chg #937: Remove `baseName()` and `pascalCaseToId()` methods from `DbStringHelper` (@Tigrov)
 
 ## 1.3.0 March 21, 2024
 
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -142,6 +142,8 @@ Each table column has its own class in the `Yiisoft\Db\Schema\Column` namespace
 - `DbArrayHelper::getColumn()` - use `array_column()` instead;
 - `DbArrayHelper::getValueByPath()`;
 - `DbArrayHelper::populate()` - use `DbArrayHelper::index()` instead;
+- `DbStringHelper::baseName()`;
+- `DbStringHelper::pascalCaseToId()`;
 - `AbstractDQLQueryBuilder::hasLimit()` - use `$limit !== null` instead;
 - `AbstractDQLQueryBuilder::hasOffset()` - use `!empty($offset)` instead;
 
diff --git a/composer.json b/composer.json
@@ -31,7 +31,6 @@
     ],
     "require": {
         "php": "8.1 - 8.4",
-        "ext-mbstring": "*",
         "ext-pdo": "*",
         "psr/log": "^2.0|^3.0",
         "psr/simple-cache": "^2.0|^3.0"
diff --git a/src/Cache/SchemaCache.php b/src/Cache/SchemaCache.php
@@ -15,8 +15,8 @@
 use function is_string;
 use function json_encode;
 use function json_last_error_msg;
-use function mb_strlen;
 use function md5;
+use function strlen;
 use function strpbrk;
 
 /**
@@ -200,7 +200,7 @@ private function normalize(mixed $key): string
     {
         if (is_string($key) || is_int($key)) {
             $key = (string)$key;
-            $length = mb_strlen($key, '8bit');
+            $length = strlen($key);
             return (strpbrk($key, '{}()/\@:') !== false || $length < 1 || $length > 64) ? md5($key) : $key;
         }
 
diff --git a/src/Helper/DbStringHelper.php b/src/Helper/DbStringHelper.php
@@ -5,49 +5,15 @@
 namespace Yiisoft\Db\Helper;
 
 use function is_float;
-use function mb_strrpos;
-use function mb_strtolower;
-use function mb_substr;
 use function preg_match;
 use function preg_replace;
-use function rtrim;
 use function str_replace;
-use function trim;
 
 /**
  * String manipulation methods.
  */
 final class DbStringHelper
 {
-    /**
-     * Returns the trailing name part of a path.
-     *
-     * This method is similar to the php function `basename()` except that it will treat both \ and / as directory
-     * separators, independent of the operating system.
-     *
-     * This method was mainly created to work on php namespaces. When working with real file paths, PHP's `basename()`
-     * should work fine for you.
-     *
-     * Note: this method isn't aware of the actual filesystem, or path components such as "..".
-     *
-     * @param string $path A path string.
-     *
-     * @return string The trailing name part of the given path.
-     *
-     * @link https://www.php.net/manual/en/function.basename.php
-     */
-    public static function baseName(string $path): string
-    {
-        $path = rtrim(str_replace('\\', '/', $path), '/');
-        $position = mb_strrpos($path, '/');
-
-        if ($position !== false) {
-            return mb_substr($path, $position + 1);
-        }
-
-        return $path;
-    }
-
     /**
      * Returns a value indicating whether an SQL statement is for read purpose.
      *
@@ -78,20 +44,4 @@ public static function normalizeFloat(float|string $value): string
         /** @var string */
         return preg_replace('/\.(?=.*\.)/', '', $value);
     }
-
-    /**
-     * Converts a PascalCase name into an ID in lowercase.
-     *
-     * Words in the ID may be concatenated using '_'. For example, 'PostTag' will be converted to 'post_tag'.
-     *
-     * @param string $input The string to be converted.
-     *
-     * @return string The resulting ID.
-     */
-    public static function pascalCaseToId(string $input): string
-    {
-        /** @var string $result */
-        $result = preg_replace('/(?<=\p{L})(?<!\p{Lu})(\p{Lu})/u', '_\1', $input);
-        return mb_strtolower(trim($result, '_'));
-    }
 }
diff --git a/tests/Db/Helper/DbStringHelperTest.php b/tests/Db/Helper/DbStringHelperTest.php
@@ -12,12 +12,6 @@
  */
 final class DbStringHelperTest extends TestCase
 {
-    public function testBaseName(): void
-    {
-        $this->assertSame('TestCase', DbStringHelper::baseName(TestCase::class));
-        $this->assertSame('TestCase', DbStringHelper::baseName('TestCase'));
-    }
-
     public function testIsReadQuery(): void
     {
         $this->assertTrue(DbStringHelper::isReadQuery('SELECT * FROM tbl'));
@@ -37,14 +31,6 @@ public static function pascalCaseToIdProvider(): array
         ];
     }
 
-    /**
-     * @dataProvider pascalCaseToIdProvider
-     */
-    public function testPascalCaseToId(string $expectedResult, string $input): void
-    {
-        $this->assertEquals($expectedResult, DbStringHelper::pascalCaseToId($input));
-    }
-
     public function testNormalizeFloat()
     {
         $this->assertSame('123', DbStringHelper::normalizeFloat(123));
