phpMv / phpMv-UI

Ajax/common/Widget.php

Spacing +75 added lines, -75 removed lines

@@ -20,7 +20,7 @@ 
 use Ajax\common\html\traits\BaseHooksTrait;
 
 abstract class Widget extends HtmlDoubleElement {
-	use FieldAsTrait,FormTrait,BaseHooksTrait;
+	use FieldAsTrait, FormTrait, BaseHooksTrait;
 
 	/**
 	 *
@@ -66,24 +66,24 @@ 
 
 	protected $_hasRules;
 
-	public function __construct($identifier, $model, $modelInstance = NULL) {
+	public function __construct($identifier, $model, $modelInstance=NULL) {
 		parent::__construct($identifier);
-		$this->_template = "%wrapContentBefore%%content%%wrapContentAfter%";
+		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 		$this->setModel($model);
 		if (isset($modelInstance)) {
 			$this->show($modelInstance);
 		}
-		$this->_generated = false;
+		$this->_generated=false;
 	}
 
 	protected function _init($instanceViewer, $contentKey, $content, $edition) {
-		$this->_instanceViewer = $instanceViewer;
-		$this->content = [
+		$this->_instanceViewer=$instanceViewer;
+		$this->content=[
 			$contentKey => $content
 		];
-		$this->_self = $content;
-		$this->_toolbarPosition = PositionInTable::BEFORETABLE;
-		$this->_edition = $edition;
+		$this->_self=$content;
+		$this->_toolbarPosition=PositionInTable::BEFORETABLE;
+		$this->_edition=$edition;
 	}
 
 	/**
@@ -92,16 +92,16 @@ 
 	 * @return int|string|boolean
 	 */
 	protected function _getIndex($fieldName) {
-		$index = $fieldName;
+		$index=$fieldName;
 		if (\is_string($fieldName)) {
-			$fields = $this->_instanceViewer->getVisibleProperties();
-			$index = \array_search($fieldName, $fields);
+			$fields=$this->_instanceViewer->getVisibleProperties();
+			$index=\array_search($fieldName, $fields);
 		}
 		return $index;
 	}
 
-	protected function _getFieldIdentifier($prefix, $name = "") {
-		return $this->identifier . "-{$prefix}-" . $this->_instanceViewer->getIdentifier();
+	protected function _getFieldIdentifier($prefix, $name="") {
+		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
 	}
 
 	protected function _getFieldName($index) {
@@ -112,13 +112,13 @@ 
 		return $this->_instanceViewer->getCaption($index);
 	}
 
-	abstract protected function _setToolbarPosition($table, $captions = NULL);
+	abstract protected function _setToolbarPosition($table, $captions=NULL);
 
 	public function show($modelInstance) {
 		if (\is_array($modelInstance)) {
-			$modelInstance = \json_decode(\json_encode($modelInstance), FALSE);
+			$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 		}
-		$this->_modelInstance = $modelInstance;
+		$this->_modelInstance=$modelInstance;
 	}
 
 	public function getModel() {
@@ -126,7 +126,7 @@ 
 	}
 
 	public function setModel($_model) {
-		$this->_model = $_model;
+		$this->_model=$_model;
 		return $this;
 	}
 
@@ -135,13 +135,13 @@ 
 	}
 
 	public function setInstanceViewer($_instanceViewer) {
-		$this->_instanceViewer = $_instanceViewer;
+		$this->_instanceViewer=$_instanceViewer;
 		return $this;
 	}
 
 	abstract public function getHtmlComponent();
 
-	public function setAttached($value = true) {
+	public function setAttached($value=true) {
 		return $this->getHtmlComponent()->setAttached($value);
 	}
 
@@ -156,8 +156,8 @@ 
 	 * @return Widget
 	 */
 	public function afterCompile($index, $callback) {
-		$index = $this->_getIndex($index);
-		if ($index !== false) {
+		$index=$this->_getIndex($index);
+		if ($index!==false) {
 			$this->_instanceViewer->afterCompile($index, $callback);
 		}
 		return $this;
@@ -182,7 +182,7 @@ 
 		return $this;
 	}
 
-	public function addField($field, $key = null) {
+	public function addField($field, $key=null) {
 		$this->_instanceViewer->addField($field, $key);
 		return $this;
 	}
@@ -196,10 +196,10 @@ 
 		return $this->_instanceViewer->visiblePropertiesCount();
 	}
 
-	public function addMessage($attributes = NULL, $fieldName = "message") {
+	public function addMessage($attributes=NULL, $fieldName="message") {
 		$this->_instanceViewer->addField($fieldName);
-		$count = $this->_instanceViewer->visiblePropertiesCount();
-		return $this->fieldAsMessage($count - 1, $attributes);
+		$count=$this->_instanceViewer->visiblePropertiesCount();
+		return $this->fieldAsMessage($count-1, $attributes);
 	}
 
 	public function addErrorMessage() {
@@ -208,15 +208,15 @@ 
 		], "message");
 	}
 
-	public function insertField($index, $field, $key = null) {
-		$index = $this->_getIndex($index);
+	public function insertField($index, $field, $key=null) {
+		$index=$this->_getIndex($index);
 		$this->_instanceViewer->insertField($index, $field, $key);
 		return $this;
 	}
 
-	public function insertInField($index, $field, $key = null) {
-		$index = $this->_getIndex($index);
-		if ($index !== false) {
+	public function insertInField($index, $field, $key=null) {
+		$index=$this->_getIndex($index);
+		if ($index!==false) {
 			$this->_instanceViewer->insertInField($index, $field, $key);
 		}
 		return $this;
@@ -232,8 +232,8 @@ 
 	 * @return Widget
 	 */
 	public function setValueFunction($index, $callback) {
-		$index = $this->_getIndex($index);
-		if ($index !== false) {
+		$index=$this->_getIndex($index);
+		if ($index!==false) {
 			$this->_instanceViewer->setValueFunction($index, $callback);
 		}
 		return $this;
@@ -249,8 +249,8 @@ 
 	 * @return \Ajax\semantic\html\collections\menus\HtmlMenu
 	 */
 	public function getToolbar() {
-		if (isset($this->_toolbar) === false) {
-			$this->_toolbar = new HtmlMenu("toolbar-" . $this->identifier);
+		if (isset($this->_toolbar)===false) {
+			$this->_toolbar=new HtmlMenu("toolbar-".$this->identifier);
 		}
 		return $this->_toolbar;
 	}
@@ -263,11 +263,11 @@ 
 	 *        	function to call on $element
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addInToolbar($element, $callback = NULL) {
-		$tb = $this->getToolbar();
+	public function addInToolbar($element, $callback=NULL) {
+		$tb=$this->getToolbar();
 		if ($element instanceof BaseWidget) {
-			if ($element->getIdentifier() === "") {
-				$element->setIdentifier("tb-item-" . $this->identifier . "-" . $tb->count());
+			if ($element->getIdentifier()==="") {
+				$element->setIdentifier("tb-item-".$this->identifier."-".$tb->count());
 			}
 		}
 		if (isset($callback)) {
@@ -286,8 +286,8 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addItemInToolbar($caption, $icon = NULL, $callback = NULL) {
-		$result = $this->addInToolbar($caption, $callback);
+	public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) {
+		$result=$this->addInToolbar($caption, $callback);
 		if (isset($icon) && method_exists($result, "addIcon"))
 			$result->addIcon($icon);
 		return $result;
@@ -300,7 +300,7 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\Widget
 	 */
-	public function addItemsInToolbar(array $items, $callback = NULL) {
+	public function addItemsInToolbar(array $items, $callback=NULL) {
 		if (JArray::isAssociative($items)) {
 			foreach ($items as $icon => $item) {
 				$this->addItemInToolbar($item, $icon, $callback);
@@ -321,10 +321,10 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addDropdownInToolbar($value, $items, $callback = NULL) {
-		$dd = $value;
+	public function addDropdownInToolbar($value, $items, $callback=NULL) {
+		$dd=$value;
 		if (\is_string($value)) {
-			$dd = new HtmlDropdown("dropdown-" . $this->identifier . "-" . $value, $value, $items);
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$value, $value, $items);
 		}
 		return $this->addInToolbar($dd, $callback);
 	}
@@ -337,8 +337,8 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonInToolbar($caption, $cssStyle = null, $callback = NULL) {
-		$bt = new HtmlButton("bt-" . $caption, $caption, $cssStyle);
+	public function addButtonInToolbar($caption, $cssStyle=null, $callback=NULL) {
+		$bt=new HtmlButton("bt-".$caption, $caption, $cssStyle);
 		return $this->addInToolbar($bt, $callback);
 	}
 
@@ -350,8 +350,8 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonsInToolbar(array $captions, $asIcon = false, $callback = NULL) {
-		$bts = new HtmlButtonGroups("", $captions, $asIcon);
+	public function addButtonsInToolbar(array $captions, $asIcon=false, $callback=NULL) {
+		$bts=new HtmlButtonGroups("", $captions, $asIcon);
 		return $this->addInToolbar($bts, $callback);
 	}
 
@@ -363,14 +363,14 @@ 
 	 * @param boolean $labeled
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addLabelledIconButtonInToolbar($caption, $icon, $before = true, $labeled = false) {
-		$bt = new HtmlButton("", $caption);
+	public function addLabelledIconButtonInToolbar($caption, $icon, $before=true, $labeled=false) {
+		$bt=new HtmlButton("", $caption);
 		$bt->addIcon($icon, $before, $labeled);
 		return $this->addInToolbar($bt);
 	}
 
-	public function addSubmitInToolbar($identifier, $value, $cssStyle = NULL, $url = NULL, $responseElement = NULL, $parameters = NULL) {
-		$button = new HtmlButton($identifier, $value, $cssStyle);
+	public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) {
+		$button=new HtmlButton($identifier, $value, $cssStyle);
 		$this->_buttonAsSubmit($button, "click", $url, $responseElement, $parameters);
 		return $this->addInToolbar($button);
 	}
@@ -393,8 +393,8 @@ 
 	 * @param boolean $_edition
 	 * @return \Ajax\common\Widget
 	 */
-	public function setEdition($_edition = true) {
-		$this->_edition = $_edition;
+	public function setEdition($_edition=true) {
+		$this->_edition=$_edition;
 		return $this;
 	}
 
@@ -423,8 +423,8 @@ 
 	 * @param string|boolean $disable
 	 * @return string
 	 */
-	public function jsDisabled($disable = true) {
-		return "$('#" . $this->identifier . " .ui.input,#" . $this->identifier . " .ui.dropdown,#" . $this->identifier . " .ui.checkbox').toggleClass('disabled'," . $disable . ");";
+	public function jsDisabled($disable=true) {
+		return "$('#".$this->identifier." .ui.input,#".$this->identifier." .ui.dropdown,#".$this->identifier." .ui.checkbox').toggleClass('disabled',".$disable.");";
 	}
 
 	/**
@@ -434,8 +434,8 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addEditButtonInToolbar($caption, $callback = NULL) {
-		$bt = new HtmlButton($this->identifier . "-editBtn", $caption);
+	public function addEditButtonInToolbar($caption, $callback=NULL) {
+		$bt=new HtmlButton($this->identifier."-editBtn", $caption);
 		$bt->setToggle();
 		$bt->setActive($this->_edition);
 		$bt->onClick($this->jsDisabled(Javascript::prep_value("!$(event.target).hasClass('active')")));
@@ -443,18 +443,18 @@ 
 	}
 
 	public function setToolbar(HtmlMenu $_toolbar) {
-		$this->_toolbar = $_toolbar;
+		$this->_toolbar=$_toolbar;
 		return $this;
 	}
 
 	public function setToolbarPosition($_toolbarPosition) {
-		$this->_toolbarPosition = $_toolbarPosition;
+		$this->_toolbarPosition=$_toolbarPosition;
 		return $this;
 	}
 
 	public function getForm() {
-		if (! isset($this->_form)) {
-			$this->_form = new HtmlForm("frm-" . $this->identifier);
+		if (!isset($this->_form)) {
+			$this->_form=new HtmlForm("frm-".$this->identifier);
 			$this->setEdition(true);
 		}
 		return $this->_form;
@@ -468,7 +468,7 @@ 
 	}
 
 	protected function runForm(JsUtils $js) {
-		$fields = $this->getContentInstances(HtmlFormField::class);
+		$fields=$this->getContentInstances(HtmlFormField::class);
 		foreach ($fields as $field) {
 			$this->_form->addField($field);
 		}
@@ -477,10 +477,10 @@ 
 
 	protected function _compileForm() {
 		if (isset($this->_form)) {
-			$noValidate = "";
-			if (\sizeof($this->_form->getValidationParams()) > 0)
-				$noValidate = "novalidate";
-				$this->wrapContent("<form class='".$this->_form->getProperty('class')."' id='frm-" . $this->identifier . "' name='frm-" . $this->identifier . "' " . $noValidate . ">", "</form>");
+			$noValidate="";
+			if (\sizeof($this->_form->getValidationParams())>0)
+				$noValidate="novalidate";
+				$this->wrapContent("<form class='".$this->_form->getProperty('class')."' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">", "</form>");
 		}
 	}
 
@@ -502,21 +502,21 @@ 
 	}
 
 	public function swapFields($index1, $index2) {
-		$index1 = $this->_getIndex($index1);
-		$index2 = $this->_getIndex($index2);
+		$index1=$this->_getIndex($index1);
+		$index2=$this->_getIndex($index2);
 		return $this->_instanceViewer->swapFields($index1, $index2);
 	}
 
 	public function removeField($index) {
-		$index = $this->_getIndex($index);
-		if ($index !== false) {
+		$index=$this->_getIndex($index);
+		if ($index!==false) {
 			$this->_instanceViewer->removeField($index);
 		}
 		return $this;
 	}
 
-	public function asModal($header = null) {
-		$modal = new HtmlModal("modal-" . $this->identifier, $header);
+	public function asModal($header=null) {
+		$modal=new HtmlModal("modal-".$this->identifier, $header);
 		$modal->setContent($this);
 		if (isset($this->_form)) {
 			$this->_form->onSuccess($modal->jsHide());
@@ -524,7 +524,7 @@ 
 		return $modal;
 	}
 
-	public function addToProperty($name, $value, $separator = " ") {
+	public function addToProperty($name, $value, $separator=" ") {
 		return $this->getHtmlComponent()->addToProperty($name, $value, $separator);
 	}
 

Braces +6 added lines, -4 removed lines

@@ -288,8 +288,9 @@ 
 	 */
 	public function addItemInToolbar($caption, $icon = NULL, $callback = NULL) {
 		$result = $this->addInToolbar($caption, $callback);
-		if (isset($icon) && method_exists($result, "addIcon"))
-			$result->addIcon($icon);
+		if (isset($icon) && method_exists($result, "addIcon")) {
+					$result->addIcon($icon);
+		}
 		return $result;
 	}
 
@@ -478,8 +479,9 @@ 
 	protected function _compileForm() {
 		if (isset($this->_form)) {
 			$noValidate = "";
-			if (\sizeof($this->_form->getValidationParams()) > 0)
-				$noValidate = "novalidate";
+			if (\sizeof($this->_form->getValidationParams()) > 0) {
+							$noValidate = "novalidate";
+			}
 				$this->wrapContent("<form class='".$this->_form->getProperty('class')."' id='frm-" . $this->identifier . "' name='frm-" . $this->identifier . "' " . $noValidate . ">", "</form>");
 		}
 	}

Ajax/semantic/components/validation/AjaxRule.php

Spacing +4 added lines, -4 removed lines

@@ -16,9 +16,9 @@ 
 
 	private $ajaxCall;
 
-	public function __construct($type, $url, $params, $jsCallback = null, $method = 'post', $parameters = [], $prompt = NULL, $value = NULL) {
+	public function __construct($type, $url, $params, $jsCallback=null, $method='post', $parameters=[], $prompt=NULL, $value=NULL) {
 		parent::__construct($type, $prompt, $value);
-		$parameters = \array_merge([
+		$parameters=\array_merge([
 			'async' => false,
 			'url' => $url,
 			'params' => $params,
@@ -29,10 +29,10 @@ 
 			'preventDefault' => false,
 			'responseElement' => null
 		], $parameters);
-		$this->ajaxCall = new AjaxCall($method, $parameters);
+		$this->ajaxCall=new AjaxCall($method, $parameters);
 	}
 
 	public function compile(JsUtils $js) {
-		$js->exec(Rule::custom($this->getType(), "function(value,ruleValue){var result=true;" . $this->ajaxCall->compile($js) . "return result;}"), true);
+		$js->exec(Rule::custom($this->getType(), "function(value,ruleValue){var result=true;".$this->ajaxCall->compile($js)."return result;}"), true);
 	}
 }
\ No newline at end of file

Ajax/semantic/components/validation/CustomRule.php

Spacing +2 added lines, -2 removed lines

@@ -15,9 +15,9 @@
 
 	protected $jsFunction;
 
-	public function __construct($type, $jsFunction, $prompt = NULL, $value = NULL) {
+	public function __construct($type, $jsFunction, $prompt=NULL, $value=NULL) {
 		parent::__construct($type, $prompt, $value);
-		$this->jsFunction = $jsFunction;
+		$this->jsFunction=$jsFunction;
 	}
 
 	public function compile(JsUtils $js) {

Ajax/semantic/html/elements/HtmlRail.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  */
 class HtmlRail extends HtmlSemDoubleElement {
 
-	public function __construct($identifier, $content = NULL) {
+	public function __construct($identifier, $content=NULL) {
 		parent::__construct($identifier, 'div', 'ui rail', $content);
 	}
 

Ajax/semantic/traits/SemanticHtmlElementsTrait.php

Spacing +16 added lines, -16 removed lines

@@ -45,7 +45,7 @@ 
 	 * @param string $onClick
 	 * @return HtmlButton
 	 */
-	public function htmlButton($identifier, $value = null, $cssStyle = null, $onClick = null) {
+	public function htmlButton($identifier, $value=null, $cssStyle=null, $onClick=null) {
 		return $this->addHtmlComponent(new HtmlButton($identifier, $value, $cssStyle, $onClick));
 	}
 
@@ -59,7 +59,7 @@ 
 	 * @param boolean $asIcons
 	 * @return HtmlButtonGroups
 	 */
-	public function htmlButtonGroups($identifier, $elements = array(), $asIcons = false) {
+	public function htmlButtonGroups($identifier, $elements=array(), $asIcons=false) {
 		return $this->addHtmlComponent(new HtmlButtonGroups($identifier, $elements, $asIcons));
 	}
 
@@ -72,7 +72,7 @@ 
 	 * @param string $content
 	 * @return HtmlContainer
 	 */
-	public function htmlContainer($identifier, $content = "") {
+	public function htmlContainer($identifier, $content="") {
 		return $this->addHtmlComponent(new HtmlContainer($identifier, $content));
 	}
 
@@ -85,7 +85,7 @@ 
 	 * @param string $content
 	 * @return HtmlDivider
 	 */
-	public function htmlDivider($identifier, $content = "", $tagName = "div") {
+	public function htmlDivider($identifier, $content="", $tagName="div") {
 		return $this->addHtmlComponent(new HtmlDivider($identifier, $content, $tagName));
 	}
 
@@ -100,7 +100,7 @@ 
 	 * @param string $type
 	 * @return HtmlHeader
 	 */
-	public function htmlHeader($identifier, $niveau = 1, $content = NULL, $type = "page") {
+	public function htmlHeader($identifier, $niveau=1, $content=NULL, $type="page") {
 		return $this->addHtmlComponent(new HtmlHeader($identifier, $niveau, $content, $type));
 	}
 
@@ -128,7 +128,7 @@ 
 	 * @param string $size
 	 * @return HtmlImage
 	 */
-	public function htmlImage($identifier, $src = "", $alt = "", $size = NULL) {
+	public function htmlImage($identifier, $src="", $alt="", $size=NULL) {
 		return $this->addHtmlComponent(new HtmlImage($identifier, $src, $alt, $size));
 	}
 
@@ -142,7 +142,7 @@ 
 	 * @param string $size
 	 * @return HtmlIconGroups
 	 */
-	public function htmlIconGroups($identifier, $icons = array(), $size = "") {
+	public function htmlIconGroups($identifier, $icons=array(), $size="") {
 		return $this->addHtmlComponent(new HtmlIconGroups($identifier, $icons, $size));
 	}
 
@@ -157,7 +157,7 @@ 
 	 * @param string $placeholder
 	 * @return HtmlInput
 	 */
-	public function htmlInput($identifier, $type = "text", $value = "", $placeholder = "") {
+	public function htmlInput($identifier, $type="text", $value="", $placeholder="") {
 		return $this->addHtmlComponent(new HtmlInput($identifier, $type, $value, $placeholder));
 	}
 
@@ -171,7 +171,7 @@ 
 	 * @param string $tagName
 	 * @return HtmlLabel
 	 */
-	public function htmlLabel($identifier, $content = "", $icon = NULL, $tagName = "div") {
+	public function htmlLabel($identifier, $content="", $icon=NULL, $tagName="div") {
 		return $this->addHtmlComponent(new HtmlLabel($identifier, $content, $icon, $tagName));
 	}
 
@@ -182,7 +182,7 @@ 
 	 * @param array $attributes
 	 * @return HtmlLabelGroups
 	 */
-	public function htmlLabelGroups($identifier, $labels = array(), $attributes = array()) {
+	public function htmlLabelGroups($identifier, $labels=array(), $attributes=array()) {
 		return $this->addHtmlComponent(new HtmlLabelGroups($identifier, $labels, $attributes));
 	}
 
@@ -193,7 +193,7 @@ 
 	 * @param array $items
 	 * @return HtmlList
 	 */
-	public function htmlList($identifier, $items = array()) {
+	public function htmlList($identifier, $items=array()) {
 		return $this->addHtmlComponent(new HtmlList($identifier, $items));
 	}
 
@@ -204,7 +204,7 @@ 
 	 * @param string $content
 	 * @return HtmlSegment
 	 */
-	public function htmlSegment($identifier, $content = "") {
+	public function htmlSegment($identifier, $content="") {
 		return $this->addHtmlComponent(new HtmlSegment($identifier, $content));
 	}
 
@@ -216,7 +216,7 @@ 
 	 *        	the segments
 	 * @return HtmlSegmentGroups
 	 */
-	public function htmlSegmentGroups($identifier, $items = array()) {
+	public function htmlSegmentGroups($identifier, $items=array()) {
 		return $this->addHtmlComponent(new HtmlSegmentGroups($identifier, $items));
 	}
 
@@ -230,7 +230,7 @@ 
 	 * @param Direction|string $attributeType
 	 * @return HtmlReveal
 	 */
-	public function htmlReveal($identifier, $visibleContent, $hiddenContent, $type = RevealType::FADE, $attributeType = NULL) {
+	public function htmlReveal($identifier, $visibleContent, $hiddenContent, $type=RevealType::FADE, $attributeType=NULL) {
 		return $this->addHtmlComponent(new HtmlReveal($identifier, $visibleContent, $hiddenContent, $type, $attributeType));
 	}
 
@@ -241,7 +241,7 @@ 
 	 * @param array $steps
 	 * @return HtmlStep
 	 */
-	public function htmlStep($identifier, $steps = array()) {
+	public function htmlStep($identifier, $steps=array()) {
 		return $this->addHtmlComponent(new HtmlStep($identifier, $steps));
 	}
 
@@ -275,7 +275,7 @@ 
 	 * @param mixed $content
 	 * @return HtmlRail
 	 */
-	public function htmlRail($identifier, $content = null) {
+	public function htmlRail($identifier, $content=null) {
 		return $this->addHtmlComponent(new HtmlRail($identifier, $content));
 	}
 }

Ajax/common/html/HtmlDoubleElement.php

Spacing +36 added lines, -36 removed lines

@@ -13,19 +13,19 @@ 
 	 */
 	protected $content;
 
-	protected $wrapContentBefore = "";
+	protected $wrapContentBefore="";
 
-	protected $wrapContentAfter = "";
+	protected $wrapContentAfter="";
 
 	protected $_editableContent;
 
-	public function __construct($identifier, $tagName = "p") {
+	public function __construct($identifier, $tagName="p") {
 		parent::__construct($identifier, $tagName);
-		$this->_template = '<%tagName% id="%identifier%" %properties%>%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>';
+		$this->_template='<%tagName% id="%identifier%" %properties%>%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>';
 	}
 
 	public function setContent($content) {
-		$this->content = $content;
+		$this->content=$content;
 		return $this;
 	}
 
@@ -33,19 +33,19 @@ 
 		return $this->content;
 	}
 
-	public function addContent($content, $before = false) {
-		if (! \is_array($this->content)) {
+	public function addContent($content, $before=false) {
+		if (!\is_array($this->content)) {
 			if (isset($this->content))
-				$this->content = array(
+				$this->content=array(
 					$this->content
 				);
 			else
-				$this->content = array();
+				$this->content=array();
 		}
 		if ($before)
 			\array_unshift($this->content, $content);
 		else
-			$this->content[] = $content;
+			$this->content[]=$content;
 		return $this;
 	}
 
@@ -68,9 +68,9 @@ 
 
 	public function setValue($value) {}
 
-	public function wrapContent($before, $after = "") {
-		$this->wrapContentBefore .= $before;
-		$this->wrapContentAfter = $after . $this->wrapContentAfter;
+	public function wrapContent($before, $after="") {
+		$this->wrapContentBefore.=$before;
+		$this->wrapContentAfter=$after.$this->wrapContentAfter;
 		return $this;
 	}
 
@@ -89,14 +89,14 @@ 
 	}
 
 	protected function _getContentInstances($class, $content) {
-		$instances = [];
+		$instances=[];
 		if ($content instanceof $class) {
-			$instances[] = $content;
+			$instances[]=$content;
 		} elseif ($content instanceof HtmlDoubleElement) {
-			$instances = \array_merge($instances, $content->getContentInstances($class));
+			$instances=\array_merge($instances, $content->getContentInstances($class));
 		} elseif (\is_array($content)) {
 			foreach ($content as $element) {
-				$instances = \array_merge($instances, $this->_getContentInstances($class, $element));
+				$instances=\array_merge($instances, $this->_getContentInstances($class, $element));
 			}
 		}
 		return $instances;
@@ -107,7 +107,7 @@ 
 	 *
 	 * @return HtmlDoubleElement
 	 */
-	public function asLink($href = NULL, $target = NULL) {
+	public function asLink($href=NULL, $target=NULL) {
 		if (isset($href))
 			$this->setProperty("href", $href);
 		if (isset($target))
@@ -122,28 +122,28 @@ 
 		return \strip_tags($this->content);
 	}
 
-	public function asEditable(HtmlFormField $field, $asForm = false, $setValueProperty = "val()") {
-		$idF = $field->getIdentifier();
-		$idE = $idF;
+	public function asEditable(HtmlFormField $field, $asForm=false, $setValueProperty="val()") {
+		$idF=$field->getIdentifier();
+		$idE=$idF;
 		if ($asForm) {
-			$frm = new HtmlForm("frm-" . $field->getIdentifier());
+			$frm=new HtmlForm("frm-".$field->getIdentifier());
 			$frm->setProperty("onsubmit", "return false;");
-			$fields = $frm->addFields();
-			$idE = $frm->getIdentifier();
+			$fields=$frm->addFields();
+			$idE=$frm->getIdentifier();
 			$fields->addItem($field);
-			$fields->addButtonIcon("bt-okay", "check", "green mini", "\$('#" . $idE . "').trigger('validate',{value: $('#'+idF+' input').val()});");
-			$fields->addButtonIcon("bt-cancel", "close", "mini", "\$('#" . $idE . "').trigger('endEdit');");
-			$this->_editableContent = $frm;
-			$keypress = "";
-			$focusOut = "";
+			$fields->addButtonIcon("bt-okay", "check", "green mini", "\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});");
+			$fields->addButtonIcon("bt-cancel", "close", "mini", "\$('#".$idE."').trigger('endEdit');");
+			$this->_editableContent=$frm;
+			$keypress="";
+			$focusOut="";
 		} else {
-			$focusOut = "if(e.relatedTarget==null)elm.trigger('endEdit');";
-			$this->_editableContent = $field;
-			$keypress = "$('#" . $idF . "').keyup(function(e){if(e.which == 13) {\$('#" . $idE . "').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#" . $idE . "').trigger('endEdit');}});";
+			$focusOut="if(e.relatedTarget==null)elm.trigger('endEdit');";
+			$this->_editableContent=$field;
+			$keypress="$('#".$idF."').keyup(function(e){if(e.which == 13) {\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#".$idE."').trigger('endEdit');}});";
 		}
 		$this->_editableContent->setProperty("style", "display:none;");
-		$this->onCreate("let idF='" . $idF . "';let idE='" . $idE . "';let elm=$('#'+idE);let self=$('#" . $this->getIdentifier() . "');" . $keypress . "elm.on('validate',function(){self.html($('#'+idE+' input')." . $setValueProperty . ");elm.trigger('endEdit');});elm.on('endEdit',function(){self.show();$(this).hide();});elm.focusout(function(e){" . $focusOut . "});");
-		$this->onClick("let self=$(this);self.hide();" . $field->setJsContent("self.html()") . ";$('#" . $idF . " input').trigger('change');elm.show();$('#'+idE+' input').focus();");
+		$this->onCreate("let idF='".$idF."';let idE='".$idE."';let elm=$('#'+idE);let self=$('#".$this->getIdentifier()."');".$keypress."elm.on('validate',function(){self.html($('#'+idE+' input').".$setValueProperty.");elm.trigger('endEdit');});elm.on('endEdit',function(){self.show();$(this).hide();});elm.focusout(function(e){".$focusOut."});");
+		$this->onClick("let self=$(this);self.hide();".$field->setJsContent("self.html()").";$('#".$idF." input').trigger('change');elm.show();$('#'+idE+' input').focus();");
 	}
 
 	/**
@@ -151,8 +151,8 @@ 
 	 * {@inheritdoc}
 	 * @see \Ajax\common\html\BaseHtml::compile_once()
 	 */
-	protected function compile_once(\Ajax\JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_compiled && isset($this->_editableContent)) {
+	protected function compile_once(\Ajax\JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_compiled && isset($this->_editableContent)) {
 			$this->wrap("", $this->_editableContent);
 		}
 		parent::compile_once($js, $view);

Braces +16 added lines, -12 removed lines

@@ -35,17 +35,19 @@ 
 
 	public function addContent($content, $before = false) {
 		if (! \is_array($this->content)) {
-			if (isset($this->content))
-				$this->content = array(
+			if (isset($this->content)) {
+							$this->content = array(
 					$this->content
 				);
-			else
-				$this->content = array();
+			} else {
+							$this->content = array();
+			}
+		}
+		if ($before) {
+					\array_unshift($this->content, $content);
+		} else {
+					$this->content[] = $content;
 		}
-		if ($before)
-			\array_unshift($this->content, $content);
-		else
-			$this->content[] = $content;
 		return $this;
 	}
 
@@ -108,10 +110,12 @@ 
 	 * @return HtmlDoubleElement
 	 */
 	public function asLink($href = NULL, $target = NULL) {
-		if (isset($href))
-			$this->setProperty("href", $href);
-		if (isset($target))
-			$this->setProperty("target", $target);
+		if (isset($href)) {
+					$this->setProperty("href", $href);
+		}
+		if (isset($target)) {
+					$this->setProperty("target", $target);
+		}
 		return $this->setTagName("a");
 	}
 

Ajax/semantic/widgets/dataform/DataForm.php

Spacing +40 added lines, -40 removed lines

@@ -24,39 +24,39 @@ 
 	private $_inverted;
 	
 	public function __construct($identifier, $modelInstance=NULL) {
-		parent::__construct($identifier, null,$modelInstance);
+		parent::__construct($identifier, null, $modelInstance);
 		$this->_form=new HtmlForm($identifier);
 		$this->_init(new FormInstanceViewer($identifier), 'form', $this->_form, true);
 	}
 
-	protected function _getFieldIdentifier($prefix,$name=''){
+	protected function _getFieldIdentifier($prefix, $name='') {
 		return $this->identifier."-{$name}-".$this->_instanceViewer->getIdentifier();
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(!$this->_generated){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
 			$this->_instanceViewer->setInstance($this->_modelInstance);
 
 			$form=$this->content['form'];
 			$this->_generateContent($form);
 
-			if(isset($this->_toolbar)){
+			if (isset($this->_toolbar)) {
 				$this->_setToolbarPosition($form);
 			}
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,'form',PositionInTable::AFTERTABLE]);
-			if($this->_inverted){
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, 'form', PositionInTable::AFTERTABLE]);
+			if ($this->_inverted) {
 				$this->content['form']->setInverted(true);
 			}
 			$this->_generated=true;
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	/**
 	 * @param HtmlForm $form
 	 */
-	protected function _generateContent($form){
-		$values= $this->_instanceViewer->getValues();
+	protected function _generateContent($form) {
+		$values=$this->_instanceViewer->getValues();
 		$count=$this->_instanceViewer->count();
 		$separators=$this->_instanceViewer->getSeparators();
 		$headers=$this->_instanceViewer->getHeaders();
@@ -65,42 +65,42 @@ 
 		\sort($separators);
 		$size=\count($separators);
 		$nb=0;
-		if($size===1){
+		if ($size===1) {
 			$i=-1;
-			foreach ($values as $k=>$v){
-				$this->_generateFields($form, [$v], $headers, $i, $wrappers,$nb++,$names[$k]??'');
+			foreach ($values as $k=>$v) {
+				$this->_generateFields($form, [$v], $headers, $i, $wrappers, $nb++, $names[$k] ?? '');
 				$i++;
 			}
-		}else{
+		} else {
 			$separators[]=$count;
-			for($i=0;$i<$size;$i++){
-				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
-				$this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers,$nb++,$names[$i]??'');
+			for ($i=0; $i<$size; $i++) {
+				$fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]);
+				$this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers, $nb++, $names[$i] ?? '');
 			}
 		}
-		if($this->_hasRules && !$this->getForm()->hasValidationParams()){
+		if ($this->_hasRules && !$this->getForm()->hasValidationParams()) {
 				$this->setValidationParams(['inline'=>true]);
 		}
 	}
 
-	protected function _generateFields($form, $values, $headers, $sepFirst, $wrappers, $nb, $name){
+	protected function _generateFields($form, $values, $headers, $sepFirst, $wrappers, $nb, $name) {
 		$wrapper=null;
-		if(isset($headers[$sepFirst+1]))
-			$form->addHeader($headers[$sepFirst+1],4,true);
-		if(isset($wrappers[$sepFirst+1])){
+		if (isset($headers[$sepFirst+1]))
+			$form->addHeader($headers[$sepFirst+1], 4, true);
+		if (isset($wrappers[$sepFirst+1])) {
 			$wrapper=$wrappers[$sepFirst+1];
 		}
 		$count=\count($values);
-		if($count===1){
+		if ($count===1) {
 			$added=$form->addField($values[0]);
-		}elseif($count>1){
+		}elseif ($count>1) {
 			$added=$form->addFields($values);
-		}else
+		} else
 			return;
-		if(isset($wrapper)){
-			$added->wrap($wrapper[0],$wrapper[1]);
+		if (isset($wrapper)) {
+			$added->wrap($wrapper[0], $wrapper[1]);
 		}
-		$this->execHook('onGenerateFields',$added,$nb,$name);
+		$this->execHook('onGenerateFields', $added, $nb, $name);
 	}
 	
 	/**
@@ -108,18 +108,18 @@ 
 	 * the generated field is the first parameter
 	 * @param callable $callback the fonction to call when a field is generated
 	 */
-	public function onGenerateField($callback){
-		$this->addHook('onGenerateFields',$callback);
+	public function onGenerateField($callback) {
+		$this->addHook('onGenerateFields', $callback);
 	}
 
 	/**
 	 * @return HtmlForm
 	 */
-	public function getForm(){
+	public function getForm() {
 		return $this->content['form'];
 	}
 
-	public function addSeparatorAfter($fieldNum){
+	public function addSeparatorAfter($fieldNum) {
 		$fieldNum=$this->_getIndex($fieldNum);
 		$this->_instanceViewer->addSeparatorAfter($fieldNum);
 		return $this;
@@ -134,12 +134,12 @@ 
 		return $this;
 	}
 
-	public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value) use ($cssStyle){
-			$button=new HtmlButton($id,$value,$cssStyle);
+	public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use ($cssStyle){
+			$button=new HtmlButton($id, $value, $cssStyle);
 			$button->setProperty('type', 'reset');
 			return $button;
-		}, $index,$attributes);
+		}, $index, $attributes);
 	}
 
 	/**
@@ -158,19 +158,19 @@ 
 		$this->content[$this->_toolbarPosition]=$this->_toolbar;
 	}
 
-	public function addDividerBefore($index,$title){
+	public function addDividerBefore($index, $title) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->addHeaderDividerBefore($index, $title);
 		return $this;
 	}
 
-	public function addWrapper($index,$contentBefore,$contentAfter=null){
+	public function addWrapper($index, $contentBefore, $contentAfter=null) {
 		$index=$this->_getIndex($index);
-		$this->_instanceViewer->addWrapper($index, $contentBefore,$contentAfter);
+		$this->_instanceViewer->addWrapper($index, $contentBefore, $contentAfter);
 		return $this;
 	}
 
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		parent::run($js);
 	}
 	

Braces +8 added lines, -6 removed lines

@@ -71,7 +71,7 @@ 
 				$this->_generateFields($form, [$v], $headers, $i, $wrappers,$nb++,$names[$k]??'');
 				$i++;
 			}
-		}else{
+		} else{
 			$separators[]=$count;
 			for($i=0;$i<$size;$i++){
 				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
@@ -85,18 +85,20 @@ 
 
 	protected function _generateFields($form, $values, $headers, $sepFirst, $wrappers, $nb, $name){
 		$wrapper=null;
-		if(isset($headers[$sepFirst+1]))
-			$form->addHeader($headers[$sepFirst+1],4,true);
+		if(isset($headers[$sepFirst+1])) {
+					$form->addHeader($headers[$sepFirst+1],4,true);
+		}
 		if(isset($wrappers[$sepFirst+1])){
 			$wrapper=$wrappers[$sepFirst+1];
 		}
 		$count=\count($values);
 		if($count===1){
 			$added=$form->addField($values[0]);
-		}elseif($count>1){
+		} elseif($count>1){
 			$added=$form->addFields($values);
-		}else
-			return;
+		} else {
+					return;
+		}
 		if(isset($wrapper)){
 			$added->wrap($wrapper[0],$wrapper[1]);
 		}

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

Spacing +15 added lines, -15 removed lines

@@ -7,20 +7,20 @@ 
 
 class HtmlFormDropdown extends HtmlFormField {
 
-	public function __construct($identifier, $items = array(), $label = NULL, $value = "", $multiple = false, $associative = true) {
-		parent::__construct("field-" . $identifier, (new HtmlDropdown("dropdown-" . $identifier, $value, $items, $associative))->asSelect($identifier, $multiple), $label);
-		$this->_identifier = $identifier;
+	public function __construct($identifier, $items=array(), $label=NULL, $value="", $multiple=false, $associative=true) {
+		parent::__construct("field-".$identifier, (new HtmlDropdown("dropdown-".$identifier, $value, $items, $associative))->asSelect($identifier, $multiple), $label);
+		$this->_identifier=$identifier;
 	}
 
 	public function setItems($items) {
 		return $this->getField()->setItems($items);
 	}
 
-	public function addItem($item, $value = NULL, $image = NULL) {
+	public function addItem($item, $value=NULL, $image=NULL) {
 		return $this->getField()->addItem($item, $value, $image);
 	}
 
-	public static function multipleDropdown($identifier, $items = array(), $label = NULL, $value = "", $associative = true) {
+	public static function multipleDropdown($identifier, $items=array(), $label=NULL, $value="", $associative=true) {
 		return new HtmlFormDropdown($identifier, $items, $label, $value, true, $associative);
 	}
 
@@ -32,7 +32,7 @@ 
 		return $this->getField()->getInput();
 	}
 
-	public function asSelect($name = NULL, $multiple = false, $selection = true) {
+	public function asSelect($name=NULL, $multiple=false, $selection=true) {
 		$this->getField()->asSelect($name, $multiple, $selection);
 		return $this;
 	}
@@ -42,11 +42,11 @@ 
 	 * @param boolean $floating
 	 * @return HtmlDropdown
 	 */
-	public function asButton($floating = false) {
-		$field = $this->content["field"];
-		$label = $this->content["label"];
+	public function asButton($floating=false) {
+		$field=$this->content["field"];
+		$label=$this->content["label"];
 		$field->addContent($label);
-		$this->content = [
+		$this->content=[
 			"field" => $field
 		];
 		$this->content["field"]->asButton($floating);
@@ -61,15 +61,15 @@ 
 	 * @param boolean $labeled
 	 * @return mixed|HtmlButton
 	 */
-	public function addAction($action, $direction = Direction::RIGHT, $icon = NULL, $labeled = false) {
+	public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) {
 		$this->getField()->setStyle('display:inline-block; width: auto');
-		$actionO = $action;
-		if (\is_object($action) === false) {
-			$actionO = new HtmlButton("action-" . $this->identifier, $action);
+		$actionO=$action;
+		if (\is_object($action)===false) {
+			$actionO=new HtmlButton("action-".$this->identifier, $action);
 			if (isset($icon))
 				$actionO->addIcon($icon, true, $labeled);
 		}
-		$this->addContent($actionO, \strstr($direction, Direction::LEFT) !== false);
+		$this->addContent($actionO, \strstr($direction, Direction::LEFT)!==false);
 		return $actionO;
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -66,8 +66,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->addContent($actionO, \strstr($direction, Direction::LEFT) !== false);
 		return $actionO;

Ajax/semantic/html/base/HtmlSemNavElement.php

Spacing +11 added lines, -11 removed lines

@@ -29,12 +29,12 @@ 
 	 *
 	 * @var string|array
 	 */
-	protected $_contentSeparator = "";
+	protected $_contentSeparator="";
 
 	public function __construct($identifier, $tagName, $baseClass) {
 		parent::__construct($identifier, $tagName, $baseClass);
-		$this->root = "";
-		$this->attr = "data-ajax";
+		$this->root="";
+		$this->attr="data-ajax";
 	}
 
 	/**
@@ -54,23 +54,23 @@ 
 		return JArray::implode($this->_contentSeparator, $this->content);
 	}
 
-	public function setContentDivider($divider, $index = NULL) {
-		$divider = "<div class='divider'> {$divider} </div>";
+	public function setContentDivider($divider, $index=NULL) {
+		$divider="<div class='divider'> {$divider} </div>";
 		return $this->setDivider($divider, $index);
 	}
 
-	public function setIconContentDivider($iconContentDivider, $index = NULL) {
-		$contentDivider = "<i class='" . $iconContentDivider . " icon divider'></i>";
+	public function setIconContentDivider($iconContentDivider, $index=NULL) {
+		$contentDivider="<i class='".$iconContentDivider." icon divider'></i>";
 		return $this->setDivider($contentDivider, $index);
 	}
 
 	protected function setDivider($divider, $index) {
 		if (isset($index)) {
-			if (! \is_array($this->_contentSeparator))
-				$this->_contentSeparator = array_fill(0, $this->count() - 1, $this->_contentSeparator);
-			$this->_contentSeparator[$index] = $divider;
+			if (!\is_array($this->_contentSeparator))
+				$this->_contentSeparator=array_fill(0, $this->count()-1, $this->_contentSeparator);
+			$this->_contentSeparator[$index]=$divider;
 		} else {
-			$this->_contentSeparator = $divider;
+			$this->_contentSeparator=$divider;
 		}
 		return $this;
 	}

Braces +3 added lines, -2 removed lines

@@ -66,8 +66,9 @@
 
 	protected function setDivider($divider, $index) {
 		if (isset($index)) {
-			if (! \is_array($this->_contentSeparator))
-				$this->_contentSeparator = array_fill(0, $this->count() - 1, $this->_contentSeparator);
+			if (! \is_array($this->_contentSeparator)) {
+							$this->_contentSeparator = array_fill(0, $this->count() - 1, $this->_contentSeparator);
+			}
 			$this->_contentSeparator[$index] = $divider;
 		} else {
 			$this->_contentSeparator = $divider;