From a6f7c6bec4dd4458e4359d18997812f110af5a99 Mon Sep 17 00:00:00 2001 From: Toon Verwerft Date: Tue, 9 Sep 2025 12:35:56 +0200 Subject: [PATCH 1/2] Revert mb_trim to trim for broader PHP support --- src/Documentation/StandardDocumentationReader.php | 2 +- src/SchemaReader.php | 4 ++-- src/Utils/UrlUtils.php | 2 +- tests/ElementsTest.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Documentation/StandardDocumentationReader.php b/src/Documentation/StandardDocumentationReader.php index 634e5f7d..da45da70 100644 --- a/src/Documentation/StandardDocumentationReader.php +++ b/src/Documentation/StandardDocumentationReader.php @@ -31,6 +31,6 @@ public function get(\DOMElement $node): string } $doc = preg_replace('/[\t ]+/', ' ', $doc); - return mb_trim($doc); + return trim($doc); } } diff --git a/src/SchemaReader.php b/src/SchemaReader.php index 52c18346..76dbf2d4 100644 --- a/src/SchemaReader.php +++ b/src/SchemaReader.php @@ -110,7 +110,7 @@ private function extractErrorMessage(): \Exception $errors = []; foreach (libxml_get_errors() as $error) { - $errors[] = sprintf("Error[%s] code %s: %s in '%s' at position %s:%s", $error->level, $error->code, mb_trim($error->message), $error->file, $error->line, $error->column); + $errors[] = sprintf("Error[%s] code %s: %s in '%s' at position %s:%s", $error->level, $error->code, trim($error->message), $error->file, $error->line, $error->column); } $e = new \Exception(implode('; ', $errors)); libxml_use_internal_errors(false); @@ -1244,7 +1244,7 @@ private function loadImport( private function createOrUseSchemaForNs(Schema $schema, string $namespace): Schema { - if ('' !== mb_trim($namespace)) { + if ('' !== trim($namespace)) { $newSchema = new Schema(); $newSchema->addSchema($this->getGlobalSchema()); $schema->addSchema($newSchema); diff --git a/src/Utils/UrlUtils.php b/src/Utils/UrlUtils.php index b9fdd5ec..b449cf7f 100644 --- a/src/Utils/UrlUtils.php +++ b/src/Utils/UrlUtils.php @@ -8,7 +8,7 @@ class UrlUtils { public static function resolveRelativeUrl(string $base, string $rel): string { - if ('' === mb_trim($rel)) { + if ('' === trim($rel)) { return $base; } diff --git a/tests/ElementsTest.php b/tests/ElementsTest.php index 7fdf1060..5ba6961c 100644 --- a/tests/ElementsTest.php +++ b/tests/ElementsTest.php @@ -218,7 +218,7 @@ public function testDefaultSchemaQualificationInheritance(): void self::assertTrue($schema->getElementsQualification()); /** - * @var $element ElementSingle + * @var ElementSingle $element */ $element = $myType->getElements()[0]; self::assertTrue($element->isQualified()); From 1e2ac1914a2c149f6a99432eef46fc35ef286c05 Mon Sep 17 00:00:00 2001 From: Github Actions Bot <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Sep 2025 10:41:44 +0000 Subject: [PATCH 2/2] Update code coverage badge --- clover.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/clover.xml b/clover.xml index b4c53a82..7c7a5f66 100644 --- a/clover.xml +++ b/clover.xml @@ -1,6 +1,6 @@ - - + + @@ -639,7 +639,7 @@ - + @@ -684,7 +684,7 @@ - + @@ -693,7 +693,7 @@ - + @@ -883,7 +883,7 @@ - + @@ -891,7 +891,7 @@ - + @@ -1502,7 +1502,7 @@ - + @@ -1558,6 +1558,6 @@ - +