refactor Utils class,

update/add unit tests

Author: mikaelcom

Tests/UtilsTest.php

@@ -21,18 +21,18 @@ public function testGetFormatedXmlAsDomDocument()
         $this->assertInstanceOf('\DOMDocument', Utils::getFormatedXml(file_get_contents(__DIR__ . '/resources/oneline.xml'), true));
     }
     /**
-     *
+     * @expectedException \InvalidArgumentException
      */
     public function testGetFormatedXmlEmptyStringAsString()
     {
-        $this->assertSame('', Utils::getFormatedXml(''));
+        Utils::getFormatedXml('');
     }
     /**
-     *
+     * @expectedException \InvalidArgumentException
      */
     public function testGetFormatedXmlEmptyStringAsDomDocument()
     {
-        $this->assertSame(null, Utils::getFormatedXml('', true));
+        Utils::getFormatedXml('', true);
     }
     /**
      * @expectedException \InvalidArgumentException
@@ -41,4 +41,18 @@ public function testGetFormatedXmlInvalidXmlAsDomDocument()
     {
         Utils::getFormatedXml('<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:img="http://ws.estesexpress.com/imageview" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://ws.estesexpress.com/imageview" xml:lang="en"><root>', true);
     }
+    /**
+     *
+     */
+    public function testGetDOMDocument()
+    {
+        $this->assertInstanceOf('\\DOMDocument', Utils::getDOMDocument(file_get_contents(__DIR__ . '/resources/oneline.xml')));
+    }
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testGetDOMDocumentException()
+    {
+        $this->assertInstanceOf('\\DOMDocument', Utils::getDOMDocument(''));
+    }
 }

Utils.php

@@ -6,31 +6,34 @@ class Utils
 {
     /**
      * Returns a XML string content as a DOMDocument or as a formated XML string
-     * @uses \DOMDocument::loadXML()
-     * @uses \DOMDocument::saveXML()
+     * @throws \InvalidArgumentException
      * @param string $string
-     * @param bool $asDomDocument
-     * @return \DOMDocument|string|null
+     * @param string $asDomDocument
+     * @return \DOMDocument|null
      */
     public static function getFormatedXml($string, $asDomDocument = false)
     {
-        $dom = null;
-        $formated = $string;
-        if (!empty($string) && class_exists('\DOMDocument')) {
-            $dom = new \DOMDocument('1.0', 'UTF-8');
-            $dom->formatOutput = true;
-            $dom->preserveWhiteSpace = false;
-            $dom->resolveExternals = false;
-            $dom->substituteEntities = false;
-            $dom->validateOnParse = false;
-            try {
-                if ($dom->loadXML($string)) {
-                    $formated = $dom->saveXML();
-                }
-            } catch (\Exception $exception) {
-                throw new \InvalidArgumentException('XML string is invalid', $exception->getCode(), $exception);
-            }
+        $domDocument = self::getDOMDocument($string);
+        return $asDomDocument ? $domDocument : $domDocument->saveXML();
+    }
+    /**
+     * @param string $string
+     * @throws \InvalidArgumentException
+     * @return \DOMDocument
+     */
+    public static function getDOMDocument($string)
+    {
+        $dom = new \DOMDocument('1.0', 'UTF-8');
+        $dom->formatOutput = true;
+        $dom->preserveWhiteSpace = false;
+        $dom->resolveExternals = false;
+        $dom->substituteEntities = false;
+        $dom->validateOnParse = false;
+        try {
+            $dom->loadXML($string);
+        } catch (\Exception $exception) {
+            throw new \InvalidArgumentException('XML string is invalid', $exception->getCode(), $exception);
         }
-        return $asDomDocument ? $dom : $formated;
+        return $dom;
     }
 }