diff --git a/.github/workflows/analyzers.yaml b/.github/workflows/analyzers.yaml
index d32db0f2..85890d14 100644
--- 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
index baf74b54..d24c9efd 100644
--- 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
index ed80b341..619334f1 100644
--- 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
index 6ce86308..225e9210 100644
--- 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
index af0d0a6e..c0502fb1 100644
--- 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
index 624b97c3..1862966a 100644
--- a/.phive/phars.xml
+++ b/.phive/phars.xml
@@ -1,6 +1,6 @@
-
-
-
+
+
+
diff --git a/composer.json b/composer.json
index fe20a916..855257fd 100644
--- 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
index 2ec840b9..dee76a31 100644
--- 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
index 04da944f..aaf9dadc 100644
--- a/src/Xml/Dom/Builder/attributes.php
+++ b/src/Xml/Dom/Builder/attributes.php
@@ -10,7 +10,7 @@
/**
* @param array $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
index 186e387e..a38f6f6b 100644
--- a/src/Xml/Dom/Builder/cdata.php
+++ b/src/Xml/Dom/Builder/cdata.php
@@ -16,7 +16,7 @@
/**
* @param list $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
index 7af8225d..9b777cf5 100644
--- a/src/Xml/Dom/Builder/element.php
+++ b/src/Xml/Dom/Builder/element.php
@@ -16,7 +16,7 @@
/**
* @param list $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
index 9c943a5b..d2f91ac6 100644
--- 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
index b3dd3be8..bb2b65d5 100644
--- 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
index 7c81bc32..d607154f 100644
--- a/src/Xml/Dom/Builder/namespaced_attributes.php
+++ b/src/Xml/Dom/Builder/namespaced_attributes.php
@@ -10,7 +10,7 @@
/**
* @param array $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
index a43bf099..8cf12ee1 100644
--- a/src/Xml/Dom/Builder/namespaced_element.php
+++ b/src/Xml/Dom/Builder/namespaced_element.php
@@ -16,7 +16,7 @@
/**
* @param list $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
index f1629e95..49ff522d 100644
--- a/src/Xml/Dom/Builder/nodes.php
+++ b/src/Xml/Dom/Builder/nodes.php
@@ -14,7 +14,7 @@
/**
* @param list|DOMNode)> $builders
*
- * @return \Closure(DOMDocument): list
+ * @return Closure(DOMDocument): list
*/
function nodes(callable ... $builders): Closure
{
diff --git a/src/Xml/Dom/Builder/value.php b/src/Xml/Dom/Builder/value.php
index f944fd44..28482d69 100644
--- 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
index 74263c08..e7ae6bd2 100644
--- 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
index e86234c7..cbf6f4d4 100644
--- a/src/Xml/Dom/Builder/xmlns_attributes.php
+++ b/src/Xml/Dom/Builder/xmlns_attributes.php
@@ -10,7 +10,7 @@
/**
* @param array $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
index 454ca059..4ccb45e6 100644
--- 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
index 6eea8f3e..c15bf473 100644
--- 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
index 4b8bc2af..27a20b3b 100644
--- 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
index c0d927bc..ba469da1 100644
--- 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
index e3e96b0f..502a9852 100644
--- 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
index 4a45235c..49f2a884 100644
--- 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
index 67f6d107..9fd845f7 100644
--- 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
index cea3ee2a..2416eac8 100644
--- a/src/Xml/Dom/Configurator/traverse.php
+++ b/src/Xml/Dom/Configurator/traverse.php
@@ -13,7 +13,7 @@
* @no-named-arguments
* @param list $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
index 6fefc477..48cfc9a5 100644
--- 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
index 5ffa875b..627feef3 100644
--- 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
index d1167406..b263ef89 100644
--- 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
index be5ae06b..0fa1e210 100644
--- 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
index 06d560ed..ce76dabb 100644
--- 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
index 4b8f2a37..01c254aa 100644
--- 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
index 333a3354..f80f183a 100644
--- 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
index d05b7525..4df07f81 100644
--- 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
index 9d5938f1..c996e815 100644
--- 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
+ * @return Closure(DOMDocument): NodeList
*/
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
index c76541f2..f16bab3e 100644
--- 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
+ * @return Closure(DOMDocument): NodeList
*/
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
index 517aa1b2..63b8ccf2 100644
--- 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
index 92b0866e..c5bd011f 100644
--- 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
index b6214ebe..529ae908 100644
--- 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
index d51d46b8..89b510ab 100644
--- a/src/Xml/Dom/Mapper/xslt_template.php
+++ b/src/Xml/Dom/Mapper/xslt_template.php
@@ -12,7 +12,7 @@
/**
* @param list $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
index 2946b2c7..29fe45df 100644
--- a/src/Xml/Dom/Validator/internal_xsd_validator.php
+++ b/src/Xml/Dom/Validator/internal_xsd_validator.php
@@ -14,7 +14,7 @@
/**
* @param list $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())
)
diff --git a/src/Xml/Dom/Validator/validator_chain.php b/src/Xml/Dom/Validator/validator_chain.php
index a3648551..8c26f0b2 100644
--- a/src/Xml/Dom/Validator/validator_chain.php
+++ b/src/Xml/Dom/Validator/validator_chain.php
@@ -11,7 +11,7 @@
/**
* @param list $validators
- * @return \Closure(DOMDocument): IssueCollection
+ * @return Closure(DOMDocument): IssueCollection
*/
function validator_chain(callable ... $validators): Closure
{
diff --git a/src/Xml/Dom/Validator/xsd_validator.php b/src/Xml/Dom/Validator/xsd_validator.php
index db65cceb..8c06d27f 100644
--- a/src/Xml/Dom/Validator/xsd_validator.php
+++ b/src/Xml/Dom/Validator/xsd_validator.php
@@ -10,7 +10,7 @@
use function VeeWee\Xml\ErrorHandling\detect_issues;
/**
- * @return \Closure(DOMDocument): IssueCollection
+ * @return Closure(DOMDocument): IssueCollection
*/
function xsd_validator(string $xsd): Closure
{
diff --git a/src/Xml/Dom/Xpath/Configurator/all_functions.php b/src/Xml/Dom/Xpath/Configurator/all_functions.php
index 8d39377f..0dbf2a8b 100644
--- a/src/Xml/Dom/Xpath/Configurator/all_functions.php
+++ b/src/Xml/Dom/Xpath/Configurator/all_functions.php
@@ -8,7 +8,7 @@
use DOMXPath;
/**
- * @return \Closure(DOMXPath): DOMXPath
+ * @return Closure(DOMXPath): DOMXPath
*/
function all_functions(): Closure
{
diff --git a/src/Xml/Dom/Xpath/Configurator/functions.php b/src/Xml/Dom/Xpath/Configurator/functions.php
index c292dd67..3a1e02fd 100644
--- a/src/Xml/Dom/Xpath/Configurator/functions.php
+++ b/src/Xml/Dom/Xpath/Configurator/functions.php
@@ -10,7 +10,7 @@
/**
* @param non-empty-list $functions
*
- * @return \Closure(DOMXPath): DOMXPath
+ * @return Closure(DOMXPath): DOMXPath
*/
function functions(array $functions): Closure
{
diff --git a/src/Xml/Dom/Xpath/Configurator/namespaces.php b/src/Xml/Dom/Xpath/Configurator/namespaces.php
index 9fd45e5f..869169de 100644
--- a/src/Xml/Dom/Xpath/Configurator/namespaces.php
+++ b/src/Xml/Dom/Xpath/Configurator/namespaces.php
@@ -10,7 +10,7 @@
/**
* @param array $namespaces
*
- * @return \Closure(DOMXPath): DOMXPath
+ * @return Closure(DOMXPath): DOMXPath
*/
function namespaces(array $namespaces): Closure
{
diff --git a/src/Xml/Dom/Xpath/Configurator/php_namespace.php b/src/Xml/Dom/Xpath/Configurator/php_namespace.php
index 54f02a33..2c46818d 100644
--- a/src/Xml/Dom/Xpath/Configurator/php_namespace.php
+++ b/src/Xml/Dom/Xpath/Configurator/php_namespace.php
@@ -9,7 +9,7 @@
use VeeWee\Xml\Xmlns\Xmlns;
/**
- * @return \Closure(DOMXPath): DOMXPath
+ * @return Closure(DOMXPath): DOMXPath
*/
function php_namespace(): Closure
{
diff --git a/src/Xml/Dom/Xpath/Locator/evaluate.php b/src/Xml/Dom/Xpath/Locator/evaluate.php
index b630dcbc..4ba61bef 100644
--- a/src/Xml/Dom/Xpath/Locator/evaluate.php
+++ b/src/Xml/Dom/Xpath/Locator/evaluate.php
@@ -15,7 +15,7 @@
*
* @param TypeInterface $type
*
- * @return \Closure(DOMXPath): T
+ * @return Closure(DOMXPath): T
*/
function evaluate(string $query, TypeInterface $type, DOMNode $node = null): Closure
{
diff --git a/src/Xml/Dom/Xpath/Locator/query.php b/src/Xml/Dom/Xpath/Locator/query.php
index 80cda80e..35d1ac20 100644
--- a/src/Xml/Dom/Xpath/Locator/query.php
+++ b/src/Xml/Dom/Xpath/Locator/query.php
@@ -13,7 +13,7 @@
use function VeeWee\Xml\ErrorHandling\disallow_libxml_false_returns;
/**
- * @return \Closure(DOMXPath): NodeList
+ * @return Closure(DOMXPath): NodeList
*/
function query(string $query, DOMNode $node = null): Closure
{
diff --git a/src/Xml/Dom/Xpath/Locator/query_single.php b/src/Xml/Dom/Xpath/Locator/query_single.php
index b261ba6d..4e8213b6 100644
--- a/src/Xml/Dom/Xpath/Locator/query_single.php
+++ b/src/Xml/Dom/Xpath/Locator/query_single.php
@@ -16,7 +16,7 @@
use function VeeWee\Xml\ErrorHandling\disallow_libxml_false_returns;
/**
- * @return \Closure(DOMXPath): DOMNode
+ * @return Closure(DOMXPath): DOMNode
*/
function query_single(string $query, DOMNode $node = null): Closure
{
diff --git a/src/Xml/Encoding/Internal/Encoder/Builder/children.php b/src/Xml/Encoding/Internal/Encoder/Builder/children.php
index fbf3b3ef..56cb864a 100644
--- a/src/Xml/Encoding/Internal/Encoder/Builder/children.php
+++ b/src/Xml/Encoding/Internal/Encoder/Builder/children.php
@@ -16,7 +16,7 @@
*
* @psalm-suppress LessSpecificReturnStatement, MoreSpecificReturnType
*
- * @return \Closure(DOMElement): DOMElement
+ * @return Closure(DOMElement): DOMElement
*/
function children(string $name, array $children): Closure
{
@@ -24,7 +24,7 @@ function children(string $name, array $children): Closure
...map(
$children,
/**
- * @return \Closure(DOMElement): DOMElement
+ * @return Closure(DOMElement): DOMElement
*/
static fn (array|string $data): Closure => is_array($data)
? element($name, $data)
diff --git a/src/Xml/Encoding/Internal/Encoder/Builder/element.php b/src/Xml/Encoding/Internal/Encoder/Builder/element.php
index 8afb9883..a9c86e37 100644
--- a/src/Xml/Encoding/Internal/Encoder/Builder/element.php
+++ b/src/Xml/Encoding/Internal/Encoder/Builder/element.php
@@ -28,7 +28,7 @@
* @psalm-internal VeeWee\Xml\Encoding
* @psalm-suppress LessSpecificReturnStatement, MoreSpecificReturnType
*
- * @return \Closure(DOMElement): DOMElement
+ * @return Closure(DOMElement): DOMElement
*
* @throws AssertException
* @throws InvariantViolationException
@@ -49,7 +49,7 @@ function element(string $name, array $data): Closure
$currentNamespace = $namespaces[''] ?? null;
$namedNamespaces = filter_keys($namespaces ?? []);
- /** @var list<\Closure(\DOMElement): \DOMElement> $children */
+ /** @var list $children */
$children = filter_nulls([
$attributes ? attributes($attributes) : null,
$namedNamespaces ? xmlns_attributes($namedNamespaces) : null,
@@ -59,7 +59,7 @@ function element(string $name, array $data): Closure
$element,
/**
* @param string|array $value
- * @return \Closure(DOMElement): DOMElement
+ * @return Closure(DOMElement): DOMElement
*/
static fn (string $name, string|array $value): Closure
=> parent_node($name, $value)
diff --git a/src/Xml/Encoding/Internal/Encoder/Builder/parent_node.php b/src/Xml/Encoding/Internal/Encoder/Builder/parent_node.php
index 0d07f544..8127a252 100644
--- a/src/Xml/Encoding/Internal/Encoder/Builder/parent_node.php
+++ b/src/Xml/Encoding/Internal/Encoder/Builder/parent_node.php
@@ -17,7 +17,7 @@
* @psalm-internal VeeWee\Xml\Encoding
* @psalm-suppress LessSpecificReturnStatement, MoreSpecificReturnType
*
- * @return \Closure(DOMNode): DOMElement
+ * @return Closure(DOMNode): DOMElement
*
* @throws AssertException
* @throws InvariantViolationException
diff --git a/src/Xml/Encoding/Internal/Encoder/Builder/root.php b/src/Xml/Encoding/Internal/Encoder/Builder/root.php
index a148f84a..aaed37f9 100644
--- a/src/Xml/Encoding/Internal/Encoder/Builder/root.php
+++ b/src/Xml/Encoding/Internal/Encoder/Builder/root.php
@@ -14,7 +14,7 @@
/**
* @psalm-internal VeeWee\Xml\Encoding
- * @return \Closure(DOMDocument): list
+ * @return Closure(DOMDocument): list
*
* @throws EncodingException
* @throws InvariantViolationException
diff --git a/src/Xml/Encoding/Internal/wrap_exception.php b/src/Xml/Encoding/Internal/wrap_exception.php
index 01500286..032824b7 100644
--- a/src/Xml/Encoding/Internal/wrap_exception.php
+++ b/src/Xml/Encoding/Internal/wrap_exception.php
@@ -12,7 +12,7 @@
* @psalm-internal VeeWee\Xml\Encoding
*
* @template T
- * @param \Closure(): T $run
+ * @param Closure(): T $run
* @return T
*
* @throws EncodingException
diff --git a/src/Xml/Reader/Configurator/parser_options.php b/src/Xml/Reader/Configurator/parser_options.php
index 24d72cc4..9f620033 100644
--- a/src/Xml/Reader/Configurator/parser_options.php
+++ b/src/Xml/Reader/Configurator/parser_options.php
@@ -31,7 +31,7 @@
* >,
* bool> $options
*
- * @return \Closure(XMLReader): XMLReader
+ * @return Closure(XMLReader): XMLReader
*/
function parser_options(array $options): Closure
{
diff --git a/src/Xml/Reader/Configurator/xsd_schema.php b/src/Xml/Reader/Configurator/xsd_schema.php
index 32c07edd..1107cf0c 100644
--- a/src/Xml/Reader/Configurator/xsd_schema.php
+++ b/src/Xml/Reader/Configurator/xsd_schema.php
@@ -11,7 +11,7 @@
use function VeeWee\Xml\ErrorHandling\disallow_libxml_false_returns;
/**
- * @return \Closure(XMLReader): XMLReader
+ * @return Closure(XMLReader): XMLReader
*/
function xsd_schema(string $schemaFile): Closure
{
diff --git a/src/Xml/Reader/Loader/xml_file_loader.php b/src/Xml/Reader/Loader/xml_file_loader.php
index cb0fabbd..214ebd4a 100644
--- a/src/Xml/Reader/Loader/xml_file_loader.php
+++ b/src/Xml/Reader/Loader/xml_file_loader.php
@@ -11,7 +11,7 @@
use function VeeWee\Xml\ErrorHandling\disallow_libxml_false_returns;
/**
- * @return \Closure(): XMLReader
+ * @return Closure(): XMLReader
*/
function xml_file_loader(string $file): Closure
{
diff --git a/src/Xml/Reader/Loader/xml_string_loader.php b/src/Xml/Reader/Loader/xml_string_loader.php
index aa2e7c13..2b781282 100644
--- a/src/Xml/Reader/Loader/xml_string_loader.php
+++ b/src/Xml/Reader/Loader/xml_string_loader.php
@@ -11,7 +11,7 @@
use function VeeWee\Xml\ErrorHandling\disallow_libxml_false_returns;
/**
- * @return \Closure(): XMLReader
+ * @return Closure(): XMLReader
*/
function xml_string_loader(string $xml): Closure
{
diff --git a/src/Xml/Reader/Matcher/all.php b/src/Xml/Reader/Matcher/all.php
index 75d8aac7..6bbce9df 100644
--- a/src/Xml/Reader/Matcher/all.php
+++ b/src/Xml/Reader/Matcher/all.php
@@ -11,7 +11,7 @@
/**
* @param list $matchers
*
- * @return \Closure(NodeSequence): bool
+ * @return Closure(NodeSequence): bool
*/
function all(callable ... $matchers): Closure
{
diff --git a/src/Xml/Reader/Matcher/any.php b/src/Xml/Reader/Matcher/any.php
index f88aac76..9588f65e 100644
--- a/src/Xml/Reader/Matcher/any.php
+++ b/src/Xml/Reader/Matcher/any.php
@@ -11,7 +11,7 @@
/**
* @param list $matchers
*
- * @return \Closure(NodeSequence): bool
+ * @return Closure(NodeSequence): bool
*/
function any(callable ... $matchers): Closure
{
diff --git a/src/Xml/Reader/Matcher/attribute_local_name.php b/src/Xml/Reader/Matcher/attribute_local_name.php
index ab1eb3a3..bbb71d24 100644
--- a/src/Xml/Reader/Matcher/attribute_local_name.php
+++ b/src/Xml/Reader/Matcher/attribute_local_name.php
@@ -10,7 +10,7 @@
use function Psl\Iter\any;
/**
- * @return \Closure(NodeSequence): bool
+ * @return Closure(NodeSequence): bool
*/
function attribute_local_name(string $localName): Closure
{
diff --git a/src/Xml/Reader/Matcher/attribute_local_value.php b/src/Xml/Reader/Matcher/attribute_local_value.php
index 2a038c5c..ded37c6f 100644
--- a/src/Xml/Reader/Matcher/attribute_local_value.php
+++ b/src/Xml/Reader/Matcher/attribute_local_value.php
@@ -10,7 +10,7 @@
use function Psl\Iter\any;
/**
- * @return \Closure(NodeSequence): bool
+ * @return Closure(NodeSequence): bool
*/
function attribute_local_value(string $localName, string $value): Closure
{
diff --git a/src/Xml/Reader/Matcher/attribute_name.php b/src/Xml/Reader/Matcher/attribute_name.php
index 813a2696..15d2e32c 100644
--- a/src/Xml/Reader/Matcher/attribute_name.php
+++ b/src/Xml/Reader/Matcher/attribute_name.php
@@ -10,7 +10,7 @@
use function Psl\Iter\any;
/**
- * @return \Closure(NodeSequence): bool
+ * @return Closure(NodeSequence): bool
*/
function attribute_name(string $name): Closure
{
diff --git a/src/Xml/Reader/Matcher/attribute_value.php b/src/Xml/Reader/Matcher/attribute_value.php
index ef00ba41..6250f29e 100644
--- a/src/Xml/Reader/Matcher/attribute_value.php
+++ b/src/Xml/Reader/Matcher/attribute_value.php
@@ -10,7 +10,7 @@
use function Psl\Iter\any;
/**
- * @return \Closure(NodeSequence): bool
+ * @return Closure(NodeSequence): bool
*/
function attribute_value(string $name, string $value): Closure
{
diff --git a/src/Xml/Reader/Matcher/document_element.php b/src/Xml/Reader/Matcher/document_element.php
index 0b81a8e5..bc37835b 100644
--- a/src/Xml/Reader/Matcher/document_element.php
+++ b/src/Xml/Reader/Matcher/document_element.php
@@ -8,7 +8,7 @@
use VeeWee\Xml\Reader\Node\NodeSequence;
/**
- * @return \Closure(NodeSequence): bool
+ * @return Closure(NodeSequence): bool
*/
function document_element(): Closure
{
diff --git a/src/Xml/Reader/Matcher/element_local_name.php b/src/Xml/Reader/Matcher/element_local_name.php
index a72d7bc5..1d20116d 100644
--- a/src/Xml/Reader/Matcher/element_local_name.php
+++ b/src/Xml/Reader/Matcher/element_local_name.php
@@ -8,7 +8,7 @@
use VeeWee\Xml\Reader\Node\NodeSequence;
/**
- * @return \Closure(NodeSequence): bool
+ * @return Closure(NodeSequence): bool
*/
function element_local_name(string $localName): Closure
{
diff --git a/src/Xml/Reader/Matcher/element_name.php b/src/Xml/Reader/Matcher/element_name.php
index 05b345b4..f8a0a0b4 100644
--- a/src/Xml/Reader/Matcher/element_name.php
+++ b/src/Xml/Reader/Matcher/element_name.php
@@ -8,7 +8,7 @@
use VeeWee\Xml\Reader\Node\NodeSequence;
/**
- * @return \Closure(NodeSequence): bool
+ * @return Closure(NodeSequence): bool
*/
function element_name(string $name): Closure
{
diff --git a/src/Xml/Reader/Matcher/element_position.php b/src/Xml/Reader/Matcher/element_position.php
index 6dd0309f..84c6f9ee 100644
--- a/src/Xml/Reader/Matcher/element_position.php
+++ b/src/Xml/Reader/Matcher/element_position.php
@@ -8,7 +8,7 @@
use VeeWee\Xml\Reader\Node\NodeSequence;
/**
- * @return \Closure(NodeSequence): bool
+ * @return Closure(NodeSequence): bool
*/
function element_position(int $position): Closure
{
diff --git a/src/Xml/Reader/Matcher/namespaced_attribute.php b/src/Xml/Reader/Matcher/namespaced_attribute.php
index ceb3103a..1d3102c5 100644
--- a/src/Xml/Reader/Matcher/namespaced_attribute.php
+++ b/src/Xml/Reader/Matcher/namespaced_attribute.php
@@ -10,7 +10,7 @@
use function Psl\Iter\any;
/**
- * @return \Closure(NodeSequence): bool
+ * @return Closure(NodeSequence): bool
*/
function namespaced_attribute(string $namespace, string $localName): Closure
{
diff --git a/src/Xml/Reader/Matcher/namespaced_attribute_value.php b/src/Xml/Reader/Matcher/namespaced_attribute_value.php
index eeab1f43..6a939b87 100644
--- a/src/Xml/Reader/Matcher/namespaced_attribute_value.php
+++ b/src/Xml/Reader/Matcher/namespaced_attribute_value.php
@@ -10,7 +10,7 @@
use function Psl\Iter\any;
/**
- * @return \Closure(NodeSequence): bool
+ * @return Closure(NodeSequence): bool
*/
function namespaced_attribute_value(string $namespace, string $localName, string $value): Closure
{
diff --git a/src/Xml/Reader/Matcher/namespaced_element.php b/src/Xml/Reader/Matcher/namespaced_element.php
index 052f1248..2d1c8abe 100644
--- a/src/Xml/Reader/Matcher/namespaced_element.php
+++ b/src/Xml/Reader/Matcher/namespaced_element.php
@@ -8,7 +8,7 @@
use VeeWee\Xml\Reader\Node\NodeSequence;
/**
- * @return \Closure(NodeSequence): bool
+ * @return Closure(NodeSequence): bool
*/
function namespaced_element(string $namespace, string $localName): Closure
{
diff --git a/src/Xml/Reader/Matcher/nested.php b/src/Xml/Reader/Matcher/nested.php
index a9be299b..3e552d20 100644
--- a/src/Xml/Reader/Matcher/nested.php
+++ b/src/Xml/Reader/Matcher/nested.php
@@ -24,7 +24,7 @@
*
* @param non-empty-list $matchers
*
- * @return \Closure(NodeSequence): bool
+ * @return Closure(NodeSequence): bool
*/
function nested(callable ... $matchers): Closure
{
diff --git a/src/Xml/Reader/Matcher/node_attribute.php b/src/Xml/Reader/Matcher/node_attribute.php
index 5e556717..8d9062f1 100644
--- a/src/Xml/Reader/Matcher/node_attribute.php
+++ b/src/Xml/Reader/Matcher/node_attribute.php
@@ -11,7 +11,7 @@
/**
* @deprecated Use attribute_value instead! This will be removed in next major version
- * @return \Closure(NodeSequence): bool
+ * @return Closure(NodeSequence): bool
*/
function node_attribute(string $key, string $value): Closure
{
diff --git a/src/Xml/Reader/Matcher/node_name.php b/src/Xml/Reader/Matcher/node_name.php
index 645fb010..6e68546c 100644
--- a/src/Xml/Reader/Matcher/node_name.php
+++ b/src/Xml/Reader/Matcher/node_name.php
@@ -9,7 +9,7 @@
/**
* @deprecated Use element_name instead! This will be removed in next major version
- * @return \Closure(NodeSequence): bool
+ * @return Closure(NodeSequence): bool
*/
function node_name(string $name): Closure
{
diff --git a/src/Xml/Reader/Matcher/not.php b/src/Xml/Reader/Matcher/not.php
index c268c18a..0d9a943c 100644
--- a/src/Xml/Reader/Matcher/not.php
+++ b/src/Xml/Reader/Matcher/not.php
@@ -10,7 +10,7 @@
/**
* @param callable(NodeSequence): bool $matcher
*
- * @return \Closure(NodeSequence): bool
+ * @return Closure(NodeSequence): bool
*/
function not(callable $matcher): Closure
{
diff --git a/src/Xml/Reader/Matcher/sequence.php b/src/Xml/Reader/Matcher/sequence.php
index 79284db0..bcfc8f03 100644
--- a/src/Xml/Reader/Matcher/sequence.php
+++ b/src/Xml/Reader/Matcher/sequence.php
@@ -17,7 +17,7 @@
*
* @param non-empty-list $matcherSequence
*
- * @return \Closure(NodeSequence): bool
+ * @return Closure(NodeSequence): bool
*/
function sequence(callable ... $matcherSequence): Closure
{
diff --git a/src/Xml/Writer/Builder/attribute.php b/src/Xml/Writer/Builder/attribute.php
index 98071058..fa876600 100644
--- a/src/Xml/Writer/Builder/attribute.php
+++ b/src/Xml/Writer/Builder/attribute.php
@@ -9,7 +9,7 @@
use XMLWriter;
/**
- * @return \Closure(XMLWriter): Generator
+ * @return Closure(XMLWriter): Generator
*/
function attribute(string $name, string $value): Closure
{
diff --git a/src/Xml/Writer/Builder/attributes.php b/src/Xml/Writer/Builder/attributes.php
index 72c3574b..67929cf7 100644
--- a/src/Xml/Writer/Builder/attributes.php
+++ b/src/Xml/Writer/Builder/attributes.php
@@ -10,7 +10,7 @@
/**
* @param array $attributes
- * @return \Closure(XMLWriter): Generator
+ * @return Closure(XMLWriter): Generator
*/
function attributes(array $attributes): Closure
{
diff --git a/src/Xml/Writer/Builder/children.php b/src/Xml/Writer/Builder/children.php
index 155c5ae6..62370129 100644
--- a/src/Xml/Writer/Builder/children.php
+++ b/src/Xml/Writer/Builder/children.php
@@ -11,7 +11,7 @@
/**
* @param iterable<(callable(XMLWriter): Generator)> $nodeBuilders
*
- * @return \Closure(XMLWriter): Generator
+ * @return Closure(XMLWriter): Generator
*/
function children(iterable $nodeBuilders): Closure
{
diff --git a/src/Xml/Writer/Builder/document.php b/src/Xml/Writer/Builder/document.php
index bc9cd8d4..5665f1ba 100644
--- a/src/Xml/Writer/Builder/document.php
+++ b/src/Xml/Writer/Builder/document.php
@@ -11,7 +11,7 @@
/**
* @param list<(callable(XMLWriter): Generator)> $configurators
*
- * @return \Closure(XMLWriter): Generator
+ * @return Closure(XMLWriter): Generator
*/
function document(string $version, string $charset, callable ... $configurators): Closure
{
diff --git a/src/Xml/Writer/Builder/element.php b/src/Xml/Writer/Builder/element.php
index 26d2196f..c6c6d186 100644
--- a/src/Xml/Writer/Builder/element.php
+++ b/src/Xml/Writer/Builder/element.php
@@ -11,7 +11,7 @@
/**
* @param list<(callable(XMLWriter): Generator)> $configurators
*
- * @return \Closure(XMLWriter): Generator
+ * @return Closure(XMLWriter): Generator
*/
function element(string $name, callable ...$configurators): Closure
{
diff --git a/src/Xml/Writer/Builder/namespace_attribute.php b/src/Xml/Writer/Builder/namespace_attribute.php
index 87ed70d9..4d5ca072 100644
--- a/src/Xml/Writer/Builder/namespace_attribute.php
+++ b/src/Xml/Writer/Builder/namespace_attribute.php
@@ -9,7 +9,7 @@
use XMLWriter;
/**
- * @return \Closure(XMLWriter): Generator
+ * @return Closure(XMLWriter): Generator
*/
function namespace_attribute(string $namespace, ?string $prefix = null): Closure
{
diff --git a/src/Xml/Writer/Builder/prefixed_attribute.php b/src/Xml/Writer/Builder/prefixed_attribute.php
index ab076b30..33e38ae1 100644
--- a/src/Xml/Writer/Builder/prefixed_attribute.php
+++ b/src/Xml/Writer/Builder/prefixed_attribute.php
@@ -9,7 +9,7 @@
use XMLWriter;
/**
- * @return \Closure(XMLWriter): Generator
+ * @return Closure(XMLWriter): Generator
*/
function prefixed_attribute(string $prefix, string $name, string $value): Closure
{
diff --git a/src/Xml/Writer/Builder/prefixed_attributes.php b/src/Xml/Writer/Builder/prefixed_attributes.php
index efd64d8d..c32531d8 100644
--- a/src/Xml/Writer/Builder/prefixed_attributes.php
+++ b/src/Xml/Writer/Builder/prefixed_attributes.php
@@ -11,7 +11,7 @@
/**
* @param array $attributes
- * @return \Closure(XMLWriter): Generator
+ * @return Closure(XMLWriter): Generator
*/
function prefixed_attributes(array $attributes): Closure
{
diff --git a/src/Xml/Writer/Builder/prefixed_element.php b/src/Xml/Writer/Builder/prefixed_element.php
index 5639a592..d6e5c077 100644
--- a/src/Xml/Writer/Builder/prefixed_element.php
+++ b/src/Xml/Writer/Builder/prefixed_element.php
@@ -11,7 +11,7 @@
/**
* @param list<(callable(XMLWriter): Generator)> $configurators
*
- * @return \Closure(XMLWriter): Generator
+ * @return Closure(XMLWriter): Generator
*/
function prefixed_element(string $prefix, string $name, callable ...$configurators): Closure
{
diff --git a/src/Xml/Writer/Builder/value.php b/src/Xml/Writer/Builder/value.php
index f45d718b..f1f82820 100644
--- a/src/Xml/Writer/Builder/value.php
+++ b/src/Xml/Writer/Builder/value.php
@@ -9,7 +9,7 @@
use XMLWriter;
/**
- * @return \Closure(XMLWriter): Generator
+ * @return Closure(XMLWriter): Generator
*/
function value(string $value): Closure
{
diff --git a/src/Xml/Writer/Configurator/indentation.php b/src/Xml/Writer/Configurator/indentation.php
index b6cc4ffc..35f384c8 100644
--- a/src/Xml/Writer/Configurator/indentation.php
+++ b/src/Xml/Writer/Configurator/indentation.php
@@ -9,7 +9,7 @@
use function VeeWee\Xml\ErrorHandling\disallow_libxml_false_returns;
/**
- * @return \Closure(XMLWriter): XMLWriter
+ * @return Closure(XMLWriter): XMLWriter
*/
function indentation(string $indentation): Closure
{
diff --git a/src/Xml/Writer/Configurator/open.php b/src/Xml/Writer/Configurator/open.php
index 2c6cc8ee..dc9d0403 100644
--- a/src/Xml/Writer/Configurator/open.php
+++ b/src/Xml/Writer/Configurator/open.php
@@ -11,7 +11,7 @@
/**
* @param callable(XMLWriter): bool $opener
- * @return \Closure(XMLWriter): XMLWriter
+ * @return Closure(XMLWriter): XMLWriter
*/
function open(callable $opener): Closure
{
diff --git a/src/Xml/Writer/Opener/xml_file_opener.php b/src/Xml/Writer/Opener/xml_file_opener.php
index 19345cc1..275a189c 100644
--- a/src/Xml/Writer/Opener/xml_file_opener.php
+++ b/src/Xml/Writer/Opener/xml_file_opener.php
@@ -9,7 +9,7 @@
use XMLWriter;
/**
- * @return \Closure(XMLWriter): bool XMLWriter
+ * @return Closure(XMLWriter): bool XMLWriter
*/
function xml_file_opener(string $file): Closure
{
diff --git a/src/Xml/Xsd/Schema/Manipulator/base_path.php b/src/Xml/Xsd/Schema/Manipulator/base_path.php
index 39515033..d6646e58 100644
--- a/src/Xml/Xsd/Schema/Manipulator/base_path.php
+++ b/src/Xml/Xsd/Schema/Manipulator/base_path.php
@@ -12,7 +12,7 @@
/**
*
- * @return \Closure(SchemaCollection): SchemaCollection
+ * @return Closure(SchemaCollection): SchemaCollection
*/
function base_path(string $basePath): Closure
{
diff --git a/src/Xml/Xsd/Schema/Manipulator/overwrite_with_local_files.php b/src/Xml/Xsd/Schema/Manipulator/overwrite_with_local_files.php
index 455d333e..12ebfc77 100644
--- a/src/Xml/Xsd/Schema/Manipulator/overwrite_with_local_files.php
+++ b/src/Xml/Xsd/Schema/Manipulator/overwrite_with_local_files.php
@@ -11,7 +11,7 @@
/**
* @param array $map - Key=namspace, value=location
*
- * @return \Closure(SchemaCollection): SchemaCollection
+ * @return Closure(SchemaCollection): SchemaCollection
*/
function overwrite_with_local_files(array $map): Closure
{
diff --git a/src/Xml/Xslt/Configurator/all_functions.php b/src/Xml/Xslt/Configurator/all_functions.php
index d922650f..ece1f163 100644
--- a/src/Xml/Xslt/Configurator/all_functions.php
+++ b/src/Xml/Xslt/Configurator/all_functions.php
@@ -8,7 +8,7 @@
use XSLTProcessor;
/**
- * @return \Closure(XSLTProcessor): XSLTProcessor
+ * @return Closure(XSLTProcessor): XSLTProcessor
*/
function all_functions(): Closure
{
diff --git a/src/Xml/Xslt/Configurator/functions.php b/src/Xml/Xslt/Configurator/functions.php
index d4ceffee..cb6e1175 100644
--- a/src/Xml/Xslt/Configurator/functions.php
+++ b/src/Xml/Xslt/Configurator/functions.php
@@ -10,7 +10,7 @@
/**
* @param non-empty-list $functions
*
- * @return \Closure(XSLTProcessor): XSLTProcessor
+ * @return Closure(XSLTProcessor): XSLTProcessor
*/
function functions(array $functions): Closure
{
diff --git a/src/Xml/Xslt/Configurator/loader.php b/src/Xml/Xslt/Configurator/loader.php
index 7586297b..fc14cd07 100644
--- a/src/Xml/Xslt/Configurator/loader.php
+++ b/src/Xml/Xslt/Configurator/loader.php
@@ -10,7 +10,7 @@
/**
* @param callable(XSLTProcessor): void $loader
*
- * @return \Closure(XSLTProcessor): XSLTProcessor
+ * @return Closure(XSLTProcessor): XSLTProcessor
*/
function loader(callable $loader): Closure
{
diff --git a/src/Xml/Xslt/Configurator/parameters.php b/src/Xml/Xslt/Configurator/parameters.php
index b49556cf..d90da449 100644
--- a/src/Xml/Xslt/Configurator/parameters.php
+++ b/src/Xml/Xslt/Configurator/parameters.php
@@ -17,7 +17,7 @@
*
* @param array $parameters
*
- * @return \Closure(XSLTProcessor): XSLTProcessor
+ * @return Closure(XSLTProcessor): XSLTProcessor
*/
function parameters(array $parameters): Closure
{
diff --git a/src/Xml/Xslt/Configurator/profiler.php b/src/Xml/Xslt/Configurator/profiler.php
index 4007596f..1789fad9 100644
--- a/src/Xml/Xslt/Configurator/profiler.php
+++ b/src/Xml/Xslt/Configurator/profiler.php
@@ -13,7 +13,7 @@
/**
* @param non-empty-string $profilingFile
- * @return \Closure(XSLTProcessor): XSLTProcessor
+ * @return Closure(XSLTProcessor): XSLTProcessor
*/
function profiler(string $profilingFile): Closure
{
diff --git a/src/Xml/Xslt/Configurator/security_preferences.php b/src/Xml/Xslt/Configurator/security_preferences.php
index 8d24d99c..06f73c5c 100644
--- a/src/Xml/Xslt/Configurator/security_preferences.php
+++ b/src/Xml/Xslt/Configurator/security_preferences.php
@@ -20,7 +20,7 @@
* \XSL_SECPREF_DEFAULT
* > $preferences
*
- * @return \Closure(XSLTProcessor): XSLTProcessor
+ * @return Closure(XSLTProcessor): XSLTProcessor
*/
function security_preferences(int $preferences): Closure
{
diff --git a/src/Xml/Xslt/Loader/from_template_document.php b/src/Xml/Xslt/Loader/from_template_document.php
index 5521b807..bca30d41 100644
--- a/src/Xml/Xslt/Loader/from_template_document.php
+++ b/src/Xml/Xslt/Loader/from_template_document.php
@@ -11,7 +11,7 @@
use function VeeWee\Xml\ErrorHandling\disallow_libxml_false_returns;
/**
- * @return \Closure(XSLTProcessor): void
+ * @return Closure(XSLTProcessor): void
*/
function from_template_document(Document $template): Closure
{
diff --git a/src/Xml/Xslt/Transformer/document_to_string.php b/src/Xml/Xslt/Transformer/document_to_string.php
index 952b74f7..b0fff5d8 100644
--- a/src/Xml/Xslt/Transformer/document_to_string.php
+++ b/src/Xml/Xslt/Transformer/document_to_string.php
@@ -11,7 +11,7 @@
use function VeeWee\Xml\ErrorHandling\disallow_libxml_false_returns;
/**
- * @return \Closure(XSLTProcessor): string
+ * @return Closure(XSLTProcessor): string
*/
function document_to_string(Document $document): Closure
{
diff --git a/tests/Xml/Dom/Builder/NamespacedAttributeTest.php b/tests/Xml/Dom/Builder/NamespacedAttributeTest.php
index af4fb4c1..695d6dfe 100644
--- a/tests/Xml/Dom/Builder/NamespacedAttributeTest.php
+++ b/tests/Xml/Dom/Builder/NamespacedAttributeTest.php
@@ -18,7 +18,7 @@ public function test_it_throws_exception_if_the_attribute_name_is_not_qualified(
$ns = 'https://namespace.com';
$this->expectException(InvalidArgumentException::class);
- $this->expectErrorMessage('The provided value "key1" is not a QName, expected ns:name instead');
+ $this->expectExceptionMessage('The provided value "key1" is not a QName, expected ns:name instead');
element(
'hello',
diff --git a/tests/Xml/Dom/Loader/XmlFileLoaderTest.php b/tests/Xml/Dom/Loader/XmlFileLoaderTest.php
index 1fd62768..7a9fdb85 100644
--- a/tests/Xml/Dom/Loader/XmlFileLoaderTest.php
+++ b/tests/Xml/Dom/Loader/XmlFileLoaderTest.php
@@ -48,7 +48,7 @@ public function test_it_cannot_load_invalid_xml_file(): void
$loader = xml_file_loader($file);
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('Could not load the DOM Document');
+ $this->expectExceptionMessage('Could not load the DOM Document');
$loader($doc);
fclose($handle);
@@ -60,7 +60,7 @@ public function test_it_throws_exception_on_invalid_file(): void
$loader = xml_file_loader('invalid-file');
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('The file "invalid-file" does not exist');
+ $this->expectExceptionMessage('The file "invalid-file" does not exist');
$loader($doc);
}
diff --git a/tests/Xml/Dom/Loader/XmlStringLoaderTest.php b/tests/Xml/Dom/Loader/XmlStringLoaderTest.php
index 23d1844f..31111691 100644
--- a/tests/Xml/Dom/Loader/XmlStringLoaderTest.php
+++ b/tests/Xml/Dom/Loader/XmlStringLoaderTest.php
@@ -28,7 +28,7 @@ public function test_it_can_not_load_invalid_xml_string(): void
$loader = xml_string_loader($xml);
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('Could not load the DOM Document');
+ $this->expectExceptionMessage('Could not load the DOM Document');
$loader($doc);
}
diff --git a/tests/Xml/Dom/Locator/Element/ParentElementTest.php b/tests/Xml/Dom/Locator/Element/ParentElementTest.php
index 3368d03c..6d323468 100644
--- a/tests/Xml/Dom/Locator/Element/ParentElementTest.php
+++ b/tests/Xml/Dom/Locator/Element/ParentElementTest.php
@@ -34,7 +34,7 @@ public function test_it_can_detect_parents(): void
static::assertSame($hello, $domdoc->documentElement);
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('Can not find parent element for DOMElement hello');
+ $this->expectExceptionMessage('Can not find parent element for DOMElement hello');
parent_element($hello);
}
}
diff --git a/tests/Xml/Dom/Locator/Node/DetectDocumentTest.php b/tests/Xml/Dom/Locator/Node/DetectDocumentTest.php
index 10502b3d..d304228f 100644
--- a/tests/Xml/Dom/Locator/Node/DetectDocumentTest.php
+++ b/tests/Xml/Dom/Locator/Node/DetectDocumentTest.php
@@ -27,7 +27,7 @@ public function test_it_throws_exception_on_unlinked_node(): void
$element = new DOMElement('name');
$this->expectException(InvalidArgumentException::class);
- $this->expectErrorMessage('Expected to find an ownerDocument on provided DOMNode.');
+ $this->expectExceptionMessage('Expected to find an ownerDocument on provided DOMNode.');
detect_document($element);
}
diff --git a/tests/Xml/Dom/Manipulator/Node/RenameTest.php b/tests/Xml/Dom/Manipulator/Node/RenameTest.php
index 193020a2..975434cf 100644
--- a/tests/Xml/Dom/Manipulator/Node/RenameTest.php
+++ b/tests/Xml/Dom/Manipulator/Node/RenameTest.php
@@ -168,7 +168,7 @@ public function test_it_can_not_rename_namespaced_attribute_prefix_when_the_xmln
$node = $root->getAttributeNode('a:who');
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('Unable to rename attribute a:who into b:you');
+ $this->expectExceptionMessage('Unable to rename attribute a:who into b:you');
rename($node, 'b:you');
}
diff --git a/tests/Xml/Dom/Manipulator/Xmlns/RenameTest.php b/tests/Xml/Dom/Manipulator/Xmlns/RenameTest.php
index 484e4e70..09b161af 100644
--- a/tests/Xml/Dom/Manipulator/Xmlns/RenameTest.php
+++ b/tests/Xml/Dom/Manipulator/Xmlns/RenameTest.php
@@ -30,7 +30,7 @@ public function test_it_can_not_rename_existing_prefix_to_other_uri(): void
$document = Document::fromXmlString('')->toUnsafeDocument();
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('Cannot rename the namespace uri http://replace because the prefix ns1 is already linked to uri http://ok');
+ $this->expectExceptionMessage('Cannot rename the namespace uri http://replace because the prefix ns1 is already linked to uri http://ok');
rename($document, 'http://replace', 'ns1');
}
diff --git a/tests/Xml/Dom/Mapper/XmlStringTest.php b/tests/Xml/Dom/Mapper/XmlStringTest.php
index 5fb83b13..7d66e9c4 100644
--- a/tests/Xml/Dom/Mapper/XmlStringTest.php
+++ b/tests/Xml/Dom/Mapper/XmlStringTest.php
@@ -31,7 +31,7 @@ public function test_it_can_map_node_to_xml(): void
public function test_it_throws_exception_on_invalid_node(): void
{
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('Expected to find an ownerDocument on provided DOMNode');
+ $this->expectExceptionMessage('Expected to find an ownerDocument on provided DOMNode');
xml_string()(new DOMElement('hello'));
}
}
diff --git a/tests/Xml/Dom/Mapper/XsltTemplateTest.php b/tests/Xml/Dom/Mapper/XsltTemplateTest.php
index cc9e8061..ab845a41 100644
--- a/tests/Xml/Dom/Mapper/XsltTemplateTest.php
+++ b/tests/Xml/Dom/Mapper/XsltTemplateTest.php
@@ -46,7 +46,7 @@ public function test_it_returns_empty_string_on_invalid_value_tag(): void
public function test_it_fails_on_invalid_template_thingies(): void
{
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('Unable to apply the XSLT template');
+ $this->expectExceptionMessage('Unable to apply the XSLT template');
xslt_template(
Document::fromXmlString(
diff --git a/tests/Xml/Dom/Xpath/Locator/EvaluateTest.php b/tests/Xml/Dom/Xpath/Locator/EvaluateTest.php
index 3ec9be1c..eafc5da1 100644
--- a/tests/Xml/Dom/Xpath/Locator/EvaluateTest.php
+++ b/tests/Xml/Dom/Xpath/Locator/EvaluateTest.php
@@ -15,8 +15,8 @@ public function test_it_can_handle_xpath_errors(): void
$xpath = $this->provideXml()->xpath();
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('Failed querying XPath query');
- $this->expectErrorMessage('[ERROR] : Invalid expression');
+ $this->expectExceptionMessage('Failed querying XPath query');
+ $this->expectExceptionMessage('[ERROR] : Invalid expression');
$xpath->evaluate('$p$m``m$^^$^^jibberish', Type\string());
}
diff --git a/tests/Xml/Dom/Xpath/Locator/QuerySingleTest.php b/tests/Xml/Dom/Xpath/Locator/QuerySingleTest.php
index c8e79705..ee2d5777 100644
--- a/tests/Xml/Dom/Xpath/Locator/QuerySingleTest.php
+++ b/tests/Xml/Dom/Xpath/Locator/QuerySingleTest.php
@@ -15,8 +15,8 @@ public function test_it_can_handle_xpath_errors(): void
$xpath = $this->provideXml()->xpath();
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('Failed querying XPath query');
- $this->expectErrorMessage('[ERROR] : Invalid expression');
+ $this->expectExceptionMessage('Failed querying XPath query');
+ $this->expectExceptionMessage('[ERROR] : Invalid expression');
$xpath->querySingle('$p$m``m$^^$^^jibberish');
}
@@ -26,7 +26,7 @@ public function test_it_throws_on_multiple_xpath_elements(): void
{
$xpath = $this->provideXml()->xpath();
- $this->expectErrorMessage('Expected to find only one node that matches //items. Got 2');
+ $this->expectExceptionMessage('Expected to find only one node that matches //items. Got 2');
$xpath->querySingle('//items');
}
diff --git a/tests/Xml/Dom/Xpath/Locator/QueryTest.php b/tests/Xml/Dom/Xpath/Locator/QueryTest.php
index 444f35e7..35d98f62 100644
--- a/tests/Xml/Dom/Xpath/Locator/QueryTest.php
+++ b/tests/Xml/Dom/Xpath/Locator/QueryTest.php
@@ -14,8 +14,8 @@ public function test_it_can_handle_xpath_errors(): void
$xpath = $this->provideXml()->xpath();
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('Failed querying XPath query');
- $this->expectErrorMessage('[ERROR] : Invalid expression');
+ $this->expectExceptionMessage('Failed querying XPath query');
+ $this->expectExceptionMessage('[ERROR] : Invalid expression');
$xpath->query('$p$m``m$^^$^^jibberish');
}
diff --git a/tests/Xml/ErrorHandling/Assertion/AssertStrictPrefixedNameTest.php b/tests/Xml/ErrorHandling/Assertion/AssertStrictPrefixedNameTest.php
index 1c07ecd4..5e3c951b 100644
--- a/tests/Xml/ErrorHandling/Assertion/AssertStrictPrefixedNameTest.php
+++ b/tests/Xml/ErrorHandling/Assertion/AssertStrictPrefixedNameTest.php
@@ -27,7 +27,7 @@ public function test_it_does_nothing_on_valid_qnames(string $input): void
public function test_it_throws_on_invalid_qnames(string $input): void
{
$this->expectException(InvalidArgumentException::class);
- $this->expectErrorMessage('The provided value "'.$input.'" is not a QName, expected ns:name instead.');
+ $this->expectExceptionMessage('The provided value "'.$input.'" is not a QName, expected ns:name instead.');
assert_strict_prefixed_name($input);
}
diff --git a/tests/Xml/ErrorHandling/DisallowIssuesTest.php b/tests/Xml/ErrorHandling/DisallowIssuesTest.php
index 9c4e024d..73401dbf 100644
--- a/tests/Xml/ErrorHandling/DisallowIssuesTest.php
+++ b/tests/Xml/ErrorHandling/DisallowIssuesTest.php
@@ -29,7 +29,7 @@ static function (): string {
public function test_it_can_detect_xml_errors_inside_callable_and_return_ok(): void
{
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('XML issues detected');
+ $this->expectExceptionMessage('XML issues detected');
$result = ErrorHandling\disallow_issues(
static function (): string {
@@ -45,7 +45,7 @@ public function test_it_can_detect_xml_errors_inside_callable_and_return_a_failu
$exception = new Exception('nonono');
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('nonono');
+ $this->expectExceptionMessage('nonono');
ErrorHandling\disallow_issues(
static function () use ($exception) {
diff --git a/tests/Xml/ErrorHandling/DisallowLibxmlFalseReturnsTest.php b/tests/Xml/ErrorHandling/DisallowLibxmlFalseReturnsTest.php
index e061401f..2d3379c5 100644
--- a/tests/Xml/ErrorHandling/DisallowLibxmlFalseReturnsTest.php
+++ b/tests/Xml/ErrorHandling/DisallowLibxmlFalseReturnsTest.php
@@ -20,7 +20,7 @@ public function test_it_continues_when_not_false(): void
public function test_it_throws_when_false(): void
{
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('nope');
+ $this->expectExceptionMessage('nope');
disallow_libxml_false_returns(false, 'nope');
}
diff --git a/tests/Xml/Reader/Configurator/XsdSchemaTest.php b/tests/Xml/Reader/Configurator/XsdSchemaTest.php
index eb2ffde6..c4855d3b 100644
--- a/tests/Xml/Reader/Configurator/XsdSchemaTest.php
+++ b/tests/Xml/Reader/Configurator/XsdSchemaTest.php
@@ -59,7 +59,7 @@ public function test_it_triggers_an_error_on_invalid_schema(): void
$iterator = $reader->provide(node_name('user'));
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('Detected issues during the parsing of the XML Stream');
+ $this->expectExceptionMessage('Detected issues during the parsing of the XML Stream');
[...$iterator];
fclose($xsdHandle);
@@ -74,7 +74,7 @@ public function test_it_triggers_an_error_if_schema_file_does_not_exist(): void
$iterator = $reader->provide(node_name('user'));
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('The file "unkown-file" does not exist.');
+ $this->expectExceptionMessage('The file "unkown-file" does not exist.');
[...$iterator];
fclose($xsdHandle);
@@ -103,7 +103,7 @@ public function test_it_can_not_set_a_schema_if_the_schema_is_invalid(): void
$iterator = $reader->provide(node_name('user'));
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('Schema contains errors');
+ $this->expectExceptionMessage('Schema contains errors');
[...$iterator];
fclose($xsdHandle);
diff --git a/tests/Xml/Reader/Loader/XmlFileLoaderTest.php b/tests/Xml/Reader/Loader/XmlFileLoaderTest.php
index 3088b9a7..0e54623c 100644
--- a/tests/Xml/Reader/Loader/XmlFileLoaderTest.php
+++ b/tests/Xml/Reader/Loader/XmlFileLoaderTest.php
@@ -17,7 +17,7 @@ final class XmlFileLoaderTest extends TestCase
public function test_it_invalid_file_loader(): void
{
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('The file "invalid-file" does not exist.');
+ $this->expectExceptionMessage('The file "invalid-file" does not exist.');
xml_file_loader('invalid-file')();
}
diff --git a/tests/Xml/Reader/Loader/XmlStringLoaderTest.php b/tests/Xml/Reader/Loader/XmlStringLoaderTest.php
index 5a855719..e1d62097 100644
--- a/tests/Xml/Reader/Loader/XmlStringLoaderTest.php
+++ b/tests/Xml/Reader/Loader/XmlStringLoaderTest.php
@@ -13,7 +13,7 @@ final class XmlStringLoaderTest extends TestCase
public function test_it_can_handle_invalid_string_loader(): void
{
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('The provided XML can not be empty!');
+ $this->expectExceptionMessage('The provided XML can not be empty!');
xml_string_loader('')();
}
diff --git a/tests/Xml/Reader/Matcher/AbstractMatcherTest.php b/tests/Xml/Reader/Matcher/AbstractMatcherTest.php
index 17ae66a3..ec25b1b5 100644
--- a/tests/Xml/Reader/Matcher/AbstractMatcherTest.php
+++ b/tests/Xml/Reader/Matcher/AbstractMatcherTest.php
@@ -17,7 +17,7 @@ abstract public static function provideMatcherCases(): Generator;
/**
* @dataProvider provideRealXmlCases
*
- * @param \Closure(NodeSequence): bool $matcher
+ * @param Closure(NodeSequence): bool $matcher
* @param list $expected
*/
public function test_real_xml_cases(Closure $matcher, string $xml, array $expected)
@@ -31,7 +31,7 @@ public function test_real_xml_cases(Closure $matcher, string $xml, array $expect
/**
* @dataProvider provideMatcherCases
*
- * @param \Closure(NodeSequence): bool $matcher
+ * @param Closure(NodeSequence): bool $matcher
*/
public function test_matcher_cases(Closure $matcher, NodeSequence $sequence, bool $expected)
{
diff --git a/tests/Xml/Reader/Node/NodeSequenceTest.php b/tests/Xml/Reader/Node/NodeSequenceTest.php
index 3b5ad38e..5b3d4271 100644
--- a/tests/Xml/Reader/Node/NodeSequenceTest.php
+++ b/tests/Xml/Reader/Node/NodeSequenceTest.php
@@ -19,7 +19,7 @@ public function test_it_can_be_empty(): void
static::assertNull($sequence->parent());
$this->expectException(InvalidArgumentException::class);
- $this->expectErrorMessage('The node sequence is empty. Can not fetch current item!');
+ $this->expectExceptionMessage('The node sequence is empty. Can not fetch current item!');
$sequence->current();
}
diff --git a/tests/Xml/Reader/Node/PointerTest.php b/tests/Xml/Reader/Node/PointerTest.php
index d2fd1206..1a6365c7 100644
--- a/tests/Xml/Reader/Node/PointerTest.php
+++ b/tests/Xml/Reader/Node/PointerTest.php
@@ -25,7 +25,7 @@ public function test_it_is_empty_at_the_start(): void
public function test_it_cannot_leave_element_on_empty(): void
{
$this->expectException(InvalidArgumentException::class);
- $this->expectErrorMessage('Currently at root level. Can not leave element!');
+ $this->expectExceptionMessage('Currently at root level. Can not leave element!');
$pointer = Pointer::create();
$pointer->leaveElement();
diff --git a/tests/Xml/Reader/ReaderTest.php b/tests/Xml/Reader/ReaderTest.php
index 6713e4df..940eb84f 100644
--- a/tests/Xml/Reader/ReaderTest.php
+++ b/tests/Xml/Reader/ReaderTest.php
@@ -60,7 +60,7 @@ public function test_it_throws_exception_on_invalid_xml_during_iteration(): void
$iterator = $reader->provide(static fn () => true);
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('Detected issues during the parsing of the XML Stream');
+ $this->expectExceptionMessage('Detected issues during the parsing of the XML Stream');
[...$iterator];
}
diff --git a/tests/Xml/Writer/Builder/AttributeTest.php b/tests/Xml/Writer/Builder/AttributeTest.php
index 054a5d4a..5035a88d 100644
--- a/tests/Xml/Writer/Builder/AttributeTest.php
+++ b/tests/Xml/Writer/Builder/AttributeTest.php
@@ -36,7 +36,7 @@ public function test_it_can_add_atribute_to_element(): void
public function test_it_can_not_write_attribute_to_invalid_context(): void
{
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('Could not write the provided XML to the stream.');
+ $this->expectExceptionMessage('Could not write the provided XML to the stream.');
$this->runInMemory(static function (XMLWriter $xmlWriter): void {
$writer = Writer::fromUnsafeWriter($xmlWriter);
diff --git a/tests/Xml/Writer/Builder/ChildrenTest.php b/tests/Xml/Writer/Builder/ChildrenTest.php
index fd3af1e8..74ace1f6 100644
--- a/tests/Xml/Writer/Builder/ChildrenTest.php
+++ b/tests/Xml/Writer/Builder/ChildrenTest.php
@@ -49,7 +49,7 @@ public function test_it_can_create_child_elements(): void
public function test_it_can_not_write_attributes_in_between_elements(): void
{
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('Could not write the provided XML to the stream.');
+ $this->expectExceptionMessage('Could not write the provided XML to the stream.');
$this->runInMemory(static function (XMLWriter $xmlWriter): void {
$writer = Writer::fromUnsafeWriter($xmlWriter);
diff --git a/tests/Xml/Writer/Builder/PrefixedAttributeTest.php b/tests/Xml/Writer/Builder/PrefixedAttributeTest.php
index 2ee51083..00807edb 100644
--- a/tests/Xml/Writer/Builder/PrefixedAttributeTest.php
+++ b/tests/Xml/Writer/Builder/PrefixedAttributeTest.php
@@ -36,7 +36,7 @@ public function test_it_can_add_atribute_to_element(): void
public function test_it_can_not_write_attribute_to_invalid_context(): void
{
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('Could not write the provided XML to the stream.');
+ $this->expectExceptionMessage('Could not write the provided XML to the stream.');
$this->runInMemory(static function (XMLWriter $xmlWriter): void {
$writer = Writer::fromUnsafeWriter($xmlWriter);
diff --git a/tests/Xml/Writer/Builder/PrefixedAttributesTest.php b/tests/Xml/Writer/Builder/PrefixedAttributesTest.php
index 6eab28a6..bd7bb9ce 100644
--- a/tests/Xml/Writer/Builder/PrefixedAttributesTest.php
+++ b/tests/Xml/Writer/Builder/PrefixedAttributesTest.php
@@ -39,7 +39,7 @@ public function test_it_can_add_atributes_to_element(): void
public function test_it_throws_exception_on_non_prefixed_attribute(): void
{
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('The provided value "default" is not a QName, expected ns:name instead');
+ $this->expectExceptionMessage('The provided value "default" is not a QName, expected ns:name instead');
$this->runInMemory(static function (XMLWriter $xmlWriter): void {
$writer = Writer::fromUnsafeWriter($xmlWriter);
diff --git a/tests/Xml/Writer/Configurator/OpenTest.php b/tests/Xml/Writer/Configurator/OpenTest.php
index 4c1d62ec..4e9212e0 100644
--- a/tests/Xml/Writer/Configurator/OpenTest.php
+++ b/tests/Xml/Writer/Configurator/OpenTest.php
@@ -23,7 +23,7 @@ public function test_it_can_open(): void
public function test_it_can_fail_opening(): void
{
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('Could not open the writer stream.');
+ $this->expectExceptionMessage('Could not open the writer stream.');
$xmlWriter = new XMLWriter();
open(static fn () => false)($xmlWriter);
diff --git a/tests/Xml/Writer/Opener/XmlFileOpenerTest.php b/tests/Xml/Writer/Opener/XmlFileOpenerTest.php
index df5b4db1..6d3c97ec 100644
--- a/tests/Xml/Writer/Opener/XmlFileOpenerTest.php
+++ b/tests/Xml/Writer/Opener/XmlFileOpenerTest.php
@@ -29,7 +29,7 @@ public function test_it_can_open_a_file(): void
public function test_it_errors_if_file_is_not_writable(): void
{
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('The path "doesnotexist" is not writable.');
+ $this->expectExceptionMessage('The path "doesnotexist" is not writable.');
Writer::forFile('doesnotexist');
}
diff --git a/tests/Xml/Writer/WriterTest.php b/tests/Xml/Writer/WriterTest.php
index f1c9db60..4cff4590 100644
--- a/tests/Xml/Writer/WriterTest.php
+++ b/tests/Xml/Writer/WriterTest.php
@@ -70,7 +70,7 @@ public function test_it_can_use_an_unsafe_writer(): void
public function test_it_throws_error_on_not_initialized(): void
{
- $this->expectErrorMessage('Invalid or uninitialized XMLWriter object');
+ $this->expectExceptionMessage('Invalid or uninitialized XMLWriter object');
$emptyWriter = Writer::configure();
$emptyWriter->write(element('root'));
@@ -79,7 +79,7 @@ public function test_it_throws_error_on_not_initialized(): void
public function test_it_throws_error_on_invalid_write(): void
{
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('Could not write the provided XML to the stream.');
+ $this->expectExceptionMessage('Could not write the provided XML to the stream.');
$this->runInMemory(static function (XMLWriter $xmlWriter): void {
$writer = Writer::fromUnsafeWriter($xmlWriter);
diff --git a/tests/Xml/Xslt/Configurator/FunctionsTest.php b/tests/Xml/Xslt/Configurator/FunctionsTest.php
index c519b0a8..d7a91223 100644
--- a/tests/Xml/Xslt/Configurator/FunctionsTest.php
+++ b/tests/Xml/Xslt/Configurator/FunctionsTest.php
@@ -47,7 +47,7 @@ functions(['substr'])
);
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('Not allowed to call handler \'strtoupper()\'');
+ $this->expectExceptionMessage('Not allowed to call handler \'strtoupper()\'');
$processor->transformDocumentToString($doc);
}
diff --git a/tests/Xml/Xslt/Configurator/ParametersTest.php b/tests/Xml/Xslt/Configurator/ParametersTest.php
index 475f6933..ebe45bbb 100644
--- a/tests/Xml/Xslt/Configurator/ParametersTest.php
+++ b/tests/Xml/Xslt/Configurator/ParametersTest.php
@@ -40,7 +40,7 @@ public function test_it_throws_exception_if_param_is_not_set(): void
);
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('Unable to apply the XSLT template');
+ $this->expectExceptionMessage('Unable to apply the XSLT template');
$processor->transformDocumentToString($doc);
}
diff --git a/tests/Xml/Xslt/Configurator/ProfilerTest.php b/tests/Xml/Xslt/Configurator/ProfilerTest.php
index 68284785..16421515 100644
--- a/tests/Xml/Xslt/Configurator/ProfilerTest.php
+++ b/tests/Xml/Xslt/Configurator/ProfilerTest.php
@@ -35,7 +35,7 @@ public function test_it_can_use_a_profiler(): void
public function test_setting_an_invalid_profiler_location_doesnt_result(): void
{
$this->expectException(RuntimeException::class);
- $this->expectErrorMessage('The file "/THISFOLDERSHOULDNOTEXIST" does not exist.');
+ $this->expectExceptionMessage('The file "/THISFOLDERSHOULDNOTEXIST" does not exist.');
Processor::fromTemplateDocument(
$this->createTemplate(),
diff --git a/tools/infection.phar b/tools/infection.phar
index 3760596f..257191b9 100755
Binary files a/tools/infection.phar and b/tools/infection.phar differ
diff --git a/tools/php-cs-fixer.phar b/tools/php-cs-fixer.phar
index 7912db6c..9a03f3e9 100755
Binary files a/tools/php-cs-fixer.phar and b/tools/php-cs-fixer.phar differ
diff --git a/tools/phpunit.phar b/tools/phpunit.phar
index ccd14314..8d1aedb2 100755
--- a/tools/phpunit.phar
+++ b/tools/phpunit.phar
@@ -19,7 +19,7 @@ if (version_compare('7.3.0', PHP_VERSION, '>')) {
fwrite(
STDERR,
sprintf(
- 'PHPUnit 9.5.27 by Sebastian Bergmann and contributors.' . PHP_EOL . PHP_EOL .
+ 'PHPUnit 9.6.13 by Sebastian Bergmann and contributors.' . PHP_EOL . PHP_EOL .
'This version of PHPUnit requires PHP >= 7.3.' . PHP_EOL .
'You are using PHP %s (%s).' . PHP_EOL,
PHP_VERSION,
@@ -30,22 +30,31 @@ if (version_compare('7.3.0', PHP_VERSION, '>')) {
die(1);
}
-foreach (['dom', 'json', 'libxml', 'mbstring', 'tokenizer', 'xml', 'xmlwriter'] as $extension) {
- if (extension_loaded($extension)) {
- continue;
+$requiredExtensions = ['dom', 'json', 'libxml', 'mbstring', 'tokenizer', 'xml', 'xmlwriter'];
+
+$unavailableExtensions = array_filter(
+ $requiredExtensions,
+ static function ($extension) {
+ return !extension_loaded($extension);
}
+);
+if ([] !== $unavailableExtensions) {
fwrite(
STDERR,
sprintf(
- 'PHPUnit requires the "%s" extension.' . PHP_EOL,
- $extension
+ 'PHPUnit requires the "%s" extensions, but the "%s" %s not available.' . PHP_EOL,
+ implode('", "', $requiredExtensions),
+ implode('", "', $unavailableExtensions),
+ count($unavailableExtensions) === 1 ? 'extension is' : 'extensions are'
)
);
die(1);
}
+unset($requiredExtensions, $unavailableExtensions);
+
if (__FILE__ === realpath($_SERVER['SCRIPT_NAME'])) {
$execute = true;
} else {
@@ -67,9 +76,9 @@ if (isset($options['manifest'])) {
unset($options);
define('__PHPUNIT_PHAR__', str_replace(DIRECTORY_SEPARATOR, '/', __FILE__));
-define('__PHPUNIT_PHAR_ROOT__', 'phar://phpunit-9.5.27.phar');
+define('__PHPUNIT_PHAR_ROOT__', 'phar://phpunit-9.6.13.phar');
-Phar::mapPhar('phpunit-9.5.27.phar');
+Phar::mapPhar('phpunit-9.6.13.phar');
spl_autoload_register(
function ($class) {
@@ -79,6 +88,7 @@ spl_autoload_register(
$classes = ['PHPUnit\\DeepCopy\\DeepCopy' => '/myclabs-deep-copy/DeepCopy/DeepCopy.php',
'PHPUnit\\DeepCopy\\Exception\\CloneException' => '/myclabs-deep-copy/DeepCopy/Exception/CloneException.php',
'PHPUnit\\DeepCopy\\Exception\\PropertyException' => '/myclabs-deep-copy/DeepCopy/Exception/PropertyException.php',
+ 'PHPUnit\\DeepCopy\\Filter\\ChainableFilter' => '/myclabs-deep-copy/DeepCopy/Filter/ChainableFilter.php',
'PHPUnit\\DeepCopy\\Filter\\Doctrine\\DoctrineCollectionFilter' => '/myclabs-deep-copy/DeepCopy/Filter/Doctrine/DoctrineCollectionFilter.php',
'PHPUnit\\DeepCopy\\Filter\\Doctrine\\DoctrineEmptyCollectionFilter' => '/myclabs-deep-copy/DeepCopy/Filter/Doctrine/DoctrineEmptyCollectionFilter.php',
'PHPUnit\\DeepCopy\\Filter\\Doctrine\\DoctrineProxyFilter' => '/myclabs-deep-copy/DeepCopy/Filter/Doctrine/DoctrineProxyFilter.php',
@@ -156,6 +166,7 @@ spl_autoload_register(
'PHPUnit\\Framework\\Constraint\\LogicalXor' => '/phpunit/Framework/Constraint/Operator/LogicalXor.php',
'PHPUnit\\Framework\\Constraint\\ObjectEquals' => '/phpunit/Framework/Constraint/Object/ObjectEquals.php',
'PHPUnit\\Framework\\Constraint\\ObjectHasAttribute' => '/phpunit/Framework/Constraint/Object/ObjectHasAttribute.php',
+ 'PHPUnit\\Framework\\Constraint\\ObjectHasProperty' => '/phpunit/Framework/Constraint/Object/ObjectHasProperty.php',
'PHPUnit\\Framework\\Constraint\\Operator' => '/phpunit/Framework/Constraint/Operator/Operator.php',
'PHPUnit\\Framework\\Constraint\\RegularExpression' => '/phpunit/Framework/Constraint/String/RegularExpression.php',
'PHPUnit\\Framework\\Constraint\\SameSize' => '/phpunit/Framework/Constraint/Cardinality/SameSize.php',
@@ -396,6 +407,7 @@ spl_autoload_register(
'PHPUnit\\PhpParser\\Lexer\\TokenEmulator\\MatchTokenEmulator' => '/nikic-php-parser/PhpParser/Lexer/TokenEmulator/MatchTokenEmulator.php',
'PHPUnit\\PhpParser\\Lexer\\TokenEmulator\\NullsafeTokenEmulator' => '/nikic-php-parser/PhpParser/Lexer/TokenEmulator/NullsafeTokenEmulator.php',
'PHPUnit\\PhpParser\\Lexer\\TokenEmulator\\NumericLiteralSeparatorEmulator' => '/nikic-php-parser/PhpParser/Lexer/TokenEmulator/NumericLiteralSeparatorEmulator.php',
+ 'PHPUnit\\PhpParser\\Lexer\\TokenEmulator\\ReadonlyFunctionTokenEmulator' => '/nikic-php-parser/PhpParser/Lexer/TokenEmulator/ReadonlyFunctionTokenEmulator.php',
'PHPUnit\\PhpParser\\Lexer\\TokenEmulator\\ReadonlyTokenEmulator' => '/nikic-php-parser/PhpParser/Lexer/TokenEmulator/ReadonlyTokenEmulator.php',
'PHPUnit\\PhpParser\\Lexer\\TokenEmulator\\ReverseEmulator' => '/nikic-php-parser/PhpParser/Lexer/TokenEmulator/ReverseEmulator.php',
'PHPUnit\\PhpParser\\Lexer\\TokenEmulator\\TokenEmulator' => '/nikic-php-parser/PhpParser/Lexer/TokenEmulator/TokenEmulator.php',
@@ -906,8 +918,8 @@ spl_autoload_register(
'PHPUnit\\TextUI\\XmlConfiguration\\Migrator' => '/phpunit/TextUI/XmlConfiguration/Migration/Migrator.php',
'PHPUnit\\TextUI\\XmlConfiguration\\MoveAttributesFromFilterWhitelistToCoverage' => '/phpunit/TextUI/XmlConfiguration/Migration/Migrations/MoveAttributesFromFilterWhitelistToCoverage.php',
'PHPUnit\\TextUI\\XmlConfiguration\\MoveAttributesFromRootToCoverage' => '/phpunit/TextUI/XmlConfiguration/Migration/Migrations/MoveAttributesFromRootToCoverage.php',
- 'PHPUnit\\TextUI\\XmlConfiguration\\MoveWhitelistDirectoriesToCoverage' => '/phpunit/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistDirectoriesToCoverage.php',
'PHPUnit\\TextUI\\XmlConfiguration\\MoveWhitelistExcludesToCoverage' => '/phpunit/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistExcludesToCoverage.php',
+ 'PHPUnit\\TextUI\\XmlConfiguration\\MoveWhitelistIncludesToCoverage' => '/phpunit/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistIncludesToCoverage.php',
'PHPUnit\\TextUI\\XmlConfiguration\\PHPUnit' => '/phpunit/TextUI/XmlConfiguration/PHPUnit/PHPUnit.php',
'PHPUnit\\TextUI\\XmlConfiguration\\Php' => '/phpunit/TextUI/XmlConfiguration/PHP/Php.php',
'PHPUnit\\TextUI\\XmlConfiguration\\PhpHandler' => '/phpunit/TextUI/XmlConfiguration/PHP/PhpHandler.php',
@@ -1103,6 +1115,7 @@ spl_autoload_register(
'Prophecy\\Call\\CallCenter' => '/phpspec-prophecy/Prophecy/Call/CallCenter.php',
'Prophecy\\Comparator\\ClosureComparator' => '/phpspec-prophecy/Prophecy/Comparator/ClosureComparator.php',
'Prophecy\\Comparator\\Factory' => '/phpspec-prophecy/Prophecy/Comparator/Factory.php',
+ 'Prophecy\\Comparator\\FactoryProvider' => '/phpspec-prophecy/Prophecy/Comparator/FactoryProvider.php',
'Prophecy\\Comparator\\ProphecyComparator' => '/phpspec-prophecy/Prophecy/Comparator/ProphecyComparator.php',
'Prophecy\\Doubler\\CachedDoubler' => '/phpspec-prophecy/Prophecy/Doubler/CachedDoubler.php',
'Prophecy\\Doubler\\ClassPatch\\ClassPatchInterface' => '/phpspec-prophecy/Prophecy/Doubler/ClassPatch/ClassPatchInterface.php',
@@ -1152,7 +1165,6 @@ spl_autoload_register(
'Prophecy\\Exception\\Prophecy\\ProphecyException' => '/phpspec-prophecy/Prophecy/Exception/Prophecy/ProphecyException.php',
'Prophecy\\PhpDocumentor\\ClassAndInterfaceTagRetriever' => '/phpspec-prophecy/Prophecy/PhpDocumentor/ClassAndInterfaceTagRetriever.php',
'Prophecy\\PhpDocumentor\\ClassTagRetriever' => '/phpspec-prophecy/Prophecy/PhpDocumentor/ClassTagRetriever.php',
- 'Prophecy\\PhpDocumentor\\LegacyClassTagRetriever' => '/phpspec-prophecy/Prophecy/PhpDocumentor/LegacyClassTagRetriever.php',
'Prophecy\\PhpDocumentor\\MethodTagRetrieverInterface' => '/phpspec-prophecy/Prophecy/PhpDocumentor/MethodTagRetrieverInterface.php',
'Prophecy\\Prediction\\CallPrediction' => '/phpspec-prophecy/Prophecy/Prediction/CallPrediction.php',
'Prophecy\\Prediction\\CallTimesPrediction' => '/phpspec-prophecy/Prophecy/Prediction/CallTimesPrediction.php',
@@ -1176,7 +1188,7 @@ spl_autoload_register(
}
if (isset($classes[$class])) {
- require_once 'phar://phpunit-9.5.27.phar' . $classes[$class];
+ require_once 'phar://phpunit-9.6.13.phar' . $classes[$class];
}
},
true,
@@ -1186,6 +1198,7 @@ spl_autoload_register(
foreach (['PHPUnit\\DeepCopy\\DeepCopy' => '/myclabs-deep-copy/DeepCopy/DeepCopy.php',
'PHPUnit\\DeepCopy\\Exception\\CloneException' => '/myclabs-deep-copy/DeepCopy/Exception/CloneException.php',
'PHPUnit\\DeepCopy\\Exception\\PropertyException' => '/myclabs-deep-copy/DeepCopy/Exception/PropertyException.php',
+ 'PHPUnit\\DeepCopy\\Filter\\ChainableFilter' => '/myclabs-deep-copy/DeepCopy/Filter/ChainableFilter.php',
'PHPUnit\\DeepCopy\\Filter\\Doctrine\\DoctrineCollectionFilter' => '/myclabs-deep-copy/DeepCopy/Filter/Doctrine/DoctrineCollectionFilter.php',
'PHPUnit\\DeepCopy\\Filter\\Doctrine\\DoctrineEmptyCollectionFilter' => '/myclabs-deep-copy/DeepCopy/Filter/Doctrine/DoctrineEmptyCollectionFilter.php',
'PHPUnit\\DeepCopy\\Filter\\Doctrine\\DoctrineProxyFilter' => '/myclabs-deep-copy/DeepCopy/Filter/Doctrine/DoctrineProxyFilter.php',
@@ -1263,6 +1276,7 @@ foreach (['PHPUnit\\DeepCopy\\DeepCopy' => '/myclabs-deep-copy/DeepCopy/DeepCopy
'PHPUnit\\Framework\\Constraint\\LogicalXor' => '/phpunit/Framework/Constraint/Operator/LogicalXor.php',
'PHPUnit\\Framework\\Constraint\\ObjectEquals' => '/phpunit/Framework/Constraint/Object/ObjectEquals.php',
'PHPUnit\\Framework\\Constraint\\ObjectHasAttribute' => '/phpunit/Framework/Constraint/Object/ObjectHasAttribute.php',
+ 'PHPUnit\\Framework\\Constraint\\ObjectHasProperty' => '/phpunit/Framework/Constraint/Object/ObjectHasProperty.php',
'PHPUnit\\Framework\\Constraint\\Operator' => '/phpunit/Framework/Constraint/Operator/Operator.php',
'PHPUnit\\Framework\\Constraint\\RegularExpression' => '/phpunit/Framework/Constraint/String/RegularExpression.php',
'PHPUnit\\Framework\\Constraint\\SameSize' => '/phpunit/Framework/Constraint/Cardinality/SameSize.php',
@@ -1503,6 +1517,7 @@ foreach (['PHPUnit\\DeepCopy\\DeepCopy' => '/myclabs-deep-copy/DeepCopy/DeepCopy
'PHPUnit\\PhpParser\\Lexer\\TokenEmulator\\MatchTokenEmulator' => '/nikic-php-parser/PhpParser/Lexer/TokenEmulator/MatchTokenEmulator.php',
'PHPUnit\\PhpParser\\Lexer\\TokenEmulator\\NullsafeTokenEmulator' => '/nikic-php-parser/PhpParser/Lexer/TokenEmulator/NullsafeTokenEmulator.php',
'PHPUnit\\PhpParser\\Lexer\\TokenEmulator\\NumericLiteralSeparatorEmulator' => '/nikic-php-parser/PhpParser/Lexer/TokenEmulator/NumericLiteralSeparatorEmulator.php',
+ 'PHPUnit\\PhpParser\\Lexer\\TokenEmulator\\ReadonlyFunctionTokenEmulator' => '/nikic-php-parser/PhpParser/Lexer/TokenEmulator/ReadonlyFunctionTokenEmulator.php',
'PHPUnit\\PhpParser\\Lexer\\TokenEmulator\\ReadonlyTokenEmulator' => '/nikic-php-parser/PhpParser/Lexer/TokenEmulator/ReadonlyTokenEmulator.php',
'PHPUnit\\PhpParser\\Lexer\\TokenEmulator\\ReverseEmulator' => '/nikic-php-parser/PhpParser/Lexer/TokenEmulator/ReverseEmulator.php',
'PHPUnit\\PhpParser\\Lexer\\TokenEmulator\\TokenEmulator' => '/nikic-php-parser/PhpParser/Lexer/TokenEmulator/TokenEmulator.php',
@@ -2013,8 +2028,8 @@ foreach (['PHPUnit\\DeepCopy\\DeepCopy' => '/myclabs-deep-copy/DeepCopy/DeepCopy
'PHPUnit\\TextUI\\XmlConfiguration\\Migrator' => '/phpunit/TextUI/XmlConfiguration/Migration/Migrator.php',
'PHPUnit\\TextUI\\XmlConfiguration\\MoveAttributesFromFilterWhitelistToCoverage' => '/phpunit/TextUI/XmlConfiguration/Migration/Migrations/MoveAttributesFromFilterWhitelistToCoverage.php',
'PHPUnit\\TextUI\\XmlConfiguration\\MoveAttributesFromRootToCoverage' => '/phpunit/TextUI/XmlConfiguration/Migration/Migrations/MoveAttributesFromRootToCoverage.php',
- 'PHPUnit\\TextUI\\XmlConfiguration\\MoveWhitelistDirectoriesToCoverage' => '/phpunit/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistDirectoriesToCoverage.php',
'PHPUnit\\TextUI\\XmlConfiguration\\MoveWhitelistExcludesToCoverage' => '/phpunit/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistExcludesToCoverage.php',
+ 'PHPUnit\\TextUI\\XmlConfiguration\\MoveWhitelistIncludesToCoverage' => '/phpunit/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistIncludesToCoverage.php',
'PHPUnit\\TextUI\\XmlConfiguration\\PHPUnit' => '/phpunit/TextUI/XmlConfiguration/PHPUnit/PHPUnit.php',
'PHPUnit\\TextUI\\XmlConfiguration\\Php' => '/phpunit/TextUI/XmlConfiguration/PHP/Php.php',
'PHPUnit\\TextUI\\XmlConfiguration\\PhpHandler' => '/phpunit/TextUI/XmlConfiguration/PHP/PhpHandler.php',
@@ -2210,6 +2225,7 @@ foreach (['PHPUnit\\DeepCopy\\DeepCopy' => '/myclabs-deep-copy/DeepCopy/DeepCopy
'Prophecy\\Call\\CallCenter' => '/phpspec-prophecy/Prophecy/Call/CallCenter.php',
'Prophecy\\Comparator\\ClosureComparator' => '/phpspec-prophecy/Prophecy/Comparator/ClosureComparator.php',
'Prophecy\\Comparator\\Factory' => '/phpspec-prophecy/Prophecy/Comparator/Factory.php',
+ 'Prophecy\\Comparator\\FactoryProvider' => '/phpspec-prophecy/Prophecy/Comparator/FactoryProvider.php',
'Prophecy\\Comparator\\ProphecyComparator' => '/phpspec-prophecy/Prophecy/Comparator/ProphecyComparator.php',
'Prophecy\\Doubler\\CachedDoubler' => '/phpspec-prophecy/Prophecy/Doubler/CachedDoubler.php',
'Prophecy\\Doubler\\ClassPatch\\ClassPatchInterface' => '/phpspec-prophecy/Prophecy/Doubler/ClassPatch/ClassPatchInterface.php',
@@ -2259,7 +2275,6 @@ foreach (['PHPUnit\\DeepCopy\\DeepCopy' => '/myclabs-deep-copy/DeepCopy/DeepCopy
'Prophecy\\Exception\\Prophecy\\ProphecyException' => '/phpspec-prophecy/Prophecy/Exception/Prophecy/ProphecyException.php',
'Prophecy\\PhpDocumentor\\ClassAndInterfaceTagRetriever' => '/phpspec-prophecy/Prophecy/PhpDocumentor/ClassAndInterfaceTagRetriever.php',
'Prophecy\\PhpDocumentor\\ClassTagRetriever' => '/phpspec-prophecy/Prophecy/PhpDocumentor/ClassTagRetriever.php',
- 'Prophecy\\PhpDocumentor\\LegacyClassTagRetriever' => '/phpspec-prophecy/Prophecy/PhpDocumentor/LegacyClassTagRetriever.php',
'Prophecy\\PhpDocumentor\\MethodTagRetrieverInterface' => '/phpspec-prophecy/Prophecy/PhpDocumentor/MethodTagRetrieverInterface.php',
'Prophecy\\Prediction\\CallPrediction' => '/phpspec-prophecy/Prophecy/Prediction/CallPrediction.php',
'Prophecy\\Prediction\\CallTimesPrediction' => '/phpspec-prophecy/Prophecy/Prediction/CallTimesPrediction.php',
@@ -2280,7 +2295,7 @@ foreach (['PHPUnit\\DeepCopy\\DeepCopy' => '/myclabs-deep-copy/DeepCopy/DeepCopy
'Prophecy\\Prophet' => '/phpspec-prophecy/Prophecy/Prophet.php',
'Prophecy\\Util\\ExportUtil' => '/phpspec-prophecy/Prophecy/Util/ExportUtil.php',
'Prophecy\\Util\\StringUtil' => '/phpspec-prophecy/Prophecy/Util/StringUtil.php'] as $file) {
- require_once 'phar://phpunit-9.5.27.phar' . $file;
+ require_once 'phar://phpunit-9.6.13.phar' . $file;
}
require __PHPUNIT_PHAR_ROOT__ . '/phpunit/Framework/Assert/Functions.php';
@@ -2304,100 +2319,104 @@ if ($execute) {
}
__HALT_COMPILER(); ?>
-j phpunit-9.5.27.phar L doctrine-instantiator/Doctrine/Instantiator/Exception/ExceptionInterface.php ec b R doctrine-instantiator/Doctrine/Instantiator/Exception/InvalidArgumentException.php ec R doctrine-instantiator/Doctrine/Instantiator/Exception/UnexpectedValueException.php: ec: _Y%[ <