phpMv / phpMv-UI

Ajax/semantic/html/modules/HtmlTab.php

Spacing +43 added lines, -43 removed lines

@@ -18,15 +18,15 @@ 
  */
 class HtmlTab extends HtmlSemCollection {
 
-	protected $params = [];
+	protected $params=[];
 
-	protected $_activated = false;
+	protected $_activated=false;
 
-	public function __construct($identifier, $tabs = array()) {
+	public function __construct($identifier, $tabs=array()) {
 		parent::__construct($identifier, "div", "");
-		$menu = new HtmlMenu("menu" . $this->identifier);
+		$menu=new HtmlMenu("menu".$this->identifier);
 		$menu->asTab(false)->setAttachment(NULL, Side::TOP);
-		$this->content["menu"] = $menu;
+		$this->content["menu"]=$menu;
 		$this->addItems($tabs);
 	}
 
@@ -37,18 +37,18 @@ 
 	 * @return HtmlSegment
 	 */
 	protected function createItem($value) {
-		$count = $this->count();
-		$title = $value;
-		$content = NULL;
+		$count=$this->count();
+		$title=$value;
+		$content=NULL;
 		if (\is_array($value)) {
-			$title = @$value[0];
-			$content = @$value[1];
+			$title=@$value[0];
+			$content=@$value[1];
 		}
-		$menuItem = $this->content["menu"]->addItem($title);
+		$menuItem=$this->content["menu"]->addItem($title);
 		$menuItem->addToProperty("data-tab", $menuItem->getIdentifier());
 		$menuItem->removeProperty("href");
-		$result = $this->createSegment($count, $content, $menuItem->getIdentifier());
-		$result->menuTab = $menuItem;
+		$result=$this->createSegment($count, $content, $menuItem->getIdentifier());
+		$result->menuTab=$menuItem;
 		return $result;
 	}
 
@@ -60,7 +60,7 @@ 
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
 	private function createSegment($count, $content, $datatab) {
-		$segment = new HtmlSegment("item-" . $this->identifier . "-" . $count, $content);
+		$segment=new HtmlSegment("item-".$this->identifier."-".$count, $content);
 		$segment->setAttachment(NULL, Side::BOTTOM)
 			->addToProperty("class", "tab")
 			->addToProperty("data-tab", $datatab);
@@ -77,10 +77,10 @@ 
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
 	public function setTabContent($index, $content) {
-		$menu = $this->content["menu"];
-		if ($index < $menu->count()) {
-			if (isset($this->content[$index]) === false) {
-				$this->content[$index] = $this->createSegment($index, $content, $menu->getItem($index)
+		$menu=$this->content["menu"];
+		if ($index<$menu->count()) {
+			if (isset($this->content[$index])===false) {
+				$this->content[$index]=$this->createSegment($index, $content, $menu->getItem($index)
 					->getIdentifier());
 			} else
 				$this->content[$index]->setContent($content);
@@ -95,8 +95,8 @@ 
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
 	public function setTabsContent($contents) {
-		$size = \sizeof($contents);
-		for ($i = 0; $i < $size; $i ++) {
+		$size=\sizeof($contents);
+		for ($i=0; $i<$size; $i++) {
 			$this->setTabContent($i, $contents[$i]);
 		}
 		return $this;
@@ -109,11 +109,11 @@ 
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
 	public function activate($index) {
-		$item = $this->content["menu"]->getItem($index);
-		if ($item != null) {
+		$item=$this->content["menu"]->getItem($index);
+		if ($item!=null) {
 			$item->setActive(true);
 			$this->content[$index]->setActive(true);
-			$this->_activated = true;
+			$this->_activated=true;
 		}
 		return $this;
 	}
@@ -147,9 +147,9 @@ 
 	 * @param array $params
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function forwardTab($index, JsUtils $js, $title, $initialController, $controller, $action, $params = array()) {
+	public function forwardTab($index, JsUtils $js, $title, $initialController, $controller, $action, $params=array()) {
 		if (\array_key_exists($index, $this->content)) {
-			$this->content[$index] = $js->forward($initialController, $controller, $action, $params);
+			$this->content[$index]=$js->forward($initialController, $controller, $action, $params);
 			return $this->content[$index];
 		}
 
@@ -170,9 +170,9 @@ 
 	 *        	The parameters to pass to the view
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function renderViewTab($index, JsUtils $js, $title, $initialController, $viewName, $params = array()) {
+	public function renderViewTab($index, JsUtils $js, $title, $initialController, $viewName, $params=array()) {
 		if (\array_key_exists($index, $this->content)) {
-			$this->content[$index] = $js->renderContent($initialController, $viewName, $params);
+			$this->content[$index]=$js->renderContent($initialController, $viewName, $params);
 			return $this->content[$index];
 		}
 		return $this->addAndRenderViewTab($js, $title, $initialController, $viewName, $params);
@@ -192,10 +192,10 @@ 
 	 * @param array $params
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function addAndForwardTab(JsUtils $js, $title, $initialController, $controller, $action, $params = array()) {
+	public function addAndForwardTab(JsUtils $js, $title, $initialController, $controller, $action, $params=array()) {
 		\ob_start();
 		$js->forward($initialController, $controller, $action, $params);
-		$content = \ob_get_clean();
+		$content=\ob_get_clean();
 		return $this->addTab($title, $content);
 	}
 
@@ -211,11 +211,11 @@ 
 	 *        	The parameters to pass to the view
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function addAndRenderViewTab(JsUtils $js, $title, $initialController, $viewName, $params = array()) {
+	public function addAndRenderViewTab(JsUtils $js, $title, $initialController, $viewName, $params=array()) {
 		return $this->addTab($title, $js->renderContent($initialController, $viewName, $params));
 	}
 
-	public function setPointing($value = Direction::NONE) {
+	public function setPointing($value=Direction::NONE) {
 		return $this->content["menu"]->setPointing($value);
 	}
 
@@ -250,25 +250,25 @@ 
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
 	public function setMenu($menu) {
-		$contentSize = \sizeof($this->content);
-		for ($i = 0; $i < $contentSize; $i ++) {
-			if ($menu->getItem($i) !== NULL) {
+		$contentSize=\sizeof($this->content);
+		for ($i=0; $i<$contentSize; $i++) {
+			if ($menu->getItem($i)!==NULL) {
 				if (isset($this->content[$i])) {
 					$menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab"));
 				}
 			}
 		}
-		$menuSize = $menu->count();
-		for ($i = 0; $i < $menuSize; $i ++) {
+		$menuSize=$menu->count();
+		for ($i=0; $i<$menuSize; $i++) {
 			$menu->getItem($i)->removeProperty("href");
-			if (isset($this->content[$i]) === false) {
-				$this->content[$i] = $this->createSegment($i, "New content", $menu->getItem($i)
+			if (isset($this->content[$i])===false) {
+				$this->content[$i]=$this->createSegment($i, "New content", $menu->getItem($i)
 					->getIdentifier());
 			}
 			$menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab"));
 		}
 
-		$this->content["menu"] = $menu;
+		$this->content["menu"]=$menu;
 		return $this;
 	}
 
@@ -277,14 +277,14 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if (isset($this->_bsComponent) === false)
-			$this->_bsComponent = $js->semantic()->tab("#" . $this->identifier . " .item", $this->params);
+		if (isset($this->_bsComponent)===false)
+			$this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item", $this->params);
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;
 	}
 
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_activated && $this->content["menu"]->count() > 0 && \sizeof($this->content) > 1)
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_activated && $this->content["menu"]->count()>0 && \sizeof($this->content)>1)
 			$this->activate(0);
 		return parent::compile($js, $view);
 	}

Braces +9 added lines, -6 removed lines

@@ -82,8 +82,9 @@ 
 			if (isset($this->content[$index]) === false) {
 				$this->content[$index] = $this->createSegment($index, $content, $menu->getItem($index)
 					->getIdentifier());
-			} else
-				$this->content[$index]->setContent($content);
+			} else {
+							$this->content[$index]->setContent($content);
+			}
 		}
 		return $this;
 	}
@@ -277,15 +278,17 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if (isset($this->_bsComponent) === false)
-			$this->_bsComponent = $js->semantic()->tab("#" . $this->identifier . " .item", $this->params);
+		if (isset($this->_bsComponent) === false) {
+					$this->_bsComponent = $js->semantic()->tab("#" . $this->identifier . " .item", $this->params);
+		}
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;
 	}
 
 	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_activated && $this->content["menu"]->count() > 0 && \sizeof($this->content) > 1)
-			$this->activate(0);
+		if (! $this->_activated && $this->content["menu"]->count() > 0 && \sizeof($this->content) > 1) {
+					$this->activate(0);
+		}
 		return parent::compile($js, $view);
 	}
 }

Ajax/semantic/components/Dropdown.php

Spacing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
 
 	public function __construct(JsUtils $js) {
 		parent::__construct($js);
-		$this->uiName = "dropdown";
+		$this->uiName="dropdown";
 	}
 
 	/**
@@ -56,10 +56,10 @@ 
 	}
 
 	public function setOnAdd($value) {
-		$this->params["onAdd"] = "%function(addedValue, addedText, \$addedChoice){" . $value . "}%";
+		$this->params["onAdd"]="%function(addedValue, addedText, \$addedChoice){".$value."}%";
 	}
 
 	public function setOnRemove($value) {
-		$this->params["onRemove"] = "%function(removedValue, removedText, \$removedChoice){" . $value . "}%";
+		$this->params["onRemove"]="%function(removedValue, removedText, \$removedChoice){".$value."}%";
 	}
 }

Ajax/semantic/html/modules/HtmlDropdown.php

Braces +18 added lines, -12 removed lines

@@ -141,8 +141,9 @@ 
 	}
 
 	public function addInput($name) {
-		if (! isset($name))
-			$name = "input-" . $this->identifier;
+		if (! isset($name)) {
+					$name = "input-" . $this->identifier;
+		}
 		$this->setAction("activate");
 		$this->input = new HtmlInput($name, "hidden");
 		$this->input->setIdentifier("input-" . $this->identifier);
@@ -293,24 +294,27 @@ 
 
 	public function asButton($floating = false) {
 		$this->removeArrow();
-		if ($floating)
-			$this->addToProperty("class", "floating");
+		if ($floating) {
+					$this->addToProperty("class", "floating");
+		}
 		$this->removePropertyValue("class", "selection");
 		return $this->addToProperty("class", "button");
 	}
 
 	public function asSelect($name = NULL, $multiple = false, $selection = true) {
 		$this->_multiple = $multiple;
-		if (isset($name))
-			$this->addInput($name);
+		if (isset($name)) {
+					$this->addInput($name);
+		}
 		if ($multiple) {
 			$this->addToProperty("class", "multiple");
 		}
 		if ($selection) {
-			if ($this->propertyContains("class", "button") === false)
-				$this->addToPropertyCtrl("class", "selection", array(
+			if ($this->propertyContains("class", "button") === false) {
+							$this->addToPropertyCtrl("class", "selection", array(
 					"selection"
 				));
+			}
 		}
 		return $this;
 	}
@@ -322,8 +326,9 @@ 
 
 	public function setSelect($name = NULL, $multiple = false) {
 		$this->_template = '<%tagName% id="%identifier%" %properties%>%items%</%tagName%>';
-		if (! isset($name))
-			$name = "select-" . $this->identifier;
+		if (! isset($name)) {
+					$name = "select-" . $this->identifier;
+		}
 		$this->input = null;
 		if ($multiple) {
 			$this->setProperty("multiple", true);
@@ -368,8 +373,9 @@ 
 			$this->setProperty("value", $value);
 		}
 		$textElement = $this->getElementById("text-" . $this->identifier, $this->content);
-		if (isset($textElement) && ($textElement instanceof HtmlDoubleElement) && ! $this->_multiple)
-			$textElement->setContent($value);
+		if (isset($textElement) && ($textElement instanceof HtmlDoubleElement) && ! $this->_multiple) {
+					$textElement->setContent($value);
+		}
 		return $this;
 	}
 

Spacing +94 added lines, -94 removed lines

@@ -13,17 +13,17 @@ 
 use Ajax\service\JArray;
 
 class HtmlDropdown extends HtmlSemDoubleElement {
-	use FieldTrait,LabeledIconTrait {
+	use FieldTrait, LabeledIconTrait {
 		addIcon as addIconP;
 	}
 
-	protected $mClass = "menu";
+	protected $mClass="menu";
 
-	protected $mTagName = "div";
+	protected $mTagName="div";
 
-	protected $items = array();
+	protected $items=array();
 
-	protected $_params = array(
+	protected $_params=array(
 		"action" => "nothing",
 		"on" => "hover",
 		"showOnFocus" => true
@@ -37,29 +37,29 @@ 
 
 	protected $_multiple;
 
-	public function __construct($identifier, $value = "", $items = array(), $associative = true) {
+	public function __construct($identifier, $value="", $items=array(), $associative=true) {
 		parent::__construct($identifier, "div");
-		$this->_template = include dirname(__FILE__) . '/../templates/tplDropdown.php';
+		$this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php';
 		$this->setProperty("class", "ui dropdown");
-		$this->_multiple = false;
-		$content = [];
-		$text = '';
+		$this->_multiple=false;
+		$content=[];
+		$text='';
 		if ($value instanceof HtmlSemDoubleElement) {
-			$text = $value;
-		} elseif ($value !== null) {
-			$text = new HtmlSemDoubleElement("text-" . $this->identifier, "div");
+			$text=$value;
+		} elseif ($value!==null) {
+			$text=new HtmlSemDoubleElement("text-".$this->identifier, "div");
 			$text->setClass("text");
 			$this->setValue($value);
 		}
-		if ($text != null) {
-			$content = [
+		if ($text!=null) {
+			$content=[
 				"text" => $text
 			];
 		}
-		$content["arrow"] = new HtmlIcon($identifier . "-icon", "dropdown");
-		$this->content = $content;
-		$this->tagName = "div";
-		$this->_associative = $associative;
+		$content["arrow"]=new HtmlIcon($identifier."-icon", "dropdown");
+		$this->content=$content;
+		$this->tagName="div";
+		$this->_associative=$associative;
 		$this->addItems($items);
 	}
 
@@ -71,16 +71,16 @@ 
 		return $this->input;
 	}
 
-	public function addItem($item, $value = NULL, $image = NULL, $description = NULL) {
-		$itemO = $this->beforeAddItem($item, $value, $image, $description);
-		$this->items[] = $itemO;
+	public function addItem($item, $value=NULL, $image=NULL, $description=NULL) {
+		$itemO=$this->beforeAddItem($item, $value, $image, $description);
+		$this->items[]=$itemO;
 		return $itemO;
 	}
 
-	public function addIcon($icon, $before = true, $labeled = false) {
+	public function addIcon($icon, $before=true, $labeled=false) {
 		$this->removeArrow();
 		$this->addIconP($icon, $before, $labeled);
-		$elm = $this->getElementById("text-" . $this->identifier, $this->content);
+		$elm=$this->getElementById("text-".$this->identifier, $this->content);
 		if (isset($elm)) {
 			$elm->setWrapAfter("");
 		}
@@ -88,8 +88,8 @@ 
 	}
 
 	public function addIcons($icons) {
-		$count = $this->count();
-		for ($i = 0; $i < \sizeof($icons) && $i < $count; $i ++) {
+		$count=$this->count();
+		for ($i=0; $i<\sizeof($icons) && $i<$count; $i++) {
 			$this->getItem($i)->addIcon($icons[$i]);
 		}
 	}
@@ -101,32 +101,32 @@ 
 	 * @param int $position
 	 * @return HtmlDropdownItem
 	 */
-	public function insertItem($item, $position = 0) {
-		$itemO = $this->beforeAddItem($item);
-		$start = array_slice($this->items, 0, $position);
-		$end = array_slice($this->items, $position);
-		$start[] = $item;
-		$this->items = array_merge($start, $end);
+	public function insertItem($item, $position=0) {
+		$itemO=$this->beforeAddItem($item);
+		$start=array_slice($this->items, 0, $position);
+		$end=array_slice($this->items, $position);
+		$start[]=$item;
+		$this->items=array_merge($start, $end);
 		return $itemO;
 	}
 
 	protected function removeArrow() {
-		if (\sizeof($this->content) > 1) {
+		if (\sizeof($this->content)>1) {
 			unset($this->content["arrow"]);
-			$this->content = \array_values($this->content);
+			$this->content=\array_values($this->content);
 		}
 	}
 
-	protected function beforeAddItem($item, $value = NULL, $image = NULL, $description = NULL) {
-		$itemO = $item;
+	protected function beforeAddItem($item, $value=NULL, $image=NULL, $description=NULL) {
+		$itemO=$item;
 		if (\is_array($item)) {
-			$description = JArray::getValue($item, "description", 3);
-			$value = JArray::getValue($item, "value", 1);
-			$image = JArray::getValue($item, "image", 2);
-			$item = JArray::getValue($item, "item", 0);
+			$description=JArray::getValue($item, "description", 3);
+			$value=JArray::getValue($item, "value", 1);
+			$image=JArray::getValue($item, "image", 2);
+			$item=JArray::getValue($item, "item", 0);
 		}
-		if (! $item instanceof HtmlDropdownItem) {
-			$itemO = new HtmlDropdownItem("dd-item-" . $this->identifier . "-" . \sizeof($this->items), $item, $value, $image, $description);
+		if (!$item instanceof HtmlDropdownItem) {
+			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items), $item, $value, $image, $description);
 		} elseif ($itemO instanceof HtmlDropdownItem) {
 			$this->addToProperty("class", "vertical");
 		}
@@ -142,11 +142,11 @@ 
 	}
 
 	public function addInput($name) {
-		if (! isset($name))
-			$name = "input-" . $this->identifier;
+		if (!isset($name))
+			$name="input-".$this->identifier;
 		$this->setAction("activate");
-		$this->input = new HtmlInput($name, "hidden");
-		$this->input->setIdentifier("input-" . $this->identifier);
+		$this->input=new HtmlInput($name, "hidden");
+		$this->input->setIdentifier("input-".$this->identifier);
 		return $this->input;
 	}
 
@@ -157,7 +157,7 @@ 
 	 * @param string $icon
 	 * @return HtmlDropdownItem
 	 */
-	public function addSearchInputItem($placeHolder = NULL, $icon = NULL) {
+	public function addSearchInputItem($placeHolder=NULL, $icon=NULL) {
 		return $this->addItem(HtmlDropdownItem::searchInput($placeHolder, $icon));
 	}
 
@@ -177,7 +177,7 @@ 
 	 * @param string $icon
 	 * @return HtmlDropdownItem
 	 */
-	public function addHeaderItem($caption = NULL, $icon = NULL) {
+	public function addHeaderItem($caption=NULL, $icon=NULL) {
 		return $this->addItem(HtmlDropdownItem::header($caption, $icon));
 	}
 
@@ -222,12 +222,12 @@ 
 	 * @return $this
 	 */
 	public function setPropertyValues($property, $values) {
-		$i = 0;
-		if (\is_array($values) === false) {
-			$values = \array_fill(0, $this->count(), $values);
+		$i=0;
+		if (\is_array($values)===false) {
+			$values=\array_fill(0, $this->count(), $values);
 		}
 		foreach ($values as $value) {
-			$c = $this->items[$i ++];
+			$c=$this->items[$i++];
 			if (isset($c)) {
 				$c->setProperty($property, $value);
 			} else {
@@ -261,12 +261,12 @@ 
 	 * @param boolean $dropdown
 	 */
 	public function asDropdown($dropdown) {
-		if ($dropdown === false) {
-			$this->_template = include dirname(__FILE__) . '/../templates/tplDropdownMenu.php';
-			$dropdown = "menu";
+		if ($dropdown===false) {
+			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
+			$dropdown="menu";
 		} else {
-			$dropdown = "dropdown";
-			$this->mClass = "menu";
+			$dropdown="dropdown";
+			$this->mClass="menu";
 		}
 		return $this->addToPropertyCtrl("class", $dropdown, array(
 			"menu",
@@ -292,7 +292,7 @@ 
 		));
 	}
 
-	public function asButton($floating = false) {
+	public function asButton($floating=false) {
 		$this->removeArrow();
 		if ($floating)
 			$this->addToProperty("class", "floating");
@@ -300,15 +300,15 @@ 
 		return $this->addToProperty("class", "button");
 	}
 
-	public function asSelect($name = NULL, $multiple = false, $selection = true) {
-		$this->_multiple = $multiple;
+	public function asSelect($name=NULL, $multiple=false, $selection=true) {
+		$this->_multiple=$multiple;
 		if (isset($name))
 			$this->addInput($name);
 		if ($multiple) {
 			$this->addToProperty("class", "multiple");
 		}
 		if ($selection) {
-			if ($this->propertyContains("class", "button") === false)
+			if ($this->propertyContains("class", "button")===false)
 				$this->addToPropertyCtrl("class", "selection", array(
 					"selection"
 				));
@@ -316,31 +316,31 @@ 
 		return $this;
 	}
 
-	public function asSearch($name = NULL, $multiple = false, $selection = true) {
+	public function asSearch($name=NULL, $multiple=false, $selection=true) {
 		$this->asSelect($name, $multiple, $selection);
 		return $this->addToProperty("class", "search");
 	}
 
-	public function setSelect($name = NULL, $multiple = false) {
-		$this->_template = '<%tagName% id="%identifier%" %properties%>%items%</%tagName%>';
-		if (! isset($name))
-			$name = "select-" . $this->identifier;
-		$this->input = null;
+	public function setSelect($name=NULL, $multiple=false) {
+		$this->_template='<%tagName% id="%identifier%" %properties%>%items%</%tagName%>';
+		if (!isset($name))
+			$name="select-".$this->identifier;
+		$this->input=null;
 		if ($multiple) {
 			$this->setProperty("multiple", true);
 			$this->addToProperty("class", "multiple");
 		}
 		$this->setAction("activate");
-		$this->tagName = "select";
+		$this->tagName="select";
 		$this->setProperty("name", $name);
-		$this->content = null;
+		$this->content=null;
 		foreach ($this->items as $item) {
 			$item->asOption();
 		}
 		return $this;
 	}
 
-	public function asSubmenu($pointing = NULL) {
+	public function asSubmenu($pointing=NULL) {
 		$this->setClass("ui dropdown link item");
 		if (isset($pointing)) {
 			$this->setPointing($pointing);
@@ -348,29 +348,29 @@ 
 		return $this;
 	}
 
-	public function setPointing($value = Direction::NONE) {
-		return $this->addToPropertyCtrl("class", $value . " pointing", Direction::getConstantValues("pointing"));
+	public function setPointing($value=Direction::NONE) {
+		return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
 	}
 
 	public function setValue($value) {
-		$this->value = $value;
+		$this->value=$value;
 		return $this;
 	}
 
 	public function setDefaultText($text) {
-		$this->content["text"] = new HtmlSemDoubleElement("", "div", "default text", $text);
+		$this->content["text"]=new HtmlSemDoubleElement("", "div", "default text", $text);
 		return $this;
 	}
 
 	private function applyValue() {
-		$value = $this->value;
+		$value=$this->value;
 		if (isset($this->input) && isset($value)) {
 			$this->input->setProperty("value", $value);
 		} else {
 			$this->setProperty("value", $value);
 		}
-		$textElement = $this->getElementById("text-" . $this->identifier, $this->content);
-		if (isset($textElement) && ($textElement instanceof HtmlDoubleElement) && ! $this->_multiple)
+		$textElement=$this->getElementById("text-".$this->identifier, $this->content);
+		if (isset($textElement) && ($textElement instanceof HtmlDoubleElement) && !$this->_multiple)
 			$textElement->setContent($value);
 		return $this;
 	}
@@ -380,9 +380,9 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if ($this->propertyContains("class", "simple") === false) {
-			if (isset($this->_bsComponent) === false) {
-				$this->_bsComponent = $js->semantic()->dropdown("#" . $this->identifier, $this->_params);
+		if ($this->propertyContains("class", "simple")===false) {
+			if (isset($this->_bsComponent)===false) {
+				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier, $this->_params);
 				$this->_bsComponent->setItemSelector(".item");
 			}
 			$this->addEventsOnRun($js);
@@ -397,31 +397,31 @@ 
 	}
 
 	public function setAction($action) {
-		$this->_params["action"] = $action;
+		$this->_params["action"]=$action;
 		return $this;
 	}
 
 	public function setOn($on) {
-		$this->_params["on"] = $on;
+		$this->_params["on"]=$on;
 		return $this;
 	}
 
 	public function setShowOnFocus($value) {
-		$this->_params["showOnFocus"] = $value;
+		$this->_params["showOnFocus"]=$value;
 		return $this;
 	}
 
 	public function setAllowAdditions($value) {
-		$this->_params["allowAdditions"] = $value;
+		$this->_params["allowAdditions"]=$value;
 		return $this;
 	}
 
 	public function setFullTextSearch($value) {
-		$this->_params["fullTextSearch"] = $value;
+		$this->_params["fullTextSearch"]=$value;
 		return $this;
 	}
 
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->applyValue();
 		return parent::compile($js, $view);
 	}
@@ -430,19 +430,19 @@ 
 		return $this->input;
 	}
 
-	public function setIcon($icon = "dropdown") {
-		$this->content["arrow"] = new HtmlIcon($this->identifier . "-icon", $icon);
+	public function setIcon($icon="dropdown") {
+		$this->content["arrow"]=new HtmlIcon($this->identifier."-icon", $icon);
 		return $this;
 	}
 
-	public function jsAddItem($caption, $value = null) {
-		$value = $value ?? $caption;
-		$js = "var first=$('#{$this->identifier} .item').first();if(first!=undefined){var newItem =first.clone();first.parent().append(newItem);newItem.html({$caption});newItem.attr('data-value',{$value}).removeClass('active filtered');}";
+	public function jsAddItem($caption, $value=null) {
+		$value=$value ?? $caption;
+		$js="var first=$('#{$this->identifier} .item').first();if(first!=undefined){var newItem =first.clone();first.parent().append(newItem);newItem.html({$caption});newItem.attr('data-value',{$value}).removeClass('active filtered');}";
 		return $js;
 	}
 
 	public function setClearable($value) {
-		$this->_params["clearable"] = $value;
+		$this->_params["clearable"]=$value;
 		return $this;
 	}
 
@@ -451,7 +451,7 @@ 
 	 * Parameters addedValue, addedText, $addedChoice
 	 */
 	public function setOnAdd($jsCode) {
-		$this->_params["onAdd"] = $jsCode;
+		$this->_params["onAdd"]=$jsCode;
 		return $this;
 	}
 
@@ -460,7 +460,7 @@ 
 	 * Parameters removedValue, removedText, $removedChoice
 	 */
 	public function setOnRemove($jsCode) {
-		$this->_params["onRemove"] = $jsCode;
+		$this->_params["onRemove"]=$jsCode;
 		return $this;
 	}
 }

Ajax/semantic/components/Dimmer.php

Spacing +5 added lines, -5 removed lines

@@ -7,18 +7,18 @@
 
 	public function __construct(JsUtils $js) {
 		parent::__construct($js);
-		$this->uiName = "dimmer";
+		$this->uiName="dimmer";
 	}
 
-	public function setOn($value = false) {
-		$this->params["on"] = $value;
+	public function setOn($value=false) {
+		$this->params["on"]=$value;
 	}
 
 	public function setOpacity($value) {
-		$this->params["opacity"] = $value;
+		$this->params["opacity"]=$value;
 	}
 
 	public function setClosable($value) {
-		$this->params["closable"] = $value;
+		$this->params["closable"]=$value;
 	}
 }

Ajax/semantic/html/modules/HtmlDimmer.php

Spacing +14 added lines, -14 removed lines

@@ -12,21 +12,21 @@ 
 
 	private $_inverted;
 
-	public function __construct($identifier, $content = NULL) {
+	public function __construct($identifier, $content=NULL) {
 		parent::__construct($identifier, "div", "ui dimmer");
 		$this->setContent($content);
-		$this->_inverted = false;
+		$this->_inverted=false;
 	}
 
 	public function setContent($content) {
-		$this->content = new HtmlSemDoubleElement("content-" . $this->identifier, "div", "content", new HtmlSemDoubleElement("", "div", "center", $content));
+		$this->content=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content", new HtmlSemDoubleElement("", "div", "center", $content));
 		return $this;
 	}
 
-	public function asIcon($icon, $title, $subHeader = NULL) {
-		$header = new HtmlHeader("header-" . $this->identifier);
+	public function asIcon($icon, $title, $subHeader=NULL) {
+		$header=new HtmlHeader("header-".$this->identifier);
 		$header->asIcon($icon, $title, $subHeader);
-		if ($this->_inverted === false)
+		if ($this->_inverted===false)
 			$header->setInverted();
 		return $this->setContent($header);
 	}
@@ -35,24 +35,24 @@ 
 		return $this->addToProperty("class", "page");
 	}
 
-	public function setInverted($recursive = true) {
+	public function setInverted($recursive=true) {
 		parent::setInverted($recursive);
-		$this->_inverted = true;
+		$this->_inverted=true;
 		return $this;
 	}
 
 	public function run(JsUtils $js) {
 		if ($this->_container instanceof HtmlSingleElement) {
-			$this->_bsComponent = $js->semantic()->dimmer("#" . $this->_container->getIdentifier(), $this->_params);
+			$this->_bsComponent=$js->semantic()->dimmer("#".$this->_container->getIdentifier(), $this->_params);
 		} else {
-			$this->_bsComponent = $js->semantic()->dimmer("#" . $this->identifier, $this->_params);
+			$this->_bsComponent=$js->semantic()->dimmer("#".$this->identifier, $this->_params);
 		}
 		return parent::run($js);
 	}
 
 	public function jsShow() {
 		if (isset($this->_container))
-			return '$("#.' . $this->_container->getIdentifier() . ').dimmer("show");';
+			return '$("#.'.$this->_container->getIdentifier().').dimmer("show");';
 	}
 
 	public function setBlurring() {
@@ -60,17 +60,17 @@ 
 	}
 
 	public function setParams($_params) {
-		$this->_params = $_params;
+		$this->_params=$_params;
 		return $this;
 	}
 
 	public function setContainer($_container) {
-		$this->_container = $_container;
+		$this->_container=$_container;
 		return $this;
 	}
 
 	public function setClosable($closable) {
-		$this->_params['closable'] = $closable;
+		$this->_params['closable']=$closable;
 		return $this;
 	}
 }

Braces +6 added lines, -4 removed lines

@@ -26,8 +26,9 @@ 
 	public function asIcon($icon, $title, $subHeader = NULL) {
 		$header = new HtmlHeader("header-" . $this->identifier);
 		$header->asIcon($icon, $title, $subHeader);
-		if ($this->_inverted === false)
-			$header->setInverted();
+		if ($this->_inverted === false) {
+					$header->setInverted();
+		}
 		return $this->setContent($header);
 	}
 
@@ -51,8 +52,9 @@ 
 	}
 
 	public function jsShow() {
-		if (isset($this->_container))
-			return '$("#.' . $this->_container->getIdentifier() . ').dimmer("show");';
+		if (isset($this->_container)) {
+					return '$("#.' . $this->_container->getIdentifier() . ').dimmer("show");';
+		}
 	}
 
 	public function setBlurring() {

Ajax/common/BaseGui.php

Braces +6 added lines, -4 removed lines

@@ -45,8 +45,9 @@ 
 	}
 
 	public function compile($internal = false) {
-		if ($internal === false && $this->autoCompile === true)
-			throw new \Exception("Impossible to compile if autoCompile is set to 'true'");
+		if ($internal === false && $this->autoCompile === true) {
+					throw new \Exception("Impossible to compile if autoCompile is set to 'true'");
+		}
 		foreach ($this->components as $component) {
 			$component->compile();
 		}
@@ -69,9 +70,10 @@ 
 				$this->components[] = $component;
 			}
 		}
-		if (isset($params))
-			if (\is_array($params))
+		if (isset($params)) {
+					if (\is_array($params))
 				$component->setParams($params);
+		}
 		return $component;
 	}
 

Spacing +17 added lines, -17 removed lines

@@ -29,10 +29,10 @@ 
 	 */
 	protected $js;
 
-	public function __construct($autoCompile = true) {
-		$this->autoCompile = $autoCompile;
-		$this->components = array();
-		$this->htmlComponents = array();
+	public function __construct($autoCompile=true) {
+		$this->autoCompile=$autoCompile;
+		$this->components=array();
+		$this->htmlComponents=array();
 	}
 
 	public function isAutoCompile() {
@@ -40,12 +40,12 @@ 
 	}
 
 	public function setAutoCompile($autoCompile) {
-		$this->autoCompile = $autoCompile;
+		$this->autoCompile=$autoCompile;
 		return $this;
 	}
 
-	public function compile($internal = false) {
-		if ($internal === false && $this->autoCompile === true)
+	public function compile($internal=false) {
+		if ($internal===false && $this->autoCompile===true)
 			throw new \Exception("Impossible to compile if autoCompile is set to 'true'");
 		foreach ($this->components as $component) {
 			$component->compile();
@@ -53,20 +53,20 @@ 
 	}
 
 	public function setJs(JsUtils $js) {
-		$this->js = $js;
+		$this->js=$js;
 	}
 
 	public function addComponent(SimpleComponent $component, $attachTo, $params) {
 		if ($this->autoCompile) {
-			if ($attachTo != null) {
-				if (! isset($this->components[$attachTo])) {
-					$this->components[$attachTo] = $component;
+			if ($attachTo!=null) {
+				if (!isset($this->components[$attachTo])) {
+					$this->components[$attachTo]=$component;
 				} else {
-					$this->components[] = $component;
+					$this->components[]=$component;
 				}
 				$component->attach($attachTo);
 			} else {
-				$this->components[] = $component;
+				$this->components[]=$component;
 			}
 		}
 		if (isset($params))
@@ -76,11 +76,11 @@ 
 	}
 
 	public function addHtmlComponent(BaseHtml $htmlComponent) {
-		$this->htmlComponents[$htmlComponent->getIdentifier()] = $htmlComponent;
+		$this->htmlComponents[$htmlComponent->getIdentifier()]=$htmlComponent;
 		return $htmlComponent;
 	}
 
-	public function compileHtml(JsUtils $js = NULL, &$view = NULL) {
+	public function compileHtml(JsUtils $js=NULL, &$view=NULL) {
 		foreach ($this->htmlComponents as $htmlComponent) {
 			$htmlComponent->compile($js, $view);
 		}
@@ -90,7 +90,7 @@ 
 		return array_filter($this->htmlComponents, $callback);
 	}
 	
-	public function getHtmlComponent($identifier){
-		return $this->htmlComponents[$identifier]??'';
+	public function getHtmlComponent($identifier) {
+		return $this->htmlComponents[$identifier] ?? '';
 	}
 }

Ajax/semantic/html/collections/HtmlMessage.php

Braces +8 added lines, -6 removed lines

@@ -85,10 +85,11 @@ 
 	}
 
 	public function setDismissable($dismiss = true) {
-		if ($dismiss === true)
-			$this->close = new HtmlIcon("close-" . $this->identifier, "close");
-		else
-			$this->close = NULL;
+		if ($dismiss === true) {
+					$this->close = new HtmlIcon("close-" . $this->identifier, "close");
+		} else {
+					$this->close = NULL;
+		}
 		return $this;
 	}
 
@@ -139,7 +140,8 @@ 
 	public function setMessage($message) {
 		if (\is_array($this->content)) {
 			$this->content[\sizeof($this->content) - 1] = $message;
-		} else
-			$this->setContent($message);
+		} else {
+					$this->setContent($message);
+		}
 	}
 }

Spacing +19 added lines, -19 removed lines

@@ -16,15 +16,15 @@ 
  * @version 1.001
  */
 class HtmlMessage extends HtmlSemDoubleElement {
-	use AttachedTrait,HasTimeoutTrait;
+	use AttachedTrait, HasTimeoutTrait;
 
 	protected $icon;
 
 	protected $close;
 
-	public function __construct($identifier, $content = "") {
+	public function __construct($identifier, $content="") {
 		parent::__construct($identifier, "div");
-		$this->_template = '<%tagName% id="%identifier%" %properties%>%close%%icon%%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>';
+		$this->_template='<%tagName% id="%identifier%" %properties%>%close%%icon%%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>';
 		$this->setClass("ui message");
 		$this->setContent($content);
 	}
@@ -36,9 +36,9 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlMessage
 	 */
 	public function addHeader($header) {
-		$headerO = $header;
+		$headerO=$header;
 		if (\is_string($header)) {
-			$headerO = new HtmlSemDoubleElement("header-" . $this->identifier, "div");
+			$headerO=new HtmlSemDoubleElement("header-".$this->identifier, "div");
 			$headerO->setClass("header");
 			$headerO->setContent($header);
 		}
@@ -53,9 +53,9 @@ 
 		$this->addToProperty("class", "icon");
 		$this->wrapContent("<div class='content'>", "</div>");
 		if (\is_string($icon)) {
-			$this->icon = new HtmlIcon("icon-" . $this->identifier, $icon);
+			$this->icon=new HtmlIcon("icon-".$this->identifier, $icon);
 		} else {
-			$this->icon = $icon;
+			$this->icon=$icon;
 		}
 		return $this;
 	}
@@ -72,23 +72,23 @@ 
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false)
 	 * @return $this
 	 */
-	public function getOnClose($url, $responseElement = "", $parameters = array()) {
+	public function getOnClose($url, $responseElement="", $parameters=array()) {
 		if (isset($this->close)) {
 			$this->close->getOnClick($url, $responseElement, $parameters);
 		}
 	}
 
-	public function addLoader($loaderIcon = "notched circle") {
+	public function addLoader($loaderIcon="notched circle") {
 		$this->setIcon($loaderIcon);
 		$this->icon->addToIcon("loading");
 		return $this;
 	}
 
-	public function setDismissable($dismiss = true) {
-		if ($dismiss === true)
-			$this->close = new HtmlIcon("close-" . $this->identifier, "close");
+	public function setDismissable($dismiss=true) {
+		if ($dismiss===true)
+			$this->close=new HtmlIcon("close-".$this->identifier, "close");
 		else
-			$this->close = NULL;
+			$this->close=NULL;
 		return $this;
 	}
 
@@ -98,9 +98,9 @@ 
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
 	 */
 	public function run(JsUtils $js) {
-		if (! isset($this->_bsComponent)) {
+		if (!isset($this->_bsComponent)) {
 			if (isset($this->close)) {
-				$js->execOn("click", "#" . $this->identifier . " .close", "$(this).closest('.message').transition({$this->_closeTransition}).trigger('close-message');");
+				$js->execOn("click", "#".$this->identifier." .close", "$(this).closest('.message').transition({$this->_closeTransition}).trigger('close-message');");
 			}
 			if (isset($this->_timeout)) {
 				$js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}).trigger('close-message'); }, {$this->_timeout});", true);
@@ -109,15 +109,15 @@ 
 		return parent::run($js);
 	}
 
-	public function setState($visible = true) {
-		$visible = ($visible === true) ? "visible" : "hidden";
+	public function setState($visible=true) {
+		$visible=($visible===true) ? "visible" : "hidden";
 		return $this->addToPropertyCtrl("class", $visible, array(
 			"visible",
 			"hidden"
 		));
 	}
 
-	public function setVariation($value = "floating") {
+	public function setVariation($value="floating") {
 		return $this->addToPropertyCtrl("class", $value, array(
 			"floating",
 			"compact"
@@ -138,7 +138,7 @@ 
 
 	public function setMessage($message) {
 		if (\is_array($this->content)) {
-			$this->content[\sizeof($this->content) - 1] = $message;
+			$this->content[\sizeof($this->content)-1]=$message;
 		} else
 			$this->setContent($message);
 	}

Ajax/semantic/html/modules/checkbox/AbstractCheckbox.php

Braces +12 added lines, -8 removed lines

@@ -15,8 +15,9 @@ 
 		$field = new \Ajax\common\html\html5\HtmlInput($identifier, $inputType, $value);
 		$field->setProperty("name", $name);
 		$this->setField($field);
-		if (isset($label))
-			$this->setLabel($label, $value);
+		if (isset($label)) {
+					$this->setLabel($label, $value);
+		}
 		$this->setLibraryId($identifier);
 	}
 
@@ -40,8 +41,9 @@ 
 			$labelO->setContent($label);
 			$labelO->setProperty("for", $this->getField()
 				->getIdentifier());
-			if (isset($value))
-				$labelO->setProperty("data-value", $value);
+			if (isset($value)) {
+							$labelO->setProperty("data-value", $value);
+			}
 		}
 		$this->content["label"] = $labelO;
 	}
@@ -56,8 +58,9 @@ 
 	 * @return mixed
 	 */
 	public function getLabel() {
-		if (\array_key_exists("label", $this->content))
-			return $this->content["label"];
+		if (\array_key_exists("label", $this->content)) {
+					return $this->content["label"];
+		}
 	}
 
 	/**
@@ -138,8 +141,9 @@ 
 	}
 
 	public function run(JsUtils $js) {
-		if (! isset($this->_bsComponent))
-			$this->_bsComponent = $js->semantic()->checkbox("#" . $this->identifier, $this->_params);
+		if (! isset($this->_bsComponent)) {
+					$this->_bsComponent = $js->semantic()->checkbox("#" . $this->identifier, $this->_params);
+		}
 		return parent::run($js);
 	}
 }

Spacing +26 added lines, -26 removed lines

@@ -7,12 +7,12 @@ 
 
 abstract class AbstractCheckbox extends HtmlSemDoubleElement {
 
-	protected $_params = [];
+	protected $_params=[];
 
-	public function __construct($identifier, $name = NULL, $label = NULL, $value = NULL, $inputType = "checkbox", $type = "checkbox") {
-		parent::__construct("ck-" . $identifier, "div", "ui " . $type);
-		$this->_identifier = $identifier;
-		$field = new \Ajax\common\html\html5\HtmlInput($identifier, $inputType, $value);
+	public function __construct($identifier, $name=NULL, $label=NULL, $value=NULL, $inputType="checkbox", $type="checkbox") {
+		parent::__construct("ck-".$identifier, "div", "ui ".$type);
+		$this->_identifier=$identifier;
+		$field=new \Ajax\common\html\html5\HtmlInput($identifier, $inputType, $value);
 		$field->setProperty("name", $name);
 		$this->setField($field);
 		if (isset($label))
@@ -20,8 +20,8 @@ 
 		$this->setLibraryId($identifier);
 	}
 
-	public function setChecked($value = true) {
-		if ($value === true) {
+	public function setChecked($value=true) {
+		if ($value===true) {
 			$this->getField()->setProperty("checked", "checked");
 		} else {
 			$this->getField()->removeProperty("checked");
@@ -29,7 +29,7 @@ 
 		return $this;
 	}
 
-	public function forceValue($value = 'true') {
+	public function forceValue($value='true') {
 		$this->getField()->forceValue($value);
 		return $this;
 	}
@@ -38,21 +38,21 @@ 
 		return $this->addToPropertyCtrl("class", $checkboxType, CheckboxType::getConstants());
 	}
 
-	public function setLabel($label, $value = null) {
-		$labelO = $label;
+	public function setLabel($label, $value=null) {
+		$labelO=$label;
 		if (\is_string($label)) {
-			$labelO = new HtmlSemDoubleElement("", "label", "");
+			$labelO=new HtmlSemDoubleElement("", "label", "");
 			$labelO->setContent($label);
 			$labelO->setProperty("for", $this->getField()
 				->getIdentifier());
 			if (isset($value))
 				$labelO->setProperty("data-value", $value);
 		}
-		$this->content["label"] = $labelO;
+		$this->content["label"]=$labelO;
 	}
 
 	public function setField($field) {
-		$this->content["field"] = $field;
+		$this->content["field"]=$field;
 	}
 
 	/**
@@ -78,9 +78,9 @@ 
 	 * puts the label before or behind
 	 */
 	public function swapLabel() {
-		$label = $this->getLabel();
+		$label=$this->getLabel();
 		unset($this->content["label"]);
-		$this->content["label"] = $label;
+		$this->content["label"]=$label;
 	}
 
 	public function setReadonly() {
@@ -97,13 +97,13 @@ 
 	 *        	action to execute : check, uncheck or NULL for toggle
 	 * @return AbstractCheckbox
 	 */
-	public function attachEvent($selector, $action = NULL) {
-		if (isset($action) || \is_numeric($action) === true) {
-			$js = '$("#%identifier%").checkbox("attach events", "' . $selector . '", "' . $action . '");';
+	public function attachEvent($selector, $action=NULL) {
+		if (isset($action) || \is_numeric($action)===true) {
+			$js='$("#%identifier%").checkbox("attach events", "'.$selector.'", "'.$action.'");';
 		} else {
-			$js = '$("#%identifier%").checkbox("attach events", "' . $selector . '");';
+			$js='$("#%identifier%").checkbox("attach events", "'.$selector.'");';
 		}
-		$js = \str_replace("%identifier%", $this->identifier, $js);
+		$js=\str_replace("%identifier%", $this->identifier, $js);
 		return $this->executeOnRun($js);
 	}
 
@@ -114,7 +114,7 @@ 
 	 *        	associative array of events to attach ex : ["#bt-toggle","check"=>"#bt-check","uncheck"=>"#bt-uncheck"]
 	 * @return AbstractCheckbox
 	 */
-	public function attachEvents($events = array()) {
+	public function attachEvents($events=array()) {
 		if (\is_array($events)) {
 			foreach ($events as $action => $selector) {
 				$this->attachEvent($selector, $action);
@@ -128,23 +128,23 @@ 
 	}
 
 	public function setOnChecked($jsCode) {
-		$this->_params["onChecked"] = $jsCode;
+		$this->_params["onChecked"]=$jsCode;
 		return $this;
 	}
 
 	public function setOnUnchecked($jsCode) {
-		$this->_params["onUnchecked"] = $jsCode;
+		$this->_params["onUnchecked"]=$jsCode;
 		return $this;
 	}
 
 	public function setOnChange($jsCode) {
-		$this->_params["onChange"] = $jsCode;
+		$this->_params["onChange"]=$jsCode;
 		return $this;
 	}
 
 	public function run(JsUtils $js) {
-		if (! isset($this->_bsComponent))
-			$this->_bsComponent = $js->semantic()->checkbox("#" . $this->identifier, $this->_params);
+		if (!isset($this->_bsComponent))
+			$this->_bsComponent=$js->semantic()->checkbox("#".$this->identifier, $this->_params);
 		return parent::run($js);
 	}
 }

Ajax/service/JArray.php

Spacing +38 added lines, -38 removed lines

@@ -4,34 +4,34 @@ 
 class JArray {
 
 	public static function isAssociative($array) {
-		return (array_values($array) !== $array);
+		return (array_values($array)!==$array);
 	}
 
 	public static function getValue($array, $key, $pos) {
 		if (array_key_exists($key, $array)) {
 			return $array[$key];
 		}
-		$values = array_values($array);
-		if ($pos < sizeof($values))
+		$values=array_values($array);
+		if ($pos<sizeof($values))
 			return $values[$pos];
 	}
 
 	public static function getConditionalValue($array, $key, $condition) {
-		$result = NULL;
+		$result=NULL;
 		if (array_key_exists($key, $array)) {
-			$result = $array[$key];
-			if ($condition($result) === true)
+			$result=$array[$key];
+			if ($condition($result)===true)
 				return $result;
 		}
-		$values = array_values($array);
+		$values=array_values($array);
 		foreach ($values as $val) {
-			if ($condition($val) === true)
+			if ($condition($val)===true)
 				return $val;
 		}
 		return $result;
 	}
 
-	public static function getDefaultValue($array, $key, $default = NULL) {
+	public static function getDefaultValue($array, $key, $default=NULL) {
 		if (array_key_exists($key, $array)) {
 			return $array[$key];
 		} else
@@ -39,77 +39,77 @@ 
 	}
 
 	public static function implode($glue, $pieces) {
-		$result = "";
+		$result="";
 		if (\is_array($glue)) {
-			$size = \sizeof($pieces);
-			if ($size > 0) {
-				for ($i = 0; $i < $size - 1; $i ++) {
-					$result .= $pieces[$i] . @$glue[$i];
+			$size=\sizeof($pieces);
+			if ($size>0) {
+				for ($i=0; $i<$size-1; $i++) {
+					$result.=$pieces[$i].@$glue[$i];
 				}
-				$result .= $pieces[$size - 1];
+				$result.=$pieces[$size-1];
 			}
 		} else {
-			$result = \implode($glue, $pieces);
+			$result=\implode($glue, $pieces);
 		}
 		return $result;
 	}
 
 	public static function dimension($array) {
 		if (\is_array(reset($array))) {
-			$return = self::dimension(reset($array)) + 1;
+			$return=self::dimension(reset($array))+1;
 		} else {
-			$return = 1;
+			$return=1;
 		}
 		return $return;
 	}
 
-	public static function sortAssociative($array, $sortedKeys = array()) {
-		$newArray = array();
+	public static function sortAssociative($array, $sortedKeys=array()) {
+		$newArray=array();
 		foreach ($sortedKeys as $key) {
 			if (\array_key_exists($key, $array)) {
-				$newArray[$key] = $array[$key];
+				$newArray[$key]=$array[$key];
 			}
 		}
 		return $newArray;
 	}
 
 	public static function moveElementTo(&$array, $from, $to) {
-		$result = false;
+		$result=false;
 		if (isset($array)) {
 			if (isset($array[$from])) {
-				$out = array_splice($array, $from, 1);
+				$out=array_splice($array, $from, 1);
 				array_splice($array, $to, 0, $out);
-				$result = true;
+				$result=true;
 			}
 		}
 		return $result;
 	}
 
 	public static function swapElements(&$array, $index1, $index2) {
-		$result = false;
+		$result=false;
 		if (isset($array)) {
 			if (isset($array[$index1]) && isset($array[$index2])) {
-				$tmp = $array[$index1];
-				$array[$index1] = $array[$index2];
-				$array[$index2] = $tmp;
-				$result = true;
+				$tmp=$array[$index1];
+				$array[$index1]=$array[$index2];
+				$array[$index2]=$tmp;
+				$result=true;
 			}
 		}
 		return $result;
 	}
 
-	public static function modelArray($objects, $identifierFunction = NULL, $modelFunction = NULL) {
-		$result = [];
-		if (isset($modelFunction) === false) {
-			$modelFunction = "__toString";
+	public static function modelArray($objects, $identifierFunction=NULL, $modelFunction=NULL) {
+		$result=[];
+		if (isset($modelFunction)===false) {
+			$modelFunction="__toString";
 		}
-		if (isset($identifierFunction) === false) {
+		if (isset($identifierFunction)===false) {
 			foreach ($objects as $object) {
-				$result[] = self::callFunction($object, $modelFunction);
+				$result[]=self::callFunction($object, $modelFunction);
 			}
 		} else {
 			foreach ($objects as $object) {
-				$result[self::callFunction($object, $identifierFunction)] = self::callFunction($object, $modelFunction);
+				$result[self::callFunction($object, $identifierFunction)]=self::callFunction($object, $modelFunction);
 			}
 		}
 		return $result;
@@ -134,9 +134,9 @@ 
 	}
 
 	public static function removeByKeys($array, $keys) {
-		$assocKeys = [];
+		$assocKeys=[];
 		foreach ($keys as $key) {
-			$assocKeys[$key] = true;
+			$assocKeys[$key]=true;
 		}
 		return \array_diff_key($array, $assocKeys);
 	}

Braces +15 added lines, -11 removed lines

@@ -12,21 +12,24 @@ 
 			return $array[$key];
 		}
 		$values = array_values($array);
-		if ($pos < sizeof($values))
-			return $values[$pos];
+		if ($pos < sizeof($values)) {
+					return $values[$pos];
+		}
 	}
 
 	public static function getConditionalValue($array, $key, $condition) {
 		$result = NULL;
 		if (array_key_exists($key, $array)) {
 			$result = $array[$key];
-			if ($condition($result) === true)
-				return $result;
+			if ($condition($result) === true) {
+							return $result;
+			}
 		}
 		$values = array_values($array);
 		foreach ($values as $val) {
-			if ($condition($val) === true)
-				return $val;
+			if ($condition($val) === true) {
+							return $val;
+			}
 		}
 		return $result;
 	}
@@ -34,8 +37,9 @@ 
 	public static function getDefaultValue($array, $key, $default = NULL) {
 		if (array_key_exists($key, $array)) {
 			return $array[$key];
-		} else
-			return $default;
+		} else {
+					return $default;
+		}
 	}
 
 	public static function implode($glue, $pieces) {
@@ -116,12 +120,12 @@ 
 	}
 
 	private static function callFunction($object, $callback) {
-		if (\is_string($callback))
-			return \call_user_func(array(
+		if (\is_string($callback)) {
+					return \call_user_func(array(
 				$object,
 				$callback
 			), []);
-		else if (\is_callable($callback)) {
+		} else if (\is_callable($callback)) {
 			return $callback($object);
 		}
 	}