phpMv / phpMv-UI

Ajax/semantic/html/elements/HtmlIcon.php

Braces +14 added lines, -10 removed lines

@@ -89,8 +89,9 @@ 
 	public function asLink($href=NULL,$target=NULL) {
 		if (isset($href)) {
 			$_target="";
-			if(isset($target))
-				$_target="target='{$target}'";
+			if(isset($target)) {
+							$_target="target='{$target}'";
+			}
 			$this->wrap("<a href='" . $href . "' {$_target}>", "</a>");
 		}
 		return $this->addToProperty("class", "link");
@@ -107,8 +108,9 @@ 
 	 */
 	public function setBordered($inverted=false) {
 		$invertedStr="";
-		if ($inverted !== false)
-			$invertedStr=" inverted";
+		if ($inverted !== false) {
+					$invertedStr=" inverted";
+		}
 		return $this->addToProperty("class", "bordered" . $invertedStr);
 	}
 
@@ -121,12 +123,14 @@ 
 	}
 
 	public function addLabel($label, $before=false, $icon=NULL) {
-		if($before)
-			$this->wrap($label);
-		else
-			$this->wrap("", $label);
-		if(isset($icon))
-			$this->addToIcon($icon);
+		if($before) {
+					$this->wrap($label);
+		} else {
+					$this->wrap("", $label);
+		}
+		if(isset($icon)) {
+					$this->addToIcon($icon);
+		}
 		return $this;
 	}
 

Spacing +9 added lines, -9 removed lines

@@ -69,7 +69,7 @@ 
 	 * @return HtmlIcon
 	 */
 	public function setFlipped($sens="horizontally") {
-		return $this->addToProperty("class", "flipped " . $sens);
+		return $this->addToProperty("class", "flipped ".$sens);
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	 * @return HtmlIcon
 	 */
 	public function setRotated($sens="clockwise") {
-		return $this->addToProperty("class", "rotated " . $sens);
+		return $this->addToProperty("class", "rotated ".$sens);
 	}
 
 	/**
@@ -87,12 +87,12 @@ 
 	 * @param string $target
 	 * @return HtmlIcon
 	 */
-	public function asLink($href=NULL,$target=NULL) {
+	public function asLink($href=NULL, $target=NULL) {
 		if (isset($href)) {
 			$_target="";
-			if(isset($target))
+			if (isset($target))
 				$_target="target='{$target}'";
-			$this->wrap("<a href='" . $href . "' {$_target}>", "</a>");
+			$this->wrap("<a href='".$href."' {$_target}>", "</a>");
 		}
 		return $this->addToProperty("class", "link");
 	}
@@ -108,9 +108,9 @@ 
 	 */
 	public function setBordered($inverted=false) {
 		$invertedStr="";
-		if ($inverted !== false)
+		if ($inverted!==false)
 			$invertedStr=" inverted";
-		return $this->addToProperty("class", "bordered" . $invertedStr);
+		return $this->addToProperty("class", "bordered".$invertedStr);
 	}
 
 	/**
@@ -122,11 +122,11 @@ 
 	}
 
 	public function addLabel($label, $before=false, $icon=NULL) {
-		if($before)
+		if ($before)
 			$this->wrap($label);
 		else
 			$this->wrap("", $label);
-		if(isset($icon))
+		if (isset($icon))
 			$this->addToIcon($icon);
 		return $this;
 	}

Ajax/semantic/html/modules/HtmlSticky.php

Spacing +14 added lines, -14 removed lines

@@ -7,50 +7,50 @@
 
 class HtmlSticky extends HtmlSemDoubleElement {
 
-	public function __construct($identifier,$context=NULL,$content=NULL) {
+	public function __construct($identifier, $context=NULL, $content=NULL) {
 		parent::__construct($identifier, "div", "ui sticky", $content);
-		if(isset($content))
+		if (isset($content))
 			$this->setContext($context);
 	}
 
-	public function setContext($context){
+	public function setContext($context) {
 		$this->_params["context"]=$context;
 		return $this;
 	}
 
-	public function setFixed($value=NULL){
+	public function setFixed($value=NULL) {
 		$fixed="fixed";
-		if(isset($value))
+		if (isset($value))
 			$fixed.=" ".$value;
-		return $this->addToProperty("class",$fixed);
+		return $this->addToProperty("class", $fixed);
 	}
 
-	public function setBound($value=NULL){
+	public function setBound($value=NULL) {
 		$bound="bound";
-		if(isset($value))
+		if (isset($value))
 			$bound.=" ".$value;
-			return $this->addToProperty("class",$bound);
+			return $this->addToProperty("class", $bound);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
 	 */
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		parent::run($js);
-		return $js->semantic()->sticky("#".$this->identifier,$this->_params);
+		return $js->semantic()->sticky("#".$this->identifier, $this->_params);
 	}
 
-	public function setOffset($offset=0){
+	public function setOffset($offset=0) {
 		$this->_params["offset"]=$offset;
 		return $this;
 	}
 
 
 
-	public function setDebug($verbose=NULL){
+	public function setDebug($verbose=NULL) {
 		$this->_params["debug"]=true;
-		if(isset($verbose))
+		if (isset($verbose))
 			$this->_params["verbose"]=true;
 		return $this;
 	}

Braces +12 added lines, -8 removed lines

@@ -9,8 +9,9 @@ 
 
 	public function __construct($identifier,$context=NULL,$content=NULL) {
 		parent::__construct($identifier, "div", "ui sticky", $content);
-		if(isset($content))
-			$this->setContext($context);
+		if(isset($content)) {
+					$this->setContext($context);
+		}
 	}
 
 	public function setContext($context){
@@ -20,15 +21,17 @@ 
 
 	public function setFixed($value=NULL){
 		$fixed="fixed";
-		if(isset($value))
-			$fixed.=" ".$value;
+		if(isset($value)) {
+					$fixed.=" ".$value;
+		}
 		return $this->addToProperty("class",$fixed);
 	}
 
 	public function setBound($value=NULL){
 		$bound="bound";
-		if(isset($value))
-			$bound.=" ".$value;
+		if(isset($value)) {
+					$bound.=" ".$value;
+		}
 			return $this->addToProperty("class",$bound);
 	}
 
@@ -50,8 +53,9 @@ 
 
 	public function setDebug($verbose=NULL){
 		$this->_params["debug"]=true;
-		if(isset($verbose))
-			$this->_params["verbose"]=true;
+		if(isset($verbose)) {
+					$this->_params["verbose"]=true;
+		}
 		return $this;
 	}
 }

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

Spacing +4 added lines, -4 removed lines

@@ -17,10 +17,10 @@
 	 * {@inheritDoc}
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
 	 */
-	public function run(JsUtils $js){
-		if(!isset($this->_bsComponent)){
-			if(isset($this->_timeout)){
-				$js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}); }, {$this->_timeout});",true);
+	public function run(JsUtils $js) {
+		if (!isset($this->_bsComponent)) {
+			if (isset($this->_timeout)) {
+				$js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}); }, {$this->_timeout});", true);
 			}
 		}
 		return parent::run($js);

Ajax/semantic/html/collections/table/traits/TableTrait.php

Braces +6 added lines, -4 removed lines

@@ -22,15 +22,17 @@
 
 	public function setBasic($very=false) {
 		$table=$this->_self;
-		if ($very)
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
+		if ($very) {
+					$table->addToPropertyCtrl("class", "very", array ("very" ));
+		}
 		return $table->addToPropertyCtrl("class", "basic", array ("basic" ));
 	}
 
 	public function setCompact($very=false) {
 		$table=$this->_self;
-		if ($very)
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
+		if ($very) {
+					$table->addToPropertyCtrl("class", "very", array ("very" ));
+		}
 		return $table->addToPropertyCtrl("class", "compact", array ("compact" ));
 	}
 

Spacing +18 added lines, -18 removed lines

@@ -8,12 +8,12 @@ 
  * @author jc
  * @property HtmlTable $_self
  */
-trait TableTrait{
+trait TableTrait {
 
 	abstract public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false);
 	abstract public function getOn($event, $url, $responseElement="", $parameters=array());
 	
-	protected function addToPropertyTable($property,$value){
+	protected function addToPropertyTable($property, $value) {
 		return $this->_self->addToProperty($property, $value);
 	}
 
@@ -24,15 +24,15 @@ 
 	public function setBasic($very=false) {
 		$table=$this->_self;
 		if ($very)
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
-		return $table->addToPropertyCtrl("class", "basic", array ("basic" ));
+			$table->addToPropertyCtrl("class", "very", array("very"));
+		return $table->addToPropertyCtrl("class", "basic", array("basic"));
 	}
 
 	public function setCompact($very=false) {
 		$table=$this->_self;
 		if ($very)
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
-		return $table->addToPropertyCtrl("class", "compact", array ("compact" ));
+			$table->addToPropertyCtrl("class", "very", array("very"));
+		return $table->addToPropertyCtrl("class", "compact", array("compact"));
 	}
 
 	public function setCollapsing() {
@@ -71,41 +71,41 @@ 
 		return $this->addToPropertyTable("class", "striped");
 	}
 
-	public function onRowClick($jsCode, $stopPropagation=false, $preventDefault=false){
-		return $this->onRow("click", $jsCode,$stopPropagation,$preventDefault);
+	public function onRowClick($jsCode, $stopPropagation=false, $preventDefault=false) {
+		return $this->onRow("click", $jsCode, $stopPropagation, $preventDefault);
 	}
 
-	public function onRow($event,$jsCode, $stopPropagation=false, $preventDefault=false){
-		return $this->_self->addEvent($event."{{tbody tr}}",$jsCode,$stopPropagation,$preventDefault);
+	public function onRow($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
+		return $this->_self->addEvent($event."{{tbody tr}}", $jsCode, $stopPropagation, $preventDefault);
 	}
 
-	public function getOnRow($event, $url, $responseElement="", $parameters=array()){
-		$parameters=\array_merge($parameters,["stopPropagation"=>false,"preventDefault"=>false,"jsCondition"=>'!$(this).closest("tr").hasClass("active")']);
+	public function getOnRow($event, $url, $responseElement="", $parameters=array()) {
+		$parameters=\array_merge($parameters, ["stopPropagation"=>false, "preventDefault"=>false, "jsCondition"=>'!$(this).closest("tr").hasClass("active")']);
 		$selector="tbody tr";
-		if(isset($parameters["selector"])){
+		if (isset($parameters["selector"])) {
 			$selector=$parameters["selector"];
 		}
-		return $this->_self->getOn($event."{{".$selector."}}", $url,$responseElement,$parameters);
+		return $this->_self->getOn($event."{{".$selector."}}", $url, $responseElement, $parameters);
 	}
 	
-	public function onPageChange($jsCode){
+	public function onPageChange($jsCode) {
 		$this->_self->_addEvent("pageChange", $jsCode);
 		return $this;
 	}
 	
-	public function onSearchTerminate($jsCode){
+	public function onSearchTerminate($jsCode) {
 		$this->_self->_addEvent("searchTerminate", $jsCode);
 		return $this;
 	}
 	
-	public function getEventsScript(){
+	public function getEventsScript() {
 		return $this->_self->getBsComponent()->getScript();
 	}
 	
 	public function addEventsOnRun(JsUtils $js=NULL) {
 		$script=parent::addEventsOnRun($js);
 		$innerScript=$this->_self->getInnerScript();
-		if(!isset($innerScript)){
+		if (!isset($innerScript)) {
 			$this->_self->setInnerScript($script);
 		}
 		return $script;

Ajax/semantic/html/views/HtmlCardGroups.php

Spacing +3 added lines, -3 removed lines

@@ -8,11 +8,11 @@
 class HtmlCardGroups extends HtmlViewGroups {
 
 	public function __construct($identifier, $cards=array()) {
-		parent::__construct($identifier, "ui cards",$cards);
+		parent::__construct($identifier, "ui cards", $cards);
 	}
 
-	protected function createElement(){
-		return new HtmlCard("card-" . $this->count());
+	protected function createElement() {
+		return new HtmlCard("card-".$this->count());
 	}
 
 	public function newItem($identifier) {

Ajax/semantic/html/views/HtmlItems.php

Spacing +3 added lines, -3 removed lines

@@ -9,11 +9,11 @@
 class HtmlItems extends HtmlViewGroups {
 
 	public function __construct($identifier, $items=[]) {
-		parent::__construct($identifier, "ui items",$items);
+		parent::__construct($identifier, "ui items", $items);
 	}
 
-	protected function createElement(){
-		return new HtmlItem("item-" . $this->count());
+	protected function createElement() {
+		return new HtmlItem("item-".$this->count());
 	}
 
 	public function newItem($identifier) {

Ajax/semantic/html/content/view/ContentPartTrait.php

Spacing +8 added lines, -8 removed lines

@@ -6,24 +6,24 @@
  * @author jc
  * @property mixed $content
  */
-trait ContentPartTrait{
-	public function addElementInPart($element,$partKey,$before=false,$force=false){
-		$part=$this->getPart($partKey,null,$force);
-		if($part instanceof  HtmlSemDoubleElement){
+trait ContentPartTrait {
+	public function addElementInPart($element, $partKey, $before=false, $force=false) {
+		$part=$this->getPart($partKey, null, $force);
+		if ($part instanceof  HtmlSemDoubleElement) {
 			$this->content[$partKey]=$part;
-			$part->addContent($element,$before);
+			$part->addContent($element, $before);
 		}
 		return $this;
 	}
 
-	public function getPart($partKey, $index=NULL,$force=false) {
+	public function getPart($partKey, $index=NULL, $force=false) {
 		if (\array_key_exists($partKey, $this->content)) {
 			if (isset($index))
 				return $this->content[$partKey][$index];
 			return $this->content[$partKey];
 		}
-		if($force){
-			return new HtmlSemDoubleElement($partKey."-".$this->identifier,"div",$partKey);
+		if ($force) {
+			return new HtmlSemDoubleElement($partKey."-".$this->identifier, "div", $partKey);
 		}
 		return NULL;
 	}

Braces +3 added lines, -2 removed lines

@@ -18,8 +18,9 @@
 
 	public function getPart($partKey, $index=NULL,$force=false) {
 		if (\array_key_exists($partKey, $this->content)) {
-			if (isset($index))
-				return $this->content[$partKey][$index];
+			if (isset($index)) {
+							return $this->content[$partKey][$index];
+			}
 			return $this->content[$partKey];
 		}
 		if($force){

Ajax/semantic/html/content/view/HtmlViewItem.php

Braces +17 added lines, -12 removed lines

@@ -19,8 +19,9 @@ 
 	public function __construct($identifier,$baseClass,$content=NULL) {
 		parent::__construct($identifier, "div", $baseClass);
 		$this->content=["content"=>new HtmlViewContent("content-".$this->identifier)];
-		if(isset($content))
-			$this->setContent($content);
+		if(isset($content)) {
+					$this->setContent($content);
+		}
 	}
 
 	public function setContent($value){
@@ -31,10 +32,12 @@ 
 			if (isset($image)) {
 				$this->addImage($image);
 			}
-			if(isset($content))
-				$this->content["content"]->setContent($content);
-			if(isset($extra))
-				$this->addExtraContent($extra);
+			if(isset($content)) {
+							$this->content["content"]->setContent($content);
+			}
+			if(isset($extra)) {
+							$this->addExtraContent($extra);
+			}
 		}
 	}
 
@@ -49,10 +52,11 @@ 
 		if (\array_key_exists($key, $this->content) === false) {
 			$this->content[$key]=[];
 		}
-		if($this->content[$key] instanceof HtmlViewContent)
-			$this->content[$key]->addElement($element);
-		else
-			$this->content[$key][]=$element;
+		if($this->content[$key] instanceof HtmlViewContent) {
+					$this->content[$key]->addElement($element);
+		} else {
+					$this->content[$key][]=$element;
+		}
 		return $element;
 	}
 
@@ -153,8 +157,9 @@ 
 		$this->addToProperty("class", "link");
 		if ($href !== "") {
 			$this->setProperty("href", $href);
-			if (isset($target))
-				$this->setProperty("target", $target);
+			if (isset($target)) {
+							$this->setProperty("target", $target);
+			}
 		}
 		return $this;
 	}

Spacing +28 added lines, -28 removed lines

@@ -16,14 +16,14 @@ 
 abstract class HtmlViewItem extends HtmlSemDoubleElement {
 	use ContentPartTrait;
 
-	public function __construct($identifier,$baseClass,$content=NULL) {
+	public function __construct($identifier, $baseClass, $content=NULL) {
 		parent::__construct($identifier, "div", $baseClass);
 		$this->content=["content"=>new HtmlViewContent("content-".$this->identifier)];
-		if(isset($content))
+		if (isset($content))
 			$this->setContent($content);
 	}
 
-	public function setContent($value){
+	public function setContent($value) {
 		if (\is_array($value)) {
 			$image=JArray::getValue($value, "image", 0);
 			$content=JArray::getValue($value, "content", 1);
@@ -31,57 +31,57 @@ 
 			if (isset($image)) {
 				$this->addImage($image);
 			}
-			if(isset($content))
+			if (isset($content))
 				$this->content["content"]->setContent($content);
-			if(isset($extra))
+			if (isset($extra))
 				$this->addExtraContent($extra);
 		}
 	}
 
 	private function createContent($content, $baseClass="content") {
 		$count=\sizeof($this->content);
-		$result=new HtmlViewContent("content-" . $count . "-" . $this->identifier, $content);
+		$result=new HtmlViewContent("content-".$count."-".$this->identifier, $content);
 		$result->setClass($baseClass);
 		return $result;
 	}
 
 	private function addElementIn($key, $element) {
-		if (\array_key_exists($key, $this->content) === false) {
+		if (\array_key_exists($key, $this->content)===false) {
 			$this->content[$key]=[];
 		}
-		if($this->content[$key] instanceof HtmlViewContent)
+		if ($this->content[$key] instanceof HtmlViewContent)
 			$this->content[$key]->addElement($element);
 		else
 			$this->content[$key][]=$element;
 		return $element;
 	}
 
-	public function addIcon($icon,$before=true){
-		return $this->addElementIn("icon",new HtmlIcon("icon-" . $this->identifier, $icon));
+	public function addIcon($icon, $before=true) {
+		return $this->addElementIn("icon", new HtmlIcon("icon-".$this->identifier, $icon));
 	}
 
 
 	public function addHeader($header, $niveau=4, $type="page") {
 		if (!$header instanceof HtmlHeader) {
-			$header=new HtmlHeader("header-" . $this->identifier, $niveau, $header, $type);
+			$header=new HtmlHeader("header-".$this->identifier, $niveau, $header, $type);
 		}
-		return $this->addElementIn("header",$this->createContent($header));
+		return $this->addElementIn("header", $this->createContent($header));
 	}
 
 	public function addImage($image, $title="") {
 		if (!$image instanceof HtmlImage) {
-			$image=new HtmlImage("image-" . $this->identifier, $image, $title);
+			$image=new HtmlImage("image-".$this->identifier, $image, $title);
 		}
 		$image->setClass("ui image");
-		return $this->content["image"]= $image;
+		return $this->content["image"]=$image;
 	}
 
-	public function addReveal($visibleContent, $hiddenContent=NULL, $type=RevealType::FADE, $attributeType=NULL,$key="extra-content") {
+	public function addReveal($visibleContent, $hiddenContent=NULL, $type=RevealType::FADE, $attributeType=NULL, $key="extra-content") {
 		$reveal=$visibleContent;
 		if (!$visibleContent instanceof HtmlReveal) {
-			$reveal=new HtmlReveal("reveral-" . $this->identifier, $visibleContent, $hiddenContent, $type, $attributeType);
+			$reveal=new HtmlReveal("reveral-".$this->identifier, $visibleContent, $hiddenContent, $type, $attributeType);
 		}
-		return $this->content[$key]= $reveal;
+		return $this->content[$key]=$reveal;
 	}
 
 	public function addRevealImage($visibleContent, $hiddenContent=NULL, $type=RevealType::FADE, $attributeType=NULL) {
@@ -89,11 +89,11 @@ 
 		if (!$visibleContent instanceof HtmlReveal) {
 			return $this->addReveal(new HtmlImage("", $visibleContent), new HtmlImage("", $hiddenContent), $type, $attributeType);
 		}
-		return $this->content["image"]= $reveal;
+		return $this->content["image"]=$reveal;
 	}
 
 	public function addExtraContent($content=array()) {
-		return $this->content["extra-content"]= $this->createContent($content, "extra content");
+		return $this->content["extra-content"]=$this->createContent($content, "extra content");
 	}
 
 	/**
@@ -103,23 +103,23 @@ 
 	 * @param boolean $before
 	 * @return HtmlButtonGroups
 	 */
-	public function addContentButtons($elements=array(), $asIcons=false,$part="extra",$before=false){
-		return $this->content["content"]->addContentButtons($elements,$asIcons,$part, $before);
+	public function addContentButtons($elements=array(), $asIcons=false, $part="extra", $before=false) {
+		return $this->content["content"]->addContentButtons($elements, $asIcons, $part, $before);
 	}
 
 
 
-	public function addItemHeaderContent($header, $metas=array(), $description=NULL,$extra=NULL) {
-		return $this->content["content"]->addHeaderContent($header, $metas, $description,$extra);
+	public function addItemHeaderContent($header, $metas=array(), $description=NULL, $extra=NULL) {
+		return $this->content["content"]->addHeaderContent($header, $metas, $description, $extra);
 	}
 
 	public function addItemContent($content=array()) {
 		$count=\sizeof($this->content);
-		return $this->addElementIn("content", new HtmlViewContent("content-" . $count . "-" . $this->identifier, $content));
+		return $this->addElementIn("content", new HtmlViewContent("content-".$count."-".$this->identifier, $content));
 	}
 
 	public function getItemContent() {
-		return $this->getPart("content",null,true);
+		return $this->getPart("content", null, true);
 	}
 
 	public function getItemExtraContent() {
@@ -141,13 +141,13 @@ 
 	 * @see HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		$this->content=JArray::sortAssociative($this->content, ["header","image","icon","content","extra-content"]);
+		$this->content=JArray::sortAssociative($this->content, ["header", "image", "icon", "content", "extra-content"]);
 		return parent::compile($js, $view);
 	}
 
-	public function asLink($href="",$target=NULL) {
+	public function asLink($href="", $target=NULL) {
 		$this->addToProperty("class", "link");
-		if ($href !== "") {
+		if ($href!=="") {
 			$this->setProperty("href", $href);
 			if (isset($target))
 				$this->setProperty("target", $target);

Ajax/semantic/widgets/base/FieldAsTrait.php

Braces +18 added lines, -14 removed lines

@@ -64,8 +64,7 @@ 
 			$rules=$attributes["rules"];
 			if(\is_array($rules)){
 				$element->addRules($rules);
-			}
-			else{
+			} else{
 				$element->addRule($rules);
 			}
 			unset($attributes["rules"]);
@@ -117,8 +116,9 @@ 
 	public function fieldAsLabel($index,$icon=NULL,$attributes=NULL){
 		return $this->_fieldAs(function($id,$name,$value) use($icon){
 			$lbl=new HtmlLabel($id,$value);
-			if(isset($icon))
-				$lbl->addIcon($icon);
+			if(isset($icon)) {
+							$lbl->addIcon($icon);
+			}
 				return $lbl;
 		}, $index,$attributes,"label");
 	}
@@ -126,8 +126,9 @@ 
 	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);
+			if(isset($icon)) {
+							$header->asIcon($icon, $value);
+			}
 			return $header;
 		}, $index,$attributes,"header");
 	}
@@ -135,7 +136,9 @@ 
 
 	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();
+			$image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular) {
+				$image->setCircular();
+			}
 			return $image;
 		});
 			return $this;
@@ -194,8 +197,9 @@ 
 
 	public function fieldAsCheckbox($index,$attributes=NULL){
 		return $this->_fieldAs(function($id,$name,$value,$caption) use($attributes){
-			if($caption===null || $caption==="")
-				$caption="";
+			if($caption===null || $caption==="") {
+							$caption="";
+			}
 			$input=new HtmlFormCheckbox($id,$caption,$this->_instanceViewer->getIdentifier());
 			$input->setChecked(JString::isBooleanTrue($value));
 			return $this->_prepareFormFields($input, $name, $attributes);
@@ -232,14 +236,14 @@ 
 		$i=0;
 		if(JArray::isAssociative($types)){
 			foreach ($types as $type=>$attributes){
-				if(\is_int($type))
-					$this->fieldAs($i++,$attributes,[]);
-				else{
+				if(\is_int($type)) {
+									$this->fieldAs($i++,$attributes,[]);
+				} else{
 					$type=preg_replace('/\d/', '', $type );
 					$this->fieldAs($i++,$type,$attributes);
 				}
 			}
-		}else{
+		} else{
 			foreach ($types as $type){
 				$this->fieldAs($i++,$type);
 			}
@@ -251,7 +255,7 @@ 
 		if(\method_exists($this, $method)){
 			if(!\is_array($attributes)){
 				$attributes=[$index];
-			}else{
+			} else{
 				\array_unshift($attributes, $index);
 			}
 			\call_user_func_array([$this,$method], $attributes);

Spacing +122 added lines, -122 removed lines

@@ -32,23 +32,23 @@ 
  * @property mixed $_modelInstance
  * @property boolean $_hasRules
  */
-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(BaseHtml &$button,$event,$url,$responseElement=NULL,$parameters=NULL);
+	abstract protected function _buttonAsSubmit(BaseHtml &$button, $event, $url, $responseElement=NULL, $parameters=NULL);
 
 	/**
 	 * @param HtmlFormField $element
 	 * @param array $attributes
 	 */
-	protected function _applyAttributes(BaseHtml $element,&$attributes,$index,$instance=null){
-		if(isset($attributes["jsCallback"])){
+	protected function _applyAttributes(BaseHtml $element, &$attributes, $index, $instance=null) {
+		if (isset($attributes["jsCallback"])) {
 			$callback=$attributes["jsCallback"];
-			if(\is_callable($callback)){
-				$callback($element,$instance,$index,InstanceViewer::$index);
+			if (\is_callable($callback)) {
+				$callback($element, $instance, $index, InstanceViewer::$index);
 			}
 		}
 		unset($attributes["rules"]);
@@ -57,44 +57,44 @@ 
 		$element->fromArray($attributes);
 	}
 
-	private function _getLabelField($caption,$icon=NULL){
-		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"),$caption,$icon);
+	private function _getLabelField($caption, $icon=NULL) {
+		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon);
 		return $label;
 	}
 
 
-	protected function _addRules(HtmlFormField $element,&$attributes){
-		if(isset($attributes["rules"])){
+	protected function _addRules(HtmlFormField $element, &$attributes) {
+		if (isset($attributes["rules"])) {
 			$this->_hasRules=true;
 			$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(HtmlFormField &$field,$name,&$attributes){
+	protected function _prepareFormFields(HtmlFormField &$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,$rowIndex) use (&$attributes,$elementCallback,$prefix){
+	protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null) {
+		$this->setValueFunction($index, function($value, $instance, $index, $rowIndex) use (&$attributes, $elementCallback, $prefix){
 			$caption=$this->_getFieldCaption($index);
 			$name=$this->_getFieldName($index);
-			$id=$this->_getFieldIdentifier($prefix,$name);
-			if(isset($attributes["name"])){
+			$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,$instance);
+			$element=$elementCallback($id, $name, $value, $caption);
+			if (\is_array($attributes)) {
+				$this->_applyAttributes($element, $attributes, $index, $instance);
 			}
 			$element->setDisabled(!$this->_edition);
 			return $element;
@@ -103,205 +103,205 @@ 
 	}
 
 
-	public function fieldAsProgress($index,$label=NULL, $attributes=array()){
-		$this->setValueFunction($index,function($value) use($label,$attributes){
-			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"),$value,$label,$attributes);
+	public function fieldAsProgress($index, $label=NULL, $attributes=array()) {
+		$this->setValueFunction($index, function($value) use($label, $attributes){
+			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes);
 			return $pb;
 		});
 			return $this;
 	}
 
-	public function fieldAsRating($index,$max=5, $icon=""){
-		$this->setValueFunction($index,function($value) use($max,$icon){
-			$rating=new HtmlRating($this->_getFieldIdentifier("rat"),$value,$max,$icon);
+	public function fieldAsRating($index, $max=5, $icon="") {
+		$this->setValueFunction($index, function($value) use($max, $icon){
+			$rating=new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon);
 			return $rating;
 		});
 			return $this;
 	}
 
-	public function fieldAsLabel($index,$icon=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value) use($icon){
-			$lbl=new HtmlLabel($id,$value);
-			if(isset($icon))
+	public function fieldAsLabel($index, $icon=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use($icon){
+			$lbl=new HtmlLabel($id, $value);
+			if (isset($icon))
 				$lbl->addIcon($icon);
 				return $lbl;
-		}, $index,$attributes,"label");
+		}, $index, $attributes, "label");
 	}
 
-	public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){
-			$header=new HtmlHeader($id,$niveau,$value);
-			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 fieldAsFlag($index){
-		$this->setValueFunction($index,function($flag){
-			$flag=new HtmlFlag($this->_getFieldIdentifier("flag"),$flag);
+	public function fieldAsFlag($index) {
+		$this->setValueFunction($index, function($flag) {
+			$flag=new HtmlFlag($this->_getFieldIdentifier("flag"), $flag);
 			return $flag;
 		});
 			return $this;
 	}
 
-	public function fieldAsIcon($index){
-		$this->setValueFunction($index,function($icon){
-			$icon=new HtmlIcon($this->_getFieldIdentifier("icon"),$icon);
+	public function fieldAsIcon($index) {
+		$this->setValueFunction($index, function($icon) {
+			$icon=new HtmlIcon($this->_getFieldIdentifier("icon"), $icon);
 			return $icon;
 		});
 			return $this;
 	}
 
-	public function fieldAsAvatar($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value){
-			$img=new HtmlImage($id,$value);
+	public function fieldAsAvatar($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$img=new HtmlImage($id, $value);
 			$img->asAvatar();
 			return $img;
-		}, $index,$attributes,"avatar");
+		}, $index, $attributes, "avatar");
 	}
 
-	public function fieldAsRadio($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value) use($attributes){
-			$input= new HtmlFormRadio($id,$name,$value,$value);
+	public function fieldAsRadio($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use($attributes){
+			$input=new HtmlFormRadio($id, $name, $value, $value);
 			return $this->_prepareFormFields($input, $name, $attributes);
-		}, $index,$attributes,"radio");
+		}, $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 fieldAsList($index,$classNames="",$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use($classNames){
-			$result= new HtmlList($name,$value);
+	public function fieldAsList($index, $classNames="", $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use($classNames){
+			$result=new HtmlList($name, $value);
 			$result->addClass($classNames);
 			return $result;
-		}, $index,$attributes,"list");
+		}, $index, $attributes, "list");
 	}
 
-	public function fieldAsInput($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($attributes){
-			$input= new HtmlFormInput($id,$caption,"text",$value);
+	public function fieldAsInput($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes){
+			$input=new HtmlFormInput($id, $caption, "text", $value);
 			return $this->_prepareFormFields($input, $name, $attributes);
-		}, $index,$attributes,"input");
+		}, $index, $attributes, "input");
 	}
 
-	public function fieldAsTextarea($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($attributes){
-			$textarea=new HtmlFormTextarea($id,$caption,$value);
+	public function fieldAsTextarea($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes){
+			$textarea=new HtmlFormTextarea($id, $caption, $value);
 			return $this->_prepareFormFields($textarea, $name, $attributes);
-		}, $index,$attributes,"textarea");
+		}, $index, $attributes, "textarea");
 	}
 
-	public function fieldAsElement($index,$tagName="div",$baseClass="",$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($attributes,$tagName,$baseClass){
-			$div=new HtmlSemDoubleElement($id,$tagName,$baseClass);
+	public function fieldAsElement($index, $tagName="div", $baseClass="", $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes, $tagName, $baseClass){
+			$div=new HtmlSemDoubleElement($id, $tagName, $baseClass);
 			$div->setContent(\htmlentities($value));
-			$textarea=new HtmlFormField("field-".$id, $div,$caption);
+			$textarea=new HtmlFormField("field-".$id, $div, $caption);
 			return $this->_prepareFormFields($textarea, $name, $attributes);
-		}, $index,$attributes,"element");
+		}, $index, $attributes, "element");
 	}
 
 
-	public function fieldAsHidden($index,$attributes=NULL){
-		if(!\is_array($attributes)){
+	public function fieldAsHidden($index, $attributes=NULL) {
+		if (!\is_array($attributes)) {
 			$attributes=[];
 		}
 		$attributes["inputType"]="hidden";
 		$attributes["style"]="display:none;";
-		return $this->fieldAsInput($index,$attributes);
+		return $this->fieldAsInput($index, $attributes);
 	}
 
-	public function fieldAsCheckbox($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use($attributes){
-			if($caption===null || $caption==="")
+	public function fieldAsCheckbox($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use($attributes){
+			if ($caption===null || $caption==="")
 				$caption="";
-			$input=new HtmlFormCheckbox($id,$caption,$this->_instanceViewer->getIdentifier());
+			$input=new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier());
 			$input->setChecked(JString::isBooleanTrue($value));
 			return $this->_prepareFormFields($input, $name, $attributes);
-		}, $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,$attributes){
-			$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, $attributes){
+			$dd=new HtmlFormDropdown($id, $elements, $caption, $value);
+			$dd->asSelect($name, $multiple);
 			return $this->_prepareFormFields($dd, $name, $attributes);
-		}, $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");
 	}
 }