Merge pull request #82 from veewee/bump-php84-for-v3

Add support for PHP 8.4 for XML v3
veewee · Oct 25, 2024 · 6ae6b15 · 6ae6b15
2 parents a825290 + e92e253
commit 6ae6b15
Show file tree

Hide file tree

Showing 21 changed files with 94,175 additions and 83,295 deletions.
diff --git a/.github/workflows/analyzers.yaml b/.github/workflows/analyzers.yaml
@@ -12,7 +12,8 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.2', '8.3']
+                php-versions: ['8.2', '8.3', '8.4']
+                composer-options: ['--ignore-platform-req=php+']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:

diff --git a/.github/workflows/autoloader.yaml b/.github/workflows/autoloader.yaml
@@ -7,7 +7,8 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.2', '8.3']
+                php-versions: ['8.2', '8.3', '8.4']
+                composer-options: ['--ignore-platform-req=php+']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:

diff --git a/.github/workflows/code-style.yaml b/.github/workflows/code-style.yaml
@@ -11,7 +11,8 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.2', '8.3']
+                php-versions: ['8.2', '8.3', '8.4']
+                composer-options: ['--ignore-platform-req=php+']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:

diff --git a/.github/workflows/stress.yaml b/.github/workflows/stress.yaml
@@ -7,7 +7,8 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.2', '8.3']
+                php-versions: ['8.2', '8.3', '8.4']
+                composer-options: ['--ignore-platform-req=php+']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:
@@ -21,6 +22,6 @@ jobs:
                   tools: 'composer:v2'
                   extensions: pcov, mbstring, posix, dom, libxml, xml, xsl, xmlreader, xmlwriter
             - name: Install dependencies
-              run: composer update --prefer-dist --no-progress --no-suggest
+              run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }}
             - name: Run the stress tests
               run: composer run stress
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -12,8 +12,8 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.2', '8.3']
-                experimental: [false]
+                php-versions: ['8.2', '8.3', '8.4']
+                composer-options: ['--ignore-platform-req=php+']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:
@@ -27,8 +27,9 @@ jobs:
                   ini-values: error_reporting=E_ALL
                   extensions: pcov, mbstring, posix, dom, libxml, xml, xsl, xmlreader, xmlwriter
             - name: Install dependencies
-              run: composer update --prefer-dist --no-progress --no-suggest
+              run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }}
             - name: Run the tests
               run: composer run tests
             - name: Check tests quality
               run: composer run testquality
+              continue-on-error: ${{ matrix.php-versions == '8.4' }} # Infection is not ready yet.
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpunit" version="^9.5.10" installed="9.6.13" location="./tools/phpunit.phar" copy="true"/>
-  <phar name="infection" version="^0.26" installed="0.26.21" location="./tools/infection.phar" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.3.2" installed="3.39.0" location="./tools/php-cs-fixer.phar" copy="true"/>
+  <phar name="phpunit" version="^9.5.10" installed="9.6.21" location="./tools/phpunit.phar" copy="true"/>
+  <phar name="infection" version="^0.27" installed="0.27.11" location="./tools/infection.phar" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.3.2" installed="3.64.0" location="./tools/php-cs-fixer.phar" copy="true"/>
 </phive>
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -55,5 +55,6 @@
         'static_lambda' => true,
         'strict_comparison' => true,
         'strict_param' => true,
+        'nullable_type_declaration_for_default_null_value' => true,
     ])
 ;
diff --git a/build/bootstrap.php b/build/bootstrap.php
@@ -1,5 +1,5 @@
 #!/usr/bin/env php
-<?php
+<?php declare(strict_types=1);
 
 use Psl\File\WriteMode;
 use Symfony\Component\Finder\Finder;

diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
     ],
     "type": "library",
     "require": {
-        "php": "~8.2.0 || ~8.3.0",
+        "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
         "ext-dom": "*",
         "ext-libxml": "*",
         "ext-xml": "*",

diff --git a/src/Xml/Dom/Xpath.php b/src/Xml/Dom/Xpath.php
@@ -64,7 +64,7 @@ public function locate(callable $locator)
      * @throws RuntimeException
      * @return NodeList<DOMNode>
      */
-    public function query(string $expression, DOMNode $contextNode = null): NodeList
+    public function query(string $expression, ?DOMNode $contextNode = null): NodeList
     {
         return $this->locate(query($expression, $contextNode));
     }
@@ -73,7 +73,7 @@ public function query(string $expression, DOMNode $contextNode = null): NodeList
      * @throws RuntimeException
      * @throws InvalidArgumentException
      */
-    public function querySingle(string $expression, DOMNode $contextNode = null): DOMNode
+    public function querySingle(string $expression, ?DOMNode $contextNode = null): DOMNode
     {
         return $this->locate(query_single($expression, $contextNode));
     }
@@ -86,7 +86,7 @@ public function querySingle(string $expression, DOMNode $contextNode = null): DO
      * @return T
      * @throws RuntimeException
      */
-    public function evaluate(string $expression, TypeInterface $type, DOMNode $contextNode = null)
+    public function evaluate(string $expression, TypeInterface $type, ?DOMNode $contextNode = null)
     {
         return $this->locate(evaluate($expression, $type, $contextNode));
     }

diff --git a/src/Xml/Dom/Xpath/Locator/evaluate.php b/src/Xml/Dom/Xpath/Locator/evaluate.php
@@ -17,7 +17,7 @@
  *
  * @return Closure(DOMXPath): T
  */
-function evaluate(string $query, TypeInterface $type, DOMNode $node = null): Closure
+function evaluate(string $query, TypeInterface $type, ?DOMNode $node = null): Closure
 {
     return
         /**

diff --git a/src/Xml/Dom/Xpath/Locator/query.php b/src/Xml/Dom/Xpath/Locator/query.php
@@ -15,7 +15,7 @@
 /**
  * @return Closure(DOMXPath): NodeList<DOMNode>
  */
-function query(string $query, DOMNode $node = null): Closure
+function query(string $query, ?DOMNode $node = null): Closure
 {
     return static function (DOMXPath $xpath) use ($query, $node): NodeList {
         $node = $node ?? $xpath->document->documentElement;

diff --git a/src/Xml/Dom/Xpath/Locator/query_single.php b/src/Xml/Dom/Xpath/Locator/query_single.php
@@ -18,7 +18,7 @@
 /**
  * @return Closure(DOMXPath): DOMNode
  */
-function query_single(string $query, DOMNode $node = null): Closure
+function query_single(string $query, ?DOMNode $node = null): Closure
 {
     return
         /**

diff --git a/src/Xml/Encoding/Exception/EncodingException.php b/src/Xml/Encoding/Exception/EncodingException.php
@@ -9,7 +9,7 @@
 
 final class EncodingException extends Exception implements ExceptionInterface
 {
-    private function __construct(string $message, Exception $previous = null)
+    private function __construct(string $message, ?Exception $previous = null)
     {
         parent::__construct(
             $message,

diff --git a/src/Xml/Encoding/Internal/Decoder/Builder/grouped_children.php b/src/Xml/Encoding/Internal/Decoder/Builder/grouped_children.php
@@ -18,9 +18,7 @@ function grouped_children(DOMElement $element): array
     return reduce_with_keys(
         group_child_elements($element),
         /**
-         * @param array $children
          * @param DOMElement|list<DOMElement> $child
-         * @return array
          */
         static fn (array $children, string $name, DOMElement|array $child): array
             => merge(

diff --git a/src/Xml/Exception/RuntimeException.php b/src/Xml/Exception/RuntimeException.php
@@ -9,7 +9,7 @@
 
 final class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
-    private function __construct(string $message, Throwable $previous = null)
+    private function __construct(string $message, ?Throwable $previous = null)
     {
         parent::__construct(
             $message,

diff --git a/src/Xml/Reader/Reader.php b/src/Xml/Reader/Reader.php
@@ -72,7 +72,7 @@ public function provide(callable $matcher, ?Signal $signal = null): Generator
 
         yield from stop_on_first_issue(
             static function () use ($reader, $signal): bool {
-                if($signal->stopRequested()) {
+                if ($signal->stopRequested()) {
                     return !$reader->close();
                 }
 

diff --git a/tools/full-coverage-check.php b/tools/full-coverage-check.php
@@ -1,5 +1,5 @@
 #!/usr/bin/env php
-<?php
+<?php declare(strict_types=1);
 
 require_once dirname(__DIR__).'/vendor/autoload.php';
 

diff --git a/tools/infection.phar b/tools/infection.phar
diff --git a/tools/php-cs-fixer.phar b/tools/php-cs-fixer.phar
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ @@
      *
      * @return Closure(DOMXPath): T
      */
-    function evaluate(string $query, TypeInterface $type, DOMNode $node = null): Closure
+    function evaluate(string $query, TypeInterface $type, ?DOMNode $node = null): Closure
     {
         return
             /**
@@ Expand Down @@