Merge pull request #14 from dutchenkoOleg/master

htmlOpenTag and htmlCloseTag

Author: OlehDutchenko

src/WezomAgency/R2D2.php

@@ -234,29 +234,43 @@ protected function getNonRepeatingId ($id, $number = null) {
      * @param string $id
      * @return string
      */
-    public function nonRepeatingId($id) {
+    public function nonRepeatingId ($id) {
         return $this->getNonRepeatingId($id);
     }
 
     /**
      * @param string $tag
      * @param array $attrs
-     * @param array $html
-     * @param bool $closeTag
      * @return string
      */
-    public function htmlElement ($tag, $attrs = [], $html = [], $closeTag = true) {
-        $element = '';
+    public function htmlOpenTag (string $tag, $attrs = []) {
         if (count($attrs)) {
-            $element = '<' . $tag . ' ' . $this->attrs($attrs) . '>';
-        } else {
-            $element = '<' . $tag . '>';
+            return '<' . $tag . ' ' . $this->attrs($attrs) . '>';
         }
+        return '<' . $tag . '>';
+    }
 
+    /**
+     * @param string $tag
+     * @return string
+     */
+    public function htmlCloseTag (string $tag)
+    {
+        return '</' . $tag . '>';
+    }
+
+    /**
+     * @param string $tag
+     * @param array $attrs
+     * @param array $html
+     * @param bool $closeTag
+     * @return string
+     */
+    public function htmlElement (string $tag, $attrs = [], $html = [], $closeTag = true) {
         if ($closeTag) {
-            $element = $element . implode(' ', $html) . '</' . $tag . '>';
+            return $this->htmlOpenTag($tag, $attrs) . implode(' ', $html) . $this->htmlCloseTag($tag);
         }
-        return $element;
+        return $this->htmlOpenTag($tag, $attrs);
     }
 
     /**