Merge pull request #41 from wikimedia/svg-warnings

Tweak XML warning handling

src/Exception/SvgLoadException.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace App\Exception;
+
+use Exception;
+use Throwable;
+
+/**
+ * For errors during SVG file loading and parsing
+ * Accepts custom error messages or uses last system error from LibXML
+ */
+class SvgLoadException extends Exception
+{
+    public function __construct(string $message = '', ?Throwable $previous = null)
+    {
+        $error = error_get_last();
+        if ($error && isset($error['message'])) {
+            $message = $error['message'];
+        }
+        parent::__construct($message, 0, $previous);
+    }
+}

src/Model/Svg/SvgFile.php

@@ -10,6 +10,7 @@
 
 namespace App\Model\Svg;
 
+use App\Exception\SvgLoadException;
 use DOMDocument;
 use DOMElement;
 use DOMNode;
@@ -57,7 +58,7 @@ class SvgFile
      * Construct an SvgFile object.
      *
      * @param string $path
-     * @todo Handle DOM warnings
+     * @throws SvgLoadException
      */
     public function __construct(string $path)
     {
@@ -66,10 +67,10 @@ public function __construct(string $path)
         $this->document = new DOMDocument('1.0');
 
         // Warnings need to be suppressed in case there are DOM warnings
-        //wfSuppressWarnings();
-        $this->document->load($path);
+        if (!$this->document->load($path, LIBXML_NOWARNING)) {
+            throw new SvgLoadException();
+        }
         $this->xpath = new DOMXpath($this->document);
-        //wfRestoreWarnings();
 
         $this->xpath->registerNamespace('svg', 'http://www.w3.org/2000/svg');