Merge pull request #7 from veewee/php83

Allow PHP83
php-soap · Nov 24, 2023 · 6c65aa1 · 6c65aa1
2 parents fb32fc6 + 62d2e32
commit 6c65aa1
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/analyzers.yaml b/.github/workflows/analyzers.yaml
@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.1', '8.2']
+                php-versions: ['8.1', '8.2', '8.3']
             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
@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.1', '8.2']
+                php-versions: ['8.1', '8.2', '8.3']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.1', '8.2']
+                php-versions: ['8.1', '8.2', '8.3']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:

diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="psalm" version="^4.30.0" installed="4.30.0" location="./tools/psalm.phar" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.13.0" installed="3.13.0" location="./tools/php-cs-fixer.phar" copy="true"/>
+  <phar name="psalm" version="^5.16.0" installed="5.16.0" location="./tools/psalm.phar" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.13.0" installed="3.39.0" location="./tools/php-cs-fixer.phar" copy="true"/>
 </phive>
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         }
     ],
     "require": {
-        "php": "~8.1.0 || ~8.2.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
         "ext-dom": "*",
         "veewee/xml": "^2.2"
     },

diff --git a/psalm.xml b/psalm.xml
@@ -20,4 +20,7 @@
             <directory name="tests" />
         </ignoreFiles>
     </projectFiles>
+    <ignoreExceptions>
+        <class name="InvalidArgumentException" />
+    </ignoreExceptions>
 </psalm>
diff --git a/src/Locator/SoapBodyLocator.php b/src/Locator/SoapBodyLocator.php
@@ -21,6 +21,6 @@ public function __invoke(DOMDocument $document): ?DOMElement
         $soapNs = root_namespace_uri()($document) ?? '';
         $xpath = Document::fromUnsafeDocument($document)->xpath(namespaces(['soap' => $soapNs]));
 
-        return $xpath->query('//soap:Envelope/soap:Body')->first();
+        return $xpath->query('//soap:Envelope/soap:Body')->expectAllOfType(DOMElement::class)->first();
     }
 }
diff --git a/src/Locator/SoapHeaderLocator.php b/src/Locator/SoapHeaderLocator.php
@@ -21,6 +21,6 @@ public function __invoke(DOMDocument $document): ?DOMElement
         $soapNs = root_namespace_uri()($document) ?? '';
         $xpath = Document::fromUnsafeDocument($document)->xpath(namespaces(['soap' => $soapNs]));
 
-        return $xpath->query('//soap:Envelope/soap:Header')->first();
+        return $xpath->query('//soap:Envelope/soap:Header')->expectAllOfType(DOMElement::class)->first();
     }
 }
diff --git a/tools/php-cs-fixer.phar b/tools/php-cs-fixer.phar
diff --git a/tools/psalm.phar b/tools/psalm.phar