Merge pull request #31 from sigwinhq/bump

chore: update PHPUnit to 10.x
dantleech · Mar 4, 2024 · ccc28c8 · ccc28c8
2 parents b442408 + 8748e79
commit ccc28c8
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 26 deletions.
diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
     "require-dev": {
         "symfony/var-dumper": "^6.0",
         "symfony/process": "^6.0",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10.5",
         "vimeo/psalm": "^5.0@beta",
         "friendsofphp/php-cs-fixer": "^3.8"
     },

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
-         cacheResultFile=".phpunit.cache/test-results"
          executionOrder="depends,defects"
-         forceCoversAnnotation="false"
-         beStrictAboutCoversAnnotation="false"
+         beStrictAboutCoverageMetadata="false"
          beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         convertDeprecationsToExceptions="true"
          failOnRisky="true"
-         colors="true" 
+         colors="true"
          failOnWarning="true"
-         verbose="true">
+         cacheDirectory=".phpunit.cache"
+         requireCoverageMetadata="false">
     <testsuites>
         <testsuite name="default">
             <directory>tests</directory>

diff --git a/tests/RuleExample/RuleExampleTest.php b/tests/RuleExample/RuleExampleTest.php
@@ -66,7 +66,7 @@ public function testExamples(Rule $rule, RuleExample $example): void
     /**
      * @return Generator<RuleExample>
      */
-    public function provideExamples(): Generator
+    public static function provideExamples(): Generator
     {
         $container = new GherkinLintContainer(new BufferedOutput(), new Config([]));
 

diff --git a/tests/Unit/Model/AnnotationParserTest.php b/tests/Unit/Model/AnnotationParserTest.php
@@ -22,7 +22,7 @@ public function testParseAnnotation(string $comment, array $expected): void
     /**
      * @return Generator<string,array<int,DTL\GherkinLint\Model\Annotation\DisableRulesAnnotation>>
      */
-    public function provideParseAnnotation(): Generator
+    public static function provideParseAnnotation(): Generator
     {
         yield 'regular comment' => [
             '# just some comment',

diff --git a/tests/Unit/Model/FeatureFinderTest.php b/tests/Unit/Model/FeatureFinderTest.php
@@ -37,7 +37,7 @@ public function testFindFeatures(string $path, array $expectedPaths): void
     /**
      * @return Generator<array{string,array<int,string>}>
      */
-    public function provideFindFeatures(): Generator
+    public static function provideFindFeatures(): Generator
     {
         yield 'relative' => [
             'feature-finder/relative',

diff --git a/tests/Unit/Model/LinterTest.php b/tests/Unit/Model/LinterTest.php
@@ -37,7 +37,7 @@ public function testLint(string $content, array $config, Closure $assertion): vo
     /**
      * @return Generator<array{string}>
      */
-    public function provideLint(): Generator
+    public static function provideLint(): Generator
     {
         yield [
             <<<'EOT'

diff --git a/tests/Unit/Rule/AllowedTagsRuleTest.php b/tests/Unit/Rule/AllowedTagsRuleTest.php
@@ -15,7 +15,7 @@ public function createRule(): Rule
         return new AllowedTagsRule();
     }
 
-    public function provideTests(): Generator
+    public static function provideTests(): Generator
     {
         yield 'allowed feature tags' => [
             new TestFeature(

diff --git a/tests/Unit/Rule/FileNameRuleTest.php b/tests/Unit/Rule/FileNameRuleTest.php
@@ -15,7 +15,7 @@ public function createRule(): Rule
         return new FileNameRule();
     }
 
-    public function provideTests(): Generator
+    public static function provideTests(): Generator
     {
         yield 'pascal fail' => [
             new TestFeature(

diff --git a/tests/Unit/Rule/IndentationRuleTest.php b/tests/Unit/Rule/IndentationRuleTest.php
@@ -15,7 +15,7 @@ public function createRule(): Rule
         return new IndentationRule();
     }
 
-    public function provideTests(): Generator
+    public static function provideTests(): Generator
     {
         yield 'feature at correct level' => [
             new TestFeature(

diff --git a/tests/Unit/Rule/KeywordOrderRuleTest.php b/tests/Unit/Rule/KeywordOrderRuleTest.php
@@ -15,7 +15,7 @@ public function createRule(): Rule
         return new KeywordOrderRule();
     }
 
-    public function provideTests(): Generator
+    public static function provideTests(): Generator
     {
         yield 'correct order' => [
             new TestFeature(

diff --git a/tests/Unit/Rule/NoConsecutiveEmptyLinesRuleTest.php b/tests/Unit/Rule/NoConsecutiveEmptyLinesRuleTest.php
@@ -15,7 +15,7 @@ public function createRule(): Rule
         return new NoConsecutiveEmptyLinesRule();
     }
 
-    public function provideTests(): Generator
+    public static function provideTests(): Generator
     {
         yield [
             new TestFeature(

diff --git a/tests/Unit/Rule/NoDisallowedPatternsRuleTest.php b/tests/Unit/Rule/NoDisallowedPatternsRuleTest.php
@@ -15,7 +15,7 @@ public function createRule(): Rule
         return new NoDisallowedPatternsRule();
     }
 
-    public function provideTests(): Generator
+    public static function provideTests(): Generator
     {
         yield [
             new TestFeature(

diff --git a/tests/Unit/Rule/NoDuplicateTagsTest.php b/tests/Unit/Rule/NoDuplicateTagsTest.php
@@ -15,7 +15,7 @@ public function createRule(): Rule
         return new NoDuplicateTags();
     }
 
-    public function provideTests(): Generator
+    public static function provideTests(): Generator
     {
         yield 'feature with no duplicate tags' => [
             new TestFeature(

diff --git a/tests/Unit/Rule/NoDuplicatedFeatureNamesTest.php b/tests/Unit/Rule/NoDuplicatedFeatureNamesTest.php
@@ -15,7 +15,7 @@ public function createRule(): Rule
         return new NoDuplicatedFeatureNames();
     }
 
-    public function provideTests(): Generator
+    public static function provideTests(): Generator
     {
         yield 'no duplicated feature' => [
             [

diff --git a/tests/Unit/Rule/NoDuplicatedScenarioNamesTest.php b/tests/Unit/Rule/NoDuplicatedScenarioNamesTest.php
@@ -15,7 +15,7 @@ public function createRule(): Rule
         return new NoDuplicatedScenarioNames();
     }
 
-    public function provideTests(): Generator
+    public static function provideTests(): Generator
     {
         yield 'duplicated scenario' => [
             new TestFeature(

diff --git a/tests/Unit/Rule/NoEmptyFileRuleTest.php b/tests/Unit/Rule/NoEmptyFileRuleTest.php
@@ -15,7 +15,7 @@ public function createRule(): Rule
         return new NoEmptyFileRule();
     }
 
-    public function provideTests(): Generator
+    public static function provideTests(): Generator
     {
         yield 'empty file' => [
             new TestFeature(

diff --git a/tests/Unit/Rule/NoHomogenousTagsRuleTest.php b/tests/Unit/Rule/NoHomogenousTagsRuleTest.php
@@ -15,7 +15,7 @@ public function createRule(): Rule
         return new NoHomogenousTagsRule();
     }
 
-    public function provideTests(): Generator
+    public static function provideTests(): Generator
     {
         yield [
             new TestFeature(

diff --git a/tests/Unit/Rule/NoMultipleEmptyLinesRuleTest.php b/tests/Unit/Rule/NoMultipleEmptyLinesRuleTest.php
@@ -15,7 +15,7 @@ public function createRule(): Rule
         return new NoConsecutiveEmptyLinesRule();
     }
 
-    public function provideTests(): Generator
+    public static function provideTests(): Generator
     {
         yield [
             new TestFeature(

diff --git a/tests/Unit/Rule/RuleTestCase.php b/tests/Unit/Rule/RuleTestCase.php
@@ -21,7 +21,7 @@ abstract public function createRule(): Rule;
     /**
      * @return Generator<string,Closure(list<FeatureDiagnostic>):void>
      */
-    abstract public function provideTests(): Generator;
+    abstract public static function provideTests(): Generator;
 
     /**
      * @dataProvider provideTests