phpMv / phpMv-UI

Ajax/semantic/components/Popup.php

Spacing +6 added lines, -6 removed lines

@@ -27,11 +27,11 @@ 
 	 * @return $this
 	 */
 	public function setOnShow($jsCode) {
-		$jsCode=str_ireplace("\"","%quote%", $jsCode);
+		$jsCode=str_ireplace("\"", "%quote%", $jsCode);
 		return $this->setParam("onShow", "%function(){".$jsCode."}%");
 	}
 
-	public function setExclusive($value){
+	public function setExclusive($value) {
 		return $this->setParam("exclusive", $value);
 	}
 
@@ -40,19 +40,19 @@ 
 	 * @param string $popup the css selector of the popup
 	 * @return \Ajax\semantic\components\Popup
 	 */
-	public function setPopup($popup){
+	public function setPopup($popup) {
 		return $this->setParam("popup", $popup);
 	}
 
-	public function setInline($value){
+	public function setInline($value) {
 		return $this->setParam("inline", $value);
 	}
 
-	public function setPosition($value){
+	public function setPosition($value) {
 		return $this->setParam("position", $value);
 	}
 
-	public function setSetFluidWidth($value){
+	public function setSetFluidWidth($value) {
 		return $this->setParam("setFluidWidth", $value);
 	}
 }

Ajax/semantic/traits/SemanticWidgetsTrait.php

Spacing +16 added lines, -16 removed lines

@@ -18,8 +18,8 @@ 
 	 * @param array $instances
 	 * @return DataTable
 	 */
-	public function dataTable($identifier,$model, $instances){
-		return $this->addHtmlComponent(new DataTable($identifier,$model,$instances));
+	public function dataTable($identifier, $model, $instances) {
+		return $this->addHtmlComponent(new DataTable($identifier, $model, $instances));
 	}
 
 	/**
@@ -28,8 +28,8 @@ 
 	 * @param array $instances
 	 * @return JsonDataTable
 	 */
-	public function jsonDataTable($identifier,$model, $instances){
-		return $this->addHtmlComponent(new JsonDataTable($identifier,$model,$instances));
+	public function jsonDataTable($identifier, $model, $instances) {
+		return $this->addHtmlComponent(new JsonDataTable($identifier, $model, $instances));
 	}
 
 	/**
@@ -37,8 +37,8 @@ 
 	 * @param object $instance
 	 * @return DataElement
 	 */
-	public function dataElement($identifier, $instance){
-		return $this->addHtmlComponent(new DataElement($identifier,$instance));
+	public function dataElement($identifier, $instance) {
+		return $this->addHtmlComponent(new DataElement($identifier, $instance));
 	}
 
 	/**
@@ -46,8 +46,8 @@ 
 	 * @param object $instance
 	 * @return DataForm
 	 */
-	public function dataForm($identifier, $instance){
-		return $this->addHtmlComponent(new DataForm($identifier,$instance));
+	public function dataForm($identifier, $instance) {
+		return $this->addHtmlComponent(new DataForm($identifier, $instance));
 	}
 
 	/**
@@ -55,8 +55,8 @@ 
 	 * @param object $instance
 	 * @return FormLogin
 	 */
-	public function defaultLogin($identifier,$instance=null){
-		return $this->addHtmlComponent(FormLogin::regular($identifier,$instance));
+	public function defaultLogin($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormLogin::regular($identifier, $instance));
 	}
 
 	/**
@@ -64,8 +64,8 @@ 
 	 * @param object $instance
 	 * @return FormLogin
 	 */
-	public function smallLogin($identifier,$instance=null){
-		return $this->addHtmlComponent(FormLogin::small($identifier,$instance));
+	public function smallLogin($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormLogin::small($identifier, $instance));
 	}
 
 	/**
@@ -73,8 +73,8 @@ 
 	 * @param object $instance
 	 * @return FormLogin
 	 */
-	public function segmentedLogin($identifier,$instance=null){
-		return $this->addHtmlComponent(FormLogin::attachedSegment($identifier,$instance));
+	public function segmentedLogin($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormLogin::attachedSegment($identifier, $instance));
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 	 * @param object $instance
 	 * @return FormAccount
 	 */
-	public function defaultAccount($identifier,$instance=null){
-		return $this->addHtmlComponent(FormAccount::regular($identifier,$instance));
+	public function defaultAccount($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormAccount::regular($identifier, $instance));
 	}
 }

Ajax/semantic/widgets/business/user/FormAccount.php

Spacing +30 added lines, -30 removed lines

@@ -10,61 +10,61 @@
 	 * @param string $identifier
 	 * @param object $modelInstance
 	 */
-	public function __construct($identifier,$modelInstance=null,$fieldsOrder=[],$fieldsDefinition=[],$fields=[],$captions=[],$separators=[]) {
-		parent::__construct($identifier,$modelInstance,$fieldsOrder,$fieldsDefinition,$fields,$captions,$separators);
+	public function __construct($identifier, $modelInstance=null, $fieldsOrder=[], $fieldsDefinition=[], $fields=[], $captions=[], $separators=[]) {
+		parent::__construct($identifier, $modelInstance, $fieldsOrder, $fieldsDefinition, $fields, $captions, $separators);
 	}
 
-	protected function getDefaultModelInstance(){
+	protected function getDefaultModelInstance() {
 		return new UserModel();
 	}
 
-	public static function regular($identifier,$modelInstance=null){
-		return new FormAccount($identifier,$modelInstance,
-				["message","login","password","passwordConf","email","submit","error"],
+	public static function regular($identifier, $modelInstance=null) {
+		return new FormAccount($identifier, $modelInstance,
+				["message", "login", "password", "passwordConf", "email", "submit", "error"],
 				["message"=>[["icon"=>"sign in"]],
 						"input0"=>[["rules"=>"empty"]],
-						"input1"=>[["inputType"=>"password","rules"=> ['minLength[6]', 'empty']]],
-						"input2"=>[["inputType"=>"password","rules"=> ['minLength[6]', 'empty', 'match[password]']]],
+						"input1"=>[["inputType"=>"password", "rules"=> ['minLength[6]', 'empty']]],
+						"input2"=>[["inputType"=>"password", "rules"=> ['minLength[6]', 'empty', 'match[password]']]],
 						"input3"=>[["rules"=>"email"]],
 						"submit"=>["green fluid"],
 						"message2"=>[["error"=>true]]],
-				["Account","login","password","passwordConf","email","submit","error"],
-				["Please enter your account informations","Login","Password","Password confirmation","Email address","Creation"],
-				[0,1,3,4,5,6]);
+				["Account", "login", "password", "passwordConf", "email", "submit", "error"],
+				["Please enter your account informations", "Login", "Password", "Password confirmation", "Email address", "Creation"],
+				[0, 1, 3, 4, 5, 6]);
 	}
 
-	public static function smallInline($identifier,$modelInstance=null){
-		$result=new FormAccount($identifier,$modelInstance,
-				["login","password","submit"],
-				["input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"submit"=>["green basic"]],
-				["login","password","submit"],
-				["","","Connection"],
+	public static function smallInline($identifier, $modelInstance=null) {
+		$result=new FormAccount($identifier, $modelInstance,
+				["login", "password", "submit"],
+				["input0"=>[["rules"=>"empty"]], "input1"=>[["inputType"=>"password", "rules"=>"empty"]], "submit"=>["green basic"]],
+				["login", "password", "submit"],
+				["", "", "Connection"],
 				[2]);
 			$result->addDividerBefore(0, "Connection");
 		return $result;
 	}
 
-	public static function small($identifier,$modelInstance=null){
-		$result=new FormAccount($identifier,$modelInstance,
-				["login","password","passwordConf","email","submit"],
+	public static function small($identifier, $modelInstance=null) {
+		$result=new FormAccount($identifier, $modelInstance,
+				["login", "password", "passwordConf", "email", "submit"],
 				[
 						"input0"=>[["rules"=>"empty"]],
-						"input1"=>[["inputType"=>"password","rules"=>['minLength[6]', 'empty']]],
-						"input2"=>[["inputType"=>"password","rules"=> ['minLength[6]', 'empty', 'match[password]']]],
+						"input1"=>[["inputType"=>"password", "rules"=>['minLength[6]', 'empty']]],
+						"input2"=>[["inputType"=>"password", "rules"=> ['minLength[6]', 'empty', 'match[password]']]],
 						"input3"=>[["rules"=>"email"]],
 						"submit"=>["green basic"]],
-				["login","password","passwordConf","email","submit"],
-				["Login","Password","Password confirmation","Email address","Creation"],
-				[1,2]);
+				["login", "password", "passwordConf", "email", "submit"],
+				["Login", "Password", "Password confirmation", "Email address", "Creation"],
+				[1, 2]);
 		$result->addDividerBefore(0, "Creation");
 		return $result;
 	}
 
-	public static function attachedSegment($identifier,$modelInstance=null){
-		$result=self::regular($identifier,$modelInstance);
-		$result->fieldAsMessage("message",["icon"=>"sign in","attached"=>true]);
-		$result->addWrapper("message",null,"<div class='ui attached segment'>");
-		$result->addWrapper("error", null,"</div>");
+	public static function attachedSegment($identifier, $modelInstance=null) {
+		$result=self::regular($identifier, $modelInstance);
+		$result->fieldAsMessage("message", ["icon"=>"sign in", "attached"=>true]);
+		$result->addWrapper("message", null, "<div class='ui attached segment'>");
+		$result->addWrapper("error", null, "</div>");
 		return $result;
 	}
 }

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

Spacing +6 added lines, -6 removed lines

@@ -13,7 +13,7 @@ 
 trait LabeledIconTrait {
 
 	abstract public function addToProperty($name, $value, $separator=" ");
-	abstract public function addContent($content,$before=false);
+	abstract public function addContent($content, $before=false);
 
 	/**
 	 * Adds an icon before or after
@@ -22,17 +22,17 @@ 
 	 * @param boolean $labeled
 	 * @return \Ajax\semantic\html\elements\HtmlIcon
 	 */
-	public function addIcon($icon,$before=true,$labeled=false){
+	public function addIcon($icon, $before=true, $labeled=false) {
 		$iconO=$icon;
-		if(\is_string($icon)){
+		if (\is_string($icon)) {
 			$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
 		}
-		if($labeled!==false){
-			$direction=($before===true)?Direction::LEFT:Direction::RIGHT;
+		if ($labeled!==false) {
+			$direction=($before===true) ?Direction::LEFT : Direction::RIGHT;
 			$this->addToProperty("class", $direction." labeled icon");
 			$this->tagName="div";
 		}
-		$this->addContent($iconO,$before);
+		$this->addContent($iconO, $before);
 		return $iconO;
 	}
 }

Ajax/semantic/components/Modal.php

Spacing +3 added lines, -3 removed lines

@@ -16,16 +16,16 @@
 		return $this;
 	}
 
-	public function showDimmer(){
+	public function showDimmer() {
 		return $this->setBehavior("hide dimmer");
 	}
 
-	public function setInverted(){
+	public function setInverted() {
 		$this->params["inverted"]=true;
 	}
 
 	public function setOnHidden($jsCode) {
-		$jsCode=str_ireplace("\"","%quote%", $jsCode);
+		$jsCode=str_ireplace("\"", "%quote%", $jsCode);
 		return $this->setParam("onHidden", "%function(){".$jsCode."}%");
 	}
 }

Ajax/semantic/html/content/table/HtmlTableContent.php

Braces +18 added lines, -12 removed lines

@@ -22,8 +22,9 @@ 
 	 */
 	public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) {
 		parent::__construct($identifier, $tagName, "");
-		if (isset($rowCount) && isset($colCount))
-			$this->setRowCount($rowCount, $colCount);
+		if (isset($rowCount) && isset($colCount)) {
+					$this->setRowCount($rowCount, $colCount);
+		}
 	}
 
 	/**
@@ -148,8 +149,9 @@ 
 			$values=\array_fill(0, $count, $values);
 			$isArray=false;
 		}
-		if (JArray::dimension($values) == 1 && $isArray)
-			$values=[ $values ];
+		if (JArray::dimension($values) == 1 && $isArray) {
+					$values=[ $values ];
+		}
 
 		$count=\min(\sizeof($values), $count);
 
@@ -193,8 +195,9 @@ 
 		$count=$this->count();
 		for($i=0; $i < $count; $i++) {
 			$index=$this->content[$i]->getColPosition($colIndex);
-			if ($index !== NULL)
-				$this->getCell($i, $index)->$function();
+			if ($index !== NULL) {
+							$this->getCell($i, $index)->$function();
+			}
 		}
 		return $this;
 	}
@@ -225,8 +228,9 @@ 
 	 */
 	public function getColCount() {
 		$result=0;
-		if ($this->count() > 0)
-			$result=$this->getItem(0)->count();
+		if ($this->count() > 0) {
+					$result=$this->getItem(0)->count();
+		}
 		return $result;
 	}
 
@@ -250,8 +254,9 @@ 
 
 	public function toDelete($rowIndex, $colIndex){
 		$row=$this->getItem($rowIndex);
-		if (isset($row) === true)
-			$row->toDelete($colIndex);
+		if (isset($row) === true) {
+					$row->toDelete($colIndex);
+		}
 		return $this;
 	}
 
@@ -349,8 +354,9 @@ 
 		foreach ( $rows as $row ) {
 			$cell=$row->getItem($colIndex);
 			$value=$cell->getContent();
-			if($functionExists)
-				$value=\call_user_func($function,$value);
+			if($functionExists) {
+							$value=\call_user_func($function,$value);
+			}
 			if($value!==$identiqual){
 				if($counter>0 && isset($cellToMerge)){
 					$cellToMerge->setRowspan($counter);

Spacing +38 added lines, -38 removed lines

@@ -11,7 +11,7 @@ 
  *
  */
 class HtmlTableContent extends HtmlSemCollection {
-	protected $_tdTagNames=[ "thead" => "th","tbody" => "td","tfoot" => "th" ];
+	protected $_tdTagNames=["thead" => "th", "tbody" => "td", "tfoot" => "th"];
 	protected $_merged=false;
 
 	/**
@@ -35,7 +35,7 @@ 
 	 */
 	public function setRowCount($rowCount, $colCount) {
 		$count=$this->count();
-		for($i=$count; $i < $rowCount; $i++) {
+		for ($i=$count; $i<$rowCount; $i++) {
 			$this->addItem($colCount);
 		}
 		return $this;
@@ -57,7 +57,7 @@ 
 		$tr=new HtmlTR("", $value);
 		$tr->setContainer($this, $count);
 		$tr->setTdTagName($this->_tdTagNames[$this->tagName]);
-		if (isset($value) === true) {
+		if (isset($value)===true) {
 			$tr->setColCount($value);
 		}
 		return $tr;
@@ -115,7 +115,7 @@ 
 	 */
 	public function setCellValue($row, $col, $value="") {
 		$cell=$this->getCell($row, $col);
-		if (isset($cell) === true) {
+		if (isset($cell)===true) {
 			$cell->setValue($value);
 		}
 		return $this;
@@ -126,7 +126,7 @@ 
 	 * @param mixed $values
 	 */
 	public function setValues($values=array()) {
-		return $this->_addOrSetValues($values, function(HtmlTR $row,$_values){$row->setValues($_values);});
+		return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {$row->setValues($_values); });
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 	 * @param mixed $values
 	 */
 	public function addValues($values=array()) {
-		return $this->_addOrSetValues($values, function(HtmlTR $row,$_values){$row->addValues($_values);});
+		return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {$row->addValues($_values); });
 	}
 
 	/**
@@ -142,21 +142,21 @@ 
 	 * @param mixed $values
 	 * @param callable $callback
 	 */
-	protected function _addOrSetValues($values,$callback) {
+	protected function _addOrSetValues($values, $callback) {
 		$count=$this->count();
 		$isArray=true;
 		if (!\is_array($values)) {
 			$values=\array_fill(0, $count, $values);
 			$isArray=false;
 		}
-		if (JArray::dimension($values) == 1 && $isArray)
-			$values=[ $values ];
+		if (JArray::dimension($values)==1 && $isArray)
+			$values=[$values];
 
 		$count=\min(\sizeof($values), $count);
 
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$row=$this->content[$i];
-			$callback($row,$values[$i]);
+			$callback($row, $values[$i]);
 		}
 		return $this;
 	}
@@ -167,7 +167,7 @@ 
 			$values=\array_fill(0, $count, $values);
 		}
 		$count=\min(\sizeof($values), $count);
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$this->getCell($i, $colIndex)->setValue($values[$i]);
 		}
 		return $this;
@@ -175,7 +175,7 @@ 
 
 	public function addColVariations($colIndex, $variations=array()) {
 		$count=$this->count();
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$this->getCell($i, $colIndex)->addVariations($variations);
 		}
 		return $this;
@@ -192,9 +192,9 @@ 
 
 	private function colAlign($colIndex, $function) {
 		$count=$this->count();
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$index=$this->content[$i]->getColPosition($colIndex);
-			if ($index !== NULL)
+			if ($index!==NULL)
 				$this->getCell($i, $index)->$function();
 		}
 		return $this;
@@ -226,7 +226,7 @@ 
 	 */
 	public function getColCount() {
 		$result=0;
-		if ($this->count() > 0)
+		if ($this->count()>0)
 			$result=$this->getItem(0)->count();
 		return $result;
 	}
@@ -240,7 +240,7 @@ 
 	public function delete($rowIndex, $colIndex=NULL) {
 		if (isset($colIndex)) {
 			$row=$this->getItem($rowIndex);
-			if (isset($row) === true) {
+			if (isset($row)===true) {
 				$row->delete($colIndex);
 			}
 		} else {
@@ -249,9 +249,9 @@ 
 		return $this;
 	}
 
-	public function toDelete($rowIndex, $colIndex){
+	public function toDelete($rowIndex, $colIndex) {
 		$row=$this->getItem($rowIndex);
-		if (isset($row) === true)
+		if (isset($row)===true)
 			$row->toDelete($colIndex);
 		return $this;
 	}
@@ -280,17 +280,17 @@ 
 	 */
 	public function conditionalCellFormat($callback, $format) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->conditionalCellFormat($callback, $format);
 		}
 		return $this;
 	}
 
-	public function conditionalColFormat($colIndex,$callback,$format){
+	public function conditionalColFormat($colIndex, $callback, $format) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$cell=$row->getItem($colIndex);
-			$cell->conditionnalCellFormat($callback,$format);
+			$cell->conditionnalCellFormat($callback, $format);
 		}
 		return $this;
 	}
@@ -302,17 +302,17 @@ 
 	 */
 	public function conditionalRowFormat($callback, $format) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->conditionalRowFormat($callback, $format);
 		}
 		return $this;
 	}
 
-	public function hideColumn($colIndex){
+	public function hideColumn($colIndex) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$cell=$row->getItem($colIndex);
-			$cell->addToProperty("style","display:none;");
+			$cell->addToProperty("style", "display:none;");
 		}
 		return $this;
 	}
@@ -323,7 +323,7 @@ 
 	 */
 	public function applyCells($callback) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->applyCells($callback);
 		}
 		return $this;
@@ -335,25 +335,25 @@ 
 	 */
 	public function applyRows($callback) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->apply($callback);
 		}
 		return $this;
 	}
 
-	public function mergeIdentiqualValues($colIndex,$function="strip_tags"){
+	public function mergeIdentiqualValues($colIndex, $function="strip_tags") {
 		$rows=$this->content;
 		$identiqual=null;
 		$counter=0;
 		$cellToMerge=null;
 		$functionExists=\function_exists($function);
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$cell=$row->getItem($colIndex);
 			$value=$cell->getContent();
-			if($functionExists)
-				$value=\call_user_func($function,$value);
-			if($value!==$identiqual){
-				if($counter>0 && isset($cellToMerge)){
+			if ($functionExists)
+				$value=\call_user_func($function, $value);
+			if ($value!==$identiqual) {
+				if ($counter>0 && isset($cellToMerge)) {
 					$cellToMerge->setRowspan($counter);
 				}
 				$counter=0;
@@ -362,17 +362,17 @@ 
 			}
 			$counter++;
 		}
-		if($counter>0 && isset($cellToMerge)){
+		if ($counter>0 && isset($cellToMerge)) {
 			$cellToMerge->setRowspan($counter);
 		}
 		return $this;
 	}
 
-	public function _isMerged(){
+	public function _isMerged() {
 		return $this->_merged;
 	}
 
-	public function _setMerged($value){
+	public function _setMerged($value) {
 		$this->_merged=$value;
 		return $this;
 	}

Ajax/semantic/html/content/table/HtmlTD.php

Braces +9 added lines, -6 removed lines

@@ -84,15 +84,17 @@ 
 
 	public function getColspan() {
 		$colspan=1;
-		if (\array_key_exists("colspan", $this->properties))
-			$colspan=$this->getProperty("colspan");
+		if (\array_key_exists("colspan", $this->properties)) {
+					$colspan=$this->getProperty("colspan");
+		}
 		return $colspan;
 	}
 
 	public function getRowspan() {
 		$rowspan=1;
-		if (\array_key_exists("rowspan", $this->properties))
-			$rowspan=$this->getProperty("rowspan");
+		if (\array_key_exists("rowspan", $this->properties)) {
+					$rowspan=$this->getProperty("rowspan");
+		}
 		return $rowspan;
 	}
 
@@ -129,8 +131,9 @@ 
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(!$this->_deleted)
-			return parent::compile();
+		if(!$this->_deleted) {
+					return parent::compile();
+		}
 		return;
 	}
 }

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
 use Ajax\JsUtils;
 
 class HtmlTD extends HtmlSemDoubleElement {
-	use TextAlignmentTrait,TableElementTrait;
+	use TextAlignmentTrait, TableElementTrait;
 	private $_container;
 	private $_row;
 	private $_col;
@@ -28,8 +28,8 @@ 
 	 */
 	public function __construct($identifier, $content=NULL, $tagName="td") {
 		parent::__construct($identifier, $tagName, "", $content);
-		$this->_variations=[ Variation::COLLAPSING ];
-		$this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ];
+		$this->_variations=[Variation::COLLAPSING];
+		$this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED];
 	}
 
 	public function setContainer($container, $row, $col) {
@@ -49,8 +49,8 @@ 
 	}
 
 	public function setRowspan($rowspan) {
-		$to=min($this->_container->count(), $this->_row + $rowspan - 1);
-		for($i=$to; $i > $this->_row; $i--) {
+		$to=min($this->_container->count(), $this->_row+$rowspan-1);
+		for ($i=$to; $i>$this->_row; $i--) {
 			$this->_container->toDelete($i, $this->_col);
 		}
 		$this->setProperty("rowspan", $rowspan);
@@ -58,7 +58,7 @@ 
 	}
 
 	public function mergeRow() {
-		if(!$this->_rowMerged){
+		if (!$this->_rowMerged) {
 			$this->_rowMerged=true;
 			return $this->setRowspan($this->_container->count());
 		}
@@ -66,7 +66,7 @@ 
 	}
 
 	public function mergeCol() {
-		if(!$this->_colMerged){
+		if (!$this->_colMerged) {
 			$this->_colMerged=true;
 			return $this->setColspan($this->_container->getRow($this->_row)->count());
 		}
@@ -74,9 +74,9 @@ 
 	}
 
 	public function setColspan($colspan) {
-		$to=min($this->_container->getRow($this->_row)->count(), $this->_col + $colspan - 1);
-		for($i=$to; $i > $this->_col; $i--) {
-			$this->_container->toDelete($this->_row, $this->_col + 1);
+		$to=min($this->_container->getRow($this->_row)->count(), $this->_col+$colspan-1);
+		for ($i=$to; $i>$this->_col; $i--) {
+			$this->_container->toDelete($this->_row, $this->_col+1);
 		}
 		$this->setProperty("colspan", $colspan);
 		return $this->_container->_setMerged(true);
@@ -115,21 +115,21 @@ 
 		return $this->addToProperty("class", "selectable");
 	}
 
-	public function setWidth($width){
+	public function setWidth($width) {
 		if (\is_int($width)) {
-			$width=Wide::getConstants()["W" . $width];
+			$width=Wide::getConstants()["W".$width];
 		}
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
-		return $this->addToPropertyCtrl("class", "wide", array ("wide" ));
+		return $this->addToPropertyCtrl("class", "wide", array("wide"));
 	}
 
-	public function toDelete(){
+	public function toDelete() {
 		$this->_deleted=true;
 		return $this;
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(!$this->_deleted)
+		if (!$this->_deleted)
 			return parent::compile();
 		return;
 	}

Ajax/semantic/html/modules/HtmlModal.php

Braces +7 added lines, -6 removed lines

@@ -43,8 +43,7 @@ 
 			foreach ($actions as $action){
 				$this->addAction($action);
 			}
-		}
-		else{
+		} else{
 			$this->addAction($actions);
 		}
 		return $this;
@@ -64,8 +63,9 @@ 
 				$class="cancel";
 			}
 			$action=new HtmlButton("action-".$this->identifier."-".\sizeof($this->content["actions"]->getContent()),$action);
-			if($class!=="")
-				$action->addToProperty("class", $class);
+			if($class!=="") {
+							$action->addToProperty("class", $class);
+			}
 		}
 		return $this->addElementInPart($action, "actions");
 	}
@@ -174,8 +174,9 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if(isset($this->_bsComponent)===false)
-			$this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts);
+		if(isset($this->_bsComponent)===false) {
+					$this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts);
+		}
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;
 	}

Spacing +50 added lines, -50 removed lines

@@ -15,36 +15,36 @@ 
 	protected $_paramParts=array();
 
 	public function __construct($identifier, $header="", $content="", $actions=null) {
-		parent::__construct($identifier, "div","ui modal");
-		if(isset($header)){
+		parent::__construct($identifier, "div", "ui modal");
+		if (isset($header)) {
 			$this->setHeader($header);
 		}
-		if(isset($content)){
+		if (isset($content)) {
 			$this->setContent($content);
 		}
-		if(isset($actions)){
+		if (isset($actions)) {
 			$this->setActions($actions);
 		}
 	}
 
 	public function setHeader($value) {
-		$this->content["header"]=new HtmlSemDoubleElement("header-" . $this->identifier, "a", "header", $value);
+		$this->content["header"]=new HtmlSemDoubleElement("header-".$this->identifier, "a", "header", $value);
 		return $this;
 	}
 
 	public function setContent($value) {
-		$this->content["content"]=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "content", $value);
+		$this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content", $value);
 		return $this;
 	}
 
 	public function setActions($actions) {
-		$this->content["actions"]=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "actions");
-		if(\is_array($actions)){
-			foreach ($actions as $action){
+		$this->content["actions"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "actions");
+		if (\is_array($actions)) {
+			foreach ($actions as $action) {
 				$this->addAction($action);
 			}
 		}
-		else{
+		else {
 			$this->addAction($actions);
 		}
 		return $this;
@@ -54,17 +54,17 @@ 
 	 * @param string|BaseHtml $action
 	 * @return HtmlButton
 	 */
-	public function addAction($action){
-		if(!$action instanceof BaseHtml){
+	public function addAction($action) {
+		if (!$action instanceof BaseHtml) {
 			$class="";
-			if(\array_search($action, ["Okay","Yes","Validate"])!==false){
+			if (\array_search($action, ["Okay", "Yes", "Validate"])!==false) {
 				$class="approve";
 			}
-			if(\array_search($action, ["Close","Cancel","No"])!==false){
+			if (\array_search($action, ["Close", "Cancel", "No"])!==false) {
 				$class="cancel";
 			}
-			$action=new HtmlButton("action-".$this->identifier."-".\sizeof($this->content["actions"]->getContent()),$action);
-			if($class!=="")
+			$action=new HtmlButton("action-".$this->identifier."-".\sizeof($this->content["actions"]->getContent()), $action);
+			if ($class!=="")
 				$action->addToProperty("class", $class);
 		}
 		return $this->addElementInPart($action, "actions");
@@ -74,66 +74,66 @@ 
 	 * @param int $index
 	 * @return HtmlButton
 	 */
-	public function getAction($index){
+	public function getAction($index) {
 		return $this->content["actions"]->getContent()[$index];
 	}
 
-	public function addContent($content,$before=false){
-		$this->content["content"]->addContent($content,$before);
+	public function addContent($content, $before=false) {
+		$this->content["content"]->addContent($content, $before);
 		return $this;
 	}
 
-	public function addImageContent($image,$description=NULL){
+	public function addImageContent($image, $description=NULL) {
 		$content=$this->content["content"];
-		if(isset($description)){
-			$description=new HtmlSemDoubleElement("description-".$this->identifier,"div","description",$description);
-			$content->addContent($description,true);
+		if (isset($description)) {
+			$description=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $description);
+			$content->addContent($description, true);
 		}
-		if($image!==""){
-			$img=new HtmlImage("image-".$this->identifier,$image,"","medium");
-			$content->addContent($img,true);
-			$content->addToProperty("class","image");
+		if ($image!=="") {
+			$img=new HtmlImage("image-".$this->identifier, $image, "", "medium");
+			$content->addContent($img, true);
+			$content->addToProperty("class", "image");
 		}
 		return $this;
 	}
 
-	public function addIconContent($icon,$description=NULL){
+	public function addIconContent($icon, $description=NULL) {
 		$content=$this->content["content"];
-		if(isset($description)){
-			$description=new HtmlSemDoubleElement("description-".$this->identifier,"div","description",$description);
-			$content->addContent($description,true);
+		if (isset($description)) {
+			$description=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $description);
+			$content->addContent($description, true);
 		}
-		if($icon!==""){
-			$img=new HtmlIcon("image-".$this->identifier,$icon);
-			$content->addContent($img,true);
-			$content->addToProperty("class","image");
+		if ($icon!=="") {
+			$img=new HtmlIcon("image-".$this->identifier, $icon);
+			$content->addContent($img, true);
+			$content->addToProperty("class", "image");
 		}
 		return $this;
 	}
 
-	private function addElementInPart($element,$part) {
+	private function addElementInPart($element, $part) {
 		$this->content[$part]->addContent($element);
 		return $element;
 	}
 
-	public function showDimmer($value){
-		$value=$value?"show":"hide";
+	public function showDimmer($value) {
+		$value=$value ? "show" : "hide";
 		$this->_paramParts[]=["'".$value." dimmer'"];
 		return $this;
 	}
 
-	public function setInverted($recursive=true){
+	public function setInverted($recursive=true) {
 		$this->_params["inverted"]=true;
 		return $this;
 	}
 
-	public function setBasic(){
+	public function setBasic() {
 		return $this->addToProperty("class", "basic");
 	}
 
 
-	public function setTransition($value){
-		$this->_paramParts[]=["'setting'","'transition'","'".$value."'"];
+	public function setTransition($value) {
+		$this->_paramParts[]=["'setting'", "'transition'", "'".$value."'"];
 	}
 
 	/**
@@ -143,8 +143,8 @@ 
 	 * @param string $viewName
 	 * @param $params The parameters to pass to the view
 	 */
-	public function renderView(JsUtils $js,$initialController,$viewName, $params=array()) {
-		return $this->setContent($js->renderContent($initialController, $viewName,$params));
+	public function renderView(JsUtils $js, $initialController, $viewName, $params=array()) {
+		return $this->setContent($js->renderContent($initialController, $viewName, $params));
 	}
 
 	/**
@@ -155,8 +155,8 @@ 
 	 * @param string $actionName the action name
 	 * @param array $params
 	 */
-	public function forward(JsUtils $js,$initialControllerInstance,$controllerName,$actionName,$params=NULL){
-		return $this->setContent($js->forward($initialControllerInstance, $controllerName, $actionName,$params));
+	public function forward(JsUtils $js, $initialControllerInstance, $controllerName, $actionName, $params=NULL) {
+		return $this->setContent($js->forward($initialControllerInstance, $controllerName, $actionName, $params));
 	}
 
 	/**
@@ -166,7 +166,7 @@ 
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		$this->content=JArray::sortAssociative($this->content, ["header","content","actions" ]);
+		$this->content=JArray::sortAssociative($this->content, ["header", "content", "actions"]);
 		return parent::compile($js, $view);
 	}
 	/*
@@ -174,8 +174,8 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if(isset($this->_bsComponent)===false)
-			$this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts);
+		if (isset($this->_bsComponent)===false)
+			$this->_bsComponent=$js->semantic()->modal("#".$this->identifier, $this->_params, $this->_paramParts);
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;
 	}
@@ -188,7 +188,7 @@ 
 		return $this->jsDo("hide");
 	}
 
-	public function onHidden($js){
+	public function onHidden($js) {
 		$this->_params["onHidden"]=$js;
 	}
 }

Ajax/semantic/html/elements/HtmlButton.php

Spacing +23 added lines, -23 removed lines

@@ -55,7 +55,7 @@ 
 	}
 
 	public function setFocusable($value=true) {
-		if ($value === true)
+		if ($value===true)
 			$this->setProperty("tabindex", "0");
 		else {
 			$this->removeProperty("tabindex");
@@ -65,14 +65,14 @@ 
 
 	public function setAnimated($content, $animation="") {
 		$this->setTagName("div");
-		$this->addToProperty("class", "animated " . $animation);
-		$visible=new HtmlSemDoubleElement("visible-" . $this->identifier, "div");
+		$this->addToProperty("class", "animated ".$animation);
+		$visible=new HtmlSemDoubleElement("visible-".$this->identifier, "div");
 		$visible->setClass("visible content");
 		$visible->setContent($this->content);
-		$hidden=new HtmlSemDoubleElement("hidden-" . $this->identifier, "div");
+		$hidden=new HtmlSemDoubleElement("hidden-".$this->identifier, "div");
 		$hidden->setClass("hidden content");
 		$hidden->setContent($content);
-		$this->content=array ($visible,$hidden );
+		$this->content=array($visible, $hidden);
 		return $hidden;
 	}
 
@@ -84,7 +84,7 @@ 
 	public function asIcon($icon) {
 		$iconO=$icon;
 		if (\is_string($icon)) {
-			$iconO=new HtmlIcon("icon-" . $this->identifier, $icon);
+			$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
 		}
 		$this->addToProperty("class", "icon");
 		$this->content=$iconO;
@@ -104,17 +104,17 @@ 
 	 * @return HtmlLabel
 	 */
 	public function addLabel($label, $before=false, $icon=NULL) {
-		$this->tagName="div";$prefix="";
-		if($before)
+		$this->tagName="div"; $prefix="";
+		if ($before)
 			$prefix="left ";
 		$this->addToProperty("class", $prefix."labeled");
 		$isIcon=(isset($this->content[0]) && $this->content[0] instanceof HtmlIcon);
-		$this->content=new HtmlButton("button-" . $this->identifier, $this->content);
-		if($isIcon){
+		$this->content=new HtmlButton("button-".$this->identifier, $this->content);
+		if ($isIcon) {
 			$this->content->addClass("icon");
 		}
 		$this->content->setTagName("div");
-		$label=new HtmlLabel("label-" . $this->identifier, $label, $icon,"a");
+		$label=new HtmlLabel("label-".$this->identifier, $label, $icon, "a");
 		$label->setBasic();
 		$this->addContent($label, $before);
 		return $label;
@@ -126,7 +126,7 @@ 
 	 */
 	public function fromArray($array) {
 		$array=parent::fromArray($array);
-		foreach ( $array as $key => $value ) {
+		foreach ($array as $key => $value) {
 			$this->setProperty($key, $value);
 		}
 		return $array;
@@ -140,10 +140,10 @@ 
 		return $this->addToProperty("class", "positive");
 	}
 
-	public function setColor($color){
-		if(\is_array($this->content)){
-			foreach ($this->content as $content){
-				if($content instanceof HtmlButton)
+	public function setColor($color) {
+		if (\is_array($this->content)) {
+			foreach ($this->content as $content) {
+				if ($content instanceof HtmlButton)
 					$content->setColor($color);
 			}
 		}
@@ -201,7 +201,7 @@ 
 	 * @return HtmlButton
 	 */
 	public static function social($identifier, $social, $value=NULL) {
-		if ($value === NULL)
+		if ($value===NULL)
 			$value=\ucfirst($social);
 		$return=new HtmlButton($identifier, $value);
 		$return->addIcon($social);
@@ -238,8 +238,8 @@ 
 	 * {@inheritDoc}
 	 * @see HtmlSemDoubleElement::asLink()
 	 */
-	public function asLink($href=NULL,$target=NULL) {
-		parent::asLink($href,$target);
+	public function asLink($href=NULL, $target=NULL) {
+		parent::asLink($href, $target);
 		return $this;
 	}
 
@@ -252,10 +252,10 @@ 
 	 * @param string $icon
 	 * @return HtmlButtonGroups
 	 */
-	public static function dropdown($identifier,$value,$items=[],$asCombo=false,$icon=null){
-		$result=new HtmlButtonGroups($identifier,[$value]);
-		$result->addDropdown($items,$asCombo);
-		if(isset($icon))
+	public static function dropdown($identifier, $value, $items=[], $asCombo=false, $icon=null) {
+		$result=new HtmlButtonGroups($identifier, [$value]);
+		$result->addDropdown($items, $asCombo);
+		if (isset($icon))
 			$result->setIcon($icon);
 		return $result;
 	}

Braces +17 added lines, -13 removed lines

@@ -55,9 +55,9 @@ 
 	}
 
 	public function setFocusable($value=true) {
-		if ($value === true)
-			$this->setProperty("tabindex", "0");
-		else {
+		if ($value === true) {
+					$this->setProperty("tabindex", "0");
+		} else {
 			$this->removeProperty("tabindex");
 		}
 		return $this;
@@ -105,8 +105,9 @@ 
 	 */
 	public function addLabel($label, $before=false, $icon=NULL) {
 		$this->tagName="div";$prefix="";
-		if($before)
-			$prefix="left ";
+		if($before) {
+					$prefix="left ";
+		}
 		$this->addToProperty("class", $prefix."labeled");
 		$isIcon=(isset($this->content[0]) && $this->content[0] instanceof HtmlIcon);
 		$this->content=new HtmlButton("button-" . $this->identifier, $this->content);
@@ -143,12 +144,13 @@ 
 	public function setColor($color){
 		if(\is_array($this->content)){
 			foreach ($this->content as $content){
-				if($content instanceof HtmlButton)
-					$content->setColor($color);
+				if($content instanceof HtmlButton) {
+									$content->setColor($color);
+				}
 			}
+		} else {
+					parent::setColor($color);
 		}
-		else
-			parent::setColor($color);
 		return $this;
 	}
 
@@ -201,8 +203,9 @@ 
 	 * @return HtmlButton
 	 */
 	public static function social($identifier, $social, $value=NULL) {
-		if ($value === NULL)
-			$value=\ucfirst($social);
+		if ($value === NULL) {
+					$value=\ucfirst($social);
+		}
 		$return=new HtmlButton($identifier, $value);
 		$return->addIcon($social);
 		return $return->addToPropertyCtrl("class", $social, Social::getConstants());
@@ -255,8 +258,9 @@ 
 	public static function dropdown($identifier,$value,$items=[],$asCombo=false,$icon=null){
 		$result=new HtmlButtonGroups($identifier,[$value]);
 		$result->addDropdown($items,$asCombo);
-		if(isset($icon))
-			$result->setIcon($icon);
+		if(isset($icon)) {
+					$result->setIcon($icon);
+		}
 		return $result;
 	}
 }