Remove yiisoft/strings dependency (#210)

* Remove `yiisoft/strings` dependency * Apply @vjik suggestion Co-authored-by: Sergei Predvoditelev <sergei@predvoditelev.ru> * Update test according changes --------- Co-authored-by: Sergei Predvoditelev <sergei@predvoditelev.ru>
yiisoft · Oct 15, 2023 · 0e23a9f · 0e23a9f
1 parent e8427c7
commit 0e23a9f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -28,8 +28,7 @@
         "yiisoft/db": "^1.1",
         "yiisoft/di": "^1.0",
         "yiisoft/definitions": "^3.0",
-        "yiisoft/injector": "^1.0",
-        "yiisoft/strings": "^2.0"
+        "yiisoft/injector": "^1.0"
     },
     "require-dev": {
         "maglnet/composer-require-checker": "^4.4",

diff --git a/src/Command/CreateCommand.php b/src/Command/CreateCommand.php
@@ -13,7 +13,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Yiisoft\Strings\Inflector;
 use Yiisoft\Db\Migration\Migrator;
 use Yiisoft\Db\Migration\Service\Generate\CreateService;
 use Yiisoft\Db\Migration\Service\MigrationService;
@@ -137,7 +136,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             return Command::INVALID;
         }
 
-        $name = $this->generateName($command, (new Inflector())->toPascalCase($table), $and);
+        $name = $this->generateName($command, $table, $and);
 
         /**
          * @var string $namespace

diff --git a/src/MigrationBuilder.php b/src/MigrationBuilder.php
@@ -12,9 +12,13 @@
 use Yiisoft\Db\Query\Query;
 use Yiisoft\Db\Query\QueryInterface;
 use Yiisoft\Db\Schema\Builder\ColumnInterface;
-use Yiisoft\Strings\StringHelper;
 use Yiisoft\Db\Migration\Informer\MigrationInformerInterface;
 
+use function implode;
+use function microtime;
+use function sprintf;
+use function substr;
+
 final class MigrationBuilder extends AbstractMigrationBuilder
 {
     public function __construct(
@@ -47,8 +51,8 @@ public function getDb(): ConnectionInterface
     public function execute(string $sql, array $params = []): void
     {
         $sqlOutput = $sql;
-        if ($this->maxSqlOutputLength > 0) {
-            $sqlOutput = StringHelper::truncateEnd($sql, $this->maxSqlOutputLength, '[... hidden]');
+        if (0 < $this->maxSqlOutputLength && $this->maxSqlOutputLength < strlen($sql)) {
+            $sqlOutput = substr($sql, 0, $this->maxSqlOutputLength) . ' [... hidden]';
         }
 
         $time = $this->beginCommand("Execute SQL: $sqlOutput");

diff --git a/src/Service/MigrationService.php b/src/Service/MigrationService.php
@@ -12,12 +12,16 @@
 use Yiisoft\Aliases\Aliases;
 use Yiisoft\Db\Connection\ConnectionInterface;
 use Yiisoft\Injector\Injector;
-use Yiisoft\Strings\Inflector;
 use Yiisoft\Db\Migration\MigrationInterface;
 use Yiisoft\Db\Migration\Migrator;
 use Yiisoft\Db\Migration\RevertibleMigrationInterface;
 
 use function dirname;
+use function gmdate;
+use function preg_replace;
+use function str_replace;
+use function trim;
+use function ucwords;
 
 final class MigrationService
 {
@@ -310,7 +314,8 @@ public function generateClassName(?string $namespace, string $name): array
             $namespace = $this->createNamespace;
         }
 
-        $class = 'M' . gmdate('ymdHis') . (new Inflector())->toPascalCase($name);
+        $class = 'M' . gmdate('ymdHis')
+            . str_replace(' ', '', ucwords(preg_replace('/[^a-z0-9]+/i', ' ', $name)));
 
         return [$namespace, $class];
     }

diff --git a/tests/Common/AbstractMigrationBuilderTest.php b/tests/Common/AbstractMigrationBuilderTest.php
@@ -575,17 +575,15 @@ public function testMaxSqlOutputLength(): void
                 SELECT 1+2+3+4+5+6+7+8+9+10+11 AS resultado FROM dual
                 SQL,
             );
-            $expected = 'Execute SQL: SELECT 1+2+3+4+5+6+7+8+9+10+11 AS resultado F[... hidden] ... Done';
         } else {
             $this->builder->execute(
                 <<<SQL
                 SELECT 1+2+3+4+5+6+7+8+9+10+11
                 SQL,
             );
-            $expected = 'Execute SQL: SELECT 1+2+3+4+5+6+7+8[... hidden] ... Done';
         }
 
-        $this->assertStringContainsString($expected, $this->informer->getOutput());
+        $this->assertStringContainsString('Execute SQL: SELE [... hidden] ... Done', $this->informer->getOutput());
     }
 
     public function testBigInteger(): void