Merge pull request #23 from hordijk/handleNullForGetFormatedXml

Add support to invoke getLastRequest without throwing an InvalidArgumentException if the request is not executed - Fix for #22

Author: mikaelcom

src/Utils.php

@@ -9,12 +9,15 @@ class Utils
      * @throws \InvalidArgumentException
      * @param string $string
      * @param bool $asDomDocument
-     * @return \DOMDocument|null
+     * @return \DOMDocument|string|null
      */
     public static function getFormatedXml($string, $asDomDocument = false)
     {
-        $domDocument = self::getDOMDocument($string);
-        return $asDomDocument ? $domDocument : $domDocument->saveXML();
+        if (!is_null($string)) {
+            $domDocument = self::getDOMDocument($string);
+            return $asDomDocument ? $domDocument : $domDocument->saveXML();
+        }
+        return null;
     }
     /**
      * @param string $string

tests/UtilsTest.php

@@ -41,6 +41,20 @@ 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 testGetFormatedXmlNullAsString()
+    {
+        $this->assertNull(Utils::getFormatedXml(null));
+    }
+    /**
+     *
+     */
+    public function testGetFormatedXmlNullAsDomDocument()
+    {
+        $this->assertNull(Utils::getFormatedXml(null, true));
+    }
     /**
      *
      */