Inspection of "Update mergeIdentiqualValues (rowspanned class usa..." - phpMv/phpMv-UI - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 6da082...c653a4 )

by Jean-Christophe

created 2020-05-06 00:13 UTC

Status

Spacing +44 added lines, -44 removed lines patch added patch discarded remove patch

@@ -22,7 +22,7 @@  discard block
 block discarded – undo
 
 	public function __construct($identifier) {
 		parent::__construct($identifier, "tr", "");
-		$this->_states = [
+		$this->_states=[
 			State::ACTIVE,
 			State::POSITIVE,
 			State::NEGATIVE,
@@ -33,9 +33,9 @@  discard block
 block discarded – undo
 	}
 
 	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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 		return parent::getItem($index);
 	}
 
-	public function setTdTagName($tagName = "td") {
-		$this->_tdTagName = $tagName;
+	public function setTdTagName($tagName="td") {
+		$this->_tdTagName=$tagName;
 	}
 
 	/**
@@ -77,8 +77,8 @@  discard block
 block discarded – undo
 	 * @param int $row
 	 */
 	public function setContainer($container, $row) {
-		$this->_container = $container;
-		$this->_row = $row;
+		$this->_container=$container;
+		$this->_row=$row;
 	}
 
 	/**
@@ -86,8 +86,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 	}
 
 	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 @@  discard block
 block discarded – undo
 	}
 
 	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 @@  discard block
 block discarded – undo
 	}
 
 	public function applyCells($callback) {
-		$cells = $this->content;
+		$cells=$this->content;
 		foreach ($cells as $cell) {
 			$cell->apply($callback);
 		}
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
 	}
 
 	public function toRowspanned($colIndex) {
-		$cell = $this->getItem($colIndex);
+		$cell=$this->getItem($colIndex);
 		$cell->addClass('rowspanned');
 		$cell->setContent('');
 		return $this;

Please login to merge, or discard this patch.

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

Spacing +32 added lines, -32 removed lines patch added patch discarded remove patch

@@ -11,7 +11,7 @@  discard block
 block discarded – undo
 use Ajax\JsUtils;
 
 class HtmlTD extends HtmlSemDoubleElement {
-	use TextAlignmentTrait,TableElementTrait;
+	use TextAlignmentTrait, TableElementTrait;
 
 	private $_container;
 
@@ -19,11 +19,11 @@  discard block
 block discarded – undo
 
 	private $_col;
 
-	private $_colMerged = false;
+	private $_colMerged=false;
 
-	private $_rowMerged = false;
+	private $_rowMerged=false;
 
-	private $_deleted = false;
+	private $_deleted=false;
 
 	/**
 	 *
@@ -31,12 +31,12 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	}
 
 	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 @@  discard block
 block discarded – undo
 	}
 
 	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 @@  discard block
 block discarded – undo
 	}
 
 	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 @@  discard block
 block discarded – undo
 	}
 
 	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 @@  discard block
 block discarded – undo
 	}
 
 	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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 	}
 
 	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);
 	}
 }

Please login to merge, or discard this patch.

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

Spacing +95 added lines, -95 removed lines patch added patch discarded remove patch

@@ -15,13 +15,13 @@  discard block
 block discarded – undo
  */
 class HtmlTableContent extends HtmlSemCollection {
 
-	protected $_tdTagNames = [
+	protected $_tdTagNames=[
 		"thead" => "th",
 		"tbody" => "td",
 		"tfoot" => "th"
 	];
 
-	protected $_merged = false;
+	protected $_merged=false;
 
 	/**
 	 *
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	}
 
 	public function refreshTR() {
-		$this->_template = "%wrapContentBefore%%content%%wrapContentAfter%";
+		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 	}
 
 	/**
@@ -66,11 +66,11 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	}
 
 	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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	}
 
 	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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	}
 
 	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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	}
 
 	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 @@  discard block
 block discarded – undo
 	 * @return HtmlTableContent
 	 */
 	public function applyCells($callback) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
 			$row->applyCells($callback);
 		}
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
 	 * @return HtmlTableContent
 	 */
 	public function applyRows($callback) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
 			$row->apply($callback);
 		}
@@ -446,28 +446,28 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	}
 
 	public function _setMerged($value) {
-		$this->_merged = $value;
+		$this->_merged=$value;
 		return $this;
 	}
 }

Please login to merge, or discard this patch.

		@@ -22,7 +22,7 @@ discard block
		block discarded – undo
22	22
23	23	public function __construct($identifier) {
24	24	parent::__construct($identifier, "tr", "");
25		- $this->_states = [
	25	+ $this->_states=[
26	26	State::ACTIVE,
27	27	State::POSITIVE,
28	28	State::NEGATIVE,
		@@ -33,9 +33,9 @@ discard block
		block discarded – undo
33	33	}
34	34
35	35	public function setColCount($colCount) {
36		- $count = $this->count();
37		- for ($i = $count; $i < $colCount; $i ++) {
38		- $item = $this->addItem(NULL);
	36	+ $count=$this->count();
	37	+ for ($i=$count; $i<$colCount; $i++) {
	38	+ $item=$this->addItem(NULL);
39	39	$item->setTagName($this->_tdTagName);
40	40	}
41	41	return $this;
		@@ -52,8 +52,8 @@ discard block
		block discarded – undo
52	52	* @see \Ajax\common\html\HtmlCollection::createItem()
53	53	*/
54	54	protected function createItem($value) {
55		- $count = $this->count();
56		- $td = new HtmlTD("", $value, $this->_tdTagName);
	55	+ $count=$this->count();
	56	+ $td=new HtmlTD("", $value, $this->_tdTagName);
57	57	$td->setContainer($this->_container, $this->_row, $count);
58	58	return $td;
59	59	}
		@@ -66,8 +66,8 @@ discard block
		block discarded – undo
66	66	return parent::getItem($index);
67	67	}
68	68
69		- public function setTdTagName($tagName = "td") {
70		- $this->_tdTagName = $tagName;
	69	+ public function setTdTagName($tagName="td") {
	70	+ $this->_tdTagName=$tagName;
71	71	}
72	72
73	73	/**
		@@ -77,8 +77,8 @@ discard block
		block discarded – undo
77	77	* @param int $row
78	78	*/
79	79	public function setContainer($container, $row) {
80		- $this->_container = $container;
81		- $this->_row = $row;
	80	+ $this->_container=$container;
	81	+ $this->_row=$row;
82	82	}
83	83
84	84	/**
		@@ -86,8 +86,8 @@ discard block
		block discarded – undo
86	86	*
87	87	* @param mixed $values
88	88	*/
89		- public function setValues($values = array()) {
90		- return $this->_addOrSetValues($values, function (HtmlTD &$cell, $value) {
	89	+ public function setValues($values=array()) {
	90	+ return $this->_addOrSetValues($values, function(HtmlTD &$cell, $value) {
91	91	$cell->setValue($value);
92	92	});
93	93	}
		@@ -97,8 +97,8 @@ discard block
		block discarded – undo
97	97	*
98	98	* @param mixed $values
99	99	*/
100		- public function addValues($values = array()) {
101		- return $this->_addOrSetValues($values, function (HtmlTD &$cell, $value) {
	100	+ public function addValues($values=array()) {
	101	+ return $this->_addOrSetValues($values, function(HtmlTD &$cell, $value) {
102	102	$cell->addValue($value);
103	103	});
104	104	}
		@@ -109,18 +109,18 @@ discard block
		block discarded – undo
109	109	* @param mixed $values
110	110	*/
111	111	protected function _addOrSetValues($values, $callback) {
112		- $count = $this->count();
113		- if (! \is_array($values)) {
114		- $values = \array_fill(0, $count, $values);
	112	+ $count=$this->count();
	113	+ if (!\is_array($values)) {
	114	+ $values=\array_fill(0, $count, $values);
115	115	} else {
116		- if (JArray::isAssociative($values) === true) {
117		- $values = \array_values($values);
	116	+ if (JArray::isAssociative($values)===true) {
	117	+ $values=\array_values($values);
118	118	}
119	119	}
120		- $count = \min(\sizeof($values), $count);
	120	+ $count=\min(\sizeof($values), $count);
121	121
122		- for ($i = 0; $i < $count; $i ++) {
123		- $cell = $this->content[$i];
	122	+ for ($i=0; $i<$count; $i++) {
	123	+ $cell=$this->content[$i];
124	124	$callback($cell, $values[$i]);
125	125	}
126	126	return $this;
		@@ -138,12 +138,12 @@ discard block
		block discarded – undo
138	138	return $this;
139	139	}
140	140
141		- public function mergeCol($colIndex = 0) {
	141	+ public function mergeCol($colIndex=0) {
142	142	return $this->getItem($colIndex)->mergeCol();
143	143	}
144	144
145		- public function mergeRow($colIndex = 0) {
146		- $row = $this->getItem($colIndex);
	145	+ public function mergeRow($colIndex=0) {
	146	+ $row=$this->getItem($colIndex);
147	147	if (isset($row)) {
148	148	$this->getItem($colIndex)->mergeRow();
149	149	}
		@@ -151,31 +151,31 @@ discard block
		block discarded – undo
151	151	}
152	152
153	153	public function getColPosition($colIndex) {
154		- if ($this->_container->_isMerged() !== true)
	154	+ if ($this->_container->_isMerged()!==true)
155	155	return $colIndex;
156		- $pos = 0;
157		- $rows = $this->_container->getContent();
158		- for ($i = 0; $i < $this->_row; $i ++) {
159		- $max = \min($colIndex, $rows[$i]->count());
160		- for ($j = 0; $j < $max; $j ++) {
161		- $rowspan = $rows[$i]->getItem($j)->getRowspan();
162		- if ($rowspan + $i > $this->_row)
163		- $pos ++;
	156	+ $pos=0;
	157	+ $rows=$this->_container->getContent();
	158	+ for ($i=0; $i<$this->_row; $i++) {
	159	+ $max=\min($colIndex, $rows[$i]->count());
	160	+ for ($j=0; $j<$max; $j++) {
	161	+ $rowspan=$rows[$i]->getItem($j)->getRowspan();
	162	+ if ($rowspan+$i>$this->_row)
	163	+ $pos++;
164	164	}
165	165	}
166		- if ($pos > $colIndex)
	166	+ if ($pos>$colIndex)
167	167	return NULL;
168		- $count = $this->count();
169		- for ($i = 0; $i < $count; $i ++) {
170		- $pos += $this->content[$i]->getColspan();
171		- if ($pos >= $colIndex + 1)
	168	+ $count=$this->count();
	169	+ for ($i=0; $i<$count; $i++) {
	170	+ $pos+=$this->content[$i]->getColspan();
	171	+ if ($pos>=$colIndex+1)
172	172	return $i;
173	173	}
174	174	return null;
175	175	}
176	176
177	177	public function conditionalCellFormat($callback, $format) {
178		- $cells = $this->content;
	178	+ $cells=$this->content;
179	179	foreach ($cells as $cell) {
180	180	$cell->conditionalCellFormat($callback, $format);
181	181	}
		@@ -190,9 +190,9 @@ discard block
		block discarded – undo
190	190	}
191	191
192	192	public function containsStr($needle) {
193		- $cells = $this->content;
	193	+ $cells=$this->content;
194	194	foreach ($cells as $cell) {
195		- if (\strpos($cell->getContent(), $needle) !== false)
	195	+ if (\strpos($cell->getContent(), $needle)!==false)
196	196	return true;
197	197	}
198	198	return false;
		@@ -204,7 +204,7 @@ discard block
		block discarded – undo
204	204	}
205	205
206	206	public function applyCells($callback) {
207		- $cells = $this->content;
	207	+ $cells=$this->content;
208	208	foreach ($cells as $cell) {
209	209	$cell->apply($callback);
210	210	}
		@@ -217,7 +217,7 @@ discard block
		block discarded – undo
217	217	}
218	218
219	219	public function toRowspanned($colIndex) {
220		- $cell = $this->getItem($colIndex);
	220	+ $cell=$this->getItem($colIndex);
221	221	$cell->addClass('rowspanned');
222	222	$cell->setContent('');
223	223	return $this;

		@@ -11,7 +11,7 @@ discard block
		block discarded – undo
11	11	use Ajax\JsUtils;
12	12
13	13	class HtmlTD extends HtmlSemDoubleElement {
14		- use TextAlignmentTrait,TableElementTrait;
	14	+ use TextAlignmentTrait, TableElementTrait;
15	15
16	16	private $_container;
17	17
		@@ -19,11 +19,11 @@ discard block
		block discarded – undo
19	19
20	20	private $_col;
21	21
22		- private $_colMerged = false;
	22	+ private $_colMerged=false;
23	23
24		- private $_rowMerged = false;
	24	+ private $_rowMerged=false;
25	25
26		- private $_deleted = false;
	26	+ private $_deleted=false;
27	27
28	28	/**
29	29	*
		@@ -31,12 +31,12 @@ discard block
		block discarded – undo
31	31	* @param mixed $content
32	32	* @param string $tagName
33	33	*/
34		- public function __construct($identifier, $content = NULL, $tagName = "td") {
	34	+ public function __construct($identifier, $content=NULL, $tagName="td") {
35	35	parent::__construct($identifier, $tagName, "", $content);
36		- $this->_variations = [
	36	+ $this->_variations=[
37	37	Variation::COLLAPSING
38	38	];
39		- $this->_states = [
	39	+ $this->_states=[
40	40	State::ACTIVE,
41	41	State::POSITIVE,
42	42	State::NEGATIVE,
		@@ -47,13 +47,13 @@ discard block
		block discarded – undo
47	47	}
48	48
49	49	public function setContainer($container, $row, $col) {
50		- $this->_container = $container;
51		- $this->_row = $row;
52		- $this->_col = $col;
	50	+ $this->_container=$container;
	51	+ $this->_row=$row;
	52	+ $this->_col=$col;
53	53	}
54	54
55	55	public function setValue($value) {
56		- $this->content = $value;
	56	+ $this->content=$value;
57	57	return $this;
58	58	}
59	59
		@@ -63,8 +63,8 @@ discard block
		block discarded – undo
63	63	}
64	64
65	65	public function setRowspan($rowspan) {
66		- $to = min($this->_container->count(), $this->_row + $rowspan - 1);
67		- for ($i = $to; $i > $this->_row; $i --) {
	66	+ $to=min($this->_container->count(), $this->_row+$rowspan-1);
	67	+ for ($i=$to; $i>$this->_row; $i--) {
68	68	$this->_container->toDelete($i, $this->_col);
69	69	}
70	70	$this->setProperty("rowspan", $rowspan);
		@@ -72,8 +72,8 @@ discard block
		block discarded – undo
72	72	}
73	73
74	74	public function setRowspanned($rowspan) {
75		- $to = min($this->_container->count(), $this->_row + $rowspan - 1);
76		- for ($i = $to; $i > $this->_row; $i --) {
	75	+ $to=min($this->_container->count(), $this->_row+$rowspan-1);
	76	+ for ($i=$to; $i>$this->_row; $i--) {
77	77	$this->_container->toRowspanned($i, $this->_col);
78	78	}
79	79	$this->setProperty("rowspan", $rowspan);
		@@ -81,16 +81,16 @@ discard block
		block discarded – undo
81	81	}
82	82
83	83	public function mergeRow() {
84		- if (! $this->_rowMerged) {
85		- $this->_rowMerged = true;
	84	+ if (!$this->_rowMerged) {
	85	+ $this->_rowMerged=true;
86	86	return $this->setRowspan($this->_container->count());
87	87	}
88	88	return $this->_container;
89	89	}
90	90
91	91	public function mergeCol() {
92		- if (! $this->_colMerged) {
93		- $this->_colMerged = true;
	92	+ if (!$this->_colMerged) {
	93	+ $this->_colMerged=true;
94	94	return $this->setColspan($this->_container->getRow($this->_row)
95	95	->count());
96	96	}
		@@ -98,25 +98,25 @@ discard block
		block discarded – undo
98	98	}
99	99
100	100	public function setColspan($colspan) {
101		- $to = min($this->_container->getRow($this->_row)->count(), $this->_col + $colspan - 1);
102		- for ($i = $to; $i > $this->_col; $i --) {
103		- $this->_container->delete($this->_row, $this->_col + 1);
	101	+ $to=min($this->_container->getRow($this->_row)->count(), $this->_col+$colspan-1);
	102	+ for ($i=$to; $i>$this->_col; $i--) {
	103	+ $this->_container->delete($this->_row, $this->_col+1);
104	104	}
105	105	$this->setProperty("colspan", $colspan);
106	106	return $this->_container;
107	107	}
108	108
109	109	public function getColspan() {
110		- $colspan = 1;
	110	+ $colspan=1;
111	111	if (\array_key_exists("colspan", $this->properties))
112		- $colspan = $this->getProperty("colspan");
	112	+ $colspan=$this->getProperty("colspan");
113	113	return $colspan;
114	114	}
115	115
116	116	public function getRowspan() {
117		- $rowspan = 1;
	117	+ $rowspan=1;
118	118	if (\array_key_exists("rowspan", $this->properties))
119		- $rowspan = $this->getProperty("rowspan");
	119	+ $rowspan=$this->getProperty("rowspan");
120	120	return $rowspan;
121	121	}
122	122
		@@ -132,16 +132,16 @@ discard block
		block discarded – undo
132	132	return $this;
133	133	}
134	134
135		- public function setSelectable($href = "#") {
	135	+ public function setSelectable($href="#") {
136	136	if (\is_string($this->content)) {
137		- $this->content = new HtmlLink("", $href, $this->content);
	137	+ $this->content=new HtmlLink("", $href, $this->content);
138	138	}
139	139	return $this->addToProperty("class", "selectable");
140	140	}
141	141
142	142	public function setWidth($width) {
143	143	if (\is_int($width)) {
144		- $width = Wide::getConstants()["W" . $width];
	144	+ $width=Wide::getConstants()["W".$width];
145	145	}
146	146	$this->addToPropertyCtrl("class", $width, Wide::getConstants());
147	147	return $this->addToPropertyCtrl("class", "wide", array(
		@@ -150,12 +150,12 @@ discard block
		block discarded – undo
150	150	}
151	151
152	152	public function toDelete() {
153		- $this->_deleted = true;
	153	+ $this->_deleted=true;
154	154	return $this;
155	155	}
156	156
157		- public function compile(JsUtils $js = NULL, &$view = NULL) {
158		- if (! $this->_deleted)
	157	+ public function compile(JsUtils $js=NULL, &$view=NULL) {
	158	+ if (!$this->_deleted)
159	159	return parent::compile($js, $view);
160	160	}
161	161	}

		@@ -15,13 +15,13 @@ discard block
		block discarded – undo
15	15	*/
16	16	class HtmlTableContent extends HtmlSemCollection {
17	17
18		- protected $_tdTagNames = [
	18	+ protected $_tdTagNames=[
19	19	"thead" => "th",
20	20	"tbody" => "td",
21	21	"tfoot" => "th"
22	22	];
23	23
24		- protected $_merged = false;
	24	+ protected $_merged=false;
25	25
26	26	/**
27	27	*
		@@ -30,7 +30,7 @@ discard block
		block discarded – undo
30	30	* @param int $rowCount
31	31	* @param int $colCount
32	32	*/
33		- public function __construct($identifier, $tagName = "tbody", $rowCount = NULL, $colCount = NULL) {
	33	+ public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) {
34	34	parent::__construct($identifier, $tagName, "");
35	35	if (isset($rowCount) && isset($colCount))
36	36	$this->setRowCount($rowCount, $colCount);
		@@ -43,8 +43,8 @@ discard block
		block discarded – undo
43	43	* @return HtmlTableContent
44	44	*/
45	45	public function setRowCount($rowCount, $colCount) {
46		- $count = $this->count();
47		- for ($i = $count; $i < $rowCount; $i ++) {
	46	+ $count=$this->count();
	47	+ for ($i=$count; $i<$rowCount; $i++) {
48	48	$this->addItem($colCount);
49	49	}
50	50	return $this;
		@@ -55,7 +55,7 @@ discard block
		block discarded – undo
55	55	}
56	56
57	57	public function refreshTR() {
58		- $this->_template = "%wrapContentBefore%%content%%wrapContentAfter%";
	58	+ $this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
59	59	}
60	60
61	61	/**
		@@ -66,11 +66,11 @@ discard block
		block discarded – undo
66	66	* @return HtmlTR
67	67	*/
68	68	protected function createItem($value) {
69		- $count = $this->count();
70		- $tr = new HtmlTR("");
	69	+ $count=$this->count();
	70	+ $tr=new HtmlTR("");
71	71	$tr->setContainer($this, $count);
72	72	$tr->setTdTagName($this->_tdTagNames[$this->tagName]);
73		- if (isset($value) === true) {
	73	+ if (isset($value)===true) {
74	74	$tr->setColCount($value);
75	75	}
76	76	return $tr;
		@@ -98,8 +98,8 @@ discard block
		block discarded – undo
98	98	return $this->addItem($row);
99	99	}
100	100
101		- public function addMergeRow($colCount, $value = null) {
102		- $row = $this->addRow($colCount);
	101	+ public function addMergeRow($colCount, $value=null) {
	102	+ $row=$this->addRow($colCount);
103	103	$row->mergeCol();
104	104	if (isset($value)) {
105	105	$row->setValues([
		@@ -125,11 +125,11 @@ discard block
		block discarded – undo
125	125	* @return HtmlTD\|HtmlDoubleElement
126	126	*/
127	127	public function getCell($row, $col) {
128		- $row = $this->getItem($row);
	128	+ $row=$this->getItem($row);
129	129	if (isset($row) && $row instanceof HtmlCollection) {
130		- $col = $row->getItem($col);
	130	+ $col=$row->getItem($col);
131	131	} else {
132		- $col = $row;
	132	+ $col=$row;
133	133	}
134	134	return $col;
135	135	}
		@@ -150,9 +150,9 @@ discard block
		block discarded – undo
150	150	* @param mixed $value
151	151	* @return HtmlTableContent
152	152	*/
153		- public function setCellValue($row, $col, $value = "") {
154		- $cell = $this->getCell($row, $col);
155		- if (isset($cell) === true) {
	153	+ public function setCellValue($row, $col, $value="") {
	154	+ $cell=$this->getCell($row, $col);
	155	+ if (isset($cell)===true) {
156	156	$cell->setValue($value);
157	157	}
158	158	return $this;
		@@ -163,8 +163,8 @@ discard block
		block discarded – undo
163	163	*
164	164	* @param mixed $values
165	165	*/
166		- public function setValues($values = array()) {
167		- return $this->_addOrSetValues($values, function (HtmlTR $row, $_values) {
	166	+ public function setValues($values=array()) {
	167	+ return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {
168	168	$row->setValues($_values);
169	169	});
170	170	}
		@@ -174,8 +174,8 @@ discard block
		block discarded – undo
174	174	*
175	175	* @param mixed $values
176	176	*/
177		- public function addValues($values = array()) {
178		- return $this->_addOrSetValues($values, function (HtmlTR $row, $_values) {
	177	+ public function addValues($values=array()) {
	178	+ return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {
179	179	$row->addValues($_values);
180	180	});
181	181	}
		@@ -187,42 +187,42 @@ discard block
		block discarded – undo
187	187	* @param callable $callback
188	188	*/
189	189	protected function _addOrSetValues($values, $callback) {
190		- $count = $this->count();
191		- $isArray = true;
192		- if (! \is_array($values)) {
193		- $values = \array_fill(0, $count, $values);
194		- $isArray = false;
	190	+ $count=$this->count();
	191	+ $isArray=true;
	192	+ if (!\is_array($values)) {
	193	+ $values=\array_fill(0, $count, $values);
	194	+ $isArray=false;
195	195	}
196		- if (JArray::dimension($values) == 1 && $isArray)
197		- $values = [
	196	+ if (JArray::dimension($values)==1 && $isArray)
	197	+ $values=[
198	198	$values
199	199	];
200	200
201		- $count = \min(\sizeof($values), $count);
	201	+ $count=\min(\sizeof($values), $count);
202	202
203		- for ($i = 0; $i < $count; $i ++) {
204		- $row = $this->content[$i];
	203	+ for ($i=0; $i<$count; $i++) {
	204	+ $row=$this->content[$i];
205	205	$callback($row, $values[$i]);
206	206	}
207	207	return $this;
208	208	}
209	209
210		- public function setColValues($colIndex, $values = array()) {
211		- $count = $this->count();
212		- if (! \is_array($values)) {
213		- $values = \array_fill(0, $count, $values);
	210	+ public function setColValues($colIndex, $values=array()) {
	211	+ $count=$this->count();
	212	+ if (!\is_array($values)) {
	213	+ $values=\array_fill(0, $count, $values);
214	214	}
215		- $count = \min(\sizeof($values), $count);
216		- for ($i = 0; $i < $count; $i ++) {
	215	+ $count=\min(\sizeof($values), $count);
	216	+ for ($i=0; $i<$count; $i++) {
217	217	$this->getCell($i, $colIndex)->setValue($values[$i]);
218	218	}
219	219	return $this;
220	220	}
221	221
222		- public function addColVariations($colIndex, $variations = array()) {
223		- $count = $this->count();
224		- for ($i = 0; $i < $count; $i ++) {
225		- $cell = $this->getCell($i, $colIndex);
	222	+ public function addColVariations($colIndex, $variations=array()) {
	223	+ $count=$this->count();
	224	+ for ($i=0; $i<$count; $i++) {
	225	+ $cell=$this->getCell($i, $colIndex);
226	226	if ($cell instanceof BaseTrait)
227	227	$cell->addVariations($variations);
228	228	}
		@@ -230,41 +230,41 @@ discard block
		block discarded – undo
230	230	}
231	231
232	232	public function addPropertyCol($colIndex, $name, $value) {
233		- $count = $this->count();
234		- for ($i = 0; $i < $count; $i ++) {
235		- $cell = $this->getCell($i, $colIndex);
	233	+ $count=$this->count();
	234	+ for ($i=0; $i<$count; $i++) {
	235	+ $cell=$this->getCell($i, $colIndex);
236	236	if (isset($cell))
237	237	$cell->addToProperty($name, $value);
238	238	}
239	239	return $this;
240	240	}
241	241
242		- public function setRowValues($rowIndex, $values = array()) {
243		- $count = $this->count();
244		- if (! \is_array($values)) {
245		- $values = \array_fill(0, $count, $values);
	242	+ public function setRowValues($rowIndex, $values=array()) {
	243	+ $count=$this->count();
	244	+ if (!\is_array($values)) {
	245	+ $values=\array_fill(0, $count, $values);
246	246	}
247	247	$this->getItem($rowIndex)->setValues($values);
248	248	return $this;
249	249	}
250	250
251	251	private function colAlign($colIndex, $function) {
252		- $count = $this->count();
253		- for ($i = 0; $i < $count; $i ++) {
254		- $index = $this->content[$i]->getColPosition($colIndex);
255		- if ($index !== NULL)
	252	+ $count=$this->count();
	253	+ for ($i=0; $i<$count; $i++) {
	254	+ $index=$this->content[$i]->getColPosition($colIndex);
	255	+ if ($index!==NULL)
256	256	$this->getCell($i, $index)->$function();
257	257	}
258	258	return $this;
259	259	}
260	260
261	261	private function colAlignFromRight($colIndex, $function) {
262		- $count = $this->count();
263		- for ($i = 0; $i < $count; $i ++) {
264		- $maxRow = $this->content[$i]->count();
265		- $index = $maxRow - $colIndex - 1;
266		- if (($cell = $this->getCell($i, $index)) !== NULL) {
267		- if ($cell->getColspan() == 1)
	262	+ $count=$this->count();
	263	+ for ($i=0; $i<$count; $i++) {
	264	+ $maxRow=$this->content[$i]->count();
	265	+ $index=$maxRow-$colIndex-1;
	266	+ if (($cell=$this->getCell($i, $index))!==NULL) {
	267	+ if ($cell->getColspan()==1)
268	268	$cell->$function();
269	269	}
270	270	}
		@@ -310,9 +310,9 @@ discard block
		block discarded – undo
310	310	* @return int
311	311	*/
312	312	public function getColCount() {
313		- $result = 0;
314		- if ($this->count() > 0)
315		- $result = $this->getItem(0)->count();
	313	+ $result=0;
	314	+ if ($this->count()>0)
	315	+ $result=$this->getItem(0)->count();
316	316	return $result;
317	317	}
318	318
		@@ -323,10 +323,10 @@ discard block
		block discarded – undo
323	323	* @param int $colIndex
324	324	* @return HtmlTableContent
325	325	*/
326		- public function delete($rowIndex, $colIndex = NULL) {
	326	+ public function delete($rowIndex, $colIndex=NULL) {
327	327	if (isset($colIndex)) {
328		- $row = $this->getItem($rowIndex);
329		- if (isset($row) === true) {
	328	+ $row=$this->getItem($rowIndex);
	329	+ if (isset($row)===true) {
330	330	$row->delete($colIndex);
331	331	}
332	332	} else {
		@@ -336,24 +336,24 @@ discard block
		block discarded – undo
336	336	}
337	337
338	338	public function toDelete($rowIndex, $colIndex) {
339		- $row = $this->getItem($rowIndex);
340		- if (isset($row) === true)
	339	+ $row=$this->getItem($rowIndex);
	340	+ if (isset($row)===true)
341	341	$row->toDelete($colIndex);
342	342	return $this;
343	343	}
344	344
345	345	public function toRowspanned($rowIndex, $colIndex) {
346		- $row = $this->getItem($rowIndex);
347		- if (isset($row) === true)
	346	+ $row=$this->getItem($rowIndex);
	347	+ if (isset($row)===true)
348	348	$row->toRowspanned($colIndex);
349	349	return $this;
350	350	}
351	351
352		- public function mergeCol($rowIndex = 0, $colIndex = 0) {
	352	+ public function mergeCol($rowIndex=0, $colIndex=0) {
353	353	return $this->getItem($rowIndex)->mergeCol($colIndex);
354	354	}
355	355
356		- public function mergeRow($rowIndex = 0, $colIndex = 0) {
	356	+ public function mergeRow($rowIndex=0, $colIndex=0) {
357	357	return $this->getItem($rowIndex)->mergeRow($colIndex);
358	358	}
359	359
		@@ -373,7 +373,7 @@ discard block
		block discarded – undo
373	373	* @return HtmlTableContent
374	374	*/
375	375	public function conditionalCellFormat($callback, $format) {
376		- $rows = $this->content;
	376	+ $rows=$this->content;
377	377	foreach ($rows as $row) {
378	378	$row->conditionalCellFormat($callback, $format);
379	379	}
		@@ -381,9 +381,9 @@ discard block
		block discarded – undo
381	381	}
382	382
383	383	public function conditionalColFormat($colIndex, $callback, $format) {
384		- $rows = $this->content;
	384	+ $rows=$this->content;
385	385	foreach ($rows as $row) {
386		- $cell = $row->getItem($colIndex);
	386	+ $cell=$row->getItem($colIndex);
387	387	$cell->conditionnalCellFormat($callback, $format);
388	388	}
389	389	return $this;
		@@ -396,7 +396,7 @@ discard block
		block discarded – undo
396	396	* @return HtmlTableContent
397	397	*/
398	398	public function conditionalRowFormat($callback, $format) {
399		- $rows = $this->content;
	399	+ $rows=$this->content;
400	400	foreach ($rows as $row) {
401	401	$row->conditionalRowFormat($callback, $format);
402	402	}
		@@ -404,9 +404,9 @@ discard block
		block discarded – undo
404	404	}
405	405
406	406	public function hideColumn($colIndex) {
407		- $rows = $this->content;
	407	+ $rows=$this->content;
408	408	foreach ($rows as $row) {
409		- $cell = $row->getItem($colIndex);
	409	+ $cell=$row->getItem($colIndex);
410	410	$cell->addToProperty("style", "display:none;");
411	411	}
412	412	return $this;
		@@ -418,7 +418,7 @@ discard block
		block discarded – undo
418	418	* @return HtmlTableContent
419	419	*/
420	420	public function applyCells($callback) {
421		- $rows = $this->content;
	421	+ $rows=$this->content;
422	422	foreach ($rows as $row) {
423	423	$row->applyCells($callback);
424	424	}
		@@ -431,7 +431,7 @@ discard block
		block discarded – undo
431	431	* @return HtmlTableContent
432	432	*/
433	433	public function applyRows($callback) {
434		- $rows = $this->content;
	434	+ $rows=$this->content;
435	435	foreach ($rows as $row) {
436	436	$row->apply($callback);
437	437	}
		@@ -446,28 +446,28 @@ discard block
		block discarded – undo
446	446	* @see https://fomantic-ui.com/collections/table.html#definition needs rowspanned class
447	447	* @since fomantic-ui 2.4.8
448	448	*/
449		- public function mergeIdentiqualValues($colIndex, $function = "strip_tags") {
450		- $rows = $this->content;
451		- $identiqual = null;
452		- $counter = 0;
453		- $cellToMerge = null;
454		- $functionExists = \function_exists($function);
	449	+ public function mergeIdentiqualValues($colIndex, $function="strip_tags") {
	450	+ $rows=$this->content;
	451	+ $identiqual=null;
	452	+ $counter=0;
	453	+ $cellToMerge=null;
	454	+ $functionExists=\function_exists($function);
455	455	foreach ($rows as $row) {
456		- $cell = $row->getItem($colIndex);
457		- $value = $cell->getContent();
	456	+ $cell=$row->getItem($colIndex);
	457	+ $value=$cell->getContent();
458	458	if ($functionExists)
459		- $value = \call_user_func($function, $value);
460		- if ($value !== $identiqual) {
461		- if ($counter > 0 && isset($cellToMerge)) {
	459	+ $value=\call_user_func($function, $value);
	460	+ if ($value!==$identiqual) {
	461	+ if ($counter>0 && isset($cellToMerge)) {
462	462	$cellToMerge->setRowspanned($counter);
463	463	}
464		- $counter = 0;
465		- $cellToMerge = $cell;
466		- $identiqual = $value;
	464	+ $counter=0;
	465	+ $cellToMerge=$cell;
	466	+ $identiqual=$value;
467	467	}
468		- $counter ++;
	468	+ $counter++;
469	469	}
470		- if ($counter > 0 && isset($cellToMerge)) {
	470	+ if ($counter>0 && isset($cellToMerge)) {
471	471	$cellToMerge->setRowspanned($counter);
472	472	}
473	473	return $this;
		@@ -478,7 +478,7 @@ discard block
		block discarded – undo
478	478	}
479	479
480	480	public function _setMerged($value) {
481		- $this->_merged = $value;
	481	+ $this->_merged=$value;
482	482	return $this;
483	483	}
484	484	}

phpMv / phpMv-UI

Push — master ( 6da082...c653a4 )

Status

Category

Spacing +44 added lines, -44 removed lines patch added patch discarded remove patch

Spacing +32 added lines, -32 removed lines patch added patch discarded remove patch

Spacing +95 added lines, -95 removed lines patch added patch discarded remove patch