Bump dev dependencies; update to PHPUnit 10

gapple · gapple · commit e347f01e0976 · 2025-01-09T02:05:58.000-08:00
diff --git a/composer.json b/composer.json
@@ -33,13 +33,13 @@
     },
     "require-dev": {
         "httpwg/structured-field-tests": "*@dev",
-        "paragonie/constant_time_encoding": "^2.6.3 || ^3.0.0",
+        "paragonie/constant_time_encoding": "^3.0.0",
         "phpmd/phpmd": "^2.15",
-        "phpstan/phpstan": "^1.9",
-        "phpstan/phpstan-phpunit": "^1.3",
-        "phpunit/phpunit": "^9.5.27",
+        "phpstan/phpstan": "^1.12",
+        "phpstan/phpstan-phpunit": "^1.4",
+        "phpunit/phpunit": "^10.5",
         "slevomat/coding-standard": "^8.15",
-        "squizlabs/php_codesniffer": "^3.7.1"
+        "squizlabs/php_codesniffer": "^3.11"
     },
     "config": {
         "sort-packages": true,
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -12,3 +12,6 @@ parameters:
         - gapple\StructuredFields\Dictionary
         - gapple\StructuredFields\Parameters
 
+    ignoreErrors:
+      - message: '#Class gapple\\Tests\\StructuredFields\\Rule has an uninitialized readonly property#'
+        path: tests/Rule.php
diff --git a/tests/DateTest.php b/tests/DateTest.php
@@ -5,7 +5,7 @@
 /**
  * Additional Date parsing and serializing tests.
  */
-class DateTest extends RulesetTest
+class DateTest extends RulesetTestBase
 {
     protected function rulesetDataProvider(): array
     {
diff --git a/tests/Httpwg/BinaryTest.php b/tests/Httpwg/BinaryTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class BinaryTest extends HttpwgTest
+class BinaryTest extends HttpwgTestBase
 {
-    protected $ruleset = 'binary';
+    protected string $ruleset = 'binary';
 }
diff --git a/tests/Httpwg/BooleanTest.php b/tests/Httpwg/BooleanTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class BooleanTest extends HttpwgTest
+class BooleanTest extends HttpwgTestBase
 {
-    protected $ruleset = 'boolean';
+    protected string $ruleset = 'boolean';
 }
diff --git a/tests/Httpwg/DateTest.php b/tests/Httpwg/DateTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class DateTest extends HttpwgTest
+class DateTest extends HttpwgTestBase
 {
-    protected $ruleset = 'date';
+    protected string $ruleset = 'date';
 }
diff --git a/tests/Httpwg/DictionaryTest.php b/tests/Httpwg/DictionaryTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class DictionaryTest extends HttpwgTest
+class DictionaryTest extends HttpwgTestBase
 {
-    protected $ruleset = 'dictionary';
+    protected string $ruleset = 'dictionary';
 }
diff --git a/tests/Httpwg/DisplayStringTest.php b/tests/Httpwg/DisplayStringTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class DisplayStringTest extends HttpwgTest
+class DisplayStringTest extends HttpwgTestBase
 {
-    protected $ruleset = 'display-string';
+    protected string $ruleset = 'display-string';
 }
diff --git a/tests/Httpwg/ExamplesTest.php b/tests/Httpwg/ExamplesTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class ExamplesTest extends HttpwgTest
+class ExamplesTest extends HttpwgTestBase
 {
-    protected $ruleset = 'examples';
+    protected string $ruleset = 'examples';
 }
diff --git a/tests/Httpwg/HttpwgTestBase.php b/tests/Httpwg/HttpwgTestBase.php
@@ -3,15 +3,15 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\Rule;
-use gapple\Tests\StructuredFields\RulesetTest;
+use gapple\Tests\StructuredFields\RulesetTestBase;
 
-abstract class HttpwgTest extends RulesetTest
+abstract class HttpwgTestBase extends RulesetTestBase
 {
+    protected string $ruleset;
+
     /**
-     * @var string
+     * @return array<string, array{Rule}>
      */
-    protected $ruleset;
-
     protected function rulesetDataProvider(): array
     {
         $path = __DIR__ . '/../../vendor/httpwg/structured-field-tests/' . $this->ruleset . '.json';
@@ -34,25 +34,18 @@ protected function rulesetDataProvider(): array
         foreach ($rules as $rawRule) {
             if (isset($rawRule->expected)) {
                 try {
-                    switch ($rawRule->header_type) {
-                        case 'item':
-                            $rawRule->expected = HttpwgRuleExpectedConverter::item($rawRule->expected);
-                            break;
-                        case 'list':
-                            $rawRule->expected = HttpwgRuleExpectedConverter::list($rawRule->expected);
-                            break;
-                        case 'dictionary':
-                            $rawRule->expected = HttpwgRuleExpectedConverter::dictionary($rawRule->expected);
-                            break;
-                        default:
-                            throw new \UnexpectedValueException('Unknown header type');
-                    }
+                    $rawRule->expected = match ($rawRule->header_type) {
+                        'item' => HttpwgRuleExpectedConverter::item($rawRule->expected),
+                        'list' => HttpwgRuleExpectedConverter::list($rawRule->expected),
+                        'dictionary' => HttpwgRuleExpectedConverter::dictionary($rawRule->expected),
+                        default => throw new \UnexpectedValueException('Unknown header type'),
+                    };
                 } catch (\UnexpectedValueException | \AssertionError $e) {
                     // Skip rules that cannot be parsed.
                     continue;
                 }
             }
-            $rule = Rule::fromClass($rawRule);
+            $rule = Rule::fromClass($rawRule); // @phpstan-ignore argument.type
 
             if (isset($dataset[$rule->name])) {
                 user_error(
diff --git a/tests/Httpwg/ItemTest.php b/tests/Httpwg/ItemTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class ItemTest extends HttpwgTest
+class ItemTest extends HttpwgTestBase
 {
-    protected $ruleset = 'item';
+    protected string $ruleset = 'item';
 }
diff --git a/tests/Httpwg/KeyGeneratedTest.php b/tests/Httpwg/KeyGeneratedTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class KeyGeneratedTest extends HttpwgTest
+class KeyGeneratedTest extends HttpwgTestBase
 {
-    protected $ruleset = 'key-generated';
+    protected string $ruleset = 'key-generated';
 }
diff --git a/tests/Httpwg/LargeGeneratedTest.php b/tests/Httpwg/LargeGeneratedTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class LargeGeneratedTest extends HttpwgTest
+class LargeGeneratedTest extends HttpwgTestBase
 {
-    protected $ruleset = 'large-generated';
+    protected string $ruleset = 'large-generated';
 }
diff --git a/tests/Httpwg/ListListTest.php b/tests/Httpwg/ListListTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class ListListTest extends HttpwgTest
+class ListListTest extends HttpwgTestBase
 {
-    protected $ruleset = 'listlist';
+    protected string $ruleset = 'listlist';
 }
diff --git a/tests/Httpwg/ListTest.php b/tests/Httpwg/ListTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class ListTest extends HttpwgTest
+class ListTest extends HttpwgTestBase
 {
-    protected $ruleset = 'list';
+    protected string $ruleset = 'list';
 }
diff --git a/tests/Httpwg/NumberGeneratedTest.php b/tests/Httpwg/NumberGeneratedTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class NumberGeneratedTest extends HttpwgTest
+class NumberGeneratedTest extends HttpwgTestBase
 {
-    protected $ruleset = 'number-generated';
+    protected string $ruleset = 'number-generated';
 }
diff --git a/tests/Httpwg/NumberTest.php b/tests/Httpwg/NumberTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class NumberTest extends HttpwgTest
+class NumberTest extends HttpwgTestBase
 {
-    protected $ruleset = 'number';
+    protected string $ruleset = 'number';
 }
diff --git a/tests/Httpwg/ParamDictTest.php b/tests/Httpwg/ParamDictTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class ParamDictTest extends HttpwgTest
+class ParamDictTest extends HttpwgTestBase
 {
-    protected $ruleset = 'param-dict';
+    protected string $ruleset = 'param-dict';
 }
diff --git a/tests/Httpwg/ParamListListTest.php b/tests/Httpwg/ParamListListTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class ParamListListTest extends HttpwgTest
+class ParamListListTest extends HttpwgTestBase
 {
-    protected $ruleset = 'param-listlist';
+    protected string $ruleset = 'param-listlist';
 }
diff --git a/tests/Httpwg/ParamListTest.php b/tests/Httpwg/ParamListTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class ParamListTest extends HttpwgTest
+class ParamListTest extends HttpwgTestBase
 {
-    protected $ruleset = 'param-list';
+    protected string $ruleset = 'param-list';
 }
diff --git a/tests/Httpwg/SerializationKeyGeneratedTest.php b/tests/Httpwg/SerializationKeyGeneratedTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class SerializationKeyGeneratedTest extends HttpwgTest
+class SerializationKeyGeneratedTest extends HttpwgTestBase
 {
-    protected $ruleset = 'serialisation-tests/key-generated';
+    protected string $ruleset = 'serialisation-tests/key-generated';
 }
diff --git a/tests/Httpwg/SerializationNumberTest.php b/tests/Httpwg/SerializationNumberTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class SerializationNumberTest extends HttpwgTest
+class SerializationNumberTest extends HttpwgTestBase
 {
-    protected $ruleset = 'serialisation-tests/number';
+    protected string $ruleset = 'serialisation-tests/number';
 }
diff --git a/tests/Httpwg/SerializationStringGeneratedTest.php b/tests/Httpwg/SerializationStringGeneratedTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class SerializationStringGeneratedTest extends HttpwgTest
+class SerializationStringGeneratedTest extends HttpwgTestBase
 {
-    protected $ruleset = 'serialisation-tests/string-generated';
+    protected string $ruleset = 'serialisation-tests/string-generated';
 }
diff --git a/tests/Httpwg/SerializationTokenGeneratedTest.php b/tests/Httpwg/SerializationTokenGeneratedTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class SerializationTokenGeneratedTest extends HttpwgTest
+class SerializationTokenGeneratedTest extends HttpwgTestBase
 {
-    protected $ruleset = 'serialisation-tests/token-generated';
+    protected string $ruleset = 'serialisation-tests/token-generated';
 }
diff --git a/tests/Httpwg/StringGeneratedTest.php b/tests/Httpwg/StringGeneratedTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class StringGeneratedTest extends HttpwgTest
+class StringGeneratedTest extends HttpwgTestBase
 {
-    protected $ruleset = 'string-generated';
+    protected string $ruleset = 'string-generated';
 }
diff --git a/tests/Httpwg/StringTest.php b/tests/Httpwg/StringTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class StringTest extends HttpwgTest
+class StringTest extends HttpwgTestBase
 {
-    protected $ruleset = 'string';
+    protected string $ruleset = 'string';
 }
diff --git a/tests/Httpwg/TokenGeneratedTest.php b/tests/Httpwg/TokenGeneratedTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class TokenGeneratedTest extends HttpwgTest
+class TokenGeneratedTest extends HttpwgTestBase
 {
-    protected $ruleset = 'token-generated';
+    protected string $ruleset = 'token-generated';
 }
diff --git a/tests/Httpwg/TokenTest.php b/tests/Httpwg/TokenTest.php
@@ -2,7 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-class TokenTest extends HttpwgTest
+class TokenTest extends HttpwgTestBase
 {
-    protected $ruleset = 'token';
+    protected string $ruleset = 'token';
 }
diff --git a/tests/Rule.php b/tests/Rule.php
diff --git a/tests/RulesetTestBase.php b/tests/RulesetTestBase.php

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`/**`
`6`	`6`	`* Additional Date parsing and serializing tests.`
`7`	`7`	`*/`
`8`		`-class DateTest extends RulesetTest`
	`8`	`+class DateTest extends RulesetTestBase`
`9`	`9`	`{`
`10`	`10`	`protected function rulesetDataProvider(): array`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace gapple\Tests\StructuredFields\Httpwg;`
`4`	`4`
`5`		`-class BinaryTest extends HttpwgTest`
	`5`	`+class BinaryTest extends HttpwgTestBase`
`6`	`6`	`{`
`7`		`- protected $ruleset = 'binary';`
	`7`	`+ protected string $ruleset = 'binary';`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace gapple\Tests\StructuredFields\Httpwg;`
`4`	`4`
`5`		`-class BooleanTest extends HttpwgTest`
	`5`	`+class BooleanTest extends HttpwgTestBase`
`6`	`6`	`{`
`7`		`- protected $ruleset = 'boolean';`
	`7`	`+ protected string $ruleset = 'boolean';`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace gapple\Tests\StructuredFields\Httpwg;`
`4`	`4`
`5`		`-class DateTest extends HttpwgTest`
	`5`	`+class DateTest extends HttpwgTestBase`
`6`	`6`	`{`
`7`		`- protected $ruleset = 'date';`
	`7`	`+ protected string $ruleset = 'date';`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace gapple\Tests\StructuredFields\Httpwg;`
`4`	`4`
`5`		`-class DictionaryTest extends HttpwgTest`
	`5`	`+class DictionaryTest extends HttpwgTestBase`
`6`	`6`	`{`
`7`		`- protected $ruleset = 'dictionary';`
	`7`	`+ protected string $ruleset = 'dictionary';`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace gapple\Tests\StructuredFields\Httpwg;`
`4`	`4`
`5`		`-class DisplayStringTest extends HttpwgTest`
	`5`	`+class DisplayStringTest extends HttpwgTestBase`
`6`	`6`	`{`
`7`		`- protected $ruleset = 'display-string';`
	`7`	`+ protected string $ruleset = 'display-string';`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace gapple\Tests\StructuredFields\Httpwg;`
`4`	`4`
`5`		`-class ExamplesTest extends HttpwgTest`
	`5`	`+class ExamplesTest extends HttpwgTestBase`
`6`	`6`	`{`
`7`		`- protected $ruleset = 'examples';`
	`7`	`+ protected string $ruleset = 'examples';`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace gapple\Tests\StructuredFields\Httpwg;`
`4`	`4`
`5`		`-class ItemTest extends HttpwgTest`
	`5`	`+class ItemTest extends HttpwgTestBase`
`6`	`6`	`{`
`7`		`- protected $ruleset = 'item';`
	`7`	`+ protected string $ruleset = 'item';`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace gapple\Tests\StructuredFields\Httpwg;`
`4`	`4`
`5`		`-class KeyGeneratedTest extends HttpwgTest`
	`5`	`+class KeyGeneratedTest extends HttpwgTestBase`
`6`	`6`	`{`
`7`		`- protected $ruleset = 'key-generated';`
	`7`	`+ protected string $ruleset = 'key-generated';`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace gapple\Tests\StructuredFields\Httpwg;`
`4`	`4`
`5`		`-class LargeGeneratedTest extends HttpwgTest`
	`5`	`+class LargeGeneratedTest extends HttpwgTestBase`
`6`	`6`	`{`
`7`		`- protected $ruleset = 'large-generated';`
	`7`	`+ protected string $ruleset = 'large-generated';`
`8`	`8`	`}`