phpMv / phpMv-UI

Ajax/semantic/widgets/datatable/PositionInTable.php

Spacing +1 added lines, -1 removed lines

@@ -3,5 +3,5 @@
 use Ajax\common\BaseEnum;
 
 abstract class PositionInTable extends BaseEnum {
-	const BEFORETABLE="beforeTable",AFTERTABLE="afterTable",HEADER="thead",FOOTER="tfoot",BODY="tbody";
+	const BEFORETABLE="beforeTable", AFTERTABLE="afterTable", HEADER="thead", FOOTER="tfoot", BODY="tbody";
 }
\ No newline at end of file

Ajax/semantic/widgets/datatable/DataTable.php

Braces +12 added lines, -8 removed lines

@@ -62,18 +62,21 @@ 
 
 		$table->setRowCount(0, \sizeof($captions));
 		$table->setHeaderValues($captions);
-		if(isset($this->_compileParts))
-			$table->setCompileParts($this->_compileParts);
+		if(isset($this->_compileParts)) {
+					$table->setCompileParts($this->_compileParts);
+		}
 		if(isset($this->_searchField)){
-			if(isset($js))
-				$this->_searchField->postOn("change", $this->_urls,"{'s':$(this).val()}","-#".$this->identifier." tbody",["preventDefault"=>false]);
+			if(isset($js)) {
+							$this->_searchField->postOn("change", $this->_urls,"{'s':$(this).val()}","-#".$this->identifier." tbody",["preventDefault"=>false]);
+			}
 		}
 
 		$this->_generateContent($table);
 
 		if($this->_hasCheckboxes){
-			if($table->hasPart("thead"))
-				$table->getHeader()->getCell(0, 0)->addToProperty("class","no-sort");
+			if($table->hasPart("thead")) {
+							$table->getHeader()->getCell(0, 0)->addToProperty("class","no-sort");
+			}
 		}
 
 		if(isset($this->_pagination) && $this->_pagination->getVisible()){
@@ -307,8 +310,9 @@ 
 	private function getDefaultButton($icon,$class=null){
 		$bt=$this->getFieldButton("");
 		$bt->asIcon($icon);
-		if(isset($class))
-			$bt->addToProperty("class", $class);
+		if(isset($class)) {
+					$bt->addToProperty("class", $class);
+		}
 		return $bt;
 	}
 

Doc Comments +19 added lines, -3 removed lines

@@ -39,6 +39,10 @@ 
 		parent::run($js);
 	}
 
+	/**
+	 * @param string $identifier
+	 * @param string $model
+	 */
 	public function __construct($identifier,$model,$modelInstance=NULL) {
 		parent::__construct($identifier, $model,$modelInstance);
 		$this->_instanceViewer=new InstanceViewer();
@@ -141,6 +145,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param PositionInTable $part
+	 */
 	private function addToolbarRow($part,$table,$captions){
 		$row=$table->getPart($part)->addRow(\sizeof($captions));
 		$row->mergeCol();
@@ -180,16 +187,17 @@ 
 	/**
 	 * @param string $caption
 	 * @param callable $callback
-	 * @return callable
+	 * @return \Closure
 	 */
 	private function getFieldButtonCallable($caption,$callback=null){
 		return $this->getCallable("getFieldButton",[$caption],$callback);
 	}
 
 	/**
-	 * @param mixed $object
 	 * @param callable $callback
-	 * @return callable
+	 * @param string $thisCallback
+	 * @param string[] $parameters
+	 * @return \Closure
 	 */
 	private function getCallable($thisCallback,$parameters,$callback=null){
 		$result=function($instance) use($thisCallback,$parameters,$callback){
@@ -250,11 +258,19 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $icon
+	 * @param string $class
+	 */
 	private function addDefaultButton($icon,$class=null,$callback=null){
 		$this->addField($this->getCallable("getDefaultButton",[$icon,$class],$callback));
 		return $this;
 	}
 
+	/**
+	 * @param string $icon
+	 * @param string $class
+	 */
 	private function insertDefaultButtonIn($index,$icon,$class=null,$callback=null){
 		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class],$callback));
 		return $this;

Spacing +80 added lines, -80 removed lines

@@ -29,8 +29,8 @@ 
 	protected $_hasCheckboxes;
 	protected $_compileParts;
 
-	public function run(JsUtils $js){
-		if($this->_hasCheckboxes && isset($js)){
+	public function run(JsUtils $js) {
+		if ($this->_hasCheckboxes && isset($js)) {
 			$js->execOn("change", "#".$this->identifier." [name='selection[]']", "
 		var \$parentCheckbox=\$('#ck-main-ck-{$this->identifier}'),\$checkbox=\$('#{$this->identifier} [name=\"selection[]\"]'),allChecked=true,allUnchecked=true;
 		\$checkbox.each(function() {if($(this).prop('checked')){allUnchecked = false;}else{allChecked = false;}});
@@ -39,21 +39,21 @@ 
 		parent::run($js);
 	}
 
-	public function __construct($identifier,$model,$modelInstance=NULL) {
-		parent::__construct($identifier, $model,$modelInstance);
+	public function __construct($identifier, $model, $modelInstance=NULL) {
+		parent::__construct($identifier, $model, $modelInstance);
 		$this->_instanceViewer=new InstanceViewer();
-		$this->content=["table"=>new HtmlTable($identifier, 0,0)];
+		$this->content=["table"=>new HtmlTable($identifier, 0, 0)];
 		$this->_toolbarPosition=PositionInTable::BEFORETABLE;
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->_instanceViewer->setInstance($this->_model);
 		$captions=$this->_instanceViewer->getCaptions();
 
 		$table=$this->content["table"];
 
-		if($this->_hasCheckboxes){
-			$ck=new HtmlCheckbox("main-ck-".$this->identifier,"");
+		if ($this->_hasCheckboxes) {
+			$ck=new HtmlCheckbox("main-ck-".$this->identifier, "");
 			$ck->setOnChecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',true);");
 			$ck->setOnUnchecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',false);");
 			\array_unshift($captions, $ck);
@@ -61,44 +61,44 @@ 
 
 		$table->setRowCount(0, \sizeof($captions));
 		$table->setHeaderValues($captions);
-		if(isset($this->_compileParts))
+		if (isset($this->_compileParts))
 			$table->setCompileParts($this->_compileParts);
-		if(isset($this->_searchField)){
-			if(isset($js))
-				$this->_searchField->postOn("change", $this->_urls,"{'s':$(this).val()}","-#".$this->identifier." tbody",["preventDefault"=>false]);
+		if (isset($this->_searchField)) {
+			if (isset($js))
+				$this->_searchField->postOn("change", $this->_urls, "{'s':$(this).val()}", "-#".$this->identifier." tbody", ["preventDefault"=>false]);
 		}
 
 		$this->_generateContent($table);
 
-		if($this->_hasCheckboxes){
-			if($table->hasPart("thead"))
-				$table->getHeader()->getCell(0, 0)->addToProperty("class","no-sort");
+		if ($this->_hasCheckboxes) {
+			if ($table->hasPart("thead"))
+				$table->getHeader()->getCell(0, 0)->addToProperty("class", "no-sort");
 		}
 
-		if(isset($this->_pagination) && $this->_pagination->getVisible()){
+		if (isset($this->_pagination) && $this->_pagination->getVisible()) {
 			$this->_generatePagination($table);
 		}
-		if(isset($this->_toolbar)){
+		if (isset($this->_toolbar)) {
 			$this->_setToolbarPosition($table, $captions);
 		}
-		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
-		return parent::compile($js,$view);
+		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
+		return parent::compile($js, $view);
 	}
 
-	protected function _generateContent($table){
+	protected function _generateContent($table) {
 		$objects=$this->_modelInstance;
-		if(isset($this->_pagination)){
+		if (isset($this->_pagination)) {
 			$objects=$this->_pagination->getObjects($this->_modelInstance);
 		}
 		InstanceViewer::setIndex(0);
-		$table->fromDatabaseObjects($objects, function($instance){
+		$table->fromDatabaseObjects($objects, function($instance) {
 			$this->_instanceViewer->setInstance($instance);
 			InstanceViewer::$index++;
-			$result= $this->_instanceViewer->getValues();
-			if($this->_hasCheckboxes){
-				$ck=new HtmlCheckbox("ck-".$this->identifier,"");
+			$result=$this->_instanceViewer->getValues();
+			if ($this->_hasCheckboxes) {
+				$ck=new HtmlCheckbox("ck-".$this->identifier, "");
 				$field=$ck->getField();
-				$field->setProperty("value",$this->_instanceViewer->getIdentifier());
+				$field->setProperty("value", $this->_instanceViewer->getIdentifier());
 				$field->setProperty("name", "selection[]");
 				\array_unshift($result, $ck);
 			}
@@ -106,25 +106,25 @@ 
 		});
 	}
 
-	private function _generatePagination($table){
+	private function _generatePagination($table) {
 		$footer=$table->getFooter();
 		$footer->mergeCol();
-		$menu=new HtmlPaginationMenu("pagination-".$this->identifier,$this->_pagination->getPagesNumbers());
+		$menu=new HtmlPaginationMenu("pagination-".$this->identifier, $this->_pagination->getPagesNumbers());
 		$menu->floatRight();
 		$menu->setActiveItem($this->_pagination->getPage()-1);
 		$footer->setValues($menu);
-		$menu->postOnClick($this->_urls,"{'p':$(this).attr('data-page')}","-#".$this->identifier." tbody",["preventDefault"=>false]);
+		$menu->postOnClick($this->_urls, "{'p':$(this).attr('data-page')}", "-#".$this->identifier." tbody", ["preventDefault"=>false]);
 	}
 
-	protected function _setToolbarPosition($table,$captions=NULL){
-		switch ($this->_toolbarPosition){
+	protected function _setToolbarPosition($table, $captions=NULL) {
+		switch ($this->_toolbarPosition) {
 			case PositionInTable::BEFORETABLE:case PositionInTable::AFTERTABLE:
-				if(isset($this->_compileParts)===false){
+				if (isset($this->_compileParts)===false) {
 					$this->content[$this->_toolbarPosition]=$this->_toolbar;
 				}
 				break;
 			case PositionInTable::HEADER:case PositionInTable::FOOTER: case PositionInTable::BODY:
-				$this->addToolbarRow($this->_toolbarPosition,$table, $captions);
+				$this->addToolbarRow($this->_toolbarPosition, $table, $captions);
 				break;
 		}
 	}
@@ -136,18 +136,18 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function afterCompile($index,$callback){
-		$this->_instanceViewer->afterCompile($index,$callback);
+	public function afterCompile($index, $callback) {
+		$this->_instanceViewer->afterCompile($index, $callback);
 		return $this;
 	}
 
-	private function addToolbarRow($part,$table,$captions){
+	private function addToolbarRow($part, $table, $captions) {
 		$row=$table->getPart($part)->addRow(\sizeof($captions));
 		$row->mergeCol();
 		$row->setValues([$this->_toolbar]);
 	}
 
-	public function getHtmlComponent(){
+	public function getHtmlComponent() {
 		return $this->content["table"];
 	}
 
@@ -160,8 +160,8 @@ 
 		return $this;
 	}
 
-	public function paginate($items_per_page=10,$page=1){
-		$this->_pagination=new Pagination($items_per_page,4,$page);
+	public function paginate($items_per_page=10, $page=1) {
+		$this->_pagination=new Pagination($items_per_page, 4, $page);
 	}
 
 	public function getHasCheckboxes() {
@@ -173,7 +173,7 @@ 
 		return $this;
 	}
 
-	public function refresh($compileParts=["tbody"]){
+	public function refresh($compileParts=["tbody"]) {
 		$this->_compileParts=$compileParts;
 		return $this;
 	}
@@ -182,8 +182,8 @@ 
 	 * @param callable $callback
 	 * @return callable
 	 */
-	private function getFieldButtonCallable($caption,$callback=null){
-		return $this->getCallable("getFieldButton",[$caption],$callback);
+	private function getFieldButtonCallable($caption, $callback=null) {
+		return $this->getCallable("getFieldButton", [$caption], $callback);
 	}
 
 	/**
@@ -191,16 +191,16 @@ 
 	 * @param callable $callback
 	 * @return callable
 	 */
-	private function getCallable($thisCallback,$parameters,$callback=null){
-		$result=function($instance) use($thisCallback,$parameters,$callback){
-			$object=call_user_func_array(array($this,$thisCallback), $parameters);
-			if(isset($callback)){
-				if(\is_callable($callback)){
-					$callback($object,$instance);
+	private function getCallable($thisCallback, $parameters, $callback=null) {
+		$result=function($instance) use($thisCallback, $parameters, $callback){
+			$object=call_user_func_array(array($this, $thisCallback), $parameters);
+			if (isset($callback)) {
+				if (\is_callable($callback)) {
+					$callback($object, $instance);
 				}
 			}
-			if($object instanceof HtmlSemDoubleElement){
-				$object->setProperty("data-ajax",$this->_instanceViewer->getIdentifier());
+			if ($object instanceof HtmlSemDoubleElement) {
+				$object->setProperty("data-ajax", $this->_instanceViewer->getIdentifier());
 			}
 			return $object;
 		};
@@ -211,8 +211,8 @@ 
 	 * @param string $caption
 	 * @return HtmlButton
 	 */
-	private function getFieldButton($caption){
-		return new HtmlButton("",$caption);
+	private function getFieldButton($caption) {
+		return new HtmlButton("", $caption);
 	}
 
 	/**
@@ -221,8 +221,8 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function addFieldButton($caption,$callback=null){
-		$this->addField($this->getCallable("getFieldButton",[$caption],$callback));
+	public function addFieldButton($caption, $callback=null) {
+		$this->addField($this->getCallable("getFieldButton", [$caption], $callback));
 		return $this;
 	}
 
@@ -233,8 +233,8 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function insertFieldButton($index,$caption,$callback=null){
-		$this->insertField($index, $this->getFieldButtonCallable($caption,$callback));
+	public function insertFieldButton($index, $caption, $callback=null) {
+		$this->insertField($index, $this->getFieldButtonCallable($caption, $callback));
 		return $this;
 	}
 
@@ -245,65 +245,65 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function insertInFieldButton($index,$caption,$callback=null){
-		$this->insertInField($index, $this->getFieldButtonCallable($caption,$callback));
+	public function insertInFieldButton($index, $caption, $callback=null) {
+		$this->insertInField($index, $this->getFieldButtonCallable($caption, $callback));
 		return $this;
 	}
 
-	private function addDefaultButton($icon,$class=null,$callback=null){
-		$this->addField($this->getCallable("getDefaultButton",[$icon,$class],$callback));
+	private function addDefaultButton($icon, $class=null, $callback=null) {
+		$this->addField($this->getCallable("getDefaultButton", [$icon, $class], $callback));
 		return $this;
 	}
 
-	private function insertDefaultButtonIn($index,$icon,$class=null,$callback=null){
-		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class],$callback));
+	private function insertDefaultButtonIn($index, $icon, $class=null, $callback=null) {
+		$this->insertInField($index, $this->getCallable("getDefaultButton", [$icon, $class], $callback));
 		return $this;
 	}
 
-	private function getDefaultButton($icon,$class=null){
+	private function getDefaultButton($icon, $class=null) {
 		$bt=$this->getFieldButton("");
 		$bt->asIcon($icon);
-		if(isset($class))
+		if (isset($class))
 			$bt->addToProperty("class", $class);
 		return $bt;
 	}
 
-	public function addDeleteButton($callback=null){
-		return $this->addDefaultButton("remove","delete red basic",$callback);
+	public function addDeleteButton($callback=null) {
+		return $this->addDefaultButton("remove", "delete red basic", $callback);
 	}
 
-	public function addEditButton($callback=null){
-		return $this->addDefaultButton("edit","edit basic",$callback);
+	public function addEditButton($callback=null) {
+		return $this->addDefaultButton("edit", "edit basic", $callback);
 	}
 
-	public function addEditDeleteButtons($callbackEdit=null,$callbackDelete=null){
+	public function addEditDeleteButtons($callbackEdit=null, $callbackDelete=null) {
 		$this->addEditButton($callbackEdit);
 		$index=$this->_instanceViewer->visiblePropertiesCount()-1;
-		$this->insertDeleteButtonIn($index,$callbackDelete);
+		$this->insertDeleteButtonIn($index, $callbackDelete);
 		return $this;
 	}
 
-	public function insertDeleteButtonIn($index,$callback=null){
-		return $this->insertDefaultButtonIn($index,"remove","delete red basic",$callback);
+	public function insertDeleteButtonIn($index, $callback=null) {
+		return $this->insertDefaultButtonIn($index, "remove", "delete red basic", $callback);
 	}
 
-	public function insertEditButtonIn($index,$callback=null){
-		return $this->insertDefaultButtonIn($index,"edit","edit basic",$callback);
+	public function insertEditButtonIn($index, $callback=null) {
+		return $this->insertDefaultButtonIn($index, "edit", "edit basic", $callback);
 	}
 
-	public function setSelectable(){
+	public function setSelectable() {
 		$this->content["table"]->setSelectable();
 		return $this;
 	}
 
-	public function addSearchInToolbar(){
+	public function addSearchInToolbar() {
 		return $this->addInToolbar($this->getSearchField())->setPosition("right");
 	}
 
-	public function getSearchField(){
-		if(isset($this->_searchField)===false){
-			$this->_searchField=new HtmlInput("search-".$this->identifier,"search","","Search...");
-			$this->_searchField->addIcon("search",Direction::RIGHT);
+	public function getSearchField() {
+		if (isset($this->_searchField)===false) {
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
+			$this->_searchField->addIcon("search", Direction::RIGHT);
 		}
 		return $this->_searchField;
 	}

Ajax/semantic/widgets/dataelement/DataElement.php

Doc Comments +3 added lines

@@ -13,6 +13,9 @@
  */
 class HtmlIconGroups extends HtmlSemCollection {
 
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier, $icons=array(), $size="") {
 		parent::__construct($identifier, "i", "icons");
 		$this->addItems($icons);

Spacing +10 added lines, -10 removed lines

@@ -19,35 +19,35 @@
 class DataElement extends Widget {
 
 	public function __construct($identifier, $modelInstance=NULL) {
-		parent::__construct($identifier, null,$modelInstance);
+		parent::__construct($identifier, null, $modelInstance);
 		$this->_instanceViewer=new InstanceViewer();
-		$this->content=["table"=>new HtmlTable($identifier, 0,2)];
+		$this->content=["table"=>new HtmlTable($identifier, 0, 2)];
 		$this->content["table"]->setDefinition();
 		$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);
 
 		$table=$this->content["table"];
 		$this->_generateContent($table);
 
-		if(isset($this->_toolbar)){
+		if (isset($this->_toolbar)) {
 			$this->_setToolbarPosition($table);
 		}
-		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
-		return parent::compile($js,$view);
+		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
+		return parent::compile($js, $view);
 	}
 
 	/**
 	 * @param HtmlTable $table
 	 */
-	protected function _generateContent($table){
+	protected function _generateContent($table) {
 		$captions=$this->_instanceViewer->getCaptions();
-		$values= $this->_instanceViewer->getValues();
+		$values=$this->_instanceViewer->getValues();
 		$count=$this->_instanceViewer->count();
-		for($i=0;$i<$count;$i++){
-			$table->addRow([$captions[$i],$values[$i]]);
+		for ($i=0; $i<$count; $i++) {
+			$table->addRow([$captions[$i], $values[$i]]);
 		}
 	}
 

Ajax/common/Widget.php

Doc Comments +10 added lines

@@ -83,16 +83,26 @@
 		return $this;
 	}
 
+	/**
+	 * @param \Closure $field
+	 */
 	public function addField($field){
 		$this->_instanceViewer->addField($field);
 		return $this;
 	}
 
+	/**
+	 * @param integer $index
+	 * @param \Closure $field
+	 */
 	public function insertField($index,$field){
 		$this->_instanceViewer->insertField($index, $field);
 		return $this;
 	}
 
+	/**
+	 * @param \Closure $field
+	 */
 	public function insertInField($index,$field){
 		$this->_instanceViewer->insertInField($index, $field);
 		return $this;

Spacing +29 added lines, -29 removed lines

@@ -31,21 +31,21 @@ 
 	protected $_toolbarPosition;
 
 
-	public function __construct($identifier,$model,$modelInstance=NULL) {
+	public function __construct($identifier, $model, $modelInstance=NULL) {
 		parent::__construct($identifier);
 		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 		$this->setModel($model);
-		if(isset($modelInstance));
+		if (isset($modelInstance));
 			$this->show($modelInstance);
 	}
 
-	protected function _getFieldIdentifier($prefix){
+	protected function _getFieldIdentifier($prefix) {
 		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
 	}
 
-	abstract protected  function _setToolbarPosition($table,$captions=NULL);
+	abstract protected  function _setToolbarPosition($table, $captions=NULL);
 
-	public function show($modelInstance){
+	public function show($modelInstance) {
 		$this->_modelInstance=$modelInstance;
 	}
 
@@ -69,42 +69,42 @@ 
 
 	public abstract function getHtmlComponent();
 
-	public function setColor($color){
+	public function setColor($color) {
 		return $this->getHtmlComponent()->setColor($color);
 	}
 
 
-	public function setCaptions($captions){
+	public function setCaptions($captions) {
 		$this->_instanceViewer->setCaptions($captions);
 		return $this;
 	}
 
-	public function setFields($fields){
+	public function setFields($fields) {
 		$this->_instanceViewer->setVisibleProperties($fields);
 		return $this;
 	}
 
-	public function addField($field){
+	public function addField($field) {
 		$this->_instanceViewer->addField($field);
 		return $this;
 	}
 
-	public function insertField($index,$field){
+	public function insertField($index, $field) {
 		$this->_instanceViewer->insertField($index, $field);
 		return $this;
 	}
 
-	public function insertInField($index,$field){
+	public function insertInField($index, $field) {
 		$this->_instanceViewer->insertInField($index, $field);
 		return $this;
 	}
 
-	public function setValueFunction($index,$callback){
+	public function setValueFunction($index, $callback) {
 		$this->_instanceViewer->setValueFunction($index, $callback);
 		return $this;
 	}
 
-	public function setIdentifierFunction($callback){
+	public function setIdentifierFunction($callback) {
 		$this->_instanceViewer->setIdentifierFunction($callback);
 		return $this;
 	}
@@ -112,8 +112,8 @@ 
 	/**
 	 * @return \Ajax\semantic\html\collections\menus\HtmlMenu
 	 */
-	public function getToolbar(){
-		if(isset($this->_toolbar)===false){
+	public function getToolbar() {
+		if (isset($this->_toolbar)===false) {
 			$this->_toolbar=new HtmlMenu("toolbar-".$this->identifier);
 			//$this->_toolbar->setSecondary();
 		}
@@ -126,35 +126,35 @@ 
 	 * @param callable $callback function to call on $element
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addInToolbar($element,$callback=NULL){
+	public function addInToolbar($element, $callback=NULL) {
 		$tb=$this->getToolbar();
-		if(isset($callback)){
-			if(\is_callable($callback)){
+		if (isset($callback)) {
+			if (\is_callable($callback)) {
 				$callback($element);
 			}
 		}
 		return $tb->addItem($element);
 	}
 
-	public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){
-		$result=$this->addInToolbar($caption,$callback);
+	public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) {
+		$result=$this->addInToolbar($caption, $callback);
 		$result->addIcon($icon);
 		return $result;
 	}
 
-	public function addButtonInToolbar($caption,$callback=NULL){
-		$bt=new HtmlButton("",$caption);
-		return $this->addInToolbar($bt,$callback);
+	public function addButtonInToolbar($caption, $callback=NULL) {
+		$bt=new HtmlButton("", $caption);
+		return $this->addInToolbar($bt, $callback);
 	}
 
-	public function addButtonsInToolbar(array $captions,$asIcon=false,$callback=NULL){
-		$bts=new HtmlButtonGroups("",$captions,$asIcon);
-		return $this->addInToolbar($bts,$callback);
+	public function addButtonsInToolbar(array $captions, $asIcon=false, $callback=NULL) {
+		$bts=new HtmlButtonGroups("", $captions, $asIcon);
+		return $this->addInToolbar($bts, $callback);
 	}
 
-	public function addLabelledIconButtonInToolbar($caption,$icon,$before=true,$labeled=false){
-		$bt=new HtmlButton("",$caption);
-		$bt->addIcon($icon,$before,$labeled);
+	public function addLabelledIconButtonInToolbar($caption, $icon, $before=true, $labeled=false) {
+		$bt=new HtmlButton("", $caption);
+		$bt->addIcon($icon, $before, $labeled);
 		return $this->addInToolbar($bt);
 	}
 

Ajax/semantic/widgets/dataform/DataForm.php

Doc Comments +3 added lines

@@ -13,6 +13,9 @@
  */
 class HtmlIconGroups extends HtmlSemCollection {
 
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier, $icons=array(), $size="") {
 		parent::__construct($identifier, "i", "icons");
 		$this->addItems($icons);

Braces +4 added lines, -3 removed lines

@@ -51,14 +51,15 @@
 			foreach ($values as $v){
 				$form->addField($v);
 			}
-		}else{
+		} else{
 			$separators[]=$count;
 			for($i=0;$i<$size-1;$i++){
 				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
 				if(\sizeof($fields)===1){
 					$form->addField($fields[0]);
-				}else
-					$form->addFields($fields);
+				} else {
+									$form->addFields($fields);
+				}
 			}
 		}
 	}

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/html/collections/form/HtmlFormField.php

Braces +6 added lines, -4 removed lines

@@ -16,8 +16,9 @@ 
 		parent::__construct($identifier, "div","field");
 		$this->content=array();
 		$this->_states=[State::ERROR,State::DISABLED];
-		if(isset($label)===true)
-			$this->setLabel($label);
+		if(isset($label)===true) {
+					$this->setLabel($label);
+		}
 		$this->setField($field);
 		$this->_validation=NULL;
 	}
@@ -48,8 +49,9 @@ 
 	 * @return mixed
 	 */
 	public function getLabel(){
-		if(\array_key_exists("label", $this->content))
-			return $this->content["label"];
+		if(\array_key_exists("label", $this->content)) {
+					return $this->content["label"];
+		}
 	}
 
 	/**

Spacing +34 added lines, -34 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)===true)
+		$this->_states=[State::ERROR, State::DISABLED];
+		if (isset($label)===true)
 			$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,26 +116,26 @@ 
 		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;

Ajax/semantic/widgets/dataform/FormInstanceViewer.php

Braces +5 added lines, -4 removed lines

@@ -34,17 +34,18 @@
 		$property=$this->getProperty($index);
 		if($property instanceof \ReflectionProperty){
 			$result=$property->getName();
-		}elseif(\is_callable($property)){
+		} elseif(\is_callable($property)){
 			$result=$this->visibleProperties[$index];
-		}else{
+		} else{
 			$result=\strtolower($this->getCaption($index));
 		}
 		return $result;
 	}
 
 	public function addSeparatorAfter($fieldNum){
-		if(\array_search($fieldNum, $this->separators)===false)
-			$this->separators[]=$fieldNum;
+		if(\array_search($fieldNum, $this->separators)===false) {
+					$this->separators[]=$fieldNum;
+		}
 			return $this;
 	}
 

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/traits/SemanticWidgetsTrait.php

Spacing +6 added lines, -6 removed lines

@@ -15,8 +15,8 @@ 
 	 * @param array $instances
 	 * @return DataTable
 	 */
-	public function dataTable($identifier,$model, $instances){
-		return $this->addHtmlComponent(new DataTable($identifier,$model,$instances));
+	public function dataTable($identifier, $model, $instances) {
+		return $this->addHtmlComponent(new DataTable($identifier, $model, $instances));
 	}
 
 	/**
@@ -24,8 +24,8 @@ 
 	 * @param object $instance
 	 * @return DataElement
 	 */
-	public function dataElement($identifier, $instance){
-		return $this->addHtmlComponent(new DataElement($identifier,$instance));
+	public function dataElement($identifier, $instance) {
+		return $this->addHtmlComponent(new DataElement($identifier, $instance));
 	}
 
 	/**
@@ -33,7 +33,7 @@ 
 	 * @param object $instance
 	 * @return DataForm
 	 */
-	public function dataForm($identifier, $instance){
-		return $this->addHtmlComponent(new DataForm($identifier,$instance));
+	public function dataForm($identifier, $instance) {
+		return $this->addHtmlComponent(new DataForm($identifier, $instance));
 	}
 }
\ No newline at end of file

Ajax/semantic/widgets/base/FieldAsTrait.php

Doc Comments +8 added lines

@@ -18,6 +18,10 @@ 
 trait FieldAsTrait{
 
 	abstract protected function _getFieldIdentifier($prefix);
+
+	/**
+	 * @param \Closure $callback
+	 */
 	abstract public function setValueFunction($index,$callback);
 
 	private function _getLabelField($caption,$icon=NULL){
@@ -27,6 +31,10 @@ 
 
 	protected function _addRules($element,$attributes){}
 
+	/**
+	 * @param \Closure $elementCallback
+	 * @param string $prefix
+	 */
 	protected function _fieldAs($elementCallback,$index,$attributes=NULL,$prefix=null){
 		$this->setValueFunction($index,function($value)use ($index,&$attributes,$elementCallback,$prefix){
 			$name=$this->_instanceViewer->getCaption($index)."[]";

Spacing +52 added lines, -52 removed lines

@@ -16,121 +16,121 @@
  * @property InstanceViewer $_instanceViewer
  */
 
-trait FieldAsTrait{
+trait FieldAsTrait {
 
 	abstract protected function _getFieldIdentifier($prefix);
-	abstract public function setValueFunction($index,$callback);
+	abstract public function setValueFunction($index, $callback);
 
-	private function _getLabelField($caption,$icon=NULL){
-		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"),$caption,$icon);
+	private function _getLabelField($caption, $icon=NULL) {
+		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon);
 		return $label;
 	}
 
-	protected function _addRules($element,&$attributes){}
+	protected function _addRules($element, &$attributes) {}
 
-	protected function _fieldAs($elementCallback,$index,$attributes=NULL,$prefix=null){
-		$this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback,$prefix){
+	protected function _fieldAs($elementCallback, $index, $attributes=NULL, $prefix=null) {
+		$this->setValueFunction($index, function($value) use ($index, &$attributes, $elementCallback, $prefix){
 			$name=$this->_instanceViewer->getCaption($index)."[]";
-			if(isset($attributes["name"])===true){
+			if (isset($attributes["name"])===true) {
 				$name=$attributes["name"];
 			}
-			$element=$elementCallback($this->_getFieldIdentifier($prefix),$name,$value,"");
-			if(\is_array($attributes))
-				$this->_applyAttributes($element, $attributes,$index);
+			$element=$elementCallback($this->_getFieldIdentifier($prefix), $name, $value, "");
+			if (\is_array($attributes))
+				$this->_applyAttributes($element, $attributes, $index);
 			return $element;
 		});
 			return $this;
 	}
 
 
-	public function fieldAsProgress($index,$label=NULL, $attributes=array()){
-		$this->setValueFunction($index,function($value) use($label,$attributes){
-			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"),$value,$label,$attributes);
+	public function fieldAsProgress($index, $label=NULL, $attributes=array()) {
+		$this->setValueFunction($index, function($value) use($label, $attributes){
+			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes);
 			return $pb;
 		});
 			return $this;
 	}
 
-	public function fieldAsRating($index,$max=5, $icon=""){
-		$this->setValueFunction($index,function($value) use($max,$icon){
-			$rating=new HtmlRating($this->_getFieldIdentifier("rat"),$value,$max,$icon);
+	public function fieldAsRating($index, $max=5, $icon="") {
+		$this->setValueFunction($index, function($value) use($max, $icon){
+			$rating=new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon);
 			return $rating;
 		});
 			return $this;
 	}
 
-	public function fieldAsLabel($index,$icon=NULL){
-		$this->setValueFunction($index,function($caption) use($icon){
-			$lbl=$this->_getLabelField($caption,$icon);
+	public function fieldAsLabel($index, $icon=NULL) {
+		$this->setValueFunction($index, function($caption) use($icon){
+			$lbl=$this->_getLabelField($caption, $icon);
 			return $lbl;
 		});
 			return $this;
 	}
 
-	public function 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 fieldAsInput($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value){
-			$input= new HtmlInput($id,"text",$value);
+	public function fieldAsInput($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$input=new HtmlInput($id, "text", $value);
 			//TODO check getField
 			$input->setName($name);
 			return $input;
-		}, $index,$attributes,"input");
+		}, $index, $attributes, "input");
 	}
 
-	public function fieldAsHidden($index,$attributes=NULL){
-		if(\is_array($attributes)===false){
+	public function fieldAsHidden($index, $attributes=NULL) {
+		if (\is_array($attributes)===false) {
 			$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){
-			$input=new HtmlCheckbox($id,"",$this->_instanceViewer->getIdentifier());
+	public function fieldAsCheckbox($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$input=new HtmlCheckbox($id, "", $this->_instanceViewer->getIdentifier());
 			$input->setChecked(JString::isBooleanTrue($value));
 			$input->getField()->setProperty("name", $name);
 			return $input;
-		}, $index,$attributes,"ck");
+		}, $index, $attributes, "ck");
 	}
 
-	public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value) use($elements,$multiple){
-			$dd=new HtmlDropdown($id,$value,$elements);
-			$dd->asSelect($name,$multiple);
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use($elements, $multiple){
+			$dd=new HtmlDropdown($id, $value, $elements);
+			$dd->asSelect($name, $multiple);
 			return $dd;
-		}, $index,$attributes,"dd");
+		}, $index, $attributes, "dd");
 	}
 }
\ No newline at end of file

Braces +9 added lines, -5 removed lines

@@ -35,8 +35,9 @@ 
 				$name=$attributes["name"];
 			}
 			$element=$elementCallback($this->_getFieldIdentifier($prefix),$name,$value,"");
-			if(\is_array($attributes))
-				$this->_applyAttributes($element, $attributes,$index);
+			if(\is_array($attributes)) {
+							$this->_applyAttributes($element, $attributes,$index);
+			}
 			return $element;
 		});
 			return $this;
@@ -70,8 +71,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");
 	}
@@ -79,7 +81,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;