diff --git a/composer.json b/composer.json index 3e701c0..3c9ca84 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "phpstan/phpstan": "^1.0.0", "phpstan/phpstan-phpunit": "^1.0.0", "phpstan/phpstan-strict-rules": "^1.0.0", - "phpunit/phpunit": "^10.0", + "phpunit/phpunit": "^10.1", "psalm/plugin-phpunit": "0.18.4", "roave/infection-static-analysis-plugin": "^1.6", "symfony/http-client": "^6.0", diff --git a/phpunit.xml.dist b/phpunit.xml.dist index f9da3f2..065daf1 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -10,20 +10,22 @@ failOnRisky="true" cacheDirectory=".phpunit.cache" > - - - ./src - - tests + - - - - + + + + + + + + ./src + + diff --git a/tests/Client/InsertTest.php b/tests/Client/InsertTest.php index 71bbc6a..a29bcce 100644 --- a/tests/Client/InsertTest.php +++ b/tests/Client/InsertTest.php @@ -105,7 +105,7 @@ public function testInsertEscaping(): void } /** @return iterable> */ - public function providerInsert(): iterable + public static function providerInsert(): iterable { $sql = <<<'CLICKHOUSE' CREATE TABLE UserActivity ( diff --git a/tests/Client/SelectTest.php b/tests/Client/SelectTest.php index 1a656cd..95d46b4 100644 --- a/tests/Client/SelectTest.php +++ b/tests/Client/SelectTest.php @@ -39,7 +39,7 @@ public function testJson(mixed $expectedData, string $sql): void } /** @return iterable */ - public function providerJson(): iterable + public static function providerJson(): iterable { yield [ [[1 => 1]], @@ -78,7 +78,7 @@ public function testJsonCompact(mixed $expectedData, string $sql): void } /** @return iterable */ - public function providerJsonCompact(): iterable + public static function providerJsonCompact(): iterable { yield [ [[1]], @@ -117,7 +117,7 @@ public function testJsonEachRow(mixed $expectedData, string $sql): void } /** @return iterable */ - public function providerJsonEachRow(): iterable + public static function providerJsonEachRow(): iterable { yield [ [[1 => 1]], diff --git a/tests/Exception/UnsupportedValueTest.php b/tests/Exception/UnsupportedValueTest.php index da950e9..1e31aa4 100644 --- a/tests/Exception/UnsupportedValueTest.php +++ b/tests/Exception/UnsupportedValueTest.php @@ -26,7 +26,7 @@ public function testType(string $expectedMessage, mixed $value): void } /** @return iterable */ - public function providerType(): iterable + public static function providerType(): iterable { yield [ 'Value of type "resource (stream)" is not supported as a parameter', @@ -53,7 +53,7 @@ public function testValue(string $expectedMessage, mixed $value): void } /** @return iterable */ - public function providerValue(): iterable + public static function providerValue(): iterable { yield [ 'Value "NULL" is not supported as a parameter', diff --git a/tests/Sql/ExpressionFactoryTest.php b/tests/Sql/ExpressionFactoryTest.php index dc3d670..6b69674 100644 --- a/tests/Sql/ExpressionFactoryTest.php +++ b/tests/Sql/ExpressionFactoryTest.php @@ -28,7 +28,7 @@ public function testTemplateAndValues(string $expectedExpressionString, string $ } /** @return iterable}> */ - public function providerTemplateAndValues(): iterable + public static function providerTemplateAndValues(): iterable { yield [ "UUIDStringToNum('6d38d288-5b13-4714-b6e4-faa59ffd49d8')", diff --git a/tests/Sql/SqlFactoryTest.php b/tests/Sql/SqlFactoryTest.php index 70bba7c..f88a246 100644 --- a/tests/Sql/SqlFactoryTest.php +++ b/tests/Sql/SqlFactoryTest.php @@ -25,7 +25,7 @@ public function testCreateWithParameters(string $expectedSql, string $sqlWithPla } /** @return iterable}> */ - public function providerCreateWithParameters(): iterable + public static function providerCreateWithParameters(): iterable { yield 'empty parameters' => [ <<<'CLICKHOUSE' diff --git a/tests/Sql/ValueFormatterTest.php b/tests/Sql/ValueFormatterTest.php index 6f9a7f2..70d8c17 100644 --- a/tests/Sql/ValueFormatterTest.php +++ b/tests/Sql/ValueFormatterTest.php @@ -31,7 +31,7 @@ public function testFormat( } /** @return iterable> */ - public function providerFormat(): iterable + public static function providerFormat(): iterable { yield 'boolean' => ['1', true]; yield 'integer' => ['1', 1]; @@ -120,7 +120,7 @@ public function testMapFormat(array $expectedValues, array $values): void } /** @return iterable>> */ - public function providerMapFormat(): iterable + public static function providerMapFormat(): iterable { yield 'string' => [["'ping'", "'pong'", 'NULL'], ['ping', 'pong', null]]; }