phpMv / phpMv-UI

Ajax/service/JString.php

Spacing +15 added lines, -15 removed lines

@@ -2,51 +2,51 @@
 namespace Ajax\service;
 class JString {
 
-	public static function contains($hay,$needle){
-		return strpos($hay, $needle) !== false;
+	public static function contains($hay, $needle) {
+		return strpos($hay, $needle)!==false;
 	}
 	public static function startswith($hay, $needle) {
-		return substr($hay, 0, strlen($needle)) === $needle;
+		return substr($hay, 0, strlen($needle))===$needle;
 	}
 
 	public static function endswith($hay, $needle) {
-		return substr($hay, -strlen($needle)) === $needle;
+		return substr($hay, -strlen($needle))===$needle;
 	}
 
-	public static function isNull($s){
+	public static function isNull($s) {
 		return (!isset($s) || NULL===$s || ""===$s);
 	}
-	public static function isNotNull($s){
+	public static function isNotNull($s) {
 		return (isset($s) && NULL!==$s && ""!==$s);
 	}
 
-	public static function isBoolean($value){
+	public static function isBoolean($value) {
 		return \is_bool($value) || $value==1 || $value==0;
 	}
 
-	public static function isBooleanTrue($value){
+	public static function isBooleanTrue($value) {
 		return $value==1 || $value;
 	}
 
-	public static function isBooleanFalse($value){
+	public static function isBooleanFalse($value) {
 		return $value==0 || !$value;
 	}
 
-	public static function camelCaseToSeparated($input,$separator=" "){
+	public static function camelCaseToSeparated($input, $separator=" ") {
 		return strtolower(preg_replace('/(?<!^)[A-Z]/', $separator.'$0', $input));
 	}
 
-	public static function replaceAtFirst($subject,$from, $to){
-		$from = '/\A'.preg_quote($from, '/').'/';
+	public static function replaceAtFirst($subject, $from, $to) {
+		$from='/\A'.preg_quote($from, '/').'/';
 		return \preg_replace($from, $to, $subject, 1);
 	}
 
-	public static function replaceAtLast($subject,$from, $to){
-		$from = '/'.preg_quote($from, '/').'\z/';
+	public static function replaceAtLast($subject, $from, $to) {
+		$from='/'.preg_quote($from, '/').'\z/';
 		return \preg_replace($from, $to, $subject, 1);
 	}
 
-	public static function replaceAtFirstAndLast($subject,$fromFirst,$toFirst,$fromLast,$toLast){
+	public static function replaceAtFirstAndLast($subject, $fromFirst, $toFirst, $fromLast, $toLast) {
 		$s=self::replaceAtFirst($subject, $fromFirst, $toFirst);
 		return self::replaceAtLast($s, $fromLast, $toLast);
 	}

Ajax/semantic/widgets/business/BusinessForm.php

Spacing +13 added lines, -13 removed lines

@@ -16,17 +16,17 @@ 
 	 *
 	 * @see \Ajax\semantic\widgets\dataform\DataForm::__construct()
 	 */
-	public function __construct($identifier,$modelInstance=null,$fieldsOrder,$fieldsDefinition,$fields=[],$captions=[],$separators=[]) {
-		if(!isset($modelInstance)){
+	public function __construct($identifier, $modelInstance=null, $fieldsOrder, $fieldsDefinition, $fields=[], $captions=[], $separators=[]) {
+		if (!isset($modelInstance)) {
 			$modelInstance=$this->getDefaultModelInstance();
 		}
-		parent::__construct($identifier,$modelInstance);
-		$this->_initForm($fieldsOrder, $fieldsDefinition,$fields,$captions,$separators);
+		parent::__construct($identifier, $modelInstance);
+		$this->_initForm($fieldsOrder, $fieldsDefinition, $fields, $captions, $separators);
 	}
 
 	abstract protected function getDefaultModelInstance();
 
-	protected function _initForm($fieldsOrder,$fieldsDefinition,$fields=[],$captions=[],$separators=[]){
+	protected function _initForm($fieldsOrder, $fieldsDefinition, $fields=[], $captions=[], $separators=[]) {
 		$this->_fieldsOrder=$fieldsOrder;
 		$this->setFields($fields);
 		$this->setSeparators($separators);
@@ -34,26 +34,26 @@ 
 		$this->setCaptions($captions);
 	}
 
-	protected function _getIndex($fieldName){
+	protected function _getIndex($fieldName) {
 		$index=$fieldName;
-		if(\is_string($fieldName)){
+		if (\is_string($fieldName)) {
 			$index=\array_search($fieldName, $this->_fieldsOrder);
 		}
 		return $index;
 	}
-	protected function _fieldAs($elementCallback,&$index,$attributes=NULL,$prefix=null){
+	protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null) {
 		$index=$this->_getIndex($index);
-		return parent::_fieldAs($elementCallback, $index,$attributes,$prefix);
+		return parent::_fieldAs($elementCallback, $index, $attributes, $prefix);
 	}
 
 
-	public function removeField($fieldName){
+	public function removeField($fieldName) {
 		parent::removeField($fieldName);
-		\array_splice($this->_fieldsOrder,$this->_getIndex($fieldName),1);
+		\array_splice($this->_fieldsOrder, $this->_getIndex($fieldName), 1);
 		return $this;
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		return parent::compile($js,$view);
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		return parent::compile($js, $view);
 	}
 }
\ No newline at end of file

Ajax/semantic/html/modules/HtmlModal.php

Spacing +50 added lines, -50 removed lines

@@ -15,117 +15,117 @@ 
 	protected $_paramParts=array();
 
 	public function __construct($identifier, $header="", $content="", $actions=null) {
-		parent::__construct($identifier, "div","ui modal");
-		if(isset($header)){
+		parent::__construct($identifier, "div", "ui modal");
+		if (isset($header)) {
 			$this->setHeader($header);
 		}
-		if(isset($content)){
+		if (isset($content)) {
 			$this->setContent($content);
 		}
-		if(isset($actions)){
+		if (isset($actions)) {
 			$this->setActions($actions);
 		}
 	}
 
 	public function setHeader($value) {
-		$this->content["header"]=new HtmlSemDoubleElement("header-" . $this->identifier, "a", "header", $value);
+		$this->content["header"]=new HtmlSemDoubleElement("header-".$this->identifier, "a", "header", $value);
 		return $this;
 	}
 
 	public function setContent($value) {
-		$this->content["content"]=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "content", $value);
+		$this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content", $value);
 		return $this;
 	}
 
 	public function setActions($actions) {
-		$this->content["actions"]=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "actions");
-		if(\is_array($actions)){
-			foreach ($actions as $action){
+		$this->content["actions"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "actions");
+		if (\is_array($actions)) {
+			foreach ($actions as $action) {
 				$this->addAction($action);
 			}
 		}
-		else{
+		else {
 			$this->addAction($actions);
 		}
 		return $this;
 	}
 
-	public function addAction($action){
-		if(!$action instanceof BaseHtml){
+	public function addAction($action) {
+		if (!$action instanceof BaseHtml) {
 			$class="";
-			if(\array_search($action, ["Okay","Yes"])!==false){
+			if (\array_search($action, ["Okay", "Yes"])!==false) {
 				$class="approve";
 			}
-			if(\array_search($action, ["Cancel","No"])!==false){
+			if (\array_search($action, ["Cancel", "No"])!==false) {
 				$class="cancel";
 			}
-			$action=new HtmlButton("action-".$this->identifier,$action);
-			if($class!=="")
+			$action=new HtmlButton("action-".$this->identifier, $action);
+			if ($class!=="")
 				$action->addToProperty("class", $class);
 		}
 		return $this->addElementInPart($action, "actions");
 	}
 
-	public function addContent($content,$before=false){
-		$this->content["content"]->addContent($content,$before);
+	public function addContent($content, $before=false) {
+		$this->content["content"]->addContent($content, $before);
 		return $this;
 	}
 
-	public function addImageContent($image,$description=NULL){
+	public function addImageContent($image, $description=NULL) {
 		$content=$this->content["content"];
-		if(isset($description)){
-			$description=new HtmlSemDoubleElement("description-".$this->identifier,"div","description",$description);
-			$content->addContent($description,true);
+		if (isset($description)) {
+			$description=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $description);
+			$content->addContent($description, true);
 		}
-		if($image!==""){
-			$img=new HtmlImage("image-".$this->identifier,$image,"","medium");
-			$content->addContent($img,true);
-			$content->addToProperty("class","image");
+		if ($image!=="") {
+			$img=new HtmlImage("image-".$this->identifier, $image, "", "medium");
+			$content->addContent($img, true);
+			$content->addToProperty("class", "image");
 		}
 		return $this;
 	}
 
-	public function addIconContent($icon,$description=NULL){
+	public function addIconContent($icon, $description=NULL) {
 		$content=$this->content["content"];
-		if(isset($description)){
-			$description=new HtmlSemDoubleElement("description-".$this->identifier,"div","description",$description);
-			$content->addContent($description,true);
+		if (isset($description)) {
+			$description=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $description);
+			$content->addContent($description, true);
 		}
-		if($icon!==""){
-			$img=new HtmlIcon("image-".$this->identifier,$icon);
-			$content->addContent($img,true);
-			$content->addToProperty("class","image");
+		if ($icon!=="") {
+			$img=new HtmlIcon("image-".$this->identifier, $icon);
+			$content->addContent($img, true);
+			$content->addToProperty("class", "image");
 		}
 		return $this;
 	}
 
-	private function addContentInPart($content,$uiClass,$part) {
-		return $this->addElementInPart(new HtmlSemDoubleElement($part."-" . $this->identifier, "div", $uiClass, $content), $part);
+	private function addContentInPart($content, $uiClass, $part) {
+		return $this->addElementInPart(new HtmlSemDoubleElement($part."-".$this->identifier, "div", $uiClass, $content), $part);
 	}
 
-	private function addElementInPart($element,$part) {
+	private function addElementInPart($element, $part) {
 		$this->content[$part]->addContent($element);
 		return $element;
 	}
 
-	public function showDimmer($value){
-		$value=$value?"show":"hide";
+	public function showDimmer($value) {
+		$value=$value ? "show" : "hide";
 		$this->_paramParts[]=["'".$value." dimmer'"];
 		return $this;
 	}
 
-	public function setInverted(){
+	public function setInverted() {
 		$this->_params["inverted"]=true;
 		return $this;
 	}
 
-	public function setBasic(){
+	public function setBasic() {
 		return $this->addToProperty("class", "basic");
 	}
 
 
-	public function setTransition($value){
-		$this->_paramParts[]=["'setting'","'transition'","'".$value."'"];
+	public function setTransition($value) {
+		$this->_paramParts[]=["'setting'", "'transition'", "'".$value."'"];
 	}
 
 	/**
@@ -135,8 +135,8 @@ 
 	 * @param string $viewName
 	 * @param $params The parameters to pass to the view
 	 */
-	public function renderView(JsUtils $js,$initialController,$viewName, $params=array()) {
-		return $this->setContent($js->renderContent($initialController, $viewName,$params));
+	public function renderView(JsUtils $js, $initialController, $viewName, $params=array()) {
+		return $this->setContent($js->renderContent($initialController, $viewName, $params));
 	}
 
 	/**
@@ -147,8 +147,8 @@ 
 	 * @param string $actionName the action name
 	 * @param array $params
 	 */
-	public function forward(JsUtils $js,$initialControllerInstance,$controllerName,$actionName,$params=NULL){
-		return $this->setContent($js->forward($initialControllerInstance, $controllerName, $actionName,$params));
+	public function forward(JsUtils $js, $initialControllerInstance, $controllerName, $actionName, $params=NULL) {
+		return $this->setContent($js->forward($initialControllerInstance, $controllerName, $actionName, $params));
 	}
 
 	/**
@@ -158,7 +158,7 @@ 
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		$this->content=JArray::sortAssociative($this->content, ["header","content","actions" ]);
+		$this->content=JArray::sortAssociative($this->content, ["header", "content", "actions"]);
 		return parent::compile($js, $view);
 	}
 	/*
@@ -166,8 +166,8 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if(isset($this->_bsComponent)===false)
-			$this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts);
+		if (isset($this->_bsComponent)===false)
+			$this->_bsComponent=$js->semantic()->modal("#".$this->identifier, $this->_params, $this->_paramParts);
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;
 	}

Ajax/semantic/html/modules/HtmlProgress.php

Spacing +11 added lines, -11 removed lines

@@ -17,17 +17,17 @@ 
 		$this->createBar();
 		if (isset($label))
 			$this->setLabel($label);
-		$this->_states=[ State::SUCCESS,State::WARNING,State::ERROR,State::ACTIVE,State::DISABLED ];
+		$this->_states=[State::SUCCESS, State::WARNING, State::ERROR, State::ACTIVE, State::DISABLED];
 		$this->addToProperty("class", $attributes);
 	}
 
 	public function setLabel($label) {
-		$this->content["label"]=new HtmlSemDoubleElement("lbl-" . $this->identifier, "div", "label", $label);
+		$this->content["label"]=new HtmlSemDoubleElement("lbl-".$this->identifier, "div", "label", $label);
 		return $this;
 	}
 
 	private function createBar() {
-		$bar=new HtmlSemDoubleElement("bar-" . $this->identifier, "div", "bar", new HtmlSemDoubleElement("progress-" . $this->identifier, "div", "progress"));
+		$bar=new HtmlSemDoubleElement("bar-".$this->identifier, "div", "bar", new HtmlSemDoubleElement("progress-".$this->identifier, "div", "progress"));
 		$this->content["bar"]=$bar;
 		return $this;
 	}
@@ -63,20 +63,20 @@ 
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		$this->content=JArray::sortAssociative($this->content, [ "bar","label" ]);
+		$this->content=JArray::sortAssociative($this->content, ["bar", "label"]);
 		return parent::compile($js, $view);
 	}
 
 	public function jsSetValue($value) {
-		return '$("#' . $this->identifier . '").progress({value:' . $value . '});';
+		return '$("#'.$this->identifier.'").progress({value:'.$value.'});';
 	}
 
 	public function jsIncValue() {
-		return '$("#' . $this->identifier . '").progress("increment");';
+		return '$("#'.$this->identifier.'").progress("increment");';
 	}
 
 	public function jsDecValue() {
-		return '$("#' . $this->identifier . '").progress("decrement");';
+		return '$("#'.$this->identifier.'").progress("decrement");';
 	}
 
 	/**
@@ -98,12 +98,12 @@ 
 			$percent=JArray::getDefaultValue($array, "percent", $percent);
 			$ratio=JArray::getDefaultValue($array, "ratio", $ratio);
 		}
-		$this->_params["text"]="%{active  : " . \var_export($active, true) . ",error: " . \var_export($error, true) . ",success : " . \var_export($success, true) . ",warning : " . \var_export($warning, true) . ",percent : " . \var_export($percent, true) . ",ratio   : " . \var_export($ratio, true) . "}%";
+		$this->_params["text"]="%{active  : ".\var_export($active, true).",error: ".\var_export($error, true).",success : ".\var_export($success, true).",warning : ".\var_export($warning, true).",percent : ".\var_export($percent, true).",ratio   : ".\var_export($ratio, true)."}%";
 		return $this;
 	}
 
 	public function onChange($jsCode) {
-		$this->addBehavior($this->_params, "onChange", $jsCode,"%function(percent, value, total){","}%");
+		$this->addBehavior($this->_params, "onChange", $jsCode, "%function(percent, value, total){", "}%");
 		return $this;
 	}
 
@@ -112,8 +112,8 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if (isset($this->_bsComponent) === false)
-			$this->_bsComponent=$js->semantic()->progress("#" . $this->identifier, $this->_params);
+		if (isset($this->_bsComponent)===false)
+			$this->_bsComponent=$js->semantic()->progress("#".$this->identifier, $this->_params);
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;
 	}

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

Spacing +24 added lines, -24 removed lines

@@ -21,7 +21,7 @@ 
  */
 class HtmlForm extends HtmlSemCollection {
 
-	use FieldsTrait,FormTrait;
+	use FieldsTrait, FormTrait;
 	/**
 	 * @var array
 	 */
@@ -34,14 +34,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;
 	}
 
@@ -62,8 +62,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) {
@@ -79,12 +79,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;
@@ -92,7 +92,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;
@@ -146,39 +146,39 @@ 
 
 
 
-	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,$before="",$after=""){
-		$this->addBehavior($this->_validationParams, $paramName, $paramValue,$before,$after);
+	public function addValidationParam($paramName, $paramValue, $before="", $after="") {
+		$this->addBehavior($this->_validationParams, $paramName, $paramValue, $before, $after);
 		return $this;
 	}
 
@@ -191,7 +191,7 @@ 
 		return $this->_validationParams;
 	}
 
-	public function removeValidationParam($param){
+	public function removeValidationParam($param) {
 		unset($this->_validationParams[$param]);
 		return $this;
 	}

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

Spacing +28 added lines, -28 removed lines

@@ -12,28 +12,28 @@ 
  * @author jc
  *
  */
-trait FormTrait{
+trait FormTrait {
 
 	/**
 	 * @return HtmlForm
 	 */
 	abstract protected function getForm();
 
-	protected function addCompoValidation($compo,$field){
+	protected function addCompoValidation($compo, $field) {
 		$validation=$field->getValidation();
-		if(isset($validation)){
+		if (isset($validation)) {
 			$validation->setIdentifier($field->getDataField()->getIdentifier());
 			$compo->addFieldValidation($validation);
 		}
 		return $compo;
 	}
 
-	protected function _runValidationParams(&$compo,JsUtils $js=NULL){
+	protected function _runValidationParams(&$compo, JsUtils $js=NULL) {
 		$form=$this->getForm();
 		$params=$form->getValidationParams();
-		if(isset($params["_ajaxSubmit"]) && $params["_ajaxSubmit"] instanceof AjaxCall){
+		if (isset($params["_ajaxSubmit"]) && $params["_ajaxSubmit"] instanceof AjaxCall) {
 			$compilation=$params["_ajaxSubmit"]->compile($js);
-			$compilation=str_ireplace("\"","%quote%", $compilation);
+			$compilation=str_ireplace("\"", "%quote%", $compilation);
 			$this->onSuccess($compilation);
 			$form->removeValidationParam("_ajaxSubmit");
 		}
@@ -51,14 +51,14 @@ 
 		return $this;
 	}
 
-	public function setAttached($value=true){
+	public function setAttached($value=true) {
 		$form=$this->getForm();
-		if($value)
-			$form->addToPropertyCtrl("class", "attached", array ("attached" ));
+		if ($value)
+			$form->addToPropertyCtrl("class", "attached", array("attached"));
 		return $form;
 	}
 
-	public function addErrorMessage(){
+	public function addErrorMessage() {
 		return $this->getForm()->addContent((new HtmlMessage(""))->setError());
 	}
 
@@ -73,38 +73,38 @@ 
 	 * @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(HtmlButton &$button,$event,$url,$responseElement=NULL,$parameters=NULL){
+	protected function _buttonAsSubmit(HtmlButton&$button, $event, $url, $responseElement=NULL, $parameters=NULL) {
 		$form=$this->getForm();
-		if(isset($url) && isset($responseElement)){
-			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true);
-			$params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true];
-			if(\is_array($parameters))
-				$params=\array_merge($params,$parameters);
+		if (isset($url) && isset($responseElement)) {
+			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');", true, true);
+			$params=["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url, "stopPropagation"=>true];
+			if (\is_array($parameters))
+				$params=\array_merge($params, $parameters);
 			$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params));
 		}
 		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;
 	}
@@ -114,7 +114,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;
@@ -125,9 +125,9 @@ 
 	 * @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", $jsCode,"%function(event,fields){","}%");
+		$form->addValidationParam("onSuccess", $jsCode, "%function(event,fields){", "}%");
 		return $form;
 	}
 }
\ 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) && $label!=="")
+		$this->_states=[State::ERROR, State::DISABLED];
+		if (isset($label) && $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/html/collections/HtmlMessage.php

Spacing +25 added lines, -25 removed lines

@@ -30,42 +30,42 @@ 
 	 * @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 setHeader($header){
+	public function setHeader($header) {
 		return $this->addHeader($header);
 	}
 
-	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;
@@ -76,38 +76,38 @@ 
 	 * {@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 setWarning(){
+	public function setWarning() {
 		return $this->setStyle("warning");
 	}
 
-	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/base/FieldAsTrait.php

Spacing +104 added lines, -104 removed lines

@@ -25,23 +25,23 @@ 
  * @property boolean $_edition
  * @property mixed _modelInstance
  */
-trait FieldAsTrait{
+trait FieldAsTrait {
 
-	abstract protected function _getFieldIdentifier($prefix,$name="");
-	abstract public function setValueFunction($index,$callback);
+	abstract protected function _getFieldIdentifier($prefix, $name="");
+	abstract public function setValueFunction($index, $callback);
 	abstract protected function _getFieldName($index);
 	abstract protected function _getFieldCaption($index);
-	abstract protected function _buttonAsSubmit(HtmlButton &$button,$event,$url,$responseElement=NULL,$parameters=NULL);
+	abstract protected function _buttonAsSubmit(HtmlButton&$button, $event, $url, $responseElement=NULL, $parameters=NULL);
 
 	/**
 	 * @param HtmlFormField $element
 	 * @param array $attributes
 	 */
-	protected function _applyAttributes($element,&$attributes,$index){
-		if(isset($attributes["callback"])){
+	protected function _applyAttributes($element, &$attributes, $index) {
+		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"]);
 			}
 		}
@@ -51,43 +51,43 @@ 
 		$element->fromArray($attributes);
 	}
 
-	private function _getLabelField($caption,$icon=NULL){
-		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"),$caption,$icon);
+	private function _getLabelField($caption, $icon=NULL) {
+		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon);
 		return $label;
 	}
 
 
-	protected function _addRules($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{
+			else {
 				$element->addRule($rules);
 			}
 			unset($attributes["rules"]);
 		}
 	}
 
-	protected function _prepareFormFields(&$field,$name,&$attributes){
+	protected function _prepareFormFields(&$field, $name, &$attributes) {
 		$field->setName($name);
 		$this->_addRules($field, $attributes);
 		return $field;
 	}
 
-	protected function _fieldAs($elementCallback,&$index,$attributes=NULL,$prefix=null){
-		$this->setValueFunction($index,function($value,$instance,$index) use (&$attributes,$elementCallback,$prefix){
+	protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null) {
+		$this->setValueFunction($index, function($value, $instance, $index) use (&$attributes, $elementCallback, $prefix){
 			$caption=$this->_getFieldCaption($index);
 			$name=$this->_getFieldName($index);
-			$id=$this->_getFieldIdentifier($prefix,$name);
-			if(isset($attributes["name"])){
+			$id=$this->_getFieldIdentifier($prefix, $name);
+			if (isset($attributes["name"])) {
 				$name=$attributes["name"];
 				unset($attributes["name"]);
 			}
-			$element=$elementCallback($id,$name,$value,$caption);
-			if(\is_array($attributes)){
-				$this->_applyAttributes($element, $attributes,$index);
+			$element=$elementCallback($id, $name, $value, $caption);
+			if (\is_array($attributes)) {
+				$this->_applyAttributes($element, $attributes, $index);
 			}
 			$element->setDisabled(!$this->_edition);
 			return $element;
@@ -96,169 +96,169 @@ 
 	}
 
 
-	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 fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){
-			$header=new HtmlHeader($id,$niveau,$value);
-			if(isset($icon))
+	public function fieldAsHeader($index, $niveau=1, $icon=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use($niveau, $icon){
+			$header=new HtmlHeader($id, $niveau, $value);
+			if (isset($icon))
 				$header->asIcon($icon, $value);
 			return $header;
-		}, $index,$attributes,"header");
+		}, $index, $attributes, "header");
 	}
 
 
-	public function fieldAsImage($index,$size=Size::MINI,$circular=false){
-		$this->setValueFunction($index,function($img) use($size,$circular){
-			$image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular();
+	public function fieldAsImage($index, $size=Size::MINI, $circular=false) {
+		$this->setValueFunction($index, function($img) use($size, $circular){
+			$image=new HtmlImage($this->_getFieldIdentifier("image"), $img); $image->setSize($size); if ($circular)$image->setCircular();
 			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 fieldAsRadios($index,$elements=[],$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($elements){
-			return HtmlFormFields::radios($name,$elements,$caption,$value);
-		}, $index,$attributes,"radios");
+	public function fieldAsRadios($index, $elements=[], $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements){
+			return HtmlFormFields::radios($name, $elements, $caption, $value);
+		}, $index, $attributes, "radios");
 	}
 
-	public function fieldAsInput($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($attributes){
-			$input= new HtmlFormInput($id,$caption,"text",$value);
+	public function fieldAsInput($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes){
+			$input=new HtmlFormInput($id, $caption, "text", $value);
 			return $this->_prepareFormFields($input, $name, $attributes);
-		}, $index,$attributes,"input");
+		}, $index, $attributes, "input");
 	}
 
-	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,"textarea");
+		}, $index, $attributes, "textarea");
 	}
 
-	public function fieldAsHidden($index,$attributes=NULL){
-		if(!\is_array($attributes)){
+	public function fieldAsHidden($index, $attributes=NULL) {
+		if (!\is_array($attributes)) {
 			$attributes=[];
 		}
 		$attributes["imputType"]="hidden";
-		return $this->fieldAsInput($index,$attributes);
+		return $this->fieldAsInput($index, $attributes);
 	}
 
-	public function fieldAsCheckbox($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			$input=new HtmlFormCheckbox($id,$caption,$this->_instanceViewer->getIdentifier());
+	public function fieldAsCheckbox($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$input=new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier());
 			$input->setChecked(JString::isBooleanTrue($value));
 			$input->setName($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,$caption) use($elements,$multiple){
-			$dd=new HtmlFormDropdown($id,$elements,$caption,$value);
-			$dd->asSelect($name,$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);
+			$dd->asSelect($name, $multiple);
 			return $dd;
-		}, $index,$attributes,"dd");
+		}, $index, $attributes, "dd");
 	}
 
-	public function fieldAsMessage($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			$mess= new HtmlMessage("message-".$id,$caption);
+	public function fieldAsMessage($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$mess=new HtmlMessage("message-".$id, $caption);
 			$mess->addHeader($value);
 			return $mess;
-		}, $index,$attributes,"message");
+		}, $index, $attributes, "message");
 	}
 
-	public function fieldAsLink($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			$lnk= new HtmlLink("message-".$id,"#",$caption);
+	public function fieldAsLink($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$lnk=new HtmlLink("message-".$id, "#", $caption);
 			return $lnk;
-		}, $index,$attributes,"link");
+		}, $index, $attributes, "link");
 	}
 
 	/**Change fields type
 	 * @param array $types an array or associative array $type=>$attributes
 	 */
-	public function fieldsAs(array $types){
+	public function fieldsAs(array $types) {
 		$i=0;
-		if(JArray::isAssociative($types)){
-			foreach ($types as $type=>$attributes){
-				if(\is_int($type))
-					$this->fieldAs($i++,$attributes,[]);
-				else{
-					$type=preg_replace('/\d/', '', $type );
-					$this->fieldAs($i++,$type,$attributes);
+		if (JArray::isAssociative($types)) {
+			foreach ($types as $type=>$attributes) {
+				if (\is_int($type))
+					$this->fieldAs($i++, $attributes, []);
+				else {
+					$type=preg_replace('/\d/', '', $type);
+					$this->fieldAs($i++, $type, $attributes);
 				}
 			}
-		}else{
-			foreach ($types as $type){
-				$this->fieldAs($i++,$type);
+		} else {
+			foreach ($types as $type) {
+				$this->fieldAs($i++, $type);
 			}
 		}
 	}
 
-	public function fieldAs($index,$type,$attributes=NULL){
+	public function fieldAs($index, $type, $attributes=NULL) {
 		$method="fieldAs".\ucfirst($type);
-		if(\method_exists($this, $method)){
-			if(!\is_array($attributes)){
+		if (\method_exists($this, $method)) {
+			if (!\is_array($attributes)) {
 				$attributes=[$index];
-			}else{
+			} else {
 				\array_unshift($attributes, $index);
 			}
-			\call_user_func_array([$this,$method], $attributes);
+			\call_user_func_array([$this, $method], $attributes);
 		}
 	}
 
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$attributes){
-			$button=new HtmlButton($id,$caption,$cssStyle);
-			$this->_buttonAsSubmit($button,"click",$url,$responseElement,@$attributes["ajax"]);
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $attributes){
+			$button=new HtmlButton($id, $caption, $cssStyle);
+			$this->_buttonAsSubmit($button, "click", $url, $responseElement, @$attributes["ajax"]);
 			return $button;
-		}, $index,$attributes,"submit");
+		}, $index, $attributes, "submit");
 	}
 
-	public function fieldAsButton($index,$cssStyle=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){
-			$button=new HtmlButton($id,$value,$cssStyle);
+	public function fieldAsButton($index, $cssStyle=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){
+			$button=new HtmlButton($id, $value, $cssStyle);
 			return $button;
-		}, $index,$attributes,"button");
+		}, $index, $attributes, "button");
 	}
 }
\ No newline at end of file