From 84d02abffb9408e6f40e07922ef41b5e4fcc5829 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Sat, 6 Apr 2024 12:35:54 +0700 Subject: [PATCH 1/5] Update tests according main PR --- tests/QueryBuilderTest.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php index cf1a397b..b1258d16 100644 --- a/tests/QueryBuilderTest.php +++ b/tests/QueryBuilderTest.php @@ -1129,4 +1129,10 @@ public function testAlterColumnWithExpression(): void $this->assertEquals($expected, $sql); } + + /** @dataProvider \Yiisoft\Db\Mssql\Tests\Provider\QueryBuilderProvider::selectScalar */ + public function testSelectScalar(array|bool|float|int $columns, string $expected): void + { + parent::testSelectScalar($columns, $expected); + } } From 866463384f5fb34458e7b68fc09c8c2f6f303c4c Mon Sep 17 00:00:00 2001 From: Tigrov Date: Sat, 6 Apr 2024 05:41:43 +0000 Subject: [PATCH 2/5] Apply Rector changes (CI) --- tests/QueryBuilderTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php index b1258d16..a96d6df2 100644 --- a/tests/QueryBuilderTest.php +++ b/tests/QueryBuilderTest.php @@ -1133,6 +1133,5 @@ public function testAlterColumnWithExpression(): void /** @dataProvider \Yiisoft\Db\Mssql\Tests\Provider\QueryBuilderProvider::selectScalar */ public function testSelectScalar(array|bool|float|int $columns, string $expected): void { - parent::testSelectScalar($columns, $expected); } } From 94211e8fade80ee00bf7d2613a2b16221c58b4d7 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Sat, 6 Apr 2024 12:52:37 +0700 Subject: [PATCH 3/5] Revert "Apply Rector changes (CI)" This reverts commit 866463384f5fb34458e7b68fc09c8c2f6f303c4c. --- tests/QueryBuilderTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php index a96d6df2..b1258d16 100644 --- a/tests/QueryBuilderTest.php +++ b/tests/QueryBuilderTest.php @@ -1133,5 +1133,6 @@ public function testAlterColumnWithExpression(): void /** @dataProvider \Yiisoft\Db\Mssql\Tests\Provider\QueryBuilderProvider::selectScalar */ public function testSelectScalar(array|bool|float|int $columns, string $expected): void { + parent::testSelectScalar($columns, $expected); } } From 7f7eb75bfa0ae8c956089b32c29a77121596fb58 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Sat, 6 Apr 2024 12:53:16 +0700 Subject: [PATCH 4/5] Disable Rector for tests --- rector.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rector.php b/rector.php index c80d86e9..7e1860ee 100644 --- a/rector.php +++ b/rector.php @@ -11,7 +11,10 @@ return static function (RectorConfig $rectorConfig): void { $rectorConfig->paths([ __DIR__ . '/src', - __DIR__ . '/tests', + /** + * Disabled ./tests directory due to different branches with main package when testing + */ + // __DIR__ . '/tests', ]); // register a single rule From d3f80e5bb0c8f60d3605c754ba76145dfae3f7ba Mon Sep 17 00:00:00 2001 From: Tigrov Date: Mon, 8 Apr 2024 09:46:38 +0700 Subject: [PATCH 5/5] Add type string to test --- tests/QueryBuilderTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php index b1258d16..4a865f69 100644 --- a/tests/QueryBuilderTest.php +++ b/tests/QueryBuilderTest.php @@ -1131,7 +1131,7 @@ public function testAlterColumnWithExpression(): void } /** @dataProvider \Yiisoft\Db\Mssql\Tests\Provider\QueryBuilderProvider::selectScalar */ - public function testSelectScalar(array|bool|float|int $columns, string $expected): void + public function testSelectScalar(array|bool|float|int|string $columns, string $expected): void { parent::testSelectScalar($columns, $expected); }