Merge branch 'develop'

* develop:
  remove tests on php 8.3
  CS
  add support for immutable 5
  use blackbox 5
  fix tests
  test against php 8.3

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest]
-        php-version: ['8.1', '8.2']
+        php-version: ['8.2']
         dependencies: ['lowest', 'highest']
     name: 'PHPUnit'
     steps:
@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['8.1', '8.2']
+        php-version: ['8.2', '8.3']
         dependencies: ['lowest', 'highest']
     name: 'Psalm'
     steps:
@@ -54,7 +54,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['8.1']
+        php-version: ['8.2']
     name: 'CS'
     steps:
       - name: Checkout

.gitignore

@@ -1,3 +1,4 @@
 composer.lock
 vendor
 .phpunit.result.cache
+.phpunit.cache

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 7.5.0 - 2023-09-16
+
+### Added
+
+- Support for `innmind/immutable:~5.0`
+
+### Removed
+
+- Support for PHP `8.1`
+
 ## 7.4.0 - 2023-02-03
 
 ### Added

composer.json

@@ -15,8 +15,8 @@
         "issues": "http://github.com/Innmind/XML/issues"
     },
     "require": {
-        "php": "~8.1",
-        "innmind/immutable": "^4.7.1",
+        "php": "~8.2",
+        "innmind/immutable": "^4.7.1|~5.0",
         "innmind/filesystem": "~5.1|~6.0"
     },
     "autoload": {
@@ -30,9 +30,9 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "~9.0",
-        "vimeo/psalm": "~4.22",
+        "phpunit/phpunit": "~10.2",
+        "vimeo/psalm": "~5.12",
         "innmind/coding-standard": "~2.0",
-        "innmind/black-box": "^4.18"
+        "innmind/black-box": "~5.5"
     }
 }

phpunit.xml.dist

@@ -1,17 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" printerClass="Innmind\BlackBox\PHPUnit\ResultPrinterV9">
-  <coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <extensions>
+    <bootstrap class="Innmind\BlackBox\PHPUnit\Extension">
+    </bootstrap>
+  </extensions>
+  <coverage/>
+  <testsuites>
+    <testsuite name="XML test suite">
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
+  <source>
     <include>
       <directory>.</directory>
     </include>
     <exclude>
       <directory>./tests</directory>
       <directory>./vendor</directory>
     </exclude>
-  </coverage>
-  <testsuites>
-    <testsuite name="XML test suite">
-      <directory>./tests</directory>
-    </testsuite>
-  </testsuites>
+  </source>
 </phpunit>

psalm.xml

@@ -2,6 +2,8 @@
 <psalm
     errorLevel="1"
     resolveFromConfigFile="true"
+    findUnusedCode="false"
+    findUnusedBaselineEntry="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"

src/Element/Element.php

@@ -207,9 +207,9 @@ public function asContent(): Content
                     $this
                         ->children
                         ->flatMap(
-                            static fn($node) => match ($node instanceof AsContent) {
-                                true => $node->asContent()->lines(),
-                                false => Content\Lines::ofContent($node->toString())->lines(),
+                            static fn($node) => match (true) {
+                                $node instanceof AsContent => $node->asContent()->lines(),
+                                default => Content\Lines::ofContent($node->toString())->lines(),
                             },
                         )
                         ->map(static fn($line) => $line->map(

src/Node/Document.php

@@ -157,9 +157,9 @@ public function asContent(): Content
                 ->append(
                     $this
                         ->children
-                        ->flatMap(static fn($node) => match ($node instanceof AsContent) {
-                            true => $node->asContent()->lines(),
-                            false => Content\Lines::ofContent($node->toString())->lines(),
+                        ->flatMap(static fn($node) => match (true) {
+                            $node instanceof AsContent => $node->asContent()->lines(),
+                            default => Content\Lines::ofContent($node->toString())->lines(),
                         }),
                 ),
         );

src/Translator/NodeTranslator/DocumentTranslator.php

@@ -62,7 +62,7 @@ public static function of(): self
      */
     private function buildVersion(\DOMDocument $document): Maybe
     {
-        [$major, $minor] = \explode('.', $document->xmlVersion);
+        [$major, $minor] = \explode('.', $document->xmlVersion ?? '');
 
         return Version::maybe(
             (int) $major,
@@ -75,6 +75,7 @@ private function buildVersion(\DOMDocument $document): Maybe
      */
     private function buildDoctype(\DOMDocumentType $type): Maybe
     {
+        /** @psalm-suppress MixedArgument */
         return Type::maybe(
             $type->name,
             $type->publicId,
@@ -92,11 +93,13 @@ private function buildChildren(
         /** @var Maybe<Sequence<Node>> */
         $children = Maybe::just(Sequence::of());
 
+        /** @psalm-suppress ImpureMethodCall */
         foreach ($nodes as $child) {
             if ($child->nodeType === \XML_DOCUMENT_TYPE_NODE) {
                 continue;
             }
 
+            /** @psalm-suppress MixedArgumentTypeCoercion */
             $children = $children->flatMap(
                 static fn($children) => $translate($child)->map(
                     static fn($node) => ($children)($node),

src/Translator/NodeTranslator/Visitor/Attributes.php

@@ -30,7 +30,16 @@ public function __invoke(\DOMNode $node): Maybe
             return $attributes;
         }
 
-        foreach ($node->attributes as $name => $attribute) {
+        /**
+         * @psalm-suppress MixedArgument
+         * @psalm-suppress ImpureMethodCall
+         */
+        foreach ($node->attributes ?? [] as $name => $attribute) {
+            /**
+             * @psalm-suppress MixedArgument
+             * @psalm-suppress MixedPropertyFetch
+             * @psalm-suppress MixedArgumentTypeCoercion
+             */
             $attributes = $attributes->flatMap(
                 static fn($attributes) => Attribute::maybe($name, $attribute->value)->map(
                     static fn($attribute) => ($attributes)($attribute),

src/Translator/NodeTranslator/Visitor/Children.php

@@ -32,7 +32,9 @@ public function __invoke(\DOMNode $node): Maybe
         /** @var Maybe<Sequence<Node>> */
         $children = Maybe::just(Sequence::of());
 
+        /** @psalm-suppress ImpureMethodCall */
         foreach ($node->childNodes as $child) {
+            /** @psalm-suppress MixedArgumentTypeCoercion */
             $children = $children->flatMap(
                 fn($children) => ($this->translate)($child)->map(
                     static fn($node) => ($children)($node),

src/Visitor/PreviousSibling.php

@@ -27,7 +27,7 @@ public function __invoke(Node $tree): Maybe
             static fn($parent) => $parent->children(),
         );
 
-        /** @psalm-suppress ArgumentTypeCoercion */
+        /** @psalm-suppress InvalidArgument */
         return $children
             ->flatMap(fn($children) => $children->indexOf($this->node))
             ->filter(static fn($position) => $position >= 0)

tests/Element/ElementTest.php

@@ -243,16 +243,34 @@ public function testPrependChild()
             ),
         );
         $this->assertEquals(
-            $element->children()->get(0),
-            $element2->children()->get(1),
+            $element->children()->get(0)->match(
+                static fn($value) => $value,
+                static fn() => null,
+            ),
+            $element2->children()->get(1)->match(
+                static fn($value) => $value,
+                static fn() => null,
+            ),
         );
         $this->assertEquals(
-            $element->children()->get(1),
-            $element2->children()->get(2),
+            $element->children()->get(1)->match(
+                static fn($value) => $value,
+                static fn() => null,
+            ),
+            $element2->children()->get(2)->match(
+                static fn($value) => $value,
+                static fn() => null,
+            ),
         );
         $this->assertEquals(
-            $element->children()->get(2),
-            $element2->children()->get(3),
+            $element->children()->get(2)->match(
+                static fn($value) => $value,
+                static fn() => null,
+            ),
+            $element2->children()->get(3)->match(
+                static fn($value) => $value,
+                static fn() => null,
+            ),
         );
     }
 
@@ -358,14 +376,13 @@ public function testFilterChild()
     {
         $this
             ->forAll(
-                DataSet\Unicode::lengthBetween(1, 255),
+                DataSet\Strings::madeOf(DataSet\Unicode::any())->between(1, 255),
                 DataSet\Sequence::of(
                     DataSet\Decorate::immutable(
                         static fn($name) => Element::of($name),
-                        DataSet\Unicode::lengthBetween(1, 10),
+                        DataSet\Strings::madeOf(DataSet\Unicode::any())->between(1, 255),
                     ),
-                    DataSet\Integers::between(0, 10),
-                ),
+                )->between(0, 10),
             )
             ->then(function($name, $children) {
                 $element = Element::of(
@@ -388,17 +405,16 @@ public function testMapChild()
     {
         $this
             ->forAll(
-                DataSet\Unicode::lengthBetween(1, 255),
+                DataSet\Strings::madeOf(DataSet\Unicode::any())->between(1, 255),
                 DataSet\Sequence::of(
                     DataSet\Decorate::immutable(
                         static fn($name) => Element::of($name),
-                        DataSet\Unicode::lengthBetween(1, 10),
+                        DataSet\Strings::madeOf(DataSet\Unicode::any())->between(1, 10),
                     ),
-                    DataSet\Integers::between(1, 10),
-                ),
+                )->between(1, 10),
                 DataSet\Decorate::immutable(
                     static fn($name) => Element::of($name),
-                    DataSet\Unicode::lengthBetween(1, 10),
+                    DataSet\Strings::madeOf(DataSet\Unicode::any())->between(1, 10),
                 ),
             )
             ->then(function($name, $children, $replacement) {

tests/Element/SelfClosingElementTest.php

@@ -258,7 +258,7 @@ public function testCast()
     public function testFilterChild()
     {
         $this
-            ->forAll(DataSet\Unicode::lengthBetween(1, 255))
+            ->forAll(DataSet\Strings::madeOf(DataSet\Unicode::any())->between(1, 255))
             ->then(function($name) {
                 $element = SelfClosingElement::of($name);
 
@@ -272,7 +272,7 @@ public function testFilterChild()
     public function testMapChild()
     {
         $this
-            ->forAll(DataSet\Unicode::lengthBetween(1, 255))
+            ->forAll(DataSet\Strings::madeOf(DataSet\Unicode::any())->between(1, 255))
             ->then(function($name) {
                 $element = SelfClosingElement::of($name);
 

tests/Node/Document/EncodingTest.php

@@ -31,7 +31,7 @@ public function testThrowWhenInvalidName($name)
         Encoding::of($name);
     }
 
-    public function cases(): array
+    public static function cases(): array
     {
         return [
             ['unicode-1-1'],
@@ -42,7 +42,7 @@ public function cases(): array
         ];
     }
 
-    public function invalid(): array
+    public static function invalid(): array
     {
         return [
             ['@'],

tests/Node/Document/TypeTest.php

@@ -31,7 +31,7 @@ public function testThrowWhenEmptyName()
         Type::of('');
     }
 
-    public function cases(): array
+    public static function cases(): array
     {
         return [
             ['foo', '', '', '<!DOCTYPE foo>'],