phpMv / phpMv-UI

Ajax/semantic/html/collections/HtmlGrid.php

Braces +24 added lines, -16 removed lines

@@ -32,8 +32,9 @@ 
 			// }
 			$this->setWide($numCols);
 		}
-		if($createCols)
-			$this->setRowsCount($numRows, $numCols);
+		if($createCols) {
+					$this->setRowsCount($numRows, $numCols);
+		}
 	}
 
 	public function asSegment() {
@@ -85,8 +86,9 @@ 
 	public function addCol($width=NULL) {
 		$colCount=$this->colCount() + 1;
 		$this->setColsCount($colCount, true, $width);
-		if ($this->hasOnlyCols($this->count()))
-			return $this->content[$colCount - 1];
+		if ($this->hasOnlyCols($this->count())) {
+					return $this->content[$colCount - 1];
+		}
 		return $this;
 	}
 
@@ -174,8 +176,9 @@ 
 	 */
 	public function rowCount() {
 		$count=$this->count();
-		if ($this->hasOnlyCols($count))
-			return 0;
+		if ($this->hasOnlyCols($count)) {
+					return 0;
+		}
 		return $count;
 	}
 
@@ -185,10 +188,12 @@ 
 	 */
 	public function colCount() {
 		$count=$this->count();
-		if ($this->hasOnlyCols($count))
-			return $count;
-		if ($count > 0)
-			return $this->getItem(0)->count();
+		if ($this->hasOnlyCols($count)) {
+					return $count;
+		}
+		if ($count > 0) {
+					return $this->getItem(0)->count();
+		}
 		return 0;
 	}
 
@@ -199,8 +204,9 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGridCol
 	 */
 	public function getCell($row, $col) {
-		if ($row < 2 && $this->hasOnlyCols($this->count()))
-			return $this->getItem($col);
+		if ($row < 2 && $this->hasOnlyCols($this->count())) {
+					return $this->getItem($col);
+		}
 		$row=$this->getItem($row);
 		if (isset($row)) {
 			$col=$row->getItem($col);
@@ -249,8 +255,9 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function setPadded($value=NULL) {
-		if (isset($value))
-			$this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" ));
+		if (isset($value)) {
+					$this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" ));
+		}
 		return $this->addToProperty("class", "padded");
 	}
 
@@ -275,8 +282,9 @@ 
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
 	 */
 	protected function createItem($value) {
-		if ($this->_createCols === false)
-			$value=null;
+		if ($this->_createCols === false) {
+					$value=null;
+		}
 		$item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows);
 		return $item;
 	}

Spacing +43 added lines, -43 removed lines

@@ -32,16 +32,16 @@ 
 			// }
 			$this->setWide($numCols);
 		}
-		if($createCols)
+		if ($createCols)
 			$this->setRowsCount($numRows, $numCols);
 	}
 
 	public function asSegment() {
-		return $this->addToPropertyCtrl("class", "segment", array ("segment" ));
+		return $this->addToPropertyCtrl("class", "segment", array("segment"));
 	}
 
 	public function asContainer() {
-		return $this->addToPropertyCtrl("class", "container", array ("container" ));
+		return $this->addToPropertyCtrl("class", "container", array("container"));
 	}
 
 	/**
@@ -49,10 +49,10 @@ 
 	 * @param int $wide
 	 */
 	public function setWide($wide) {
-		if(isset(Wide::getConstants()["W" . $wide])){
-			$wide=Wide::getConstants()["W" . $wide];
+		if (isset(Wide::getConstants()["W".$wide])) {
+			$wide=Wide::getConstants()["W".$wide];
 			$this->addToPropertyCtrl("class", $wide, Wide::getConstants());
-			return $this->addToPropertyCtrl("class", "column", array ("column" ));
+			return $this->addToPropertyCtrl("class", "column", array("column"));
 		}
 		return $this;
 	}
@@ -72,9 +72,9 @@ 
 	 * @return mixed
 	 */
 	public function addRow($colsCount=NULL) {
-		$rowCount=$this->rowCount() + 1;
+		$rowCount=$this->rowCount()+1;
 		$this->setRowsCount($rowCount, $colsCount, true);
-		return $this->content[$rowCount - 1];
+		return $this->content[$rowCount-1];
 	}
 
 	/**
@@ -83,10 +83,10 @@ 
 	 * @return mixed|\Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function addCol($width=NULL) {
-		$colCount=$this->colCount() + 1;
+		$colCount=$this->colCount()+1;
 		$this->setColsCount($colCount, true, $width);
 		if ($this->hasOnlyCols($this->count()))
-			return $this->content[$colCount - 1];
+			return $this->content[$colCount-1];
 		return $this;
 	}
 
@@ -96,7 +96,7 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function addCols($sizes=array()) {
-		foreach ( $sizes as $size ) {
+		foreach ($sizes as $size) {
 			$this->addCol($size);
 		}
 		return $this;
@@ -110,19 +110,19 @@ 
 	 */
 	public function setRowsCount($rowsCount, $colsCount=NULL, $force=false) {
 		$count=$this->count();
-		if ($rowsCount < 2 && $force === false) {
-			for($i=$count; $i < $colsCount; $i++) {
-				$this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i));
+		if ($rowsCount<2 && $force===false) {
+			for ($i=$count; $i<$colsCount; $i++) {
+				$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i));
 			}
 		} else {
 			if ($this->hasOnlyCols($count)) {
 				$tmpContent=$this->content;
 				$item=$this->addItem($colsCount);
 				$item->setContent($tmpContent);
-				$this->content=array ();
+				$this->content=array();
 				$count=1;
 			}
-			for($i=$count; $i < $rowsCount; $i++) {
+			for ($i=$count; $i<$rowsCount; $i++) {
 				$this->addItem($colsCount);
 			}
 		}
@@ -130,7 +130,7 @@ 
 	}
 
 	protected function hasOnlyCols($count) {
-		return $count > 0 && $this->content[0] instanceof HtmlGridCol;
+		return $count>0 && $this->content[0] instanceof HtmlGridCol;
 	}
 
 	/**
@@ -144,14 +144,14 @@ 
 		if (isset($width)===false) {
 			$this->setWide($numCols);
 		}
-		if ($toCreate === true) {
+		if ($toCreate===true) {
 			$count=$this->count();
-			if ($count == 0 || $this->hasOnlyCols($count)) {
-				for($i=$count; $i < $numCols; $i++) {
-					$this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i, $width));
+			if ($count==0 || $this->hasOnlyCols($count)) {
+				for ($i=$count; $i<$numCols; $i++) {
+					$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i, $width));
 				}
 			} else {
-				for($i=0; $i < $count; $i++) {
+				for ($i=0; $i<$count; $i++) {
 					$this->getItem($i)->setColsCount($numCols);
 				}
 			}
@@ -187,7 +187,7 @@ 
 		$count=$this->count();
 		if ($this->hasOnlyCols($count))
 			return $count;
-		if ($count > 0)
+		if ($count>0)
 			return $this->getItem(0)->count();
 		return 0;
 	}
@@ -199,7 +199,7 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGridCol
 	 */
 	public function getCell($row, $col) {
-		if ($row < 2 && $this->hasOnlyCols($this->count()))
+		if ($row<2 && $this->hasOnlyCols($this->count()))
 			return $this->getItem($col);
 		$row=$this->getItem($row);
 		if (isset($row)) {
@@ -214,8 +214,8 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function setDivided($vertically=false) {
-		$value=($vertically === true) ? "vertically divided" : "divided";
-		return $this->addToPropertyCtrl("class", $value, array ("divided" ));
+		$value=($vertically===true) ? "vertically divided" : "divided";
+		return $this->addToPropertyCtrl("class", $value, array("divided"));
 	}
 
 	/**
@@ -224,15 +224,15 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function setCelled($internally=false) {
-		$value=($internally === true) ? "internally celled" : "celled";
-		return $this->addToPropertyCtrl("class", $value, array ("celled","internally celled" ));
+		$value=($internally===true) ? "internally celled" : "celled";
+		return $this->addToPropertyCtrl("class", $value, array("celled", "internally celled"));
 	}
 
 	/**
 	 * A grid can have its columns centered
 	 */
 	public function setCentered() {
-		return $this->addToPropertyCtrl("class", "centered", array ("centered" ));
+		return $this->addToPropertyCtrl("class", "centered", array("centered"));
 	}
 
 	/**
@@ -250,7 +250,7 @@ 
 	 */
 	public function setPadded($value=NULL) {
 		if (isset($value))
-			$this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" ));
+			$this->addToPropertyCtrl("class", $value, array("vertically", "horizontally"));
 		return $this->addToProperty("class", "padded");
 	}
 
@@ -260,12 +260,12 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function setRelaxed($very=false) {
-		$value=($very === true) ? "very relaxed" : "relaxed";
-		return $this->addToPropertyCtrl("class", $value, array ("relaxed","very relaxed" ));
+		$value=($very===true) ? "very relaxed" : "relaxed";
+		return $this->addToPropertyCtrl("class", $value, array("relaxed", "very relaxed"));
 	}
 
 	public function setVerticalAlignment($value=VerticalAlignment::MIDDLE) {
-		return $this->addToPropertyCtrl("class", $value . " aligned", VerticalAlignment::getConstantValues("aligned"));
+		return $this->addToPropertyCtrl("class", $value." aligned", VerticalAlignment::getConstantValues("aligned"));
 	}
 
 	/**
@@ -275,9 +275,9 @@ 
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
 	 */
 	protected function createItem($value) {
-		if ($this->_createCols === false)
+		if ($this->_createCols===false)
 			$value=null;
-		$item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows);
+		$item=new HtmlGridRow($this->identifier."-row-".($this->count()+1), $value, $this->_colSizing, $this->_implicitRows);
 		return $item;
 	}
 
@@ -288,20 +288,20 @@ 
 	public function setValues($values, $force=true) {
 		$count=$this->count();
 		$valuesSize=\sizeof($values);
-		if ($this->_createCols === false || $force === true) {
-			for($i=$count; $i < $valuesSize; $i++) {
+		if ($this->_createCols===false || $force===true) {
+			for ($i=$count; $i<$valuesSize; $i++) {
 				$colSize=\sizeof($values[$i]);
-				$this->addItem(new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $colSize, $this->_colSizing, $this->_implicitRows));
+				$this->addItem(new HtmlGridRow($this->identifier."-row-".($this->count()+1), $colSize, $this->_colSizing, $this->_implicitRows));
 			}
 		}
-		$count=\min(array ($this->count(),$valuesSize ));
-		for($i=0; $i < $count; $i++) {
-			$this->content[$i]->setValues($values[$i], $this->_createCols === false);
+		$count=\min(array($this->count(), $valuesSize));
+		for ($i=0; $i<$count; $i++) {
+			$this->content[$i]->setValues($values[$i], $this->_createCols===false);
 		}
 	}
 	
-	public function setColWidth($numCol,$width){
-		foreach ($this->content as $row){
+	public function setColWidth($numCol, $width) {
+		foreach ($this->content as $row) {
 			$row->getCol($numCol)->setWidth($width);
 		}
 		return $this;

Doc Comments +4 added lines, -1 removed lines

@@ -22,6 +22,9 @@ 
 	private $_colSizing=true;
 	private $_implicitRows=false;
 
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier, $numRows=1, $numCols=NULL, $createCols=true, $implicitRows=false) {
 		parent::__construct($identifier, "div", "ui grid");
 		$this->_implicitRows=$implicitRows;
@@ -162,7 +165,7 @@ 
 	/**
 	 * return the row at $index
 	 * @param int $index
-	 * @return \Ajax\semantic\html\collections\HtmlGridRow
+	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
 	public function getRow($index) {
 		return $this->getItem($index);

Ajax/common/html/HtmlDoubleElement.php

Spacing +15 added lines, -15 removed lines

@@ -27,15 +27,15 @@ 
 		return $this->content;
 	}
 
-	public function addContent($content,$before=false) {
+	public function addContent($content, $before=false) {
 		if (!\is_array($this->content)) {
-			if(isset($this->content))
-				$this->content=array ($this->content);
+			if (isset($this->content))
+				$this->content=array($this->content);
 			else
 				$this->content=array();
 		}
-		if($before)
-			array_unshift($this->content,$content);
+		if ($before)
+			array_unshift($this->content, $content);
 		else
 			$this->content []=$content;
 		return $this;
@@ -50,7 +50,7 @@ 
 		if ($this->content instanceof HtmlDoubleElement) {
 			$this->content->run($js);
 		} else if (\is_array($this->content)) {
-			foreach ( $this->content as $itemContent ) {
+			foreach ($this->content as $itemContent) {
 				if ($itemContent instanceof HtmlDoubleElement) {
 					$itemContent->run($js);
 				}
@@ -67,19 +67,19 @@ 
 		return $this;
 	}
 
-	public function getContentInstances($class){
-		return $this->_getContentInstances($class,$this->content);
+	public function getContentInstances($class) {
+		return $this->_getContentInstances($class, $this->content);
 	}
 
-	protected function _getContentInstances($class,$content){
+	protected function _getContentInstances($class, $content) {
 		$instances=[];
-		if($content instanceof $class){
+		if ($content instanceof $class) {
 			$instances[]=$content;
-		}elseif($content instanceof HtmlDoubleElement){
-			$instances=\array_merge($instances,$content->getContentInstances($class));
-		}elseif (\is_array($content)){
-			foreach ($content as $element){
-				$instances=\array_merge($instances,$this->_getContentInstances($class, $element));
+		}elseif ($content instanceof HtmlDoubleElement) {
+			$instances=\array_merge($instances, $content->getContentInstances($class));
+		}elseif (\is_array($content)) {
+			foreach ($content as $element) {
+				$instances=\array_merge($instances, $this->_getContentInstances($class, $element));
 			}
 		}
 		return $instances;

Braces +12 added lines, -10 removed lines

@@ -29,15 +29,17 @@ 
 
 	public function addContent($content,$before=false) {
 		if (!\is_array($this->content)) {
-			if(isset($this->content))
-				$this->content=array ($this->content);
-			else
-				$this->content=array();
+			if(isset($this->content)) {
+							$this->content=array ($this->content);
+			} else {
+							$this->content=array();
+			}
+		}
+		if($before) {
+					array_unshift($this->content,$content);
+		} else {
+					$this->content []=$content;
 		}
-		if($before)
-			array_unshift($this->content,$content);
-		else
-			$this->content []=$content;
 		return $this;
 	}
 
@@ -75,9 +77,9 @@ 
 		$instances=[];
 		if($content instanceof $class){
 			$instances[]=$content;
-		}elseif($content instanceof HtmlDoubleElement){
+		} elseif($content instanceof HtmlDoubleElement){
 			$instances=\array_merge($instances,$content->getContentInstances($class));
-		}elseif (\is_array($content)){
+		} elseif (\is_array($content)){
 			foreach ($content as $element){
 				$instances=\array_merge($instances,$this->_getContentInstances($class, $element));
 			}

Ajax/common/html/html5/HtmlInput.php

Braces +9 added lines, -6 removed lines

@@ -17,8 +17,9 @@ 
 	}
 
 	public function setValue($value) {
-		if(isset($value))
-		$this->setProperty("value", $value);
+		if(isset($value)) {
+				$this->setProperty("value", $value);
+		}
 		return $this;
 	}
 
@@ -27,16 +28,18 @@ 
 	}
 
 	public function setPlaceholder($value){
-		if(JString::isNotNull($value))
-			$this->_placeholder=$value;
+		if(JString::isNotNull($value)) {
+					$this->_placeholder=$value;
+		}
 		return $this;
 	}
 
 	public function compile(JsUtils $js=NULL,&$view=NULL){
 		$value=$this->_placeholder;
 		if(JString::isNull($value)){
-			if(JString::isNotNull($this->getProperty("name")))
-				$value=\ucfirst($this->getProperty("name"));
+			if(JString::isNotNull($this->getProperty("name"))) {
+							$value=\ucfirst($this->getProperty("name"));
+			}
 		}
 		$this->setProperty("placeholder", $value);
 		return parent::compile($js,$view);

Spacing +8 added lines, -8 removed lines

@@ -8,7 +8,7 @@ 
 
 class HtmlInput extends HtmlSingleElement {
 	protected $_placeholder;
-	public function __construct($identifier,$type="text",$value=NULL,$placeholder=NULL) {
+	public function __construct($identifier, $type="text", $value=NULL, $placeholder=NULL) {
 		parent::__construct($identifier, "input");
 		$this->setProperty("name", $identifier);
 		$this->setValue($value);
@@ -17,7 +17,7 @@ 
 	}
 
 	public function setValue($value) {
-		if(isset($value))
+		if (isset($value))
 		$this->setProperty("value", $value);
 		return $this;
 	}
@@ -26,19 +26,19 @@ 
 		return $this->setProperty("type", $value);
 	}
 
-	public function setPlaceholder($value){
-		if(JString::isNotNull($value))
+	public function setPlaceholder($value) {
+		if (JString::isNotNull($value))
 			$this->_placeholder=$value;
 		return $this;
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$value=$this->_placeholder;
-		if(JString::isNull($value)){
-			if(JString::isNotNull($this->getProperty("name")))
+		if (JString::isNull($value)) {
+			if (JString::isNotNull($this->getProperty("name")))
 				$value=\ucfirst($this->getProperty("name"));
 		}
 		$this->setProperty("placeholder", $value);
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 }

Ajax/common/Widget.php

Braces +7 added lines, -5 removed lines

@@ -186,8 +186,9 @@ 
 	 */
 	public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){
 		$result=$this->addInToolbar($caption,$callback);
-		if(isset($icon))
-			$result->addIcon($icon);
+		if(isset($icon)) {
+					$result->addIcon($icon);
+		}
 		return $result;
 	}
 
@@ -201,7 +202,7 @@ 
 			foreach ($items as $icon=>$item){
 				$this->addItemInToolbar($item,$icon,$callback);
 			}
-		}else{
+		} else{
 			foreach ($items as $item){
 				$this->addItemInToolbar($item,null,$callback);
 			}
@@ -352,8 +353,9 @@ 
 	protected function _compileForm(){
 		if(isset($this->_form)){
 			$noValidate="";
-			if(\sizeof($this->_form->getValidationParams())>0)
-				$noValidate="novalidate";
+			if(\sizeof($this->_form->getValidationParams())>0) {
+							$noValidate="novalidate";
+			}
 			$this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">","</form>");
 		}
 	}

Spacing +81 added lines, -81 removed lines

@@ -20,7 +20,7 @@ 
 use Ajax\semantic\html\modules\HtmlModal;
 
 abstract class Widget extends HtmlDoubleElement {
-	use FieldAsTrait,FormTrait;
+	use FieldAsTrait, FormTrait;
 
 	/**
 	 * @var string classname
@@ -53,17 +53,17 @@ 
 	protected $_generated;
 
 
-	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);
 		}
 		$this->_generated=false;
 	}
 
-	protected function _init($instanceViewer,$contentKey,$content,$edition){
+	protected function _init($instanceViewer, $contentKey, $content, $edition) {
 		$this->_instanceViewer=$instanceViewer;
 		$this->content=[$contentKey=>$content];
 		$this->_self=$content;
@@ -75,31 +75,31 @@ 
 	 * @param int|string $fieldName
 	 * @return int|string
 	 */
-	protected function _getIndex($fieldName){
+	protected function _getIndex($fieldName) {
 		$index=$fieldName;
-		if(\is_string($fieldName)){
+		if (\is_string($fieldName)) {
 			$fields=$this->_instanceViewer->getVisibleProperties();
 			$index=\array_search($fieldName, $fields);
 		}
 		return $index;
 	}
 
-	protected function _getFieldIdentifier($prefix,$name=""){
+	protected function _getFieldIdentifier($prefix, $name="") {
 		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
 	}
 
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		return $this->_instanceViewer->getFieldName($index);
 	}
 
-	protected function _getFieldCaption($index){
+	protected function _getFieldCaption($index) {
 		return $this->_instanceViewer->getCaption($index);
 	}
 
-	abstract protected  function _setToolbarPosition($table,$captions=NULL);
+	abstract protected  function _setToolbarPosition($table, $captions=NULL);
 
-	public function show($modelInstance){
-		if(\is_array($modelInstance)){
+	public function show($modelInstance) {
+		if (\is_array($modelInstance)) {
 			$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 		}
 		$this->_modelInstance=$modelInstance;
@@ -125,7 +125,7 @@ 
 
 	abstract public function getHtmlComponent();
 
-	public function setAttached($value=true){
+	public function setAttached($value=true) {
 		return $this->getHtmlComponent()->setAttached($value);
 	}
 
@@ -136,71 +136,71 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return Widget
 	 */
-	public function afterCompile($index,$callback){
+	public function afterCompile($index, $callback) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->afterCompile($index, $callback);
 		return $this;
 	}
 
-	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 setCaption($index,$caption){
+	public function setCaption($index, $caption) {
 		$this->_instanceViewer->setCaption($this->_getIndex($index), $caption);
 		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 addFields($fields){
+	public function addFields($fields) {
 		$this->_instanceViewer->addFields($fields);
 		return $this;
 	}
 
-	public function addMessage($attributes=NULL,$fieldName="message"){
+	public function addMessage($attributes=NULL, $fieldName="message") {
 		$this->_instanceViewer->addField($fieldName);
 		$count=$this->_instanceViewer->visiblePropertiesCount();
-		return $this->fieldAsMessage($count-1,$attributes);
+		return $this->fieldAsMessage($count-1, $attributes);
 	}
 
-	public function addErrorMessage(){
-		return $this->addMessage(["error"=>true],"message");
+	public function addErrorMessage() {
+		return $this->addMessage(["error"=>true], "message");
 	}
 
-	public function insertField($index,$field){
+	public function insertField($index, $field) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->insertField($index, $field);
 		return $this;
 	}
 
-	public function insertInField($index,$field){
+	public function insertInField($index, $field) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->insertInField($index, $field);
 		return $this;
 	}
 
-	public function setValueFunction($index,$callback){
+	public function setValueFunction($index, $callback) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->setValueFunction($index, $callback);
 		return $this;
 	}
 
-	public function setIdentifierFunction($callback){
+	public function setIdentifierFunction($callback) {
 		$this->_instanceViewer->setIdentifierFunction($callback);
 		return $this;
 	}
@@ -208,8 +208,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);
 		}
 		return $this->_toolbar;
@@ -221,15 +221,15 @@ 
 	 * @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($element instanceof BaseWidget){
-			if($element->getIdentifier()===""){
+		if ($element instanceof BaseWidget) {
+			if ($element->getIdentifier()==="") {
 				$element->setIdentifier("tb-item-".$this->identifier."-".$tb->count());
 			}
 		}
-		if(isset($callback)){
-			if(\is_callable($callback)){
+		if (isset($callback)) {
+			if (\is_callable($callback)) {
 				$callback($element);
 			}
 		}
@@ -242,9 +242,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){
-		$result=$this->addInToolbar($caption,$callback);
-		if(isset($icon))
+	public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) {
+		$result=$this->addInToolbar($caption, $callback);
+		if (isset($icon))
 			$result->addIcon($icon);
 		return $result;
 	}
@@ -254,14 +254,14 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\Widget
 	 */
-	public function addItemsInToolbar(array $items,$callback=NULL){
-		if(JArray::isAssociative($items)){
-			foreach ($items as $icon=>$item){
-				$this->addItemInToolbar($item,$icon,$callback);
+	public function addItemsInToolbar(array $items, $callback=NULL) {
+		if (JArray::isAssociative($items)) {
+			foreach ($items as $icon=>$item) {
+				$this->addItemInToolbar($item, $icon, $callback);
 			}
-		}else{
-			foreach ($items as $item){
-				$this->addItemInToolbar($item,null,$callback);
+		} else {
+			foreach ($items as $item) {
+				$this->addItemInToolbar($item, null, $callback);
 			}
 		}
 		return $this;
@@ -273,12 +273,12 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addDropdownInToolbar($value,$items,$callback=NULL){
+	public function addDropdownInToolbar($value, $items, $callback=NULL) {
 		$dd=$value;
 		if (\is_string($value)) {
-			$dd=new HtmlDropdown("dropdown-". $this->identifier."-".$value, $value, $items);
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$value, $value, $items);
 		}
-		return $this->addInToolbar($dd,$callback);
+		return $this->addInToolbar($dd, $callback);
 	}
 
 	/**
@@ -287,9 +287,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonInToolbar($caption,$cssStyle=null,$callback=NULL){
-		$bt=new HtmlButton("bt-".$caption,$caption,$cssStyle);
-		return $this->addInToolbar($bt,$callback);
+	public function addButtonInToolbar($caption, $cssStyle=null, $callback=NULL) {
+		$bt=new HtmlButton("bt-".$caption, $caption, $cssStyle);
+		return $this->addInToolbar($bt, $callback);
 	}
 
 	/**
@@ -298,9 +298,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	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);
 	}
 
 	/**
@@ -310,15 +310,15 @@ 
 	 * @param boolean $labeled
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	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);
 	}
 
-	public function addSubmitInToolbar($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){
-		$button=new HtmlButton($identifier,$value,$cssStyle);
-		$this->_buttonAsSubmit($button,"click",$url,$responseElement,$parameters);
+	public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) {
+		$button=new HtmlButton($identifier, $value, $cssStyle);
+		$this->_buttonAsSubmit($button, "click", $url, $responseElement, $parameters);
 		return $this->addInToolbar($button);
 	}
 
@@ -348,7 +348,7 @@ 
 	 * @param callable $defaultValueFunction function parameters are : $name : the field name, $value : the field value ,$index : the field index, $instance : the active instance of model
 	 * @return \Ajax\common\Widget
 	 */
-	public function setDefaultValueFunction($defaultValueFunction){
+	public function setDefaultValueFunction($defaultValueFunction) {
 		$this->_instanceViewer->setDefaultValueFunction($defaultValueFunction);
 		return $this;
 	}
@@ -357,7 +357,7 @@ 
 	 * @param string|boolean $disable
 	 * @return string
 	 */
-	public function jsDisabled($disable=true){
+	public function jsDisabled($disable=true) {
 		return "$('#".$this->identifier." .ui.input,#".$this->identifier." .ui.dropdown,#".$this->identifier." .ui.checkbox').toggleClass('disabled',".$disable.");";
 	}
 
@@ -366,12 +366,12 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addEditButtonInToolbar($caption,$callback=NULL){
-		$bt=new HtmlButton($this->identifier."-editBtn",$caption);
+	public function addEditButtonInToolbar($caption, $callback=NULL) {
+		$bt=new HtmlButton($this->identifier."-editBtn", $caption);
 		$bt->setToggle();
 		$bt->setActive($this->_edition);
 		$bt->onClick($this->jsDisabled(Javascript::prep_value("!$(event.target).hasClass('active')")));
-		return $this->addInToolbar($bt,$callback);
+		return $this->addInToolbar($bt, $callback);
 	}
 
 	public function setToolbar(HtmlMenu $_toolbar) {
@@ -385,35 +385,35 @@ 
 	}
 
 	public function getForm() {
-		if(!isset($this->_form)){
+		if (!isset($this->_form)) {
 			$this->_form=new HtmlForm("frm-".$this->identifier);
 			$this->setEdition(true);
 		}
 		return $this->_form;
 	}
 
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		$result=parent::run($js);
-		if(isset($this->_form)){
+		if (isset($this->_form)) {
 			$result=$this->runForm($js);
 		}
 		return $result;
 	}
 
-	protected function runForm(JsUtils $js){
+	protected function runForm(JsUtils $js) {
 		$fields=$this->getContentInstances(HtmlFormField::class);
-		foreach ($fields as $field){
+		foreach ($fields as $field) {
 			$this->_form->addField($field);
 		}
 		return $this->_form->run($js);
 	}
 
-	protected function _compileForm(){
-		if(isset($this->_form)){
+	protected function _compileForm() {
+		if (isset($this->_form)) {
 			$noValidate="";
-			if(\sizeof($this->_form->getValidationParams())>0)
+			if (\sizeof($this->_form->getValidationParams())>0)
 				$noValidate="novalidate";
-			$this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">","</form>");
+			$this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">", "</form>");
 		}
 	}
 
@@ -422,32 +422,32 @@ 
 		return $this;
 	}
 
-	public function moveFieldTo($from,$to){
+	public function moveFieldTo($from, $to) {
 		return $this->_instanceViewer->moveFieldTo($from, $to);
 	}
 
-	public function swapFields($index1,$index2){
+	public function swapFields($index1, $index2) {
 		$index1=$this->_getIndex($index1);
 		$index2=$this->_getIndex($index2);
 		return $this->_instanceViewer->swapFields($index1, $index2);
 	}
 
-	public function removeField($index){
+	public function removeField($index) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->removeField($index);
 		return $this;
 	}
 
-	public function asModal($header=null){
-		$modal=new HtmlModal("modal-".$this->identifier,$header);
+	public function asModal($header=null) {
+		$modal=new HtmlModal("modal-".$this->identifier, $header);
 		$modal->setContent($this);
-		if(isset($this->_form)){
+		if (isset($this->_form)) {
 			$this->_form->onSuccess($modal->jsHide());
 		}
 		return $modal;
 	}
 
 	public function addToProperty($name, $value, $separator=" ") {
-		return $this->getHtmlComponent()->addToProperty($name,$value,$separator);
+		return $this->getHtmlComponent()->addToProperty($name, $value, $separator);
 	}
 }

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

Braces +25 added lines, -17 removed lines

@@ -52,8 +52,9 @@ 
 	 */
 	public function addHeader($title, $niveau=1, $dividing=true) {
 		$header=new HtmlHeader("", $niveau, $title);
-		if ($dividing)
-			$header->setDividing();
+		if ($dividing) {
+					$header->setDividing();
+		}
 		return $this->addItem($header);
 	}
 
@@ -74,14 +75,16 @@ 
 					if (\is_string($end)) {
 						$label=$end;
 						\array_pop($fields);
-					} else
-						$label=NULL;
+					} else {
+											$label=NULL;
+					}
 				}
 				$this->_fields=\array_merge($this->_fields, $fields);
 				$fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields);
 			}
-			if (isset($label))
-				$fields=new HtmlFormField("", $fields, $label);
+			if (isset($label)) {
+							$fields=new HtmlFormField("", $fields, $label);
+			}
 		} else {
 			$fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count());
 		}
@@ -134,27 +137,31 @@ 
 	 */
 	public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) {
 		$message=new HtmlMessage($identifier, $content);
-		if (isset($header))
-			$message->addHeader($header);
-		if (isset($icon))
-			$message->setIcon($icon);
-		if (isset($type))
-			$message->setStyle($type);
+		if (isset($header)) {
+					$message->addHeader($header);
+		}
+		if (isset($icon)) {
+					$message->setIcon($icon);
+		}
+		if (isset($type)) {
+					$message->setStyle($type);
+		}
 		return $this->addItem($message);
 	}
 
 
 
 	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(\sizeof($this->_validationParams)>0)
-			$this->setProperty("novalidate", "");
+		if(\sizeof($this->_validationParams)>0) {
+					$this->setProperty("novalidate", "");
+		}
 		return parent::compile($js,$view);
 	}
 
 	public function run(JsUtils $js) {
 		if(isset($js)){
 			$compo=$js->semantic()->form("#".$this->identifier);
-		}else{
+		} else{
 			$compo=new Form();
 			$compo->attach("#".$this->identifier);
 		}
@@ -167,8 +174,9 @@ 
 			if($field instanceof HtmlFormFields){
 				$items=$field->getItems();
 				foreach ($items as $_field){
-					if($_field instanceof HtmlFormField)
-						$compo=$this->addCompoValidation($compo, $_field);
+					if($_field instanceof HtmlFormField) {
+											$compo=$this->addCompoValidation($compo, $_field);
+					}
 				}
 			}
 		}

Spacing +24 added lines, -24 removed lines

@@ -20,7 +20,7 @@ 
  */
 class HtmlForm extends HtmlSemCollection {
 
-	use FieldsTrait,FormTrait;
+	use FieldsTrait, FormTrait;
 	/**
 	 * @var array
 	 */
@@ -33,14 +33,14 @@ 
 
 	public function __construct($identifier, $elements=array()) {
 		parent::__construct($identifier, "form", "ui form");
-		$this->_states=[ State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED ];
+		$this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED];
 		$this->setProperty("name", $this->identifier);
-		$this->_fields=array ();
+		$this->_fields=array();
 		$this->addItems($elements);
 		$this->_validationParams=[];
 	}
 
-	protected function getForm(){
+	protected function getForm() {
 		return $this;
 	}
 
@@ -62,8 +62,8 @@ 
 	 * @param string $caption
 	 * @return HtmlForm
 	 */
-	public function addDivider($caption=NULL){
-		return $this->addContent(new HtmlDivider("",$caption));
+	public function addDivider($caption=NULL) {
+		return $this->addContent(new HtmlDivider("", $caption));
 	}
 
 	/**
@@ -85,12 +85,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;
@@ -98,7 +98,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;
@@ -156,39 +156,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;
 	}
 
@@ -201,7 +201,7 @@ 
 		return $this->_validationParams;
 	}
 
-	public function removeValidationParam($param){
+	public function removeValidationParam($param) {
 		unset($this->_validationParams[$param]);
 		return $this;
 	}

Ajax/service/Javascript.php

Spacing +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
 	public static $preventDefault="\nif(event && event.preventDefault) event.preventDefault();\n";
 	public static $stopPropagation="\nif(event && event.stopPropagation) event.stopPropagation();\n";
 
-	public static function containsCode($expression){
-		return strrpos($expression, 'this')!==false||strrpos($expression, 'event')!==false||strrpos($expression, 'self')!==false;
+	public static function containsCode($expression) {
+		return strrpos($expression, 'this')!==false || strrpos($expression, 'event')!==false || strrpos($expression, 'self')!==false;
 	}
 
 	/**

Ajax/common/html/HtmlSingleElement.php

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
 	}
 
 	public function setClass($classNames) {
-		if(\is_array($classNames)){
+		if (\is_array($classNames)) {
 			$classNames=implode(" ", $classNames);
 		}
 		$this->setProperty("class", $classNames);
@@ -21,7 +21,7 @@ 
 	}
 
 	public function addClass($classNames) {
-		if(\is_array($classNames)){
+		if (\is_array($classNames)) {
 			$classNames=implode(" ", $classNames);
 		}
 		$this->addToProperty("class", $classNames);
@@ -52,7 +52,7 @@ 
 	 */
 	public function fromArray($array) {
 		$array=parent::fromArray($array);
-		foreach ( $array as $key => $value ) {
+		foreach ($array as $key => $value) {
 			$this->setProperty($key, $value);
 		}
 		return $array;

Ajax/common/html/BaseHtml.php

Braces +12 added lines, -8 removed lines

@@ -99,15 +99,18 @@ 
 			$flag=false;
 			$index=0;
 			while ( !$flag && $index < sizeof($elements) ) {
-				if ($elements[$index] instanceof BaseHtml)
-					$flag=($callback($elements[$index]));
+				if ($elements[$index] instanceof BaseHtml) {
+									$flag=($callback($elements[$index]));
+				}
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag === true) {
+							return $elements[$index - 1];
+			}
 		} elseif ($elements instanceof BaseHtml) {
-			if ($callback($elements))
-				return $elements;
+			if ($callback($elements)) {
+							return $elements;
+			}
 		}
 		return null;
 	}
@@ -140,8 +143,9 @@ 
 
 	public function fromArray($array) {
 		foreach ( $this as $key => $value ) {
-			if(array_key_exists($key, $array)===true)
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+			if(array_key_exists($key, $array)===true) {
+							$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+			}
 		}
 		foreach ( $array as $key => $value ) {
 			if($this->_callSetter($key, $key, $value, $array)===false){

Doc Comments +17 added lines

@@ -63,6 +63,10 @@ 
 
 
 
+	/**
+	 * @param string $name
+	 * @param string[] $typeCtrl
+	 */
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
 		if ($this->ctrl($name, $value, $typeCtrl) === true) {
 			return $name=$value;
@@ -80,6 +84,10 @@ 
 
 
 
+	/**
+	 * @param string $name
+	 * @param string[] $typeCtrl
+	 */
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
 		if ($this->ctrl($name, $value, $typeCtrl) === true) {
 			if (\is_array($typeCtrl)) {
@@ -90,6 +98,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	protected function addToMember(&$name, $value, $separator=" ") {
 		$name=str_ireplace($value, "", $name) . $separator . $value;
 		return $this;
@@ -102,6 +113,9 @@ 
 		$oldValue=trim($oldValue);
 	}
 
+	/**
+	 * @param \Closure $callback
+	 */
 	protected function _getElementBy($callback,$elements){
 		if (\is_array($elements)) {
 			$elements=\array_values($elements);
@@ -183,6 +197,9 @@ 
 		return $this->_bsComponent;
 	}
 
+	/**
+	 * @param \Ajax\semantic\components\Form $bsComponent
+	 */
 	public function setBsComponent($bsComponent) {
 		$this->_bsComponent=$bsComponent;
 		return $this;

Spacing +39 added lines, -39 removed lines

@@ -15,11 +15,11 @@ 
  * @version 1.3
  */
 abstract class BaseHtml extends BaseWidget {
-	use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait;
+	use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait;
 	protected $_template;
 	protected $tagName;
-	protected $_wrapBefore=array ();
-	protected $_wrapAfter=array ();
+	protected $_wrapBefore=array();
+	protected $_wrapAfter=array();
 	protected $_bsComponent;
 	protected $_compiled=false;
 	protected $_postCompile;
@@ -32,14 +32,14 @@ 
 	 */
 	abstract public function run(JsUtils $js);
 
-	private function _callSetter($setter,$key,$value,&$array){
+	private function _callSetter($setter, $key, $value, &$array) {
 		$result=false;
 		if (method_exists($this, $setter) && !JString::startswith($key, "_")) {
 			try {
 				$this->$setter($value);
 				unset($array[$key]);
 				$result=true;
-			} catch ( \Exception $e ) {
+			}catch (\Exception $e) {
 				$result=false;
 			}
 		}
@@ -47,17 +47,17 @@ 
 	}
 
 	protected function getTemplate(JsUtils $js=NULL) {
-		return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js);
+		return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js);
 	}
 
 	protected function ctrl($name, $value, $typeCtrl) {
 		if (\is_array($typeCtrl)) {
-			if (array_search($value, $typeCtrl) === false) {
-				throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}");
+			if (array_search($value, $typeCtrl)===false) {
+				throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
 			}
 		} else {
 			if (!$typeCtrl($value)) {
-				throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name);
+				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
 			}
 		}
 		return true;
@@ -66,7 +66,7 @@ 
 
 
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			return $name=$value;
 		}
 		return $this;
@@ -75,7 +75,7 @@ 
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
@@ -83,17 +83,17 @@ 
 
 
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			if (\is_array($typeCtrl)) {
 				$this->removeOldValues($name, $typeCtrl);
 			}
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
 
 	protected function addToMember(&$name, $value, $separator=" ") {
-		$name=str_ireplace($value, "", $name) . $separator . $value;
+		$name=str_ireplace($value, "", $name).$separator.$value;
 		return $this;
 	}
 
@@ -104,18 +104,18 @@ 
 		$oldValue=trim($oldValue);
 	}
 
-	protected function _getElementBy($callback,$elements){
+	protected function _getElementBy($callback, $elements) {
 		if (\is_array($elements)) {
 			$elements=\array_values($elements);
 			$flag=false;
 			$index=0;
-			while ( !$flag && $index < sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
 					$flag=($callback($elements[$index]));
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag===true)
+				return $elements[$index-1];
 		} elseif ($elements instanceof BaseHtml) {
 			if ($callback($elements))
 				return $elements;
@@ -143,13 +143,13 @@ 
 	}
 
 	public function fromArray($array) {
-		foreach ( $this as $key => $value ) {
-			if(array_key_exists($key, $array)===true)
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+		foreach ($this as $key => $value) {
+			if (array_key_exists($key, $array)===true)
+				$this->_callSetter("set".ucfirst($key), $key, $array[$key], $array);
 		}
-		foreach ( $array as $key => $value ) {
-			if($this->_callSetter($key, $key, $value, $array)===false){
-				$this->_callSetter("set" . ucfirst($key), $key, $value, $array);
+		foreach ($array as $key => $value) {
+			if ($this->_callSetter($key, $key, $value, $array)===false) {
+				$this->_callSetter("set".ucfirst($key), $key, $value, $array);
 			}
 		}
 		return $array;
@@ -157,7 +157,7 @@ 
 
 	public function fromDatabaseObjects($objects, $function) {
 		if (isset($objects)) {
-			foreach ( $objects as $object ) {
+			foreach ($objects as $object) {
 				$this->fromDatabaseObject($object, $function);
 			}
 		}
@@ -178,7 +178,7 @@ 
 
 
 	public function getElementById($identifier, $elements) {
-		return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements);
+		return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements);
 	}
 
 	public function getBsComponent() {
@@ -191,14 +191,14 @@ 
 	}
 
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
-		if(!$this->_compiled){
-			if(isset($js)){
+		if (!$this->_compiled) {
+			if (isset($js)) {
 				$beforeCompile=$js->getParam("beforeCompileHtml");
-				if(\is_callable($beforeCompile)){
-					$beforeCompile($this,$js,$view);
+				if (\is_callable($beforeCompile)) {
+					$beforeCompile($this, $js, $view);
 				}
 			}
-			if(\is_callable($this->_preCompile)){
+			if (\is_callable($this->_preCompile)) {
 				$pc=$this->_preCompile;
 				$pc($this);
 			}
@@ -207,26 +207,26 @@ 
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		$this->compile_once($js,$view);
+		$this->compile_once($js, $view);
 		$result=$this->getTemplate($js);
-		foreach ( $this as $key => $value ) {
-			if (JString::startswith($key, "_") === false && $key !== "events") {
+		foreach ($this as $key => $value) {
+			if (JString::startswith($key, "_")===false && $key!=="events") {
 				if (\is_array($value)) {
 					$v=PropertyWrapper::wrap($value, $js);
 				} else {
 					$v=$value;
 				}
-				$result=str_ireplace("%" . $key . "%", $v, $result);
+				$result=str_ireplace("%".$key."%", $v, $result);
 			}
 		}
 		if (isset($js)===true) {
 			$this->run($js);
-			if (isset($view) === true) {
+			if (isset($view)===true) {
 				$js->addViewElement($this->_identifier, $result, $view);
 			}
 		}
 
-		if(\is_callable($this->_postCompile)){
+		if (\is_callable($this->_postCompile)) {
 			$pc=$this->_postCompile;
 			$pc($this);
 		}
@@ -237,11 +237,11 @@ 
 		return $this->compile();
 	}
 
-	public function onPostCompile($callback){
+	public function onPostCompile($callback) {
 		$this->_postCompile=$callback;
 	}
 
-	public function onPreCompile($callback){
+	public function onPreCompile($callback) {
 		$this->_preCompile=$callback;
 	}
 }

Ajax/bootstrap/html/HtmlButtongroups.php

Doc Comments +6 added lines

@@ -53,6 +53,9 @@ 
 			$element->setStyle($value);
 	}
 
+	/**
+	 * @param HtmlDropdown $bt
+	 */
 	private function dropdownAsButton($bt) {
 		$this->addExistingDropDown($bt);
 		$bt->setTagName("button");
@@ -81,6 +84,9 @@ 
 		return $result;
 	}
 
+	/**
+	 * @param integer $iid
+	 */
 	private function _addArrayElement(array $element,$iid){
 		if (array_key_exists("glyph", $element))
 			$bt=new HtmlGlyphButton($this->identifier."-button-".$iid);

Spacing +12 added lines, -12 removed lines

@@ -39,7 +39,7 @@ 
 	 * @return HtmlButtongroups default : ""
 	 */
 	public function setSize($size) {
-		foreach ( $this->elements as $element ) {
+		foreach ($this->elements as $element) {
 			$element->setSize($size);
 		}
 		if (is_int($size)) {
@@ -49,7 +49,7 @@ 
 	}
 
 	public function setStyle($value) {
-		foreach ( $this->elements as $element )
+		foreach ($this->elements as $element)
 			$element->setStyle($value);
 	}
 
@@ -69,29 +69,29 @@ 
 	public function addElement($element) {
 		$result=$element;
 		$iid=sizeof($this->elements)+1;
-		if (($element instanceof HtmlDropdown)||($element instanceof HtmlSplitbutton)) {
+		if (($element instanceof HtmlDropdown) || ($element instanceof HtmlSplitbutton)) {
 			$this->addExistingDropDown($element);
 		} elseif (\is_array($element)) {
-			$result=$this->_addArrayElement($element,$iid);
+			$result=$this->_addArrayElement($element, $iid);
 		} elseif (is_string($element)) {
-			$result=new HtmlButton($this->identifier."-button-".$iid,$element);
+			$result=new HtmlButton($this->identifier."-button-".$iid, $element);
 		}
-		if($result instanceof HtmlButton)
+		if ($result instanceof HtmlButton)
 			$this->elements[]=$result;
 		return $result;
 	}
 
-	private function _addArrayElement(array $element,$iid){
+	private function _addArrayElement(array $element, $iid) {
 		if (array_key_exists("glyph", $element))
 			$bt=new HtmlGlyphButton($this->identifier."-button-".$iid);
 		elseif (array_key_exists("btnCaption", $element)) {
 			if (array_key_exists("split", $element))
 				$bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid);
-			else{
+			else {
 				$bt=new HtmlDropdown($this->identifier."-dropdown-".$iid);
 				$this->dropdownAsButton($bt);
 			}
-		} else{
+		} else {
 			$bt=new HtmlButton($this->identifier."-button-".$iid);
 			$bt->fromArray($element);
 		}
@@ -99,7 +99,7 @@ 
 	}
 
 	public function addElements($elements) {
-		foreach ( $elements as $element ) {
+		foreach ($elements as $element) {
 			$this->addElement($element);
 		}
 		return $this;
@@ -119,7 +119,7 @@ 
 		} else
 			$value="btn-group-".$value;
 		if (strstr($value, "justified")) {
-			foreach ( $this->elements as $element ) {
+			foreach ($this->elements as $element) {
 				$element->wrap('<div class="btn-group" role="group">', '</div>');
 			}
 		}
@@ -150,7 +150,7 @@ 
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
 	 */
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		foreach ( $this->elements as $element ) {
+		foreach ($this->elements as $element) {
 			$element->on($event, $jsCode, $stopPropagation, $preventDefault);
 		}
 		return $this;

Braces +18 added lines, -15 removed lines

@@ -49,8 +49,9 @@ 
 	}
 
 	public function setStyle($value) {
-		foreach ( $this->elements as $element )
-			$element->setStyle($value);
+		foreach ( $this->elements as $element ) {
+					$element->setStyle($value);
+		}
 	}
 
 	private function dropdownAsButton($bt) {
@@ -76,18 +77,19 @@ 
 		} elseif (is_string($element)) {
 			$result=new HtmlButton($this->identifier."-button-".$iid,$element);
 		}
-		if($result instanceof HtmlButton)
-			$this->elements[]=$result;
+		if($result instanceof HtmlButton) {
+					$this->elements[]=$result;
+		}
 		return $result;
 	}
 
 	private function _addArrayElement(array $element,$iid){
-		if (array_key_exists("glyph", $element))
-			$bt=new HtmlGlyphButton($this->identifier."-button-".$iid);
-		elseif (array_key_exists("btnCaption", $element)) {
-			if (array_key_exists("split", $element))
-				$bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid);
-			else{
+		if (array_key_exists("glyph", $element)) {
+					$bt=new HtmlGlyphButton($this->identifier."-button-".$iid);
+		} elseif (array_key_exists("btnCaption", $element)) {
+			if (array_key_exists("split", $element)) {
+							$bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid);
+			} else{
 				$bt=new HtmlDropdown($this->identifier."-dropdown-".$iid);
 				$this->dropdownAsButton($bt);
 			}
@@ -116,8 +118,9 @@ 
 	public function setAlignment($value) {
 		if (is_int($value)) {
 			$value=CssRef::alignment("btn-group")[$value];
-		} else
-			$value="btn-group-".$value;
+		} else {
+					$value="btn-group-".$value;
+		}
 		if (strstr($value, "justified")) {
 			foreach ( $this->elements as $element ) {
 				$element->wrap('<div class="btn-group" role="group">', '</div>');
@@ -132,9 +135,9 @@ 
 	 * @return HtmlButton
 	 */
 	public function getElement($index) {
-		if (is_int($index))
-			return $this->elements[$index];
-		else {
+		if (is_int($index)) {
+					return $this->elements[$index];
+		} else {
 			$elm=$this->getElementById($index, $this->elements);
 			return $elm;
 		}