Upgrade phpunit; rename xml file; fix tests

uuf6429 · uuf6429 · commit 3ba83e7da2df · 2024-12-09T21:45:20.000+01:00
diff --git a/.gitattributes b/.gitattributes
@@ -5,4 +5,4 @@
 /.gitignore export-ignore
 /package.xml.tpl export-ignore
 /phpdoc.ini.dist export-ignore
-/phpunit.xml.dist export-ignore
+/phpunit.dist.xml export-ignore
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,6 @@
 vendor
 composer.phar
 composer.lock
+.phpunit.cache
 .phpunit.result.cache
+phpunit.xml
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
 
     "require-dev": {
         "symfony/yaml": "^5.4 || ^6.4 || ^7.0",
-        "phpunit/phpunit": "^9.6",
+        "phpunit/phpunit": "^10.5",
         "cucumber/cucumber": "dev-gherkin-24.1.0"
     },
 
diff --git a/phpunit.dist.xml b/phpunit.dist.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         bootstrap="vendor/autoload.php"
+         cacheDirectory=".phpunit.cache"
+         backupStaticProperties="false"
+         failOnDeprecation="true"
+         failOnNotice="true"
+         failOnWarning="true"
+         failOnRisky="true"
+         displayDetailsOnIncompleteTests="true"
+         displayDetailsOnSkippedTests="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerNotices="true"
+         displayDetailsOnTestsThatTriggerWarnings="true">
+    <testsuites>
+        <testsuite name="Behat Gherkin test suite">
+            <directory>./tests/Behat/Gherkin/</directory>
+        </testsuite>
+    </testsuites>
+    <source>
+        <include>
+            <directory>./src/Behat/Gherkin/</directory>
+        </include>
+    </source>
+</phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
diff --git a/tests/Behat/Gherkin/Filter/FilterTestCase.php b/tests/Behat/Gherkin/Filter/FilterTestCase.php
@@ -7,7 +7,7 @@
 use Behat\Gherkin\Parser;
 use PHPUnit\Framework\TestCase;
 
-abstract class FilterTest extends TestCase
+abstract class FilterTestCase extends TestCase
 {
     protected function getParser()
     {
diff --git a/tests/Behat/Gherkin/Filter/LineFilterTest.php b/tests/Behat/Gherkin/Filter/LineFilterTest.php
@@ -8,7 +8,7 @@
 use Behat\Gherkin\Node\OutlineNode;
 use Behat\Gherkin\Node\ScenarioNode;
 
-class LineFilterTest extends FilterTest
+class LineFilterTest extends FilterTestCase
 {
     public function testIsFeatureMatchFilter()
     {
diff --git a/tests/Behat/Gherkin/Filter/LineRangeFilterTest.php b/tests/Behat/Gherkin/Filter/LineRangeFilterTest.php
@@ -8,7 +8,7 @@
 use Behat\Gherkin\Node\OutlineNode;
 use Behat\Gherkin\Node\ScenarioNode;
 
-class LineRangeFilterTest extends FilterTest
+class LineRangeFilterTest extends FilterTestCase
 {
     public function featureLineRangeProvider()
     {
diff --git a/tests/Behat/Gherkin/Filter/NarrativeFilterTest.php b/tests/Behat/Gherkin/Filter/NarrativeFilterTest.php
@@ -5,7 +5,7 @@
 use Behat\Gherkin\Filter\NarrativeFilter;
 use Behat\Gherkin\Node\FeatureNode;
 
-class NarrativeFilterTest extends FilterTest
+class NarrativeFilterTest extends FilterTestCase
 {
     public function testIsFeatureMatchFilter()
     {
diff --git a/tests/Behat/Gherkin/Filter/PathsFilterTest.php b/tests/Behat/Gherkin/Filter/PathsFilterTest.php
@@ -5,7 +5,7 @@
 use Behat\Gherkin\Filter\PathsFilter;
 use Behat\Gherkin\Node\FeatureNode;
 
-class PathsFilterTest extends FilterTest
+class PathsFilterTest extends FilterTestCase
 {
     public function testIsFeatureMatchFilter()
     {
@@ -44,7 +44,7 @@ public function testItDoesNotMatchPartialPaths()
 
         $filter = new PathsFilter(array($fixtures . 'full_path'));
         $this->assertTrue($filter->isFeatureMatch($feature));
-        
+
         $filter = new PathsFilter(array($fixtures . 'ful._path')); // Don't accept regexp
         $this->assertFalse($filter->isFeatureMatch($feature));
     }
diff --git a/tests/Behat/Gherkin/Filter/RoleFilterTest.php b/tests/Behat/Gherkin/Filter/RoleFilterTest.php
@@ -5,7 +5,7 @@
 use Behat\Gherkin\Filter\RoleFilter;
 use Behat\Gherkin\Node\FeatureNode;
 
-class RoleFilterTest extends FilterTest
+class RoleFilterTest extends FilterTestCase
 {
     public function testIsFeatureMatchFilter()
     {
@@ -62,7 +62,7 @@ public function testFeatureRolePrefixedWithAn()
 
         $filter = new RoleFilter('*user');
         $this->assertTrue($filter->isFeatureMatch($feature));
-        
+
         $filter = new RoleFilter('[\w\s]+user');
         $this->assertFalse($filter->isFeatureMatch($feature));
 
diff --git a/tests/Behat/Gherkin/Keywords/ArrayKeywordsTest.php b/tests/Behat/Gherkin/Keywords/ArrayKeywordsTest.php
@@ -5,7 +5,7 @@
 use Behat\Gherkin\Keywords\ArrayKeywords;
 use Behat\Gherkin\Node\StepNode;
 
-class ArrayKeywordsTest extends KeywordsTest
+class ArrayKeywordsTest extends KeywordsTestCase
 {
     protected function getKeywords()
     {
diff --git a/tests/Behat/Gherkin/Keywords/CachedArrayKeywordsTest.php b/tests/Behat/Gherkin/Keywords/CachedArrayKeywordsTest.php
@@ -5,7 +5,7 @@
 use Behat\Gherkin\Keywords\CachedArrayKeywords;
 use Behat\Gherkin\Node\StepNode;
 
-class CachedArrayKeywordsTest extends KeywordsTest
+class CachedArrayKeywordsTest extends KeywordsTestCase
 {
     protected function getKeywords()
     {
diff --git a/tests/Behat/Gherkin/Keywords/CucumberKeywordsTest.php b/tests/Behat/Gherkin/Keywords/CucumberKeywordsTest.php
@@ -6,7 +6,7 @@
 use Behat\Gherkin\Node\StepNode;
 use Symfony\Component\Yaml\Yaml;
 
-class CucumberKeywordsTest extends KeywordsTest
+class CucumberKeywordsTest extends KeywordsTestCase
 {
     protected function getKeywords()
     {
diff --git a/tests/Behat/Gherkin/Keywords/KeywordsTestCase.php b/tests/Behat/Gherkin/Keywords/KeywordsTestCase.php
@@ -12,7 +12,7 @@
 use Behat\Gherkin\Parser;
 use PHPUnit\Framework\TestCase;
 
-abstract class KeywordsTest extends TestCase
+abstract class KeywordsTestCase extends TestCase
 {
     abstract protected function getKeywords();
     abstract protected function getKeywordsArray();

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use Behat\Gherkin\Parser;`
`8`	`8`	`use PHPUnit\Framework\TestCase;`
`9`	`9`
`10`		`-abstract class FilterTest extends TestCase`
	`10`	`+abstract class FilterTestCase extends TestCase`
`11`	`11`	`{`
`12`	`12`	`protected function getParser()`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`use Behat\Gherkin\Node\OutlineNode;`
`9`	`9`	`use Behat\Gherkin\Node\ScenarioNode;`
`10`	`10`
`11`		`-class LineFilterTest extends FilterTest`
	`11`	`+class LineFilterTest extends FilterTestCase`
`12`	`12`	`{`
`13`	`13`	`public function testIsFeatureMatchFilter()`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use Behat\Gherkin\Filter\NarrativeFilter;`
`6`	`6`	`use Behat\Gherkin\Node\FeatureNode;`
`7`	`7`
`8`		`-class NarrativeFilterTest extends FilterTest`
	`8`	`+class NarrativeFilterTest extends FilterTestCase`
`9`	`9`	`{`
`10`	`10`	`public function testIsFeatureMatchFilter()`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use Behat\Gherkin\Filter\PathsFilter;`
`6`	`6`	`use Behat\Gherkin\Node\FeatureNode;`
`7`	`7`
`8`		`-class PathsFilterTest extends FilterTest`
	`8`	`+class PathsFilterTest extends FilterTestCase`
`9`	`9`	`{`
`10`	`10`	`public function testIsFeatureMatchFilter()`
`11`	`11`	`{`
`@@ -44,7 +44,7 @@ public function testItDoesNotMatchPartialPaths()`
`44`	`44`
`45`	`45`	`$filter = new PathsFilter(array($fixtures . 'full_path'));`
`46`	`46`	`$this->assertTrue($filter->isFeatureMatch($feature));`
`47`		`-`
	`47`	`+`
`48`	`48`	`$filter = new PathsFilter(array($fixtures . 'ful._path')); // Don't accept regexp`
`49`	`49`	`$this->assertFalse($filter->isFeatureMatch($feature));`
`50`	`50`	`}`