Merge branch 'sonarcloud-review'

phpcfdi · Jan 16, 2024 · 2c3e88d · 2c3e88d
2 parents b1d4e39 + 609e190
commit 2c3e88d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -10,7 +10,7 @@ on:
 jobs:
 
   tests-coverage:
-    name: Tests on PHP 8.0 (code coverage)
+    name: Tests on PHP 8.3 (code coverage)
     runs-on: "ubuntu-latest"
     steps:
       - name: Checkout

diff --git a/src/Internal/XmlNamespaceMethodsTrait.php b/src/Internal/XmlNamespaceMethodsTrait.php
@@ -62,7 +62,7 @@ private function isNamespaceReserved(string $namespace): bool
             XmlConstants::NAMESPACE_XMLNS,  // xml namespace allocation
             XmlConstants::NAMESPACE_XSI,    // xml schema instance
         ];
-        return (in_array($namespace, $reservedNameSpaces, true));
+        return in_array($namespace, $reservedNameSpaces, true);
     }
 
     private function isNamespaceRelatedToSat(string $namespace): bool

diff --git a/src/XmlDocumentCleaners/RemoveUnusedNamespaces.php b/src/XmlDocumentCleaners/RemoveUnusedNamespaces.php
@@ -80,14 +80,14 @@ private function hasElementsOnNamespace(string $namespace, string $prefix): bool
         $elements = $this->xpath->query(
             sprintf('(//*[namespace-uri()="%1$s" and name()=concat("%2$s", local-name())])[1]', $namespace, $prefix),
         );
-        return (false !== $elements && $elements->length > 0);
+        return false !== $elements && $elements->length > 0;
     }
 
     private function hasAttributesOnNamespace(string $namespace, string $prefix): bool
     {
         $elements = $this->xpath->query(
             sprintf('(//@*[namespace-uri()="%1$s" and name()=concat("%2$s", local-name())])[1]', $namespace, $prefix),
         );
-        return (false !== $elements && $elements->length > 0);
+        return false !== $elements && $elements->length > 0;
     }
 }
diff --git a/src/XmlDocumentCleaners/RenameElementAddPrefix.php b/src/XmlDocumentCleaners/RenameElementAddPrefix.php
@@ -34,8 +34,8 @@ public function clean(DOMDocument $document): void
         }
 
         // Remove redundant namespace declarations
+        // We are using saveXML and loadXML because normalizeDocument method doesn't seem to reset the namespaces;
         $document->loadXML($document->saveXML() ?: '', LIBXML_NSCLEAN | LIBXML_PARSEHUGE);
-        // $document->normalizeDocument();
     }
 
     private function cleanElement(DOMElement $element): void