phpMv / phpMv-UI

Ajax/semantic/html/modules/HtmlPopup.php

Spacing +15 added lines, -15 removed lines

@@ -11,7 +11,7 @@ 
 
 class HtmlPopup extends HtmlSemDoubleElement {
 	private $_container;
-	public function __construct(BaseHtml $container,$identifier, $content="") {
+	public function __construct(BaseHtml $container, $identifier, $content="") {
 		parent::__construct($identifier, "div");
 		$this->_container=$container;
 		$this->setClass("ui popup");
@@ -19,9 +19,9 @@ 
 		$this->_params=array("on"=>"hover");
 	}
 
-	public function addList($items=array(),$header=NULL){
-		if(!$this->content instanceof HtmlGrid){
-			$this->content=new HtmlGrid("Grid-".$this->identifier,0);
+	public function addList($items=array(), $header=NULL) {
+		if (!$this->content instanceof HtmlGrid) {
+			$this->content=new HtmlGrid("Grid-".$this->identifier, 0);
 		}
 		$grid=$this->content;
 
@@ -29,12 +29,12 @@ 
 		$colCount++;
 		$grid->setColsCount($colCount);
 
-		$list=new HtmlList("",$items);
+		$list=new HtmlList("", $items);
 		$list->asLink();
-		if(isset($header)){
-			$list->addHeader(4,$header);
+		if (isset($header)) {
+			$list->addHeader(4, $header);
 		}
-		$grid->getCell(0,$colCount-1)->setContent($list);
+		$grid->getCell(0, $colCount-1)->setContent($list);
 		$grid->setDivided()->setRelaxed(true);
 		return $list;
 	}
@@ -42,14 +42,14 @@ 
 	/**
 	 * A popup can have no maximum width and continue to flow to fit its content
 	 */
-	public function setFlowing(){
+	public function setFlowing() {
 		return $this->addToProperty("class", "flowing");
 	}
 
 	/**
 	 * A popup can provide more basic formatting
 	 */
-	public function setBasic(){
+	public function setBasic() {
 		return $this->addToProperty("class", "basic");
 	}
 
@@ -57,22 +57,22 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
 	 */
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		$this->_params["popup"]="#".$this->identifier;
-		$js->semantic()->popup("#".$this->_container->getIdentifier(),$this->_params);
+		$js->semantic()->popup("#".$this->_container->getIdentifier(), $this->_params);
 	}
 
-	public function setOn($event="click"){
+	public function setOn($event="click") {
 		$this->_params["on"]=$event;
 		return $this;
 	}
 
-	public function setInline($value=true){
+	public function setInline($value=true) {
 		$this->_params["inline"]=$value;
 		return $this;
 	}
 
-	public function setPosition($position){
+	public function setPosition($position) {
 		$this->_params["position"]=$position;
 		return $this;
 	}

Ajax/Semantic.php

Spacing +6 added lines, -6 removed lines

@@ -11,8 +11,8 @@ 
 use Ajax\semantic\traits\SemanticWidgetsTrait;
 
 class Semantic extends BaseGui {
-	use SemanticComponentsTrait,SemanticHtmlElementsTrait,SemanticHtmlCollectionsTrait,
-	SemanticHtmlModulesTrait,SemanticHtmlViewsTrait,SemanticWidgetsTrait;
+	use SemanticComponentsTrait, SemanticHtmlElementsTrait, SemanticHtmlCollectionsTrait,
+	SemanticHtmlModulesTrait, SemanticHtmlViewsTrait, SemanticWidgetsTrait;
 
 	private $language;
 
@@ -21,12 +21,12 @@ 
 	}
 
 
-	public function setLanguage($language){
-		if($language!==$this->language){
+	public function setLanguage($language) {
+		if ($language!==$this->language) {
 			$file=\realpath(dirname(__FILE__)."/semantic/components/validation/languages/".$language.".js");
-			if(\file_exists($file)){
+			if (\file_exists($file)) {
 				$script=\file_get_contents($file);
-				$this->js->exec($script,true);
+				$this->js->exec($script, true);
 				$this->language=$language;
 			}
 		}

Ajax/common/traits/JqueryActionsTrait.php

Spacing +9 added lines, -9 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 trait JqueryActionsTrait {
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 
 	/**
 	 * Get or set the value of an attribute for the first element in the set of matched elements or set one or more attributes for every matched element.
@@ -38,7 +38,7 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	public function after($element='this', $value='', $immediatly=false){
+	public function after($element='this', $value='', $immediatly=false) {
 		$element=Javascript::prep_element($element);
 		$value=Javascript::prep_value($value);
 		$str="$({$element}).after({$value});";
@@ -63,7 +63,7 @@ 
 
 		$animations="\t\t\t";
 		if (\is_array($params)) {
-			foreach ( $params as $param => $value ) {
+			foreach ($params as $param => $value) {
 				$animations.=$param.': \''.$value.'\', ';
 			}
 		}
@@ -356,8 +356,8 @@ 
 	 * @param boolean $immediatly
 	 * @return string
 	 */
-	public function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="",$immediatly=true) {
-		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation,$immediatly);
+	public function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) {
+		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -383,8 +383,8 @@ 
 	 * @param boolean $immediatly
 	 * @return String
 	 */
-	public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false,$immediatly=true) {
-		return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation,$immediatly);
+	public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false, $immediatly=true) {
+		return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -393,8 +393,8 @@ 
 	 * @return string
 	 */
 	private function _validate_speed($speed) {
-		if (in_array($speed, array (
-				'slow','normal','fast'
+		if (in_array($speed, array(
+				'slow', 'normal', 'fast'
 		))) {
 			$speed='"'.$speed.'"';
 		} elseif (preg_match("/[^0-9]/", $speed)) {

Braces +51 added lines, -34 removed lines

@@ -24,10 +24,12 @@ 
 		if (isset($value)) {
 			$value=Javascript::prep_value($value);
 			$str="$({$element}).attr(\"$attributeName\",{$value});";
-		} else
-			$str="$({$element}).attr(\"$attributeName\");";
-			if ($immediatly)
-				$this->jquery_code_for_compile[]=$str;
+		} else {
+					$str="$({$element}).attr(\"$attributeName\");";
+		}
+			if ($immediatly) {
+							$this->jquery_code_for_compile[]=$str;
+			}
 				return $str;
 	}
 
@@ -42,8 +44,9 @@ 
 		$element=Javascript::prep_element($element);
 		$value=Javascript::prep_value($value);
 		$str="$({$element}).after({$value});";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -79,8 +82,9 @@ 
 
 		$str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -105,8 +109,9 @@ 
 
 		$str="$({$element}).fadeIn({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -131,8 +136,9 @@ 
 
 		$str="$({$element}).fadeOut({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -157,8 +163,9 @@ 
 
 		$str="$({$element}).hide({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -185,8 +192,9 @@ 
 
 		$str="$({$element}).slideUp({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -211,8 +219,9 @@ 
 
 		$str="$({$element}).slideDown({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -237,8 +246,9 @@ 
 
 		$str="$({$element}).slideToggle({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -255,8 +265,9 @@ 
 		$element=Javascript::prep_element($element);
 		$str="$({$element}).toggle();";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -272,8 +283,9 @@ 
 		$element=Javascript::prep_element($element);
 		$str="$({$element}).trigger(\"$event\");";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -298,8 +310,9 @@ 
 
 		$str="$({$element}).show({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -317,8 +330,9 @@ 
 			$str.="else{".$jsCodeIfFalse."}";
 		}
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -335,11 +349,13 @@ 
 	public function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) {
 		$param=Javascript::prep_value($param);
 		$callback="";
-		if ($jsCallback!="")
-			$callback=", function(event){\n{$jsCallback}\n}";
+		if ($jsCallback!="") {
+					$callback=", function(event){\n{$jsCallback}\n}";
+		}
 			$script="$(".Javascript::prep_element($element).").".$jqueryCall."(".$param.$callback.");\n";
-			if ($immediatly)
-				$this->jquery_code_for_compile[]=$script;
+			if ($immediatly) {
+							$this->jquery_code_for_compile[]=$script;
+			}
 				return $script;
 	}
 
@@ -368,8 +384,9 @@ 
 	 */
 	public function _exec($js, $immediatly=false) {
 		$script=$js."\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$script;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$script;
+		}
 			return $script;
 	}
 

Ajax/common/components/SimpleComponent.php

Spacing +8 added lines, -8 removed lines

@@ -17,18 +17,18 @@ 
 
 	public function __construct(JsUtils $js=NULL) {
 		parent::__construct($js);
-		$this->events=array ();
+		$this->events=array();
 	}
 
 	protected function compileEvents() {
-		foreach ( $this->events as $event => $jsCode ) {
-			if($event=="execute"){
+		foreach ($this->events as $event => $jsCode) {
+			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->attachTo;
-				if(isset($this->itemSelector)){
+				if (isset($this->itemSelector)) {
 					$selector.=" ".$this->itemSelector;
 				}
 				$this->jquery_code_for_compile []="$( \"".$selector."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});";
@@ -40,7 +40,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"
@@ -50,7 +50,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 +5 added lines, -4 removed lines

@@ -24,9 +24,9 @@ 
 		foreach ( $this->events as $event => $jsCode ) {
 			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->attachTo;
 				if(isset($this->itemSelector)){
 					$selector.=" ".$this->itemSelector;
@@ -75,8 +75,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/common/html/HtmlCollection.php

Braces +10 added lines, -10 removed lines

@@ -22,7 +22,7 @@ 
 			foreach ($items as $k=>$v){
 				$this->addItem([$k,$v]);
 			}
-		}else{
+		} else{
 			foreach ($items as $item){
 				$this->addItem($item);
 			}
@@ -70,9 +70,9 @@ 
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
 	public function getItem($index) {
-		if (is_int($index))
-			return $this->content[$index];
-		else {
+		if (is_int($index)) {
+					return $this->content[$index];
+		} else {
 			$elm=$this->getElementById($index, $this->content);
 			return $elm;
 		}
@@ -134,10 +134,11 @@ 
 		$i=0;
 		foreach ($properties as $k=>$v){
 			$c=$this->content[$i++];
-			if(isset($c))
-				$c->setProperty($k,$v);
-			else
-				return $this;
+			if(isset($c)) {
+							$c->setProperty($k,$v);
+			} else {
+							return $this;
+			}
 		}
 		return $this;
 	}
@@ -151,8 +152,7 @@ 
 			$c=$this->content[$i++];
 			if(isset($c)){
 				$c->setProperty($property,$value);
-			}
-			else{
+			} else{
 				return $this;
 			}
 		}

Doc Comments +10 added lines

@@ -49,6 +49,10 @@ 
 		return $itemO;
 	}
 
+	/**
+	 * @param string $classname
+	 * @param integer $index
+	 */
 	protected function setItemIdentifier($item,$classname,$index){
 		if($item instanceof BaseWidget){
 			if($item->getIdentifier()===""){
@@ -93,6 +97,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param integer $index
+	 */
 	public function removeItem($index){
 		return array_splice($this->content, $index, 1);
 	}
@@ -108,6 +115,9 @@ 
 		return $this->addItem($function($object));
 	}
 
+	/**
+	 * @param \Closure $callBack
+	 */
 	public function apply($callBack){
 		foreach ($this->content as $item){
 			$callBack($item);

Spacing +39 added lines, -39 removed lines

@@ -14,44 +14,44 @@ 
  */
 abstract class HtmlCollection extends HtmlDoubleElement {
 
-	public function __construct($identifier,$tagName="div"){
-		parent::__construct($identifier,$tagName);
+	public function __construct($identifier, $tagName="div") {
+		parent::__construct($identifier, $tagName);
 		$this->content=array();
 	}
 
-	public function addItems($items){
-		if(JArray::isAssociative($items)){
-			foreach ($items as $k=>$v){
-				$this->addItem([$k,$v]);
+	public function addItems($items) {
+		if (JArray::isAssociative($items)) {
+			foreach ($items as $k=>$v) {
+				$this->addItem([$k, $v]);
 			}
-		}else{
-			foreach ($items as $item){
+		} else {
+			foreach ($items as $item) {
 				$this->addItem($item);
 			}
 		}
 		return $this;
 	}
 
-	public function setItems($items){
+	public function setItems($items) {
 		$this->content=$items;
 		return $this;
 	}
 
-	public function getItems(){
+	public function getItems() {
 		return $this->content;
 	}
 
-	protected function getItemToAdd($item){
+	protected function getItemToAdd($item) {
 		$itemO=$item;
-		if($this->createCondition($item)===true){
+		if ($this->createCondition($item)===true) {
 			$itemO=$this->createItem($item);
 		}
 		return $itemO;
 	}
 
-	protected function setItemIdentifier($item,$classname,$index){
-		if($item instanceof BaseWidget){
-			if($item->getIdentifier()===""){
+	protected function setItemIdentifier($item, $classname, $index) {
+		if ($item instanceof BaseWidget) {
+			if ($item->getIdentifier()==="") {
 				$item->setIdentifier($classname."-".$this->identifier."-".$index);
 			}
 		}
@@ -62,15 +62,15 @@ 
 	 * @param HtmlDoubleElement|string|array $item
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addItem($item){
+	public function addItem($item) {
 		$itemO=$this->getItemToAdd($item);
 		$this->addContent($itemO);
 		return $itemO;
 	}
 
-	public function insertItem($item,$position=0){
+	public function insertItem($item, $position=0) {
 		$itemO=$this->getItemToAdd($item);
-		\array_splice( $this->content, $position, 0, array($itemO));
+		\array_splice($this->content, $position, 0, array($itemO));
 		return $itemO;
 	}
 
@@ -93,11 +93,11 @@ 
 		return $this;
 	}
 
-	public function removeItem($index){
+	public function removeItem($index) {
 		return array_splice($this->content, $index, 1);
 	}
 
-	public function count(){
+	public function count() {
 		return \sizeof($this->content);
 	}
 
@@ -108,8 +108,8 @@ 
 		return $this->addItem($function($object));
 	}
 
-	public function apply($callBack){
-		foreach ($this->content as $item){
+	public function apply($callBack) {
+		foreach ($this->content as $item) {
 			$callBack($item);
 		}
 		return $this;
@@ -129,40 +129,40 @@ 
 	 */
 	abstract protected function createItem($value);
 
-	protected function createCondition($value){
+	protected function createCondition($value) {
 		return \is_object($value)===false;
 	}
 
-	protected function contentAs($tagName){
-		foreach ($this->content as $item){
+	protected function contentAs($tagName) {
+		foreach ($this->content as $item) {
 			$item->setTagName($tagName);
 		}
 		return $this;
 	}
 
-	public function setProperties($properties){
+	public function setProperties($properties) {
 		$i=0;
-		foreach ($properties as $k=>$v){
+		foreach ($properties as $k=>$v) {
 			$c=$this->content[$i++];
-			if(isset($c))
-				$c->setProperty($k,$v);
+			if (isset($c))
+				$c->setProperty($k, $v);
 			else
 				return $this;
 		}
 		return $this;
 	}
 
-	public function setPropertyValues($property,$values){
+	public function setPropertyValues($property, $values) {
 		$i=0;
-		if(\is_array($values)===false){
-			$values=\array_fill(0, $this->count(),$values);
+		if (\is_array($values)===false) {
+			$values=\array_fill(0, $this->count(), $values);
 		}
-		foreach ($values as $value){
+		foreach ($values as $value) {
 			$c=$this->content[$i++];
-			if(isset($c)){
-				$c->setProperty($property,$value);
+			if (isset($c)) {
+				$c->setProperty($property, $value);
 			}
-			else{
+			else {
 				return $this;
 			}
 		}
@@ -172,9 +172,9 @@ 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$index=0;
 		$classname=\strtolower(JReflection::shortClassName($this));
-		foreach ($this->content as $item){
-			$this->setItemIdentifier($item,$classname,$index++);
+		foreach ($this->content as $item) {
+			$this->setItemIdentifier($item, $classname, $index++);
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 }
\ No newline at end of file

Ajax/common/html/html5/HtmlTextarea.php

Spacing +6 added lines, -6 removed lines

@@ -7,27 +7,27 @@
 
 class HtmlTextarea extends HtmlDoubleElement {
 
-	public function __construct($identifier,$value=NULL,$placeholder=NULL,$rows=NULL) {
+	public function __construct($identifier, $value=NULL, $placeholder=NULL, $rows=NULL) {
 		parent::__construct($identifier, "textarea");
 		$this->setProperty("name", $identifier);
 		$this->setValue($value);
 		$this->setPlaceholder($placeholder);
-		if(isset($rows))
+		if (isset($rows))
 			$this->setRows($rows);
 	}
 	public function setValue($value) {
-		if(isset($value))
+		if (isset($value))
 			$this->setContent($value);
 		return $this;
 	}
 
-	public function setPlaceholder($value){
-		if(JString::isNotNull($value))
+	public function setPlaceholder($value) {
+		if (JString::isNotNull($value))
 			$this->setProperty("placeholder", $value);
 		return $this;
 	}
 
-	public function setRows($count){
+	public function setRows($count) {
 		$this->setProperty("rows", $count);
 	}
 }
\ No newline at end of file

Braces +9 added lines, -6 removed lines

@@ -12,18 +12,21 @@
 		$this->setProperty("name", $identifier);
 		$this->setValue($value);
 		$this->setPlaceholder($placeholder);
-		if(isset($rows))
-			$this->setRows($rows);
+		if(isset($rows)) {
+					$this->setRows($rows);
+		}
 	}
 	public function setValue($value) {
-		if(isset($value))
-			$this->setContent($value);
+		if(isset($value)) {
+					$this->setContent($value);
+		}
 		return $this;
 	}
 
 	public function setPlaceholder($value){
-		if(JString::isNotNull($value))
-			$this->setProperty("placeholder", $value);
+		if(JString::isNotNull($value)) {
+					$this->setProperty("placeholder", $value);
+		}
 		return $this;
 	}
 

Ajax/semantic/html/elements/HtmlSegmentGroups.php

Spacing +12 added lines, -12 removed lines

@@ -7,20 +7,20 @@ 
 use Ajax\semantic\html\base\constants\Sens;
 use Ajax\JsUtils;
 
-class HtmlSegmentGroups extends HtmlSemCollection{
+class HtmlSegmentGroups extends HtmlSemCollection {
 
 
-	public function __construct( $identifier, $items=array()){
-		parent::__construct( $identifier, "div","ui segments");
+	public function __construct($identifier, $items=array()) {
+		parent::__construct($identifier, "div", "ui segments");
 		$this->addItems($items);
 	}
 
 
-	protected function createItem($value){
-		return new HtmlSegment("segment-".$this->count(),$value);
+	protected function createItem($value) {
+		return new HtmlSegment("segment-".$this->count(), $value);
 	}
 
-	protected function createCondition($value){
+	protected function createCondition($value) {
 		return !($value instanceof HtmlSegment);
 	}
 
@@ -29,21 +29,21 @@ 
 	 * @param string $type one of "raised","stacked","piled" default : ""
 	 * @return \Ajax\semantic\html\elements\HtmlSegmentGroups
 	 */
-	public function setType($type){
+	public function setType($type) {
 		return $this->addToPropertyCtrl("class", $type, SegmentType::getConstants());
 	}
 
-	public function setSens($sens=Sens::VERTICAL){
+	public function setSens($sens=Sens::VERTICAL) {
 		return $this->addToPropertyCtrl("class", $sens, Sens::getConstants());
 	}
 
-	public function run(JsUtils $js){
-		$result= parent::run($js);
+	public function run(JsUtils $js) {
+		$result=parent::run($js);
 		return $result->setItemSelector(".ui.segment");
 	}
 
-	public static function group($identifier,$items=array(),$type="",$sens=Sens::VERTICAL){
-		$group=new HtmlSegmentGroups($identifier,$items);
+	public static function group($identifier, $items=array(), $type="", $sens=Sens::VERTICAL) {
+		$group=new HtmlSegmentGroups($identifier, $items);
 		$group->setSens($sens);
 		return $group->setType($type);
 	}

Ajax/semantic/widgets/dataform/DataForm.php

Doc Comments +3 added lines

@@ -18,6 +18,9 @@
  */
 class DataForm extends Widget {
 
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier, $modelInstance=NULL) {
 		parent::__construct($identifier, null,$modelInstance);
 		$this->_form=new HtmlForm($identifier);

Spacing +22 added lines, -22 removed lines

@@ -19,49 +19,49 @@ 
 class DataForm extends Widget {
 
 	public function __construct($identifier, $modelInstance=NULL) {
-		parent::__construct($identifier, null,$modelInstance);
+		parent::__construct($identifier, null, $modelInstance);
 		$this->_form=new HtmlForm($identifier);
 		$this->_init(new FormInstanceViewer($identifier), "form", $this->_form, true);
 	}
 
-	protected function _getFieldIdentifier($prefix,$name=""){
+	protected function _getFieldIdentifier($prefix, $name="") {
 		return $this->identifier."-{$name}-".$this->_instanceViewer->getIdentifier();
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->_instanceViewer->setInstance($this->_modelInstance);
 
 		$form=$this->content["form"];
 		$this->_generateContent($form);
 
-		if(isset($this->_toolbar)){
+		if (isset($this->_toolbar)) {
 			$this->_setToolbarPosition($form);
 		}
-		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]);
-		return parent::compile($js,$view);
+		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]);
+		return parent::compile($js, $view);
 	}
 
 	/**
 	 * @param HtmlForm $form
 	 */
-	protected function _generateContent($form){
-		$values= $this->_instanceViewer->getValues();
+	protected function _generateContent($form) {
+		$values=$this->_instanceViewer->getValues();
 		$count=$this->_instanceViewer->count();
 
 		$separators=$this->_instanceViewer->getSeparators();
 		$size=\sizeof($separators);
-		if($size===1){
-			foreach ($values as $v){
+		if ($size===1) {
+			foreach ($values as $v) {
 				$form->addField($v);
 			}
-		}else{
+		} else {
 			$separators[]=$count;
-			for($i=0;$i<$size;$i++){
-				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
+			for ($i=0; $i<$size; $i++) {
+				$fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]);
 				//TODO check why $fields is empty
-				if(\sizeof($fields)===1){
+				if (\sizeof($fields)===1) {
 					$form->addField($fields[0]);
-				}elseif(\sizeof($fields)>1){
+				}elseif (\sizeof($fields)>1) {
 					$form->addFields($fields);
 				}
 			}
@@ -72,11 +72,11 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\common\Widget::getForm()
 	 */
-	public function getForm(){
+	public function getForm() {
 		return $this->content["form"];
 	}
 
-	public function addSeparatorAfter($fieldNum){
+	public function addSeparatorAfter($fieldNum) {
 		$this->_instanceViewer->addSeparatorAfter($fieldNum);
 		return $this;
 	}
@@ -90,12 +90,12 @@ 
 		return $this;
 	}
 
-	public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){
-			$button=new HtmlButton($id,$value,$cssStyle);
+	public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){
+			$button=new HtmlButton($id, $value, $cssStyle);
 			$button->setProperty("type", "reset");
 			return $button;
-		}, $index,$attributes);
+		}, $index, $attributes);
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 		$this->content[$this->_toolbarPosition]=$this->_toolbar;
 	}
 
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		return parent::run($js);
 	}
 }
\ No newline at end of file

Braces +2 added lines, -2 removed lines

@@ -54,14 +54,14 @@
 			foreach ($values as $v){
 				$form->addField($v);
 			}
-		}else{
+		} else{
 			$separators[]=$count;
 			for($i=0;$i<$size;$i++){
 				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
 				//TODO check why $fields is empty
 				if(\sizeof($fields)===1){
 					$form->addField($fields[0]);
-				}elseif(\sizeof($fields)>1){
+				} elseif(\sizeof($fields)>1){
 					$form->addFields($fields);
 				}
 			}

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));
 			}