phpMv / phpMv-UI

Ajax/semantic/html/collections/table/HtmlTable.php

Spacing +58 added lines, -58 removed lines

@@ -31,7 +31,7 @@ 
 
 	private $_activeRowSelector;
 
-	private $_focusable = false;
+	private $_focusable=false;
 
 	/**
 	 *
@@ -45,19 +45,19 @@ 
 
 	public function __construct($identifier, $rowCount, $colCount) {
 		parent::__construct($identifier, "table", "ui table");
-		$this->content = array();
+		$this->content=array();
 		$this->setRowCount($rowCount, $colCount);
-		$this->_variations = [
+		$this->_variations=[
 			Variation::CELLED,
 			Variation::PADDED,
 			Variation::COMPACT
 		];
-		$this->_compileParts = [
+		$this->_compileParts=[
 			"thead",
 			"tbody",
 			"tfoot"
 		];
-		$this->_afterCompileEvents = [];
+		$this->_afterCompileEvents=[];
 	}
 
 	/**
@@ -67,9 +67,9 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function getPart($key) {
-		if (\array_key_exists($key, $this->content) === false) {
-			$this->content[$key] = new HtmlTableContent("", $key);
-			if ($key !== "tbody") {
+		if (\array_key_exists($key, $this->content)===false) {
+			$this->content[$key]=new HtmlTableContent("", $key);
+			if ($key!=="tbody") {
 				$this->content[$key]->setRowCount(1, $this->_colCount);
 			}
 		}
@@ -126,7 +126,7 @@ 
 	 * @return boolean
 	 */
 	public function hasPart($key) {
-		return \array_key_exists($key, $this->content) === true;
+		return \array_key_exists($key, $this->content)===true;
 	}
 
 	/**
@@ -136,7 +136,7 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function setRowCount($rowCount, $colCount) {
-		$this->_colCount = $colCount;
+		$this->_colCount=$colCount;
 		return $this->getBody()->setRowCount($rowCount, $colCount);
 	}
 
@@ -167,8 +167,8 @@ 
 	 * @param array $values
 	 * @return HtmlTR
 	 */
-	public function addRow($values = array()) {
-		$row = $this->getBody()->addRow($this->_colCount);
+	public function addRow($values=array()) {
+		$row=$this->getBody()->addRow($this->_colCount);
 		$row->setValues(\array_values($values));
 		return $row;
 	}
@@ -189,7 +189,7 @@ 
 	 *        	values in an array of array
 	 * @return HtmlTable
 	 */
-	public function setValues($values = array()) {
+	public function setValues($values=array()) {
 		$this->getBody()->setValues($values);
 		return $this;
 	}
@@ -200,7 +200,7 @@ 
 	 * @param array $values
 	 * @return HtmlTableContent
 	 */
-	public function setHeaderValues($values = array()) {
+	public function setHeaderValues($values=array()) {
 		return $this->getHeader()->setValues($values);
 	}
 
@@ -210,7 +210,7 @@ 
 	 * @param array $values
 	 * @return HtmlTableContent
 	 */
-	public function setFooterValues($values = array()) {
+	public function setFooterValues($values=array()) {
 		return $this->getFooter()->setValues($values);
 	}
 
@@ -221,7 +221,7 @@ 
 	 * @param array $values
 	 * @return HtmlTable
 	 */
-	public function setColValues($colIndex, $values = array()) {
+	public function setColValues($colIndex, $values=array()) {
 		$this->getBody()->setColValues($colIndex, $values);
 		return $this;
 	}
@@ -233,12 +233,12 @@ 
 	 * @param array $values
 	 * @return HtmlTable
 	 */
-	public function setRowValues($rowIndex, $values = array()) {
+	public function setRowValues($rowIndex, $values=array()) {
 		$this->getBody()->setRowValues($rowIndex, $values);
 		return $this;
 	}
 
-	public function addColVariations($colIndex, $variations = array()) {
+	public function addColVariations($colIndex, $variations=array()) {
 		return $this->getBody()->addColVariations($colIndex, $variations);
 	}
 
@@ -305,19 +305,19 @@ 
 	public function setColAlignment($colIndex, $alignment) {
 		switch ($alignment) {
 			case TextAlignment::LEFT:
-				$function = "colLeft";
+				$function="colLeft";
 				break;
 
 			case TextAlignment::RIGHT:
-				$function = "colRight";
+				$function="colRight";
 				break;
 
 			case TextAlignment::CENTER:
-				$function = "colCenter";
+				$function="colCenter";
 				break;
 
 			default:
-				$function = "colLeft";
+				$function="colLeft";
 		}
 		$this->colAlign($colIndex, $function);
 		return $this;
@@ -326,19 +326,19 @@ 
 	public function setColAlignmentFromRight($colIndex, $alignment) {
 		switch ($alignment) {
 			case TextAlignment::LEFT:
-				$function = "colLeftFromRight";
+				$function="colLeftFromRight";
 				break;
 
 			case TextAlignment::RIGHT:
-				$function = "colRightFromRight";
+				$function="colRightFromRight";
 				break;
 
 			case TextAlignment::CENTER:
-				$function = "colCenterFromRight";
+				$function="colCenterFromRight";
 				break;
 
 			default:
-				$function = "colLeftFromRight";
+				$function="colLeftFromRight";
 		}
 		$this->colAlign($colIndex, $function);
 		return $this;
@@ -414,19 +414,19 @@ 
 	 *
 	 * @see HtmlSemDoubleElement::compile()
 	 */
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if (\sizeof($this->_compileParts) < 3) {
-			$this->_template = "%content%";
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (\sizeof($this->_compileParts)<3) {
+			$this->_template="%content%";
 			$this->refresh($js);
 		}
-		$this->content = JArray::sortAssociative($this->content, $this->_compileParts);
+		$this->content=JArray::sortAssociative($this->content, $this->_compileParts);
 		return parent::compile($js, $view);
 	}
 
-	protected function compile_once(JsUtils $js = NULL, &$view = NULL) {
+	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
 		parent::compile_once($js, $view);
 		if ($this->propertyContains("class", "sortable")) {
-			$this->addEvent("execute", "$('#" . $this->identifier . "').tablesort().data('tablesort').sort($('th.default-sort'));");
+			$this->addEvent("execute", "$('#".$this->identifier."').tablesort().data('tablesort').sort($('th.default-sort'));");
 		}
 	}
 
@@ -437,11 +437,11 @@ 
 	 * @see BaseHtml::fromDatabaseObject()
 	 */
 	public function fromDatabaseObject($object, $function) {
-		$result = $function($object);
+		$result=$function($object);
 		if (\is_array($result)) {
-			$result = $this->addRow($function($object));
+			$result=$this->addRow($function($object));
 		} else {
-			$result = $this->getBody()->_addRow($result);
+			$result=$this->getBody()->_addRow($result);
 		}
 		if (isset($this->_afterCompileEvents["onNewRow"])) {
 			if (\is_callable($this->_afterCompileEvents["onNewRow"]))
@@ -457,10 +457,10 @@ 
 	 *        	array of thead,tbody,tfoot
 	 * @return HtmlTable
 	 */
-	public function setCompileParts($parts = [
+	public function setCompileParts($parts=[
 		"tbody"
 	]) {
-		$this->_compileParts = $parts;
+		$this->_compileParts=$parts;
 		return $this;
 	}
 
@@ -470,22 +470,22 @@ 
 	}
 
 	public function refresh($js) {
-		$this->_footer = $this->getFooter();
+		$this->_footer=$this->getFooter();
 		if (isset($js)) {
-			$js->exec('$("#' . $this->identifier . ' tfoot").replaceWith("' . \addslashes($this->_footer) . '");', true);
+			$js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");', true);
 		}
 	}
 
 	public function run(JsUtils $js) {
-		if (! $this->_runned) {
+		if (!$this->_runned) {
 			if (isset($this->_activeRowSelector)) {
 				$this->_activeRowSelector->run();
 			}
 		}
-		$result = parent::run($js);
+		$result=parent::run($js);
 		if (isset($this->_footer))
 			$this->_footer->run($js);
-		$this->_runned = true;
+		$this->_runned=true;
 		return $result;
 	}
 
@@ -497,7 +497,7 @@ 
 	 * @return HtmlTable
 	 */
 	public function onNewRow($callback) {
-		$this->_afterCompileEvents["onNewRow"] = $callback;
+		$this->_afterCompileEvents["onNewRow"]=$callback;
 		return $this;
 	}
 
@@ -509,8 +509,8 @@ 
 	 * @param boolean $multiple
 	 * @return HtmlTable
 	 */
-	public function setActiveRowSelector($class = "active", $event = "click", $multiple = false) {
-		$this->_activeRowSelector = new ActiveRow($this, $class, $event, $multiple);
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
+		$this->_activeRowSelector=new ActiveRow($this, $class, $event, $multiple);
 		return $this;
 	}
 
@@ -537,29 +537,29 @@ 
 	}
 
 	public function setColWidth($colIndex, $width) {
-		$part = $this->_getFirstPart();
-		if ($part !== null && $part->count() > 0)
+		$part=$this->_getFirstPart();
+		if ($part!==null && $part->count()>0)
 			$part->getCell(0, $colIndex)->setWidth($width);
 		return $this;
 	}
 
 	public function setColWidths($widths) {
-		$part = $this->_getFirstPart();
-		if ($part !== null && $part->count() > 0) {
-			$count = $part->getColCount();
-			if (! \is_array($widths)) {
-				$widths = \array_fill(0, $count, $widths);
+		$part=$this->_getFirstPart();
+		if ($part!==null && $part->count()>0) {
+			$count=$part->getColCount();
+			if (!\is_array($widths)) {
+				$widths=\array_fill(0, $count, $widths);
 			}
-			$max = \min(\sizeof($widths), $count);
-			for ($i = 0; $i < $max; $i ++) {
+			$max=\min(\sizeof($widths), $count);
+			for ($i=0; $i<$max; $i++) {
 				$part->getCell(0, $i)->setWidth($widths[$i]);
 			}
 		}
 		return $this;
 	}
 
-	public function mergeIdentiqualValues($colIndex, $function = "strip_tags") {
-		$body = $this->getBody();
+	public function mergeIdentiqualValues($colIndex, $function="strip_tags") {
+		$body=$this->getBody();
 		$body->mergeIdentiqualValues($colIndex, $function);
 		return $this;
 	}
@@ -577,7 +577,7 @@ 
 	 * @param mixed $_innerScript
 	 */
 	public function setInnerScript($_innerScript) {
-		$this->_innerScript = $_innerScript;
+		$this->_innerScript=$_innerScript;
 	}
 
 	public function onActiveRowChange($jsCode) {
@@ -585,7 +585,7 @@ 
 		return $this;
 	}
 
-	public function addMergeRow($colCount, $value = null) {
+	public function addMergeRow($colCount, $value=null) {
 		return $this->getBody()->addMergeRow($colCount, $value);
 	}
 

Ajax/semantic/widgets/datatable/DataTable.php

Spacing +128 added lines, -128 removed lines

@@ -25,7 +25,7 @@ 
  *
  */
 class DataTable extends Widget {
-	use TableTrait,DataTableFieldAsTrait,HasCheckboxesTrait,BaseTrait;
+	use TableTrait, DataTableFieldAsTrait, HasCheckboxesTrait, BaseTrait;
 
 	protected $_searchField;
 
@@ -41,7 +41,7 @@ 
 
 	protected $_displayBehavior;
 
-	protected $_visibleHover = false;
+	protected $_visibleHover=false;
 
 	protected $_targetSelector;
 
@@ -51,7 +51,7 @@ 
 
 	protected $_json;
 
-	protected $_rowClass = "_element";
+	protected $_rowClass="_element";
 
 	protected $_sortable;
 
@@ -65,26 +65,26 @@ 
 
 	protected $_namePrefix;
 
-	public function __construct($identifier, $model, $modelInstance = NULL) {
+	public function __construct($identifier, $model, $modelInstance=NULL) {
 		parent::__construct($identifier, $model, $modelInstance);
 		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 0), false);
-		$this->_urls = [];
-		$this->_emptyMessage = new HtmlMessage("", "nothing to display");
+		$this->_urls=[];
+		$this->_emptyMessage=new HtmlMessage("", "nothing to display");
 		$this->_emptyMessage->setIcon("info circle");
 	}
 
 	public function run(JsUtils $js) {
-		if ($this->_runned !== true) {
-			$offset = $js->scriptCount();
+		if ($this->_runned!==true) {
+			$offset=$js->scriptCount();
 			if ($this->_hasCheckboxes && isset($js)) {
 				$this->_runCheckboxes($js);
 			}
 			if ($this->_visibleHover) {
-				$js->execOn("mouseover", "#" . $this->identifier . " tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'visible');", [
+				$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'visible');", [
 					"preventDefault" => false,
 					"stopPropagation" => true
 				]);
-				$js->execOn("mouseout", "#" . $this->identifier . " tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'hidden');$(event.currentTarget).trigger('visibleoverOut');", [
+				$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'hidden');$(event.currentTarget).trigger('visibleoverOut');", [
 					"preventDefault" => false,
 					"stopPropagation" => true
 				]);
@@ -101,16 +101,16 @@ 
 				$this->_associatePaginationBehavior($js, $offset);
 			}
 			$this->_associateSearchFieldBehavior($js, $offset);
-			$this->_runned = true;
+			$this->_runned=true;
 		}
 	}
 
 	protected function _generateBehavior($op, $params, JsUtils $js) {
 		if (isset($this->_urls[$op])) {
-			$params = \array_merge($params, [
+			$params=\array_merge($params, [
 				"attr" => "data-ajax"
 			]);
-			$js->ajaxOnClick("#" . $this->identifier . " ._" . $op, $this->_urls[$op], $this->getTargetSelector($op), $params);
+			$js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op], $this->getTargetSelector($op), $params);
 		}
 	}
 
@@ -129,21 +129,21 @@ 
 	}
 
 	public function refreshTD($fieldName, $jquery, $view) {
-		$index = $this->_getIndex($fieldName);
+		$index=$this->_getIndex($fieldName);
 		$this->compile($jquery, $view);
 		return $this->refreshTR()
 			->getTable()
 			->getCell(0, $index);
 	}
 
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_generated) {
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
 			if (isset($this->_buttonsColumn)) {
 				$this->_instanceViewer->sortColumnContent($this->_buttonsColumn, $this->_buttons);
 			}
 			$this->_instanceViewer->setInstance($this->_model);
-			$captions = $this->_instanceViewer->getCaptions();
-			$table = $this->content["table"];
+			$captions=$this->_instanceViewer->getCaptions();
+			$table=$this->content["table"];
 			if ($this->_hasCheckboxes) {
 				$this->_generateMainCheckbox($captions);
 			}
@@ -158,17 +158,17 @@ 
 			$this->compileExtraElements($table, $captions);
 			$this->_compileSearchFieldBehavior($js);
 
-			$this->content = JArray::sortAssociative($this->content, [
+			$this->content=JArray::sortAssociative($this->content, [
 				PositionInTable::BEFORETABLE,
 				"table",
 				PositionInTable::AFTERTABLE
 			]);
-			if ($this->_caption != null) {
+			if ($this->_caption!=null) {
 				$this->wrap("<div class='field'><label>{$this->_caption}</label>", "</div>");
 			}
 			$this->_compileForm();
 			$this->_applyStyleAttributes($table);
-			$this->_generated = true;
+			$this->_generated=true;
 		}
 		return parent::compile($js, $view);
 	}
@@ -206,9 +206,9 @@ 
 	}
 
 	protected function _generateHeader(HtmlTable $table, $captions) {
-		$gbFields = $this->_instanceViewer->getGroupByFields();
+		$gbFields=$this->_instanceViewer->getGroupByFields();
 		if (\is_array($gbFields)) {
-			$captions = \array_values(JArray::removeByKeys($captions, $gbFields));
+			$captions=\array_values(JArray::removeByKeys($captions, $gbFields));
 		}
 		$table->setHeaderValues($captions);
 		if (isset($this->_sortable)) {
@@ -217,22 +217,22 @@ 
 	}
 
 	protected function _generateContent($table) {
-		$objects = $this->_modelInstance;
+		$objects=$this->_modelInstance;
 		if (isset($this->_pagination)) {
-			$objects = $this->_pagination->getObjects($this->_modelInstance);
+			$objects=$this->_pagination->getObjects($this->_modelInstance);
 		}
 		InstanceViewer::setIndex(0);
-		$fields = $this->_instanceViewer->getSimpleProperties();
-		$groupByFields = $this->_instanceViewer->getGroupByFields();
-		if (! \is_array($groupByFields)) {
-			$table->fromDatabaseObjects($objects, function ($instance) use ($table, $fields) {
+		$fields=$this->_instanceViewer->getSimpleProperties();
+		$groupByFields=$this->_instanceViewer->getGroupByFields();
+		if (!\is_array($groupByFields)) {
+			$table->fromDatabaseObjects($objects, function($instance) use ($table, $fields) {
 				return $this->_generateRow($instance, $fields, $table);
 			});
 		} else {
-			$diffFields = \array_values(JArray::removeByKeys($fields, $groupByFields));
-			$activeValues = \array_combine($groupByFields, \array_fill(0, \count($groupByFields), null));
-			$uuids = [];
-			$table->fromDatabaseObjects($objects, function ($instance) use ($table, $fields, &$activeValues, $groupByFields, &$uuids, $diffFields) {
+			$diffFields=\array_values(JArray::removeByKeys($fields, $groupByFields));
+			$activeValues=\array_combine($groupByFields, \array_fill(0, \count($groupByFields), null));
+			$uuids=[];
+			$table->fromDatabaseObjects($objects, function($instance) use ($table, $fields, &$activeValues, $groupByFields, &$uuids, $diffFields) {
 				$this->_instanceViewer->setInstance($instance);
 				foreach ($groupByFields as $index => $gbField) {
 					$this->_generateGroupByRow($index, $gbField, $table, $fields, $activeValues, $uuids);
@@ -240,8 +240,8 @@ 
 				return $this->_generateRow($instance, $diffFields, $table, null, $uuids);
 			});
 		}
-		if ($table->getRowCount() == 0) {
-			$result = $table->addRow();
+		if ($table->getRowCount()==0) {
+			$result=$table->addRow();
 			$result->mergeCol();
 			$result->setValues([
 				$this->_emptyMessage
@@ -250,20 +250,20 @@ 
 	}
 
 	protected function _generateGroupByRow($index, $gbField, $table, $fields, &$activeValues, &$uuids) {
-		$newValue = $this->_instanceViewer->getValue($gbField);
-		if ($this->getElementContent($activeValues[$gbField]) !== $this->getElementContent($newValue)) {
-			if ($index == 0) {
-				$uuids = [];
+		$newValue=$this->_instanceViewer->getValue($gbField);
+		if ($this->getElementContent($activeValues[$gbField])!==$this->getElementContent($newValue)) {
+			if ($index==0) {
+				$uuids=[];
 			}
-			$uuid = \uniqid("grp");
-			$uuids[$gbField] = $uuid;
-			$id = $this->_instanceViewer->getIdentifier();
-			$result = $table->addMergeRow(\count($fields) + 1, $newValue);
-			$result->setIdentifier($this->identifier . "-tr-gb-" . $id);
+			$uuid=\uniqid("grp");
+			$uuids[$gbField]=$uuid;
+			$id=$this->_instanceViewer->getIdentifier();
+			$result=$table->addMergeRow(\count($fields)+1, $newValue);
+			$result->setIdentifier($this->identifier."-tr-gb-".$id);
 			$result->setProperty("data-ajax", $id);
 			$result->setProperty("data-group", $uuid);
 			$result->addToProperty("class", $this->_rowClass);
-			$activeValues[$gbField] = $newValue;
+			$activeValues[$gbField]=$newValue;
 		}
 	}
 
@@ -275,9 +275,9 @@ 
 	}
 
 	public function getFieldValue($index) {
-		$index = $this->_getIndex($index);
+		$index=$this->_getIndex($index);
 		if (\is_numeric($index)) {
-			$values = $this->_instanceViewer->getValues();
+			$values=$this->_instanceViewer->getValues();
 			if (isset($values[$index])) {
 				return $values[$index];
 			}
@@ -285,30 +285,30 @@ 
 		return null;
 	}
 
-	protected function _generateRow($instance, $fields, &$table, $checkedClass = null, $uuids = null) {
+	protected function _generateRow($instance, $fields, &$table, $checkedClass=null, $uuids=null) {
 		$this->_instanceViewer->setInstance($instance);
-		InstanceViewer::$index ++;
-		$values = $this->_instanceViewer->getValues();
-		$id = $this->_instanceViewer->getIdentifier();
-		$dataAjax = $id;
-		$id = $this->cleanIdentifier($id);
+		InstanceViewer::$index++;
+		$values=$this->_instanceViewer->getValues();
+		$id=$this->_instanceViewer->getIdentifier();
+		$dataAjax=$id;
+		$id=$this->cleanIdentifier($id);
 		if ($this->_hasCheckboxes) {
-			$ck = new HtmlCheckbox("ck-" . $this->identifier . "-" . $id, "");
-			$checked = false;
+			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id, "");
+			$checked=false;
 			if (isset($this->_checkedCallback)) {
-				$func = $this->_checkedCallback;
-				$checked = $func($instance);
+				$func=$this->_checkedCallback;
+				$checked=$func($instance);
 			}
 			$ck->setChecked($checked);
-			$field = $ck->getField();
+			$field=$ck->getField();
 			$field->setProperty("value", $dataAjax);
 			$field->setProperty("name", "selection[]");
 			if (isset($checkedClass))
 				$field->setClass($checkedClass);
 			\array_unshift($values, $ck);
 		}
-		$result = $table->newRow();
-		$result->setIdentifier($this->identifier . "-tr-" . $id);
+		$result=$table->newRow();
+		$result->setIdentifier($this->identifier."-tr-".$id);
 		$result->setProperty("data-ajax", $dataAjax);
 		$result->setValues($values);
 		$result->addToProperty("class", $this->_rowClass);
@@ -321,67 +321,67 @@ 
 
 	protected function _generatePagination($table) {
 		if (isset($this->_toolbar)) {
-			if ($this->_toolbarPosition == PositionInTable::FOOTER)
+			if ($this->_toolbarPosition==PositionInTable::FOOTER)
 				$this->_toolbar->setFloated("left");
 		}
-		$footer = $table->getFooter();
+		$footer=$table->getFooter();
 		$footer->mergeCol();
-		$this->_paginationToolbar = $this->_pagination->generateMenu($this->identifier);
+		$this->_paginationToolbar=$this->_pagination->generateMenu($this->identifier);
 		$footer->addValues($this->_paginationToolbar);
 	}
 
-	protected function _associatePaginationBehavior(JsUtils $js = NULL, $offset = null) {
+	protected function _associatePaginationBehavior(JsUtils $js=NULL, $offset=null) {
 		if (isset($this->_urls["refresh"])) {
-			$menu = $this->_pagination->getMenu();
+			$menu=$this->_pagination->getMenu();
 			if (isset($menu) && isset($js)) {
-				$js->postOnClick("#" . $menu->getIdentifier() . " .item", $this->_urls["refresh"], "{'p':$(this).attr('data-page'),'_model':'" . JString::doubleBackSlashes($this->_model) . "'}", $this->getRefreshSelector(), [
+				$js->postOnClick("#".$menu->getIdentifier()." .item", $this->_urls["refresh"], "{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}", $this->getRefreshSelector(), [
 					"preventDefault" => false,
 					"jqueryDone" => "replaceWith",
 					"hasLoader" => false,
-					"jsCallback" => '$("#' . $this->identifier . '").trigger("pageChange");$("#' . $this->identifier . '").trigger("activeRowChange");'
+					"jsCallback" => '$("#'.$this->identifier.'").trigger("pageChange");$("#'.$this->identifier.'").trigger("activeRowChange");'
 				]);
-				$page = $_POST["p"] ?? null;
+				$page=$_POST["p"] ?? null;
 				if (isset($page)) {
-					$activeClass = $this->getActiveRowClass();
-					$js->execAtLast('$("#' . $this->getIdentifier() . ' .pagination").children("a.item").removeClass("' . $activeClass . '");$("#' . $this->getIdentifier() . ' .pagination").children("a.item[data-page=' . $page . ']:not(.no-active)").addClass("' . $activeClass . '");');
+					$activeClass=$this->getActiveRowClass();
+					$js->execAtLast('$("#'.$this->getIdentifier().' .pagination").children("a.item").removeClass("'.$activeClass.'");$("#'.$this->getIdentifier().' .pagination").children("a.item[data-page='.$page.']:not(.no-active)").addClass("'.$activeClass.'");');
 				}
 			}
 		}
 	}
 
-	protected function _compileSearchFieldBehavior(JsUtils $js = NULL) {
+	protected function _compileSearchFieldBehavior(JsUtils $js=NULL) {
 		if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) {
-			$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(self).val(),'_model':'" . JString::doubleBackSlashes($this->_model) . "'}", "#" . $this->identifier . " tbody", [
+			$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "#".$this->identifier." tbody", [
 				"preventDefault" => false,
 				"jqueryDone" => "replaceWith",
 				"hasLoader" => "internal",
-				"jsCallback" => '$("#' . $this->identifier . '").trigger("searchTerminate",[$(self).val()]);'
+				"jsCallback" => '$("#'.$this->identifier.'").trigger("searchTerminate",[$(self).val()]);'
 			]);
 		}
 	}
 
-	protected function _associateSearchFieldBehavior(JsUtils $js = NULL, $offset = null) {}
+	protected function _associateSearchFieldBehavior(JsUtils $js=NULL, $offset=null) {}
 
 	protected function _getFieldName($index) {
-		$fieldName = parent::_getFieldName($index);
+		$fieldName=parent::_getFieldName($index);
 		if (\is_object($fieldName))
-			$fieldName = "field-" . $index;
-		if ($this->_namePrefix != null) {
-			$fieldName = $this->_namePrefix . '.' . $fieldName;
+			$fieldName="field-".$index;
+		if ($this->_namePrefix!=null) {
+			$fieldName=$this->_namePrefix.'.'.$fieldName;
 		}
-		return $fieldName . "[]";
+		return $fieldName."[]";
 	}
 
 	protected function _getFieldCaption($index) {
 		return null;
 	}
 
-	protected function applyToolbarPosition(string $position, $table, $captions = NULL) {
+	protected function applyToolbarPosition(string $position, $table, $captions=NULL) {
 		switch ($position) {
 			case PositionInTable::BEFORETABLE:
 			case PositionInTable::AFTERTABLE:
-				if (isset($this->_compileParts) === false) {
-					$this->content[$position] = $this->_toolbar;
+				if (isset($this->_compileParts)===false) {
+					$this->content[$position]=$this->_toolbar;
 				}
 				break;
 			case PositionInTable::HEADER:
@@ -392,7 +392,7 @@ 
 		}
 	}
 
-	protected function _setToolbarPosition($table, $captions = NULL) {
+	protected function _setToolbarPosition($table, $captions=NULL) {
 		if (\is_array($this->_toolbarPosition)) {
 			foreach ($this->_toolbarPosition as $tbp) {
 				$this->applyToolbarPosition($tbp, $table, $captions);
@@ -418,11 +418,11 @@ 
 	}
 
 	private function addToolbarRow($part, $table, $captions) {
-		$hasPart = $table->hasPart($part);
+		$hasPart=$table->hasPart($part);
 		if ($hasPart) {
-			$row = $table->getPart($part)->addRow(\count($captions));
+			$row=$table->getPart($part)->addRow(\count($captions));
 		} else {
-			$row = $table->getPart($part)->getRow(0);
+			$row=$table->getPart($part)->getRow(0);
 		}
 		$row->mergeCol();
 		$row->setValues([
@@ -454,12 +454,12 @@ 
 	 */
 	public function setUrls($urls) {
 		if (\is_array($urls)) {
-			$this->_urls["refresh"] = JArray::getValue($urls, "refresh", 0);
-			$this->_urls["edit"] = JArray::getValue($urls, "edit", 1);
-			$this->_urls["delete"] = JArray::getValue($urls, "delete", 2);
-			$this->_urls["display"] = JArray::getValue($urls, "display", 3);
+			$this->_urls["refresh"]=JArray::getValue($urls, "refresh", 0);
+			$this->_urls["edit"]=JArray::getValue($urls, "edit", 1);
+			$this->_urls["delete"]=JArray::getValue($urls, "delete", 2);
+			$this->_urls["display"]=JArray::getValue($urls, "display", 3);
 		} else {
-			$this->_urls = [
+			$this->_urls=[
 				"refresh" => $urls,
 				"edit" => $urls,
 				"delete" => $urls,
@@ -482,8 +482,8 @@ 
 	 *        	The number of visible pages in the Pagination component
 	 * @return DataTable
 	 */
-	public function paginate($page, $total_rowcount, $items_per_page = 10, $pages_visibles = null) {
-		$this->_pagination = new Pagination($items_per_page, $pages_visibles, $page, $total_rowcount);
+	public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) {
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page, $total_rowcount);
 		return $this;
 	}
 
@@ -498,8 +498,8 @@ 
 	 *        	The number of visible pages in the Pagination component
 	 * @return DataTable
 	 */
-	public function autoPaginate($page = 1, $items_per_page = 10, $pages_visibles = 4) {
-		$this->_pagination = new Pagination($items_per_page, $pages_visibles, $page);
+	public function autoPaginate($page=1, $items_per_page=10, $pages_visibles=4) {
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page);
 		return $this;
 	}
 
@@ -508,10 +508,10 @@ 
 	 * @param array $compileParts
 	 * @return DataTable
 	 */
-	public function refresh($compileParts = [
+	public function refresh($compileParts=[
 		'tbody'
 	]) {
-		$this->_compileParts = $compileParts;
+		$this->_compileParts=$compileParts;
 		return $this;
 	}
 
@@ -521,14 +521,14 @@ 
 	 * @param string $position
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addSearchInToolbar($position = Direction::RIGHT) {
+	public function addSearchInToolbar($position=Direction::RIGHT) {
 		return $this->addInToolbar($this->getSearchField())
 			->setPosition($position);
 	}
 
 	public function getSearchField() {
-		if (isset($this->_searchField) === false) {
-			$this->_searchField = new HtmlInput("search-" . $this->identifier, "search", "", "Search...");
+		if (isset($this->_searchField)===false) {
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
 			$this->_searchField->addIcon("search", Direction::RIGHT);
 		}
 		return $this->_searchField;
@@ -556,9 +556,9 @@ 
 	}
 
 	protected function getTargetSelector($op) {
-		$result = $this->_targetSelector;
-		if (! isset($result[$op]))
-			$result = "#" . $this->identifier;
+		$result=$this->_targetSelector;
+		if (!isset($result[$op]))
+			$result="#".$this->identifier;
 		return $result[$op];
 	}
 
@@ -570,20 +570,20 @@ 
 	 * @return DataTable
 	 */
 	public function setTargetSelector($_targetSelector) {
-		if (! \is_array($_targetSelector)) {
-			$_targetSelector = [
+		if (!\is_array($_targetSelector)) {
+			$_targetSelector=[
 				"edit" => $_targetSelector,
 				"delete" => $_targetSelector
 			];
 		}
-		$this->_targetSelector = $_targetSelector;
+		$this->_targetSelector=$_targetSelector;
 		return $this;
 	}
 
 	public function getRefreshSelector() {
 		if (isset($this->_refreshSelector))
 			return $this->_refreshSelector;
-		return "#" . $this->identifier . " tbody";
+		return "#".$this->identifier." tbody";
 	}
 
 	/**
@@ -592,7 +592,7 @@ 
 	 * @return DataTable
 	 */
 	public function setRefreshSelector($_refreshSelector) {
-		$this->_refreshSelector = $_refreshSelector;
+		$this->_refreshSelector=$_refreshSelector;
 		return $this;
 	}
 
@@ -604,9 +604,9 @@ 
 	public function show($modelInstance) {
 		if (\is_array($modelInstance)) {
 			if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
-				$modelInstance = \json_decode(\json_encode($modelInstance), FALSE);
+				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 		}
-		$this->_modelInstance = $modelInstance;
+		$this->_modelInstance=$modelInstance;
 	}
 
 	public function getRowClass() {
@@ -620,7 +620,7 @@ 
 	 * @return DataTable
 	 */
 	public function setRowClass($_rowClass) {
-		$this->_rowClass = $_rowClass;
+		$this->_rowClass=$_rowClass;
 		return $this;
 	}
 
@@ -631,16 +631,16 @@ 
 	 * @return DataTable
 	 */
 	public function setEmptyMessage($_emptyMessage) {
-		$this->_emptyMessage = $_emptyMessage;
+		$this->_emptyMessage=$_emptyMessage;
 		return $this;
 	}
 
-	public function setSortable($colIndex = NULL) {
-		$this->_sortable = $colIndex;
+	public function setSortable($colIndex=NULL) {
+		$this->_sortable=$colIndex;
 		return $this;
 	}
 
-	public function setActiveRowSelector($class = "active", $event = "click", $multiple = false) {
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
 		$this->_self->setActiveRowSelector($class, $event, $multiple);
 		return $this;
 	}
@@ -654,19 +654,19 @@ 
 	}
 
 	public function hideColumn($colIndex) {
-		if (! \is_array($this->_hiddenColumns))
-			$this->_hiddenColumns = [];
-		$this->_hiddenColumns[] = $colIndex;
+		if (!\is_array($this->_hiddenColumns))
+			$this->_hiddenColumns=[];
+		$this->_hiddenColumns[]=$colIndex;
 		return $this;
 	}
 
 	public function setColWidth($colIndex, $width) {
-		$this->_colWidths[$colIndex] = $width;
+		$this->_colWidths[$colIndex]=$width;
 		return $this;
 	}
 
 	public function setColWidths($_colWidths) {
-		$this->_colWidths = $_colWidths;
+		$this->_colWidths=$_colWidths;
 		return $this;
 	}
 
@@ -675,7 +675,7 @@ 
 		return $this;
 	}
 
-	public function trigger($event, $params = "[]") {
+	public function trigger($event, $params="[]") {
 		return $this->getHtmlComponent()->trigger($event, $params);
 	}
 
@@ -713,7 +713,7 @@ 
 	 * @param mixed $_displayBehavior
 	 */
 	public function setDisplayBehavior($_displayBehavior) {
-		$this->_displayBehavior = $_displayBehavior;
+		$this->_displayBehavior=$_displayBehavior;
 	}
 
 	/**
@@ -733,8 +733,8 @@ 
 	}
 
 	public function addGroupBy($index) {
-		$index = $this->_getIndex($index);
-		if ($index !== false) {
+		$index=$this->_getIndex($index);
+		if ($index!==false) {
 			$this->_instanceViewer->addGroupBy($index);
 		}
 	}
@@ -744,7 +744,7 @@ 
 	 * @param boolean $_visibleHover
 	 */
 	public function setVisibleHover($_visibleHover) {
-		$this->_visibleHover = $_visibleHover;
+		$this->_visibleHover=$_visibleHover;
 	}
 
 	/**
@@ -755,7 +755,7 @@ 
 		return $this->_paginationToolbar;
 	}
 
-	public function setInverted($recursive = true) {
+	public function setInverted($recursive=true) {
 		$this->getHtmlComponent()->setInverted($recursive);
 		if ($this->_emptyMessage instanceof HtmlSemDoubleElement) {
 			$this->_emptyMessage->setInverted($recursive);
@@ -767,7 +767,7 @@ 
 	}
 
 	public function setFormCaption($caption) {
-		$this->_caption = $caption;
+		$this->_caption=$caption;
 	}
 
 	/**
@@ -783,6 +783,6 @@ 
 	 * @param mixed $namePrefix
 	 */
 	public function setNamePrefix($namePrefix): void {
-		$this->_namePrefix = $namePrefix;
+		$this->_namePrefix=$namePrefix;
 	}
 }

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

Spacing +99 added lines, -99 removed lines

@@ -15,15 +15,15 @@ 
  */
 class HtmlTableContent extends HtmlSemCollection {
 
-	protected $_focusable = false;
+	protected $_focusable=false;
 
-	protected $_tdTagNames = [
+	protected $_tdTagNames=[
 		"thead" => "th",
 		"tbody" => "td",
 		"tfoot" => "th"
 	];
 
-	protected $_merged = false;
+	protected $_merged=false;
 
 	/**
 	 *
@@ -32,7 +32,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);
@@ -45,8 +45,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;
@@ -57,7 +57,7 @@ 
 	}
 
 	public function refreshTR() {
-		$this->_template = "%wrapContentBefore%%content%%wrapContentAfter%";
+		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 	}
 
 	/**
@@ -68,14 +68,14 @@ 
 	 * @return HtmlTR
 	 */
 	protected function createItem($value) {
-		$count = $this->count();
-		$tr = new HtmlTR("");
+		$count=$this->count();
+		$tr=new HtmlTR("");
 		$tr->setContainer($this, $count);
 		if ($this->_focusable) {
 			$tr->setProperty('tabindex', $count);
 		}
 		$tr->setTdTagName($this->_tdTagNames[$this->tagName]);
-		if (isset($value) === true) {
+		if (isset($value)===true) {
 			$tr->setColCount($value);
 		}
 		return $tr;
@@ -103,8 +103,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([
@@ -130,11 +130,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;
 	}
@@ -155,9 +155,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;
@@ -168,8 +168,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);
 		});
 	}
@@ -179,8 +179,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);
 		});
 	}
@@ -192,42 +192,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);
 		}
@@ -235,31 +235,31 @@ 
 	}
 
 	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) {
-				$cell = $this->getCell($i, $index);
-				if ($cell != NULL) {
+		$count=$this->count();
+		for ($i=0; $i<$count; $i++) {
+			$index=$this->content[$i]->getColPosition($colIndex);
+			if ($index!==NULL) {
+				$cell=$this->getCell($i, $index);
+				if ($cell!=NULL) {
 					$cell->$function();
 				}
 			}
@@ -268,12 +268,12 @@ 
 	}
 
 	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();
 			}
 		}
@@ -319,9 +319,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;
 	}
 
@@ -332,10 +332,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 {
@@ -345,24 +345,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);
 	}
 
@@ -382,7 +382,7 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function conditionalCellFormat($callback, $format) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
 			$row->conditionalCellFormat($callback, $format);
 		}
@@ -390,9 +390,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;
@@ -405,7 +405,7 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function conditionalRowFormat($callback, $format) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
 			$row->conditionalRowFormat($callback, $format);
 		}
@@ -413,9 +413,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;
@@ -427,7 +427,7 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function applyCells($callback) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
 			$row->applyCells($callback);
 		}
@@ -440,7 +440,7 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function applyRows($callback) {
-		$rows = $this->content;
+		$rows=$this->content;
 		foreach ($rows as $row) {
 			$row->apply($callback);
 		}
@@ -455,28 +455,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;
@@ -487,7 +487,7 @@ 
 	}
 
 	public function _setMerged($value) {
-		$this->_merged = $value;
+		$this->_merged=$value;
 		return $this;
 	}
 
@@ -496,6 +496,6 @@ 
 	 * @param bool $focusable
 	 */
 	public function setFocusable(bool $focusable): void {
-		$this->_focusable = $focusable;
+		$this->_focusable=$focusable;
 	}
 }

Ajax/semantic/widgets/base/FieldAsTrait.php

Spacing +114 added lines, -114 removed lines

@@ -37,7 +37,7 @@ 
  */
 trait FieldAsTrait {
 
-	abstract protected function _getFieldIdentifier($prefix, $name = "");
+	abstract protected function _getFieldIdentifier($prefix, $name="");
 
 	abstract public function setValueFunction($index, $callback);
 
@@ -45,7 +45,7 @@ 
 
 	abstract protected function _getFieldCaption($index);
 
-	abstract protected function _buttonAsSubmit(BaseHtml &$button, $event, $url, $responseElement = NULL, $parameters = NULL);
+	abstract protected function _buttonAsSubmit(BaseHtml &$button, $event, $url, $responseElement=NULL, $parameters=NULL);
 
 	private $_speProperties;
 
@@ -54,9 +54,9 @@ 
 	 * @param HtmlFormField $element
 	 * @param array $attributes
 	 */
-	protected function _applyAttributes(BaseHtml $element, &$attributes, $index, $instance = null) {
+	protected function _applyAttributes(BaseHtml $element, &$attributes, $index, $instance=null) {
 		if (isset($attributes["jsCallback"])) {
-			$callback = $attributes["jsCallback"];
+			$callback=$attributes["jsCallback"];
 			if (\is_callable($callback)) {
 				$callback($element, $instance, $index, InstanceViewer::$index);
 			}
@@ -67,15 +67,15 @@ 
 		$element->fromArray($attributes);
 	}
 
-	private function _getLabelField($caption, $icon = NULL) {
-		$label = new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon);
+	private function _getLabelField($caption, $icon=NULL) {
+		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon);
 		return $label;
 	}
 
 	protected function _addRules(HtmlFormField $element, &$attributes) {
 		if (isset($attributes["rules"])) {
-			$this->_hasRules = true;
-			$rules = $attributes["rules"];
+			$this->_hasRules=true;
+			$rules=$attributes["rules"];
 			if (\is_array($rules)) {
 				$element->addRules($rules);
 			} else {
@@ -91,24 +91,24 @@ 
 		return $field;
 	}
 
-	protected function _fieldAs($elementCallback, &$index, $attributes = NULL, $prefix = null) {
-		$this->setValueFunction($index, function ($value, $instance, $index, $rowIndex) use (&$attributes, $elementCallback, $prefix) {
-			$caption = $this->_getFieldCaption($index);
-			$name = $this->_getFieldName($index);
-			$id = $this->_getFieldIdentifier($prefix, $name);
+	protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null) {
+		$this->setValueFunction($index, function($value, $instance, $index, $rowIndex) use (&$attributes, $elementCallback, $prefix) {
+			$caption=$this->_getFieldCaption($index);
+			$name=$this->_getFieldName($index);
+			$id=$this->_getFieldIdentifier($prefix, $name);
 			if (isset($attributes["name"])) {
-				$name = $attributes["name"];
+				$name=$attributes["name"];
 				unset($attributes["name"]);
 			}
-			$element = $elementCallback($id, $name, $value, $caption);
+			$element=$elementCallback($id, $name, $value, $caption);
 			if (isset($this->_speProperties[$index])) {
 				$attributes ??= [];
-				$attributes += $this->_speProperties[$index];
+				$attributes+=$this->_speProperties[$index];
 			}
 			if (\is_array($attributes)) {
 				$this->_applyAttributes($element, $attributes, $index, $instance);
 			}
-			$element->setDisabled(! $this->_edition);
+			$element->setDisabled(!$this->_edition);
 			return $element;
 		});
 		return $this;
@@ -124,48 +124,48 @@ 
 	 */
 	public function setPropertyValues($property, $indexValues) {
 		foreach ($indexValues as $index => $value) {
-			$ind = $this->_getIndex($index);
-			$this->_speProperties[$ind][$property] = $value;
+			$ind=$this->_getIndex($index);
+			$this->_speProperties[$ind][$property]=$value;
 		}
 	}
 
-	public function fieldAsProgress($index, $label = NULL, $attributes = array()) {
-		$this->setValueFunction($index, function ($value) use ($label, $attributes) {
-			$pb = new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes);
+	public function fieldAsProgress($index, $label=NULL, $attributes=array()) {
+		$this->setValueFunction($index, function($value) use ($label, $attributes) {
+			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes);
 			return $pb;
 		});
 		return $this;
 	}
 
-	public function fieldAsRating($index, $max = 5, $icon = "") {
-		$this->setValueFunction($index, function ($value) use ($max, $icon) {
-			$rating = new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon);
+	public function fieldAsRating($index, $max=5, $icon="") {
+		$this->setValueFunction($index, function($value) use ($max, $icon) {
+			$rating=new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon);
 			return $rating;
 		});
 		return $this;
 	}
 
-	public function fieldAsLabel($index, $icon = NULL, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value) use ($icon) {
-			$lbl = new HtmlLabel($id, $value);
+	public function fieldAsLabel($index, $icon=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use ($icon) {
+			$lbl=new HtmlLabel($id, $value);
 			if (isset($icon))
 				$lbl->addIcon($icon);
 			return $lbl;
 		}, $index, $attributes, "label");
 	}
 
-	public function fieldAsHeader($index, $niveau = 1, $icon = NULL, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value) use ($niveau, $icon) {
-			$header = new HtmlHeader($id, $niveau, $value);
+	public function fieldAsHeader($index, $niveau=1, $icon=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use ($niveau, $icon) {
+			$header=new HtmlHeader($id, $niveau, $value);
 			if (isset($icon))
 				$header->asIcon($icon, $value);
 			return $header;
 		}, $index, $attributes, "header");
 	}
 
-	public function fieldAsImage($index, $size = Size::MINI, $circular = false) {
-		$this->setValueFunction($index, function ($img) use ($size, $circular) {
-			$image = new HtmlImage($this->_getFieldIdentifier("image"), $img);
+	public function fieldAsImage($index, $size=Size::MINI, $circular=false) {
+		$this->setValueFunction($index, function($img) use ($size, $circular) {
+			$image=new HtmlImage($this->_getFieldIdentifier("image"), $img);
 			$image->setSize($size);
 			if ($circular)
 				$image->setCircular();
@@ -175,65 +175,65 @@ 
 	}
 
 	public function fieldAsFlag($index) {
-		$this->setValueFunction($index, function ($flag) {
-			$flag = new HtmlFlag($this->_getFieldIdentifier("flag"), $flag);
+		$this->setValueFunction($index, function($flag) {
+			$flag=new HtmlFlag($this->_getFieldIdentifier("flag"), $flag);
 			return $flag;
 		});
 		return $this;
 	}
 
 	public function fieldAsIcon($index) {
-		$this->setValueFunction($index, function ($icon) {
-			$icon = new HtmlIcon($this->_getFieldIdentifier("icon"), $icon);
+		$this->setValueFunction($index, function($icon) {
+			$icon=new HtmlIcon($this->_getFieldIdentifier("icon"), $icon);
 			return $icon;
 		});
 		return $this;
 	}
 
-	public function fieldAsAvatar($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value) {
-			$img = new HtmlImage($id, $value);
+	public function fieldAsAvatar($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$img=new HtmlImage($id, $value);
 			$img->asAvatar();
 			return $img;
 		}, $index, $attributes, "avatar");
 	}
 
-	public function fieldAsRadio($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value) use ($attributes) {
-			$input = new HtmlFormRadio($id, $name, $value, $value);
+	public function fieldAsRadio($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use ($attributes) {
+			$input=new HtmlFormRadio($id, $name, $value, $value);
 			return $this->_prepareFormFields($input, $name, $attributes);
 		}, $index, $attributes, "radio");
 	}
 
-	public function fieldAsRadios($index, $elements = [], $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($elements) {
+	public function fieldAsRadios($index, $elements=[], $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements) {
 			return HtmlFormFields::radios($name, $elements, $caption, $value);
 		}, $index, $attributes, "radios");
 	}
 
-	public function fieldAsList($index, $classNames = "", $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($classNames) {
-			$result = new HtmlList($name, $value);
+	public function fieldAsList($index, $classNames="", $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($classNames) {
+			$result=new HtmlList($name, $value);
 			$result->addClass($classNames);
 			return $result;
 		}, $index, $attributes, "list");
 	}
 
-	public function fieldAsInput($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			$input = new HtmlFormInput($id, $caption, "text", $value);
+	public function fieldAsInput($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes) {
+			$input=new HtmlFormInput($id, $caption, "text", $value);
 			return $this->_prepareFormFields($input, $name, $attributes);
 		}, $index, $attributes, "input");
 	}
 
-	public function fieldAsLabeledInput($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			$input = new HtmlFormInput($id, '', 'text', $value, $caption);
-			$required = '';
+	public function fieldAsLabeledInput($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes) {
+			$input=new HtmlFormInput($id, '', 'text', $value, $caption);
+			$required='';
 			if (isset($attributes['rules'])) {
-				$rules = json_encode($attributes['rules']);
-				if (strpos($rules, 'empty') !== false) {
-					$required = 'required';
+				$rules=json_encode($attributes['rules']);
+				if (strpos($rules, 'empty')!==false) {
+					$required='required';
 				}
 			}
 			$input->getField()
@@ -244,80 +244,80 @@ 
 		}, $index, $attributes, 'input');
 	}
 
-	public function fieldAsDataList($index, ?array $items = [], $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes, $items) {
-			$input = new HtmlFormInput($id, $caption, "text", $value);
+	public function fieldAsDataList($index, ?array $items=[], $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes, $items) {
+			$input=new HtmlFormInput($id, $caption, "text", $value);
 			$input->getField()
 				->addDataList($items);
 			return $this->_prepareFormFields($input, $name, $attributes);
 		}, $index, $attributes, "input");
 	}
 
-	public function fieldAsFile($index, $attributes = NULL) {
+	public function fieldAsFile($index, $attributes=NULL) {
 		if (isset($this->_form)) {
 			$this->_form->setProperty('enctype', 'multipart/form-data');
 		}
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			$input = new HtmlFormInput($id, $caption);
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes) {
+			$input=new HtmlFormInput($id, $caption);
 			$input->asFile();
 			return $this->_prepareFormFields($input, $name, $attributes);
 		}, $index, $attributes, "input");
 	}
 
-	public function fieldAsTextarea($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			$textarea = new HtmlFormTextarea($id, $caption, $value);
+	public function fieldAsTextarea($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes) {
+			$textarea=new HtmlFormTextarea($id, $caption, $value);
 			return $this->_prepareFormFields($textarea, $name, $attributes);
 		}, $index, $attributes, "textarea");
 	}
 
-	public function fieldAsElement($index, $tagName = "div", $baseClass = "", $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes, $tagName, $baseClass) {
-			$div = new HtmlSemDoubleElement($id, $tagName, $baseClass);
+	public function fieldAsElement($index, $tagName="div", $baseClass="", $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes, $tagName, $baseClass) {
+			$div=new HtmlSemDoubleElement($id, $tagName, $baseClass);
 			$div->setContent(\htmlentities($value));
-			$textarea = new HtmlFormField("field-" . $id, $div, $caption);
+			$textarea=new HtmlFormField("field-".$id, $div, $caption);
 			return $this->_prepareFormFields($textarea, $name, $attributes);
 		}, $index, $attributes, "element");
 	}
 
-	public function fieldAsHidden($index, $attributes = NULL) {
-		if (! \is_array($attributes)) {
-			$attributes = [];
+	public function fieldAsHidden($index, $attributes=NULL) {
+		if (!\is_array($attributes)) {
+			$attributes=[];
 		}
-		$attributes["inputType"] = "hidden";
-		$attributes["style"] = "display:none;";
+		$attributes["inputType"]="hidden";
+		$attributes["style"]="display:none;";
 		return $this->fieldAsInput($index, $attributes);
 	}
 
-	public function fieldAsCheckbox($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			if ($caption === null || $caption === "")
-				$caption = "";
-			$input = new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier());
+	public function fieldAsCheckbox($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes) {
+			if ($caption===null || $caption==="")
+				$caption="";
+			$input=new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier());
 			$input->setChecked(JString::isBooleanTrue($value));
 			return $this->_prepareFormFields($input, $name, $attributes);
 		}, $index, $attributes, "ck");
 	}
 
-	public function fieldAsDropDown($index, $elements = [], $multiple = false, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($elements, $multiple, $attributes) {
-			$dd = new HtmlFormDropdown($id, $elements, $caption, $value ?? '');
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements, $multiple, $attributes) {
+			$dd=new HtmlFormDropdown($id, $elements, $caption, $value ?? '');
 			$dd->asSelect($name, $multiple);
 			return $this->_prepareFormFields($dd, $name, $attributes);
 		}, $index, $attributes, "dd");
 	}
 
-	public function fieldAsMessage($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) {
-			$mess = new HtmlMessage("message-" . $id, $caption);
+	public function fieldAsMessage($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$mess=new HtmlMessage("message-".$id, $caption);
 			$mess->addHeader($value);
 			return $mess;
 		}, $index, $attributes, "message");
 	}
 
-	public function fieldAsLink($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) {
-			$lnk = new HtmlLink("message-" . $id, "#", $caption);
+	public function fieldAsLink($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$lnk=new HtmlLink("message-".$id, "#", $caption);
 			return $lnk;
 		}, $index, $attributes, "link");
 	}
@@ -329,28 +329,28 @@ 
 	 *        	an array or associative array $type=>$attributes
 	 */
 	public function fieldsAs(array $types) {
-		$i = 0;
+		$i=0;
 		if (JArray::isAssociative($types)) {
 			foreach ($types as $type => $attributes) {
 				if (\is_int($type))
-					$this->fieldAs($i ++, $attributes, []);
+					$this->fieldAs($i++, $attributes, []);
 				else {
-					$type = preg_replace('/\d/', '', $type);
-					$this->fieldAs($i ++, $type, $attributes);
+					$type=preg_replace('/\d/', '', $type);
+					$this->fieldAs($i++, $type, $attributes);
 				}
 			}
 		} else {
 			foreach ($types as $type) {
-				$this->fieldAs($i ++, $type);
+				$this->fieldAs($i++, $type);
 			}
 		}
 	}
 
-	public function fieldAs($index, $type, $attributes = NULL) {
-		$method = "fieldAs" . \ucfirst($type);
+	public function fieldAs($index, $type, $attributes=NULL) {
+		$method="fieldAs".\ucfirst($type);
 		if (\method_exists($this, $method)) {
-			if (! \is_array($attributes)) {
-				$attributes = [
+			if (!\is_array($attributes)) {
+				$attributes=[
 					$index
 				];
 			} else {
@@ -363,39 +363,39 @@ 
 		}
 	}
 
-	public function fieldAsSubmit($index, $cssStyle = NULL, $url = NULL, $responseElement = NULL, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $attributes) {
-			$button = new HtmlButton($id, $caption, $cssStyle);
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $attributes) {
+			$button=new HtmlButton($id, $caption, $cssStyle);
 			$this->_buttonAsSubmit($button, "click", $url, $responseElement, $attributes["ajax"] ?? []);
 			return $button;
 		}, $index, $attributes, "submit");
 	}
 
-	public function fieldAsButton($index, $cssStyle = NULL, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($cssStyle) {
-			$button = new HtmlButton($id, $value, $cssStyle);
+	public function fieldAsButton($index, $cssStyle=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle) {
+			$button=new HtmlButton($id, $value, $cssStyle);
 			return $button;
 		}, $index, $attributes, "button");
 	}
 
-	public function fieldAsDataTable($index, $model, $instances = null, $fields = [], $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($model, $instances, $fields, $index) {
-			$dt = new DataTable($id, $model, $instances);
+	public function fieldAsDataTable($index, $model, $instances=null, $fields=[], $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($model, $instances, $fields, $index) {
+			$dt=new DataTable($id, $model, $instances);
 			$dt->setNamePrefix($index);
 			$dt->setFields($fields);
 			$dt->setEdition(true);
-			$dt->addDeleteButton(false, [], function ($bt) use ($index) {
+			$dt->addDeleteButton(false, [], function($bt) use ($index) {
 				$bt->addClass('mini circular')
-					->wrap('<input value="" class="_status" type="hidden" name="' . $index . '._status[]">');
+					->wrap('<input value="" class="_status" type="hidden" name="'.$index.'._status[]">');
 			});
-			if ($caption != null) {
+			if ($caption!=null) {
 				$dt->setFormCaption($caption);
 			}
-			$dt->onPreCompile(function () use (&$dt) {
+			$dt->onPreCompile(function() use (&$dt) {
 				$dt->getHtmlComponent()
 					->colRightFromRight(0);
 			});
-			$dt->wrap('<input type="hidden" name="' . $index . '">');
+			$dt->wrap('<input type="hidden" name="'.$index.'">');
 			return $dt;
 		}, $index, $attributes, "dataTable");
 	}

Ajax/semantic/html/collections/form/HtmlFormInput.php

Spacing +20 added lines, -20 removed lines

@@ -7,23 +7,23 @@ 
 class HtmlFormInput extends HtmlFormField {
 	use TextFieldsTrait;
 
-	const TOGGLE_CLICK = 0;
+	const TOGGLE_CLICK=0;
 
-	const TOGGLE_MOUSEDOWN = 1;
+	const TOGGLE_MOUSEDOWN=1;
 
-	const TOGGLE_INTERVAL = 2;
+	const TOGGLE_INTERVAL=2;
 
-	public function __construct($identifier, $label = NULL, $type = "text", $value = NULL, $placeholder = NULL) {
-		if (! isset($placeholder) && $type === "text")
-			$placeholder = $label;
-		parent::__construct("field-" . $identifier, new HtmlInput($identifier, $type, $value, $placeholder), $label);
-		$this->_identifier = $identifier;
+	public function __construct($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) {
+		if (!isset($placeholder) && $type==="text")
+			$placeholder=$label;
+		parent::__construct("field-".$identifier, new HtmlInput($identifier, $type, $value, $placeholder), $label);
+		$this->_identifier=$identifier;
 	}
 
 	public function getDataField() {
-		$field = $this->getField();
+		$field=$this->getField();
 		if ($field instanceof HtmlInput)
-			$field = $field->getDataField();
+			$field=$field->getDataField();
 		return $field;
 	}
 
@@ -32,9 +32,9 @@ 
 	 *
 	 * @param string $keyIcon
 	 */
-	public function asPassword($keyIcon = 'key') {
+	public function asPassword($keyIcon='key') {
 		$this->setInputType('password');
-		if ($keyIcon != '') {
+		if ($keyIcon!='') {
 			$this->addIcon($keyIcon);
 		}
 	}
@@ -49,28 +49,28 @@ 
 	 *        	one of TOGGLE_CLICK, TOGGLE_MOUSEDOWN, TOGGLE_INTERVAL
 	 * @return mixed|\Ajax\semantic\html\elements\HtmlButton
 	 */
-	public function addTogglePasswordAction($buttonIcon = 'eye', $keyIcon = 'key', $slashIcon = 'slash', $type = 0) {
+	public function addTogglePasswordAction($buttonIcon='eye', $keyIcon='key', $slashIcon='slash', $type=0) {
 		$this->asPassword($keyIcon);
-		$action = $this->addAction('see');
+		$action=$this->addAction('see');
 		$action->asIcon($buttonIcon);
 		switch ($type) {
 			case self::TOGGLE_CLICK:
-				$action->onClick('let th=$(this);' . $this->getJsToggle($slashIcon, '(_,attr)=>(attr=="text")?"password":"text"', 'toggle'));
+				$action->onClick('let th=$(this);'.$this->getJsToggle($slashIcon, '(_,attr)=>(attr=="text")?"password":"text"', 'toggle'));
 				break;
 			case self::TOGGLE_MOUSEDOWN:
 				$action->onClick('');
-				$action->addEvent('mousedown', 'let th=$(this);' . $this->getJsToggle($slashIcon, '"text"', 'add'));
-				$action->addEvent('mouseup', 'let th=$(this);' . $this->getJsToggle($slashIcon, '"password"', 'remove'));
-				$action->addEvent('mouseout', 'let th=$(this);' . $this->getJsToggle($slashIcon, '"password"', 'remove'));
+				$action->addEvent('mousedown', 'let th=$(this);'.$this->getJsToggle($slashIcon, '"text"', 'add'));
+				$action->addEvent('mouseup', 'let th=$(this);'.$this->getJsToggle($slashIcon, '"password"', 'remove'));
+				$action->addEvent('mouseout', 'let th=$(this);'.$this->getJsToggle($slashIcon, '"password"', 'remove'));
 				break;
 			case self::TOGGLE_INTERVAL:
-				$action->onClick('let th=$(this);' . $this->getJsToggle($slashIcon, '"text"', 'add') . 'setTimeout(function(){ ' . $this->getJsToggle($slashIcon, '"password"', 'remove') . ' }, 5000);');
+				$action->onClick('let th=$(this);'.$this->getJsToggle($slashIcon, '"text"', 'add').'setTimeout(function(){ '.$this->getJsToggle($slashIcon, '"password"', 'remove').' }, 5000);');
 				break;
 		}
 		return $action;
 	}
 
 	private function getJsToggle($slashIcon, $type, $actionClass) {
-		return 'th.find(".icon").' . $actionClass . 'Class("' . $slashIcon . '");th.closest(".field").find("input").attr("type",' . $type . ');';
+		return 'th.find(".icon").'.$actionClass.'Class("'.$slashIcon.'");th.closest(".field").find("input").attr("type",'.$type.');';
 	}
 }

Ajax/common/traits/JsUtilsInternalTrait.php

Spacing +15 added lines, -15 removed lines

@@ -5,12 +5,12 @@ 
 
 trait JsUtilsInternalTrait {
 
-	protected $jquery_code_for_compile = array();
+	protected $jquery_code_for_compile=array();
 
-	protected $jquery_code_for_compile_at_last = array();
+	protected $jquery_code_for_compile_at_last=array();
 
 	protected function _addToCompile($jsScript) {
-		$this->jquery_code_for_compile[] = $jsScript;
+		$this->jquery_code_for_compile[]=$jsScript;
 	}
 
 	/**
@@ -18,7 +18,7 @@ 
 	 * @param BaseGui $library
 	 * @param mixed $view
 	 */
-	protected function _compileLibrary(BaseGui $library, &$view = NULL) {
+	protected function _compileLibrary(BaseGui $library, &$view=NULL) {
 		if (isset($view))
 			$library->compileHtml($this, $view);
 		if ($library->isAutoCompile()) {
@@ -27,21 +27,21 @@ 
 	}
 
 	protected function defer($script) {
-		$result = "window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { defer(method) }, 50);};";
-		$result .= "window.defer(function(){" . $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) {
-		$result = '$(document).ready(function() {' . "\n";
-		$result .= $script . '})';
+		$result='$(document).ready(function() {'."\n";
+		$result.=$script.'})';
 		return $result;
 	}
 
 	protected function minify($input) {
-		if (trim($input) === "")
+		if (trim($input)==="")
 			return $input;
-		$input = preg_replace(array(
+		$input=preg_replace(array(
 			// Remove comment(s)
 			'#\s*("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')\s*|\s*\/\*(?!\!|@cc_on)(?>[\s\S]*?\*\/)\s*|\s*(?<![\:\=])\/\/.*(?=[\n\r]|$)|^\s*|\s*$#',
 			// Remove white-space(s) outside the string and regex
@@ -59,7 +59,7 @@ 
 			'$1$3',
 			'$1.$3'
 		), $input);
-		$input = str_replace("}$", "};$", $input);
+		$input=str_replace("}$", "};$", $input);
 		return $input;
 	}
 
@@ -69,9 +69,9 @@ 
 	 * @param string $src
 	 * @return string
 	 */
-	protected function _open_script($src = '') {
-		$str = '<script ';
-		$str .= ($src == '') ? '>' : ' src="' . $src . '">';
+	protected function _open_script($src='') {
+		$str='<script ';
+		$str.=($src=='') ? '>' : ' src="'.$src.'">';
 		return $str;
 	}
 
@@ -81,7 +81,7 @@ 
 	 * @param string $extra
 	 * @return string
 	 */
-	protected function _close_script($extra = "\n") {
+	protected function _close_script($extra="\n") {
 		return "</script>$extra";
 	}
 

Ajax/common/html/BaseHtml.php

Spacing +77 added lines, -77 removed lines

@@ -15,21 +15,21 @@ 
  * @version 1.3.3
  */
 abstract class BaseHtml extends BaseWidget {
-	use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait;
+	use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait;
 
 	protected $_template;
 
 	protected $tagName;
 
-	protected $_wrapBefore = array();
+	protected $_wrapBefore=array();
 
-	protected $_wrapAfter = array();
+	protected $_wrapAfter=array();
 
 	protected $_bsComponent;
 
-	protected $_compiled = false;
+	protected $_compiled=false;
 
-	protected $_runned = false;
+	protected $_runned=false;
 
 	protected $_postCompile;
 
@@ -43,31 +43,31 @@ 
 	abstract public function run(JsUtils $js);
 
 	private function _callSetter($setter, $key, $value, &$array) {
-		$result = false;
-		if (method_exists($this, $setter) && substr($setter, 0, 1) !== "_") {
+		$result=false;
+		if (method_exists($this, $setter) && substr($setter, 0, 1)!=="_") {
 			try {
 				$this->$setter($value);
 				unset($array[$key]);
-				$result = true;
-			} catch (\Exception $e) {
-				$result = false;
+				$result=true;
+			}catch (\Exception $e) {
+				$result=false;
 			}
 		}
 		return $result;
 	}
 
-	protected function getTemplate(JsUtils $js = NULL, $view = null) {
-		return PropertyWrapper::wrap($this->_wrapBefore, $js, $view) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js, $view);
+	protected function getTemplate(JsUtils $js=NULL, $view=null) {
+		return PropertyWrapper::wrap($this->_wrapBefore, $js, $view).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js, $view);
 	}
 
 	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);
+			if (!$typeCtrl($value)) {
+				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
 			}
 		}
 		return true;
@@ -75,49 +75,49 @@ 
 
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
 		$this->ctrl($name, $value, $typeCtrl);
-		$name = $value;
+		$name=$value;
 		return $this;
 	}
 
-	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator = " ") {
+	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
-			$name .= $separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
 
-	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator = " ") {
+	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
 		$this->ctrl($name, $value, $typeCtrl);
 		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;
+	protected function addToMember(&$name, $value, $separator=" ") {
+		$name=str_ireplace($value, "", $name).$separator.$value;
 		return $this;
 	}
 
 	protected function removeOldValues(&$oldValue, $allValues) {
-		$oldValue = str_ireplace($allValues, "", $oldValue);
-		$oldValue = trim($oldValue);
+		$oldValue=str_ireplace($allValues, "", $oldValue);
+		$oldValue=trim($oldValue);
 	}
 
 	protected function _getElementBy($callback, $elements) {
 		if (\is_array($elements)) {
-			$elements = \array_values($elements);
-			$flag = false;
-			$index = 0;
-			while (! $flag && $index < sizeof($elements)) {
+			$elements=\array_values($elements);
+			$flag=false;
+			$index=0;
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
-					$flag = ($callback($elements[$index]));
-				$index ++;
+					$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;
@@ -126,12 +126,12 @@ 
 	}
 
 	protected function setWrapBefore($wrapBefore) {
-		$this->_wrapBefore = $wrapBefore;
+		$this->_wrapBefore=$wrapBefore;
 		return $this;
 	}
 
 	protected function setWrapAfter($wrapAfter) {
-		$this->_wrapAfter = $wrapAfter;
+		$this->_wrapAfter=$wrapAfter;
 		return $this;
 	}
 
@@ -140,18 +140,18 @@ 
 	}
 
 	public function setTagName($tagName) {
-		$this->tagName = $tagName;
+		$this->tagName=$tagName;
 		return $this;
 	}
 
 	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) {
-				$this->_callSetter("set" . ucfirst($key), $key, $value, $array);
+			if ($this->_callSetter($key, $key, $value, $array)===false) {
+				$this->_callSetter("set".ucfirst($key), $key, $value, $array);
 			}
 		}
 		return $array;
@@ -168,17 +168,17 @@ 
 
 	public function fromDatabaseObject($object, $function) {}
 
-	public function wrap($before, $after = "") {
+	public function wrap($before, $after="") {
 		if (isset($before)) {
 			array_unshift($this->_wrapBefore, $before);
 		}
-		$this->_wrapAfter[] = $after;
+		$this->_wrapAfter[]=$after;
 		return $this;
 	}
 
 	public function getElementById($identifier, $elements) {
-		return $this->_getElementBy(function (BaseWidget $element) use ($identifier) {
-			return $element->getIdentifier() === $identifier;
+		return $this->_getElementBy(function(BaseWidget $element) use ($identifier) {
+			return $element->getIdentifier()===$identifier;
 		}, $elements);
 	}
 
@@ -187,50 +187,50 @@ 
 	}
 
 	public function setBsComponent($bsComponent) {
-		$this->_bsComponent = $bsComponent;
+		$this->_bsComponent=$bsComponent;
 		return $this;
 	}
 
-	protected function compile_once(JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_compiled) {
+	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_compiled) {
 			if (isset($js)) {
-				$beforeCompile = $js->getParam("beforeCompileHtml");
+				$beforeCompile=$js->getParam("beforeCompileHtml");
 				if (\is_callable($beforeCompile)) {
 					$beforeCompile($this, $js, $view);
 				}
 			}
 			$this->callCallback($this->_preCompile);
 			unset($this->properties["jsCallback"]);
-			$this->_compiled = true;
+			$this->_compiled=true;
 		}
 	}
 
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->compile_once($js, $view);
-		$result = $this->getTemplate($js, $view);
+		$result=$this->getTemplate($js, $view);
 		foreach ($this as $key => $value) {
-			if (\strstr($result, "%{$key}%") !== false) {
+			if (\strstr($result, "%{$key}%")!==false) {
 				if (\is_array($value)) {
-					$v = PropertyWrapper::wrap($value, $js, $view);
+					$v=PropertyWrapper::wrap($value, $js, $view);
 				} elseif ($value instanceof \stdClass) {
-					$v = \print_r($value, true);
+					$v=\print_r($value, true);
 				} elseif ($value instanceof BaseHtml) {
-					$v = $value->compile($js, $view);
+					$v=$value->compile($js, $view);
 				} else {
-					$v = $value;
+					$v=$value;
 				}
-				$result = \str_replace("%{$key}%", $v ?? '', $result);
+				$result=\str_replace("%{$key}%", $v ?? '', $result);
 			}
 		}
-		if (isset($js) === true) {
+		if (isset($js)===true) {
 			$this->run($js);
-			if (isset($view) === true) {
+			if (isset($view)===true) {
 				$js->addViewElement($this->getLibraryId(), $result, $view);
 			}
 		}
 
 		if (\is_callable($this->_postCompile)) {
-			$pc = $this->_postCompile;
+			$pc=$this->_postCompile;
 			$pc($this);
 		}
 		return $result;
@@ -247,12 +247,12 @@ 
 	 *        	default: ["jsCallback"=>"","jqueryDone"=>"append"]
 	 * @return \Ajax\common\html\BaseHtml
 	 */
-	public function setDraggable($attr = "id", $dropZone = null, $parameters = []) {
+	public function setDraggable($attr="id", $dropZone=null, $parameters=[]) {
 		$this->setProperty("draggable", "true");
 		$this->addEvent("dragstart", Javascript::draggable($attr));
 		if (isset($dropZone) && $dropZone instanceof BaseHtml) {
-			$jqueryDone = "append";
-			$jsCallback = "";
+			$jqueryDone="append";
+			$jsCallback="";
 			extract($parameters);
 			$dropZone->asDropZone($jsCallback, $jqueryDone, $parameters);
 		}
@@ -267,8 +267,8 @@ 
 	 * @param array $parameters
 	 * @return \Ajax\common\html\BaseHtml
 	 */
-	public function asDropZone($jsCallback = "", $jqueryDone = "append", $parameters = []) {
-		$stopPropagation = false;
+	public function asDropZone($jsCallback="", $jqueryDone="append", $parameters=[]) {
+		$stopPropagation=false;
 		$this->addEvent("dragover", '', $stopPropagation, true);
 		extract($parameters);
 		$this->addEvent("drop", Javascript::dropZone($jqueryDone, $jsCallback), $stopPropagation, true);
@@ -285,9 +285,9 @@ 
 	 * @param array $parameters
 	 * @return \Ajax\common\html\BaseHtml
 	 */
-	public function asFileDropZone($responseElement = null, $url = null, $progress = null, $jsCallback = "", $parameters = []) {
-		$stopPropagation = false;
-		$defaultAjaxAttributes = [
+	public function asFileDropZone($responseElement=null, $url=null, $progress=null, $jsCallback="", $parameters=[]) {
+		$stopPropagation=false;
+		$defaultAjaxAttributes=[
 			'contentType' => 'false',
 			'processData' => 'false'
 		];
@@ -295,15 +295,15 @@ 
 		extract($parameters);
 		$this->addEvent("drop", Javascript::fileDropZone($jsCallback), $stopPropagation, true);
 		if (isset($ajaxAttributes)) {
-			$ajaxAttributes += $defaultAjaxAttributes;
+			$ajaxAttributes+=$defaultAjaxAttributes;
 		} else {
-			$ajaxAttributes = $defaultAjaxAttributes;
+			$ajaxAttributes=$defaultAjaxAttributes;
 		}
 		if (isset($progress)) {
-			$progress = new HtmlProgress($this->_identifier . '-pg', 0, $progress);
+			$progress=new HtmlProgress($this->_identifier.'-pg', 0, $progress);
 			$progress->setTotal(100);
 			$this->wrap('', $progress);
-			$ajaxAttributes['upload'] = "$('#" . $this->_identifier . "-pg').progress('set percent', Math.ceil(event.loaded/event.total)*100);";
+			$ajaxAttributes['upload']="$('#".$this->_identifier."-pg').progress('set percent', Math.ceil(event.loaded/event.total)*100);";
 		}
 		if (isset($url)) {
 			$this->postOn('upload', $url, 'event.target.upload', $responseElement, $ajaxAttributes);
@@ -316,21 +316,21 @@ 
 	}
 
 	public function onPostCompile($callback) {
-		$this->_postCompile = $callback;
+		$this->_postCompile=$callback;
 	}
 
 	public function onPreCompile($callback) {
-		$this->_preCompile = $this->addCallback($this->_preCompile, $callback);
+		$this->_preCompile=$this->addCallback($this->_preCompile, $callback);
 	}
 
 	private function addCallback($originalValue, $callback) {
 		if (isset($originalValue)) {
-			if (! is_array($originalValue)) {
-				$result = [
+			if (!is_array($originalValue)) {
+				$result=[
 					$originalValue
 				];
 			}
-			$result[] = $callback;
+			$result[]=$callback;
 			return $result;
 		}
 		return $callback;

Ajax/semantic/components/validation/FieldValidation.php

Spacing +19 added lines, -19 removed lines

@@ -30,7 +30,7 @@ 
 	 */
 	protected $customRules;
 
-	protected $hasCustomRules = false;
+	protected $hasCustomRules=false;
 
 	/**
 	 *
@@ -41,8 +41,8 @@ 
 	protected $optional;
 
 	public function __construct($identifier) {
-		$this->identifier = $identifier;
-		$this->rules = [];
+		$this->identifier=$identifier;
+		$this->rules=[];
 	}
 
 	public function getIdentifier() {
@@ -50,7 +50,7 @@ 
 	}
 
 	public function setIdentifier($identifier) {
-		$this->identifier = $identifier;
+		$this->identifier=$identifier;
 		return $this;
 	}
 
@@ -65,47 +65,47 @@ 
 	 * @param string $value
 	 * @return Rule
 	 */
-	public function addRule($type, $prompt = NULL, $value = NULL) {
+	public function addRule($type, $prompt=NULL, $value=NULL) {
 		if ($type instanceof Rule) {
-			$rule = $type;
+			$rule=$type;
 			if ($type instanceof CustomRule) {
-				$this->customRules[] = $type;
-				$this->hasCustomRules = true;
+				$this->customRules[]=$type;
+				$this->hasCustomRules=true;
 			}
 		} elseif (\is_array($type)) {
-			$value = JArray::getValue($type, "value", 2);
-			$prompt = JArray::getValue($type, "prompt", 1);
-			$type = JArray::getValue($type, "type", 0);
-			$rule = new Rule($type, $prompt, $value);
+			$value=JArray::getValue($type, "value", 2);
+			$prompt=JArray::getValue($type, "prompt", 1);
+			$type=JArray::getValue($type, "type", 0);
+			$rule=new Rule($type, $prompt, $value);
 		} else {
-			$rule = new Rule($type, $prompt, $value);
+			$rule=new Rule($type, $prompt, $value);
 		}
-		$this->rules[] = $rule;
+		$this->rules[]=$rule;
 		return $rule;
 	}
 
 	#[\ReturnTypeWillChange]
 	public function jsonSerialize() {
-		$result = [
+		$result=[
 			"identifier" => $this->identifier,
 			"rules" => $this->rules
 		];
 		if ($this->optional) {
-			$result["optional"] = true;
+			$result["optional"]=true;
 		}
 		if (isset($this->depends)) {
-			$result["depends"] = $this->depends;
+			$result["depends"]=$this->depends;
 		}
 		return $result;
 	}
 
 	public function setDepends($depends) {
-		$this->depends = $depends;
+		$this->depends=$depends;
 		return $this;
 	}
 
 	public function setOptional($optional) {
-		$this->optional = $optional;
+		$this->optional=$optional;
 		return $this;
 	}
 

Ajax/semantic/components/validation/Rule.php

Spacing +49 added lines, -49 removed lines

@@ -8,7 +8,7 @@ 
  * @version 1.001
  * Generates a JSON Rule for the validation of a field
  */
-class Rule implements \JsonSerializable{
+class Rule implements \JsonSerializable {
 	/**
 	 * @var string
 	 */
@@ -23,7 +23,7 @@ 
 	 */
 	private $value;
 
-	public function __construct($type,$prompt=NULL,$value=NULL){
+	public function __construct($type, $prompt=NULL, $value=NULL) {
 		$this->type=$type;
 		$this->prompt=$prompt;
 		$this->value=$value;
@@ -58,10 +58,10 @@ 
 
 	#[\ReturnTypeWillChange]
 	public function jsonSerialize() {
-		$result= ["type"=>$this->type];
-		if(isset($this->prompt))
+		$result=["type"=>$this->type];
+		if (isset($this->prompt))
 			$result["prompt"]=$this->prompt;
-		if(isset($this->value))
+		if (isset($this->value))
 			$result["value"]=$this->value;
 		return $result;
 	}
@@ -72,8 +72,8 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function match($name,$prompt=NULL){
-		return new Rule("match[".$name."]",$prompt);
+	public static function match($name, $prompt=NULL) {
+		return new Rule("match[".$name."]", $prompt);
 	}
 
 	/**
@@ -82,8 +82,8 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function different($name,$prompt=NULL){
-		return new Rule("different[".$name."]",$prompt);
+	public static function different($name, $prompt=NULL) {
+		return new Rule("different[".$name."]", $prompt);
 	}
 
 	/**
@@ -93,82 +93,82 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function integer($min=NULL,$max=NULL,$prompt=NULL){
-		if(\is_int($min) && \is_int($max))
-			return new Rule("integer[{$min}..{$max}]",$prompt);
-		return new Rule("integer",$prompt);
+	public static function integer($min=NULL, $max=NULL, $prompt=NULL) {
+		if (\is_int($min) && \is_int($max))
+			return new Rule("integer[{$min}..{$max}]", $prompt);
+		return new Rule("integer", $prompt);
 	}
 
-	public static function decimal($prompt=NULL){
-		return new Rule("decimal",$prompt);
+	public static function decimal($prompt=NULL) {
+		return new Rule("decimal", $prompt);
 	}
 
-	public static function number($prompt=NULL){
-		return new Rule("number",$prompt);
+	public static function number($prompt=NULL) {
+		return new Rule("number", $prompt);
 	}
 
-	public static function is($value,$prompt=NULL){
-		return new Rule("is[".$value."]",$prompt);
+	public static function is($value, $prompt=NULL) {
+		return new Rule("is[".$value."]", $prompt);
 	}
 
-	public static function isExactly($value,$prompt=NULL){
-		return new Rule("isExactly[".$value."]",$prompt);
+	public static function isExactly($value, $prompt=NULL) {
+		return new Rule("isExactly[".$value."]", $prompt);
 	}
 
-	public static function not($value,$prompt=NULL){
-		return new Rule("not[".$value."]",$prompt);
+	public static function not($value, $prompt=NULL) {
+		return new Rule("not[".$value."]", $prompt);
 	}
 
-	public static function notExactly($value,$prompt=NULL){
-		return new Rule("notExactly[".$value."]",$prompt);
+	public static function notExactly($value, $prompt=NULL) {
+		return new Rule("notExactly[".$value."]", $prompt);
 	}
 
-	public static function contains($value,$prompt=NULL){
-		return new Rule("contains[".$value."]",$prompt);
+	public static function contains($value, $prompt=NULL) {
+		return new Rule("contains[".$value."]", $prompt);
 	}
 
-	public static function containsExactly($value,$prompt=NULL){
-		return new Rule("containsExactly[".$value."]",$prompt);
+	public static function containsExactly($value, $prompt=NULL) {
+		return new Rule("containsExactly[".$value."]", $prompt);
 	}
 
-	public static function doesntContain($value,$prompt=NULL){
-		return new Rule("doesntContain[".$value."]",$prompt);
+	public static function doesntContain($value, $prompt=NULL) {
+		return new Rule("doesntContain[".$value."]", $prompt);
 	}
 
-	public static function doesntContainExactly($value,$prompt=NULL){
-		return new Rule("doesntContainExactly[".$value."]",$prompt);
+	public static function doesntContainExactly($value, $prompt=NULL) {
+		return new Rule("doesntContainExactly[".$value."]", $prompt);
 	}
 
-	public static function minCount($value,$prompt=NULL){
-		return new Rule("minCount[".$value."]",$prompt);
+	public static function minCount($value, $prompt=NULL) {
+		return new Rule("minCount[".$value."]", $prompt);
 	}
 
-	public static function maxCount($value,$prompt=NULL){
-		return new Rule("maxCount[".$value."]",$prompt);
+	public static function maxCount($value, $prompt=NULL) {
+		return new Rule("maxCount[".$value."]", $prompt);
 	}
 
-	public static function exactCount($value,$prompt=NULL){
-		return new Rule("exactCount[".$value."]",$prompt);
+	public static function exactCount($value, $prompt=NULL) {
+		return new Rule("exactCount[".$value."]", $prompt);
 	}
 
-	public static function email($prompt=NULL){
-		return new Rule("email",$prompt);
+	public static function email($prompt=NULL) {
+		return new Rule("email", $prompt);
 	}
 
-	public static function url($prompt=NULL){
-		return new Rule("url",$prompt);
+	public static function url($prompt=NULL) {
+		return new Rule("url", $prompt);
 	}
 
-	public static function regExp($value,$prompt=NULL){
-		return new Rule("regExp",$prompt,$value);
+	public static function regExp($value, $prompt=NULL) {
+		return new Rule("regExp", $prompt, $value);
 	}
 
-	public static function custom($name,$jsFunction){
-		return "$.fn.form.settings.rules.".$name." =".$jsFunction ;
+	public static function custom($name, $jsFunction) {
+		return "$.fn.form.settings.rules.".$name." =".$jsFunction;
 	}
 
-	public static function ajax(JsUtils $js,$name,$url,$params,$jsCallback,$method="post",$parameters=[]){
-		$parameters=\array_merge(["async"=>false,"url"=>$url,"params"=>$params,"hasLoader"=>false,"jsCallback"=>$jsCallback,"dataType"=>"json","stopPropagation"=>false,"preventDefault"=>false,"responseElement"=>null],$parameters);
+	public static function ajax(JsUtils $js, $name, $url, $params, $jsCallback, $method="post", $parameters=[]) {
+		$parameters=\array_merge(["async"=>false, "url"=>$url, "params"=>$params, "hasLoader"=>false, "jsCallback"=>$jsCallback, "dataType"=>"json", "stopPropagation"=>false, "preventDefault"=>false, "responseElement"=>null], $parameters);
 		$ajax=new AjaxCall($method, $parameters);
 		return self::custom($name, "function(value,ruleValue){var result=true;".$ajax->compile($js)."return result;}");
 	}