Bump to phunit 10

veewee · Sep 16, 2024 · 3fb8ce5 · 3fb8ce5
1 parent 0b65f56
commit 3fb8ce5
Show file tree

Hide file tree

Showing 57 changed files with 64,732 additions and 70,072 deletions.
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.19" installed="9.6.19" location="./tools/phpunit.phar" copy="true"/>
+  <phar name="phpunit" version="^10.5.26" installed="10.5.26" location="./tools/phpunit.phar" copy="true"/>
   <phar name="infection" version="^0.29" installed="0.29.6" location="./tools/infection.phar" copy="true"/>
   <phar name="php-cs-fixer" version="^3.3.2" installed="3.59.3" location="./tools/php-cs-fixer.phar" copy="true"/>
 </phive>
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,31 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
-    bootstrap="tests/bootstrap.php"
-    executionOrder="random"
-    forceCoversAnnotation="false"
-    beStrictAboutCoversAnnotation="false"
-    beStrictAboutOutputDuringTests="true"
-    beStrictAboutTodoAnnotatedTests="true"
-    verbose="true"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+        bootstrap="tests/bootstrap.php"
+        executionOrder="random"
+        beStrictAboutOutputDuringTests="true"
+        cacheDirectory=".phpunit.cache"
+        requireCoverageMetadata="false"
+        beStrictAboutCoverageMetadata="false"
+        displayDetailsOnTestsThatTriggerWarnings="true"
 >
-  <coverage cacheDirectory=".phpunit.cache/code-coverage"
-      processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
-    <exclude>
-      <file>src/bootstrap.php</file>
-    </exclude>
+  <coverage>
     <report>
-      <clover outputFile=".phpunit.cache/clover/clover.xml" />
-      <html outputDirectory=".phpunit.cache/report" lowUpperBound="99" highLowerBound="99" />
+      <clover outputFile=".phpunit.cache/clover/clover.xml"/>
+      <html outputDirectory=".phpunit.cache/report" lowUpperBound="99" highLowerBound="99"/>
     </report>
   </coverage>
   <testsuites>
     <testsuite name="default">
       <directory suffix="Test.php">tests/Xml</directory>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+    <exclude>
+      <file>src/bootstrap.php</file>
+    </exclude>
+  </source>
 </phpunit>
diff --git a/src/Xml/Reader/Configurator/xsd_schema.php b/src/Xml/Reader/Configurator/xsd_schema.php
@@ -20,7 +20,7 @@ function xsd_schema(string $schemaFile): Closure
             Assert::fileExists($schemaFile);
 
             disallow_libxml_false_returns(
-                $reader->setSchema($schemaFile),
+                @$reader->setSchema($schemaFile),
                 'Unable to apply XSD schema to the XML Reader.'
             );
 

diff --git a/tests/Xml/Dom/Assert/AssertCDataTest.php b/tests/Xml/Dom/Assert/AssertCDataTest.php
@@ -26,7 +26,7 @@ public function test_it_knows_cdata(?\DOM\Node $node, bool $expected): void
         static::assertSame($node, $actual);
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         $doc = Document::fromXmlString(
             <<<EOXML

diff --git a/tests/Xml/Dom/Assert/AssertDocumentTest.php b/tests/Xml/Dom/Assert/AssertDocumentTest.php
@@ -26,7 +26,7 @@ public function test_it_knows_documents(?\DOM\Node $node, bool $expected): void
         static::assertSame($node, $actual);
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         $doc = Document::fromXmlString(
             <<<EOXML

diff --git a/tests/Xml/Dom/Assert/AssertElementTest.php b/tests/Xml/Dom/Assert/AssertElementTest.php
@@ -26,7 +26,7 @@ public function test_it_knows_elements(?\DOM\Node $node, bool $expected): void
         static::assertSame($node, $actual);
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         $doc = Document::fromXmlString(
             <<<EOXML

diff --git a/tests/Xml/Dom/Configurator/CanonicalizeTest.php b/tests/Xml/Dom/Configurator/CanonicalizeTest.php
@@ -23,7 +23,7 @@ public function test_it_can_canonicalize(string $input, string $expected): void
         static::assertSame($expected, $actual);
     }
 
-    public function provideXmls()
+    public static function provideXmls()
     {
         yield 'no-action' => [
             '<hello/>',

diff --git a/tests/Xml/Dom/Configurator/ComparableTest.php b/tests/Xml/Dom/Configurator/ComparableTest.php
@@ -23,7 +23,7 @@ public function test_it_can_canonicalize(string $input, string $expected): void
         static::assertSame($expected, $actual);
     }
 
-    public function provideXmls()
+    public static function provideXmls()
     {
         yield 'no-action' => [
             '<hello/>',

diff --git a/tests/Xml/Dom/Configurator/OptimizeNamespacesTest.php b/tests/Xml/Dom/Configurator/OptimizeNamespacesTest.php
@@ -23,7 +23,7 @@ public function test_it_can_optimize_namespaces(string $input, string $expected)
         static::assertSame($expected, $actual);
     }
 
-    public function provideXmls()
+    public static function provideXmls()
     {
         yield 'no-action' => [
             '<hello/>',

diff --git a/tests/Xml/Dom/Locator/Attribute/AttributesListTest.php b/tests/Xml/Dom/Locator/Attribute/AttributesListTest.php
@@ -21,7 +21,7 @@ public function test_it_can_fetch_xmlns_attribute_list_from_node(\DOM\Node $node
         static::assertEquals($expected, [...$actual]);
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         $doc = Document::fromXmlString(
             <<<EOXML

diff --git a/tests/Xml/Dom/Locator/Attribute/XmlnsAttributesListTest.php b/tests/Xml/Dom/Locator/Attribute/XmlnsAttributesListTest.php
@@ -21,7 +21,7 @@ public function test_it_can_fetch_xmlns_attribute_list_from_node(\DOM\Node $node
         static::assertEquals($expected, [...$actual]);
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         $doc = Document::fromXmlString(
             <<<EOXML

diff --git a/tests/Xml/Dom/Manipulator/Document/OptimizeNamespacesTest.php b/tests/Xml/Dom/Manipulator/Document/OptimizeNamespacesTest.php
@@ -25,7 +25,7 @@ public function test_it_can_optimize_namespaces(string $input, string $expected)
         static::assertSame($expected, $actual);
     }
 
-    public function provideXmls()
+    public static function provideXmls()
     {
         yield 'no-action' => [
             '<hello/>',

diff --git a/tests/Xml/Dom/Manipulator/Node/RenameTest.php b/tests/Xml/Dom/Manipulator/Node/RenameTest.php
@@ -160,12 +160,8 @@ public function test_it_can_rename_namespaced_attributes(): void
         static::assertSame($root->getAttributeNode('a:you'), $result);
     }
 
-    /**
-     * https://github.com/php/php-src/blob/1c8bb6d6818c10a691d6836b336bcee003478b44/ext/dom/element.c#L663
-     */
     public function test_it_can_not_rename_namespaced_attribute_prefix_when_the_xmlns_is_still_available(): void
     {
-        $this->markAsRisky('Broken DOM functionality');
         $doc = Document::fromXmlString('<hello a:who="world" xmlns:a="http://a"/>');
         $root = $doc->map(document_element());
         $node = $root->getAttributeNode('a:who');

diff --git a/tests/Xml/Dom/Manipulator/Xmlns/RenameTest.php b/tests/Xml/Dom/Manipulator/Xmlns/RenameTest.php
@@ -24,7 +24,7 @@ public function test_it_can_rename_namespaces(string $input, string $expected):
         static::assertSame($expected, $actual);
     }
 
-    public function provideXmls()
+    public static function provideXmls()
     {
         yield 'simple' => [
             '<hello xmlns:replace="http://replace"/>',

diff --git a/tests/Xml/Dom/Predicate/IsAttributeTest.php b/tests/Xml/Dom/Predicate/IsAttributeTest.php
@@ -20,7 +20,7 @@ public function test_it_knows_attributes(\DOM\Node $node, bool $expected): void
         static::assertSame($expected, is_attribute($node));
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         $doc = Document::fromXmlString(
             <<<EOXML

diff --git a/tests/Xml/Dom/Predicate/IsCDataTest.php b/tests/Xml/Dom/Predicate/IsCDataTest.php
@@ -21,7 +21,7 @@ public function test_it_knows_cdata(?\DOM\Node $node, bool $expected): void
         static::assertSame($expected, $actual);
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         $doc = Document::fromXmlString(
             <<<EOXML

diff --git a/tests/Xml/Dom/Predicate/IsDefaultXmlnsAttributeTest.php b/tests/Xml/Dom/Predicate/IsDefaultXmlnsAttributeTest.php
@@ -21,7 +21,7 @@ public function test_it_knows_default_xmlns_attribute(\DOM\Node|\DOM\NameSpaceNo
         static::assertSame($expected, is_default_xmlns_attribute($node));
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         $doc = Document::fromXmlString(
             <<<EOXML

diff --git a/tests/Xml/Dom/Predicate/IsDocumentElementTest.php b/tests/Xml/Dom/Predicate/IsDocumentElementTest.php
@@ -20,7 +20,7 @@ public function test_it_knows_document_elements(\DOM\Node $node, bool $expected)
         static::assertSame($expected, is_document_element($node));
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         $doc = Document::fromXmlString(
             <<<EOXML

diff --git a/tests/Xml/Dom/Predicate/IsDocumentTest.php b/tests/Xml/Dom/Predicate/IsDocumentTest.php
@@ -20,7 +20,7 @@ public function test_it_knows_documents(\DOM\Node $node, bool $expected): void
         static::assertSame($expected, is_document($node));
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         $doc = Document::fromXmlString(
             <<<EOXML

diff --git a/tests/Xml/Dom/Predicate/IsElementTest.php b/tests/Xml/Dom/Predicate/IsElementTest.php
@@ -20,7 +20,7 @@ public function test_it_knows_elements(\DOM\Node $node, bool $expected): void
         static::assertSame($expected, is_element($node));
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         $doc = Document::fromXmlString(
             <<<EOXML

diff --git a/tests/Xml/Dom/Predicate/IsNonEmptyTextTest.php b/tests/Xml/Dom/Predicate/IsNonEmptyTextTest.php
@@ -20,7 +20,7 @@ public function test_it_knows_text(\DOM\Node $node, bool $expected): void
         static::assertSame($expected, is_non_empty_text($node));
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         $doc = Document::fromXmlString(
             <<<EOXML

diff --git a/tests/Xml/Dom/Predicate/IsTextTest.php b/tests/Xml/Dom/Predicate/IsTextTest.php
@@ -20,7 +20,7 @@ public function test_it_knows_text(\DOM\Node $node, bool $expected): void
         static::assertSame($expected, is_text($node));
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         $doc = Document::fromXmlString(
             <<<EOXML

diff --git a/tests/Xml/Dom/Predicate/IsWhitespaceTest.php b/tests/Xml/Dom/Predicate/IsWhitespaceTest.php
@@ -20,7 +20,7 @@ public function test_it_knows_whitespaces(\DOM\Node $node, bool $expected): void
         static::assertSame($expected, is_whitespace($node));
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         $doc = Document::fromXmlString(
             <<<EOXML

diff --git a/tests/Xml/Dom/Predicate/IsXmlnsAttributeTest.php b/tests/Xml/Dom/Predicate/IsXmlnsAttributeTest.php
@@ -21,7 +21,7 @@ public function test_it_knows_xmlns_attributes(\DOM\Node|\DOM\NameSpaceNode $nod
         static::assertSame($expected, is_xmlns_attribute($node));
     }
 
-    public function provideTestCases()
+    public static function provideTestCases()
     {
         $doc = Document::fromXmlString(
             <<<EOXML

diff --git a/tests/Xml/Dom/Validator/InternalXsdValidatorTest.php b/tests/Xml/Dom/Validator/InternalXsdValidatorTest.php
@@ -36,7 +36,7 @@ public function test_it_can_validate_internal_xsds(string $xml, int $errors): vo
     /**
      * @return array
      */
-    public function provideSchemeValidation()
+    public static function provideSchemeValidation()
     {
         yield 'valid' => [
             'xml' => 'xml-valid.xml',

diff --git a/tests/Xml/Dom/Validator/ValidatorChainTest.php b/tests/Xml/Dom/Validator/ValidatorChainTest.php
@@ -29,7 +29,7 @@ public function test_it_can_validate_multiple_validators(callable $validator, in
         static::assertCount($errors, $issues);
     }
 
-    public function provideErrorCases()
+    public static function provideErrorCases()
     {
         yield 'empty' => [
             'validator' => validator_chain(),
@@ -47,7 +47,7 @@ public function provideErrorCases()
             'validator' => validator_chain(
                 static fn (DOMDocument $document) => new IssueCollection(),
                 fn (DOMDocument $document) => new IssueCollection(
-                    $this->createIssue(Level::fatal())
+                    self::createIssue(Level::fatal())
                 ),
                 static fn (DOMDocument $document) => new IssueCollection(),
                 static fn (DOMDocument $document) => new IssueCollection()
@@ -57,11 +57,11 @@ public function provideErrorCases()
         yield 'allFails' => [
             'validator' => validator_chain(
                 fn (DOMDocument $document) => new IssueCollection(
-                    $this->createIssue(Level::fatal())
+                    self::createIssue(Level::fatal())
                 ),
                 fn (DOMDocument $document) => new IssueCollection(
-                    $this->createIssue(Level::fatal()),
-                    $this->createIssue(Level::fatal())
+                    self::createIssue(Level::fatal()),
+                    self::createIssue(Level::fatal())
                 ),
             ),
             'errors' => 3,

diff --git a/tests/Xml/Dom/Validator/XsdValidatorTest.php b/tests/Xml/Dom/Validator/XsdValidatorTest.php
@@ -32,7 +32,7 @@ public function test_it_can_validate_xsds(string $xml, string $xsd, int $errors)
     /**
      * @return array
      */
-    public function provideSchemeValidation()
+    public static function provideSchemeValidation()
     {
         yield 'valid' => [
             'xml' => 'xml-valid.xml',

diff --git a/tests/Xml/Encoding/EncodingTest.php b/tests/Xml/Encoding/EncodingTest.php
@@ -103,13 +103,13 @@ public function test_it_errors_while_encoding_invalid_xml_element(string $xml, a
     /**
      * @dataProvider provideInvalidXml
      */
-    public function test_it_errors_while_decoding_invalid_xml(string $xml)
+    public function test_it_errors_while_decoding_invalid_xml(string $xml, array $data)
     {
         $this->expectException(EncodingException::class);
         xml_decode($xml);
     }
 
-    public function provideBidirectionalCases()
+    public static function provideBidirectionalCases()
     {
         yield 'empty' => [
             'xml' => '<hello />',
@@ -239,19 +239,13 @@ public function provideBidirectionalCases()
                 ]
             ]
         ];
-        yield 'cdata' => [
-            'xml' => '<hello><![CDATA[<html>world</html>]]></hello>',
-            'data' => ['hello' => [
-                '@cdata' => '<html>world</html>'
-            ]]
-        ];
         yield 'mixed cdata' => [
             'xml' => '<hello>hello <![CDATA[<html>world</html>]]></hello>',
             'data' => ['hello' => 'hello <html>world</html>']
         ];
     }
 
-    public function provideRiskyBidirectionalCases()
+    public static function provideRiskyBidirectionalCases()
     {
         yield 'namespaced' => [
             'xml' => <<<EOXML
@@ -278,7 +272,7 @@ public function provideRiskyBidirectionalCases()
         ];
     }
 
-    public function provideEncodingOnly()
+    public static function provideEncodingOnly()
     {
         yield 'normalizable-types' => [
             'xml' => <<<EOXML
@@ -335,17 +329,23 @@ public function jsonSerialize(): mixed
                 ]
             ]
         ];
+        yield 'cdata' => [
+            'xml' => '<hello><![CDATA[<html>world</html>]]></hello>',
+            'data' => ['hello' => [
+                '@cdata' => '<html>world</html>'
+            ]]
+        ];
     }
 
-    public function provideDecodingOnly()
+    public static function provideDecodingOnly()
     {
         yield 'cdata' => [
             'xml' => '<hello><![CDATA[Jos & Bos]]></hello>',
             'data' => ['hello' => 'Jos & Bos']
         ];
     }
 
-    public function provideRiskyDecodingOnly()
+    public static function provideRiskyDecodingOnly()
     {
         yield 'falsy namespaced' => [
             'xml' => <<<EOXML
@@ -421,7 +421,7 @@ public function provideRiskyDecodingOnly()
         ];
     }
 
-    public function provideInvalidXml()
+    public static function provideInvalidXml()
     {
         yield 'items-in-root' => [
             'xml' => <<<EOXML