Show error to user when XML is invalid and the reason why it is invalid

mantas-done · Aug 4, 2023 · ddb1028 · ddb1028
1 parent d05a340
commit ddb1028
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Code/Converters/TtmlConverter.php b/src/Code/Converters/TtmlConverter.php
@@ -2,6 +2,8 @@
 
 namespace Done\Subtitles\Code\Converters;
 
+use Done\Subtitles\Code\UserException;
+
 class TtmlConverter implements ConverterContract
 {
     public function canParseFileContent($file_content)
@@ -11,8 +13,14 @@ public function canParseFileContent($file_content)
 
     public function fileContentToInternalFormat($file_content)
     {
+        libxml_use_internal_errors(true);
         $dom = new \DOMDocument();
-        @$dom->loadXML($file_content);
+        $dom->loadXML($file_content);
+
+        $errors = libxml_get_errors();
+        if (!empty($errors)) {
+            throw new UserException('Invalid XML: ' . trim($errors[0]->message));
+        }
 
         $fps = self::framesPerSecond($dom);
 

diff --git a/tests/formats/TtmlTest.php b/tests/formats/TtmlTest.php
@@ -4,6 +4,7 @@
 
 use Done\Subtitles\Code\Converters\TtmlConverter;
 use Done\Subtitles\Code\Helpers;
+use Done\Subtitles\Code\UserException;
 use Done\Subtitles\Subtitles;
 use PHPUnit\Framework\TestCase;
 use Helpers\AdditionalAssertionsTrait;
@@ -65,6 +66,8 @@ public function testParses2()
 
     public function testDuplicatedElementIdsParse()
     {
+        $this->expectException(UserException::class);
+
         $ttml_path = './tests/files/ttml_with_duplicated_element_ids.ttml';
         $actual = Subtitles::loadFromFile($ttml_path)->getInternalFormat();
         $expected = (new Subtitles())
@@ -77,6 +80,8 @@ public function testDuplicatedElementIdsParse()
 
     public function testTimeParseWithFpsAndMultiplierGiven()
     {
+        $this->expectException(UserException::class);
+
         $ttml_path = './tests/files/ttml_with_fps_and_multiplier_given.ttml';
         $actual = Subtitles::loadFromFile($ttml_path)->getInternalFormat();
         $expected = (new Subtitles())