phpMv / phpMv-UI

Ajax/common/components/SimpleComponent.php

Spacing +10 added lines, -10 removed lines

@@ -18,27 +18,27 @@ 
 
 	public function __construct(JsUtils $js=NULL) {
 		parent::__construct($js);
-		$this->events=array ();
+		$this->events=array();
 	}
 
 	protected function compileEvents() {
-		foreach ( $this->events as $event => $jsCode ) {
+		foreach ($this->events as $event => $jsCode) {
 			$itemSelector=JString::getValueBetween($event);
-			if($event=="execute"){
+			if ($event=="execute") {
 				$this->jquery_code_for_compile []=$jsCode;
-			}else if($event=="beforeExecute"){
+			} else if ($event=="beforeExecute") {
 				\array_unshift($this->jquery_code_for_compile, $jsCode);
-			}else{
+			} else {
 				$selector=$this->_createSelector($itemSelector, $this->attachTo);
 				$this->jquery_code_for_compile []="$( \"".$selector."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});";
 			}
 		}
 	}
 
-	protected function _createSelector($itemSelector,$selector){
-		if(!isset($itemSelector))
+	protected function _createSelector($itemSelector, $selector) {
+		if (!isset($itemSelector))
 			$itemSelector=$this->itemSelector;
-		if(isset($itemSelector) && $itemSelector!=="")
+		if (isset($itemSelector) && $itemSelector!=="")
 			$selector.=" ".$itemSelector;
 		return $selector;
 	}
@@ -47,7 +47,7 @@ 
 		$result=implode("\n", $this->jquery_code_for_compile);
 		$result=str_ireplace("\"%", "", $result);
 		$result=str_ireplace("%\"", "", $result);
-		$result=str_replace(array (
+		$result=str_replace(array(
 				"\\n",
 				"\\r",
 				"\\t"
@@ -57,7 +57,7 @@ 
 
 	public function getScript() {
 		$allParams=$this->params;
-		$this->jquery_code_for_compile=array ();
+		$this->jquery_code_for_compile=array();
 		$this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).");";
 		$this->compileEvents();
 		return $this->compileJQueryCode();

Braces +11 added lines, -8 removed lines

@@ -26,9 +26,9 @@ 
 			$itemSelector=JString::getValueBetween($event);
 			if($event=="execute"){
 				$this->jquery_code_for_compile []=$jsCode;
-			}else if($event=="beforeExecute"){
+			} else if($event=="beforeExecute"){
 				\array_unshift($this->jquery_code_for_compile, $jsCode);
-			}else{
+			} else{
 				$selector=$this->_createSelector($itemSelector, $this->attachTo);
 				$this->jquery_code_for_compile []="$( \"".$selector."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});";
 			}
@@ -36,10 +36,12 @@ 
 	}
 
 	protected function _createSelector($itemSelector,$selector){
-		if(!isset($itemSelector))
-			$itemSelector=$this->itemSelector;
-		if(isset($itemSelector) && $itemSelector!=="")
-			$selector.=" ".$itemSelector;
+		if(!isset($itemSelector)) {
+					$itemSelector=$this->itemSelector;
+		}
+		if(isset($itemSelector) && $itemSelector!=="") {
+					$selector.=" ".$itemSelector;
+		}
 		return $selector;
 	}
 
@@ -82,8 +84,9 @@ 
 
 	protected function setParamCtrl($key, $value, $typeCtrl) {
 		if (\is_array($typeCtrl)) {
-			if (array_search($value, $typeCtrl)===false)
-				throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
+			if (array_search($value, $typeCtrl)===false) {
+							throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` 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é ".$key." au composant ".$this->uiName);

Ajax/semantic/widgets/base/InstanceViewer.php

Braces +42 added lines, -36 removed lines

@@ -23,8 +23,9 @@ 
 		$this->widgetIdentifier=$identifier;
 		$this->values=[];
 		$this->afterCompile=[];
-		if(isset($instance))
-			$this->setInstance($instance);
+		if(isset($instance)) {
+					$this->setInstance($instance);
+		}
 		$this->setCaptions($captions);
 		$this->captionCallback=NULL;
 		$this->defaultValueFunction=function($name,$value){return $value;};
@@ -62,14 +63,16 @@ 
 	}
 
 	public function getIdentifier($index=NULL){
-		if(!isset($index))
-			$index=self::$index;
+		if(!isset($index)) {
+					$index=self::$index;
+		}
 		$value=$index;
 		if(isset($this->values["identifier"])){
-			if(\is_string($this->values["identifier"]))
-				$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
-			else
-				$value=$this->values["identifier"]($index,$this->instance);
+			if(\is_string($this->values["identifier"])) {
+							$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
+			} else {
+							$value=$this->values["identifier"]($index,$this->instance);
+			}
 		}
 		return $value;
 	}
@@ -99,16 +102,16 @@ 
 		if($property instanceof \ReflectionProperty){
 			$value=$this->_getPropertyValue($property, $index);
 			$propertyName=$property->getName();
-		}elseif(\is_callable($property))
-			$value=$property($this->instance);
-		elseif(\is_array($property)){
+		} elseif(\is_callable($property)) {
+					$value=$property($this->instance);
+		} elseif(\is_array($property)){
 			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
 			$value=\implode("", $values);
-		}elseif(\is_string($property)){
+		} elseif(\is_string($property)){
 			$value=$property;
 			if(isset($this->instance->{$property})){
 				$value=$this->instance->{$property};
-			}elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
+			} elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
 				$value=JReflection::callMethod($this->instance, $getter, []);
 			}
 		}
@@ -118,7 +121,7 @@ 
 	protected function _postGetValue($index,$propertyName,$value){
 		if(isset($this->values[$index])){
 			$value= $this->values[$index]($value,$this->instance,$index);
-		}else{
+		} else{
 			$value=$this->_getDefaultValue($propertyName,$value, $index);
 		}
 		if(isset($this->afterCompile[$index])){
@@ -139,10 +142,10 @@ 
 		if(isset($vb[$index])){
 			if(\is_array($vb[$index])){
 				$this->visibleProperties[$index][]=$field;
-			}else{
+			} else{
 				$this->visibleProperties[$index]=[$vb[$index],$field];
 			}
-		}else{
+		} else{
 			return $this->insertField($index, $field);
 		}
 		return $this;
@@ -169,9 +172,9 @@ 
 		$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=$property;
 		}
 		return $result;
@@ -191,7 +194,7 @@ 
 		$this->reflect=new \ReflectionClass($instance);
 		if(\sizeof($this->visibleProperties)===0){
 			$this->properties=$this->getDefaultProperties();
-		}else{
+		} else{
 			foreach ($this->visibleProperties as $property){
 				$this->setInstanceProperty($property);
 			}
@@ -202,22 +205,23 @@ 
 	private function setInstanceProperty($property){
 		if(\is_callable($property)){
 			$this->properties[]=$property;
-		}elseif(\is_string($property)){
+		} elseif(\is_string($property)){
 			try{
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$rProperty=$this->reflect->getProperty($property);
 				$this->properties[]=$rProperty;
-			}catch(\Exception $e){
+			} catch(\Exception $e){
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$this->properties[]=$property;
 			}
-		}elseif(\is_int($property)){
+		} elseif(\is_int($property)){
 			$props=$this->getDefaultProperties();
-			if(isset($props[$property]))
-				$this->properties[]=$props[$property];
-				else
-					$this->properties[]=$property;
-		}else{
+			if(isset($props[$property])) {
+							$this->properties[]=$props[$property];
+			} else {
+									$this->properties[]=$property;
+				}
+		} else{
 			$this->properties[]=$property;
 		}
 	}
@@ -261,12 +265,13 @@ 
 		if(isset($this->captions[$index])){
 			return $this->captions[$index];
 		}
-		if($this->properties[$index] instanceof \ReflectionProperty)
-			return $this->properties[$index]->getName();
-		elseif(\is_callable($this->properties[$index]))
-			return "";
-		else
-			return $this->properties[$index];
+		if($this->properties[$index] instanceof \ReflectionProperty) {
+					return $this->properties[$index]->getName();
+		} elseif(\is_callable($this->properties[$index])) {
+					return "";
+		} else {
+					return $this->properties[$index];
+		}
 	}
 
 	public function getCaptions(){
@@ -277,7 +282,7 @@ 
 			for($i=$captionsSize;$i<$count;$i++){
 				$captions[]="";
 			}
-		}else{
+		} else{
 			$captions=[];
 			$index=0;
 			while($index<$count){
@@ -292,8 +297,9 @@ 
 	}
 
 	public function setCaption($index,$caption){
-		if(isset($this->captions)===false)
-			$this->captions=[];
+		if(isset($this->captions)===false) {
+					$this->captions=[];
+		}
 		$this->captions[$index]=$caption;
 		return $this;
 	}

Spacing +91 added lines, -91 removed lines

@@ -19,220 +19,220 @@ 
 
 	public static $index=0;
 
-	public function __construct($identifier,$instance=NULL,$captions=NULL){
+	public function __construct($identifier, $instance=NULL, $captions=NULL) {
 		$this->widgetIdentifier=$identifier;
 		$this->values=[];
 		$this->afterCompile=[];
-		if(isset($instance))
+		if (isset($instance))
 			$this->setInstance($instance);
 		$this->setCaptions($captions);
 		$this->captionCallback=NULL;
-		$this->defaultValueFunction=function($name,$value){return $value;};
+		$this->defaultValueFunction=function($name, $value) {return $value; };
 	}
 
-	public function moveFieldTo($from,$to){
-		if(JArray::moveElementTo($this->visibleProperties, $from, $to)){
+	public function moveFieldTo($from, $to) {
+		if (JArray::moveElementTo($this->visibleProperties, $from, $to)) {
 			return JArray::moveElementTo($this->values, $from, $to);
 		}
 		return false;
 	}
 
-	public function swapFields($index1,$index2){
-		if(JArray::swapElements($this->visibleProperties, $index1, $index2)){
+	public function swapFields($index1, $index2) {
+		if (JArray::swapElements($this->visibleProperties, $index1, $index2)) {
 			return JArray::swapElements($this->values, $index1, $index2);
 		}
 		return false;
 	}
 
-	public function removeField($index){
-		\array_splice($this->visibleProperties,$index,1);
-		\array_splice($this->values,$index,1);
-		\array_splice($this->captions,$index,1);
+	public function removeField($index) {
+		\array_splice($this->visibleProperties, $index, 1);
+		\array_splice($this->values, $index, 1);
+		\array_splice($this->captions, $index, 1);
 		return $this;
 	}
 
-	public function getValues(){
+	public function getValues() {
 		$values=[];
 		$index=0;
 		$count=$this->count();
-		while($index<$count){
+		while ($index<$count) {
 			$values[]=$this->getValue($index++);
 		}
 		return $values;
 	}
 
-	public function getIdentifier($index=NULL){
-		if(!isset($index))
+	public function getIdentifier($index=NULL) {
+		if (!isset($index))
 			$index=self::$index;
 		$value=$index;
-		if(isset($this->values["identifier"])){
-			if(\is_string($this->values["identifier"]))
+		if (isset($this->values["identifier"])) {
+			if (\is_string($this->values["identifier"]))
 				$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
 			else
-				$value=$this->values["identifier"]($index,$this->instance);
+				$value=$this->values["identifier"]($index, $this->instance);
 		}
 		return $value;
 	}
 
-	public function getValue($index){
+	public function getValue($index) {
 		$property=$this->properties[$index];
 		return $this->_getValue($property, $index);
 	}
 
-	protected function _beforeAddProperty($index,&$field){
+	protected function _beforeAddProperty($index, &$field) {
 
 	}
 
-	protected function _getDefaultValue($name,$value,$index){
+	protected function _getDefaultValue($name, $value, $index) {
 		$func=$this->defaultValueFunction;
-		return $func($name,$value,$index,$this->instance);
+		return $func($name, $value, $index, $this->instance);
 	}
 
-	protected function _getPropertyValue(\ReflectionProperty $property,$index){
+	protected function _getPropertyValue(\ReflectionProperty $property, $index) {
 		$property->setAccessible(true);
 		return $property->getValue($this->instance);
 	}
 
-	protected function _getValue($property,$index){
+	protected function _getValue($property, $index) {
 		$value=null;
 		$propertyName=$property;
-		if($property instanceof \ReflectionProperty){
+		if ($property instanceof \ReflectionProperty) {
 			$value=$this->_getPropertyValue($property, $index);
 			$propertyName=$property->getName();
-		}elseif(\is_callable($property))
+		}elseif (\is_callable($property))
 			$value=$property($this->instance);
-		elseif(\is_array($property)){
-			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
+		elseif (\is_array($property)) {
+			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property);
 			$value=\implode("", $values);
-		}elseif(\is_string($property)){
+		}elseif (\is_string($property)) {
 			$value=$property;
-			if(isset($this->instance->{$property})){
+			if (isset($this->instance->{$property})) {
 				$value=$this->instance->{$property};
-			}elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
+			}elseif (\method_exists($this->instance, $getter=JReflection::getterName($property))) {
 				$value=JReflection::callMethod($this->instance, $getter, []);
 			}
 		}
 		return $this->_postGetValue($index, $propertyName, $value);
 	}
 
-	protected function _postGetValue($index,$propertyName,$value){
-		if(isset($this->values[$index])){
-			$value= $this->values[$index]($value,$this->instance,$index);
-		}else{
-			$value=$this->_getDefaultValue($propertyName,$value, $index);
+	protected function _postGetValue($index, $propertyName, $value) {
+		if (isset($this->values[$index])) {
+			$value=$this->values[$index]($value, $this->instance, $index);
+		} else {
+			$value=$this->_getDefaultValue($propertyName, $value, $index);
 		}
-		if(isset($this->afterCompile[$index])){
-			if(\is_callable($this->afterCompile[$index])){
-				$this->afterCompile[$index]($value,$this->instance,$index);
+		if (isset($this->afterCompile[$index])) {
+			if (\is_callable($this->afterCompile[$index])) {
+				$this->afterCompile[$index]($value, $this->instance, $index);
 			}
 		}
 		return $value;
 	}
 
-	public function insertField($index,$field){
-		array_splice( $this->visibleProperties, $index, 0, $field );
+	public function insertField($index, $field) {
+		array_splice($this->visibleProperties, $index, 0, $field);
 		return $this;
 	}
 
-	public function insertInField($index,$field){
+	public function insertInField($index, $field) {
 		$vb=$this->visibleProperties;
-		if(isset($vb[$index])){
-			if(\is_array($vb[$index])){
+		if (isset($vb[$index])) {
+			if (\is_array($vb[$index])) {
 				$this->visibleProperties[$index][]=$field;
-			}else{
-				$this->visibleProperties[$index]=[$vb[$index],$field];
+			} else {
+				$this->visibleProperties[$index]=[$vb[$index], $field];
 			}
-		}else{
+		} else {
 			return $this->insertField($index, $field);
 		}
 		return $this;
 	}
 
-	public function addField($field){
+	public function addField($field) {
 		$this->visibleProperties[]=$field;
 		return $this;
 	}
 
-	public function addFields($fields){
-		$this->visibleProperties=\array_merge($this->visibleProperties,$fields);
+	public function addFields($fields) {
+		$this->visibleProperties=\array_merge($this->visibleProperties, $fields);
 		return $this;
 	}
 
-	public function count(){
+	public function count() {
 		return \sizeof($this->properties);
 	}
 
-	public function visiblePropertiesCount(){
+	public function visiblePropertiesCount() {
 		return \sizeof($this->visibleProperties);
 	}
 
-	public function getProperty($index){
+	public function getProperty($index) {
 		return $this->properties[$index];
 	}
 
-	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;
 	}
 
 
-	protected function showableProperty(\ReflectionProperty $rProperty){
-		return JString::startswith($rProperty->getName(),"_")===false;
+	protected function showableProperty(\ReflectionProperty $rProperty) {
+		return JString::startswith($rProperty->getName(), "_")===false;
 	}
 
 	public function setInstance($instance) {
-		if(\is_string($instance)){
+		if (\is_string($instance)) {
 			$instance=new $instance();
 		}
 		$this->instance=$instance;
 		$this->properties=[];
 		$this->reflect=new \ReflectionClass($instance);
-		if(\sizeof($this->visibleProperties)===0){
+		if (\sizeof($this->visibleProperties)===0) {
 			$this->properties=$this->getDefaultProperties();
-		}else{
-			foreach ($this->visibleProperties as $property){
+		} else {
+			foreach ($this->visibleProperties as $property) {
 				$this->setInstanceProperty($property);
 			}
 		}
 		return $this;
 	}
 
-	private function setInstanceProperty($property){
-		if(\is_callable($property)){
+	private function setInstanceProperty($property) {
+		if (\is_callable($property)) {
 			$this->properties[]=$property;
-		}elseif(\is_string($property)){
-			try{
+		}elseif (\is_string($property)) {
+			try {
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$rProperty=$this->reflect->getProperty($property);
 				$this->properties[]=$rProperty;
-			}catch(\Exception $e){
+			}catch (\Exception $e) {
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$this->properties[]=$property;
 			}
-		}elseif(\is_int($property)){
+		}elseif (\is_int($property)) {
 			$props=$this->getDefaultProperties();
-			if(isset($props[$property]))
+			if (isset($props[$property]))
 				$this->properties[]=$props[$property];
 				else
 					$this->properties[]=$property;
-		}else{
+		} else {
 			$this->properties[]=$property;
 		}
 	}
 
-	protected function getDefaultProperties(){
+	protected function getDefaultProperties() {
 		$result=[];
 		$properties=$this->reflect->getProperties();
-		foreach ($properties as $property){
+		foreach ($properties as $property) {
 			$showable=$this->showableProperty($property);
-			if($showable!==false){
+			if ($showable!==false) {
 				$result[]=$property;
 			}
 		}
@@ -244,12 +244,12 @@ 
 		return $this;
 	}
 
-	public function setValueFunction($index,$callback){
+	public function setValueFunction($index, $callback) {
 		$this->values[$index]=$callback;
 		return $this;
 	}
 
-	public function setIdentifierFunction($callback){
+	public function setIdentifierFunction($callback) {
 		$this->values["identifier"]=$callback;
 		return $this;
 	}
@@ -262,42 +262,42 @@ 
 		return $this->properties;
 	}
 
-	public function getCaption($index){
-		if(isset($this->captions[$index])){
+	public function getCaption($index) {
+		if (isset($this->captions[$index])) {
 			return $this->captions[$index];
 		}
-		if($this->properties[$index] instanceof \ReflectionProperty)
+		if ($this->properties[$index] instanceof \ReflectionProperty)
 			return $this->properties[$index]->getName();
-		elseif(\is_callable($this->properties[$index]))
+		elseif (\is_callable($this->properties[$index]))
 			return "";
 		else
 			return $this->properties[$index];
 	}
 
-	public function getCaptions(){
+	public function getCaptions() {
 		$count=$this->count();
-		if(isset($this->captions)){
-			$captions= \array_values($this->captions);
+		if (isset($this->captions)) {
+			$captions=\array_values($this->captions);
 			$captionsSize=\sizeof($captions);
-			for($i=$captionsSize;$i<$count;$i++){
+			for ($i=$captionsSize; $i<$count; $i++) {
 				$captions[]="";
 			}
-		}else{
+		} else {
 			$captions=[];
 			$index=0;
-			while($index<$count){
+			while ($index<$count) {
 				$captions[]=$this->getCaption($index++);
 			}
 		}
-		if(isset($this->captionCallback) && \is_callable($this->captionCallback)){
+		if (isset($this->captionCallback) && \is_callable($this->captionCallback)) {
 			$callback=$this->captionCallback;
-			$callback($captions,$this->instance);
+			$callback($captions, $this->instance);
 		}
 		return $captions;
 	}
 
-	public function setCaption($index,$caption){
-		if(isset($this->captions)===false)
+	public function setCaption($index, $caption) {
+		if (isset($this->captions)===false)
 			$this->captions=[];
 		$this->captions[$index]=$caption;
 		return $this;
@@ -315,7 +315,7 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return \Ajax\semantic\widgets\datatable\InstanceViewer
 	 */
-	public function afterCompile($index,$callback){
+	public function afterCompile($index, $callback) {
 		$this->afterCompile[$index]=$callback;
 		return $this;
 	}

Doc Comments +7 added lines, -1 removed lines

@@ -244,6 +244,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param callable $callback
+	 */
 	public function setValueFunction($index,$callback){
 		$this->values[$index]=$callback;
 		return $this;
@@ -254,6 +257,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param integer $index
+	 */
 	public static function setIndex($index) {
 		self::$index=$index;
 	}
@@ -313,7 +319,7 @@ 
 	 * The $callback function can take the following arguments : $field=>the compiled field, $instance : the active instance of the object, $index: the field position
 	 * @param int $index postion of the compiled field
 	 * @param callable $callback function called after the field compilation
-	 * @return \Ajax\semantic\widgets\datatable\InstanceViewer
+	 * @return InstanceViewer
 	 */
 	public function afterCompile($index,$callback){
 		$this->afterCompile[$index]=$callback;

Ajax/semantic/components/Sticky.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 		return $this->setParam("context", $value);
 	}
 
-	public function setOffset($offset=0){
+	public function setOffset($offset=0) {
 		return $this->setParam("offset", $offset);
 	}
 }

Ajax/semantic/components/Checkbox.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 		$this->params["onUnchecked"]="%function(){".$value."}%";
 	}
 
-	public function setOnChange($value){
+	public function setOnChange($value) {
 		$this->params["onChange"]="%function(){".$value."}%";
 	}
 }

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

Spacing +6 added lines, -6 removed lines

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

Braces +6 added lines, -4 removed lines

@@ -9,16 +9,18 @@
 	use TextFieldsTrait;
 
 	public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) {
-		if(!isset($placeholder) && $type==="text")
-			$placeholder=$label;
+		if(!isset($placeholder) && $type==="text") {
+					$placeholder=$label;
+		}
 		parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label);
 		$this->_identifier=$identifier;
 	}
 
 	public function getDataField(){
 		$field= $this->getField();
-		if($field instanceof HtmlInput)
-			$field=$field->getDataField();
+		if($field instanceof HtmlInput) {
+					$field=$field->getDataField();
+		}
 		return $field;
 	}
 }

Ajax/common/html/BaseHtml.php

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 +42 added lines, -42 removed lines

@@ -14,11 +14,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;
@@ -31,14 +31,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) && substr($setter, 0, 1) !== "_") {
+		if (method_exists($this, $setter) && substr($setter, 0, 1)!=="_") {
 			try {
 				$this->$setter($value);
 				unset($array[$key]);
 				$result=true;
-			} catch ( \Exception $e ) {
+			}catch (\Exception $e) {
 				$result=false;
 			}
 		}
@@ -46,17 +46,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;
@@ -65,7 +65,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;
@@ -74,7 +74,7 @@ 
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
@@ -82,17 +82,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;
 	}
 
@@ -103,18 +103,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;
@@ -142,13 +142,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;
@@ -156,7 +156,7 @@ 
 
 	public function fromDatabaseObjects($objects, $function) {
 		if (isset($objects)) {
-			foreach ( $objects as $object ) {
+			foreach ($objects as $object) {
 				$this->fromDatabaseObject($object, $function);
 			}
 		}
@@ -177,7 +177,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() {
@@ -190,14 +190,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,15 +207,15 @@ 
 	}
 
 	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(\strstr($result, "%{$key}%")!==false){
+		foreach ($this as $key => $value) {
+				if (\strstr($result, "%{$key}%")!==false) {
 					if (\is_array($value)) {
 						$v=PropertyWrapper::wrap($value, $js);
-					}elseif($value instanceof \stdClass){
-							$v=\print_r($value,true);
-					}else{
+					}elseif ($value instanceof \stdClass) {
+							$v=\print_r($value, true);
+					} else {
 						$v=$value;
 					}
 					$result=str_replace("%{$key}%", $v, $result);
@@ -223,12 +223,12 @@ 
 		}
 		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);
 		}
@@ -239,11 +239,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;
 	}
 }

Braces +14 added lines, -10 removed lines

@@ -109,15 +109,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;
 	}
@@ -143,8 +146,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){
@@ -213,9 +217,9 @@ 
 				if(\strstr($result, "%{$key}%")!==false){
 					if (\is_array($value)) {
 						$v=PropertyWrapper::wrap($value, $js);
-					}elseif($value instanceof \stdClass){
+					} elseif($value instanceof \stdClass){
 							$v=\print_r($value,true);
-					}else{
+					} else{
 						$v=$value;
 					}
 					$result=str_replace("%{$key}%", $v, $result);

Ajax/ui/components/Autocomplete.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 	 * @return $this
 	 */
 	public function setSource($source) {
-		$source=str_ireplace(array (
+		$source=str_ireplace(array(
 				"\"",
 				"'"
 		), "%quote%", $source);

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

Spacing +27 added lines, -27 removed lines

@@ -15,8 +15,8 @@ 
  * @property HtmlSemDoubleElement $_self
  */
 trait BaseTrait {
-	protected $_variations=[ ];
-	protected $_states=[ ];
+	protected $_variations=[];
+	protected $_states=[];
 	protected $_baseClass;
 
 	abstract protected function setPropertyCtrl($name, $value, $typeCtrl);
@@ -29,7 +29,7 @@ 
 
 	abstract public function setProperty($name, $value);
 
-	abstract public function addContent($content,$before=false);
+	abstract public function addContent($content, $before=false);
 
 	abstract public function onCreate($jsCode);
 
@@ -50,7 +50,7 @@ 
 		$this->_self->setProperty("class", $this->_self->getBaseClass());
 		if (\is_string($variations))
 			$variations=\explode(" ", $variations);
-		foreach ( $variations as $variation ) {
+		foreach ($variations as $variation) {
 			$this->_self->addVariation($variation);
 		}
 		return $this;
@@ -64,7 +64,7 @@ 
 	public function addVariations($variations=array()) {
 		if (\is_string($variations))
 			$variations=\explode(" ", $variations);
-		foreach ( $variations as $variation ) {
+		foreach ($variations as $variation) {
 			$this->_self->addVariation($variation);
 		}
 		return $this;
@@ -73,7 +73,7 @@ 
 	public function addStates($states=array()) {
 		if (\is_string($states))
 			$states=\explode(" ", $states);
-		foreach ( $states as $state ) {
+		foreach ($states as $state) {
 			$this->_self->addState($state);
 		}
 		return $this;
@@ -83,17 +83,17 @@ 
 		$this->_self->setProperty("class", $this->_self->getBaseClass());
 		if (\is_string($states))
 			$states=\explode(" ", $states);
-		foreach ( $states as $state ) {
+		foreach ($states as $state) {
 			$this->_self->addState($state);
 		}
 		return $this;
 	}
 
 	public function addIcon($icon, $before=true) {
-		return $this->_self->addContent(new HtmlIcon("icon-" . $this->_self->getIdentifier(), $icon), $before);
+		return $this->_self->addContent(new HtmlIcon("icon-".$this->_self->getIdentifier(), $icon), $before);
 	}
 
-	public function addSticky($context="body"){
+	public function addSticky($context="body") {
 		$this->_self->onCreate("$('#".$this->_self->getIdentifier()."').sticky({ context: '".$context."'});");
 		return $this;
 	}
@@ -114,7 +114,7 @@ 
 	 * @return HtmlSemDoubleElement
 	 */
 	public function setDisabled($disable=true) {
-		if($disable)
+		if ($disable)
 			$this->_self->addToProperty("class", "disabled");
 		return $this;
 	}
@@ -140,7 +140,7 @@ 
 	 *
 	 * @return HtmlSemDoubleElement
 	 */
-	public function asHeader(){
+	public function asHeader() {
 		return $this->_self->addToProperty("class", "header");
 	}
 
@@ -148,15 +148,15 @@ 
 	 * show it is currently the active user selection
 	 * @return HtmlSemDoubleElement
 	 */
-	public function setActive($value=true){
-		if($value)
+	public function setActive($value=true) {
+		if ($value)
 			$this->_self->addToProperty("class", "active");
 		return $this;
 	}
 
-	public function setAttached($value=true){
-		if($value)
-			$this->_self->addToPropertyCtrl("class", "attached", array ("attached" ));
+	public function setAttached($value=true) {
+		if ($value)
+			$this->_self->addToPropertyCtrl("class", "attached", array("attached"));
 		return $this;
 	}
 
@@ -164,13 +164,13 @@ 
 	 * can be formatted to appear on dark backgrounds
 	 */
 	public function setInverted($recursive=true) {
-		if($recursive===true){
+		if ($recursive===true) {
 			$content=$this->_self->getContent();
-			if($content instanceof HtmlSemDoubleElement)
+			if ($content instanceof HtmlSemDoubleElement)
 				$content->setInverted($recursive);
-			elseif(\is_array($content) || $content instanceof \Traversable){
-				foreach ($content as $elm){
-					if($elm instanceof  HtmlSemDoubleElement){
+			elseif (\is_array($content) || $content instanceof \Traversable) {
+				foreach ($content as $elm) {
+					if ($elm instanceof  HtmlSemDoubleElement) {
 						$elm->setInverted($recursive);
 					}
 				}
@@ -184,7 +184,7 @@ 
 	}
 
 	public function setFloated($direction="right") {
-		return $this->_self->addToPropertyCtrl("class", $direction . " floated", Direction::getConstantValues("floated"));
+		return $this->_self->addToPropertyCtrl("class", $direction." floated", Direction::getConstantValues("floated"));
 	}
 
 	public function floatRight() {
@@ -199,14 +199,14 @@ 
 		return $this->_baseClass;
 	}
 
-	protected function addBehavior(&$array,$key,$value,$before="",$after=""){
-		if(\is_string($value)){
-			if(isset($array[$key])){
+	protected function addBehavior(&$array, $key, $value, $before="", $after="") {
+		if (\is_string($value)) {
+			if (isset($array[$key])) {
 				$p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, "");
 				$array[$key]=$before.$p.$value.$after;
-			}else
+			} else
 				$array[$key]=$before.$value.$after;
-		}else{
+		} else {
 			$array[$key]=$value;
 		}
 		return $this;

Braces +28 added lines, -20 removed lines

@@ -48,8 +48,9 @@ 
 
 	public function setVariations($variations) {
 		$this->_self->setProperty("class", $this->_self->getBaseClass());
-		if (\is_string($variations))
-			$variations=\explode(" ", $variations);
+		if (\is_string($variations)) {
+					$variations=\explode(" ", $variations);
+		}
 		foreach ( $variations as $variation ) {
 			$this->_self->addVariation($variation);
 		}
@@ -62,8 +63,9 @@ 
 	}
 
 	public function addVariations($variations=array()) {
-		if (\is_string($variations))
-			$variations=\explode(" ", $variations);
+		if (\is_string($variations)) {
+					$variations=\explode(" ", $variations);
+		}
 		foreach ( $variations as $variation ) {
 			$this->_self->addVariation($variation);
 		}
@@ -71,8 +73,9 @@ 
 	}
 
 	public function addStates($states=array()) {
-		if (\is_string($states))
-			$states=\explode(" ", $states);
+		if (\is_string($states)) {
+					$states=\explode(" ", $states);
+		}
 		foreach ( $states as $state ) {
 			$this->_self->addState($state);
 		}
@@ -81,8 +84,9 @@ 
 
 	public function setStates($states) {
 		$this->_self->setProperty("class", $this->_self->getBaseClass());
-		if (\is_string($states))
-			$states=\explode(" ", $states);
+		if (\is_string($states)) {
+					$states=\explode(" ", $states);
+		}
 		foreach ( $states as $state ) {
 			$this->_self->addState($state);
 		}
@@ -114,8 +118,9 @@ 
 	 * @return HtmlSemDoubleElement
 	 */
 	public function setDisabled($disable=true) {
-		if($disable)
-			$this->_self->addToProperty("class", "disabled");
+		if($disable) {
+					$this->_self->addToProperty("class", "disabled");
+		}
 		return $this;
 	}
 
@@ -149,14 +154,16 @@ 
 	 * @return HtmlSemDoubleElement
 	 */
 	public function setActive($value=true){
-		if($value)
-			$this->_self->addToProperty("class", "active");
+		if($value) {
+					$this->_self->addToProperty("class", "active");
+		}
 		return $this;
 	}
 
 	public function setAttached($value=true){
-		if($value)
-			$this->_self->addToPropertyCtrl("class", "attached", array ("attached" ));
+		if($value) {
+					$this->_self->addToPropertyCtrl("class", "attached", array ("attached" ));
+		}
 		return $this;
 	}
 
@@ -166,9 +173,9 @@ 
 	public function setInverted($recursive=true) {
 		if($recursive===true){
 			$content=$this->_self->getContent();
-			if($content instanceof HtmlSemDoubleElement)
-				$content->setInverted($recursive);
-			elseif(\is_array($content) || $content instanceof \Traversable){
+			if($content instanceof HtmlSemDoubleElement) {
+							$content->setInverted($recursive);
+			} elseif(\is_array($content) || $content instanceof \Traversable){
 				foreach ($content as $elm){
 					if($elm instanceof  HtmlSemDoubleElement){
 						$elm->setInverted($recursive);
@@ -204,9 +211,10 @@ 
 			if(isset($array[$key])){
 				$p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, "");
 				$array[$key]=$before.$p.$value.$after;
-			}else
-				$array[$key]=$before.$value.$after;
-		}else{
+			} else {
+							$array[$key]=$before.$value.$after;
+			}
+		} else{
 			$array[$key]=$value;
 		}
 		return $this;

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

Doc Comments +5 added lines

@@ -7,6 +7,11 @@
 use Ajax\common\html\HtmlDoubleElement;
 
 trait AttachedTrait {
+
+	/**
+	 * @param string $name
+	 * @param string $value
+	 */
 	abstract public function addToPropertyCtrl($name, $value, $typeCtrl);
 	/**
 	 * @param HtmlSemDoubleElement $toElement

Spacing +1 added lines, -1 removed lines

@@ -17,6 +17,6 @@
 		if (isset($toElement) && \method_exists($toElement, "setAttached")) {
 			$toElement->setAttached(true);
 		}
-		return $this->addToPropertyCtrl("class", $side . " attached", Side::getConstantValues("attached"));
+		return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached"));
 	}
 }