Update mergeIdentiqualValues (rowspanned class usage)

require fomantic-ui 2.4.8

Author: jcheron

Ajax/semantic/html/content/table/HtmlTD.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Ajax\semantic\html\content\table;
 
 use Ajax\semantic\html\base\HtmlSemDoubleElement;
@@ -13,33 +12,48 @@
 
 class HtmlTD extends HtmlSemDoubleElement {
 	use TextAlignmentTrait,TableElementTrait;
+
 	private $_container;
+
 	private $_row;
+
 	private $_col;
-	private $_colMerged=false;
-	private $_rowMerged=false;
-	private $_deleted=false;
+
+	private $_colMerged = false;
+
+	private $_rowMerged = false;
+
+	private $_deleted = false;
 
 	/**
 	 *
 	 * @param string $identifier
 	 * @param mixed $content
 	 * @param string $tagName
 	 */
-	public function __construct($identifier, $content=NULL, $tagName="td") {
+	public function __construct($identifier, $content = NULL, $tagName = "td") {
 		parent::__construct($identifier, $tagName, "", $content);
-		$this->_variations=[ Variation::COLLAPSING ];
-		$this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ];
+		$this->_variations = [
+			Variation::COLLAPSING
+		];
+		$this->_states = [
+			State::ACTIVE,
+			State::POSITIVE,
+			State::NEGATIVE,
+			State::WARNING,
+			State::ERROR,
+			State::DISABLED
+		];
 	}
 
 	public function setContainer($container, $row, $col) {
-		$this->_container=$container;
-		$this->_row=$row;
-		$this->_col=$col;
+		$this->_container = $container;
+		$this->_row = $row;
+		$this->_col = $col;
 	}
 
 	public function setValue($value) {
-		$this->content=$value;
+		$this->content = $value;
 		return $this;
 	}
 
@@ -49,50 +63,60 @@ public function addValue($value) {
 	}
 
 	public function setRowspan($rowspan) {
-		$to=min($this->_container->count(), $this->_row + $rowspan - 1);
-		for($i=$to; $i > $this->_row; $i--) {
+		$to = min($this->_container->count(), $this->_row + $rowspan - 1);
+		for ($i = $to; $i > $this->_row; $i --) {
 			$this->_container->toDelete($i, $this->_col);
 		}
 		$this->setProperty("rowspan", $rowspan);
 		return $this->_container->_setMerged(true);
 	}
 
+	public function setRowspanned($rowspan) {
+		$to = min($this->_container->count(), $this->_row + $rowspan - 1);
+		for ($i = $to; $i > $this->_row; $i --) {
+			$this->_container->toRowspanned($i, $this->_col);
+		}
+		$this->setProperty("rowspan", $rowspan);
+		return $this->_container->_setMerged(true);
+	}
+
 	public function mergeRow() {
-		if(!$this->_rowMerged){
-			$this->_rowMerged=true;
+		if (! $this->_rowMerged) {
+			$this->_rowMerged = true;
 			return $this->setRowspan($this->_container->count());
 		}
 		return $this->_container;
 	}
 
 	public function mergeCol() {
-		if(!$this->_colMerged){
-			$this->_colMerged=true;
-			return $this->setColspan($this->_container->getRow($this->_row)->count());
+		if (! $this->_colMerged) {
+			$this->_colMerged = true;
+			return $this->setColspan($this->_container->getRow($this->_row)
+				->count());
 		}
 		return $this->_container;
 	}
 
 	public function setColspan($colspan) {
-		$to=min($this->_container->getRow($this->_row)->count(), $this->_col + $colspan - 1);
-		for($i=$to; $i > $this->_col; $i--) {
+		$to = min($this->_container->getRow($this->_row)->count(), $this->_col + $colspan - 1);
+		for ($i = $to; $i > $this->_col; $i --) {
 			$this->_container->delete($this->_row, $this->_col + 1);
 		}
 		$this->setProperty("colspan", $colspan);
 		return $this->_container;
 	}
 
 	public function getColspan() {
-		$colspan=1;
+		$colspan = 1;
 		if (\array_key_exists("colspan", $this->properties))
-			$colspan=$this->getProperty("colspan");
+			$colspan = $this->getProperty("colspan");
 		return $colspan;
 	}
 
 	public function getRowspan() {
-		$rowspan=1;
+		$rowspan = 1;
 		if (\array_key_exists("rowspan", $this->properties))
-			$rowspan=$this->getProperty("rowspan");
+			$rowspan = $this->getProperty("rowspan");
 		return $rowspan;
 	}
 
@@ -108,28 +132,30 @@ public function apply($callback) {
 		return $this;
 	}
 
-	public function setSelectable($href="#") {
+	public function setSelectable($href = "#") {
 		if (\is_string($this->content)) {
-			$this->content=new HtmlLink("", $href, $this->content);
+			$this->content = new HtmlLink("", $href, $this->content);
 		}
 		return $this->addToProperty("class", "selectable");
 	}
 
-	public function setWidth($width){
+	public function setWidth($width) {
 		if (\is_int($width)) {
-			$width=Wide::getConstants()["W" . $width];
+			$width = Wide::getConstants()["W" . $width];
 		}
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
-		return $this->addToPropertyCtrl("class", "wide", array ("wide" ));
+		return $this->addToPropertyCtrl("class", "wide", array(
+			"wide"
+		));
 	}
 
-	public function toDelete(){
-		$this->_deleted=true;
+	public function toDelete() {
+		$this->_deleted = true;
 		return $this;
 	}
 
-	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(!$this->_deleted)
-			return parent::compile($js,$view);
+	public function compile(JsUtils $js = NULL, &$view = NULL) {
+		if (! $this->_deleted)
+			return parent::compile($js, $view);
 	}
 }