phpMv / phpMv-UI

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

Spacing +44 added lines, -44 removed lines

@@ -22,7 +22,7 @@ 
 
 	public function __construct($identifier) {
 		parent::__construct($identifier, "tr", "");
-		$this->_states = [
+		$this->_states=[
 			State::ACTIVE,
 			State::POSITIVE,
 			State::NEGATIVE,
@@ -33,9 +33,9 @@ 
 	}
 
 	public function setColCount($colCount) {
-		$count = $this->count();
-		for ($i = $count; $i < $colCount; $i ++) {
-			$item = $this->addItem(NULL);
+		$count=$this->count();
+		for ($i=$count; $i<$colCount; $i++) {
+			$item=$this->addItem(NULL);
 			$item->setTagName($this->_tdTagName);
 		}
 		return $this;
@@ -52,8 +52,8 @@ 
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
 	 */
 	protected function createItem($value) {
-		$count = $this->count();
-		$td = new HtmlTD("", $value, $this->_tdTagName);
+		$count=$this->count();
+		$td=new HtmlTD("", $value, $this->_tdTagName);
 		$td->setContainer($this->_container, $this->_row, $count);
 		return $td;
 	}
@@ -66,8 +66,8 @@ 
 		return parent::getItem($index);
 	}
 
-	public function setTdTagName($tagName = "td") {
-		$this->_tdTagName = $tagName;
+	public function setTdTagName($tagName="td") {
+		$this->_tdTagName=$tagName;
 	}
 
 	/**
@@ -77,8 +77,8 @@ 
 	 * @param int $row
 	 */
 	public function setContainer($container, $row) {
-		$this->_container = $container;
-		$this->_row = $row;
+		$this->_container=$container;
+		$this->_row=$row;
 	}
 
 	/**
@@ -86,8 +86,8 @@ 
 	 *
 	 * @param mixed $values
 	 */
-	public function setValues($values = array()) {
-		return $this->_addOrSetValues($values, function (HtmlTD &$cell, $value) {
+	public function setValues($values=array()) {
+		return $this->_addOrSetValues($values, function(HtmlTD &$cell, $value) {
 			$cell->setValue($value);
 		});
 	}
@@ -97,8 +97,8 @@ 
 	 *
 	 * @param mixed $values
 	 */
-	public function addValues($values = array()) {
-		return $this->_addOrSetValues($values, function (HtmlTD &$cell, $value) {
+	public function addValues($values=array()) {
+		return $this->_addOrSetValues($values, function(HtmlTD &$cell, $value) {
 			$cell->addValue($value);
 		});
 	}
@@ -109,18 +109,18 @@ 
 	 * @param mixed $values
 	 */
 	protected function _addOrSetValues($values, $callback) {
-		$count = $this->count();
-		if (! \is_array($values)) {
-			$values = \array_fill(0, $count, $values);
+		$count=$this->count();
+		if (!\is_array($values)) {
+			$values=\array_fill(0, $count, $values);
 		} else {
-			if (JArray::isAssociative($values) === true) {
-				$values = \array_values($values);
+			if (JArray::isAssociative($values)===true) {
+				$values=\array_values($values);
 			}
 		}
-		$count = \min(\sizeof($values), $count);
+		$count=\min(\sizeof($values), $count);
 
-		for ($i = 0; $i < $count; $i ++) {
-			$cell = $this->content[$i];
+		for ($i=0; $i<$count; $i++) {
+			$cell=$this->content[$i];
 			$callback($cell, $values[$i]);
 		}
 		return $this;
@@ -138,12 +138,12 @@ 
 		return $this;
 	}
 
-	public function mergeCol($colIndex = 0) {
+	public function mergeCol($colIndex=0) {
 		return $this->getItem($colIndex)->mergeCol();
 	}
 
-	public function mergeRow($colIndex = 0) {
-		$row = $this->getItem($colIndex);
+	public function mergeRow($colIndex=0) {
+		$row=$this->getItem($colIndex);
 		if (isset($row)) {
 			$this->getItem($colIndex)->mergeRow();
 		}
@@ -151,31 +151,31 @@ 
 	}
 
 	public function getColPosition($colIndex) {
-		if ($this->_container->_isMerged() !== true)
+		if ($this->_container->_isMerged()!==true)
 			return $colIndex;
-		$pos = 0;
-		$rows = $this->_container->getContent();
-		for ($i = 0; $i < $this->_row; $i ++) {
-			$max = \min($colIndex, $rows[$i]->count());
-			for ($j = 0; $j < $max; $j ++) {
-				$rowspan = $rows[$i]->getItem($j)->getRowspan();
-				if ($rowspan + $i > $this->_row)
-					$pos ++;
+		$pos=0;
+		$rows=$this->_container->getContent();
+		for ($i=0; $i<$this->_row; $i++) {
+			$max=\min($colIndex, $rows[$i]->count());
+			for ($j=0; $j<$max; $j++) {
+				$rowspan=$rows[$i]->getItem($j)->getRowspan();
+				if ($rowspan+$i>$this->_row)
+					$pos++;
 			}
 		}
-		if ($pos > $colIndex)
+		if ($pos>$colIndex)
 			return NULL;
-		$count = $this->count();
-		for ($i = 0; $i < $count; $i ++) {
-			$pos += $this->content[$i]->getColspan();
-			if ($pos >= $colIndex + 1)
+		$count=$this->count();
+		for ($i=0; $i<$count; $i++) {
+			$pos+=$this->content[$i]->getColspan();
+			if ($pos>=$colIndex+1)
 				return $i;
 		}
 		return null;
 	}
 
 	public function conditionalCellFormat($callback, $format) {
-		$cells = $this->content;
+		$cells=$this->content;
 		foreach ($cells as $cell) {
 			$cell->conditionalCellFormat($callback, $format);
 		}
@@ -190,9 +190,9 @@ 
 	}
 
 	public function containsStr($needle) {
-		$cells = $this->content;
+		$cells=$this->content;
 		foreach ($cells as $cell) {
-			if (\strpos($cell->getContent(), $needle) !== false)
+			if (\strpos($cell->getContent(), $needle)!==false)
 				return true;
 		}
 		return false;
@@ -204,7 +204,7 @@ 
 	}
 
 	public function applyCells($callback) {
-		$cells = $this->content;
+		$cells=$this->content;
 		foreach ($cells as $cell) {
 			$cell->apply($callback);
 		}
@@ -217,7 +217,7 @@ 
 	}
 
 	public function toRowspanned($colIndex) {
-		$cell = $this->getItem($colIndex);
+		$cell=$this->getItem($colIndex);
 		$cell->addClass('rowspanned');
 		$cell->setContent('');
 		return $this;

Braces +15 added lines, -10 removed lines

@@ -151,25 +151,29 @@ 
 	}
 
 	public function getColPosition($colIndex) {
-		if ($this->_container->_isMerged() !== true)
-			return $colIndex;
+		if ($this->_container->_isMerged() !== true) {
+					return $colIndex;
+		}
 		$pos = 0;
 		$rows = $this->_container->getContent();
 		for ($i = 0; $i < $this->_row; $i ++) {
 			$max = \min($colIndex, $rows[$i]->count());
 			for ($j = 0; $j < $max; $j ++) {
 				$rowspan = $rows[$i]->getItem($j)->getRowspan();
-				if ($rowspan + $i > $this->_row)
-					$pos ++;
+				if ($rowspan + $i > $this->_row) {
+									$pos ++;
+				}
 			}
 		}
-		if ($pos > $colIndex)
-			return NULL;
+		if ($pos > $colIndex) {
+					return NULL;
+		}
 		$count = $this->count();
 		for ($i = 0; $i < $count; $i ++) {
 			$pos += $this->content[$i]->getColspan();
-			if ($pos >= $colIndex + 1)
-				return $i;
+			if ($pos >= $colIndex + 1) {
+							return $i;
+			}
 		}
 		return null;
 	}
@@ -192,8 +196,9 @@ 
 	public function containsStr($needle) {
 		$cells = $this->content;
 		foreach ($cells as $cell) {
-			if (\strpos($cell->getContent(), $needle) !== false)
-				return true;
+			if (\strpos($cell->getContent(), $needle) !== false) {
+							return true;
+			}
 		}
 		return false;
 	}

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

Spacing +32 added lines, -32 removed lines

@@ -11,7 +11,7 @@ 
 use Ajax\JsUtils;
 
 class HtmlTD extends HtmlSemDoubleElement {
-	use TextAlignmentTrait,TableElementTrait;
+	use TextAlignmentTrait, TableElementTrait;
 
 	private $_container;
 
@@ -19,11 +19,11 @@ 
 
 	private $_col;
 
-	private $_colMerged = false;
+	private $_colMerged=false;
 
-	private $_rowMerged = false;
+	private $_rowMerged=false;
 
-	private $_deleted = false;
+	private $_deleted=false;
 
 	/**
 	 *
@@ -31,12 +31,12 @@ 
 	 * @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 = [
+		$this->_variations=[
 			Variation::COLLAPSING
 		];
-		$this->_states = [
+		$this->_states=[
 			State::ACTIVE,
 			State::POSITIVE,
 			State::NEGATIVE,
@@ -47,13 +47,13 @@ 
 	}
 
 	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;
 	}
 
@@ -63,8 +63,8 @@ 
 	}
 
 	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);
@@ -72,8 +72,8 @@ 
 	}
 
 	public function setRowspanned($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->toRowspanned($i, $this->_col);
 		}
 		$this->setProperty("rowspan", $rowspan);
@@ -81,16 +81,16 @@ 
 	}
 
 	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;
+		if (!$this->_colMerged) {
+			$this->_colMerged=true;
 			return $this->setColspan($this->_container->getRow($this->_row)
 				->count());
 		}
@@ -98,25 +98,25 @@ 
 	}
 
 	public function setColspan($colspan) {
-		$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);
+		$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;
 	}
 
@@ -132,16 +132,16 @@ 
 		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) {
 		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(
@@ -150,12 +150,12 @@ 
 	}
 
 	public function toDelete() {
-		$this->_deleted = true;
+		$this->_deleted=true;
 		return $this;
 	}
 
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_deleted)
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_deleted)
 			return parent::compile($js, $view);
 	}
 }

Braces +9 added lines, -6 removed lines

@@ -108,15 +108,17 @@ 
 
 	public function getColspan() {
 		$colspan = 1;
-		if (\array_key_exists("colspan", $this->properties))
-			$colspan = $this->getProperty("colspan");
+		if (\array_key_exists("colspan", $this->properties)) {
+					$colspan = $this->getProperty("colspan");
+		}
 		return $colspan;
 	}
 
 	public function getRowspan() {
 		$rowspan = 1;
-		if (\array_key_exists("rowspan", $this->properties))
-			$rowspan = $this->getProperty("rowspan");
+		if (\array_key_exists("rowspan", $this->properties)) {
+					$rowspan = $this->getProperty("rowspan");
+		}
 		return $rowspan;
 	}
 
@@ -155,7 +157,8 @@ 
 	}
 
 	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_deleted)
-			return parent::compile($js, $view);
+		if (! $this->_deleted) {
+					return parent::compile($js, $view);
+		}
 	}
 }

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

Spacing +95 added lines, -95 removed lines

@@ -15,13 +15,13 @@ 
  */
 class HtmlTableContent extends HtmlSemCollection {
 
-	protected $_tdTagNames = [
+	protected $_tdTagNames=[
 		"thead" => "th",
 		"tbody" => "td",
 		"tfoot" => "th"
 	];
 
-	protected $_merged = false;
+	protected $_merged=false;
 
 	/**
 	 *
@@ -30,7 +30,7 @@ 
 	 * @param int $rowCount
 	 * @param int $colCount
 	 */
-	public function __construct($identifier, $tagName = "tbody", $rowCount = NULL, $colCount = NULL) {
+	public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) {
 		parent::__construct($identifier, $tagName, "");
 		if (isset($rowCount) && isset($colCount))
 			$this->setRowCount($rowCount, $colCount);
@@ -43,8 +43,8 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function setRowCount($rowCount, $colCount) {
-		$count = $this->count();
-		for ($i = $count; $i < $rowCount; $i ++) {
+		$count=$this->count();
+		for ($i=$count; $i<$rowCount; $i++) {
 			$this->addItem($colCount);
 		}
 		return $this;
@@ -55,7 +55,7 @@ 
 	}
 
 	public function refreshTR() {
-		$this->_template = "%wrapContentBefore%%content%%wrapContentAfter%";
+		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 	}
 
 	/**
@@ -66,11 +66,11 @@ 
 	 * @return HtmlTR
 	 */
 	protected function createItem($value) {
-		$count = $this->count();
-		$tr = new HtmlTR("");
+		$count=$this->count();
+		$tr=new HtmlTR("");
 		$tr->setContainer($this, $count);
 		$tr->setTdTagName($this->_tdTagNames[$this->tagName]);
-		if (isset($value) === true) {
+		if (isset($value)===true) {
 			$tr->setColCount($value);
 		}
 		return $tr;
@@ -98,8 +98,8 @@ 
 		return $this->addItem($row);
 	}
 
-	public function addMergeRow($colCount, $value = null) {
-		$row = $this->addRow($colCount);
+	public function addMergeRow($colCount, $value=null) {
+		$row=$this->addRow($colCount);
 		$row->mergeCol();
 		if (isset($value)) {
 			$row->setValues([
@@ -125,11 +125,11 @@ 
 	 * @return HtmlTD|HtmlDoubleElement
 	 */
 	public function getCell($row, $col) {
-		$row = $this->getItem($row);
+		$row=$this->getItem($row);
 		if (isset($row) && $row instanceof HtmlCollection) {
-			$col = $row->getItem($col);
+			$col=$row->getItem($col);
 		} else {
-			$col = $row;
+			$col=$row;
 		}
 		return $col;
 	}
@@ -150,9 +150,9 @@ 
 	 * @param mixed $value
 	 * @return HtmlTableContent
 	 */
-	public function setCellValue($row, $col, $value = "") {
-		$cell = $this->getCell($row, $col);
-		if (isset($cell) === true) {
+	public function setCellValue($row, $col, $value="") {
+		$cell=$this->getCell($row, $col);
+		if (isset($cell)===true) {
 			$cell->setValue($value);
 		}
 		return $this;
@@ -163,8 +163,8 @@ 
 	 *
 	 * @param mixed $values
 	 */
-	public function setValues($values = array()) {
-		return $this->_addOrSetValues($values, function (HtmlTR $row, $_values) {
+	public function setValues($values=array()) {
+		return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {
 			$row->setValues($_values);
 		});
 	}
@@ -174,8 +174,8 @@ 
 	 *
 	 * @param mixed $values
 	 */
-	public function addValues($values = array()) {
-		return $this->_addOrSetValues($values, function (HtmlTR $row, $_values) {
+	public function addValues($values=array()) {
+		return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {
 			$row->addValues($_values);
 		});
 	}
@@ -187,42 +187,42 @@ 
 	 * @param callable $callback
 	 */
 	protected function _addOrSetValues($values, $callback) {
-		$count = $this->count();
-		$isArray = true;
-		if (! \is_array($values)) {
-			$values = \array_fill(0, $count, $values);
-			$isArray = false;
+		$count=$this->count();
+		$isArray=true;
+		if (!\is_array($values)) {
+			$values=\array_fill(0, $count, $values);
+			$isArray=false;
 		}
-		if (JArray::dimension($values) == 1 && $isArray)
-			$values = [
+		if (JArray::dimension($values)==1 && $isArray)
+			$values=[
 				$values
 			];
 
-		$count = \min(\sizeof($values), $count);
+		$count=\min(\sizeof($values), $count);
 
-		for ($i = 0; $i < $count; $i ++) {
-			$row = $this->content[$i];
+		for ($i=0; $i<$count; $i++) {
+			$row=$this->content[$i];
 			$callback($row, $values[$i]);
 		}
 		return $this;
 	}
 
-	public function setColValues($colIndex, $values = array()) {
-		$count = $this->count();
-		if (! \is_array($values)) {
-			$values = \array_fill(0, $count, $values);
+	public function setColValues($colIndex, $values=array()) {
+		$count=$this->count();
+		if (!\is_array($values)) {
+			$values=\array_fill(0, $count, $values);
 		}
-		$count = \min(\sizeof($values), $count);
-		for ($i = 0; $i < $count; $i ++) {
+		$count=\min(\sizeof($values), $count);
+		for ($i=0; $i<$count; $i++) {
 			$this->getCell($i, $colIndex)->setValue($values[$i]);
 		}
 		return $this;
 	}
 
-	public function addColVariations($colIndex, $variations = array()) {
-		$count = $this->count();
-		for ($i = 0; $i < $count; $i ++) {
-			$cell = $this->getCell($i, $colIndex);
+	public function addColVariations($colIndex, $variations=array()) {
+		$count=$this->count();
+		for ($i=0; $i<$count; $i++) {
+			$cell=$this->getCell($i, $colIndex);
 			if ($cell instanceof BaseTrait)
 				$cell->addVariations($variations);
 		}
@@ -230,41 +230,41 @@ 
 	}
 
 	public function addPropertyCol($colIndex, $name, $value) {
-		$count = $this->count();
-		for ($i = 0; $i < $count; $i ++) {
-			$cell = $this->getCell($i, $colIndex);
+		$count=$this->count();
+		for ($i=0; $i<$count; $i++) {
+			$cell=$this->getCell($i, $colIndex);
 			if (isset($cell))
 				$cell->addToProperty($name, $value);
 		}
 		return $this;
 	}
 
-	public function setRowValues($rowIndex, $values = array()) {
-		$count = $this->count();
-		if (! \is_array($values)) {
-			$values = \array_fill(0, $count, $values);
+	public function setRowValues($rowIndex, $values=array()) {
+		$count=$this->count();
+		if (!\is_array($values)) {
+			$values=\array_fill(0, $count, $values);
 		}
 		$this->getItem($rowIndex)->setValues($values);
 		return $this;
 	}
 
 	private function colAlign($colIndex, $function) {
-		$count = $this->count();
-		for ($i = 0; $i < $count; $i ++) {
-			$index = $this->content[$i]->getColPosition($colIndex);
-			if ($index !== NULL)
+		$count=$this->count();
+		for ($i=0; $i<$count; $i++) {
+			$index=$this->content[$i]->getColPosition($colIndex);
+			if ($index!==NULL)
 				$this->getCell($i, $index)->$function();
 		}
 		return $this;
 	}
 
 	private function colAlignFromRight($colIndex, $function) {
-		$count = $this->count();
-		for ($i = 0; $i < $count; $i ++) {
-			$maxRow = $this->content[$i]->count();
-			$index = $maxRow - $colIndex - 1;
-			if (($cell = $this->getCell($i, $index)) !== NULL) {
-				if ($cell->getColspan() == 1)
+		$count=$this->count();
+		for ($i=0; $i<$count; $i++) {
+			$maxRow=$this->content[$i]->count();
+			$index=$maxRow-$colIndex-1;
+			if (($cell=$this->getCell($i, $index))!==NULL) {
+				if ($cell->getColspan()==1)
 					$cell->$function();
 			}
 		}
@@ -310,9 +310,9 @@ 
 	 * @return int
 	 */
 	public function getColCount() {
-		$result = 0;
-		if ($this->count() > 0)
-			$result = $this->getItem(0)->count();
+		$result=0;
+		if ($this->count()>0)
+			$result=$this->getItem(0)->count();
 		return $result;
 	}
 
@@ -323,10 +323,10 @@ 
 	 * @param int $colIndex
 	 * @return HtmlTableContent
 	 */
-	public function delete($rowIndex, $colIndex = NULL) {
+	public function delete($rowIndex, $colIndex=NULL) {
 		if (isset($colIndex)) {
-			$row = $this->getItem($rowIndex);
-			if (isset($row) === true) {
+			$row=$this->getItem($rowIndex);
+			if (isset($row)===true) {
 				$row->delete($colIndex);
 			}
 		} else {
@@ -336,24 +336,24 @@ 
 	}
 
 	public function toDelete($rowIndex, $colIndex) {
-		$row = $this->getItem($rowIndex);
-		if (isset($row) === true)
+		$row=$this->getItem($rowIndex);
+		if (isset($row)===true)
 			$row->toDelete($colIndex);
 		return $this;
 	}
 
 	public function toRowspanned($rowIndex, $colIndex) {
-		$row = $this->getItem($rowIndex);
-		if (isset($row) === true)
+		$row=$this->getItem($rowIndex);
+		if (isset($row)===true)
 			$row->toRowspanned($colIndex);
 		return $this;
 	}
 
-	public function mergeCol($rowIndex = 0, $colIndex = 0) {
+	public function mergeCol($rowIndex=0, $colIndex=0) {
 		return $this->getItem($rowIndex)->mergeCol($colIndex);
 	}
 
-	public function mergeRow($rowIndex = 0, $colIndex = 0) {
+	public function mergeRow($rowIndex=0, $colIndex=0) {
 		return $this->getItem($rowIndex)->mergeRow($colIndex);
 	}
 
@@ -373,7 +373,7 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function conditionalCellFormat($callback, $format) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
 			$row->conditionalCellFormat($callback, $format);
 		}
@@ -381,9 +381,9 @@ 
 	}
 
 	public function conditionalColFormat($colIndex, $callback, $format) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
-			$cell = $row->getItem($colIndex);
+			$cell=$row->getItem($colIndex);
 			$cell->conditionnalCellFormat($callback, $format);
 		}
 		return $this;
@@ -396,7 +396,7 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function conditionalRowFormat($callback, $format) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
 			$row->conditionalRowFormat($callback, $format);
 		}
@@ -404,9 +404,9 @@ 
 	}
 
 	public function hideColumn($colIndex) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
-			$cell = $row->getItem($colIndex);
+			$cell=$row->getItem($colIndex);
 			$cell->addToProperty("style", "display:none;");
 		}
 		return $this;
@@ -418,7 +418,7 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function applyCells($callback) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
 			$row->applyCells($callback);
 		}
@@ -431,7 +431,7 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function applyRows($callback) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
 			$row->apply($callback);
 		}
@@ -446,28 +446,28 @@ 
 	 * @see https://fomantic-ui.com/collections/table.html#definition needs rowspanned class
 	 * @since fomantic-ui 2.4.8
 	 */
-	public function mergeIdentiqualValues($colIndex, $function = "strip_tags") {
-		$rows = $this->content;
-		$identiqual = null;
-		$counter = 0;
-		$cellToMerge = null;
-		$functionExists = \function_exists($function);
+	public function mergeIdentiqualValues($colIndex, $function="strip_tags") {
+		$rows=$this->content;
+		$identiqual=null;
+		$counter=0;
+		$cellToMerge=null;
+		$functionExists=\function_exists($function);
 		foreach ($rows as $row) {
-			$cell = $row->getItem($colIndex);
-			$value = $cell->getContent();
+			$cell=$row->getItem($colIndex);
+			$value=$cell->getContent();
 			if ($functionExists)
-				$value = \call_user_func($function, $value);
-			if ($value !== $identiqual) {
-				if ($counter > 0 && isset($cellToMerge)) {
+				$value=\call_user_func($function, $value);
+			if ($value!==$identiqual) {
+				if ($counter>0 && isset($cellToMerge)) {
 					$cellToMerge->setRowspanned($counter);
 				}
-				$counter = 0;
-				$cellToMerge = $cell;
-				$identiqual = $value;
+				$counter=0;
+				$cellToMerge=$cell;
+				$identiqual=$value;
 			}
-			$counter ++;
+			$counter++;
 		}
-		if ($counter > 0 && isset($cellToMerge)) {
+		if ($counter>0 && isset($cellToMerge)) {
 			$cellToMerge->setRowspanned($counter);
 		}
 		return $this;
@@ -478,7 +478,7 @@ 
 	}
 
 	public function _setMerged($value) {
-		$this->_merged = $value;
+		$this->_merged=$value;
 		return $this;
 	}
 }

Braces +30 added lines, -20 removed lines

@@ -32,8 +32,9 @@ 
 	 */
 	public function __construct($identifier, $tagName = "tbody", $rowCount = NULL, $colCount = NULL) {
 		parent::__construct($identifier, $tagName, "");
-		if (isset($rowCount) && isset($colCount))
-			$this->setRowCount($rowCount, $colCount);
+		if (isset($rowCount) && isset($colCount)) {
+					$this->setRowCount($rowCount, $colCount);
+		}
 	}
 
 	/**
@@ -193,10 +194,11 @@ 
 			$values = \array_fill(0, $count, $values);
 			$isArray = false;
 		}
-		if (JArray::dimension($values) == 1 && $isArray)
-			$values = [
+		if (JArray::dimension($values) == 1 && $isArray) {
+					$values = [
 				$values
 			];
+		}
 
 		$count = \min(\sizeof($values), $count);
 
@@ -223,8 +225,9 @@ 
 		$count = $this->count();
 		for ($i = 0; $i < $count; $i ++) {
 			$cell = $this->getCell($i, $colIndex);
-			if ($cell instanceof BaseTrait)
-				$cell->addVariations($variations);
+			if ($cell instanceof BaseTrait) {
+							$cell->addVariations($variations);
+			}
 		}
 		return $this;
 	}
@@ -233,8 +236,9 @@ 
 		$count = $this->count();
 		for ($i = 0; $i < $count; $i ++) {
 			$cell = $this->getCell($i, $colIndex);
-			if (isset($cell))
-				$cell->addToProperty($name, $value);
+			if (isset($cell)) {
+							$cell->addToProperty($name, $value);
+			}
 		}
 		return $this;
 	}
@@ -252,8 +256,9 @@ 
 		$count = $this->count();
 		for ($i = 0; $i < $count; $i ++) {
 			$index = $this->content[$i]->getColPosition($colIndex);
-			if ($index !== NULL)
-				$this->getCell($i, $index)->$function();
+			if ($index !== NULL) {
+							$this->getCell($i, $index)->$function();
+			}
 		}
 		return $this;
 	}
@@ -264,8 +269,9 @@ 
 			$maxRow = $this->content[$i]->count();
 			$index = $maxRow - $colIndex - 1;
 			if (($cell = $this->getCell($i, $index)) !== NULL) {
-				if ($cell->getColspan() == 1)
-					$cell->$function();
+				if ($cell->getColspan() == 1) {
+									$cell->$function();
+				}
 			}
 		}
 		return $this;
@@ -311,8 +317,9 @@ 
 	 */
 	public function getColCount() {
 		$result = 0;
-		if ($this->count() > 0)
-			$result = $this->getItem(0)->count();
+		if ($this->count() > 0) {
+					$result = $this->getItem(0)->count();
+		}
 		return $result;
 	}
 
@@ -337,15 +344,17 @@ 
 
 	public function toDelete($rowIndex, $colIndex) {
 		$row = $this->getItem($rowIndex);
-		if (isset($row) === true)
-			$row->toDelete($colIndex);
+		if (isset($row) === true) {
+					$row->toDelete($colIndex);
+		}
 		return $this;
 	}
 
 	public function toRowspanned($rowIndex, $colIndex) {
 		$row = $this->getItem($rowIndex);
-		if (isset($row) === true)
-			$row->toRowspanned($colIndex);
+		if (isset($row) === true) {
+					$row->toRowspanned($colIndex);
+		}
 		return $this;
 	}
 
@@ -455,8 +464,9 @@ 
 		foreach ($rows as $row) {
 			$cell = $row->getItem($colIndex);
 			$value = $cell->getContent();
-			if ($functionExists)
-				$value = \call_user_func($function, $value);
+			if ($functionExists) {
+							$value = \call_user_func($function, $value);
+			}
 			if ($value !== $identiqual) {
 				if ($counter > 0 && isset($cellToMerge)) {
 					$cellToMerge->setRowspanned($counter);