2.0.2

Author: bupy7

CHANGELOG.md

@@ -1,6 +1,12 @@
 xml-constrcutor
 ===
 
+v2.0.2 [2023-01-07]
+---
+
+- Added some tests.
+- Small fixes and improvements.
+
 v2.0.1 [2023-01-07]
 ---
 

src/XmlConstructor.php

@@ -57,11 +57,15 @@
 class XmlConstructor
 {
     /**
-     * @var boolean
+     * @var bool
      */
     private $flushed = false;
     /**
-     * @var boolean
+     * @var bool
+     */
+    private $made = false;
+    /**
+     * @var bool
      */
     private $hasDocumentStart = false;
     /**
@@ -140,6 +144,12 @@ public function __construct(array $config = [])
      */
     public function fromArray(array $in)
     {
+        if ($this->made) {
+            throw new RuntimeException('XML document is made already.');
+        }
+
+        $this->made = true;
+
         if ($this->flushed) {
             throw new RuntimeException('The constructor is closed. You have to create new one to create an XML document'
                 . ' again.');

tests/XmlConstructTest.php

@@ -5,8 +5,6 @@
 use bupy7\xml\constructor\RuntimeException;
 use bupy7\xml\constructor\XmlConstructor;
 
-use function preg_replace;
-
 /**
  * @since 1.2.1
  */
@@ -112,6 +110,20 @@ public function testDefaultDocument2()
         $this->assertEquals($expected, $out);
     }
 
+    /**
+     * @since 2.0.2
+     */
+    public function testDefaultDocument3()
+    {
+        $expected = <<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+
+XML;
+        $xml = new XmlConstructor();
+        $out = $xml->toOutput();
+        $this->assertEquals($expected, $out);
+    }
+
     /**
      * @since 2.0.1
      */
@@ -247,10 +259,11 @@ public function testCdataContent()
     <tag1><![CDATA[<b>content1</b>]]></tag1>
     <tag2>content2</tag2>
 </root>
+
 XML;
         $xml = new XmlConstructor();
         $out = $xml->fromArray($this->in3)->toOutput();
-        $this->assertEquals($this->prepare($expected), $this->prepare($out));
+        $this->assertEquals($expected, $out);
     }
 
     /**
@@ -260,73 +273,81 @@ public function testInvalidConfiguration()
     {
         $expected = <<<XML
 <?xml version="1.0" encoding="UTF-8"?>
+
 XML;
         $xml = new XmlConstructor();
         $out = $xml->fromArray(['incorrect' => 'array'])->toOutput();
-        $this->assertEquals($this->prepare($expected), $this->prepare($out));
+        $this->assertEquals($expected, $out);
     }
 
     /**
-     * @since 2.0.0
+     * @since 2.0.2
      */
-    public function testDoubleToOutput()
+    public function testDoubleToOutput1()
     {
-        $expected = <<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-    <tag1 attr1="val1" attr2="val2"/>
-    <tag2>content2</tag2>
-    <tag3>
-        <tag4>content4</tag4>
-    </tag3>
-</root>
-XML;
         $xml = new XmlConstructor();
 
-        $out = $xml->fromArray($this->in1)->toOutput();
-        $this->assertEquals($this->prepare($expected), $this->prepare($out));
+        $xml->fromArray($this->in1)->toOutput();
 
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('The constructor is closed. You have to create new one to flush its again.');
         $xml->toOutput();
     }
 
     /**
-     * @since 2.0.0
+     * @since 2.0.2
      */
-    public function testDoubleFromArray()
+    public function testDoubleToOutput2()
     {
-        $expected = <<<XML
-<?xml version="1.1" encoding="ASCII"?>
-<root>
- <tag1 attr1="val1" attr2="val2"/>
- <tag2>content2</tag2>
- <tag3>
-  <tag4>content4</tag4>
- </tag3>
-</root>
+        $xml = new XmlConstructor();
 
-XML;
-        $xml = new XmlConstructor([
-            'startDocument' => ['1.1', 'ASCII'],
-            'indentString' => ' ',
-        ]);
+        $xml->toOutput();
 
-        $out = $xml->fromArray($this->in1)->toOutput();
-        $this->assertEquals($expected, $out);
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('The constructor is closed. You have to create new one to flush its again.');
+        $xml->toOutput();
+    }
+
+    /**
+     * @since 2.0.2
+     */
+    public function testDoubleFromArray1()
+    {
+        $xml = new XmlConstructor();
+
+        $xml->fromArray($this->in1);
 
         $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('The constructor is closed. You have to create new one to create '
-            . 'an XML document again.');
+        $this->expectExceptionMessage('XML document is made already.');
         $xml->fromArray($this->in1);
     }
 
     /**
-     * @param string $xml
-     * @return string
+     * @since 2.0.2
      */
-    private function prepare($xml)
+    public function testDoubleFromArray2()
     {
-        return preg_replace('/\s/', '', $xml);
+        $xml = new XmlConstructor();
+
+        $xml->fromArray($this->in1)->toOutput();
+
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('XML document is made already.');
+        $xml->fromArray($this->in1);
+    }
+
+    /**
+     * @since 2.0.3
+     */
+    public function testDoubleFromArray3()
+    {
+        $xml = new XmlConstructor();
+
+        $xml->toOutput();
+
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('The constructor is closed. You have to create new one to create an XML '
+            . 'document again.');
+        $xml->fromArray($this->in1);
     }
 }