Merge pull request #187 from alexdebril/issue/186

Issue/186
alexdebril · Jun 22, 2018 · 0a64aeb · 0a64aeb
2 parents ed66d0f + 3f5284a
commit 0a64aeb
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 18 deletions.
diff --git a/src/FeedIo/Rule/Atom/Author.php b/src/FeedIo/Rule/Atom/Author.php
@@ -39,11 +39,13 @@ public function setProperty(NodeInterface $node, \DOMElement $element) : void
      */
     protected function addElement(\DomDocument $document, \DOMElement $rootElement, NodeInterface $node) : void
     {
-        $element = $document->createElement(static::NODE_NAME);
-        $element->appendChild($document->createElement('name', $node->getAuthor()->getName()));
-        $element->appendChild($document->createElement('uri', $node->getAuthor()->getUri()));
-        $element->appendChild($document->createElement('email', $node->getAuthor()->getEmail()));
+        if ($node instanceof ItemInterface ) {
+            $element = $document->createElement(static::NODE_NAME);
+            $this->appendNonEmptyChild($document, $element, 'name', $node->getAuthor()->getName());
+            $this->appendNonEmptyChild($document, $element, 'uri', $node->getAuthor()->getUri());
+            $this->appendNonEmptyChild($document, $element, 'email', $node->getAuthor()->getEmail());
 
-        $rootElement->appendChild($element);
+            $rootElement->appendChild($element);
+        }
     }
 }
diff --git a/src/FeedIo/Rule/Atom/Category.php b/src/FeedIo/Rule/Atom/Category.php
@@ -44,17 +44,4 @@ public function createCategoryElement(\DomDocument $document, CategoryInterface
 
         return $element;
     }
-
-    /**
-     * Sets the attribute only if the value is not emtpy
-     * @param DomElement $element
-     * @param string     $name
-     * @param string     $value
-     */
-    protected function setNonEmptyAttribute(\DomElement $element, string $name, string $value = null) : void
-    {
-        if (! is_null($value)) {
-            $element->setAttribute($name, $value);
-        }
-    }
 }
diff --git a/src/FeedIo/RuleAbstract.php b/src/FeedIo/RuleAbstract.php
@@ -80,6 +80,33 @@ public function apply(\DomDocument $document, \DOMElement $rootElement, NodeInte
         }
     }
 
+    /**
+     * Sets the attribute only if the value is not empty
+     * @param DomElement $element
+     * @param string     $name
+     * @param string     $value
+     */
+    protected function setNonEmptyAttribute(\DomElement $element, string $name, string $value = null) : void
+    {
+        if (! is_null($value)) {
+            $element->setAttribute($name, $value);
+        }
+    }
+
+    /**
+     * Appends a child node only if the value is not null
+     * @param DomDocument $document
+     * @param DOMElement  $element
+     * @param string      $name
+     * @param string      $value
+     */
+    protected function appendNonEmptyChild(\DomDocument $document, \DOMElement $element, string $name, string $value = null) : void
+    {
+        if (! is_null($value)) {
+            $element->appendChild($document->createElement($name, $value));
+        }
+    }
+
     /**
      * Sets the accurate $item property according to the DomElement content
      *