phpMv / phpMv-UI

Ajax/semantic/html/collections/HtmlGrid.php

Spacing +41 added lines, -41 removed lines

@@ -32,16 +32,16 @@ 
 			// }
 			$this->setWide($numCols);
 		}
-		if($createCols)
+		if ($createCols)
 			$this->setRowsCount($numRows, $numCols);
 	}
 
 	public function asSegment() {
-		return $this->addToPropertyCtrl("class", "segment", array ("segment" ));
+		return $this->addToPropertyCtrl("class", "segment", array("segment"));
 	}
 
 	public function asContainer() {
-		return $this->addToPropertyCtrl("class", "container", array ("container" ));
+		return $this->addToPropertyCtrl("class", "container", array("container"));
 	}
 
 	/**
@@ -49,10 +49,10 @@ 
 	 * @param int $wide
 	 */
 	public function setWide($wide) {
-		if(isset(Wide::getConstants()["W" . $wide])){
-			$wide=Wide::getConstants()["W" . $wide];
+		if (isset(Wide::getConstants()["W".$wide])) {
+			$wide=Wide::getConstants()["W".$wide];
 			$this->addToPropertyCtrl("class", $wide, Wide::getConstants());
-			return $this->addToPropertyCtrl("class", "column", array ("column" ));
+			return $this->addToPropertyCtrl("class", "column", array("column"));
 		}
 		return $this;
 	}
@@ -72,9 +72,9 @@ 
 	 * @return mixed
 	 */
 	public function addRow($colsCount=NULL) {
-		$rowCount=$this->rowCount() + 1;
+		$rowCount=$this->rowCount()+1;
 		$this->setRowsCount($rowCount, $colsCount, true);
-		return $this->content[$rowCount - 1];
+		return $this->content[$rowCount-1];
 	}
 
 	/**
@@ -83,10 +83,10 @@ 
 	 * @return mixed|\Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function addCol($width=NULL) {
-		$colCount=$this->colCount() + 1;
+		$colCount=$this->colCount()+1;
 		$this->setColsCount($colCount, true, $width);
 		if ($this->hasOnlyCols($this->count()))
-			return $this->content[$colCount - 1];
+			return $this->content[$colCount-1];
 		return $this;
 	}
 
@@ -96,7 +96,7 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function addCols($sizes=array()) {
-		foreach ( $sizes as $size ) {
+		foreach ($sizes as $size) {
 			$this->addCol($size);
 		}
 		return $this;
@@ -110,19 +110,19 @@ 
 	 */
 	public function setRowsCount($rowsCount, $colsCount=NULL, $force=false) {
 		$count=$this->count();
-		if ($rowsCount < 2 && $force === false) {
-			for($i=$count; $i < $colsCount; $i++) {
-				$this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i));
+		if ($rowsCount<2 && $force===false) {
+			for ($i=$count; $i<$colsCount; $i++) {
+				$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i));
 			}
 		} else {
 			if ($this->hasOnlyCols($count)) {
 				$tmpContent=$this->content;
 				$item=$this->addItem($colsCount);
 				$item->setContent($tmpContent);
-				$this->content=array ();
+				$this->content=array();
 				$count=1;
 			}
-			for($i=$count; $i < $rowsCount; $i++) {
+			for ($i=$count; $i<$rowsCount; $i++) {
 				$this->addItem($colsCount);
 			}
 		}
@@ -130,7 +130,7 @@ 
 	}
 
 	protected function hasOnlyCols($count) {
-		return $count > 0 && $this->content[0] instanceof HtmlGridCol;
+		return $count>0 && $this->content[0] instanceof HtmlGridCol;
 	}
 
 	/**
@@ -144,14 +144,14 @@ 
 		if (isset($width)===false) {
 			$this->setWide($numCols);
 		}
-		if ($toCreate === true) {
+		if ($toCreate===true) {
 			$count=$this->count();
-			if ($count == 0 || $this->hasOnlyCols($count)) {
-				for($i=$count; $i < $numCols; $i++) {
-					$this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i, $width));
+			if ($count==0 || $this->hasOnlyCols($count)) {
+				for ($i=$count; $i<$numCols; $i++) {
+					$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i, $width));
 				}
 			} else {
-				for($i=0; $i < $count; $i++) {
+				for ($i=0; $i<$count; $i++) {
 					$this->getItem($i)->setColsCount($numCols);
 				}
 			}
@@ -187,7 +187,7 @@ 
 		$count=$this->count();
 		if ($this->hasOnlyCols($count))
 			return $count;
-		if ($count > 0)
+		if ($count>0)
 			return $this->getItem(0)->count();
 		return 0;
 	}
@@ -199,7 +199,7 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGridCol
 	 */
 	public function getCell($row, $col) {
-		if ($row < 2 && $this->hasOnlyCols($this->count()))
+		if ($row<2 && $this->hasOnlyCols($this->count()))
 			return $this->getItem($col);
 		$row=$this->getItem($row);
 		if (isset($row)) {
@@ -214,8 +214,8 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function setDivided($vertically=false) {
-		$value=($vertically === true) ? "vertically divided" : "divided";
-		return $this->addToPropertyCtrl("class", $value, array ("divided" ));
+		$value=($vertically===true) ? "vertically divided" : "divided";
+		return $this->addToPropertyCtrl("class", $value, array("divided"));
 	}
 
 	/**
@@ -224,15 +224,15 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function setCelled($internally=false) {
-		$value=($internally === true) ? "internally celled" : "celled";
-		return $this->addToPropertyCtrl("class", $value, array ("celled","internally celled" ));
+		$value=($internally===true) ? "internally celled" : "celled";
+		return $this->addToPropertyCtrl("class", $value, array("celled", "internally celled"));
 	}
 
 	/**
 	 * A grid can have its columns centered
 	 */
 	public function setCentered() {
-		return $this->addToPropertyCtrl("class", "centered", array ("centered" ));
+		return $this->addToPropertyCtrl("class", "centered", array("centered"));
 	}
 
 	/**
@@ -250,7 +250,7 @@ 
 	 */
 	public function setPadded($value=NULL) {
 		if (isset($value))
-			$this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" ));
+			$this->addToPropertyCtrl("class", $value, array("vertically", "horizontally"));
 		return $this->addToProperty("class", "padded");
 	}
 
@@ -260,12 +260,12 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function setRelaxed($very=false) {
-		$value=($very === true) ? "very relaxed" : "relaxed";
-		return $this->addToPropertyCtrl("class", $value, array ("relaxed","very relaxed" ));
+		$value=($very===true) ? "very relaxed" : "relaxed";
+		return $this->addToPropertyCtrl("class", $value, array("relaxed", "very relaxed"));
 	}
 
 	public function setVerticalAlignment($value=VerticalAlignment::MIDDLE) {
-		return $this->addToPropertyCtrl("class", $value . " aligned", VerticalAlignment::getConstantValues("aligned"));
+		return $this->addToPropertyCtrl("class", $value." aligned", VerticalAlignment::getConstantValues("aligned"));
 	}
 
 	/**
@@ -275,9 +275,9 @@ 
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
 	 */
 	protected function createItem($value) {
-		if ($this->_createCols === false)
+		if ($this->_createCols===false)
 			$value=null;
-		$item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows);
+		$item=new HtmlGridRow($this->identifier."-row-".($this->count()+1), $value, $this->_colSizing, $this->_implicitRows);
 		return $item;
 	}
 
@@ -288,15 +288,15 @@ 
 	public function setValues($values, $force=true) {
 		$count=$this->count();
 		$valuesSize=\sizeof($values);
-		if ($this->_createCols === false || $force === true) {
-			for($i=$count; $i < $valuesSize; $i++) {
+		if ($this->_createCols===false || $force===true) {
+			for ($i=$count; $i<$valuesSize; $i++) {
 				$colSize=\sizeof($values[$i]);
-				$this->addItem(new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $colSize, $this->_colSizing, $this->_implicitRows));
+				$this->addItem(new HtmlGridRow($this->identifier."-row-".($this->count()+1), $colSize, $this->_colSizing, $this->_implicitRows));
 			}
 		}
-		$count=\min(array ($this->count(),$valuesSize ));
-		for($i=0; $i < $count; $i++) {
-			$this->content[$i]->setValues($values[$i], $this->_createCols === false);
+		$count=\min(array($this->count(), $valuesSize));
+		for ($i=0; $i<$count; $i++) {
+			$this->content[$i]->setValues($values[$i], $this->_createCols===false);
 		}
 	}
 

Ajax/common/html/HtmlDoubleElement.php

Spacing +15 added lines, -15 removed lines

@@ -27,15 +27,15 @@ 
 		return $this->content;
 	}
 
-	public function addContent($content,$before=false) {
+	public function addContent($content, $before=false) {
 		if (!\is_array($this->content)) {
-			if(isset($this->content))
-				$this->content=array ($this->content);
+			if (isset($this->content))
+				$this->content=array($this->content);
 			else
 				$this->content=array();
 		}
-		if($before)
-			array_unshift($this->content,$content);
+		if ($before)
+			array_unshift($this->content, $content);
 		else
 			$this->content []=$content;
 		return $this;
@@ -50,7 +50,7 @@ 
 		if ($this->content instanceof HtmlDoubleElement) {
 			$this->content->run($js);
 		} else if (\is_array($this->content)) {
-			foreach ( $this->content as $itemContent ) {
+			foreach ($this->content as $itemContent) {
 				if ($itemContent instanceof HtmlDoubleElement) {
 					$itemContent->run($js);
 				}
@@ -67,19 +67,19 @@ 
 		return $this;
 	}
 
-	public function getContentInstances($class){
-		return $this->_getContentInstances($class,$this->content);
+	public function getContentInstances($class) {
+		return $this->_getContentInstances($class, $this->content);
 	}
 
-	protected function _getContentInstances($class,$content){
+	protected function _getContentInstances($class, $content) {
 		$instances=[];
-		if($content instanceof $class){
+		if ($content instanceof $class) {
 			$instances[]=$content;
-		}elseif($content instanceof HtmlDoubleElement){
-			$instances=\array_merge($instances,$content->getContentInstances($class));
-		}elseif (\is_array($content)){
-			foreach ($content as $element){
-				$instances=\array_merge($instances,$this->_getContentInstances($class, $element));
+		}elseif ($content instanceof HtmlDoubleElement) {
+			$instances=\array_merge($instances, $content->getContentInstances($class));
+		}elseif (\is_array($content)) {
+			foreach ($content as $element) {
+				$instances=\array_merge($instances, $this->_getContentInstances($class, $element));
 			}
 		}
 		return $instances;

Ajax/common/html/html5/HtmlInput.php

Spacing +8 added lines, -8 removed lines

@@ -8,7 +8,7 @@ 
 
 class HtmlInput extends HtmlSingleElement {
 	protected $_placeholder;
-	public function __construct($identifier,$type="text",$value=NULL,$placeholder=NULL) {
+	public function __construct($identifier, $type="text", $value=NULL, $placeholder=NULL) {
 		parent::__construct($identifier, "input");
 		$this->setProperty("name", $identifier);
 		$this->setValue($value);
@@ -17,7 +17,7 @@ 
 	}
 
 	public function setValue($value) {
-		if(isset($value))
+		if (isset($value))
 		$this->setProperty("value", $value);
 		return $this;
 	}
@@ -26,19 +26,19 @@ 
 		return $this->setProperty("type", $value);
 	}
 
-	public function setPlaceholder($value){
-		if(JString::isNotNull($value))
+	public function setPlaceholder($value) {
+		if (JString::isNotNull($value))
 			$this->_placeholder=$value;
 		return $this;
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$value=$this->_placeholder;
-		if(JString::isNull($value)){
-			if(JString::isNotNull($this->getProperty("name")))
+		if (JString::isNull($value)) {
+			if (JString::isNotNull($this->getProperty("name")))
 				$value=\ucfirst($this->getProperty("name"));
 		}
 		$this->setProperty("placeholder", $value);
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 }
\ No newline at end of file

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

Spacing +37 added lines, -37 removed lines

@@ -14,34 +14,34 @@ 
 	use FieldTrait;
 	protected $_container;
 	protected $_validation;
-	public function __construct($identifier, $field,$label=NULL) {
-		parent::__construct($identifier, "div","field");
+	public function __construct($identifier, $field, $label=NULL) {
+		parent::__construct($identifier, "div", "field");
 		$this->content=array();
-		$this->_states=[State::ERROR,State::DISABLED];
-		if(isset($label))
+		$this->_states=[State::ERROR, State::DISABLED];
+		if (isset($label))
 			$this->setLabel($label);
 		$this->setField($field);
 		$this->_validation=NULL;
 	}
 
-	public function addPointingLabel($label,$pointing=Direction::NONE){
-		$labelO=new HtmlLabel("",$label);
+	public function addPointingLabel($label, $pointing=Direction::NONE) {
+		$labelO=new HtmlLabel("", $label);
 		$labelO->setPointing($pointing);
-		$this->addContent($labelO,$pointing==="below" || $pointing==="right");
+		$this->addContent($labelO, $pointing==="below" || $pointing==="right");
 		return $labelO;
 	}
 
-	public function setLabel($label){
+	public function setLabel($label) {
 		$labelO=$label;
-		if(\is_string($label)){
-			$labelO=new HtmlSemDoubleElement("","label","");
+		if (\is_string($label)) {
+			$labelO=new HtmlSemDoubleElement("", "label", "");
 			$labelO->setContent($label);
-			$labelO->setProperty("for", \str_replace("field-", "",$this->identifier));
+			$labelO->setProperty("for", \str_replace("field-", "", $this->identifier));
 		}
 		$this->content["label"]=$labelO;
 	}
 
-	public function setField($field){
+	public function setField($field) {
 		$this->content["field"]=$field;
 	}
 
@@ -49,8 +49,8 @@ 
 	 * Returns the label or null
 	 * @return mixed
 	 */
-	public function getLabel(){
-		if(\array_key_exists("label", $this->content))
+	public function getLabel() {
+		if (\array_key_exists("label", $this->content))
 			return $this->content["label"];
 	}
 
@@ -58,7 +58,7 @@ 
 	 * Return the field
 	 * @return mixed
 	 */
-	public function getField(){
+	public function getField() {
 		return $this->content["field"];
 	}
 
@@ -66,14 +66,14 @@ 
 	 * Return the field with data
 	 * @return mixed
 	 */
-	public function getDataField(){
+	public function getDataField() {
 		return $this->content["field"];
 	}
 
 	/**
 	 * puts the label before or behind
 	 */
-	public function swapLabel(){
+	public function swapLabel() {
 		$label=$this->getLabel();
 		unset($this->content["label"]);
 		$this->content["label"]=$label;
@@ -84,31 +84,31 @@ 
 	 * @param int $width
 	 * @return \Ajax\semantic\html\collections\form\HtmlFormField
 	 */
-	public function setWidth($width){
-		if(\is_int($width)){
+	public function setWidth($width) {
+		if (\is_int($width)) {
 			$width=Wide::getConstants()["W".$width];
 		}
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
-		if(isset($this->_container)){
+		if (isset($this->_container)) {
 			$this->_container->setEqualWidth(false);
 		}
-		return $this->addToPropertyCtrl("class", "wide",array("wide"));
+		return $this->addToPropertyCtrl("class", "wide", array("wide"));
 	}
 
 	/**
 	 * Field displays an error state
 	 * @return \Ajax\semantic\html\collections\form\HtmlFormField
 	 */
-	public function setError(){
+	public function setError() {
 		return $this->addToProperty("class", "error");
 	}
 
-	public function setInline(){
+	public function setInline() {
 		return $this->addToProperty("class", "inline");
 	}
 
-	public function jsState($state){
-		return $this->jsDoJquery("addClass",$state);
+	public function jsState($state) {
+		return $this->jsDoJquery("addClass", $state);
 	}
 
 	public function setContainer($_container) {
@@ -116,39 +116,39 @@ 
 		return $this;
 	}
 
-	public function setReadonly(){
+	public function setReadonly() {
 		$this->getField()->setProperty("readonly", "");
 	}
 
-	public function addRule($type,$prompt=NULL,$value=NULL){
+	public function addRule($type, $prompt=NULL, $value=NULL) {
 		$field=$this->getDataField();
-		if(isset($field)){
-			if(!isset($this->_validation)){
+		if (isset($field)) {
+			if (!isset($this->_validation)) {
 				$this->_validation=new FieldValidation($field->getIdentifier());
 			}
-			if($type==="empty"){
-				$this->addToProperty("class","required");
+			if ($type==="empty") {
+				$this->addToProperty("class", "required");
 			}
-			$this->_validation->addRule($type,$prompt,$value);
+			$this->_validation->addRule($type, $prompt, $value);
 		}
 		return $this;
 	}
 
-	public function addRules(array $rules){
-		foreach ($rules as $rule){
+	public function addRules(array $rules) {
+		foreach ($rules as $rule) {
 			$this->addRule($rule);
 		}
 		return $this;
 	}
 
-	public function setRules(array $rules){
+	public function setRules(array $rules) {
 		$this->_validation=null;
 		return $this->addRules($rules);
 	}
 
-	public function addIcon($icon,$direction=Direction::LEFT){
+	public function addIcon($icon, $direction=Direction::LEFT) {
 		$field=$this->getField();
-		return $field->addIcon($icon,$direction);
+		return $field->addIcon($icon, $direction);
 	}
 
 	public function getValidation() {

Ajax/semantic/widgets/dataform/DataForm.php

Spacing +22 added lines, -22 removed lines

@@ -19,49 +19,49 @@ 
 class DataForm extends Widget {
 
 	public function __construct($identifier, $modelInstance=NULL) {
-		parent::__construct($identifier, null,$modelInstance);
+		parent::__construct($identifier, null, $modelInstance);
 		$this->_form=new HtmlForm($identifier);
 		$this->_init(new FormInstanceViewer($identifier), "form", $this->_form, true);
 	}
 
-	protected function _getFieldIdentifier($prefix,$name=""){
+	protected function _getFieldIdentifier($prefix, $name="") {
 		return $this->identifier."-{$name}-".$this->_instanceViewer->getIdentifier();
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->_instanceViewer->setInstance($this->_modelInstance);
 
 		$form=$this->content["form"];
 		$this->_generateContent($form);
 
-		if(isset($this->_toolbar)){
+		if (isset($this->_toolbar)) {
 			$this->_setToolbarPosition($form);
 		}
-		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]);
-		return parent::compile($js,$view);
+		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]);
+		return parent::compile($js, $view);
 	}
 
 	/**
 	 * @param HtmlForm $form
 	 */
-	protected function _generateContent($form){
-		$values= $this->_instanceViewer->getValues();
+	protected function _generateContent($form) {
+		$values=$this->_instanceViewer->getValues();
 		$count=$this->_instanceViewer->count();
 
 		$separators=$this->_instanceViewer->getSeparators();
 		$size=\sizeof($separators);
-		if($size===1){
-			foreach ($values as $v){
+		if ($size===1) {
+			foreach ($values as $v) {
 				$form->addField($v);
 			}
-		}else{
+		} else {
 			$separators[]=$count;
-			for($i=0;$i<$size;$i++){
-				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
+			for ($i=0; $i<$size; $i++) {
+				$fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]);
 				//TODO check why $fields is empty
-				if(\sizeof($fields)===1){
+				if (\sizeof($fields)===1) {
 					$form->addField($fields[0]);
-				}elseif(\sizeof($fields)>1){
+				}elseif (\sizeof($fields)>1) {
 					$form->addFields($fields);
 					$i+=\sizeof($fields)-1;
 				}
@@ -73,11 +73,11 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\common\Widget::getForm()
 	 */
-	public function getForm(){
+	public function getForm() {
 		return $this->content["form"];
 	}
 
-	public function addSeparatorAfter($fieldNum){
+	public function addSeparatorAfter($fieldNum) {
 		$this->_instanceViewer->addSeparatorAfter($fieldNum);
 		return $this;
 	}
@@ -91,12 +91,12 @@ 
 		return $this;
 	}
 
-	public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){
-			$button=new HtmlButton($id,$value,$cssStyle);
+	public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){
+			$button=new HtmlButton($id, $value, $cssStyle);
 			$button->setProperty("type", "reset");
 			return $button;
-		}, $index,$attributes);
+		}, $index, $attributes);
 	}
 
 	/**
@@ -115,7 +115,7 @@ 
 		$this->content[$this->_toolbarPosition]=$this->_toolbar;
 	}
 
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		return parent::run($js);
 	}
 }
\ No newline at end of file

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

Spacing +23 added lines, -23 removed lines

@@ -20,7 +20,7 @@ 
  */
 class HtmlForm extends HtmlSemCollection {
 
-	use FieldsTrait,FormTrait;
+	use FieldsTrait, FormTrait;
 	/**
 	 * @var array
 	 */
@@ -33,14 +33,14 @@ 
 
 	public function __construct($identifier, $elements=array()) {
 		parent::__construct($identifier, "form", "ui form");
-		$this->_states=[ State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED ];
+		$this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED];
 		$this->setProperty("name", $this->identifier);
-		$this->_fields=array ();
+		$this->_fields=array();
 		$this->addItems($elements);
 		$this->_validationParams=[];
 	}
 
-	protected function getForm(){
+	protected function getForm() {
 		return $this;
 	}
 
@@ -61,8 +61,8 @@ 
 	 * @param string $caption
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function addDivider($caption=NULL){
-		return $this->addContent(new HtmlDivider("",$caption));
+	public function addDivider($caption=NULL) {
+		return $this->addContent(new HtmlDivider("", $caption));
 	}
 
 	public function addFields($fields=NULL, $label=NULL) {
@@ -78,12 +78,12 @@ 
 						$label=NULL;
 				}
 				$this->_fields=\array_merge($this->_fields, $fields);
-				$fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields);
+				$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields);
 			}
 			if (isset($label))
 				$fields=new HtmlFormField("", $fields, $label);
 		} else {
-			$fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count());
+			$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count());
 		}
 		$this->addItem($fields);
 		return $fields;
@@ -91,7 +91,7 @@ 
 
 	public function addItem($item) {
 		$item=parent::addItem($item);
-		if (\is_subclass_of($item, HtmlFormField::class) === true) {
+		if (\is_subclass_of($item, HtmlFormField::class)===true) {
 			$this->_fields[]=$item;
 		}
 		return $item;
@@ -145,38 +145,38 @@ 
 
 
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(\sizeof($this->_validationParams)>0)
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (\sizeof($this->_validationParams)>0)
 			$this->setProperty("novalidate", "");
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	public function run(JsUtils $js) {
-		if(isset($js)){
+		if (isset($js)) {
 			$compo=$js->semantic()->form("#".$this->identifier);
-		}else{
+		} else {
 			$compo=new Form();
 			$compo->attach("#".$this->identifier);
 		}
-		foreach ($this->_fields as $field){
-			if($field instanceof HtmlFormField){
+		foreach ($this->_fields as $field) {
+			if ($field instanceof HtmlFormField) {
 				$compo=$this->addCompoValidation($compo, $field);
 			}
 		}
-		foreach ($this->content as $field){
-			if($field instanceof HtmlFormFields){
+		foreach ($this->content as $field) {
+			if ($field instanceof HtmlFormFields) {
 				$items=$field->getItems();
-				foreach ($items as $_field){
-					if($_field instanceof HtmlFormField)
+				foreach ($items as $_field) {
+					if ($_field instanceof HtmlFormField)
 						$compo=$this->addCompoValidation($compo, $_field);
 				}
 			}
 		}
-		$this->_runValidationParams($compo,$js);
+		$this->_runValidationParams($compo, $js);
 		return $this->_bsComponent;
 	}
 
-	public function addValidationParam($paramName,$paramValue){
+	public function addValidationParam($paramName, $paramValue) {
 		$this->_validationParams[$paramName]=$paramValue;
 		return $this;
 	}
@@ -190,7 +190,7 @@ 
 		return $this->_validationParams;
 	}
 
-	public function removeValidationParam($param){
+	public function removeValidationParam($param) {
 		unset($this->_validationParams[$param]);
 		return $this;
 	}

Ajax/semantic/widgets/dataelement/DataElement.php

Spacing +14 added lines, -14 removed lines

@@ -19,45 +19,45 @@ 
 class DataElement extends Widget {
 
 	public function __construct($identifier, $modelInstance=NULL) {
-		parent::__construct($identifier, null,$modelInstance);
-		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0,2), false);
+		parent::__construct($identifier, null, $modelInstance);
+		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 2), false);
 		$this->content["table"]->setDefinition();
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(!$this->_generated){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
 			$this->_instanceViewer->setInstance($this->_modelInstance);
 
 			$table=$this->content["table"];
 			$this->_generateContent($table);
 
-			if(isset($this->_toolbar)){
+			if (isset($this->_toolbar)) {
 				$this->_setToolbarPosition($table);
 			}
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
 			$this->_compileForm();
 			$this->_generated=true;
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	/**
 	 * @param HtmlTable $table
 	 */
-	protected function _generateContent($table){
+	protected function _generateContent($table) {
 		$captions=$this->_instanceViewer->getCaptions();
-		$values= $this->_instanceViewer->getValues();
+		$values=$this->_instanceViewer->getValues();
 		$count=$this->_instanceViewer->count();
-		for($i=0;$i<$count;$i++){
-			$table->addRow([$captions[$i],$values[$i]]);
+		for ($i=0; $i<$count; $i++) {
+			$table->addRow([$captions[$i], $values[$i]]);
 		}
 	}
 
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		return $this->_instanceViewer->getFieldName($index);
 	}
 
-	protected function _getFieldCaption($index){
+	protected function _getFieldCaption($index) {
 		return null;
 	}
 
@@ -89,7 +89,7 @@ 
 		return $this;
 	}
 
-	public function asForm(){
+	public function asForm() {
 		return $this->getForm();
 	}
 }
\ No newline at end of file

Ajax/common/Widget.php

Spacing +67 added lines, -67 removed lines

@@ -18,7 +18,7 @@ 
 use Ajax\semantic\html\collections\form\traits\FormTrait;
 
 abstract class Widget extends HtmlDoubleElement {
-	use FieldAsTrait,FormTrait;
+	use FieldAsTrait, FormTrait;
 
 	/**
 	 * @var string classname
@@ -51,12 +51,12 @@ 
 	protected $_generated;
 
 
-	public function __construct($identifier,$model,$modelInstance=NULL) {
+	public function __construct($identifier, $model, $modelInstance=NULL) {
 		parent::__construct($identifier);
 		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 		$this->setModel($model);
-		if(isset($modelInstance)){
-			if(\is_array($modelInstance)){
+		if (isset($modelInstance)) {
+			if (\is_array($modelInstance)) {
 				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 			}
 			$this->show($modelInstance);
@@ -64,28 +64,28 @@ 
 		$this->_generated=false;
 	}
 
-	protected function _init($instanceViewer,$contentKey,$content,$edition){
+	protected function _init($instanceViewer, $contentKey, $content, $edition) {
 		$this->_instanceViewer=$instanceViewer;
 		$this->content=[$contentKey=>$content];
 		$this->_toolbarPosition=PositionInTable::BEFORETABLE;
 		$this->_edition=$edition;
 	}
 
-	protected function _getFieldIdentifier($prefix,$name=""){
+	protected function _getFieldIdentifier($prefix, $name="") {
 		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
 	}
 
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		return $this->_instanceViewer->getFieldName($index);
 	}
 
-	protected function _getFieldCaption($index){
+	protected function _getFieldCaption($index) {
 		return $this->_instanceViewer->getCaption($index);
 	}
 
-	abstract protected  function _setToolbarPosition($table,$captions=NULL);
+	abstract protected  function _setToolbarPosition($table, $captions=NULL);
 
-	public function show($modelInstance){
+	public function show($modelInstance) {
 		$this->_modelInstance=$modelInstance;
 	}
 
@@ -109,56 +109,56 @@ 
 
 	abstract public function getHtmlComponent();
 
-	public function setAttached($value=true){
+	public function setAttached($value=true) {
 		return $this->getHtmlComponent()->setAttached($value);
 	}
 
-	public function setColor($color){
+	public function setColor($color) {
 		return $this->getHtmlComponent()->setColor($color);
 	}
 
 
-	public function setCaptions($captions){
+	public function setCaptions($captions) {
 		$this->_instanceViewer->setCaptions($captions);
 		return $this;
 	}
 
-	public function setFields($fields){
+	public function setFields($fields) {
 		$this->_instanceViewer->setVisibleProperties($fields);
 		return $this;
 	}
 
-	public function addField($field){
+	public function addField($field) {
 		$this->_instanceViewer->addField($field);
 		return $this;
 	}
 
-	public function addMessage($attributes=NULL,$fieldName="message"){
+	public function addMessage($attributes=NULL, $fieldName="message") {
 		$this->_instanceViewer->addField($fieldName);
 		$count=$this->_instanceViewer->visiblePropertiesCount();
-		return $this->fieldAsMessage($count-1,$attributes);
+		return $this->fieldAsMessage($count-1, $attributes);
 	}
 
-	public function addErrorMessage(){
-		return $this->addMessage(["error"=>true],"message");
+	public function addErrorMessage() {
+		return $this->addMessage(["error"=>true], "message");
 	}
 
-	public function insertField($index,$field){
+	public function insertField($index, $field) {
 		$this->_instanceViewer->insertField($index, $field);
 		return $this;
 	}
 
-	public function insertInField($index,$field){
+	public function insertInField($index, $field) {
 		$this->_instanceViewer->insertInField($index, $field);
 		return $this;
 	}
 
-	public function setValueFunction($index,$callback){
+	public function setValueFunction($index, $callback) {
 		$this->_instanceViewer->setValueFunction($index, $callback);
 		return $this;
 	}
 
-	public function setIdentifierFunction($callback){
+	public function setIdentifierFunction($callback) {
 		$this->_instanceViewer->setIdentifierFunction($callback);
 		return $this;
 	}
@@ -166,8 +166,8 @@ 
 	/**
 	 * @return \Ajax\semantic\html\collections\menus\HtmlMenu
 	 */
-	public function getToolbar(){
-		if(isset($this->_toolbar)===false){
+	public function getToolbar() {
+		if (isset($this->_toolbar)===false) {
 			$this->_toolbar=new HtmlMenu("toolbar-".$this->identifier);
 		}
 		return $this->_toolbar;
@@ -179,10 +179,10 @@ 
 	 * @param callable $callback function to call on $element
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addInToolbar($element,$callback=NULL){
+	public function addInToolbar($element, $callback=NULL) {
 		$tb=$this->getToolbar();
-		if(isset($callback)){
-			if(\is_callable($callback)){
+		if (isset($callback)) {
+			if (\is_callable($callback)) {
 				$callback($element);
 			}
 		}
@@ -195,9 +195,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){
-		$result=$this->addInToolbar($caption,$callback);
-		if(isset($icon))
+	public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) {
+		$result=$this->addInToolbar($caption, $callback);
+		if (isset($icon))
 			$result->addIcon($icon);
 		return $result;
 	}
@@ -207,14 +207,14 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\Widget
 	 */
-	public function addItemsInToolbar(array $items,$callback=NULL){
-		if(JArray::isAssociative($items)){
-			foreach ($items as $icon=>$item){
-				$this->addItemInToolbar($item,$icon,$callback);
+	public function addItemsInToolbar(array $items, $callback=NULL) {
+		if (JArray::isAssociative($items)) {
+			foreach ($items as $icon=>$item) {
+				$this->addItemInToolbar($item, $icon, $callback);
 			}
-		}else{
-			foreach ($items as $item){
-				$this->addItemInToolbar($item,null,$callback);
+		} else {
+			foreach ($items as $item) {
+				$this->addItemInToolbar($item, null, $callback);
 			}
 		}
 		return $this;
@@ -226,12 +226,12 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addDropdownInToolbar($value,$items,$callback=NULL){
+	public function addDropdownInToolbar($value, $items, $callback=NULL) {
 		$dd=$value;
 		if (\is_string($value)) {
-			$dd=new HtmlDropdown("dropdown-". $this->identifier."-".$value, $value, $items);
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$value, $value, $items);
 		}
-		return $this->addInToolbar($dd,$callback);
+		return $this->addInToolbar($dd, $callback);
 	}
 
 	/**
@@ -239,9 +239,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonInToolbar($caption,$callback=NULL){
-		$bt=new HtmlButton("bt-".$caption,$caption);
-		return $this->addInToolbar($bt,$callback);
+	public function addButtonInToolbar($caption, $callback=NULL) {
+		$bt=new HtmlButton("bt-".$caption, $caption);
+		return $this->addInToolbar($bt, $callback);
 	}
 
 	/**
@@ -250,9 +250,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonsInToolbar(array $captions,$asIcon=false,$callback=NULL){
-		$bts=new HtmlButtonGroups("",$captions,$asIcon);
-		return $this->addInToolbar($bts,$callback);
+	public function addButtonsInToolbar(array $captions, $asIcon=false, $callback=NULL) {
+		$bts=new HtmlButtonGroups("", $captions, $asIcon);
+		return $this->addInToolbar($bts, $callback);
 	}
 
 	/**
@@ -262,15 +262,15 @@ 
 	 * @param boolean $labeled
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addLabelledIconButtonInToolbar($caption,$icon,$before=true,$labeled=false){
-		$bt=new HtmlButton("",$caption);
-		$bt->addIcon($icon,$before,$labeled);
+	public function addLabelledIconButtonInToolbar($caption, $icon, $before=true, $labeled=false) {
+		$bt=new HtmlButton("", $caption);
+		$bt->addIcon($icon, $before, $labeled);
 		return $this->addInToolbar($bt);
 	}
 
-	public function addSubmitInToolbar($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){
-		$button=new HtmlButton($identifier,$value,$cssStyle);
-		$this->_buttonAsSubmit($button,"click",$url,$responseElement,$parameters);
+	public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) {
+		$button=new HtmlButton($identifier, $value, $cssStyle);
+		$this->_buttonAsSubmit($button, "click", $url, $responseElement, $parameters);
 		return $this->addInToolbar($button);
 	}
 
@@ -300,7 +300,7 @@ 
 	 * @param callable $defaultValueFunction function parameters are : $name : the field name, $value : the field value ,$index : the field index, $instance : the active instance of model
 	 * @return \Ajax\common\Widget
 	 */
-	public function setDefaultValueFunction($defaultValueFunction){
+	public function setDefaultValueFunction($defaultValueFunction) {
 		$this->_instanceViewer->setDefaultValueFunction($defaultValueFunction);
 		return $this;
 	}
@@ -309,7 +309,7 @@ 
 	 * @param string|boolean $disable
 	 * @return string
 	 */
-	public function jsDisabled($disable=true){
+	public function jsDisabled($disable=true) {
 		return "$('#".$this->identifier." .ui.input,#".$this->identifier." .ui.dropdown,#".$this->identifier." .ui.checkbox').toggleClass('disabled',".$disable.");";
 	}
 
@@ -318,12 +318,12 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addEditButtonInToolbar($caption,$callback=NULL){
-		$bt=new HtmlButton($this->identifier."-editBtn",$caption);
+	public function addEditButtonInToolbar($caption, $callback=NULL) {
+		$bt=new HtmlButton($this->identifier."-editBtn", $caption);
 		$bt->setToggle();
 		$bt->setActive($this->_edition);
 		$bt->onClick($this->jsDisabled(Javascript::prep_value("!$(event.target).hasClass('active')")));
-		return $this->addInToolbar($bt,$callback);
+		return $this->addInToolbar($bt, $callback);
 	}
 
 	public function setToolbar(HtmlMenu $_toolbar) {
@@ -337,35 +337,35 @@ 
 	}
 
 	public function getForm() {
-		if(!isset($this->_form)){
+		if (!isset($this->_form)) {
 			$this->_form=new HtmlForm("frm-".$this->identifier);
 			$this->setEdition(true);
 		}
 		return $this->_form;
 	}
 
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		$result=parent::run($js);
-		if(isset($this->_form)){
+		if (isset($this->_form)) {
 			$result=$this->runForm($js);
 		}
 		return $result;
 	}
 
-	protected function runForm(JsUtils $js){
+	protected function runForm(JsUtils $js) {
 		$fields=$this->getContentInstances(HtmlFormField::class);
-		foreach ($fields as $field){
+		foreach ($fields as $field) {
 			$this->_form->addField($field);
 		}
 		return $this->_form->run($js);
 	}
 
-	protected function _compileForm(){
-		if(isset($this->_form)){
+	protected function _compileForm() {
+		if (isset($this->_form)) {
 			$noValidate="";
-			if(\sizeof($this->_form->getValidationParams())>0)
+			if (\sizeof($this->_form->getValidationParams())>0)
 				$noValidate="novalidate";
-			$this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">","</form>");
+			$this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">", "</form>");
 		}
 	}
 

Ajax/semantic/html/base/traits/AttachedTrait.php

Spacing +1 added lines, -1 removed lines

@@ -16,6 +16,6 @@
 		if (isset($toElement)) {
 			$toElement->setAttached(true);
 		}
-		return $this->addToPropertyCtrl("class", $side . " attached", Side::getConstantValues("attached"));
+		return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached"));
 	}
 }
\ No newline at end of file