Merge pull request #573 from MauricioFauth/5.9-phpunit10-support

MauricioFauth · web-flow · commit 1e73ee4c6a78 · 2024-08-13T15:51:44.000-03:00
Add support for PHPUnit 10
diff --git a/composer.json b/composer.json
@@ -33,8 +33,7 @@
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan": "^1.9.12",
         "phpstan/phpstan-phpunit": "^1.3.3",
-        "phpunit/php-code-coverage": "*",
-        "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+        "phpunit/phpunit": "^8.5 || ^9.6",
         "psalm/plugin-phpunit": "^0.16.1",
         "vimeo/psalm": "^4.11",
         "zumba/json-serializer": "~3.0.2"
diff --git a/tests/Builder/CreateStatementTest.php b/tests/Builder/CreateStatementTest.php
@@ -252,11 +252,9 @@ public function testBuilderPartitions(): void
     /**
      * @return string[][]
      */
-    public function partitionQueriesProvider(): array
+    public static function partitionQueriesProvider(): array
     {
-        return [
-            [
-                'subparts' => <<<EOT
+        $subPartitions = <<<EOT
 CREATE TABLE `ts` (
   `id` int(11) DEFAULT NULL,
   `purchased` date DEFAULT NULL
@@ -277,11 +275,9 @@ public function partitionQueriesProvider(): array
 SUBPARTITION s5 ENGINE=InnoDB
 )
 )
-EOT
-            ,
-            ],
-            [
-                'parts' => <<<EOT
+EOT;
+
+        $partitions = <<<EOT
 CREATE TABLE ptest (
   `event_date` date NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
@@ -293,10 +289,9 @@ public function partitionQueriesProvider(): array
 PARTITION p3 ENGINE=InnoDB,
 PARTITION p4 ENGINE=InnoDB
 )
-EOT
-            ,
-            ],
-        ];
+EOT;
+
+        return ['subpartitions' => [$subPartitions], 'partitions' => [$partitions]];
     }
 
     /**
diff --git a/tests/Components/ArrayObjTest.php b/tests/Components/ArrayObjTest.php
@@ -50,7 +50,7 @@ public function testParse(string $test): void
     /**
      * @return string[][]
      */
-    public function parseProvider(): array
+    public static function parseProvider(): array
     {
         return [
             ['parser/parseArrayErr1'],
diff --git a/tests/Components/ExpressionTest.php b/tests/Components/ExpressionTest.php
@@ -53,7 +53,7 @@ public function testParseErr(string $expr, string $error): void
     /**
      * @return string[][]
      */
-    public function parseErrProvider(): array
+    public static function parseErrProvider(): array
     {
         return [
             /*
diff --git a/tests/Components/GroupKeywordTest.php b/tests/Components/GroupKeywordTest.php
@@ -16,7 +16,7 @@ class GroupKeywordTest extends TestCase
     /**
      * @return Generator<string, array{GroupKeyword|array<GroupKeyword>, string}>
      */
-    public function provideExpressions(): Generator
+    public static function provideExpressions(): Generator
     {
         yield 'With no expression at all' => [[], ''];
 
diff --git a/tests/Components/LimitTest.php b/tests/Components/LimitTest.php
@@ -32,7 +32,7 @@ public function testParse(string $test): void
     /**
      * @return string[][]
      */
-    public function parseProvider(): array
+    public static function parseProvider(): array
     {
         return [
             ['parser/parseLimitErr1'],
diff --git a/tests/Components/LockExpressionTest.php b/tests/Components/LockExpressionTest.php
@@ -41,7 +41,7 @@ public function testParseErr(string $expr, string $error): void
     /**
      * @return string[][]
      */
-    public function parseErrProvider(): array
+    public static function parseErrProvider(): array
     {
         return [
             [
diff --git a/tests/Lexer/ContextTest.php b/tests/Lexer/ContextTest.php
@@ -52,7 +52,7 @@ public function testLoadClosest(string $context, ?string $expected): void
      * @return array<string, array<int, string|null>>
      * @psalm-return array<string, array{string, (string|null)}>
      */
-    public function contextLoadingProvider(): array
+    public static function contextLoadingProvider(): array
     {
         return [
             'MySQL match' => [
@@ -101,7 +101,7 @@ public function testLoadAll(string $context): void
     /**
      * @return string[][]
      */
-    public function contextNamesProvider(): array
+    public static function contextNamesProvider(): array
     {
         return [
             ['MySql50000'],
@@ -141,7 +141,7 @@ public function testMode($mode, int $expected): void
      * @return array<int, array<int, int|string>>
      * @psalm-return list<array{int|string, int}>
      */
-    public function providerForTestMode(): array
+    public static function providerForTestMode(): array
     {
         return [
             [0, Context::SQL_MODE_NONE],
diff --git a/tests/Lexer/LexerTest.php b/tests/Lexer/LexerTest.php
@@ -59,7 +59,7 @@ public function testLex(string $test): void
     /**
      * @return string[][]
      */
-    public function lexProvider(): array
+    public static function lexProvider(): array
     {
         return [
             ['lexer/lex'],
diff --git a/tests/Misc/BugsTest.php b/tests/Misc/BugsTest.php
@@ -19,7 +19,7 @@ public function testBug(string $test): void
     /**
      * @return string[][]
      */
-    public function bugProvider(): array
+    public static function bugProvider(): array
     {
         return [
             ['bugs/fuzz1'],
diff --git a/tests/Misc/ParameterTest.php b/tests/Misc/ParameterTest.php
@@ -19,7 +19,7 @@ public function testParameter(string $test): void
     /**
      * @return string[][]
      */
-    public function parameterProvider(): array
+    public static function parameterProvider(): array
     {
         return [
             ['misc/parseParameter'],
diff --git a/tests/Misc/UtfStringTest.php b/tests/Misc/UtfStringTest.php
@@ -98,7 +98,7 @@ public function testAccess(string $text, ?string $pos10, ?string $pos20): void
      * @return array<string, array<int, string|null>>
      * @psalm-return array<string, array{string, (string|null), (string|null)}>
      */
-    public function utf8StringsProvider(): array
+    public static function utf8StringsProvider(): array
     {
         return [
             'ascii' => [
diff --git a/tests/Parser/AlterStatementTest.php b/tests/Parser/AlterStatementTest.php
@@ -19,7 +19,7 @@ public function testAlter(string $test): void
     /**
      * @return string[][]
      */
-    public function alterProvider(): array
+    public static function alterProvider(): array
     {
         return [
             ['parser/parseAlter'],
diff --git a/tests/Parser/AnalyzeStatementTest.php b/tests/Parser/AnalyzeStatementTest.php
@@ -19,7 +19,7 @@ public function testAnalyze(string $test): void
     /**
      * @return string[][]
      */
-    public function analyzeProvider(): array
+    public static function analyzeProvider(): array
     {
         return [
             ['parser/parseAnalyzeTable'],
diff --git a/tests/Parser/CallStatementTest.php b/tests/Parser/CallStatementTest.php
@@ -19,7 +19,7 @@ public function testCall(string $test): void
     /**
      * @return string[][]
      */
-    public function callProvider(): array
+    public static function callProvider(): array
     {
         return [
             ['parser/parseCall'],
diff --git a/tests/Parser/CreateStatementTest.php b/tests/Parser/CreateStatementTest.php
@@ -19,7 +19,7 @@ public function testCreate(string $test): void
     /**
      * @return string[][]
      */
-    public function createProvider(): array
+    public static function createProvider(): array
     {
         return [
             ['parser/parseCreateDatabase'],
diff --git a/tests/Parser/DeleteStatementTest.php b/tests/Parser/DeleteStatementTest.php
@@ -19,7 +19,7 @@ public function testDelete(string $test): void
     /**
      * @return string[][]
      */
-    public function deleteProvider(): array
+    public static function deleteProvider(): array
     {
         return [
             ['parser/parseDelete'],
diff --git a/tests/Parser/DropStatementTest.php b/tests/Parser/DropStatementTest.php
@@ -19,7 +19,7 @@ public function testDrop(string $test): void
     /**
      * @return string[][]
      */
-    public function dropProvider(): array
+    public static function dropProvider(): array
     {
         return [
             ['parser/parseDrop'],
diff --git a/tests/Parser/ExplainStatementTest.php b/tests/Parser/ExplainStatementTest.php
@@ -19,7 +19,7 @@ public function testExplain(string $test): void
     /**
      * @return string[][]
      */
-    public function explainProvider(): array
+    public static function explainProvider(): array
     {
         return [
             ['parser/parseExplain'],
diff --git a/tests/Parser/InsertStatementTest.php b/tests/Parser/InsertStatementTest.php
@@ -19,7 +19,7 @@ public function testInsert(string $test): void
     /**
      * @return string[][]
      */
-    public function insertProvider(): array
+    public static function insertProvider(): array
     {
         return [
             ['parser/parseInsert'],
diff --git a/tests/Parser/LoadStatementTest.php b/tests/Parser/LoadStatementTest.php
@@ -28,7 +28,7 @@ public function testLoad(string $test): void
     /**
      * @return string[][]
      */
-    public function loadProvider(): array
+    public static function loadProvider(): array
     {
         return [
             ['parser/parseLoad1'],
diff --git a/tests/Parser/LockStatementTest.php b/tests/Parser/LockStatementTest.php
@@ -19,7 +19,7 @@ public function testLock(string $test): void
     /**
      * @return string[][]
      */
-    public function lockProvider(): array
+    public static function lockProvider(): array
     {
         return [
             ['parser/parseLock1'],
diff --git a/tests/Parser/ParserLongExportsTest.php b/tests/Parser/ParserLongExportsTest.php
@@ -111,7 +111,7 @@ public function testParseExport(string $test): void
     /**
      * @return string[][]
      */
-    public function exportFileProvider(): array
+    public static function exportFileProvider(): array
     {
         return [
             ['parser/parsephpMyAdminExport1'],
diff --git a/tests/Parser/ParserTest.php b/tests/Parser/ParserTest.php
@@ -25,7 +25,7 @@ public function testParse(string $test): void
     /**
      * @return string[][]
      */
-    public function parseProvider(): array
+    public static function parseProvider(): array
     {
         return [
             ['parser/parse'],
diff --git a/tests/Parser/PurgeStatementTest.php b/tests/Parser/PurgeStatementTest.php
@@ -19,7 +19,7 @@ public function testPurge(string $test): void
     /**
      * @return string[][]
      */
-    public function purgeProvider(): array
+    public static function purgeProvider(): array
     {
         return [
             ['parser/parsePurge'],
diff --git a/tests/Parser/RenameStatementTest.php b/tests/Parser/RenameStatementTest.php
@@ -19,7 +19,7 @@ public function testRename(string $test): void
     /**
      * @return string[][]
      */
-    public function renameProvider(): array
+    public static function renameProvider(): array
     {
         return [
             ['parser/parseRename'],
diff --git a/tests/Parser/ReplaceStatementTest.php b/tests/Parser/ReplaceStatementTest.php
@@ -19,7 +19,7 @@ public function testReplace(string $test): void
     /**
      * @return string[][]
      */
-    public function replaceProvider(): array
+    public static function replaceProvider(): array
     {
         return [
             ['parser/parseReplace'],
diff --git a/tests/Parser/RestoreStatementTest.php b/tests/Parser/RestoreStatementTest.php
@@ -19,7 +19,7 @@ public function testRestore(string $test): void
     /**
      * @return string[][]
      */
-    public function restoreProvider(): array
+    public static function restoreProvider(): array
     {
         return [
             ['parser/parseRestore'],
diff --git a/tests/Parser/SelectStatementTest.php b/tests/Parser/SelectStatementTest.php
@@ -28,7 +28,7 @@ public function testSelect(string $test): void
     /**
      * @return string[][]
      */
-    public function selectProvider(): array
+    public static function selectProvider(): array
     {
         return [
             ['parser/parseSelect2'],
diff --git a/tests/Parser/SetStatementTest.php b/tests/Parser/SetStatementTest.php
@@ -19,7 +19,7 @@ public function testSet(string $test): void
     /**
      * @return string[][]
      */
-    public function setProvider(): array
+    public static function setProvider(): array
     {
         return [
             ['parser/parseSetCharset'],
diff --git a/tests/Parser/TransactionStatementTest.php b/tests/Parser/TransactionStatementTest.php
@@ -31,7 +31,7 @@ public function testTransaction(string $test): void
     /**
      * @return string[][]
      */
-    public function transactionProvider(): array
+    public static function transactionProvider(): array
     {
         return [
             ['parser/parseTransaction'],
diff --git a/tests/Parser/UpdateStatementTest.php b/tests/Parser/UpdateStatementTest.php
@@ -19,7 +19,7 @@ public function testUpdate(string $test): void
     /**
      * @return string[][]
      */
-    public function updateProvider(): array
+    public static function updateProvider(): array
     {
         return [
             ['parser/parseUpdate1'],
diff --git a/tests/Parser/WithStatementTest.php b/tests/Parser/WithStatementTest.php
@@ -23,7 +23,7 @@ public function testParse(string $test): void
     /**
      * @return string[][]
      */
-    public function parseWith(): array
+    public static function parseWith(): array
     {
         return [
             ['parser/parseWithStatement'],
diff --git a/tests/Utils/BufferedQueryTest.php b/tests/Utils/BufferedQueryTest.php
@@ -63,7 +63,7 @@ public function testExtract(
      * @return array<int, array<int, int|string|string[]|bool[]>>
      * @psalm-return list<array{string, positive-int, array{parse_delimiter: bool, add_delimiter: bool}, string[]}>
      */
-    public function extractProvider(): array
+    public static function extractProvider(): array
     {
         $query =
             '/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;' . "\n" .
diff --git a/tests/Utils/CLITest.php b/tests/Utils/CLITest.php
diff --git a/tests/Utils/FormatterTest.php b/tests/Utils/FormatterTest.php
diff --git a/tests/Utils/MiscTest.php b/tests/Utils/MiscTest.php
diff --git a/tests/Utils/QueryTest.php b/tests/Utils/QueryTest.php
diff --git a/tests/Utils/RoutineTest.php b/tests/Utils/RoutineTest.php
diff --git a/tests/Utils/TableTest.php b/tests/Utils/TableTest.php
diff --git a/tests/Utils/TokensTest.php b/tests/Utils/TokensTest.php

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function testParse(string $test): void`
`50`	`50`	`/**`
`51`	`51`	`* @return string[][]`
`52`	`52`	`*/`
`53`		`- public function parseProvider(): array`
	`53`	`+ public static function parseProvider(): array`
`54`	`54`	`{`
`55`	`55`	`return [`
`56`	`56`	`['parser/parseArrayErr1'],`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function testParseErr(string $expr, string $error): void`
`53`	`53`	`/**`
`54`	`54`	`* @return string[][]`
`55`	`55`	`*/`
`56`		`- public function parseErrProvider(): array`
	`56`	`+ public static function parseErrProvider(): array`
`57`	`57`	`{`
`58`	`58`	`return [`
`59`	`59`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class GroupKeywordTest extends TestCase`
`16`	`16`	`/**`
`17`	`17`	`* @return Generator<string, array{GroupKeyword\|array<GroupKeyword>, string}>`
`18`	`18`	`*/`
`19`		`- public function provideExpressions(): Generator`
	`19`	`+ public static function provideExpressions(): Generator`
`20`	`20`	`{`
`21`	`21`	`yield 'With no expression at all' => [[], ''];`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function testParse(string $test): void`
`32`	`32`	`/**`
`33`	`33`	`* @return string[][]`
`34`	`34`	`*/`
`35`		`- public function parseProvider(): array`
	`35`	`+ public static function parseProvider(): array`
`36`	`36`	`{`
`37`	`37`	`return [`
`38`	`38`	`['parser/parseLimitErr1'],`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function testParseErr(string $expr, string $error): void`
`41`	`41`	`/**`
`42`	`42`	`* @return string[][]`
`43`	`43`	`*/`
`44`		`- public function parseErrProvider(): array`
	`44`	`+ public static function parseErrProvider(): array`
`45`	`45`	`{`
`46`	`46`	`return [`
`47`	`47`	`[`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function testLex(string $test): void`
`59`	`59`	`/**`
`60`	`60`	`* @return string[][]`
`61`	`61`	`*/`
`62`		`- public function lexProvider(): array`
	`62`	`+ public static function lexProvider(): array`
`63`	`63`	`{`
`64`	`64`	`return [`
`65`	`65`	`['lexer/lex'],`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public function testBug(string $test): void`
`19`	`19`	`/**`
`20`	`20`	`* @return string[][]`
`21`	`21`	`*/`
`22`		`- public function bugProvider(): array`
	`22`	`+ public static function bugProvider(): array`
`23`	`23`	`{`
`24`	`24`	`return [`
`25`	`25`	`['bugs/fuzz1'],`