phpMv / phpMv-UI

Ajax/semantic/components/validation/FieldValidation.php

Spacing +19 added lines, -19 removed lines

@@ -30,7 +30,7 @@ 
 	 */
 	protected $customRules;
 
-	protected $hasCustomRules = false;
+	protected $hasCustomRules=false;
 
 	/**
 	 *
@@ -41,8 +41,8 @@ 
 	protected $optional;
 
 	public function __construct($identifier) {
-		$this->identifier = $identifier;
-		$this->rules = [];
+		$this->identifier=$identifier;
+		$this->rules=[];
 	}
 
 	public function getIdentifier() {
@@ -50,7 +50,7 @@ 
 	}
 
 	public function setIdentifier($identifier) {
-		$this->identifier = $identifier;
+		$this->identifier=$identifier;
 		return $this;
 	}
 
@@ -65,47 +65,47 @@ 
 	 * @param string $value
 	 * @return Rule
 	 */
-	public function addRule($type, $prompt = NULL, $value = NULL) {
+	public function addRule($type, $prompt=NULL, $value=NULL) {
 		if ($type instanceof Rule) {
-			$rule = $type;
+			$rule=$type;
 			if ($type instanceof CustomRule) {
-				$this->customRules[] = $type;
-				$this->hasCustomRules = true;
+				$this->customRules[]=$type;
+				$this->hasCustomRules=true;
 			}
 		} elseif (\is_array($type)) {
-			$value = JArray::getValue($type, "value", 2);
-			$prompt = JArray::getValue($type, "prompt", 1);
-			$type = JArray::getValue($type, "type", 0);
-			$rule = new Rule($type, $prompt, $value);
+			$value=JArray::getValue($type, "value", 2);
+			$prompt=JArray::getValue($type, "prompt", 1);
+			$type=JArray::getValue($type, "type", 0);
+			$rule=new Rule($type, $prompt, $value);
 		} else {
-			$rule = new Rule($type, $prompt, $value);
+			$rule=new Rule($type, $prompt, $value);
 		}
-		$this->rules[] = $rule;
+		$this->rules[]=$rule;
 		return $rule;
 	}
 
 	#[\ReturnTypeWillChange]
 	public function jsonSerialize() {
-		$result = [
+		$result=[
 			"identifier" => $this->identifier,
 			"rules" => $this->rules
 		];
 		if ($this->optional) {
-			$result["optional"] = true;
+			$result["optional"]=true;
 		}
 		if (isset($this->depends)) {
-			$result["depends"] = $this->depends;
+			$result["depends"]=$this->depends;
 		}
 		return $result;
 	}
 
 	public function setDepends($depends) {
-		$this->depends = $depends;
+		$this->depends=$depends;
 		return $this;
 	}
 
 	public function setOptional($optional) {
-		$this->optional = $optional;
+		$this->optional=$optional;
 		return $this;
 	}
 

Ajax/semantic/components/validation/Rule.php

Braces +9 added lines, -6 removed lines

@@ -59,10 +59,12 @@ 
 	#[\ReturnTypeWillChange]
 	public function jsonSerialize() {
 		$result= ["type"=>$this->type];
-		if(isset($this->prompt))
-			$result["prompt"]=$this->prompt;
-		if(isset($this->value))
-			$result["value"]=$this->value;
+		if(isset($this->prompt)) {
+					$result["prompt"]=$this->prompt;
+		}
+		if(isset($this->value)) {
+					$result["value"]=$this->value;
+		}
 		return $result;
 	}
 
@@ -94,8 +96,9 @@ 
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
 	public static function integer($min=NULL,$max=NULL,$prompt=NULL){
-		if(\is_int($min) && \is_int($max))
-			return new Rule("integer[{$min}..{$max}]",$prompt);
+		if(\is_int($min) && \is_int($max)) {
+					return new Rule("integer[{$min}..{$max}]",$prompt);
+		}
 		return new Rule("integer",$prompt);
 	}
 

Spacing +49 added lines, -49 removed lines

@@ -8,7 +8,7 @@ 
  * @version 1.001
  * Generates a JSON Rule for the validation of a field
  */
-class Rule implements \JsonSerializable{
+class Rule implements \JsonSerializable {
 	/**
 	 * @var string
 	 */
@@ -23,7 +23,7 @@ 
 	 */
 	private $value;
 
-	public function __construct($type,$prompt=NULL,$value=NULL){
+	public function __construct($type, $prompt=NULL, $value=NULL) {
 		$this->type=$type;
 		$this->prompt=$prompt;
 		$this->value=$value;
@@ -58,10 +58,10 @@ 
 
 	#[\ReturnTypeWillChange]
 	public function jsonSerialize() {
-		$result= ["type"=>$this->type];
-		if(isset($this->prompt))
+		$result=["type"=>$this->type];
+		if (isset($this->prompt))
 			$result["prompt"]=$this->prompt;
-		if(isset($this->value))
+		if (isset($this->value))
 			$result["value"]=$this->value;
 		return $result;
 	}
@@ -72,8 +72,8 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function match($name,$prompt=NULL){
-		return new Rule("match[".$name."]",$prompt);
+	public static function match($name, $prompt=NULL){
+		return new Rule("match[".$name."]", $prompt);
 	}
 
 	/**
@@ -82,8 +82,8 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function different($name,$prompt=NULL){
-		return new Rule("different[".$name."]",$prompt);
+	public static function different($name, $prompt=NULL) {
+		return new Rule("different[".$name."]", $prompt);
 	}
 
 	/**
@@ -93,82 +93,82 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function integer($min=NULL,$max=NULL,$prompt=NULL){
-		if(\is_int($min) && \is_int($max))
-			return new Rule("integer[{$min}..{$max}]",$prompt);
-		return new Rule("integer",$prompt);
+	public static function integer($min=NULL, $max=NULL, $prompt=NULL) {
+		if (\is_int($min) && \is_int($max))
+			return new Rule("integer[{$min}..{$max}]", $prompt);
+		return new Rule("integer", $prompt);
 	}
 
-	public static function decimal($prompt=NULL){
-		return new Rule("decimal",$prompt);
+	public static function decimal($prompt=NULL) {
+		return new Rule("decimal", $prompt);
 	}
 
-	public static function number($prompt=NULL){
-		return new Rule("number",$prompt);
+	public static function number($prompt=NULL) {
+		return new Rule("number", $prompt);
 	}
 
-	public static function is($value,$prompt=NULL){
-		return new Rule("is[".$value."]",$prompt);
+	public static function is($value, $prompt=NULL) {
+		return new Rule("is[".$value."]", $prompt);
 	}
 
-	public static function isExactly($value,$prompt=NULL){
-		return new Rule("isExactly[".$value."]",$prompt);
+	public static function isExactly($value, $prompt=NULL) {
+		return new Rule("isExactly[".$value."]", $prompt);
 	}
 
-	public static function not($value,$prompt=NULL){
-		return new Rule("not[".$value."]",$prompt);
+	public static function not($value, $prompt=NULL) {
+		return new Rule("not[".$value."]", $prompt);
 	}
 
-	public static function notExactly($value,$prompt=NULL){
-		return new Rule("notExactly[".$value."]",$prompt);
+	public static function notExactly($value, $prompt=NULL) {
+		return new Rule("notExactly[".$value."]", $prompt);
 	}
 
-	public static function contains($value,$prompt=NULL){
-		return new Rule("contains[".$value."]",$prompt);
+	public static function contains($value, $prompt=NULL) {
+		return new Rule("contains[".$value."]", $prompt);
 	}
 
-	public static function containsExactly($value,$prompt=NULL){
-		return new Rule("containsExactly[".$value."]",$prompt);
+	public static function containsExactly($value, $prompt=NULL) {
+		return new Rule("containsExactly[".$value."]", $prompt);
 	}
 
-	public static function doesntContain($value,$prompt=NULL){
-		return new Rule("doesntContain[".$value."]",$prompt);
+	public static function doesntContain($value, $prompt=NULL) {
+		return new Rule("doesntContain[".$value."]", $prompt);
 	}
 
-	public static function doesntContainExactly($value,$prompt=NULL){
-		return new Rule("doesntContainExactly[".$value."]",$prompt);
+	public static function doesntContainExactly($value, $prompt=NULL) {
+		return new Rule("doesntContainExactly[".$value."]", $prompt);
 	}
 
-	public static function minCount($value,$prompt=NULL){
-		return new Rule("minCount[".$value."]",$prompt);
+	public static function minCount($value, $prompt=NULL) {
+		return new Rule("minCount[".$value."]", $prompt);
 	}
 
-	public static function maxCount($value,$prompt=NULL){
-		return new Rule("maxCount[".$value."]",$prompt);
+	public static function maxCount($value, $prompt=NULL) {
+		return new Rule("maxCount[".$value."]", $prompt);
 	}
 
-	public static function exactCount($value,$prompt=NULL){
-		return new Rule("exactCount[".$value."]",$prompt);
+	public static function exactCount($value, $prompt=NULL) {
+		return new Rule("exactCount[".$value."]", $prompt);
 	}
 
-	public static function email($prompt=NULL){
-		return new Rule("email",$prompt);
+	public static function email($prompt=NULL) {
+		return new Rule("email", $prompt);
 	}
 
-	public static function url($prompt=NULL){
-		return new Rule("url",$prompt);
+	public static function url($prompt=NULL) {
+		return new Rule("url", $prompt);
 	}
 
-	public static function regExp($value,$prompt=NULL){
-		return new Rule("regExp",$prompt,$value);
+	public static function regExp($value, $prompt=NULL) {
+		return new Rule("regExp", $prompt, $value);
 	}
 
-	public static function custom($name,$jsFunction){
-		return "$.fn.form.settings.rules.".$name." =".$jsFunction ;
+	public static function custom($name, $jsFunction) {
+		return "$.fn.form.settings.rules.".$name." =".$jsFunction;
 	}
 
-	public static function ajax(JsUtils $js,$name,$url,$params,$jsCallback,$method="post",$parameters=[]){
-		$parameters=\array_merge(["async"=>false,"url"=>$url,"params"=>$params,"hasLoader"=>false,"jsCallback"=>$jsCallback,"dataType"=>"json","stopPropagation"=>false,"preventDefault"=>false,"responseElement"=>null],$parameters);
+	public static function ajax(JsUtils $js, $name, $url, $params, $jsCallback, $method="post", $parameters=[]) {
+		$parameters=\array_merge(["async"=>false, "url"=>$url, "params"=>$params, "hasLoader"=>false, "jsCallback"=>$jsCallback, "dataType"=>"json", "stopPropagation"=>false, "preventDefault"=>false, "responseElement"=>null], $parameters);
 		$ajax=new AjaxCall($method, $parameters);
 		return self::custom($name, "function(value,ruleValue){var result=true;".$ajax->compile($js)."return result;}");
 	}

Ajax/service/Javascript.php

Spacing +21 added lines, -21 removed lines

@@ -3,36 +3,36 @@ 
 
 class Javascript {
 
-	public static $preventDefault = "\nif(event && event.preventDefault) event.preventDefault();\n";
+	public static $preventDefault="\nif(event && event.preventDefault) event.preventDefault();\n";
 
-	public static $stopPropagation = "\nif(event && event.stopPropagation) event.stopPropagation();\n";
+	public static $stopPropagation="\nif(event && event.stopPropagation) event.stopPropagation();\n";
 
-	public static function draggable($attr = "id") {
-		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;dt.setData("text/plain",JSON.stringify({id:$(event.target).attr("id"),data:$(event.target).attr("' . $attr . '")}));';
+	public static function draggable($attr="id") {
+		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;dt.setData("text/plain",JSON.stringify({id:$(event.target).attr("id"),data:$(event.target).attr("'.$attr.'")}));';
 	}
 
-	public static function dropZone($jqueryDone, $jsCallback = "") {
-		$done = ($jqueryDone != null) ? '$(event.target).' . $jqueryDone . '($("#"+_data.id));' : '';
-		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;var _data=JSON.parse(dt.getData("text/plain"));' . $done . 'var data=_data.data;' . $jsCallback;
+	public static function dropZone($jqueryDone, $jsCallback="") {
+		$done=($jqueryDone!=null) ? '$(event.target).'.$jqueryDone.'($("#"+_data.id));' : '';
+		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;var _data=JSON.parse(dt.getData("text/plain"));'.$done.'var data=_data.data;'.$jsCallback;
 	}
 
-	public static function fileDropZone($jsCallback = "") {
-		$done = 'event.target.upload=formData;$(event.target).trigger("upload");';
-		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;var files=dt.files;var formData = new FormData();for (var i = 0; i < files.length; i++) {formData.append("file-"+i,files[i]);}' . $done . $jsCallback;
+	public static function fileDropZone($jsCallback="") {
+		$done='event.target.upload=formData;$(event.target).trigger("upload");';
+		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;var files=dt.files;var formData = new FormData();for (var i = 0; i < files.length; i++) {formData.append("file-"+i,files[i]);}'.$done.$jsCallback;
 	}
 
 	public static function containsCode($expression) {
-		if ($expression == null) {
+		if ($expression==null) {
 			return false;
 		}
-		return \strrpos($expression, 'this') !== false || \strrpos($expression, 'event') !== false || \strrpos($expression, 'self') !== false;
+		return \strrpos($expression, 'this')!==false || \strrpos($expression, 'event')!==false || \strrpos($expression, 'self')!==false;
 	}
 
 	public static function isFunction($jsCode) {
 		return JString::startswith($jsCode, "function");
 	}
 
-	public static function fileUploadBehavior($id = '') {
+	public static function fileUploadBehavior($id='') {
 		return "$('input:text, .ui.button', '#{$id}').on('click', function (e) {e.preventDefault();\$('input:file', '#{$id}').click();});
 				$('input:file', '#{$id}').on('change', function (e) {if(e.target.files.length){var name = e.target.files[0].name;$('input:text', $(e.target).parent()).val(name);}});";
 	}
@@ -46,8 +46,8 @@ 
 	 * @return string
 	 */
 	public static function prep_element($element) {
-		if (self::containsCode($element) === false) {
-			$element = '"' . addslashes($element ?? '') . '"';
+		if (self::containsCode($element)===false) {
+			$element='"'.addslashes($element ?? '').'"';
 		}
 		return $element;
 	}
@@ -62,24 +62,24 @@ 
 	 */
 	public static function prep_value($value) {
 		if (\is_array($value)) {
-			$value = implode(",", $value);
+			$value=implode(",", $value);
 		}
-		if (self::containsCode($value) === false) {
-			$value = \str_replace([
+		if (self::containsCode($value)===false) {
+			$value=\str_replace([
 				"\\",
 				"\""
 			], [
 				"\\\\",
 				"\\\""
 			], $value);
-			$value = '"' . $value . '"';
+			$value='"'.$value.'"';
 		}
 		return trim($value, "%");
 	}
 
 	public static function prep_jquery_selector($value) {
-		if (JString::startswith($value, '$(') === false) {
-			return '$(' . self::prep_value($value) . ')';
+		if (JString::startswith($value, '$(')===false) {
+			return '$('.self::prep_value($value).')';
 		}
 		return $value;
 	}

Ajax/common/Widget.php

Spacing +76 added lines, -76 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,27 +66,27 @@ 
 
 	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)) {
 			if (\is_object($modelInstance)) {
-				$this->_model = \get_class($modelInstance);
+				$this->_model=\get_class($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;
 	}
 
 	/**
@@ -95,16 +95,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) {
@@ -115,13 +115,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() {
@@ -129,7 +129,7 @@ 
 	}
 
 	public function setModel($_model) {
-		$this->_model = $_model;
+		$this->_model=$_model;
 		return $this;
 	}
 
@@ -138,13 +138,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);
 	}
 
@@ -159,8 +159,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;
@@ -185,7 +185,7 @@ 
 		return $this;
 	}
 
-	public function addField($field, $key = null) {
+	public function addField($field, $key=null) {
 		$this->_instanceViewer->addField($field, $key);
 		return $this;
 	}
@@ -199,10 +199,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() {
@@ -211,15 +211,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;
@@ -235,8 +235,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;
@@ -252,8 +252,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;
 	}
@@ -266,11 +266,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)) {
@@ -289,8 +289,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;
@@ -303,7 +303,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);
@@ -324,10 +324,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);
 	}
@@ -340,8 +340,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);
 	}
 
@@ -353,8 +353,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);
 	}
 
@@ -366,14 +366,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);
 	}
@@ -396,8 +396,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;
 	}
 
@@ -426,8 +426,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.");";
 	}
 
 	/**
@@ -437,8 +437,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')")));
@@ -446,18 +446,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;
@@ -471,7 +471,7 @@ 
 	}
 
 	protected function runForm(JsUtils $js) {
-		$fields = $this->getContentInstances(HtmlFormField::class);
+		$fields=$this->getContentInstances(HtmlFormField::class);
 		foreach ($fields as $field) {
 			$this->_form->addField($field);
 		}
@@ -480,10 +480,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>");
 		}
 	}
 
@@ -505,21 +505,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());
@@ -527,7 +527,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

@@ -291,8 +291,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;
 	}
 
@@ -481,8 +482,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/html/collections/form/HtmlFormField.php

Spacing +30 added lines, -30 removed lines

@@ -19,38 +19,38 @@ 
 
 	protected $_validation;
 
-	public function __construct($identifier, $field, $label = NULL) {
+	public function __construct($identifier, $field, $label=NULL) {
 		parent::__construct($identifier, "div", "field");
-		$this->content = array();
-		$this->_states = [
+		$this->content=array();
+		$this->_states=[
 			State::ERROR,
 			State::DISABLED
 		];
-		if (isset($label) && $label !== "")
+		if (isset($label) && $label!=="")
 			$this->setLabel($label);
 		$this->setField($field);
-		$this->_validation = NULL;
+		$this->_validation=NULL;
 	}
 
-	public function addPointingLabel($label, $pointing = Direction::NONE) {
-		$labelO = new HtmlLabel("", $label);
+	public function addPointingLabel($label, $pointing=Direction::NONE) {
+		$labelO=new HtmlLabel("", $label);
 		$labelO->setPointing($pointing);
-		$this->addContent($labelO, $pointing === "below" || $pointing === "right");
+		$this->addContent($labelO, $pointing==="below" || $pointing==="right");
 		return $labelO;
 	}
 
 	public function setLabel($label) {
-		$labelO = $label;
+		$labelO=$label;
 		if (\is_string($label)) {
-			$labelO = new HtmlSemDoubleElement("", "label", "");
+			$labelO=new HtmlSemDoubleElement("", "label", "");
 			$labelO->setContent($label);
 			$labelO->setProperty("for", \str_replace("field-", "", $this->identifier));
 		}
-		$this->content["label"] = $labelO;
+		$this->content["label"]=$labelO;
 	}
 
 	public function setField($field) {
-		$this->content["field"] = $field;
+		$this->content["field"]=$field;
 	}
 
 	/**
@@ -85,9 +85,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;
 	}
 
 	/**
@@ -98,7 +98,7 @@ 
 	 */
 	public function setWidth($width) {
 		if (\is_int($width)) {
-			$width = Wide::getConstants()["W" . $width];
+			$width=Wide::getConstants()["W".$width];
 		}
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
 		if (isset($this->_container)) {
@@ -127,7 +127,7 @@ 
 	}
 
 	public function setContainer($_container) {
-		$this->_container = $_container;
+		$this->_container=$_container;
 		return $this;
 	}
 
@@ -135,17 +135,17 @@ 
 		$this->getDataField()->setProperty("readonly", "");
 	}
 
-	public function addRule($type, $prompt = NULL, $value = NULL) {
-		$field = $this->getDataField();
+	public function addRule($type, $prompt=NULL, $value=NULL) {
+		$field=$this->getDataField();
 		if (isset($field)) {
-			if (! isset($this->_validation)) {
-				$this->_validation = new FieldValidation($field->getIdentifier());
+			if (!isset($this->_validation)) {
+				$this->_validation=new FieldValidation($field->getIdentifier());
 			}
-			if($type instanceof Rule){
-				if($type->getType()=='empty'){
+			if ($type instanceof Rule) {
+				if ($type->getType()=='empty') {
 					$this->addToProperty('class', 'required');
 				}
-			}elseif ($type === 'empty' || ($type['type'] ?? '') === 'empty') {
+			}elseif ($type==='empty' || ($type['type'] ?? '')==='empty') {
 				$this->addToProperty('class', 'required');
 			}
 			$this->_validation->addRule($type, $prompt, $value);
@@ -153,11 +153,11 @@ 
 		return $this;
 	}
 
-	public function setOptional($optional = true) {
-		$field = $this->getDataField();
+	public function setOptional($optional=true) {
+		$field=$this->getDataField();
 		if (isset($field)) {
-			if (! isset($this->_validation)) {
-				$this->_validation = new FieldValidation($field->getIdentifier());
+			if (!isset($this->_validation)) {
+				$this->_validation=new FieldValidation($field->getIdentifier());
 			}
 			$this->_validation->setOptional($optional);
 		}
@@ -171,12 +171,12 @@ 
 	}
 
 	public function setRules(array $rules) {
-		$this->_validation = null;
+		$this->_validation=null;
 		return $this->addRules($rules);
 	}
 
-	public function addIcon($icon, $direction = Direction::LEFT) {
-		$field = $this->getField();
+	public function addIcon($icon, $direction=Direction::LEFT) {
+		$field=$this->getField();
 		return $field->addIcon($icon, $direction);
 	}
 

Braces +7 added lines, -5 removed lines

@@ -26,8 +26,9 @@ 
 			State::ERROR,
 			State::DISABLED
 		];
-		if (isset($label) && $label !== "")
-			$this->setLabel($label);
+		if (isset($label) && $label !== "") {
+					$this->setLabel($label);
+		}
 		$this->setField($field);
 		$this->_validation = NULL;
 	}
@@ -59,8 +60,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"];
+		}
 	}
 
 	/**
@@ -145,7 +147,7 @@ 
 				if($type->getType()=='empty'){
 					$this->addToProperty('class', 'required');
 				}
-			}elseif ($type === 'empty' || ($type['type'] ?? '') === 'empty') {
+			} elseif ($type === 'empty' || ($type['type'] ?? '') === 'empty') {
 				$this->addToProperty('class', 'required');
 			}
 			$this->_validation->addRule($type, $prompt, $value);