phpMv / phpMv-UI

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

Spacing +6 added lines, -6 removed lines

@@ -8,16 +8,16 @@
 class HtmlFormInput extends HtmlFormField {
 	use TextFieldsTrait;
 
-	public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) {
-		if(!isset($placeholder) && $type==="text")
+	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);
+		parent::__construct("field-".$identifier, new HtmlInput($identifier, $type, $value, $placeholder), $label);
 	}
 
-	public function getDataField(){
-		$field= $this->getField();
+	public function getDataField() {
+		$field=$this->getField();
 		//TODO check getField
-		if($field instanceof HtmlInput)
+		if ($field instanceof HtmlInput)
 			$field=$field->getDataField();
 		return $field;
 	}

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

Spacing +6 added lines, -6 removed lines

@@ -9,17 +9,17 @@ 
 class HtmlFormTextarea extends HtmlFormField {
 	use TextFieldsTrait;
 
-	public function __construct($identifier, $label=NULL,$value=NULL,$placeholder=NULL,$rows=NULL) {
-		if(!isset($placeholder))
+	public function __construct($identifier, $label=NULL, $value=NULL, $placeholder=NULL, $rows=NULL) {
+		if (!isset($placeholder))
 			$placeholder=$label;
-		parent::__construct("field-".$identifier, new HtmlTextarea($identifier,$value,$placeholder,$rows), $label);
+		parent::__construct("field-".$identifier, new HtmlTextarea($identifier, $value, $placeholder, $rows), $label);
 	}
 
 	/**
 	 * Defines the textarea row count
 	 * @param int $count
 	 */
-	public function setRows($count){
+	public function setRows($count) {
 		$this->getField()->setRows($count);
 	}
 
@@ -27,7 +27,7 @@ 
 		return $this->content["field"];
 	}
 
-	public function setName($name){
-		$this->getDataField()->setProperty("name",$name);
+	public function setName($name) {
+		$this->getDataField()->setProperty("name", $name);
 	}
 }
\ No newline at end of file

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

Spacing +5 added lines, -5 removed lines

@@ -6,19 +6,19 @@
 
 	abstract public function getDataField();
 	abstract public function addToProperty($name, $value, $separator=" ");
-	public function setPlaceholder($value){
+	public function setPlaceholder($value) {
 		$this->getDataField()->setPlaceholder($value);
 		return $this;
 	}
 
-	public function setValue($value){
+	public function setValue($value) {
 		$this->getDataField()->setValue($value);
 		return $this;
 	}
 
-	public function setInputType($type){
-		if($type==="hidden")
-			$this->addToProperty("style","display:none;");
+	public function setInputType($type) {
+		if ($type==="hidden")
+			$this->addToProperty("style", "display:none;");
 		$this->getDataField()->setInputType($type);
 		return $this;
 	}

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

Spacing +16 added lines, -16 removed lines

@@ -11,14 +11,14 @@ 
 
 	abstract public function addToProperty($name, $value, $separator=" ");
 	abstract public function addLabel($caption, $style="label-default", $leftSeparator=" ");
-	abstract public function addContent($content,$before=false);
+	abstract public function addContent($content, $before=false);
 	abstract public function getField();
 	public function setFocus() {
 		$this->getField()->addToProperty("class", State::FOCUS);
 	}
 
 	public function addLoading() {
-		if ($this->_hasIcon === false) {
+		if ($this->_hasIcon===false) {
 			throw new \Exception("Input must have an icon for showing a loader, use addIcon before");
 		}
 		return $this->addToProperty("class", State::LOADING);
@@ -26,44 +26,44 @@ 
 
 	public function labeled($label, $direction=Direction::LEFT, $icon=NULL) {
 		$field=$this->getField();
-		$labelO=$field->addLabel($label,$direction===Direction::LEFT,$icon);
-		$field->addToProperty("class", $direction . " labeled");
+		$labelO=$field->addLabel($label, $direction===Direction::LEFT, $icon);
+		$field->addToProperty("class", $direction." labeled");
 		return $labelO;
 	}
 
 	public function labeledToCorner($icon, $direction=Direction::LEFT) {
-		return $this->labeled("", $direction . " corner", $icon)->toCorner($direction);
+		return $this->labeled("", $direction." corner", $icon)->toCorner($direction);
 	}
 
 	public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) {
 		$field=$this->getField();
 		$actionO=$action;
-		if (\is_object($action) === false) {
-			$actionO=new HtmlButton("action-" . $this->identifier, $action);
+		if (\is_object($action)===false) {
+			$actionO=new HtmlButton("action-".$this->identifier, $action);
 			if (isset($icon))
 				$actionO->addIcon($icon, true, $labeled);
 		}
-		$field->addToProperty("class", $direction . " action");
-		$field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false);
+		$field->addToProperty("class", $direction." action");
+		$field->addContent($actionO, \strstr($direction, Direction::LEFT)!==false);
 		return $actionO;
 	}
 
-	public function addDropdown($label="", $items=array(),$direction=Direction::RIGHT){
-		$labelO=new HtmlDropdown("dd-".$this->identifier,$label,$items);
-		$labelO->asSelect("select-".$this->identifier,false,true);
-		return $this->labeled($labelO,$direction);
+	public function addDropdown($label="", $items=array(), $direction=Direction::RIGHT) {
+		$labelO=new HtmlDropdown("dd-".$this->identifier, $label, $items);
+		$labelO->asSelect("select-".$this->identifier, false, true);
+		return $this->labeled($labelO, $direction);
 	}
 
 	public function setTransparent() {
 		return $this->getField()->addToProperty("class", "transparent");
 	}
 
-	public function setReadonly(){
+	public function setReadonly() {
 		$this->getDataField()->setProperty("readonly", "");
 	}
 
-	public function setName($name){
-		$this->getDataField()->setProperty("name",$name);
+	public function setName($name) {
+		$this->getDataField()->setProperty("name", $name);
 	}
 
 }
\ No newline at end of file

Ajax/semantic/html/collections/HtmlMessage.php

Spacing +23 added lines, -23 removed lines

@@ -31,38 +31,38 @@ 
 	 * @param string|HtmlSemDoubleElement $header
 	 * @return \Ajax\semantic\html\collections\HtmlMessage
 	 */
-	public function addHeader($header){
+	public function addHeader($header) {
 		$headerO=$header;
-		if(\is_string($header)){
-			$headerO=new HtmlSemDoubleElement("header-".$this->identifier,"div");
+		if (\is_string($header)) {
+			$headerO=new HtmlSemDoubleElement("header-".$this->identifier, "div");
 			$headerO->setClass("header");
 			$headerO->setContent($header);
 		}
-		return $this->addContent($headerO,true);
+		return $this->addContent($headerO, true);
 	}
 
-	public function addList($elements,$ordered=false){
-		$list=new HtmlList("list-".$this->identifier,$elements);
+	public function addList($elements, $ordered=false) {
+		$list=new HtmlList("list-".$this->identifier, $elements);
 		$list->setOrdered($ordered);
 		$list->setClass("ui list");
 		$this->addContent($list);
 	}
 
-	public function setIcon($icon){
+	public function setIcon($icon) {
 		$this->addToProperty("class", "icon");
-		$this->wrapContent("<div class='content'>","</div>");
+		$this->wrapContent("<div class='content'>", "</div>");
 		$this->icon=new HtmlIcon("icon-".$this->identifier, $icon);
 		return $this;
 	}
 
-	public function addLoader($loaderIcon="notched circle"){
+	public function addLoader($loaderIcon="notched circle") {
 		$this->setIcon($loaderIcon);
 		$this->icon->addToIcon("loading");
 		return $this;
 	}
 
-	public function setDismissable($dismiss=true){
-		if($dismiss===true)
+	public function setDismissable($dismiss=true) {
+		if ($dismiss===true)
 			$this->close=new HtmlIcon("close-".$this->identifier, "close");
 		else
 			$this->close=NULL;
@@ -73,34 +73,34 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
 	 */
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		parent::run($js);
-		if(isset($this->close)){
+		if (isset($this->close)) {
 			$js->execOn("click", "#".$this->identifier." .close", "$(this).closest('.message').transition('fade')");
 		}
 	}
 
-	public function setState($visible=true){
-		$visible=($visible===true)?"visible":"hidden";
-		return $this->addToPropertyCtrl("class", $visible, array("visible","hidden"));
+	public function setState($visible=true) {
+		$visible=($visible===true) ? "visible" : "hidden";
+		return $this->addToPropertyCtrl("class", $visible, array("visible", "hidden"));
 	}
 
-	public function setVariation($value="floating"){
-		return $this->addToPropertyCtrl("class", $value, array("floating","compact"));
+	public function setVariation($value="floating") {
+		return $this->addToPropertyCtrl("class", $value, array("floating", "compact"));
 	}
 
-	public function setStyle($style){
+	public function setStyle($style) {
 		return $this->addToPropertyCtrl("class", $style, Style::getConstants());
 	}
 
-	public function setError(){
+	public function setError() {
 		return $this->setStyle("error");
 	}
 
-	public function setMessage($message){
-		if(\is_array($this->content)){
+	public function setMessage($message) {
+		if (\is_array($this->content)) {
 			$this->content[\sizeof($this->content)-1]=$message;
-		}else
+		} else
 			$this->setContent($message);
 	}
 }
\ No newline at end of file

Ajax/semantic/widgets/dataform/DataForm.php

Spacing +29 added lines, -29 removed lines

@@ -17,48 +17,48 @@ 
  * @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();
 		$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]);
-				if(\sizeof($fields)===1){
+			for ($i=0; $i<$size; $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);
 			}
 		}
@@ -67,11 +67,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;
 	}
@@ -85,26 +85,26 @@ 
 		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);
 	}
 
-	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);
 	}
 
 	/**

Ajax/semantic/widgets/dataform/FormInstanceViewer.php

Spacing +13 added lines, -13 removed lines

@@ -9,42 +9,42 @@
 class FormInstanceViewer extends InstanceViewer {
 	protected $separators;
 
-	public function __construct($identifier,$instance=NULL, $captions=NULL) {
-		parent::__construct($identifier,$instance=NULL, $captions=NULL);
+	public function __construct($identifier, $instance=NULL, $captions=NULL) {
+		parent::__construct($identifier, $instance=NULL, $captions=NULL);
 		$this->separators=[-1];
 	}
 
-	protected function _beforeAddProperty($index,&$field){
-		if(JString::endswith($field, "\n")===true){
+	protected function _beforeAddProperty($index, &$field) {
+		if (JString::endswith($field, "\n")===true) {
 			$this->addSeparatorAfter($index);
 		}
-		if($index>1 && JString::startswith($field, "\n")===true){
+		if ($index>1 && JString::startswith($field, "\n")===true) {
 			$this->addSeparatorAfter($index-1);
 		}
 		$field=\str_replace("\n", "", $field);
 	}
 
-	protected function _getDefaultValue($name,$value,$index){
+	protected function _getDefaultValue($name, $value, $index) {
 		$caption=$this->getCaption($index);
-		$input=new HtmlFormInput($this->widgetIdentifier."-".$name,$caption,"text",$value);
+		$input=new HtmlFormInput($this->widgetIdentifier."-".$name, $caption, "text", $value);
 		$input->setName($name);
 		return $input;
 	}
 
-	public function getFieldName($index){
+	public function getFieldName($index) {
 		$property=$this->getProperty($index);
-		if($property instanceof \ReflectionProperty){
+		if ($property instanceof \ReflectionProperty) {
 			$result=$property->getName();
-		}elseif(\is_callable($property)){
+		}elseif (\is_callable($property)) {
 			$result=$this->visibleProperties[$index];
-		}else{
+		} else {
 			$result=$property;
 		}
 		return $result;
 	}
 
-	public function addSeparatorAfter($fieldNum){
-		if(\array_search($fieldNum, $this->separators)===false)
+	public function addSeparatorAfter($fieldNum) {
+		if (\array_search($fieldNum, $this->separators)===false)
 			$this->separators[]=$fieldNum;
 			return $this;
 	}

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

Spacing +27 added lines, -27 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());
@@ -155,34 +155,34 @@ 
 		return $compo;
 	}
 
-	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) {
 		$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"]);
 			}
@@ -193,7 +193,7 @@ 
 		return $this->_bsComponent;
 	}
 
-	public function addValidationParam($paramName,$paramValue){
+	public function addValidationParam($paramName, $paramValue) {
 		$this->_validationParams[$paramName]=$paramValue;
 		return $this;
 	}

Ajax/semantic/widgets/dataform/FormFieldAsTrait.php

Spacing +44 added lines, -44 removed lines

@@ -16,13 +16,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;
 	}
 
@@ -30,22 +30,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
@@ -54,13 +54,13 @@ 
 		}
 	}
 
-	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($this->getIdentifier()."-".$name,$name,$value,$caption);
-			if(\is_array($attributes)){
-				$this->_applyAttributes($element, $attributes,$index);
+			$element=$elementCallback($this->getIdentifier()."-".$name, $name, $value, $caption);
+			if (\is_array($attributes)) {
+				$this->_applyAttributes($element, $attributes, $index);
 			}
 			return $element;
 		});
@@ -68,53 +68,53 @@ 
 	}
 
 
-	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 fieldAsRadios($index,$elements=[],$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption,$elements){
-			return HtmlFormFields::radios($name,$elements,$caption,$value);
-		}, $index,$attributes);
+	public function fieldAsRadios($index, $elements=[], $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption, $elements) {
+			return HtmlFormFields::radios($name, $elements, $caption, $value);
+		}, $index, $attributes);
 	}
 
-	public function fieldAsTextarea($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			$textarea=new HtmlFormTextarea($id,$caption,$value);
+	public function fieldAsTextarea($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$textarea=new HtmlFormTextarea($id, $caption, $value);
 			$textarea->setName($name);
 			return $textarea;
-		}, $index,$attributes);
+		}, $index, $attributes);
 	}
 
-	public function fieldAsInput($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			$input= new HtmlFormInput($id,$caption,"text",$value);
+	public function fieldAsInput($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$input=new HtmlFormInput($id, $caption, "text", $value);
 			$input->setName($name);
 			return $input;
-		}, $index,$attributes);
+		}, $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){
-			$dd=new HtmlFormDropdown($id,$elements,$caption,$value,$multiple);
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements, $multiple){
+			$dd=new HtmlFormDropdown($id, $elements, $caption, $value, $multiple);
 			$dd->setName($name);
 			return $dd;
-		}, $index,$attributes);
+		}, $index, $attributes);
 	}
 
-	public function fieldAsMessage($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			$mess= new HtmlMessage("message-".$id,$value);
+	public function fieldAsMessage($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$mess=new HtmlMessage("message-".$id, $value);
 			$mess->addHeader($caption);
 			return $mess;
-		}, $index,$attributes,"message");
+		}, $index, $attributes, "message");
 	}
 }
\ No newline at end of file