phpMv / phpMv-UI

Ajax/common/html/BaseHtml.php

Spacing +42 added lines, -42 removed lines

@@ -14,11 +14,11 @@ 
  * @version 1.3
  */
 abstract class BaseHtml extends BaseWidget {
-	use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait;
+	use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait;
 	protected $_template;
 	protected $tagName;
-	protected $_wrapBefore=array ();
-	protected $_wrapAfter=array ();
+	protected $_wrapBefore=array();
+	protected $_wrapAfter=array();
 	protected $_bsComponent;
 	protected $_compiled=false;
 	protected $_postCompile;
@@ -31,14 +31,14 @@ 
 	 */
 	abstract public function run(JsUtils $js);
 
-	private function _callSetter($setter,$key,$value,&$array){
+	private function _callSetter($setter, $key, $value, &$array) {
 		$result=false;
-		if (method_exists($this, $setter) && substr($setter, 0, 1) !== "_") {
+		if (method_exists($this, $setter) && substr($setter, 0, 1)!=="_") {
 			try {
 				$this->$setter($value);
 				unset($array[$key]);
 				$result=true;
-			} catch ( \Exception $e ) {
+			}catch (\Exception $e) {
 				$result=false;
 			}
 		}
@@ -46,17 +46,17 @@ 
 	}
 
 	protected function getTemplate(JsUtils $js=NULL) {
-		return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js);
+		return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js);
 	}
 
 	protected function ctrl($name, $value, $typeCtrl) {
 		if (\is_array($typeCtrl)) {
-			if (array_search($value, $typeCtrl) === false) {
-				throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}");
+			if (array_search($value, $typeCtrl)===false) {
+				throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
 			}
 		} else {
 			if (!$typeCtrl($value)) {
-				throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name);
+				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
 			}
 		}
 		return true;
@@ -65,7 +65,7 @@ 
 
 
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			return $name=$value;
 		}
 		return $this;
@@ -74,7 +74,7 @@ 
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
@@ -82,17 +82,17 @@ 
 
 
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			if (\is_array($typeCtrl)) {
 				$this->removeOldValues($name, $typeCtrl);
 			}
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
 
 	protected function addToMember(&$name, $value, $separator=" ") {
-		$name=str_ireplace($value, "", $name) . $separator . $value;
+		$name=str_ireplace($value, "", $name).$separator.$value;
 		return $this;
 	}
 
@@ -103,18 +103,18 @@ 
 		$oldValue=trim($oldValue);
 	}
 
-	protected function _getElementBy($callback,$elements){
+	protected function _getElementBy($callback, $elements) {
 		if (\is_array($elements)) {
 			$elements=\array_values($elements);
 			$flag=false;
 			$index=0;
-			while ( !$flag && $index < sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
 					$flag=($callback($elements[$index]));
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag===true)
+				return $elements[$index-1];
 		} elseif ($elements instanceof BaseHtml) {
 			if ($callback($elements))
 				return $elements;
@@ -142,13 +142,13 @@ 
 	}
 
 	public function fromArray($array) {
-		foreach ( $this as $key => $value ) {
-			if(array_key_exists($key, $array)===true)
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+		foreach ($this as $key => $value) {
+			if (array_key_exists($key, $array)===true)
+				$this->_callSetter("set".ucfirst($key), $key, $array[$key], $array);
 		}
-		foreach ( $array as $key => $value ) {
-			if($this->_callSetter($key, $key, $value, $array)===false){
-				$this->_callSetter("set" . ucfirst($key), $key, $value, $array);
+		foreach ($array as $key => $value) {
+			if ($this->_callSetter($key, $key, $value, $array)===false) {
+				$this->_callSetter("set".ucfirst($key), $key, $value, $array);
 			}
 		}
 		return $array;
@@ -156,7 +156,7 @@ 
 
 	public function fromDatabaseObjects($objects, $function) {
 		if (isset($objects)) {
-			foreach ( $objects as $object ) {
+			foreach ($objects as $object) {
 				$this->fromDatabaseObject($object, $function);
 			}
 		}
@@ -177,7 +177,7 @@ 
 
 
 	public function getElementById($identifier, $elements) {
-		return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements);
+		return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements);
 	}
 
 	public function getBsComponent() {
@@ -190,14 +190,14 @@ 
 	}
 
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
-		if(!$this->_compiled){
-			if(isset($js)){
+		if (!$this->_compiled) {
+			if (isset($js)) {
 				$beforeCompile=$js->getParam("beforeCompileHtml");
-				if(\is_callable($beforeCompile)){
-					$beforeCompile($this,$js,$view);
+				if (\is_callable($beforeCompile)) {
+					$beforeCompile($this, $js, $view);
 				}
 			}
-			if(\is_callable($this->_preCompile)){
+			if (\is_callable($this->_preCompile)) {
 				$pc=$this->_preCompile;
 				$pc($this);
 			}
@@ -207,15 +207,15 @@ 
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		$this->compile_once($js,$view);
+		$this->compile_once($js, $view);
 		$result=$this->getTemplate($js);
-		foreach ( $this as $key => $value ) {
-				if(\strstr($result, "%{$key}%")!==false){
+		foreach ($this as $key => $value) {
+				if (\strstr($result, "%{$key}%")!==false) {
 					if (\is_array($value)) {
 						$v=PropertyWrapper::wrap($value, $js);
-					}elseif($value instanceof \stdClass){
-							$v=\print_r($value,true);
-					}else{
+					}elseif ($value instanceof \stdClass) {
+							$v=\print_r($value, true);
+					} else {
 						$v=$value;
 					}
 					$result=str_replace("%{$key}%", $v, $result);
@@ -223,12 +223,12 @@ 
 		}
 		if (isset($js)===true) {
 			$this->run($js);
-			if (isset($view) === true) {
+			if (isset($view)===true) {
 				$js->addViewElement($this->_identifier, $result, $view);
 			}
 		}
 
-		if(\is_callable($this->_postCompile)){
+		if (\is_callable($this->_postCompile)) {
 			$pc=$this->_postCompile;
 			$pc($this);
 		}
@@ -239,11 +239,11 @@ 
 		return $this->compile();
 	}
 
-	public function onPostCompile($callback){
+	public function onPostCompile($callback) {
 		$this->_postCompile=$callback;
 	}
 
-	public function onPreCompile($callback){
+	public function onPreCompile($callback) {
 		$this->_preCompile=$callback;
 	}
 }

Braces +14 added lines, -10 removed lines

@@ -109,15 +109,18 @@ 
 			$flag=false;
 			$index=0;
 			while ( !$flag && $index < sizeof($elements) ) {
-				if ($elements[$index] instanceof BaseHtml)
-					$flag=($callback($elements[$index]));
+				if ($elements[$index] instanceof BaseHtml) {
+									$flag=($callback($elements[$index]));
+				}
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag === true) {
+							return $elements[$index - 1];
+			}
 		} elseif ($elements instanceof BaseHtml) {
-			if ($callback($elements))
-				return $elements;
+			if ($callback($elements)) {
+							return $elements;
+			}
 		}
 		return null;
 	}
@@ -143,8 +146,9 @@ 
 
 	public function fromArray($array) {
 		foreach ( $this as $key => $value ) {
-			if(array_key_exists($key, $array)===true)
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+			if(array_key_exists($key, $array)===true) {
+							$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+			}
 		}
 		foreach ( $array as $key => $value ) {
 			if($this->_callSetter($key, $key, $value, $array)===false){
@@ -213,9 +217,9 @@ 
 				if(\strstr($result, "%{$key}%")!==false){
 					if (\is_array($value)) {
 						$v=PropertyWrapper::wrap($value, $js);
-					}elseif($value instanceof \stdClass){
+					} elseif($value instanceof \stdClass){
 							$v=\print_r($value,true);
-					}else{
+					} else{
 						$v=$value;
 					}
 					$result=str_replace("%{$key}%", $v, $result);

Ajax/common/html/PropertyWrapper.php

Spacing +13 added lines, -13 removed lines

@@ -12,8 +12,8 @@ 
 		}
 		$output="";
 		if (\is_array($input)) {
-			if (sizeof($input) > 0) {
-				if (self::containsElement($input) === false) {
+			if (sizeof($input)>0) {
+				if (self::containsElement($input)===false) {
 					$output=self::wrapStrings($input, $separator=' ', $valueQuote='"');
 				} else {
 					$output=self::wrapObjects($input, $js, $separator, $valueQuote);
@@ -24,7 +24,7 @@ 
 	}
 
 	private static function containsElement($input) {
-		foreach ( $input as $v ) {
+		foreach ($input as $v) {
 			if (\is_object($v) || \is_array($v))
 				return true;
 		}
@@ -32,9 +32,9 @@ 
 	}
 
 	public static function wrapStrings($input, $separator=' ', $valueQuote='"') {
-		if (JArray::isAssociative($input) === true) {
-			$result=implode($separator, array_map(function ($v, $k) use($valueQuote) {
-				return $k . '=' . $valueQuote . $v . $valueQuote;
+		if (JArray::isAssociative($input)===true) {
+			$result=implode($separator, array_map(function($v, $k) use($valueQuote) {
+				return $k.'='.$valueQuote.$v.$valueQuote;
 			}, $input, array_keys($input)));
 		} else {
 			$result=implode($separator, $input);
@@ -43,17 +43,17 @@ 
 	}
 
 	public static function wrapObjects($input, $js=NULL, $separator=' ', $valueQuote='"') {
-		return implode($separator, array_map(function ($v) use($js, $separator, $valueQuote) {
-			if(\is_string($v)){
+		return implode($separator, array_map(function($v) use($js, $separator, $valueQuote) {
+			if (\is_string($v)) {
 				return $v;
 			}
-			if ($v instanceof BaseHtml){
+			if ($v instanceof BaseHtml) {
 				return $v->compile($js);
 			}
 			if (\is_array($v)) {
 				return self::wrap($v, $js, $separator, $valueQuote);
 			}
-			if(!\is_callable($v)){
+			if (!\is_callable($v)) {
 				return $v;
 			}
 		}, $input));
@@ -71,14 +71,14 @@ 
 		return $result;*/
 	}
 
-	protected static function wrapValue($value,$js=NULL, $separator=' ', $valueQuote='"'){
+	protected static function wrapValue($value, $js=NULL, $separator=' ', $valueQuote='"') {
 		if (\is_array($value)) {
 			return self::wrap($value, $js, $separator, $valueQuote);
 		}
-		if ($value instanceof BaseHtml){
+		if ($value instanceof BaseHtml) {
 			return $value->compile($js);
 		}
-		if(!\is_callable($value)){
+		if (!\is_callable($value)) {
 			return $value;
 		}
 		return '';

Braces +3 added lines, -2 removed lines

@@ -25,8 +25,9 @@
 
 	private static function containsElement($input) {
 		foreach ( $input as $v ) {
-			if (\is_object($v) || \is_array($v))
-				return true;
+			if (\is_object($v) || \is_array($v)) {
+							return true;
+			}
 		}
 		return false;
 	}

Ajax/common/traits/JsUtilsInternalTrait.php

Spacing +8 added lines, -8 removed lines

@@ -2,10 +2,10 @@ 
 namespace Ajax\common\traits;
 use Ajax\common\BaseGui;
 
-trait JsUtilsInternalTrait{
+trait JsUtilsInternalTrait {
 
-	protected $jquery_code_for_compile=array ();
-	protected $jquery_code_for_compile_at_last=array ();
+	protected $jquery_code_for_compile=array();
+	protected $jquery_code_for_compile_at_last=array();
 
 	protected function _addToCompile($jsScript) {
 		$this->jquery_code_for_compile[]=$jsScript;
@@ -15,28 +15,28 @@ 
 	 * @param BaseGui $library
 	 * @param mixed $view
 	 */
-	protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL){
-		if(isset($view))
+	protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL) {
+		if (isset($view))
 			$library->compileHtml($this, $view);
 		if ($library->isAutoCompile()) {
 			$library->compile(true);
 		}
 	}
 
-	protected function defer($script){
+	protected function defer($script) {
 		$result="window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { defer(method) }, 50);};";
 		$result.="window.defer(function(){".$script."})";
 		return $result;
 	}
 
-	protected function ready($script){
+	protected function ready($script) {
 		$result='$(document).ready(function() {'."\n";
 		$result.=$script.'})';
 		return $result;
 	}
 
 	protected function minify($input) {
-		if(trim($input) === "") return $input;
+		if (trim($input)==="") return $input;
 		return preg_replace(
 				array(
 						// Remove comment(s)

Braces +6 added lines, -3 removed lines

@@ -16,8 +16,9 @@ 
 	 * @param mixed $view
 	 */
 	protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL){
-		if(isset($view))
-			$library->compileHtml($this, $view);
+		if(isset($view)) {
+					$library->compileHtml($this, $view);
+		}
 		if ($library->isAutoCompile()) {
 			$library->compile(true);
 		}
@@ -36,7 +37,9 @@ 
 	}
 
 	protected function minify($input) {
-		if(trim($input) === "") return $input;
+		if(trim($input) === "") {
+			return $input;
+		}
 		return preg_replace(
 				array(
 						// Remove comment(s)

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

Spacing +21 added lines, -21 removed lines

@@ -20,19 +20,19 @@ 
 
 	public function __construct($identifier) {
 		parent::__construct($identifier, "tr", "");
-		$this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ];
+		$this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED];
 	}
 
 	public function setColCount($colCount) {
 		$count=$this->count();
-		for($i=$count; $i < $colCount; $i++) {
+		for ($i=$count; $i<$colCount; $i++) {
 			$item=$this->addItem(NULL);
 			$item->setTagName($this->_tdTagName);
 		}
 		return $this;
 	}
 
-	public function getColCount(){
+	public function getColCount() {
 		return $this->count();
 	}
 
@@ -68,7 +68,7 @@ 
 	 * @param mixed $values
 	 */
 	public function setValues($values=array()) {
-		return $this->_addOrSetValues($values, function(HtmlTD &$cell,$value){$cell->setValue($value);});
+		return $this->_addOrSetValues($values, function(HtmlTD&$cell, $value) {$cell->setValue($value); });
 	}
 
 	/**
@@ -76,27 +76,27 @@ 
 	 * @param mixed $values
 	 */
 	public function addValues($values=array()) {
-		return $this->_addOrSetValues($values, function(HtmlTD &$cell,$value){$cell->addValue($value);});
+		return $this->_addOrSetValues($values, function(HtmlTD&$cell, $value) {$cell->addValue($value); });
 	}
 
 	/**
 	 * Sets or adds values to the row cols
 	 * @param mixed $values
 	 */
-	protected function _addOrSetValues($values,$callback) {
+	protected function _addOrSetValues($values, $callback) {
 		$count=$this->count();
 		if (!\is_array($values)) {
 			$values=\array_fill(0, $count, $values);
 		} else {
-			if (JArray::isAssociative($values) === true) {
+			if (JArray::isAssociative($values)===true) {
 				$values=\array_values($values);
 			}
 		}
 		$count=\min(\sizeof($values), $count);
 
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$cell=$this->content[$i];
-			$callback($cell,$values[$i]);
+			$callback($cell, $values[$i]);
 		}
 		return $this;
 	}
@@ -120,24 +120,24 @@ 
 	}
 
 	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++) {
+		for ($i=0; $i<$this->_row; $i++) {
 			$max=\min($colIndex, $rows[$i]->count());
-			for($j=0; $j < $max; $j++) {
+			for ($j=0; $j<$max; $j++) {
 				$rowspan=$rows[$i]->getItem($j)->getRowspan();
-				if ($rowspan + $i > $this->_row)
+				if ($rowspan+$i>$this->_row)
 					$pos++;
 			}
 		}
-		if ($pos > $colIndex)
+		if ($pos>$colIndex)
 			return NULL;
 		$count=$this->count();
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$pos+=$this->content[$i]->getColspan();
-			if ($pos >= $colIndex + 1)
+			if ($pos>=$colIndex+1)
 				return $i;
 		}
 		return null;
@@ -145,7 +145,7 @@ 
 
 	public function conditionalCellFormat($callback, $format) {
 		$cells=$this->content;
-		foreach ( $cells as $cell ) {
+		foreach ($cells as $cell) {
 			$cell->conditionalCellFormat($callback, $format);
 		}
 		return $this;
@@ -160,8 +160,8 @@ 
 
 	public function containsStr($needle) {
 		$cells=$this->content;
-		foreach ( $cells as $cell ) {
-			if (\strpos($cell->getContent(), $needle) !== false)
+		foreach ($cells as $cell) {
+			if (\strpos($cell->getContent(), $needle)!==false)
 				return true;
 		}
 		return false;
@@ -174,13 +174,13 @@ 
 
 	public function applyCells($callback) {
 		$cells=$this->content;
-		foreach ( $cells as $cell ) {
+		foreach ($cells as $cell) {
 			$cell->apply($callback);
 		}
 		return $this;
 	}
 
-	public function toDelete($colIndex){
+	public function toDelete($colIndex) {
 		$this->getItem($colIndex)->toDelete();
 		return $this;
 	}

Braces +15 added lines, -10 removed lines

@@ -120,25 +120,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;
 	}
@@ -161,8 +165,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/HtmlTableContent.php

Spacing +38 added lines, -38 removed lines

@@ -11,7 +11,7 @@ 
  *
  */
 class HtmlTableContent extends HtmlSemCollection {
-	protected $_tdTagNames=[ "thead" => "th","tbody" => "td","tfoot" => "th" ];
+	protected $_tdTagNames=["thead" => "th", "tbody" => "td", "tfoot" => "th"];
 	protected $_merged=false;
 
 	/**
@@ -35,7 +35,7 @@ 
 	 */
 	public function setRowCount($rowCount, $colCount) {
 		$count=$this->count();
-		for($i=$count; $i < $rowCount; $i++) {
+		for ($i=$count; $i<$rowCount; $i++) {
 			$this->addItem($colCount);
 		}
 		return $this;
@@ -57,7 +57,7 @@ 
 		$tr=new HtmlTR("", $value);
 		$tr->setContainer($this, $count);
 		$tr->setTdTagName($this->_tdTagNames[$this->tagName]);
-		if (isset($value) === true) {
+		if (isset($value)===true) {
 			$tr->setColCount($value);
 		}
 		return $tr;
@@ -115,7 +115,7 @@ 
 	 */
 	public function setCellValue($row, $col, $value="") {
 		$cell=$this->getCell($row, $col);
-		if (isset($cell) === true) {
+		if (isset($cell)===true) {
 			$cell->setValue($value);
 		}
 		return $this;
@@ -126,7 +126,7 @@ 
 	 * @param mixed $values
 	 */
 	public function setValues($values=array()) {
-		return $this->_addOrSetValues($values, function(HtmlTR $row,$_values){$row->setValues($_values);});
+		return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {$row->setValues($_values); });
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 	 * @param mixed $values
 	 */
 	public function addValues($values=array()) {
-		return $this->_addOrSetValues($values, function(HtmlTR $row,$_values){$row->addValues($_values);});
+		return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {$row->addValues($_values); });
 	}
 
 	/**
@@ -142,21 +142,21 @@ 
 	 * @param mixed $values
 	 * @param callable $callback
 	 */
-	protected function _addOrSetValues($values,$callback) {
+	protected function _addOrSetValues($values, $callback) {
 		$count=$this->count();
 		$isArray=true;
 		if (!\is_array($values)) {
 			$values=\array_fill(0, $count, $values);
 			$isArray=false;
 		}
-		if (JArray::dimension($values) == 1 && $isArray)
-			$values=[ $values ];
+		if (JArray::dimension($values)==1 && $isArray)
+			$values=[$values];
 
 		$count=\min(\sizeof($values), $count);
 
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$row=$this->content[$i];
-			$callback($row,$values[$i]);
+			$callback($row, $values[$i]);
 		}
 		return $this;
 	}
@@ -167,7 +167,7 @@ 
 			$values=\array_fill(0, $count, $values);
 		}
 		$count=\min(\sizeof($values), $count);
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$this->getCell($i, $colIndex)->setValue($values[$i]);
 		}
 		return $this;
@@ -175,7 +175,7 @@ 
 
 	public function addColVariations($colIndex, $variations=array()) {
 		$count=$this->count();
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$this->getCell($i, $colIndex)->addVariations($variations);
 		}
 		return $this;
@@ -192,9 +192,9 @@ 
 
 	private function colAlign($colIndex, $function) {
 		$count=$this->count();
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$index=$this->content[$i]->getColPosition($colIndex);
-			if ($index !== NULL)
+			if ($index!==NULL)
 				$this->getCell($i, $index)->$function();
 		}
 		return $this;
@@ -226,7 +226,7 @@ 
 	 */
 	public function getColCount() {
 		$result=0;
-		if ($this->count() > 0)
+		if ($this->count()>0)
 			$result=$this->getItem(0)->count();
 		return $result;
 	}
@@ -240,7 +240,7 @@ 
 	public function delete($rowIndex, $colIndex=NULL) {
 		if (isset($colIndex)) {
 			$row=$this->getItem($rowIndex);
-			if (isset($row) === true) {
+			if (isset($row)===true) {
 				$row->delete($colIndex);
 			}
 		} else {
@@ -249,9 +249,9 @@ 
 		return $this;
 	}
 
-	public function toDelete($rowIndex, $colIndex){
+	public function toDelete($rowIndex, $colIndex) {
 		$row=$this->getItem($rowIndex);
-		if (isset($row) === true)
+		if (isset($row)===true)
 			$row->toDelete($colIndex);
 		return $this;
 	}
@@ -280,17 +280,17 @@ 
 	 */
 	public function conditionalCellFormat($callback, $format) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->conditionalCellFormat($callback, $format);
 		}
 		return $this;
 	}
 
-	public function conditionalColFormat($colIndex,$callback,$format){
+	public function conditionalColFormat($colIndex, $callback, $format) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$cell=$row->getItem($colIndex);
-			$cell->conditionnalCellFormat($callback,$format);
+			$cell->conditionnalCellFormat($callback, $format);
 		}
 		return $this;
 	}
@@ -302,17 +302,17 @@ 
 	 */
 	public function conditionalRowFormat($callback, $format) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->conditionalRowFormat($callback, $format);
 		}
 		return $this;
 	}
 
-	public function hideColumn($colIndex){
+	public function hideColumn($colIndex) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$cell=$row->getItem($colIndex);
-			$cell->addToProperty("style","display:none;");
+			$cell->addToProperty("style", "display:none;");
 		}
 		return $this;
 	}
@@ -323,7 +323,7 @@ 
 	 */
 	public function applyCells($callback) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->applyCells($callback);
 		}
 		return $this;
@@ -335,25 +335,25 @@ 
 	 */
 	public function applyRows($callback) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->apply($callback);
 		}
 		return $this;
 	}
 
-	public function mergeIdentiqualValues($colIndex,$function="strip_tags"){
+	public function mergeIdentiqualValues($colIndex, $function="strip_tags") {
 		$rows=$this->content;
 		$identiqual=null;
 		$counter=0;
 		$cellToMerge=null;
 		$functionExists=\function_exists($function);
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$cell=$row->getItem($colIndex);
 			$value=$cell->getContent();
-			if($functionExists)
-				$value=\call_user_func($function,$value);
-			if($value!==$identiqual){
-				if($counter>0 && isset($cellToMerge)){
+			if ($functionExists)
+				$value=\call_user_func($function, $value);
+			if ($value!==$identiqual) {
+				if ($counter>0 && isset($cellToMerge)) {
 					$cellToMerge->setRowspan($counter);
 				}
 				$counter=0;
@@ -362,17 +362,17 @@ 
 			}
 			$counter++;
 		}
-		if($counter>0 && isset($cellToMerge)){
+		if ($counter>0 && isset($cellToMerge)) {
 			$cellToMerge->setRowspan($counter);
 		}
 		return $this;
 	}
 
-	public function _isMerged(){
+	public function _isMerged() {
 		return $this->_merged;
 	}
 
-	public function _setMerged($value){
+	public function _setMerged($value) {
 		$this->_merged=$value;
 		return $this;
 	}

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

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
 use Ajax\JsUtils;
 
 class HtmlTD extends HtmlSemDoubleElement {
-	use TextAlignmentTrait,TableElementTrait;
+	use TextAlignmentTrait, TableElementTrait;
 	private $_container;
 	private $_row;
 	private $_col;
@@ -28,8 +28,8 @@ 
 	 */
 	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) {
@@ -49,8 +49,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);
@@ -58,7 +58,7 @@ 
 	}
 
 	public function mergeRow() {
-		if(!$this->_rowMerged){
+		if (!$this->_rowMerged) {
 			$this->_rowMerged=true;
 			return $this->setRowspan($this->_container->count());
 		}
@@ -66,7 +66,7 @@ 
 	}
 
 	public function mergeCol() {
-		if(!$this->_colMerged){
+		if (!$this->_colMerged) {
 			$this->_colMerged=true;
 			return $this->setColspan($this->_container->getRow($this->_row)->count());
 		}
@@ -74,9 +74,9 @@ 
 	}
 
 	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->toDelete($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->toDelete($this->_row, $this->_col+1);
 		}
 		$this->setProperty("colspan", $colspan);
 		return $this->_container->_setMerged(true);
@@ -115,21 +115,21 @@ 
 		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(){
+	public function toDelete() {
 		$this->_deleted=true;
 		return $this;
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(!$this->_deleted)
+		if (!$this->_deleted)
 			return parent::compile();
 		return;
 	}