From aafe1c556574b47fc40419954f91e5a595a353a1 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Sat, 6 Apr 2024 12:35:30 +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 a54377ea..3f12dfc2 100644 --- a/tests/QueryBuilderTest.php +++ b/tests/QueryBuilderTest.php @@ -769,4 +769,10 @@ public function testJsonColumn() $qb->insert('json_table', ['json_col' => new JsonExpression(['a' => 1, 'b' => 2])]), ); } + + /** @dataProvider \Yiisoft\Db\Sqlite\Tests\Provider\QueryBuilderProvider::selectScalar */ + public function testSelectScalar(array|bool|float|int $columns, string $expected): void + { + parent::testSelectScalar($columns, $expected); + } } From 132fef749da5ee8327a5d91101aa49286539fcaf Mon Sep 17 00:00:00 2001 From: Tigrov Date: Sat, 6 Apr 2024 05:39:45 +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 3f12dfc2..2ce9d531 100644 --- a/tests/QueryBuilderTest.php +++ b/tests/QueryBuilderTest.php @@ -773,6 +773,5 @@ public function testJsonColumn() /** @dataProvider \Yiisoft\Db\Sqlite\Tests\Provider\QueryBuilderProvider::selectScalar */ public function testSelectScalar(array|bool|float|int $columns, string $expected): void { - parent::testSelectScalar($columns, $expected); } } From b20bd40a0a4bf5b0a9287be419ac765874df05df Mon Sep 17 00:00:00 2001 From: Tigrov Date: Sat, 6 Apr 2024 12:45:00 +0700 Subject: [PATCH 3/5] Revert "Apply Rector changes (CI)" This reverts commit 132fef749da5ee8327a5d91101aa49286539fcaf. --- tests/QueryBuilderTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php index 2ce9d531..3f12dfc2 100644 --- a/tests/QueryBuilderTest.php +++ b/tests/QueryBuilderTest.php @@ -773,5 +773,6 @@ public function testJsonColumn() /** @dataProvider \Yiisoft\Db\Sqlite\Tests\Provider\QueryBuilderProvider::selectScalar */ public function testSelectScalar(array|bool|float|int $columns, string $expected): void { + parent::testSelectScalar($columns, $expected); } } From 9e1a8a564a03144fbb939797a1f72f1778cac444 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Sat, 6 Apr 2024 12:45:54 +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 6d4e4d49..8cbdabbd 100644 --- a/rector.php +++ b/rector.php @@ -11,7 +11,10 @@ $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 51c1f1ae3efc8183ebb0fec6e30a96cd90ea0325 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Mon, 8 Apr 2024 09:46:14 +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 3f12dfc2..0173a4d1 100644 --- a/tests/QueryBuilderTest.php +++ b/tests/QueryBuilderTest.php @@ -771,7 +771,7 @@ public function testJsonColumn() } /** @dataProvider \Yiisoft\Db\Sqlite\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); }