Require & test on 8.2-8.5

.github/workflows/php.yml

@@ -11,7 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['8.1', '8.2', '8.3']
+        php: 
+          - 8.2
+          - 8.3
+          - 8.4
+          - 8.5
 
     steps:
     - uses: actions/checkout@v3

composer.json

@@ -3,14 +3,14 @@
   "description": "A structured document parser.",
   "type": "library",
   "require": {
-    "php": "8.1.* || 8.2.* || 8.3.*",
+    "php": "8.2.* || 8.3.* || 8.4.* || 8.5.*",
     "ext-libxml": "*"
   },
   "require-dev": {
     "ext-mbstring": "*",
-    "phpspec/phpspec": "7.5.*",
+    "phpspec/phpspec": "8.2.0",
     "phpunit/phpunit": "9.6.* || 10.5.*",
-    "friends-of-phpspec/phpspec-code-coverage": "6.3.* || 6.4.*",
+    "friends-of-phpspec/phpspec-code-coverage": "7.0.0",
     "phpstan/phpstan": "1.10.* || 1.11.* || 1.12.*",
     "phpstan/extension-installer": "1.3.* || 1.4.*",
     "jangregor/phpstan-prophecy": "1.0.*"

src/State/AbstractState.php

@@ -19,7 +19,7 @@ abstract class AbstractState implements StateInterface
     **/
     private $matchers = [];
 
-    public function registerMatcher(MatcherInterface $matcher, callable $callback = null): void
+    public function registerMatcher(MatcherInterface $matcher, ?callable $callback = null): void
     {
         $this->matchers[] = ['matcher' => $matcher, 'callback' => $callback];
     }

src/State/AmbiguousTokenFoundException.php

@@ -36,7 +36,7 @@ public function __construct(
         array $calledMatchers,
         array $matchedTokens,
         int $code = 0,
-        Throwable $previous = null
+        ?Throwable $previous = null
     ) {
         $this->stateName      = $stateName;
         $this->text           = $text;

src/State/NoTokenFoundException.php

@@ -24,7 +24,7 @@ class NoTokenFoundException extends RuntimeException
      */
     private $remainingText;
 
-    public function __construct(string $stateName, int $currentPosition, string $remainingText, int $code = 0, Throwable $previous = null)
+    public function __construct(string $stateName, int $currentPosition, string $remainingText, int $code = 0, ?Throwable $previous = null)
     {
         $this->stateName       = $stateName;
         $this->currentPosition = $currentPosition;