Upgrade to veewee/xml v4 with PHP 8.4+

- Bump minimum PHP to ~8.4.0 || ~8.5.0
- Replace monolithic PSL with standalone php-standard-library packages
- Migrate from legacy ext-dom (DOMDocument, DOMElement, DOMNode) to
  PHP 8.4 Dom\ namespace (XMLDocument, Element, Node, NamespaceInfo)
- Handle nullable getAttribute() returns in the new DOM API
- Remove FixRemovedDefaultXmlnsDeclarationsDuringImport workaround
  (no longer needed with PHP 8.4 spec-compliant DOM)
- Remove bundled dom.phpstub (now shipped by veewee/xml)
- Bump veewee/xml to ^4.9 (includes C14N duplicate xmlns workaround)
- Update CI to PHP 8.4/8.5, add test timeout

Author: veewee

.github/workflows/analyzers.yaml

@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.3', '8.4', '8.5']
+                php-versions: ['8.4', '8.5']
                 composer-options: ['--ignore-platform-req=php+']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}

.github/workflows/code-style.yaml

@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.3', '8.4', '8.5']
+                php-versions: ['8.4', '8.5']
                 composer-options: ['--ignore-platform-req=php+']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}

.github/workflows/tests.yaml

@@ -7,20 +7,27 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.3', '8.4', '8.5']
+                php-versions: ['8.4', '8.5']
                 composer-options: ['--ignore-platform-req=php+']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:
             - name: Checkout
               uses: actions/checkout@master
             - name: Install PHP
-              uses: shivammathur/setup-php@master
+              uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php-versions }}
                   tools: 'composer:v2'
-                  extensions: pcov, mbstring, posix, dom, soap
+                  extensions: mbstring, posix, dom, soap
+                  coverage: pcov
+              env:
+                  update: true
+            - name: PHP info
+              run: |
+                  php -v
+                  php -i | grep -i libxml
             - name: Install dependencies
               run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }}
             - name: Run the tests
-              run: ./vendor/bin/phpunit
+              run: php vendor/bin/phpunit

composer.json

@@ -26,14 +26,22 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.3.0 || ~8.4.0 || ~8.5.0",
+        "php": "~8.4.0 || ~8.5.0",
         "ext-dom": "*",
-        "php-standard-library/php-standard-library": "^3.0 || ^4.0 || ^5.0 || ^6.0",
         "league/uri": "^7.0",
         "league/uri-components": "^7.0",
         "php-soap/xml": "^1.9",
+        "php-standard-library/dict": "^6.1",
+        "php-standard-library/file": "^6.1",
+        "php-standard-library/filesystem": "^6.1",
+        "php-standard-library/foundation": "^6.1",
+        "php-standard-library/fun": "^6.1",
+        "php-standard-library/option": "^6.1",
+        "php-standard-library/str": "^6.1",
+        "php-standard-library/type": "^6.1",
+        "php-standard-library/vec": "^6.1",
         "symfony/console": "^5.4 || ^6.0 || ^7.0 || ^8.0",
-        "veewee/xml": "~3.0"
+        "veewee/xml": "^4.9"
     },
     "require-dev": {
         "php-cs-fixer/shim": "^3.88",

psalm.xml

@@ -3,7 +3,7 @@
     errorLevel="1"
     resolveFromConfigFile="true"
     strictBinaryOperands="true"
-    phpVersion="8.1"
+    phpVersion="8.4"
     allowStringToStandInForClass="true"
     rememberPropertyAssignmentsAfterCall="false"
     skipChecksOnUnresolvableIncludes="false"
@@ -30,6 +30,6 @@
         <pluginClass class="Psalm\SymfonyPsalmPlugin\Plugin"/>
     </plugins>
     <stubs>
-        <file name="stubs/dom.phpstub" />
+        <file name="vendor/veewee/xml/stubs/DOM.phpstub" />
     </stubs>
 </psalm>

src/Loader/Context/FlatteningContext.php

@@ -3,7 +3,7 @@
 
 namespace Soap\Wsdl\Loader\Context;
 
-use DOMElement;
+use Dom\Element;
 use Psl\Type\Exception\AssertException;
 use Soap\Wsdl\Exception\UnloadableWsdlException;
 use Soap\Wsdl\Loader\WsdlLoader;
@@ -79,12 +79,12 @@ public function wsdl(): Document
      *
      * @throws RuntimeException
      */
-    public function types(): DOMElement
+    public function types(): Element
     {
         $doc = Document::fromUnsafeDocument($this->wsdl->toUnsafeDocument(), new FlattenTypes());
         $xpath = $doc->xpath(new WsdlPreset($doc));
 
-        /** @var DOMElement $types */
+        /** @var Element $types */
         $types = $xpath->querySingle('//wsdl:types');
 
         return $types;

src/Xml/Configurator/FlattenTypes.php

@@ -3,14 +3,15 @@
 
 namespace Soap\Wsdl\Xml\Configurator;
 
-use DOMDocument;
-use DOMElement;
+use Dom\Element;
+use Dom\XMLDocument;
 use Soap\Xml\Xmlns;
 use Soap\Xml\Xpath\WsdlPreset;
 use VeeWee\Xml\Dom\Configurator\Configurator;
 use VeeWee\Xml\Dom\Document;
 use VeeWee\Xml\Exception\RuntimeException;
 use function VeeWee\Xml\Dom\Builder\namespaced_element;
+use function VeeWee\Xml\Dom\Locator\document_element;
 use function VeeWee\Xml\Dom\Locator\Node\children;
 use function VeeWee\Xml\Dom\Manipulator\append;
 use function VeeWee\Xml\Dom\Manipulator\Node\remove;
@@ -24,16 +25,16 @@ final class FlattenTypes implements Configurator
     /**
      * @throws RuntimeException
      */
-    public function __invoke(DOMDocument $document): DOMDocument
+    public function __invoke(XMLDocument $document): XMLDocument
     {
         $xml = Document::fromUnsafeDocument($document);
         $xpath = $xml->xpath(new WsdlPreset($xml));
-        /** @var list<DOMElement> $types */
+        /** @var list<Element> $types */
         $types = [...$xpath->query('wsdl:types')];
 
         // Creates wsdl:types if no matching element exists yet
         if (!count($types)) {
-            $document->documentElement->append(
+            $xml->map(document_element())->append(
                 namespaced_element(Xmlns::wsdl()->value(), 'types')($document)
             );
 

src/Xml/Configurator/FlattenWsdlImports.php

@@ -4,8 +4,8 @@
 
 namespace Soap\Wsdl\Xml\Configurator;
 
-use DOMDocument;
-use DOMElement;
+use Dom\Element;
+use Dom\XMLDocument;
 use Soap\Wsdl\Exception\UnloadableWsdlException;
 use Soap\Wsdl\Loader\Context\FlatteningContext;
 use Soap\Wsdl\Uri\IncludePathBuilder;
@@ -14,6 +14,7 @@
 use VeeWee\Xml\Dom\Configurator\Configurator;
 use VeeWee\Xml\Dom\Document;
 use VeeWee\Xml\Exception\RuntimeException;
+use function VeeWee\Xml\Dom\Assert\assert_document;
 use function VeeWee\Xml\Dom\Locator\document_element;
 use function VeeWee\Xml\Dom\Locator\Node\children;
 use function VeeWee\Xml\Dom\Manipulator\Element\copy_named_xmlns_attributes;
@@ -40,13 +41,13 @@ public function __construct(
      * @throws RuntimeException
      * @throws UnloadableWsdlException
      */
-    public function __invoke(DOMDocument $document): DOMDocument
+    public function __invoke(XMLDocument $document): XMLDocument
     {
         $xml = Document::fromUnsafeDocument($document);
         $xpath = $xml->xpath(new WsdlPreset($xml));
 
-        $imports = $xpath->query('wsdl:import')->expectAllOfType(DOMElement::class);
-        $imports->forEach(fn (DOMElement $import) => $this->importWsdlImportElement($import));
+        $imports = $xpath->query('wsdl:import')->expectAllOfType(Element::class);
+        $imports->forEach(fn (Element $import) => $this->importWsdlImportElement($import));
 
         return $document;
     }
@@ -55,10 +56,10 @@ public function __invoke(DOMDocument $document): DOMDocument
      * @throws RuntimeException
      * @throws UnloadableWsdlException
      */
-    private function importWsdlImportElement(DOMElement $import): void
+    private function importWsdlImportElement(Element $import): void
     {
         $location = IncludePathBuilder::build(
-            $import->getAttribute('location'),
+            $import->getAttribute('location') ?? '',
             $this->currentLocation
         );
 
@@ -79,11 +80,15 @@ private function importWsdlImportElement(DOMElement $import): void
 
     /**
      * @throws RuntimeException
+     * @throws \Psl\Type\Exception\AssertException
      */
-    private function importWsdlPart(DOMElement $importElement, Document $importedDocument): void
+    private function importWsdlPart(Element $importElement, Document $importedDocument): void
     {
         $definitions = $importedDocument->map(document_element());
-        copy_named_xmlns_attributes($importElement->ownerDocument->documentElement, $definitions);
+        copy_named_xmlns_attributes(
+            document_element()(assert_document($importElement->ownerDocument)),
+            $definitions
+        );
 
         replace_by_external_nodes(
             $importElement,
@@ -94,7 +99,7 @@ private function importWsdlPart(DOMElement $importElement, Document $importedDoc
     /**
      * @throws RuntimeException
      */
-    private function importXsdPart(DOMElement $importElement, Document $importedDocument): void
+    private function importXsdPart(Element $importElement, Document $importedDocument): void
     {
         $types = $this->context->types();
         remove($importElement);