From 58d65c3d5467c5aebce82a902975f5dd3c5c97c9 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Sat, 6 Apr 2024 12:35:18 +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 fa87cdb02..455f7d4f8 100644 --- a/tests/QueryBuilderTest.php +++ b/tests/QueryBuilderTest.php @@ -674,4 +674,10 @@ public function testUpsertExecute( ): void { parent::testUpsertExecute($table, $insertColumns, $updateColumns); } + + /** @dataProvider \Yiisoft\Db\Pgsql\Tests\Provider\QueryBuilderProvider::selectScalar */ + public function testSelectScalar(array|bool|float|int $columns, string $expected): void + { + parent::testSelectScalar($columns, $expected); + } } From d8849afa5c1d6ce3703dc73a727b1534d33eeb20 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Mon, 8 Apr 2024 09:46:03 +0700 Subject: [PATCH 2/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 455f7d4f8..5f1b78ab8 100644 --- a/tests/QueryBuilderTest.php +++ b/tests/QueryBuilderTest.php @@ -676,7 +676,7 @@ public function testUpsertExecute( } /** @dataProvider \Yiisoft\Db\Pgsql\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); } From 230d3fddbd627b7ee304ec8df7bc24650411deb5 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Mon, 8 Apr 2024 02:57:28 +0000 Subject: [PATCH 3/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 5f1b78ab8..3aa90600c 100644 --- a/tests/QueryBuilderTest.php +++ b/tests/QueryBuilderTest.php @@ -678,6 +678,5 @@ public function testUpsertExecute( /** @dataProvider \Yiisoft\Db\Pgsql\Tests\Provider\QueryBuilderProvider::selectScalar */ public function testSelectScalar(array|bool|float|int|string $columns, string $expected): void { - parent::testSelectScalar($columns, $expected); } } From f2b8e8a530d415d09abaa81cc9147469fdfeb7a3 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Mon, 8 Apr 2024 10:11:05 +0700 Subject: [PATCH 4/5] Revert "Apply Rector changes (CI)" This reverts commit 230d3fddbd627b7ee304ec8df7bc24650411deb5. --- tests/QueryBuilderTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php index 3aa90600c..5f1b78ab8 100644 --- a/tests/QueryBuilderTest.php +++ b/tests/QueryBuilderTest.php @@ -678,5 +678,6 @@ public function testUpsertExecute( /** @dataProvider \Yiisoft\Db\Pgsql\Tests\Provider\QueryBuilderProvider::selectScalar */ public function testSelectScalar(array|bool|float|int|string $columns, string $expected): void { + parent::testSelectScalar($columns, $expected); } } From a1331df4fa99caaf7cf182d15f0593e94d3784a8 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Mon, 8 Apr 2024 10:12:50 +0700 Subject: [PATCH 5/5] Disable Rector for tests --- rector.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rector.php b/rector.php index f55daaed4..dc433c139 100644 --- a/rector.php +++ b/rector.php @@ -10,7 +10,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