Restore PHP8.1 support

nyamsprod · nyamsprod · commit 84d73bc2589c · 2024-11-29T23:02:42.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
         runs-on: ubuntu-20.04
         strategy:
             matrix:
-                php: ['8.2', '8.3', '8.4']
+                php: ['8.1', '8.2', '8.3', '8.4']
                 stability: [prefer-lowest, prefer-stable]
         steps:
             - name: Checkout code
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ $container[1]->parameterByName(key: 'q', default: 1.0); // returns 1.0 if the pa
 
 ## System Requirements
 
-**PHP >= 8.2** is required but the latest stable version of PHP is recommended.
+**PHP >= 8.1** is required but the latest stable version of PHP is recommended.
 
 ## Installation
 
diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
         }
     ],
     "require": {
-        "php" : "^8.2"
+        "php" : "^8.1"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.65.0",
@@ -48,7 +48,7 @@
         "phpstan/phpstan-strict-rules": "^1.6.1",
         "phpstan/phpstan-phpunit": "^1.4.1",
         "phpstan/phpstan-deprecation-rules": "^1.2.1",
-        "phpunit/phpunit": "^11.4.4",
+        "phpunit/phpunit": "^10.5.38 || ^11.4.4",
         "phpbench/phpbench": "^1.3.1",
         "symfony/var-dumper": "^6.4.15",
         "bakame/aide-base32": "dev-main"
diff --git a/docs/08-migration.md b/docs/08-migration.md
@@ -21,7 +21,7 @@ This will edit (or create) your `composer.json` file.
 
 ## PHP version requirement
 
-`bakame/http-structured-fields 2.0` requires a PHP version greater or equal to `8.2` the previous version required `8.1`.
+`bakame/http-structured-fields 2.0` requires a PHP version greater or equal to `8.1` as does the previous version.
 
 ## Interfaces
 
diff --git a/src/Bytes.php b/src/Bytes.php
@@ -14,9 +14,9 @@
 /**
  * @see https://www.rfc-editor.org/rfc/rfc9651.html#section-3.3.5
  */
-final readonly class Bytes
+final class Bytes
 {
-    private function __construct(private string $value)
+    private function __construct(private readonly string $value)
     {
     }
 
diff --git a/src/Dictionary.php b/src/Dictionary.php
@@ -32,10 +32,10 @@
  * @implements ArrayAccess<string, InnerList|Item>
  * @implements IteratorAggregate<int, array{0:string, 1:InnerList|Item}>
  */
-final readonly class Dictionary implements ArrayAccess, Countable, IteratorAggregate
+final class Dictionary implements ArrayAccess, Countable, IteratorAggregate
 {
     /** @var array<string, InnerList|Item> */
-    private array $members;
+    private readonly array $members;
 
     /**
      * @param iterable<string, SfMemberInput> $members
diff --git a/src/DisplayString.php b/src/DisplayString.php
@@ -15,11 +15,10 @@
 /**
  * @see https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-sfbis#section-4.2.10
  */
-final readonly class DisplayString
+final class DisplayString
 {
-    private function __construct(
-        private string $value
-    ) {
+    private function __construct(private readonly string $value)
+    {
     }
 
     public static function tryFromEncoded(Stringable|string $encoded): ?self
diff --git a/src/InnerList.php b/src/InnerList.php
@@ -35,13 +35,13 @@
  * @implements  ArrayAccess<int, Item>
  * @implements  IteratorAggregate<int, Item>
  */
-final readonly class InnerList implements ArrayAccess, Countable, IteratorAggregate
+final class InnerList implements ArrayAccess, Countable, IteratorAggregate
 {
     use ParameterAccess;
 
     /** @var list<Item> */
-    private array $members;
-    private Parameters $parameters;
+    private readonly array $members;
+    private readonly Parameters $parameters;
 
     /**
      * @param iterable<SfItemInput> $members
diff --git a/src/Item.php b/src/Item.php
@@ -21,14 +21,12 @@
  * @phpstan-import-type SfItemPair from StructuredFieldProvider
  * @phpstan-import-type SfTypeInput from StructuredFieldProvider
  */
-final readonly class Item
+final class Item
 {
     use ParameterAccess;
 
-    private function __construct(
-        private Value $value,
-        private Parameters $parameters
-    ) {
+    private function __construct(private readonly Value $value, private readonly Parameters $parameters)
+    {
     }
 
     public static function fromRfc9651(Stringable|string $httpValue): self
diff --git a/src/MapKey.php b/src/MapKey.php
@@ -10,9 +10,9 @@
  * @see https://www.rfc-editor.org/rfc/rfc9651.html#section-3.1.2
  * @internal normalize HTTP field key
  */
-final readonly class MapKey
+final class MapKey
 {
-    private function __construct(public string $value)
+    private function __construct(public readonly string $value)
     {
     }
 
diff --git a/src/OuterList.php b/src/OuterList.php
@@ -36,10 +36,10 @@
  * @implements ArrayAccess<int, InnerList|Item>
  * @implements IteratorAggregate<int, InnerList|Item>
  */
-final readonly class OuterList implements ArrayAccess, Countable, IteratorAggregate
+final class OuterList implements ArrayAccess, Countable, IteratorAggregate
 {
     /** @var list<InnerList|Item> */
-    private array $members;
+    private readonly array $members;
 
     /**
      * @param SfMemberInput ...$members
diff --git a/src/Parameters.php b/src/Parameters.php
@@ -32,10 +32,10 @@
  * @implements ArrayAccess<string, InnerList|Item>
  * @implements IteratorAggregate<int, array{0:string, 1:Item}>
  */
-final readonly class Parameters implements ArrayAccess, Countable, IteratorAggregate
+final class Parameters implements ArrayAccess, Countable, IteratorAggregate
 {
     /** @var array<string, Item> */
-    private array $members;
+    private readonly array $members;
 
     /**
      * @param iterable<string, SfItemInput> $members
diff --git a/src/Parser.php b/src/Parser.php
@@ -35,7 +35,7 @@
  *
  * @phpstan-import-type SfType from StructuredFieldProvider
  */
-final readonly class Parser
+final class Parser
 {
     private const REGEXP_BYTE_SEQUENCE = '/^(?<sequence>:(?<byte>[a-z\d+\/=]*):)/i';
     private const REGEXP_BOOLEAN = '/^\?[01]/';
@@ -54,7 +54,7 @@ public static function new(?Ietf $rfc = null): self
         return new self($rfc ?? Ietf::Rfc9651);
     }
 
-    public function __construct(private Ietf $rfc)
+    public function __construct(private readonly Ietf $rfc)
     {
     }
 
diff --git a/src/Token.php b/src/Token.php
@@ -12,9 +12,9 @@
 /**
  * @see https://www.rfc-editor.org/rfc/rfc9651.html#name-tokens
  */
-final readonly class Token
+final class Token
 {
-    private function __construct(private string $value)
+    private function __construct(private readonly string $value)
     {
         if (1 !== preg_match("/^([a-z*][a-z\d:\/!#\$%&'*+\-.^_`|~]*)$/i", $this->value)) {
             throw new SyntaxError('The token '.$this->value.' contains invalid characters.');
diff --git a/src/Validation/Result.php b/src/Validation/Result.php
@@ -4,11 +4,11 @@
 
 namespace Bakame\Http\StructuredFields\Validation;
 
-final readonly class Result
+final class Result
 {
     private function __construct(
-        public ValidatedParameters|ValidatedItem|null $data,
-        public ViolationList $errors,
+        public readonly ValidatedParameters|ValidatedItem|null $data,
+        public readonly ViolationList $errors,
     ) {
     }
 
diff --git a/src/Validation/ValidatedItem.php b/src/Validation/ValidatedItem.php
@@ -9,11 +9,11 @@
 use Bakame\Http\StructuredFields\Token;
 use DateTimeImmutable;
 
-final readonly class ValidatedItem
+final class ValidatedItem
 {
     public function __construct(
-        public Bytes|Token|DisplayString|DateTimeImmutable|string|int|float|bool|null $value,
-        public ValidatedParameters $parameters = new ValidatedParameters(),
+        public readonly Bytes|Token|DisplayString|DateTimeImmutable|string|int|float|bool|null $value,
+        public readonly ValidatedParameters $parameters = new ValidatedParameters(),
     ) {
     }
 }
diff --git a/src/Validation/ValidatedParameters.php b/src/Validation/ValidatedParameters.php
@@ -18,13 +18,13 @@
  * @implements ArrayAccess<array-key, array{0:string, 1:SfType}|array{}|SfType|null>
  * @implements IteratorAggregate<array-key, array{0:string, 1:SfType}|array{}|SfType|null>
  */
-final readonly class ValidatedParameters implements ArrayAccess, Countable, IteratorAggregate
+final class ValidatedParameters implements ArrayAccess, Countable, IteratorAggregate
 {
     /**
      * @param array<array-key, array{0:string, 1:SfType}|array{}|SfType|null> $values
      */
     public function __construct(
-        private array $values = [],
+        private readonly array $values = [],
     ) {
     }
 
diff --git a/src/Value.php b/src/Value.php
@@ -28,10 +28,10 @@
  * @see https://www.rfc-editor.org/rfc/rfc9651.html#section-3.3
  * @internal
  */
-final readonly class Value
+final class Value
 {
-    public Token|Bytes|DisplayString|DateTimeImmutable|int|float|string|bool $value;
-    public Type $type;
+    public readonly Token|Bytes|DisplayString|DateTimeImmutable|int|float|string|bool $value;
+    public readonly Type $type;
 
     /**
      * @throws InvalidArgument

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@`
`14`	`14`	`/**`
`15`	`15`	`* @see https://www.rfc-editor.org/rfc/rfc9651.html#section-3.3.5`
`16`	`16`	`*/`
`17`		`-final readonly class Bytes`
	`17`	`+final class Bytes`
`18`	`18`	`{`
`19`		`- private function __construct(private string $value)`
	`19`	`+ private function __construct(private readonly string $value)`
`20`	`20`	`{`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,10 @@`
`15`	`15`	`/**`
`16`	`16`	`* @see https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-sfbis#section-4.2.10`
`17`	`17`	`*/`
`18`		`-final readonly class DisplayString`
	`18`	`+final class DisplayString`
`19`	`19`	`{`
`20`		`- private function __construct(`
`21`		`- private string $value`
`22`		`- ) {`
	`20`	`+ private function __construct(private readonly string $value)`
	`21`	`+ {`
`23`	`22`	`}`
`24`	`23`
`25`	`24`	`public static function tryFromEncoded(Stringable\|string $encoded): ?self`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@`
`10`	`10`	`* @see https://www.rfc-editor.org/rfc/rfc9651.html#section-3.1.2`
`11`	`11`	`* @internal normalize HTTP field key`
`12`	`12`	`*/`
`13`		`-final readonly class MapKey`
	`13`	`+final class MapKey`
`14`	`14`	`{`
`15`		`- private function __construct(public string $value)`
	`15`	`+ private function __construct(public readonly string $value)`
`16`	`16`	`{`
`17`	`17`	`}`
`18`	`18`