1.2.5

bupy7 · Nov 8, 2018 · 4b85682 · 4b85682
1 parent c5fcbb4
commit 4b85682
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 xml-constrcutor
 ===============
 
+v1.2.5 [2018-11-08]
+-------------------
+
+- Fixed "no tag content" bug.
+
 v1.2.4 [2017-12-06]
 -------------------
 

diff --git a/composer.json b/composer.json
@@ -11,11 +11,11 @@
     "xml maker"
   ],
   "license": "BSD-3-Clause",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "authors": [
     {
-      "name": "Vaseelie Belosloodcev",
-      "email": "bupy765@gmail.com"
+      "name": "Vasily Belosloodcev",
+      "email": "vasily.belosloodcev@gmail.com"
     }
   ],
   "require": {

diff --git a/tests/XmlConstructTest.php b/tests/XmlConstructTest.php
@@ -10,7 +10,7 @@
  */
 class XmlConstructTest extends TestCase
 {
-    protected $in = [
+    private $in1 = [
         [
             'tag' => 'root',
             'elements' => [
@@ -37,8 +37,27 @@ class XmlConstructTest extends TestCase
             ],
         ],
     ];
+    private $in2 = [
+        [
+            'tag' => 'root',
+            'elements' => [
+                [
+                    'tag' => 'tag1',
+                    // 'content' => 'content1', // no content
+                ],
+                [
+                    'tag' => 'tag2',
+                    'content' => 'content2',
+                ],
+                [
+                    'tag' => 'tag3',
+                    // 'content' => 'content3', // no content
+                ],
+            ],
+        ],
+    ];
 
-    public function testDefaultDocument()
+    public function testDefaultDocument1()
     {
         $out1 = <<<XML
 <?xml version="1.0" encoding="UTF-8"?>
@@ -51,10 +70,25 @@ public function testDefaultDocument()
 </root>
 XML;
         $xml = new XmlConstructor;
-        $out2 = $xml->fromArray($this->in)->toOutput();
+        $out2 = $xml->fromArray($this->in1)->toOutput();
         $this->assertEquals($this->prepare($out1), $this->prepare($out2));
     }
-
+
+    public function testDefaultDocument2()
+    {
+        $out1 = <<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+    <tag1/>
+    <tag2>content2</tag2>
+    <tag3/>
+</root>
+XML;
+        $xml = new XmlConstructor;
+        $out2 = $xml->fromArray($this->in2)->toOutput();
+        $this->assertEquals($this->prepare($out1), $this->prepare($out2));
+    }
+
     public function testWithoutStartDocument()
     {
         $out1 = <<<XML
@@ -67,7 +101,7 @@ public function testWithoutStartDocument()
 </root>
 XML;
         $xml = new XmlConstructor(['startDocument' => false]);
-        $out2 = $xml->fromArray($this->in)->toOutput();
+        $out2 = $xml->fromArray($this->in1)->toOutput();
         $this->assertEquals($this->prepare($out1), $this->prepare($out2));
     }
 
@@ -84,7 +118,7 @@ public function testCustomIndentString()
 </root>
 XML;
         $xml = new XmlConstructor(['indentString' => false]);
-        $out2 = $xml->fromArray($this->in)->toOutput();
+        $out2 = $xml->fromArray($this->in1)->toOutput();
         $this->assertEquals($this->prepare($out1), $this->prepare($out2));
     }
 
@@ -97,8 +131,12 @@ public function testError()
         $out2 = $xml->fromArray(['incorrect' => 'array'])->toOutput();
         $this->assertEquals($this->prepare($out1), $this->prepare($out2));
     }
-
-    protected function prepare($xml)
+
+    /**
+     * @param string $xml
+     * @return string
+     */
+    private function prepare($xml)
     {
         return preg_replace('/\s/', '', $xml);
     }