Elements with attributes, but without values are no longer ignored

runz0rd · Oct 25, 2016 · 7209ed1 · 7209ed1
1 parent 43caf90
commit 7209ed1
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 2 deletions.
diff --git a/src/Mapper/XmlModelMapper.php b/src/Mapper/XmlModelMapper.php
@@ -94,8 +94,8 @@ protected function domNodeToObject(\DOMNode $domElement) {
         $object = new \stdClass();
         $result = null;
 
-        $this->mapAttributes($domElement, $object);
-        $this->mapNamespaces($domElement, $object);
+        $result = $this->mapAttributes($domElement, $object);
+        $result = $this->mapNamespaces($domElement, $object);
 
         for($i = 0; $i < $domElement->childNodes->length; $i++) {
             $element = $domElement->childNodes->item($i);
@@ -125,6 +125,8 @@ protected function mapAttributes(\DOMNode $domElement, $object) {
             $value = $domElement->attributes->item($i)->nodeValue;
             $object->$attributesKey[$key] = $value;
         }
+
+        return $object;
     }
 
     /**
@@ -142,6 +144,8 @@ protected function mapNamespaces(\DOMNode $domElement, $object) {
         foreach($newNamespaces as $key => $value) {
             $object->$attributesKey[$key] = $value;
         }
+
+        return $object;
     }
 
     /**

diff --git a/tests/Mapper/XmlModelMapperTest.php b/tests/Mapper/XmlModelMapperTest.php
@@ -70,6 +70,8 @@ public function validValues() {
         $model->xml = new XmlTestModel();
         $model->xml->attributeTest = 'attribute';
         $model->xml->value = 'nodeValue';
+        $model->xmlWithoutValue = new XmlTestWithoutValue();
+        $model->xmlWithoutValue->attributeTest = 'attribute';
 
         $xml = Xml::loadFromFile(__DIR__ . '/xml/valid_testModel.xml');
 

diff --git a/tests/Mapper/xml/valid_testModel.xml b/tests/Mapper/xml/valid_testModel.xml
@@ -127,4 +127,5 @@
     <alwaysRequiredBoolean>false</alwaysRequiredBoolean>
     <multipleRequiredInteger>5</multipleRequiredInteger>
     <xml attributeTest="attribute">nodeValue</xml>
+    <xmlWithoutValue attributeTest="attribute"/>
 </testModel>
diff --git a/tests/TestModel.php b/tests/TestModel.php
@@ -134,4 +134,9 @@ class TestModel {
      * @var XmlTestModel
      */
     public $xml;
+
+    /**
+     * @var XmlTestWithoutValue
+     */
+    public $xmlWithoutValue;
 }
diff --git a/tests/XmlTestWithoutValue.php b/tests/XmlTestWithoutValue.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Created by PhpStorm.
+ * User: milos.pejanovic
+ * Date: 7/31/2016
+ * Time: 9:49 AM
+ */
+use Traits\MappableTrait;
+use Traits\ConvertibleTrait;
+use Traits\ValidatableTrait;
+
+class XmlTestWithoutValue {
+    use MappableTrait;
+    use ConvertibleTrait;
+    use ValidatableTrait;
+
+    /**
+     * @xmlAttribute
+     */
+    public $attributeTest;
+}