Merge pull request #106 from horstoeko/Issue_104

#104 Use LibXML Internal errors in ProfileResolver
horstoeko · Sep 4, 2024 · d967bfe · d967bfe
2 parents 164e57a + c05d6d4
commit d967bfe
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -4,16 +4,17 @@
 [![PHP version](https://img.shields.io/packagist/php-v/horstoeko/zugferd.svg?style=plastic)](https://packagist.org/packages/horstoeko/zugferd)
 [![License](https://img.shields.io/packagist/l/horstoeko/zugferd.svg?style=plastic)](https://packagist.org/packages/horstoeko/zugferd)
 
+<!--
 [![CI](https://github.com/horstoeko/zugferd/actions/workflows/build.ci.yml/badge.svg)](https://github.com/horstoeko/zugferd/actions/workflows/build.ci.yml)
+-->
 
-<!--
 [![CI (Ant, PHP 7.3)](https://github.com/horstoeko/zugferd/actions/workflows/build.php73.ant.yml/badge.svg)](https://github.com/horstoeko/zugferd/actions/workflows/build.php73.ant.yml)
 [![CI (Ant, PHP 7.4)](https://github.com/horstoeko/zugferd/actions/workflows/build.php74.ant.yml/badge.svg)](https://github.com/horstoeko/zugferd/actions/workflows/build.php74.ant.yml)
 [![CI (PHP 8.0)](https://github.com/horstoeko/zugferd/actions/workflows/build.php80.ant.yml/badge.svg)](https://github.com/horstoeko/zugferd/actions/workflows/build.php80.ant.yml)
 [![CI (PHP 8.1)](https://github.com/horstoeko/zugferd/actions/workflows/build.php81.ant.yml/badge.svg)](https://github.com/horstoeko/zugferd/actions/workflows/build.php81.ant.yml)
 [![CI (PHP 8.2)](https://github.com/horstoeko/zugferd/actions/workflows/build.php82.ant.yml/badge.svg)](https://github.com/horstoeko/zugferd/actions/workflows/build.php82.ant.yml)
 [![CI (PHP 8.3)](https://github.com/horstoeko/zugferd/actions/workflows/build.php83.ant.yml/badge.svg)](https://github.com/horstoeko/zugferd/actions/workflows/build.php83.ant.yml)
--->
+
 
 ## Table of Contents
 

diff --git a/src/ZugferdProfileResolver.php b/src/ZugferdProfileResolver.php
@@ -9,6 +9,7 @@
 
 namespace horstoeko\zugferd;
 
+use Throwable;
 use SimpleXMLElement;
 use horstoeko\zugferd\ZugferdProfiles;
 use horstoeko\zugferd\exception\ZugferdUnknownProfileException;
@@ -34,11 +35,18 @@ class ZugferdProfileResolver
      */
     public static function resolve(string $xmlContent): array
     {
+        $prevUseInternalErrors = \libxml_use_internal_errors(true);
+
         try {
             $xmldocument = new SimpleXMLElement($xmlContent);
             $typeelement = $xmldocument->xpath('/rsm:CrossIndustryInvoice/rsm:ExchangedDocumentContext/ram:GuidelineSpecifiedDocumentContextParameter/ram:ID');
-        } catch (\Throwable $e) {
+            if (libxml_get_last_error()) {
+                throw new ZugferdUnknownXmlContentException();
+            }
+        } catch (Throwable $e) {
             throw new ZugferdUnknownXmlContentException();
+        } finally {
+            libxml_use_internal_errors($prevUseInternalErrors);
         }
 
         if (!is_array($typeelement) || !isset($typeelement[0])) {

diff --git a/tests/assets/invalid2.xml b/tests/assets/invalid2.xml
@@ -0,0 +1 @@
+Bad XML
diff --git a/tests/testcases/issues/Issue104Test.php b/tests/testcases/issues/Issue104Test.php
@@ -12,12 +12,25 @@ class Issue104Test extends TestCase
      * @return void
      * @issue 104
      */
-    public function testInvalidException()
+    public function testInvalidException1()
     {
         $this->expectException(ZugferdUnknownXmlContentException::class);
 
         $document = ZugferdDocumentReader::readAndGuessFromFile(dirname(__FILE__) . '/../../assets/invalid.xml');
 
         $this->assertNull($document);
     }
+
+    /**
+     * @return void
+     * @issue 104
+     */
+    public function testInvalidException2()
+    {
+        $this->expectException(ZugferdUnknownXmlContentException::class);
+
+        $document = ZugferdDocumentReader::readAndGuessFromFile(dirname(__FILE__) . '/../../assets/invalid2.xml');
+
+        $this->assertNull($document);
+    }
 }