Merge pull request #63 from veewee/php83

PHP 8.3 Support
veewee · Nov 23, 2023 · 78a4ba4 · 78a4ba4
2 parents e84f554 + a0aa5c8
commit 78a4ba4
Show file tree

Hide file tree

Showing 136 changed files with 3,063 additions and 2,068 deletions.
diff --git a/.github/workflows/analyzers.yaml b/.github/workflows/analyzers.yaml
@@ -12,7 +12,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/autoloader.yaml b/.github/workflows/autoloader.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
@@ -1,13 +1,17 @@
 name: CodeStyle
 
 on: [push, pull_request]
+
+env:
+  PHP_CS_FIXER_IGNORE_ENV: 1
+
 jobs:
     run:
         runs-on: ${{ matrix.operating-system }}
         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/stress.yaml b/.github/workflows/stress.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
@@ -12,7 +12,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.1', '8.2']
+                php-versions: ['8.1', '8.2', '8.3']
                 experimental: [false]
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}

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.10" installed="9.5.27" location="./tools/phpunit.phar" copy="true"/>
-  <phar name="infection" version="^0.26" installed="0.26.16" location="./tools/infection.phar" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.3.2" installed="3.13.0" location="./tools/php-cs-fixer.phar" copy="true"/>
+  <phar name="phpunit" version="^9.5.10" installed="9.6.13" location="./tools/phpunit.phar" copy="true"/>
+  <phar name="infection" version="^0.26" installed="0.26.21" location="./tools/infection.phar" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.3.2" installed="3.39.0" location="./tools/php-cs-fixer.phar" copy="true"/>
 </phive>
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
     ],
     "type": "library",
     "require": {
-        "php": "~8.1.0 || ~8.2.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
         "ext-dom": "*",
         "ext-libxml": "*",
         "ext-xml": "*",

diff --git a/src/Xml/Dom/Builder/attribute.php b/src/Xml/Dom/Builder/attribute.php
@@ -8,7 +8,7 @@
 use DOMElement;
 
 /**
- * @return \Closure(DOMElement): DOMElement
+ * @return Closure(DOMElement): DOMElement
  */
 function attribute(string $name, string $value): Closure
 {

diff --git a/src/Xml/Dom/Builder/attributes.php b/src/Xml/Dom/Builder/attributes.php
@@ -10,7 +10,7 @@
 
 /**
  * @param array<string, string> $attributes
- * @return \Closure(DOMElement): DOMElement
+ * @return Closure(DOMElement): DOMElement
  */
 function attributes(array $attributes): Closure
 {

diff --git a/src/Xml/Dom/Builder/cdata.php b/src/Xml/Dom/Builder/cdata.php
@@ -16,7 +16,7 @@
 /**
  * @param list<callable(DOMCdataSection): DOMCdataSection> $configurators
  *
- * @return \Closure(DOMNode): DOMCdataSection
+ * @return Closure(DOMNode): DOMCdataSection
  */
 function cdata(string $data, ...$configurators): Closure
 {

diff --git a/src/Xml/Dom/Builder/element.php b/src/Xml/Dom/Builder/element.php
@@ -16,7 +16,7 @@
 /**
  * @param list<callable(DOMElement): DOMElement> $configurators
  *
- * @return \Closure(DOMNode): DOMElement
+ * @return Closure(DOMNode): DOMElement
  */
 function element(string $name, callable ...$configurators): Closure
 {

diff --git a/src/Xml/Dom/Builder/escaped_value.php b/src/Xml/Dom/Builder/escaped_value.php
@@ -8,7 +8,7 @@
 use DOMElement;
 
 /**
- * @return \Closure(DOMElement): DOMElement
+ * @return Closure(DOMElement): DOMElement
  */
 function escaped_value(string $value): Closure
 {

diff --git a/src/Xml/Dom/Builder/namespaced_attribute.php b/src/Xml/Dom/Builder/namespaced_attribute.php
@@ -9,7 +9,7 @@
 use function VeeWee\Xml\Assertion\assert_strict_prefixed_name;
 
 /**
- * @return \Closure(DOMElement): DOMElement
+ * @return Closure(DOMElement): DOMElement
  */
 function namespaced_attribute(string $namespace, string $qualifiedName, string $value): Closure
 {

diff --git a/src/Xml/Dom/Builder/namespaced_attributes.php b/src/Xml/Dom/Builder/namespaced_attributes.php
@@ -10,7 +10,7 @@
 
 /**
  * @param array<string, string> $attributes
- * @return \Closure(DOMElement): DOMElement
+ * @return Closure(DOMElement): DOMElement
  */
 function namespaced_attributes(string $namespace, array $attributes): Closure
 {

diff --git a/src/Xml/Dom/Builder/namespaced_element.php b/src/Xml/Dom/Builder/namespaced_element.php
@@ -16,7 +16,7 @@
 /**
  * @param list<callable(DOMElement): DOMElement> $configurators
  *
- * @return \Closure(DOMNode): DOMElement
+ * @return Closure(DOMNode): DOMElement
  */
 function namespaced_element(string $namespace, string $qualifiedName, callable ...$configurators): Closure
 {

diff --git a/src/Xml/Dom/Builder/nodes.php b/src/Xml/Dom/Builder/nodes.php
@@ -14,7 +14,7 @@
 /**
  * @param list<callable(DOMDocument): (list<DOMNode>|DOMNode)> $builders
  *
- * @return \Closure(DOMDocument): list<DOMNode>
+ * @return Closure(DOMDocument): list<DOMNode>
  */
 function nodes(callable ... $builders): Closure
 {

diff --git a/src/Xml/Dom/Builder/value.php b/src/Xml/Dom/Builder/value.php
@@ -8,7 +8,7 @@
 use DOMElement;
 
 /**
- * @return \Closure(DOMElement): DOMElement
+ * @return Closure(DOMElement): DOMElement
  */
 function value(string $value): Closure
 {

diff --git a/src/Xml/Dom/Builder/xmlns_attribute.php b/src/Xml/Dom/Builder/xmlns_attribute.php
@@ -10,7 +10,7 @@
 use function VeeWee\Xml\Assertion\assert_strict_prefixed_name;
 
 /**
- * @return \Closure(DOMElement): DOMElement
+ * @return Closure(DOMElement): DOMElement
  */
 function xmlns_attribute(string $prefix, string $namespaceURI): Closure
 {

diff --git a/src/Xml/Dom/Builder/xmlns_attributes.php b/src/Xml/Dom/Builder/xmlns_attributes.php
@@ -10,7 +10,7 @@
 
 /**
  * @param array<string, string> $attributes - A map of namespace prefix with namespace URI
- * @return \Closure(DOMElement): DOMElement
+ * @return Closure(DOMElement): DOMElement
  */
 function xmlns_attributes(array $attributes): Closure
 {

diff --git a/src/Xml/Dom/Configurator/canonicalize.php b/src/Xml/Dom/Configurator/canonicalize.php
@@ -12,7 +12,7 @@
 use function VeeWee\Xml\ErrorHandling\disallow_libxml_false_returns;
 
 /**
- * @return \Closure(DOMDocument): DOMDocument
+ * @return Closure(DOMDocument): DOMDocument
  */
 function canonicalize(): Closure
 {

diff --git a/src/Xml/Dom/Configurator/comparable.php b/src/Xml/Dom/Configurator/comparable.php
@@ -10,7 +10,7 @@
 use function VeeWee\Xml\Internal\configure;
 
 /**
- * @return \Closure(DOMDocument): DOMDocument
+ * @return Closure(DOMDocument): DOMDocument
  */
 function comparable(): Closure
 {

diff --git a/src/Xml/Dom/Configurator/document_uri.php b/src/Xml/Dom/Configurator/document_uri.php
@@ -9,7 +9,7 @@
 
 /**
  * @param non-empty-string $documentUri
- * @return \Closure(DOMDocument): DOMDocument
+ * @return Closure(DOMDocument): DOMDocument
  */
 function document_uri(string $documentUri): Closure
 {

diff --git a/src/Xml/Dom/Configurator/loader.php b/src/Xml/Dom/Configurator/loader.php
@@ -10,7 +10,7 @@
 /**
  * @param callable(DOMDocument): void $loader
  *
- * @return \Closure(DOMDocument): DOMDocument
+ * @return Closure(DOMDocument): DOMDocument
  */
 function loader(callable $loader): Closure
 {

diff --git a/src/Xml/Dom/Configurator/normalize.php b/src/Xml/Dom/Configurator/normalize.php
@@ -8,7 +8,7 @@
 use DOMDocument;
 
 /**
- * @return \Closure(DOMDocument): DOMDocument
+ * @return Closure(DOMDocument): DOMDocument
  */
 function normalize(): Closure
 {

diff --git a/src/Xml/Dom/Configurator/optimize_namespaces.php b/src/Xml/Dom/Configurator/optimize_namespaces.php
@@ -9,7 +9,7 @@
 use function VeeWee\Xml\Dom\Manipulator\Document\optimize_namespaces as optimize_namespaces_manipulator;
 
 /**
- * @return \Closure(DOMDocument): DOMDocument
+ * @return Closure(DOMDocument): DOMDocument
  */
 function optimize_namespaces(string $prefix = 'ns'): Closure
 {

diff --git a/src/Xml/Dom/Configurator/pretty_print.php b/src/Xml/Dom/Configurator/pretty_print.php
@@ -8,7 +8,7 @@
 use DOMDocument;
 
 /**
- * @return \Closure(DOMDocument): DOMDocument
+ * @return Closure(DOMDocument): DOMDocument
  */
 function pretty_print(): Closure
 {

diff --git a/src/Xml/Dom/Configurator/traverse.php b/src/Xml/Dom/Configurator/traverse.php
@@ -13,7 +13,7 @@
  * @no-named-arguments
  * @param list<Visitor> $visitors
  *
- * @return \Closure(DOMDocument): DOMDocument
+ * @return Closure(DOMDocument): DOMDocument
  */
 function traverse(Visitor ... $visitors): Closure
 {

diff --git a/src/Xml/Dom/Configurator/trim_spaces.php b/src/Xml/Dom/Configurator/trim_spaces.php
@@ -8,7 +8,7 @@
 use DOMDocument;
 
 /**
- * @return \Closure(DOMDocument): DOMDocument
+ * @return Closure(DOMDocument): DOMDocument
  */
 function trim_spaces(): Closure
 {

diff --git a/src/Xml/Dom/Configurator/utf8.php b/src/Xml/Dom/Configurator/utf8.php
@@ -8,7 +8,7 @@
 use DOMDocument;
 
 /**
- * @return \Closure(DOMDocument): DOMDocument
+ * @return Closure(DOMDocument): DOMDocument
  */
 function utf8(): Closure
 {

diff --git a/src/Xml/Dom/Configurator/validator.php b/src/Xml/Dom/Configurator/validator.php
@@ -14,7 +14,7 @@
 /**
  * @param callable(DOMDocument): IssueCollection $validator
  *
- * @return \Closure(DOMDocument): DOMDocument
+ * @return Closure(DOMDocument): DOMDocument
  */
 function validator(callable $validator, ?Level $minimumLevel = null): Closure
 {

diff --git a/src/Xml/Dom/Document.php b/src/Xml/Dom/Document.php
@@ -134,7 +134,7 @@ public function build(callable ... $builders): array
     {
         return Builder\nodes(...map(
             $builders,
-            fn (callable $builder): Closure => $builder(...)
+            static fn (callable $builder): Closure => $builder(...)
         ))($this->document);
     }
 

diff --git a/src/Xml/Dom/Loader/xml_file_loader.php b/src/Xml/Dom/Loader/xml_file_loader.php
@@ -10,7 +10,7 @@
 
 /**
  * @param int $options - bitmask of LIBXML_* constants https://www.php.net/manual/en/libxml.constants.php
- * @return \Closure(DOMDocument): void
+ * @return Closure(DOMDocument): void
  */
 function xml_file_loader(string $file, int $options = 0): Closure
 {

diff --git a/src/Xml/Dom/Loader/xml_node_loader.php b/src/Xml/Dom/Loader/xml_node_loader.php
@@ -11,7 +11,7 @@
 use function VeeWee\Xml\Dom\Manipulator\Node\append_external_node;
 
 /**
- * @return \Closure(DOMDocument): void
+ * @return Closure(DOMDocument): void
  */
 function xml_node_loader(DOMNode $importedNode): Closure
 {

diff --git a/src/Xml/Dom/Loader/xml_string_loader.php b/src/Xml/Dom/Loader/xml_string_loader.php
@@ -10,7 +10,7 @@
 /**
  * @param non-empty-string $xml
  * @param int $options - bitmask of LIBXML_* constants https://www.php.net/manual/en/libxml.constants.php
- * @return \Closure(DOMDocument): void
+ * @return Closure(DOMDocument): void
  */
 function xml_string_loader(string $xml, int $options = 0): Closure
 {

diff --git a/src/Xml/Dom/Locator/document_element.php b/src/Xml/Dom/Locator/document_element.php
@@ -9,7 +9,7 @@
 use DOMElement;
 
 /**
- * @return \Closure(DOMDocument): DOMElement
+ * @return Closure(DOMDocument): DOMElement
  */
 function document_element(): Closure
 {

diff --git a/src/Xml/Dom/Locator/elements_with_namespaced_tagname.php b/src/Xml/Dom/Locator/elements_with_namespaced_tagname.php
@@ -11,7 +11,7 @@
 use function VeeWee\Xml\Dom\Locator\Element\locate_by_namespaced_tag_name;
 
 /**
- * @return \Closure(DOMDocument): NodeList<DOMElement>
+ * @return Closure(DOMDocument): NodeList<DOMElement>
  */
 function elements_with_namespaced_tagname(string $namespace, string $localTagName): Closure
 {

diff --git a/src/Xml/Dom/Locator/elements_with_tagname.php b/src/Xml/Dom/Locator/elements_with_tagname.php
@@ -11,7 +11,7 @@
 use function VeeWee\Xml\Dom\Locator\Element\locate_by_tag_name;
 
 /**
- * @return \Closure(DOMDocument): NodeList<DOMElement>
+ * @return Closure(DOMDocument): NodeList<DOMElement>
  */
 function elements_with_tagname(string $tagName): Closure
 {

diff --git a/src/Xml/Dom/Locator/root_namespace.php b/src/Xml/Dom/Locator/root_namespace.php
@@ -8,7 +8,7 @@
 use DOMDocument;
 
 /**
- * @return \Closure(DOMDocument): ?string
+ * @return Closure(DOMDocument): ?string
  */
 function root_namespace_uri(): Closure
 {

diff --git a/src/Xml/Dom/Manipulator/append.php b/src/Xml/Dom/Manipulator/append.php
@@ -12,7 +12,7 @@
 /**
  * @no-named-arguments
  * @throws RuntimeException
- * @return \Closure(DOMNode): DOMNode
+ * @return Closure(DOMNode): DOMNode
  */
 function append(DOMNode ... $nodes): Closure
 {

diff --git a/src/Xml/Dom/Mapper/xml_string.php b/src/Xml/Dom/Mapper/xml_string.php
@@ -13,7 +13,7 @@
 use function VeeWee\Xml\ErrorHandling\disallow_libxml_false_returns;
 
 /**
- * @return \Closure(DOMNode): non-empty-string
+ * @return Closure(DOMNode): non-empty-string
  */
 function xml_string(): Closure
 {

diff --git a/src/Xml/Dom/Mapper/xslt_template.php b/src/Xml/Dom/Mapper/xslt_template.php
@@ -12,7 +12,7 @@
 
 /**
  * @param list<callable(XSLTProcessor): XSLTProcessor> $configurators
- * @return \Closure(DOMDocument): string
+ * @return Closure(DOMDocument): string
  */
 function xslt_template(Document $template, callable ... $configurators): Closure
 {

diff --git a/src/Xml/Dom/Validator/internal_xsd_validator.php b/src/Xml/Dom/Validator/internal_xsd_validator.php
@@ -14,7 +14,7 @@
 
 /**
  * @param list<callable(SchemaCollection): SchemaCollection> $schemaManipulators
- * @return \Closure(DOMDocument): IssueCollection
+ * @return Closure(DOMDocument): IssueCollection
  */
 function internal_xsd_validator(callable ... $schemaManipulators): Closure
 {
@@ -24,7 +24,7 @@ function internal_xsd_validator(callable ... $schemaManipulators): Closure
         return validator_chain(
             ...$schemas->map(
                 /**
-                 * @return \Closure(DOMDocument): IssueCollection
+                 * @return Closure(DOMDocument): IssueCollection
                  */
                 static fn (Schema $schema): Closure => xsd_validator($schema->location())
             )