Add support for PHP 8.4 for XML v3

veewee · Oct 25, 2024 · bc5aa2a · bc5aa2a
1 parent a825290
commit bc5aa2a
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 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,7 +27,7 @@ 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

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/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
         /**