Clean tests for PHPUnit v.10. (#109)

php-forge · Sep 27, 2024 · 870f336 · 870f336
1 parent 658aa1c
commit 870f336
Show file tree

Hide file tree

Showing 69 changed files with 452 additions and 333 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -48,6 +48,7 @@ Yii Core version 2 Change Log
 - Enh #106: Move `extractAlias()` method to `Quoter::class` (@terabytesoftw)
 - Enh #107: Add `SqlHelper::class` in `db` (@terabytesoftw)
 - Enh #108: Add method `addSuffix()` in `SqlHelper::class` (@terabytesoftw)
+- Enh #109: Clean tests for `PHPUnit` v.10 (@terabytesoftw)
 
 Yii Framework 2 Change Log
 ==========================

diff --git a/src/db/Schema.php b/src/db/Schema.php
@@ -609,7 +609,7 @@ public function getServerVersion()
      */
     public function getSequenceInfo(string $sequence): array|false
     {
-        throw new NotSupportedException($this->db->getDriverName() . ' does not support getting sequence name.');
+        throw new NotSupportedException($this->db->getDriverName() . ' does not support getting sequence information.');
     }
 
     /**

diff --git a/src/db/pgsql/Schema.php b/src/db/pgsql/Schema.php
@@ -334,10 +334,10 @@ public function resetAutoIncrementPK(string $tableName, int|null $value = null):
             $value = $this->db->getSchema()->getNextAutoIncrementPKValue($tableSchema->fullName, $columnPK);
         }
 
-        $sequenceName = $this->db->quoteValue($tableSchema->columns[$columnPK]->sequenceName);
+        $sequenceName =  $this->quoteValue('"' . $tableSchema->columns[$columnPK]->sequenceName . '"');
 
         $sql = <<<SQL
-        SELECT SETVAL($sequenceName,{$value},false)
+        SELECT SETVAL($sequenceName,$value,false)
         SQL;
 
         $this->db->createCommand($sql)->execute();

diff --git a/tests/framework/db/command/AbstractBatchInsert.php b/tests/framework/db/command/AbstractBatchInsert.php
@@ -5,8 +5,7 @@
 namespace yiiunit\framework\db\command;
 
 use yii\base\InvalidArgumentException;
-use yii\db\Connection;
-use yii\db\Query;
+use yii\db\{Connection, Query};
 
 abstract class AbstractBatchInsert extends \yiiunit\TestCase
 {
@@ -26,23 +25,23 @@ public function tearDown(): void
      * {@see https://github.com/yiisoft/yii2/issues/11242}
      */
     public function testBatchInsert(
-        string $table,
+        string $tableName,
         array $columns,
         array $values,
         string $expected,
         array $expectedParams = [],
         int $insertedRow = 1
     ): void {
         $command = $this->db->createCommand();
-        $command->batchInsert($table, $columns, $values);
+        $command->batchInsert($tableName, $columns, $values);
 
         $this->assertSame($expected, $command->getSql());
         $this->assertSame($expectedParams, $command->params);
 
         $command->prepare(false);
         $command->execute();
 
-        $this->assertEquals($insertedRow, (new Query())->from($table)->count(db: $this->db));
+        $this->assertEquals($insertedRow, (new Query())->from($tableName)->count(db: $this->db));
     }
 
     /**
@@ -98,12 +97,13 @@ public function testBatchInsertDataTypesLocale(): void
             $this->assertEquals('1', $data[0]['bool_col']);
             $this->assertIsOneOf($data[1]['bool_col'], ['0', false]);
             $this->assertIsOneOf($data[2]['bool_col'], ['0', false]);
-
         } catch (\Exception $e) {
             setlocale(LC_NUMERIC, $locale);
+
             throw $e;
         } catch (\Throwable $e) {
             setlocale(LC_NUMERIC, $locale);
+
             throw $e;
         }
 

diff --git a/tests/framework/db/command/AbstractCreateSequence.php b/tests/framework/db/command/AbstractCreateSequence.php
@@ -5,6 +5,7 @@
 namespace yiiunit\framework\db\command;
 
 use yii\db\Connection;
+use yiiunit\support\DbHelper;
 
 abstract class AbstractCreateSequence extends \yiiunit\TestCase
 {
@@ -19,34 +20,26 @@ protected function tearDown(): void
     }
 
     public function testCreateSequence(
-        string $table,
+        string $sequence,
         int $start,
         int $increment,
         array $options,
         array $expectedSequenceInfo
     ): void {
-        $this->ensureNoTable($table);
+        DbHelper::ensureNoTable($this->db, $sequence);
 
-        $result = $this->db->createCommand()->createSequence($table, $start, $increment, $options)->execute();
+        $result = $this->db->createCommand()->createSequence($sequence, $start, $increment, $options)->execute();
 
         $this->assertSame(0, $result);
 
-        $sequenceInfo = $this->db->getSchema()->getSequenceInfo($table);
+        $sequenceInfo = $this->db->getSchema()->getSequenceInfo($sequence);
 
         $this->assertSame($expectedSequenceInfo, $sequenceInfo);
 
-        $result = $this->db->createCommand()->dropSequence($table)->execute();
+        $result = $this->db->createCommand()->dropSequence($sequence)->execute();
 
         $this->assertSame(0, $result);
 
-        $this->ensureNoTable($table);
-    }
-
-    protected function ensureNoTable(string $tableName): void
-    {
-        if ($this->db->hasTable($tableName)) {
-            $this->db->createCommand()->dropTable($tableName)->execute();
-            $this->assertFalse($this->db->hasTable($tableName));
-        }
+        DbHelper::ensureNoTable($this->db, $sequence);
     }
 }
diff --git a/tests/framework/db/command/AbstractInsert.php b/tests/framework/db/command/AbstractInsert.php
@@ -5,9 +5,8 @@
 namespace yiiunit\framework\db\command;
 
 use yii\db\Connection;
-use yiiunit\TestCase;
 
-abstract class AbstractInsert extends TestCase
+abstract class AbstractInsert extends \yiiunit\TestCase
 {
     protected Connection|null $db = null;
 
@@ -44,12 +43,4 @@ public function testInsertWithReturningPksEmptyValuesAndNoPk(): void
             $this->db->createCommand()->insertWithReturningPks('negative_default_values', []),
         );
     }
-
-    protected function ensureNoTable(string $tableName): void
-    {
-        if ($this->db->hasTable($tableName)) {
-            $this->db->createCommand()->dropTable($tableName)->execute();
-            $this->assertFalse($this->db->hasTable($tableName));
-        }
-    }
 }
diff --git a/tests/framework/db/command/AbstractUpsert.php b/tests/framework/db/command/AbstractUpsert.php
@@ -4,11 +4,11 @@
 
 namespace yiiunit\framework\db\command;
 
-use yii\db\Connection;
-use yii\db\Query;
-use yii\db\QueryInterface;
+use yii\db\{Connection, Query, QueryInterface};
 
+use function is_resource;
 use function json_encode;
+use function stream_get_contents;
 
 abstract class AbstractUpsert extends \yiiunit\TestCase
 {

diff --git a/tests/framework/db/connection/AbstractConnection.php b/tests/framework/db/connection/AbstractConnection.php
@@ -4,8 +4,7 @@
 
 namespace yiiunit\framework\db\connection;
 
-use yii\db\Connection;
-use yii\db\Schema;
+use yii\db\{Connection, Schema};
 
 abstract class AbstractConnection extends \yiiunit\TestCase
 {
@@ -21,7 +20,7 @@ protected function tearDown(): void
 
     public function testHasTable(): void
     {
-        $tableName = 'T_table';
+        $tableName = '{{%T_has_table}}';
 
         if ($this->db->hasTable($tableName)) {
             $result = $this->db->createCommand()->dropTable($tableName)->execute();

diff --git a/tests/framework/db/mssql/command/BatchInserTest.php b/tests/framework/db/mssql/command/BatchInserTest.php
@@ -10,7 +10,7 @@
  * @group db
  * @group mssql
  * @group command
- * @group batchinsert
+ * @group batch-insert
  */
 final class BatchInserTest extends \yiiunit\framework\db\command\AbstractBatchInsert
 {
@@ -25,13 +25,13 @@ protected function setUp(): void
      * @dataProvider \yiiunit\framework\db\mssql\provider\CommandProvider::batchInsert
      */
     public function testBatchInsert(
-        string $table,
+        string $tableName,
         array $columns,
         array $values,
         string $expected,
         array $expectedParams = [],
         int $insertedRow = 1
     ): void {
-        parent::testBatchInsert($table, $columns, $values, $expected, $expectedParams, $insertedRow);
+        parent::testBatchInsert($tableName, $columns, $values, $expected, $expectedParams, $insertedRow);
     }
 }
diff --git a/tests/framework/db/mssql/command/CreateSequenceTest.php b/tests/framework/db/mssql/command/CreateSequenceTest.php
@@ -25,12 +25,12 @@ public function setup(): void
      * @dataProvider \yiiunit\framework\db\mssql\provider\CommandProvider::createSequence
      */
     public function testCreateSequence(
-        string $table,
+        string $sequence,
         int $start,
         int $increment,
         array $options,
         array $expectedSequenceInfo
     ): void {
-        parent::testCreateSequence($table, $start, $increment, $options, $expectedSequenceInfo);
+        parent::testCreateSequence($sequence, $start, $increment, $options, $expectedSequenceInfo);
     }
 }
diff --git a/tests/framework/db/mssql/command/InsertTest.php b/tests/framework/db/mssql/command/InsertTest.php
@@ -5,7 +5,7 @@
 namespace yiiunit\framework\db\mssql\command;
 
 use yii\db\Expression;
-use yiiunit\support\MssqlConnection;
+use yiiunit\support\{DbHelper, MssqlConnection};
 
 /**
  * @group db
@@ -26,7 +26,7 @@ public function testInsertUsingSequence(): void
     {
         $tableName = '{{%T_insert_using_sequence}}';
 
-        $this->ensureNoTable($tableName);
+        DbHelper::ensureNoTable($this->db, $tableName);
 
         $result = $this->db->createCommand()->createTable(
             $tableName,
@@ -38,15 +38,15 @@ public function testInsertUsingSequence(): void
 
         $this->assertSame(0, $result);
 
-        $sequenceName = 'T_insert_using_sequence';
+        $sequence = 'T_insert_using_sequence';
 
-        $result = $this->db->createCommand()->createSequence($sequenceName)->execute();
+        $result = $this->db->createCommand()->createSequence($sequence)->execute();
 
         $this->assertSame(0, $result);
 
         $result = $this->db->createCommand()->insert(
             $tableName,
-            ['id' => new Expression("NEXT VALUE FOR {$sequenceName}_SEQ"), 'name' => 'test']
+            ['id' => new Expression("NEXT VALUE FOR {$sequence}_SEQ"), 'name' => 'test']
         )->execute();
 
         $this->assertSame(1, $result);
@@ -60,18 +60,18 @@ public function testInsertUsingSequence(): void
 
         $this->assertSame(['1'], $ids);
 
-        $result = $this->db->createCommand()->dropSequence($sequenceName)->execute();
+        $result = $this->db->createCommand()->dropSequence($sequence)->execute();
 
         $this->assertSame(0, $result);
 
-        $this->ensureNoTable($tableName);
+        DbHelper::ensureNoTable($this->db, $tableName);
     }
 
     public function testInsertUsingSequenceWithOptions(): void
     {
         $tableName = '{{%T_insert_using_sequence_options}}';
 
-        $this->ensureNoTable($tableName);
+        DbHelper::ensureNoTable($this->db, $tableName);
 
         $result = $this->db->createCommand()->createTable(
             $tableName,
@@ -83,10 +83,10 @@ public function testInsertUsingSequenceWithOptions(): void
 
         $this->assertSame(0, $result);
 
-        $sequenceName = 'T_insert_using_sequence_options';
+        $sequence = 'T_insert_using_sequence_options';
 
         $result = $this->db->createCommand()->createSequence(
-            $sequenceName,
+            $sequence,
             100,
             2,
             [
@@ -97,7 +97,7 @@ public function testInsertUsingSequenceWithOptions(): void
 
         $this->assertSame(0, $result);
 
-        $idValue = new Expression("NEXT VALUE FOR {$sequenceName}_SEQ");
+        $idValue = new Expression("NEXT VALUE FOR {$sequence}_SEQ");
 
         $result = $this->db->createCommand()->insert($tableName, ['id' => $idValue, 'name' => 'test'])->execute();
 
@@ -116,10 +116,10 @@ public function testInsertUsingSequenceWithOptions(): void
 
         $this->assertSame(['100', '102'], $ids);
 
-        $result = $this->db->createCommand()->dropSequence($sequenceName)->execute();
+        $result = $this->db->createCommand()->dropSequence($sequence)->execute();
 
         $this->assertSame(0, $result);
 
-        $this->ensureNoTable($tableName);
+        DbHelper::ensureNoTable($this->db, $tableName);
     }
 }
diff --git a/tests/framework/db/mssql/provider/SchemaProvider.php b/tests/framework/db/mssql/provider/SchemaProvider.php
@@ -11,7 +11,7 @@ public static function resetAutoIncrementPK(): array
         $rows = parent::resetAutoIncrementPK();
 
         $rows['value with zero'] = [
-            '{{%reset_autoincrement_pk}}',
+            '{{%T_reset_autoincrement_pk}}',
             [
                 ['name' => 'name1'],
                 ['name' => 'name2'],
@@ -22,7 +22,7 @@ public static function resetAutoIncrementPK(): array
         ];
 
         $rows['value negative'] = [
-            '{{%reset_autoincrement_pk}}',
+            '{{%T_reset_autoincrement_pk}}',
             [
                 ['name' => 'name1'],
                 ['name' => 'name2'],

diff --git a/tests/framework/db/mssql/querybuilder/BatchInserTest.php b/tests/framework/db/mssql/querybuilder/BatchInserTest.php
@@ -9,8 +9,8 @@
 /**
  * @group db
  * @group mssql
- * @group querybuilder
- * @group batchinsert
+ * @group query-builder
+ * @group batch-insert
  */
 final class BatchInserTest extends \yiiunit\framework\db\querybuilder\AbstractBatchInsert
 {
@@ -24,8 +24,8 @@ protected function setUp(): void
     /**
      * @dataProvider \yiiunit\framework\db\mssql\provider\QueryBuilderProvider::batchInsert
      */
-    public function testBatchInsert(string $table, array $columns, iterable $rows, string $expected): void
+    public function testBatchInsert(string $tableName, array $columns, iterable $rows, string $expected): void
     {
-        parent::testBatchInsert($table, $columns, $rows, $expected);
+        parent::testBatchInsert($tableName, $columns, $rows, $expected);
     }
 }
diff --git a/tests/framework/db/mssql/querybuilder/BuildTest.php b/tests/framework/db/mssql/querybuilder/BuildTest.php
@@ -11,7 +11,7 @@
 /**
  * @group db
  * @group mssql
- * @group querybuilder
+ * @group query-builder
  * @group build
  */
 final class BuildTest extends \yiiunit\TestCase

diff --git a/tests/framework/db/mssql/querybuilder/CreateSequenceTest.php b/tests/framework/db/mssql/querybuilder/CreateSequenceTest.php
@@ -9,7 +9,7 @@
 /**
  * @group db
  * @group mssql
- * @group querybuilder
+ * @group query-builder
  * @group create-sequence
  */
 final class CreateSequenceTest extends \yiiunit\framework\db\querybuilder\AbstractCreateSequence
@@ -25,12 +25,12 @@ public function setup(): void
      * @dataProvider \yiiunit\framework\db\mssql\provider\QueryBuilderProvider::createSequence
      */
     public function testGenerateSQL(
-        string $sequenceName,
+        string $sequence,
         int $start,
         int $increment,
         array $options,
         string $expectedSQL
     ): void {
-        parent::testGenerateSQL($sequenceName, $start, $increment, $options, $expectedSQL);
+        parent::testGenerateSQL($sequence, $start, $increment, $options, $expectedSQL);
     }
 }