phpMv / phpMv-UI

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

Braces +24 added lines, -16 removed lines

@@ -47,8 +47,9 @@ 
 	 */
 	public function addHeader($title, $niveau=1, $dividing=true) {
 		$header=new HtmlHeader("", $niveau, $title);
-		if ($dividing)
-			$header->setDividing();
+		if ($dividing) {
+					$header->setDividing();
+		}
 		return $this->addItem($header);
 	}
 
@@ -69,14 +70,16 @@ 
 					if (\is_string($end)) {
 						$label=$end;
 						\array_pop($fields);
-					} else
-						$label=NULL;
+					} else {
+											$label=NULL;
+					}
 				}
 				$this->_fields=\array_merge($this->_fields, $fields);
 				$fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields);
 			}
-			if (isset($label))
-				$fields=new HtmlFormField("", $fields, $label);
+			if (isset($label)) {
+							$fields=new HtmlFormField("", $fields, $label);
+			}
 		} else {
 			$fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count());
 		}
@@ -145,12 +148,15 @@ 
 	 */
 	public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) {
 		$message=new HtmlMessage($identifier, $content);
-		if (isset($header))
-			$message->addHeader($header);
-		if (isset($icon))
-			$message->setIcon($icon);
-		if (isset($type))
-			$message->setStyle($type);
+		if (isset($header)) {
+					$message->addHeader($header);
+		}
+		if (isset($icon)) {
+					$message->setIcon($icon);
+		}
+		if (isset($type)) {
+					$message->setStyle($type);
+		}
 		return $this->addItem($message);
 	}
 
@@ -169,15 +175,17 @@ 
 	public function run(JsUtils $js) {
 		$compo=NULL;
 		foreach ($this->_fields as $field){
-			if($field instanceof HtmlFormField)
-				$compo=$this->addCompoValidation($js, $compo, $field);
+			if($field instanceof HtmlFormField) {
+							$compo=$this->addCompoValidation($js, $compo, $field);
+			}
 		}
 		foreach ($this->content as $field){
 			if($field instanceof HtmlFormFields){
 				$items=$field->getItems();
 				foreach ($items as $_field){
-					if($_field instanceof HtmlFormField)
-						$compo=$this->addCompoValidation($js, $compo, $_field);
+					if($_field instanceof HtmlFormField) {
+											$compo=$this->addCompoValidation($js, $compo, $_field);
+					}
 				}
 			}
 		}

Spacing +24 added lines, -24 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->_validationParams=[];
 		$this->addItems($elements);
 	}
 
-	protected function getForm(){
+	protected function getForm() {
 		return $this;
 	}
 
@@ -61,14 +61,14 @@ 
 	 * @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) {
 		if (isset($fields)) {
 			if (!$fields instanceof HtmlFormFields) {
-				if (\is_array($fields) === false) {
+				if (\is_array($fields)===false) {
 					$fields=\func_get_args();
 					$end=\end($fields);
 					if (\is_string($end)) {
@@ -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;
@@ -143,10 +143,10 @@ 
 		return $this->addItem($message);
 	}
 
-	private function addCompoValidation($js,$compo,$field){
+	private function addCompoValidation($js, $compo, $field) {
 		$validation=$field->getValidation();
-		if(isset($validation)){
-			if(isset($compo)===false){
+		if (isset($validation)) {
+			if (isset($compo)===false) {
 				$compo=$js->semantic()->form("#".$this->identifier);
 			}
 			$validation->setIdentifier($field->getDataField()->getIdentifier());
@@ -157,26 +157,26 @@ 
 
 	public function run(JsUtils $js) {
 		$compo=NULL;
-		foreach ($this->_fields as $field){
-			if($field instanceof HtmlFormField)
+		foreach ($this->_fields as $field) {
+			if ($field instanceof HtmlFormField)
 				$compo=$this->addCompoValidation($js, $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($js, $compo, $_field);
 				}
 			}
 		}
-		if(isset($compo)===false){
+		if (isset($compo)===false) {
 			return parent::run($js);
 		}
-		if(isset($this->_validationParams["_ajaxSubmit"])){
-			if($this->_validationParams["_ajaxSubmit"] instanceof AjaxCall){
+		if (isset($this->_validationParams["_ajaxSubmit"])) {
+			if ($this->_validationParams["_ajaxSubmit"] instanceof AjaxCall) {
 				$compilation=$this->_validationParams["_ajaxSubmit"]->compile($js);
-				$compilation=str_ireplace("\"","%quote%", $compilation);
+				$compilation=str_ireplace("\"", "%quote%", $compilation);
 				$this->onSuccess($compilation);
 				unset($this->_validationParams["_ajaxSubmit"]);
 			}
@@ -187,7 +187,7 @@ 
 		return $this->_bsComponent;
 	}
 
-	public function addValidationParam($paramName,$paramValue){
+	public function addValidationParam($paramName, $paramValue) {
 		$this->_validationParams[$paramName]=$paramValue;
 		return $this;
 	}

Ajax/semantic/html/collections/form/traits/FormTrait.php

Doc Comments +3 added lines

@@ -48,6 +48,9 @@
 		return $this->_buttonAsSubmit($bt, "click",$url,$responseElement);
 	}
 
+	/**
+	 * @param string $event
+	 */
 	protected function _buttonAsSubmit($button,$event,$url,$responseElement=NULL){
 		$form=$this->getForm();
 		if(isset($url) && isset($responseElement)){

Spacing +16 added lines, -16 removed lines

@@ -5,7 +5,7 @@ 
 use Ajax\semantic\html\collections\HtmlMessage;
 use Ajax\service\AjaxCall;
 
-trait FormTrait{
+trait FormTrait {
 	/**
 	 * @return HtmlForm
 	 */
@@ -15,7 +15,7 @@ 
 		return $this->getForm()->addToProperty("class", "loading");
 	}
 
-	public function addErrorMessage(){
+	public function addErrorMessage() {
 		return $this->getForm()->addContent((new HtmlMessage(""))->setError());
 	}
 
@@ -30,35 +30,35 @@ 
 	 * @param string $responseElement
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function submitOn($event,$identifier,$url,$responseElement){
+	public function submitOn($event, $identifier, $url, $responseElement) {
 		$form=$this->getForm();
 		$elem=$form->getElementById($identifier, $form->getContent());
-		if(isset($elem)){
-			$this->_buttonAsSubmit($elem, $event,$url,$responseElement);
+		if (isset($elem)) {
+			$this->_buttonAsSubmit($elem, $event, $url, $responseElement);
 		}
 		return $form;
 	}
 
-	public function submitOnClick($identifier,$url,$responseElement){
+	public function submitOnClick($identifier, $url, $responseElement) {
 		return $this->submitOn("click", $identifier, $url, $responseElement);
 	}
 
-	public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL){
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
-		return $this->_buttonAsSubmit($bt, "click",$url,$responseElement);
+	public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL) {
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
+		return $this->_buttonAsSubmit($bt, "click", $url, $responseElement);
 	}
 
-	protected function _buttonAsSubmit($button,$event,$url,$responseElement=NULL){
+	protected function _buttonAsSubmit($button, $event, $url, $responseElement=NULL) {
 		$form=$this->getForm();
-		if(isset($url) && isset($responseElement)){
+		if (isset($url) && isset($responseElement)) {
 			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');");
-			$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", ["form"=>$this->identifier,"responseElement"=>$responseElement,"url"=>$url]));
+			$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", ["form"=>$this->identifier, "responseElement"=>$responseElement, "url"=>$url]));
 		}
 		return $button;
 	}
 
-	public function addReset($identifier,$value,$cssStyle=NULL){
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
+	public function addReset($identifier, $value, $cssStyle=NULL) {
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
 		$bt->setProperty("type", "reset");
 		return $bt;
 	}
@@ -68,7 +68,7 @@ 
 	 * @param string $jsCode
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function onValid($jsCode){
+	public function onValid($jsCode) {
 		$form=$this->getForm();
 		$form->addValidationParam("onValid", "%function(){".$jsCode."}%");
 		return $form;
@@ -79,7 +79,7 @@ 
 	 * @param string $jsCode can use event and fields parameters
 	 * @return HtmlForm
 	 */
-	public function onSuccess($jsCode){
+	public function onSuccess($jsCode) {
 		$form=$this->getForm();
 		$form->addValidationParam("onSuccess", "%function(evt,fields){".$jsCode."}%");
 		return $form;

Ajax/semantic/widgets/dataform/DataForm.php

Spacing +22 added lines, -22 removed lines

@@ -17,41 +17,41 @@ 
  * @since 2.2
  */
 class DataForm extends Widget {
-	use FormFieldAsTrait,FormTrait;
+	use FormFieldAsTrait, FormTrait;
 
 	public function __construct($identifier, $modelInstance=NULL) {
-		parent::__construct($identifier, null,$modelInstance);
+		parent::__construct($identifier, null, $modelInstance);
 		$this->_instanceViewer=new FormInstanceViewer();
 		$this->content=["form"=>new HtmlForm($identifier)];
 		$this->_toolbarPosition=PositionInTable::BEFORETABLE;
 	}
 
-	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();
 		$separators[]=$count;
-		for($i=0;$i<\sizeof($separators)-1;$i++){
-			$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
-			if(\sizeof($fields)===1){
+		for ($i=0; $i<\sizeof($separators)-1; $i++) {
+			$fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]);
+			if (\sizeof($fields)===1) {
 				$form->addField($fields[0]);
-			}else
+			} else
 				$form->addFields($fields);
 		}
 	}
@@ -59,11 +59,11 @@ 
 	/**
 	 * @return HtmlForm
 	 */
-	protected function getForm(){
+	protected function getForm() {
 		return $this->content["form"];
 	}
 
-	public function addSeparatorAfter($fieldNum){
+	public function addSeparatorAfter($fieldNum) {
 		$this->_instanceViewer->addSeparatorAfter($fieldNum);
 		return $this;
 	}
@@ -77,18 +77,18 @@ 
 		return $this;
 	}
 
-	public function addSubmitInToolbar($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL){
-		$button=new HtmlButton($identifier,$value,$cssStyle);
-		$this->_buttonAsSubmit($button,"click",$url,$responseElement);
+	public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL) {
+		$button=new HtmlButton($identifier, $value, $cssStyle);
+		$this->_buttonAsSubmit($button, "click", $url, $responseElement);
 		return $this->addInToolbar($button);
 	}
 
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle){
-			$button=new HtmlButton($id,$value,$cssStyle);
-			$this->_buttonAsSubmit($button,"click",$url,$responseElement);
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle){
+			$button=new HtmlButton($id, $value, $cssStyle);
+			$this->_buttonAsSubmit($button, "click", $url, $responseElement);
 			return $button;
-		}, $index,$attributes);
+		}, $index, $attributes);
 	}
 
 	/**

Ajax/semantic/widgets/dataform/FormFieldAsTrait.php

Spacing +36 added lines, -36 removed lines

@@ -14,13 +14,13 @@ 
  * @property object $_modelInstance;
  */
 
-trait FormFieldAsTrait{
+trait FormFieldAsTrait {
 
 	abstract protected function _getFieldIdentifier($prefix);
-	abstract public function setValueFunction($index,$callback);
+	abstract public function setValueFunction($index, $callback);
 
-	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;
 	}
 
@@ -28,22 +28,22 @@ 
 	 * @param HtmlFormField $element
 	 * @param array $attributes
 	 */
-	protected function _applyAttributes($element,&$attributes,$index){
+	protected function _applyAttributes($element, &$attributes, $index) {
 		$this->_addRules($element, $attributes);
-		if(isset($attributes["callback"])){
+		if (isset($attributes["callback"])) {
 			$callback=$attributes["callback"];
-			if(\is_callable($callback)){
-				$callback($element,$this->_modelInstance,$index);
+			if (\is_callable($callback)) {
+				$callback($element, $this->_modelInstance, $index);
 				unset($attributes["callback"]);
 			}
 		}
 		$element->fromArray($attributes);
 	}
 
-	protected function _addRules($element,$attributes){
-		if(isset($attributes["rules"])){
+	protected function _addRules($element, $attributes) {
+		if (isset($attributes["rules"])) {
 			$rules=$attributes["rules"];
-			if(\is_array($rules))
+			if (\is_array($rules))
 				$element->addRules($rules);
 				else
 					$element->addRule($rules);
@@ -51,46 +51,46 @@ 
 		}
 	}
 
-	protected function _fieldAs($elementCallback,$index,$attributes=NULL,$identifier=null){
-		$this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback){
+	protected function _fieldAs($elementCallback, $index, $attributes=NULL, $identifier=null) {
+		$this->setValueFunction($index, function($value) use ($index, &$attributes, $elementCallback){
 			$caption=$this->_instanceViewer->getCaption($index);
 			$name=$this->_instanceViewer->getFieldName($index);
-			$element=$elementCallback($name,$name,$value,$caption);
-			if(\is_array($attributes))
-				$this->_applyAttributes($element, $attributes,$index);
+			$element=$elementCallback($name, $name, $value, $caption);
+			if (\is_array($attributes))
+				$this->_applyAttributes($element, $attributes, $index);
 			return $element;
 		});
 			return $this;
 	}
 
 
-	public function fieldAsRadio($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			return new HtmlFormRadio($id,$name,$caption,$value);
-		}, $index,$attributes);
+	public function fieldAsRadio($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			return new HtmlFormRadio($id, $name, $caption, $value);
+		}, $index, $attributes);
 	}
 
-	public function fieldAsTextarea($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			return new HtmlFormTextarea($id,$caption,$value);
-		}, $index,$attributes);
+	public function fieldAsTextarea($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			return new HtmlFormTextarea($id, $caption, $value);
+		}, $index, $attributes);
 	}
 
-	public function fieldAsInput($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			return new HtmlFormInput($id,$caption,"text",$value);
-		}, $index,$attributes);
+	public function fieldAsInput($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			return new HtmlFormInput($id, $caption, "text", $value);
+		}, $index, $attributes);
 	}
 
-	public function fieldAsCheckbox($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			return new HtmlFormCheckbox($id,$caption,$value);
-		}, $index,$attributes);
+	public function fieldAsCheckbox($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			return new HtmlFormCheckbox($id, $caption, $value);
+		}, $index, $attributes);
 	}
 
-	public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($elements,$multiple){
-			return new HtmlFormDropdown($id,$elements,$caption,$value,$multiple);
-		}, $index,$attributes);
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements, $multiple){
+			return new HtmlFormDropdown($id, $elements, $caption, $value, $multiple);
+		}, $index, $attributes);
 	}
 }
\ No newline at end of file

Ajax/semantic/widgets/base/InstanceViewer.php

Spacing +66 added lines, -66 removed lines

@@ -14,144 +14,144 @@ 
 
 	public static $index=0;
 
-	public function __construct($instance=NULL,$captions=NULL){
+	public function __construct($instance=NULL, $captions=NULL) {
 		$this->values=[];
 		$this->afterCompile=[];
-		if(isset($instance))
+		if (isset($instance))
 			$this->setInstance($instance);
 		$this->setCaptions($captions);
 	}
 
-	public function getValues(){
+	public function getValues() {
 		$values=[];
 		$index=0;
 		$count=$this->count();
-		while($index<$count){
+		while ($index<$count) {
 			$values[]=$this->getValue($index++);
 		}
 		return $values;
 	}
 
-	public function getIdentifier(){
+	public function getIdentifier() {
 		$value=self::$index;
-		if(isset($this->values["identifier"]))
-			$value=$this->values["identifier"](self::$index,$this->instance);
+		if (isset($this->values["identifier"]))
+			$value=$this->values["identifier"](self::$index, $this->instance);
 		return $value;
 	}
 
-	public function getValue($index){
+	public function getValue($index) {
 		$property=$this->properties[$index];
 		return $this->_getValue($property, $index);
 	}
 
-	protected function _beforeAddProperty($index,&$field){
+	protected function _beforeAddProperty($index, &$field) {
 
 	}
 
-	protected function _getDefaultValue($name,$value,$index){
+	protected function _getDefaultValue($name, $value, $index) {
 		return $value;
 	}
 
-	protected function _getValue($property,$index){
-		if($property instanceof \ReflectionProperty){
+	protected function _getValue($property, $index) {
+		if ($property instanceof \ReflectionProperty) {
 			$property->setAccessible(true);
 			$value=$property->getValue($this->instance);
-			if(isset($this->values[$index])){
-				$value= $this->values[$index]($value,$this->instance,$index);
-			}else{
-				$value=$this->_getDefaultValue($property->getName(),$value, $index);
+			if (isset($this->values[$index])) {
+				$value=$this->values[$index]($value, $this->instance, $index);
+			} else {
+				$value=$this->_getDefaultValue($property->getName(), $value, $index);
 			}
-		}else{
-			if(\is_callable($property))
+		} else {
+			if (\is_callable($property))
 				$value=$property($this->instance);
-			elseif(\is_array($property)){
-				$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
+			elseif (\is_array($property)) {
+				$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property);
 				$value=\implode("", $values);
-			}else{
-				if(isset($this->values[$index])){
-					$value= $this->values[$index]($property,$this->instance,$index);
-				}else{
+			} else {
+				if (isset($this->values[$index])) {
+					$value=$this->values[$index]($property, $this->instance, $index);
+				} else {
 					$value=$property;
 				}
 			}
 		}
-		if(isset($this->afterCompile[$index])){
-			if(\is_callable($this->afterCompile[$index])){
-				$this->afterCompile[$index]($value,$this->instance,$index);
+		if (isset($this->afterCompile[$index])) {
+			if (\is_callable($this->afterCompile[$index])) {
+				$this->afterCompile[$index]($value, $this->instance, $index);
 			}
 		}
 		return $value;
 	}
 
-	public function insertField($index,$field){
-		array_splice( $this->visibleProperties, $index, 0, $field );
+	public function insertField($index, $field) {
+		array_splice($this->visibleProperties, $index, 0, $field);
 		return $this;
 	}
 
-	public function insertInField($index,$field){
+	public function insertInField($index, $field) {
 		$vb=$this->visibleProperties;
-		if(isset($vb[$index])){
-			if(\is_array($vb[$index])){
+		if (isset($vb[$index])) {
+			if (\is_array($vb[$index])) {
 				$this->visibleProperties[$index][]=$field;
-			}else{
-				$this->visibleProperties[$index]=[$vb[$index],$field];
+			} else {
+				$this->visibleProperties[$index]=[$vb[$index], $field];
 			}
-		}else{
+		} else {
 			return $this->insertField($index, $field);
 		}
 		return $this;
 	}
 
-	public function addField($field){
+	public function addField($field) {
 		$this->visibleProperties[]=$field;
 		return $this;
 	}
 
-	public function count(){
+	public function count() {
 		return \sizeof($this->properties);
 	}
 
-	public function visiblePropertiesCount(){
+	public function visiblePropertiesCount() {
 		return \sizeof($this->visibleProperties);
 	}
 
-	public function getProperty($index){
+	public function getProperty($index) {
 		return $this->properties[$index];
 	}
 
-	protected function showableProperty(\ReflectionProperty $rProperty){
-		return JString::startswith($rProperty->getName(),"_")===false;
+	protected function showableProperty(\ReflectionProperty $rProperty) {
+		return JString::startswith($rProperty->getName(), "_")===false;
 	}
 
 	public function setInstance($instance) {
-		if(\is_string($instance)){
+		if (\is_string($instance)) {
 			$instance=new $instance();
 		}
 		$this->instance=$instance;
 		$this->properties=[];
 		$this->reflect=new \ReflectionClass($instance);
-		if(\sizeof($this->visibleProperties)===0){
+		if (\sizeof($this->visibleProperties)===0) {
 			$this->properties=$this->getDefaultProperties();
-		}else{
-			foreach ($this->visibleProperties as $property){
-				if(\is_callable($property)){
+		} else {
+			foreach ($this->visibleProperties as $property) {
+				if (\is_callable($property)) {
 					$this->properties[]=$property;
-				}elseif(\is_string($property)){
-					try{
+				}elseif (\is_string($property)) {
+					try {
 						$this->_beforeAddProperty(\sizeof($this->properties), $property);
 						$rProperty=$this->reflect->getProperty($property);
 						$this->properties[]=$rProperty;
-					}catch(\Exception $e){
+					}catch (\Exception $e) {
 						$this->_beforeAddProperty(\sizeof($this->properties), $property);
 						$this->properties[]=$property;
 					}
-				}elseif(\is_int($property)){
+				}elseif (\is_int($property)) {
 					$props=$this->getDefaultProperties();
-					if(isset($props[$property]))
+					if (isset($props[$property]))
 						$this->properties[]=$props[$property];
 					else
 						$this->properties[]=$property;
-				}else{
+				} else {
 					$this->properties[]=$property;
 				}
 			}
@@ -159,12 +159,12 @@ 
 		return $this;
 	}
 
-	protected function getDefaultProperties(){
+	protected function getDefaultProperties() {
 		$result=[];
 		$properties=$this->reflect->getProperties();
-		foreach ($properties as $property){
+		foreach ($properties as $property) {
 			$showable=$this->showableProperty($property);
-			if($showable!==false){
+			if ($showable!==false) {
 				$result[]=$property;
 			}
 		}
@@ -176,12 +176,12 @@ 
 		return $this;
 	}
 
-	public function setValueFunction($index,$callback){
+	public function setValueFunction($index, $callback) {
 		$this->values[$index]=$callback;
 		return $this;
 	}
 
-	public function setIdentifierFunction($callback){
+	public function setIdentifierFunction($callback) {
 		$this->values["identifier"]=$callback;
 		return $this;
 	}
@@ -194,19 +194,19 @@ 
 		return $this->properties;
 	}
 
-	public function getCaption($index){
-		if($this->properties[$index] instanceof \ReflectionProperty)
+	public function getCaption($index) {
+		if ($this->properties[$index] instanceof \ReflectionProperty)
 			return $this->properties[$index]->getName();
-			elseif(\is_callable($this->properties[$index]))
+			elseif (\is_callable($this->properties[$index]))
 			return "";
 			else
 				return $this->properties[$index];
 	}
 
-	public function getCaptions(){
-		if(isset($this->captions)){
-			$result= $this->captions;
-			for($i=\sizeof($result);$i<$this->count();$i++){
+	public function getCaptions() {
+		if (isset($this->captions)) {
+			$result=$this->captions;
+			for ($i=\sizeof($result); $i<$this->count(); $i++) {
 				$result[]="";
 			}
 			return $result;
@@ -214,7 +214,7 @@ 
 		$captions=[];
 		$index=0;
 		$count=$this->count();
-		while($index<$count){
+		while ($index<$count) {
 			$captions[]=$this->getCaption($index++);
 		}
 		return $captions;
@@ -232,7 +232,7 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return \Ajax\semantic\widgets\datatable\InstanceViewer
 	 */
-	public function afterCompile($index,$callback){
+	public function afterCompile($index, $callback) {
 		$this->afterCompile[$index]=$callback;
 		return $this;
 	}

Braces +32 added lines, -28 removed lines

@@ -17,8 +17,9 @@ 
 	public function __construct($instance=NULL,$captions=NULL){
 		$this->values=[];
 		$this->afterCompile=[];
-		if(isset($instance))
-			$this->setInstance($instance);
+		if(isset($instance)) {
+					$this->setInstance($instance);
+		}
 		$this->setCaptions($captions);
 	}
 
@@ -34,8 +35,9 @@ 
 
 	public function getIdentifier(){
 		$value=self::$index;
-		if(isset($this->values["identifier"]))
-			$value=$this->values["identifier"](self::$index,$this->instance);
+		if(isset($this->values["identifier"])) {
+					$value=$this->values["identifier"](self::$index,$this->instance);
+		}
 		return $value;
 	}
 
@@ -58,19 +60,19 @@ 
 			$value=$property->getValue($this->instance);
 			if(isset($this->values[$index])){
 				$value= $this->values[$index]($value,$this->instance,$index);
-			}else{
+			} else{
 				$value=$this->_getDefaultValue($property->getName(),$value, $index);
 			}
-		}else{
-			if(\is_callable($property))
-				$value=$property($this->instance);
-			elseif(\is_array($property)){
+		} else{
+			if(\is_callable($property)) {
+							$value=$property($this->instance);
+			} elseif(\is_array($property)){
 				$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
 				$value=\implode("", $values);
-			}else{
+			} else{
 				if(isset($this->values[$index])){
 					$value= $this->values[$index]($property,$this->instance,$index);
-				}else{
+				} else{
 					$value=$property;
 				}
 			}
@@ -93,10 +95,10 @@ 
 		if(isset($vb[$index])){
 			if(\is_array($vb[$index])){
 				$this->visibleProperties[$index][]=$field;
-			}else{
+			} else{
 				$this->visibleProperties[$index]=[$vb[$index],$field];
 			}
-		}else{
+		} else{
 			return $this->insertField($index, $field);
 		}
 		return $this;
@@ -132,26 +134,27 @@ 
 		$this->reflect=new \ReflectionClass($instance);
 		if(\sizeof($this->visibleProperties)===0){
 			$this->properties=$this->getDefaultProperties();
-		}else{
+		} else{
 			foreach ($this->visibleProperties as $property){
 				if(\is_callable($property)){
 					$this->properties[]=$property;
-				}elseif(\is_string($property)){
+				} elseif(\is_string($property)){
 					try{
 						$this->_beforeAddProperty(\sizeof($this->properties), $property);
 						$rProperty=$this->reflect->getProperty($property);
 						$this->properties[]=$rProperty;
-					}catch(\Exception $e){
+					} catch(\Exception $e){
 						$this->_beforeAddProperty(\sizeof($this->properties), $property);
 						$this->properties[]=$property;
 					}
-				}elseif(\is_int($property)){
+				} elseif(\is_int($property)){
 					$props=$this->getDefaultProperties();
-					if(isset($props[$property]))
-						$this->properties[]=$props[$property];
-					else
-						$this->properties[]=$property;
-				}else{
+					if(isset($props[$property])) {
+											$this->properties[]=$props[$property];
+					} else {
+											$this->properties[]=$property;
+					}
+				} else{
 					$this->properties[]=$property;
 				}
 			}
@@ -195,12 +198,13 @@ 
 	}
 
 	public function getCaption($index){
-		if($this->properties[$index] instanceof \ReflectionProperty)
-			return $this->properties[$index]->getName();
-			elseif(\is_callable($this->properties[$index]))
-			return "";
-			else
-				return $this->properties[$index];
+		if($this->properties[$index] instanceof \ReflectionProperty) {
+					return $this->properties[$index]->getName();
+		} elseif(\is_callable($this->properties[$index])) {
+						return "";
+			} else {
+							return $this->properties[$index];
+			}
 	}
 
 	public function getCaptions(){

Ajax/semantic/widgets/base/FieldAsTrait.php

Spacing +44 added lines, -44 removed lines

@@ -15,103 +15,103 @@
  * @property InstanceViewer $_instanceViewer
  */
 
-trait FieldAsTrait{
+trait FieldAsTrait {
 
 	abstract protected function _getFieldIdentifier($prefix);
-	abstract public function setValueFunction($index,$callback);
+	abstract public function setValueFunction($index, $callback);
 
-	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($element,$attributes){}
+	protected function _addRules($element, $attributes) {}
 
-	protected function _fieldAs($elementCallback,$index,$attributes=NULL,$prefix=null){
-		$this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback,$prefix){
+	protected function _fieldAs($elementCallback, $index, $attributes=NULL, $prefix=null) {
+		$this->setValueFunction($index, function($value) use ($index, &$attributes, $elementCallback, $prefix){
 			$name=$this->_instanceViewer->getCaption($index)."[]";
-			if(isset($attributes["name"])===true){
+			if (isset($attributes["name"])===true) {
 				$name=$attributes["name"];
 			}
-			$element=$elementCallback($this->_getFieldIdentifier($prefix),$name,$value,"");
-			if(\is_array($attributes))
-				$this->_applyAttributes($element, $attributes,$index);
+			$element=$elementCallback($this->_getFieldIdentifier($prefix), $name, $value, "");
+			if (\is_array($attributes))
+				$this->_applyAttributes($element, $attributes, $index);
 			return $element;
 		});
 			return $this;
 	}
 
 
-	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){
-		$this->setValueFunction($index,function($caption) use($icon){
-			$lbl=$this->_getLabelField($caption,$icon);
+	public function fieldAsLabel($index, $icon=NULL) {
+		$this->setValueFunction($index, function($caption) use($icon){
+			$lbl=$this->_getLabelField($caption, $icon);
 			return $lbl;
 		});
 			return $this;
 	}
 
-	public function fieldAsImage($index,$size=Size::SMALL,$circular=false){
-		$this->setValueFunction($index,function($img) use($size,$circular){
-			$image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular();
+	public function fieldAsImage($index, $size=Size::SMALL, $circular=false) {
+		$this->setValueFunction($index, function($img) use($size, $circular){
+			$image=new HtmlImage($this->_getFieldIdentifier("image"), $img); $image->setSize($size); if ($circular)$image->setCircular();
 			return $image;
 		});
 			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");
+		}, $index, $attributes, "avatar");
 	}
 
 
-	public function fieldAsRadio($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value){
-			$input= new HtmlRadio($id,$name,$value,$value);
+	public function fieldAsRadio($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$input=new HtmlRadio($id, $name, $value, $value);
 			return $input;
-		}, $index,$attributes,"radio");
+		}, $index, $attributes, "radio");
 	}
 
-	public function fieldAsInput($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value){
-			$input= new HtmlInput($id,"text",$value);
+	public function fieldAsInput($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$input=new HtmlInput($id, "text", $value);
 			$input->getField()->setProperty("name", $name);
 			return $input;
-		}, $index,$attributes,"input");
+		}, $index, $attributes, "input");
 	}
 
-	public function fieldAsCheckbox($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value){
-			$input=new HtmlCheckbox($id,"",$this->_instanceViewer->getIdentifier());
+	public function fieldAsCheckbox($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$input=new HtmlCheckbox($id, "", $this->_instanceViewer->getIdentifier());
 			$input->setChecked(JString::isBooleanTrue($value));
 			$input->getField()->setProperty("name", $name);
 			return $input;
-		}, $index,$attributes,"ck");
+		}, $index, $attributes, "ck");
 	}
 
-	public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value) use($elements,$multiple){
-			$dd=new HtmlDropdown($id,$value,$elements);
-			$dd->asSelect($name,$multiple);
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use($elements, $multiple){
+			$dd=new HtmlDropdown($id, $value, $elements);
+			$dd->asSelect($name, $multiple);
 			return $dd;
-		}, $index,$attributes,"dd");
+		}, $index, $attributes, "dd");
 	}
 }
\ No newline at end of file