DOM improvement

Author: Wazabii

Dom/Document.php

@@ -4,7 +4,6 @@
  * @Author: 	Daniel Ronkainen
  * @Licence: 	The MIT License (MIT), Copyright © Daniel Ronkainen
  				Don't delete this comment, its part of the license.
- * @Version: 	1.0.0
  */
 
 namespace PHPFuse\Output\Dom;
@@ -15,10 +14,9 @@ class Document {
 		"meta", "link", "img", "br", "hr", "input", "keygen", "param", "source", "track", "embed"
 	];
 
-	private $html;
 	protected $elements;
+	private $html;
 	private $el;
-
 	private static $inst;
 
 	/**
@@ -135,6 +133,7 @@ function __toString() {
 		return $this->get();
 	}
 
+
 	/**
 	 * Build document
 	 * @param  array         $arr  elements
@@ -143,22 +142,16 @@ function __toString() {
 	private function build(array $arr, ?callable $call = NULL) {
 		foreach($arr as $k => $a) {
 			$hasNoEnding = in_array($a->getEl(), $this::TAG_NO_ENDING);
-
 			if(!is_null($call)) $call($a, $k, $hasNoEnding);
 
-			$this->html .= "\t<".$a->getEl().$a->buildAttr().">";
+			if(!$a->hideTagValid()) $this->html .= "\t<".$a->getEl().$a->buildAttr().">";
 			if(!$hasNoEnding) $this->html .= $a->getValue();
 			if(isset($a->elements)) {
 				$this->build($a->elements, $call);
 			}
-			if(!$hasNoEnding) $this->html .= "</".$a->getEl().">\n";
-			if($hasNoEnding) $this->html .= "\n";
+			if(!$hasNoEnding && !$a->hideTagValid()) $this->html .= "</".$a->getEl().">\n";
+			if($hasNoEnding && !$a->hideTagValid()) $this->html .= "\n";
 		}
 	}
 
 }
-
-
-
-
-?>

Dom/Element.php

@@ -19,6 +19,7 @@ class Element extends Document {
 	private $snippet;
 	private $value;
 	private $node;
+	private $hideEmptyTag = false;
 
 
 	function __construct(string $el, ?string $value, bool $snippet = false) {
@@ -59,24 +60,55 @@ function attrArr(?array $arr) {
 		return $this;
 	}
 
-	function attrAddTo(string $key, string $value, string $sep = " ") {
-		
+	/**
+	 * Hide html tag if its value is empty
+	 * @param  bool   $bool
+	 * @return self
+	 */
+	function hideEmptyTag(bool $bool): self
+	{
+		$this->hideEmptyTag = $bool;
+		return $this;
+	}
 
+	/**
+	 * Validate hide tag value
+	 * @return bool
+	 */
+	protected function hideTagValid(): bool 
+	{
+		return (bool)(($this->hideEmptyTag && !$this->value));
+	}
+	
+	/**
+	 * Add value to attr
+	 * @param  string $key
+	 * @param  string $value
+	 * @param  string $sep
+	 * @return self
+	 */
+	function attrAdd(string $key, string $value, string $sep = " "): self 
+	{
 		if(isset($this->attr[$key])) {
 			$this->attr[$key] .= "{$sep}{$value}";
 		} else {
 			$this->attr[$key] = $value;
 		}
-
 		return $this;
 	}
-
+	
+	// Same as above
+	function attrAddTo(string $key, string $value, string $sep = " "): self 
+	{
+		return $this->attrAdd($key, $value, $sep);
+	}
 
 	/**
 	 * Set el value <elem>[VALUE]</elem>
 	 * @param self
 	 */
-	function setValue(?string $value) {
+	function setValue(?string $value): self 
+	{
 		$this->value = $value;
 		return $this;
 	}
@@ -85,23 +117,26 @@ function setValue(?string $value) {
 	 * Set el value
 	 * @param string
 	 */
-	function getValue() {
-		return $this->value;
+	function getValue(): string 
+	{
+		return (string)$this->value;
 	}
 
 	/**
 	 * Get el/HTML tag
-	 * @return [type] [description]
+	 * @return string
 	 */
-	function getEl() {
-		return $this->el;
+	function getEl(): string 
+	{
+		return (string)$this->el;
 	}
 
 	/**
 	 * Array attr to string
 	 * @return string
 	 */
-	function buildAttr() {
+	protected function buildAttr(): string 
+	{
 		$attr = "";
 		if(count($this->attr) > 0) foreach($this->attr as $k => $v) {
 			$attr .= " {$k}";
@@ -110,7 +145,12 @@ function buildAttr() {
 		return $attr;
 	}
 
-	function withElement() {
+	/**
+	 * Clone/Static
+	 * @return static|false
+	 */
+	function withElement()
+	{
 		if(!is_null($this->el)) {
 			return clone $this;
 		}