jcheron / phalcon-jquery

Ajax/bootstrap/html/HtmlBreadcrumbs.php

Braces +3 added lines, -3 removed lines

@@ -67,9 +67,9 @@ 
 		if(is_array($element)){
 			$elm=new HtmlLink("lnk-".$this->identifier."-".$size);
 			$elm->fromArray($element);
-		}else if($element instanceof HtmlLink){
+		} else if($element instanceof HtmlLink){
 			$elm=$element;
-		}else{
+		} else{
 			$elm=new HtmlLink("lnk-".$this->identifier."-".$size,$href,$element);
 			if(isset($glyph)){
 				$elm->wrapContentWithGlyph($glyph);
@@ -116,7 +116,7 @@ 
 		}
 		if($this->absolutePaths===true){
 			return $this->_hrefFunction($this->content[$index]);
-		}else{
+		} else{
 			return $this->root.implode($separator, array_slice(array_map(function($e){return $this->_hrefFunction($e);}, $this->content),0,$index+1));
 		}
 	}

Spacing +35 added lines, -35 removed lines

@@ -41,15 +41,15 @@ 
 	 * @param boolean $autoActive sets the last element's class to <b>active</b> if true
 	 * @param function $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()}
 	 */
-	public function __construct($identifier,$elements=array(),$autoActive=true,$startIndex=0,$hrefFunction=NULL){
-		parent::__construct($identifier,"ol");
+	public function __construct($identifier, $elements=array(), $autoActive=true, $startIndex=0, $hrefFunction=NULL) {
+		parent::__construct($identifier, "ol");
 		$this->startIndex=$startIndex;
 		$this->setProperty("class", "breadcrumb");
 		$this->content=array();
 		$this->autoActive=$autoActive;
 		$this->absolutePaths;
-		$this->_hrefFunction=function ($e){return $e->getContent();};
-		if(isset($hrefFunction)){
+		$this->_hrefFunction=function($e) {return $e->getContent(); };
+		if (isset($hrefFunction)) {
 			$this->_hrefFunction=$hrefFunction;
 		}
 		$this->addElements($elements);
@@ -60,43 +60,43 @@ 
 	 * @param string $href
 	 * @return \Ajax\bootstrap\html\HtmlLink
 	 */
-	public function addElement($element,$href="",$glyph=NULL){
+	public function addElement($element, $href="", $glyph=NULL) {
 		$size=sizeof($this->content);
-		if(is_array($element)){
+		if (is_array($element)) {
 			$elm=new HtmlLink("lnk-".$this->identifier."-".$size);
 			$elm->fromArray($element);
-		}else if($element instanceof HtmlLink){
+		}else if ($element instanceof HtmlLink) {
 			$elm=$element;
-		}else{
-			$elm=new HtmlLink("lnk-".$this->identifier."-".$size,$href,$element);
-			if(isset($glyph)){
+		}else {
+			$elm=new HtmlLink("lnk-".$this->identifier."-".$size, $href, $element);
+			if (isset($glyph)) {
 				$elm->wrapContentWithGlyph($glyph);
 			}
 		}
-		$elm->wrap("<li>","</li>");
+		$elm->wrap("<li>", "</li>");
 		$this->content[]=$elm;
 		$elm->setProperty($this->attr, $this->getHref($size));
 		return $elm;
 	}
 
-	public function setActive($index=null){
-		if(!isset($index)){
+	public function setActive($index=null) {
+		if (!isset($index)) {
 			$index=sizeof($this->content)-1;
 		}
-		$li=new HtmlBsDoubleElement("","li");
+		$li=new HtmlBsDoubleElement("", "li");
 		$li->setClass("active");
 		$li->setContent($this->content[$index]->getContent());
 		$this->content[$index]=$li;
 	}
 
-	public function addElements($elements){
-		foreach ( $elements as $element ) {
+	public function addElements($elements) {
+		foreach ($elements as $element) {
 			$this->addElement($element);
 		}
 		return $this;
 	}
 
-	public function fromArray($array){
+	public function fromArray($array) {
 		$array=parent::fromArray($array);
 		$this->addElements($array);
 		return $array;
@@ -108,14 +108,14 @@ 
 	 * @param string $separator
 	 * @return string
 	 */
-	public function getHref($index=null,$separator="/"){
-		if(!isset($index)){
+	public function getHref($index=null, $separator="/") {
+		if (!isset($index)) {
 			$index=sizeof($this->content);
 		}
-		if($this->absolutePaths===true){
+		if ($this->absolutePaths===true) {
 			return $this->_hrefFunction($this->content[$index]);
-		}else{
-			return $this->root.implode($separator, array_slice(array_map(function($e){return $this->_hrefFunction($e);}, $this->content),$this->startIndex,$index+1));
+		}else {
+			return $this->root.implode($separator, array_slice(array_map(function($e) {return $this->_hrefFunction($e); }, $this->content), $this->startIndex, $index+1));
 		}
 	}
 
@@ -124,7 +124,7 @@ 
 	 * @see \Ajax\bootstrap\html\BaseHtml::compile()
 	 */
 	public function compile(JsUtils $js=NULL, $view=NULL) {
-		if($this->autoActive){
+		if ($this->autoActive) {
 			$this->setActive();
 		}
 		return parent::compile($js, $view);
@@ -142,19 +142,19 @@ 
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
 	 */
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		foreach ($this->content as $element){
-			$element->on($event,$jsCode,$stopPropagation,$preventDefault);
+		foreach ($this->content as $element) {
+			$element->on($event, $jsCode, $stopPropagation, $preventDefault);
 		}
 		return $this;
 	}
 
 	public function setAutoActive($autoActive) {
-		$this->autoActive = $autoActive;
+		$this->autoActive=$autoActive;
 		return $this;
 	}
 
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
-		foreach ($this->content as $element){
+		foreach ($this->content as $element) {
 			$element->_ajaxOn($operation, $event, $url, $responseElement, $parameters);
 		}
 		return $this;
@@ -166,18 +166,18 @@ 
 	 * @param string $targetSelector the target of the get
 	 * @return HtmlBreadcrumbs
 	 */
-	public function autoGetOnClick($targetSelector){
-		return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr));
+	public function autoGetOnClick($targetSelector) {
+		return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr));
 	}
 
-	public function contentAsString(){
-		if($this->autoActive){
+	public function contentAsString() {
+		if ($this->autoActive) {
 			$this->setActive();
 		}
 		return parent::contentAsString();
 	}
 
-	public function getElement($index){
+	public function getElement($index) {
 		return $this->content[$index];
 	}
 
@@ -186,7 +186,7 @@ 
 	 * @param mixed $glyph
 	 * @param int $index
 	 */
-	public function addGlyph($glyph,$index=0){
+	public function addGlyph($glyph, $index=0) {
 		$elm=$this->getElement($index);
 		return $elm->wrapContentWithGlyph($glyph);
 	}
@@ -197,7 +197,7 @@ 
 	 * @param Dispatcher $dispatcher the request dispatcher
 	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
 	 */
-	public function fromDispatcher(JsUtils $js,$dispatcher,$startIndex=0){
+	public function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0) {
 		$this->startIndex=$startIndex;
 		return $this->addElements($js->fromDispatcher($dispatcher));
 	}
@@ -209,7 +209,7 @@ 
 	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
 	 */
 	public function setHrefFunction($_hrefFunction) {
-		$this->_hrefFunction = $_hrefFunction;
+		$this->_hrefFunction=$_hrefFunction;
 		return $this;
 	}
 

Ajax/common/BaseEnum.php

Spacing +9 added lines, -9 removed lines

@@ -12,8 +12,8 @@ 
 	private static $constCacheArray=NULL;
 
 	public static function getConstants() {
-		if (self::$constCacheArray == NULL) {
-			self::$constCacheArray=[ ];
+		if (self::$constCacheArray==NULL) {
+			self::$constCacheArray=[];
 		}
 		$calledClass=get_called_class();
 		if (!array_key_exists($calledClass, self::$constCacheArray)) {
@@ -23,16 +23,16 @@ 
 		return self::$constCacheArray[$calledClass];
 	}
 
-	public static function getConstantValues($postFix="",$prefixBefore=false) {
-		if ($postFix == "")
+	public static function getConstantValues($postFix="", $prefixBefore=false) {
+		if ($postFix=="")
 			return \array_values(self::getConstants());
 		else {
-			if($prefixBefore===false){
-				return \array_map(function ($elem) use($postFix) {
-					return $elem . " " . $postFix;
+			if ($prefixBefore===false) {
+				return \array_map(function($elem) use($postFix) {
+					return $elem." ".$postFix;
 				}, \array_values(self::getConstants()));
-			}else{
-				return \array_map(function ($elem) use($postFix) {
+			}else {
+				return \array_map(function($elem) use($postFix) {
 					return $postFix." ".$elem;
 				}, \array_values(self::getConstants()));
 			}

Braces +4 added lines, -4 removed lines

@@ -24,14 +24,14 @@
 	}
 
 	public static function getConstantValues($postFix="",$prefixBefore=false) {
-		if ($postFix == "")
-			return \array_values(self::getConstants());
-		else {
+		if ($postFix == "") {
+					return \array_values(self::getConstants());
+		} else {
 			if($prefixBefore===false){
 				return \array_map(function ($elem) use($postFix) {
 					return $elem . " " . $postFix;
 				}, \array_values(self::getConstants()));
-			}else{
+			} else{
 				return \array_map(function ($elem) use($postFix) {
 					return $postFix." ".$elem;
 				}, \array_values(self::getConstants()));

Ajax/common/html/html5/HtmlInput.php

Spacing +6 added lines, -6 removed lines

@@ -7,7 +7,7 @@ 
 
 class HtmlInput extends HtmlSingleElement {
 
-	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);
@@ -16,7 +16,7 @@ 
 	}
 
 	public function setValue($value) {
-		if(isset($value))
+		if (isset($value))
 		$this->setProperty("value", $value);
 		return $this;
 	}
@@ -25,12 +25,12 @@ 
 		return $this->setProperty("type", $value);
 	}
 
-	public function setPlaceholder($value){
-		if(JString::isNull($value)){
-			if(JString::isNotNull($this->identifier))
+	public function setPlaceholder($value) {
+		if (JString::isNull($value)) {
+			if (JString::isNotNull($this->identifier))
 				$value=\ucfirst($this->identifier);
 		}
-		if(JString::isNotNull($value))
+		if (JString::isNotNull($value))
 			$this->setProperty("placeholder", $value);
 		return $this;
 	}

Braces +9 added lines, -6 removed lines

@@ -16,8 +16,9 @@ 
 	}
 
 	public function setValue($value) {
-		if(isset($value))
-		$this->setProperty("value", $value);
+		if(isset($value)) {
+				$this->setProperty("value", $value);
+		}
 		return $this;
 	}
 
@@ -27,11 +28,13 @@ 
 
 	public function setPlaceholder($value){
 		if(JString::isNull($value)){
-			if(JString::isNotNull($this->identifier))
-				$value=\ucfirst($this->identifier);
+			if(JString::isNotNull($this->identifier)) {
+							$value=\ucfirst($this->identifier);
+			}
+		}
+		if(JString::isNotNull($value)) {
+					$this->setProperty("placeholder", $value);
 		}
-		if(JString::isNotNull($value))
-			$this->setProperty("placeholder", $value);
 		return $this;
 	}
 }
\ No newline at end of file

Ajax/common/html/BaseHtml.php

Spacing +61 added lines, -61 removed lines

@@ -16,10 +16,10 @@ 
 abstract class BaseHtml extends BaseWidget {
 	protected $_template;
 	protected $tagName;
-	protected $properties=array ();
-	protected $_events=array ();
-	protected $_wrapBefore=array ();
-	protected $_wrapAfter=array ();
+	protected $properties=array();
+	protected $_events=array();
+	protected $_wrapBefore=array();
+	protected $_wrapAfter=array();
 	protected $_bsComponent;
 
 	public function getBsComponent() {
@@ -32,7 +32,7 @@ 
 	}
 
 	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);
 	}
 
 	public function getProperties() {
@@ -56,13 +56,13 @@ 
 
 	public function addToProperty($name, $value, $separator=" ") {
 		if (\is_array($value)) {
-			foreach ( $value as $v ) {
+			foreach ($value as $v) {
 				$this->addToProperty($name, $v, $separator);
 			}
-		} else if ($value !== "" && $this->propertyContains($name, $value) === false) {
+		}else if ($value!=="" && $this->propertyContains($name, $value)===false) {
 			$v=@$this->properties[$name];
-			if (isset($v) && $v !== "")
-				$v=$v . $separator . $value;
+			if (isset($v) && $v!=="")
+				$v=$v.$separator.$value;
 			else
 				$v=$value;
 
@@ -78,19 +78,19 @@ 
 
 	public function compile(JsUtils $js=NULL, $view=NULL) {
 		$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 {
+				}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);
 			}
 		}
@@ -99,12 +99,12 @@ 
 
 	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 {
+		}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;
@@ -119,13 +119,13 @@ 
 	}
 
 	protected function setPropertyCtrl($name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl) === true)
+		if ($this->ctrl($name, $value, $typeCtrl)===true)
 			return $this->setProperty($name, $value);
 		return $this;
 	}
 
 	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;
@@ -134,7 +134,7 @@ 
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
 		if (is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
@@ -156,17 +156,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;
 	}
 
@@ -184,7 +184,7 @@ 
 	}
 
 	public function addToPropertyCtrlCheck($name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			return $this->addToProperty($name, $value);
 		}
 		return $this;
@@ -212,28 +212,28 @@ 
 	}
 
 	public function fromArray($array) {
-		foreach ( $this as $key => $value ) {
+		foreach ($this as $key => $value) {
 			if (array_key_exists($key, $array) && !JString::startswith($key, "_")) {
-				$setter="set" . ucfirst($key);
+				$setter="set".ucfirst($key);
 				$this->$setter($array[$key]);
 				unset($array[$key]);
 			}
 		}
-		foreach ( $array as $key => $value ) {
+		foreach ($array as $key => $value) {
 			if (method_exists($this, $key)) {
 				try {
 					$this->$key($value);
 					unset($array[$key]);
-				} catch ( \Exception $e ) {
+				} catch (\Exception $e) {
 					// Nothing to do
 				}
-			} else {
-				$setter="set" . ucfirst($key);
+			}else {
+				$setter="set".ucfirst($key);
 				if (method_exists($this, $setter)) {
 					try {
 						$this->$setter($value);
 						unset($array[$key]);
-					} catch ( \Exception $e ) {
+					} catch (\Exception $e) {
 						// Nothing to do
 					}
 				}
@@ -244,7 +244,7 @@ 
 
 	public function fromDatabaseObjects($objects, $function) {
 		if (isset($objects)) {
-			foreach ( $objects as $object ) {
+			foreach ($objects as $object) {
 				$this->fromDatabaseObject($object, $function);
 			}
 		}
@@ -264,11 +264,11 @@ 
 	}
 
 	public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		if ($stopPropagation === true) {
-			$jsCode="event.stopPropagation();" . $jsCode;
+		if ($stopPropagation===true) {
+			$jsCode="event.stopPropagation();".$jsCode;
 		}
-		if ($preventDefault === true) {
-			$jsCode="event.preventDefault();" . $jsCode;
+		if ($preventDefault===true) {
+			$jsCode="event.preventDefault();".$jsCode;
 		}
 		return $this->_addEvent($event, $jsCode);
 	}
@@ -277,10 +277,10 @@ 
 		if (array_key_exists($event, $this->_events)) {
 			if (is_array($this->_events[$event])) {
 				$this->_events[$event][]=$jsCode;
-			} else {
-				$this->_events[$event]=array ($this->_events[$event],$jsCode );
+			}else {
+				$this->_events[$event]=array($this->_events[$event], $jsCode);
 			}
-		} else {
+		}else {
 			$this->_events[$event]=$jsCode;
 		}
 		return $this;
@@ -300,15 +300,15 @@ 
 
 	public function addEventsOnRun(JsUtils $js) {
 		if (isset($this->_bsComponent)) {
-			foreach ( $this->_events as $event => $jsCode ) {
+			foreach ($this->_events as $event => $jsCode) {
 				$code=$jsCode;
 				if (is_array($jsCode)) {
 					$code="";
-					foreach ( $jsCode as $jsC ) {
+					foreach ($jsCode as $jsC) {
 						if ($jsC instanceof AjaxCall) {
-							$code.="\n" . $jsC->compile($js);
-						} else {
-							$code.="\n" . $jsC;
+							$code.="\n".$jsC->compile($js);
+						}else {
+							$code.="\n".$jsC;
 						}
 					}
 				} elseif ($jsCode instanceof AjaxCall) {
@@ -316,12 +316,12 @@ 
 				}
 				$this->_bsComponent->addEvent($event, $code);
 			}
-			$this->_events=array ();
+			$this->_events=array();
 		}
 	}
 
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
-		$params=array ("url" => $url,"responseElement" => $responseElement );
+		$params=array("url" => $url, "responseElement" => $responseElement);
 		$params=array_merge($params, $parameters);
 		$this->_addEvent($event, new AjaxCall($operation, $params));
 		return $this;
@@ -357,33 +357,33 @@ 
 		if (is_array($elements)) {
 			$flag=false;
 			$index=0;
-			while ( !$flag && $index < sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
-					$flag=($elements[$index]->getIdentifier() === $identifier);
+					$flag=($elements[$index]->getIdentifier()===$identifier);
 				$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag===true)
+				return $elements[$index-1];
 		} elseif ($elements instanceof BaseHtml) {
-			if ($elements->getIdentifier() === $identifier)
+			if ($elements->getIdentifier()===$identifier)
 				return $elements;
 		}
 		return null;
 	}
 
-	protected function getElementByPropertyValue($propertyName,$value, $elements) {
+	protected function getElementByPropertyValue($propertyName, $value, $elements) {
 		if (is_array($elements)) {
 			$flag=false;
 			$index=0;
-			while ( !$flag && $index < sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
-					$flag=($elements[$index]->propertyContains($propertyName, $value) === true);
+					$flag=($elements[$index]->propertyContains($propertyName, $value)===true);
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag===true)
+				return $elements[$index-1];
 		} elseif ($elements instanceof BaseHtml) {
-			if ($elements->propertyContains($propertyName, $value) === true)
+			if ($elements->propertyContains($propertyName, $value)===true)
 				return $elements;
 		}
 		return null;
@@ -405,14 +405,14 @@ 
 		if (is_array($value)) {
 			$value=implode(",", $value);
 		}
-		if (strrpos($value, 'this') === false && strrpos($value, 'event') === false) {
-			$value='"' . $value . '"';
+		if (strrpos($value, 'this')===false && strrpos($value, 'event')===false) {
+			$value='"'.$value.'"';
 		}
 		return $value;
 	}
 
 	public function jsDoJquery($jqueryCall, $param="") {
-		return "$('#" . $this->identifier . "')." . $jqueryCall . "(" . $this->_prep_value($param) . ");";
+		return "$('#".$this->identifier."').".$jqueryCall."(".$this->_prep_value($param).");";
 	}
 
 	public function executeOnRun($jsCode) {

Braces +35 added lines, -24 removed lines

@@ -50,8 +50,9 @@ 
 	}
 
 	public function getProperty($name) {
-		if (array_key_exists($name, $this->properties))
-			return $this->properties[$name];
+		if (array_key_exists($name, $this->properties)) {
+					return $this->properties[$name];
+		}
 	}
 
 	public function addToProperty($name, $value, $separator=" ") {
@@ -61,10 +62,11 @@ 
 			}
 		} else if ($value !== "" && $this->propertyContains($name, $value) === false) {
 			$v=@$this->properties[$name];
-			if (isset($v) && $v !== "")
-				$v=$v . $separator . $value;
-			else
-				$v=$value;
+			if (isset($v) && $v !== "") {
+							$v=$v . $separator . $value;
+			} else {
+							$v=$value;
+			}
 
 			return $this->setProperty($name, $v);
 		}
@@ -119,8 +121,9 @@ 
 	}
 
 	protected function setPropertyCtrl($name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl) === true)
-			return $this->setProperty($name, $value);
+		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+					return $this->setProperty($name, $value);
+		}
 		return $this;
 	}
 
@@ -150,8 +153,9 @@ 
 	}
 
 	protected function removeProperty($name) {
-		if (\array_key_exists($name, $this->properties))
-			unset($this->properties[$name]);
+		if (\array_key_exists($name, $this->properties)) {
+					unset($this->properties[$name]);
+		}
 		return $this;
 	}
 
@@ -171,8 +175,9 @@ 
 	}
 
 	protected function addToPropertyUnique($name, $value, $typeCtrl) {
-		if (@class_exists($typeCtrl, true))
-			$typeCtrl=$typeCtrl::getConstants();
+		if (@class_exists($typeCtrl, true)) {
+					$typeCtrl=$typeCtrl::getConstants();
+		}
 		if (is_array($typeCtrl)) {
 			$this->removeOldValues($this->properties[$name], $typeCtrl);
 		}
@@ -358,15 +363,18 @@ 
 			$flag=false;
 			$index=0;
 			while ( !$flag && $index < sizeof($elements) ) {
-				if ($elements[$index] instanceof BaseHtml)
-					$flag=($elements[$index]->getIdentifier() === $identifier);
+				if ($elements[$index] instanceof BaseHtml) {
+									$flag=($elements[$index]->getIdentifier() === $identifier);
+				}
 				$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag === true) {
+							return $elements[$index - 1];
+			}
 		} elseif ($elements instanceof BaseHtml) {
-			if ($elements->getIdentifier() === $identifier)
-				return $elements;
+			if ($elements->getIdentifier() === $identifier) {
+							return $elements;
+			}
 		}
 		return null;
 	}
@@ -376,15 +384,18 @@ 
 			$flag=false;
 			$index=0;
 			while ( !$flag && $index < sizeof($elements) ) {
-				if ($elements[$index] instanceof BaseHtml)
-					$flag=($elements[$index]->propertyContains($propertyName, $value) === true);
+				if ($elements[$index] instanceof BaseHtml) {
+									$flag=($elements[$index]->propertyContains($propertyName, $value) === true);
+				}
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag === true) {
+							return $elements[$index - 1];
+			}
 		} elseif ($elements instanceof BaseHtml) {
-			if ($elements->propertyContains($propertyName, $value) === true)
-				return $elements;
+			if ($elements->propertyContains($propertyName, $value) === true) {
+							return $elements;
+			}
 		}
 		return null;
 	}

Ajax/semantic/traits/SemanticHtmlElementsTrait.php

Spacing +4 added lines, -4 removed lines

@@ -130,12 +130,12 @@
 	 * @param string $tagName
 	 * @return HtmlLabel
 	 */
-	public function htmlLabel($identifier, $content="", $icon=NULL,$tagName="div") {
-		return $this->addHtmlComponent(new HtmlLabel($identifier, $content,$icon, $tagName));
+	public function htmlLabel($identifier, $content="", $icon=NULL, $tagName="div") {
+		return $this->addHtmlComponent(new HtmlLabel($identifier, $content, $icon, $tagName));
 	}
 
-	public function htmlLabelGroups($identifier,$labels=array(),$attributes=array()){
-		return $this->addHtmlComponent(new HtmlLabelGroups($identifier,$labels,$attributes));
+	public function htmlLabelGroups($identifier, $labels=array(), $attributes=array()) {
+		return $this->addHtmlComponent(new HtmlLabelGroups($identifier, $labels, $attributes));
 	}
 
 	/**

Ajax/semantic/html/elements/HtmlLabelGroups.php

Spacing +4 added lines, -4 removed lines

@@ -15,9 +15,9 @@ 
  */
 class HtmlLabelGroups extends HtmlSemCollection {
 
-	public function __construct($identifier,$labels=array(), $attributes=array()) {
+	public function __construct($identifier, $labels=array(), $attributes=array()) {
 		parent::__construct($identifier, "div", "ui labels");
-		$this->_states=\array_merge(Size::getConstants(),Color::getConstants(),["tag","circular"]);
+		$this->_states=\array_merge(Size::getConstants(), Color::getConstants(), ["tag", "circular"]);
 		$this->addItems($labels);
 		$this->setStates($attributes);
 	}
@@ -31,12 +31,12 @@ 
 			$icon=JArray::getValue($value, "icon", 1);
 			$tagName=JArray::getValue($value, "tagName", 2);
 		}
-		$labelO=new HtmlLabel("label-" . $this->identifier, $caption,$icon,$tagName);
+		$labelO=new HtmlLabel("label-".$this->identifier, $caption, $icon, $tagName);
 		return $labelO;
 	}
 
 	protected function createCondition($value) {
-		return ($value instanceof HtmlLabel) === false;
+		return ($value instanceof HtmlLabel)===false;
 	}
 
 }
\ No newline at end of file

Ajax/semantic/html/elements/HtmlList.php

Spacing +15 added lines, -15 removed lines

@@ -18,17 +18,17 @@ 
 
 	protected function createItem($value) {
 		$count=$this->count();
-		$item=new HtmlListItem("item-" . $this->identifier . "-" . $count, $value);
+		$item=new HtmlListItem("item-".$this->identifier."-".$count, $value);
 		return $item;
 	}
 
 	public function addHeader($niveau, $content) {
-		$header=new HtmlHeader("header-" . $this->identifier, $niveau, $content, "page");
+		$header=new HtmlHeader("header-".$this->identifier, $niveau, $content, "page");
 		$this->wrap($header);
 		return $header;
 	}
 
-	public function getItemPart($index,$partName="header"){
+	public function getItemPart($index, $partName="header") {
 		return $this->getItem($index)->getPart($partName);
 	}
 
@@ -37,7 +37,7 @@ 
 	}
 
 	public function asLink() {
-		$this->addToPropertyCtrl("class", "link", array ("link" ));
+		$this->addToPropertyCtrl("class", "link", array("link"));
 		return $this->contentAs("a");
 	}
 
@@ -60,9 +60,9 @@ 
 	}
 
 	public function run(JsUtils $js) {
-		if ($this->_hasCheckedList === true) {
-			$jsCode=include dirname(__FILE__) . '/../../components/jsTemplates/tplCheckedList.php';
-			$jsCode=\str_replace("%identifier%", "#" . $this->identifier, $jsCode);
+		if ($this->_hasCheckedList===true) {
+			$jsCode=include dirname(__FILE__).'/../../components/jsTemplates/tplCheckedList.php';
+			$jsCode=\str_replace("%identifier%", "#".$this->identifier, $jsCode);
 			$this->executeOnRun($jsCode);
 		}
 		return parent::run($js);
@@ -86,28 +86,28 @@ 
 
 	public function addCheckedList($items=array(), $masterItem=NULL, $values=array()) {
 		$count=$this->count();
-		$identifier=$this->identifier . "-" . $count;
+		$identifier=$this->identifier."-".$count;
 		if (isset($masterItem)) {
-			$masterO=new HtmlFormCheckbox("master-" . $identifier, $masterItem);
+			$masterO=new HtmlFormCheckbox("master-".$identifier, $masterItem);
 			$masterO->getField()->addToProperty("class", "master");
 			$masterO->setClass("item");
 			$this->addItem($masterO);
 		}
-		$fields=array ();
+		$fields=array();
 		$i=0;
-		foreach ( $items as $val => $caption ) {
-			$itemO=new HtmlFormCheckbox($identifier . "-" . $i++, $caption, $val, "child");
-			if (\array_search($val, $values) !== false) {
+		foreach ($items as $val => $caption) {
+			$itemO=new HtmlFormCheckbox($identifier."-".$i++, $caption, $val, "child");
+			if (\array_search($val, $values)!==false) {
 				$itemO->getField()->getField()->setProperty("checked", "");
 			}
 			$itemO->setClass("item");
 			$fields[]=$itemO;
 		}
-		if (isset($masterO) === true) {
+		if (isset($masterO)===true) {
 			$list=new HtmlList("", $fields);
 			$list->setClass("list");
 			$masterO->addContent($list);
-		} else {
+		}else {
 			$this->addList($fields);
 		}
 		$this->_hasCheckedList=true;

Ajax/semantic/html/elements/HtmlInput.php

Spacing +16 added lines, -16 removed lines

@@ -13,10 +13,10 @@ 
 	use IconTrait;
 
 	public function __construct($identifier, $type="text", $value="", $placeholder="") {
-		parent::__construct("div-" . $identifier, "div", "ui input");
-		$this->content=[ "field" => new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder) ];
-		$this->_states=[ State::DISABLED,State::FOCUS,State::ERROR ];
-		$this->_variations=[ Variation::TRANSPARENT ];
+		parent::__construct("div-".$identifier, "div", "ui input");
+		$this->content=["field" => new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder)];
+		$this->_states=[State::DISABLED, State::FOCUS, State::ERROR];
+		$this->_variations=[Variation::TRANSPARENT];
 	}
 
 	public function setFocus() {
@@ -24,38 +24,38 @@ 
 	}
 
 	public function addLoading() {
-		if ($this->_hasIcon === false) {
+		if ($this->_hasIcon===false) {
 			throw new \Exception("Input must have an icon for showing a loader, use addIcon before");
 		}
 		return $this->addToProperty("class", State::LOADING);
 	}
 
 	public function labeled($label, $direction=Direction::LEFT, $icon=NULL) {
-		$labelO=$this->addLabel($label,$direction===Direction::LEFT,$icon);
-		$this->addToProperty("class", $direction . " labeled");
+		$labelO=$this->addLabel($label, $direction===Direction::LEFT, $icon);
+		$this->addToProperty("class", $direction." labeled");
 		return $labelO;
 	}
 
 	public function labeledToCorner($icon, $direction=Direction::LEFT) {
-		return $this->labeled("", $direction . " corner", $icon)->toCorner($direction);
+		return $this->labeled("", $direction." corner", $icon)->toCorner($direction);
 	}
 
 	public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) {
 		$actionO=$action;
-		if (\is_object($action) === false) {
-			$actionO=new HtmlButton("action-" . $this->identifier, $action);
+		if (\is_object($action)===false) {
+			$actionO=new HtmlButton("action-".$this->identifier, $action);
 			if (isset($icon))
 				$actionO->addIcon($icon, true, $labeled);
 		}
-		$this->addToProperty("class", $direction . " action");
-		$this->addContent($actionO, \strstr($direction, Direction::LEFT) !== false);
+		$this->addToProperty("class", $direction." action");
+		$this->addContent($actionO, \strstr($direction, Direction::LEFT)!==false);
 		return $actionO;
 	}
 
-	public function addDropdown($label="", $items=array(),$direction=Direction::RIGHT){
-		$labelO=new HtmlDropdown("dd-".$this->identifier,$label,$items);
-		$labelO->asSelect("select-".$this->identifier,false,true);
-		return $this->labeled($labelO,$direction);
+	public function addDropdown($label="", $items=array(), $direction=Direction::RIGHT) {
+		$labelO=new HtmlDropdown("dd-".$this->identifier, $label, $items);
+		$labelO->asSelect("select-".$this->identifier, false, true);
+		return $this->labeled($labelO, $direction);
 	}
 
 	public function getField() {

Braces +3 added lines, -2 removed lines

@@ -44,8 +44,9 @@
 		$actionO=$action;
 		if (\is_object($action) === false) {
 			$actionO=new HtmlButton("action-" . $this->identifier, $action);
-			if (isset($icon))
-				$actionO->addIcon($icon, true, $labeled);
+			if (isset($icon)) {
+							$actionO->addIcon($icon, true, $labeled);
+			}
 		}
 		$this->addToProperty("class", $direction . " action");
 		$this->addContent($actionO, \strstr($direction, Direction::LEFT) !== false);

Ajax/semantic/html/elements/HtmlLabel.php

Spacing +18 added lines, -18 removed lines

@@ -24,10 +24,10 @@ 
 	 * @return \Ajax\semantic\html\elements\HtmlLabel
 	 */
 	public function setPointing($value=Direction::NONE) {
-		if($value==="left" || $value==="right")
+		if ($value==="left" || $value==="right")
 			return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
 		else
-			return $this->addToPropertyCtrl("class", "pointing ".$value, Direction::getConstantValues("pointing",true));
+			return $this->addToPropertyCtrl("class", "pointing ".$value, Direction::getConstantValues("pointing", true));
 	}
 
 	/**
@@ -36,15 +36,15 @@ 
 	 * @return \Ajax\semantic\html\elements\HtmlLabel
 	 */
 	public function toCorner($side="left") {
-		return $this->addToPropertyCtrl("class", $side . " corner", array ("right corner","left corner" ));
+		return $this->addToPropertyCtrl("class", $side." corner", array("right corner", "left corner"));
 	}
 
-	public function setHorizontal(){
-		return $this->addToPropertyCtrl("class", "hozizontal",array("horizontal"));
+	public function setHorizontal() {
+		return $this->addToPropertyCtrl("class", "hozizontal", array("horizontal"));
 	}
 
-	public function setFloating(){
-		return $this->addToPropertyCtrl("class", "floating",array("floating"));
+	public function setFloating() {
+		return $this->addToPropertyCtrl("class", "floating", array("floating"));
 	}
 
 	/**
@@ -55,9 +55,9 @@ 
 		return $this->addToProperty("class", "tag");
 	}
 
-	public function setEmpty(){
+	public function setEmpty() {
 		$this->content=NULL;
-		return $this->addToPropertyCtrl("class", "empty",array("empty"));
+		return $this->addToPropertyCtrl("class", "empty", array("empty"));
 	}
 
 	public function setBasic() {
@@ -73,7 +73,7 @@ 
 	 */
 	public function addEmphasisImage($src, $alt="", $before=true) {
 		$this->addToProperty("class", "image");
-		return $this->addImage($src,$alt,$before);
+		return $this->addImage($src, $alt, $before);
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 	 * @return \Ajax\semantic\html\elements\html5\HtmlImg
 	 */
 	public function addAvatarImage($src, $alt="", $before=true) {
-		$img=$this->addImage($src,$alt,$before);
+		$img=$this->addImage($src, $alt, $before);
 		$img->setClass("ui image");
 		$img->asAvatar();
 		return $img;
@@ -98,7 +98,7 @@ 
 	* @return \Ajax\semantic\html\elements\html5\HtmlImg
 	*/
 	public function addImage($src, $alt="", $before=true) {
-		$img=new HtmlImg("image-" . $this->identifier, $src, $alt);
+		$img=new HtmlImg("image-".$this->identifier, $src, $alt);
 		$img->setClass("");
 		$this->addContent($img, $before);
 		return $img;
@@ -110,21 +110,21 @@ 
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
 	public function addDetail($detail) {
-		$div=new HtmlSemDoubleElement("detail-" . $this->identifier, $this->tagName,"detail");
+		$div=new HtmlSemDoubleElement("detail-".$this->identifier, $this->tagName, "detail");
 		$div->setContent($detail);
 		$this->addContent($div);
 		return $div;
 	}
 
 	public function asRibbon($direction=Direction::NONE) {
-		return $this->addToPropertyCtrl("class", $direction." ribbon", array ("ribbon","right ribbon","left ribbon" ));
+		return $this->addToPropertyCtrl("class", $direction." ribbon", array("ribbon", "right ribbon", "left ribbon"));
 	}
 
-	public function setAttached($side=Side::TOP,$direction=Direction::NONE){
-		if($direction!==Direction::NONE)
-			return $this->addToPropertyCtrl("class", $side." ".$direction." attached",Side::getConstantValues($direction." attached"));
+	public function setAttached($side=Side::TOP, $direction=Direction::NONE) {
+		if ($direction!==Direction::NONE)
+			return $this->addToPropertyCtrl("class", $side." ".$direction." attached", Side::getConstantValues($direction." attached"));
 		else
-			return $this->addToPropertyCtrl("class", $side." attached",Side::getConstantValues("attached"));
+			return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached"));
 	}
 
 	public static function ribbon($identifier, $caption) {

Braces +13 added lines, -10 removed lines

@@ -14,8 +14,9 @@ 
 	public function __construct($identifier, $caption="", $icon=NULL, $tagName="div") {
 		parent::__construct($identifier, $tagName, "ui label");
 		$this->content=$caption;
-		if (isset($icon)===true)
-			$this->addIcon($icon);
+		if (isset($icon)===true) {
+					$this->addIcon($icon);
+		}
 	}
 
 	/**
@@ -24,10 +25,11 @@ 
 	 * @return \Ajax\semantic\html\elements\HtmlLabel
 	 */
 	public function setPointing($value=Direction::NONE) {
-		if($value==="left" || $value==="right")
-			return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
-		else
-			return $this->addToPropertyCtrl("class", "pointing ".$value, Direction::getConstantValues("pointing",true));
+		if($value==="left" || $value==="right") {
+					return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
+		} else {
+					return $this->addToPropertyCtrl("class", "pointing ".$value, Direction::getConstantValues("pointing",true));
+		}
 	}
 
 	/**
@@ -121,10 +123,11 @@ 
 	}
 
 	public function setAttached($side=Side::TOP,$direction=Direction::NONE){
-		if($direction!==Direction::NONE)
-			return $this->addToPropertyCtrl("class", $side." ".$direction." attached",Side::getConstantValues($direction." attached"));
-		else
-			return $this->addToPropertyCtrl("class", $side." attached",Side::getConstantValues("attached"));
+		if($direction!==Direction::NONE) {
+					return $this->addToPropertyCtrl("class", $side." ".$direction." attached",Side::getConstantValues($direction." attached"));
+		} else {
+					return $this->addToPropertyCtrl("class", $side." attached",Side::getConstantValues("attached"));
+		}
 	}
 
 	public static function ribbon($identifier, $caption) {