Completed
Push — master ( ab06fe...ef9455 )
by Jean-Christophe
02:37
created
Ajax/common/html/PropertyWrapper.php 1 patch
Braces   +9 added lines, -7 removed lines patch added patch discarded remove patch
@@ -25,8 +25,9 @@  discard block
 block discarded – undo
25 25
 
26 26
 	private static function containsElement($input) {
27 27
 		foreach ( $input as $v ) {
28
-			if (\is_object($v) || \is_array($v))
29
-				return true;
28
+			if (\is_object($v) || \is_array($v)) {
29
+							return true;
30
+			}
30 31
 		}
31 32
 		return false;
32 33
 	}
@@ -44,12 +45,13 @@  discard block
 block discarded – undo
44 45
 
45 46
 	public static function wrapObjects($input, $js=NULL, $separator=' ', $valueQuote='"') {
46 47
 		return implode($separator, array_map(function ($v) use($js, $separator, $valueQuote) {
47
-			if (is_object($v))
48
-				return $v->compile($js);
49
-			elseif (\is_array($v)) {
48
+			if (is_object($v)) {
49
+							return $v->compile($js);
50
+			} elseif (\is_array($v)) {
50 51
 				return self::wrap($v, $js, $separator, $valueQuote);
51
-			} else
52
-				return $v;
52
+			} else {
53
+							return $v;
54
+			}
53 55
 		}, $input));
54 56
 	}
55 57
 }
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlInputgroup.php 1 patch
Braces   +17 added lines, -13 removed lines patch added patch discarded remove patch
@@ -28,10 +28,11 @@  discard block
 block discarded – undo
28 28
 		$this->setProperty("aria-describedby", $id);
29 29
 		$span->setContent($text);
30 30
 		$span->setClass("input-group-addon");
31
-		if (strtolower($position)==="left")
32
-			$this->addonLeft=$span;
33
-		else
34
-			$this->addonRight=$span;
31
+		if (strtolower($position)==="left") {
32
+					$this->addonLeft=$span;
33
+		} else {
34
+					$this->addonRight=$span;
35
+		}
35 36
 		return $span;
36 37
 	}
37 38
 
@@ -74,7 +75,7 @@  discard block
 block discarded – undo
74 75
 			$bt=NULL;
75 76
 			if(is_string($item)){
76 77
 				$bt=new HtmlButton($this->identifier."-bt-".$i++,$item);
77
-			}elseif ($item instanceof HtmlButton){
78
+			} elseif ($item instanceof HtmlButton){
78 79
 				$bt=$item;
79 80
 			}
80 81
 			if(isset($bt)){
@@ -88,10 +89,11 @@  discard block
 block discarded – undo
88 89
 		$dropdown->setBtnCaption($caption);
89 90
 		$dropdown->fromArray($items);
90 91
 
91
-		if (strtolower($position)==="left")
92
-			$this->addonLeft=$dropdown;
93
-		else
94
-			$this->addonRight=$dropdown;
92
+		if (strtolower($position)==="left") {
93
+					$this->addonLeft=$dropdown;
94
+		} else {
95
+					$this->addonRight=$dropdown;
96
+		}
95 97
 		return $dropdown;
96 98
 	}
97 99
 
@@ -126,10 +128,12 @@  discard block
 block discarded – undo
126 128
 
127 129
 	public function run(JsUtils $js) {
128 130
 		parent::run($js);
129
-		if (isset($this->addonLeft))
130
-			$this->addonLeft->run($js);
131
-		if (isset($this->addonRight))
132
-			$this->addonRight->run($js);
131
+		if (isset($this->addonLeft)) {
132
+					$this->addonLeft->run($js);
133
+		}
134
+		if (isset($this->addonRight)) {
135
+					$this->addonRight->run($js);
136
+		}
133 137
 	}
134 138
 
135 139
 }
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlAccordion.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -69,7 +69,8 @@
 block discarded – undo
69 69
 	}
70 70
 
71 71
 	public function getPanel($index) {
72
-		if ($index<sizeof($this->content))
73
-			return $this->content [$index];
72
+		if ($index<sizeof($this->content)) {
73
+					return $this->content [$index];
74
+		}
74 75
 	}
75 76
 }
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlPanel.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -89,8 +89,9 @@  discard block
 block discarded – undo
89 89
 	 * @return \Ajax\bootstrap\html\HtmlPanel default : "panel-default"
90 90
 	 */
91 91
 	public function setStyle($cssStyle) {
92
-		if (!PhalconUtils::startsWith($cssStyle, "panel"))
93
-			$cssStyle="panel".$cssStyle;
92
+		if (!PhalconUtils::startsWith($cssStyle, "panel")) {
93
+					$cssStyle="panel".$cssStyle;
94
+		}
94 95
 		return $this->addToPropertyCtrl("class", $cssStyle, CssRef::Styles("panel"));
95 96
 	}
96 97
 
@@ -132,7 +133,8 @@  discard block
 block discarded – undo
132 133
 	 * @return $this default : false
133 134
 	 */
134 135
 	public function show($value) {
135
-		if ($this->_collapsable)
136
-			$this->_showOnStartup=$value;
136
+		if ($this->_collapsable) {
137
+					$this->_showOnStartup=$value;
138
+		}
137 139
 	}
138 140
 }
Please login to merge, or discard this patch.
Ajax/bootstrap/components/Tabs.php 1 patch
Braces   +15 added lines, -10 removed lines patch added patch discarded remove patch
@@ -36,8 +36,9 @@  discard block
 block discarded – undo
36 36
 	}
37 37
 
38 38
 	public function getTab($index) {
39
-		if ($index>0&&$index<sizeof($this->tabs))
40
-			return $this->tabs [$index];
39
+		if ($index>0&&$index<sizeof($this->tabs)) {
40
+					return $this->tabs [$index];
41
+		}
41 42
 	}
42 43
 
43 44
 	public function show($index) {
@@ -53,8 +54,9 @@  discard block
 block discarded – undo
53 54
 	 */
54 55
 	public function onShow($index, $jsCode) {
55 56
 		$tab=$this->getTab($index);
56
-		if (isset($tab))
57
-			return $tab->onShow($jsCode);
57
+		if (isset($tab)) {
58
+					return $tab->onShow($jsCode);
59
+		}
58 60
 	}
59 61
 
60 62
 	/**
@@ -65,8 +67,9 @@  discard block
 block discarded – undo
65 67
 	 */
66 68
 	public function onShown($index, $jsCode) {
67 69
 		$tab=$this->getTab($index);
68
-		if (isset($tab))
69
-			return $tab->onShown($jsCode);
70
+		if (isset($tab)) {
71
+					return $tab->onShown($jsCode);
72
+		}
70 73
 	}
71 74
 
72 75
 	/**
@@ -77,8 +80,9 @@  discard block
 block discarded – undo
77 80
 	 */
78 81
 	public function onHide($index, $jsCode) {
79 82
 		$tab=$this->getTab($index);
80
-		if (isset($tab))
81
-			return $tab->onShow($jsCode);
83
+		if (isset($tab)) {
84
+					return $tab->onShow($jsCode);
85
+		}
82 86
 	}
83 87
 
84 88
 	/**
@@ -89,7 +93,8 @@  discard block
 block discarded – undo
89 93
 	 */
90 94
 	public function onHidden($index, $jsCode) {
91 95
 		$tab=$this->getTab($index);
92
-		if (isset($tab))
93
-			return $tab->onShow($jsCode);
96
+		if (isset($tab)) {
97
+					return $tab->onShow($jsCode);
98
+		}
94 99
 	}
95 100
 }
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsActionsTrait.php 1 patch
Braces   +36 added lines, -24 removed lines patch added patch discarded remove patch
@@ -28,8 +28,9 @@  discard block
 block discarded – undo
28 28
 			$callback=", function(){\n{$callback}\n}";
29 29
 		}
30 30
 		$str="$({$element}).{$action}({$speed}{$callback});";
31
-		if ($immediatly)
32
-			$this->jquery_code_for_compile[]=$str;
31
+		if ($immediatly) {
32
+					$this->jquery_code_for_compile[]=$str;
33
+		}
33 34
 			return $str;
34 35
 	}
35 36
 	/**
@@ -61,10 +62,12 @@  discard block
 block discarded – undo
61 62
 		if (isset($param)) {
62 63
 			$param=Javascript::prep_value($param);
63 64
 			$str="$({$element}).{$jQueryCall}({$param});";
64
-		} else
65
-			$str="$({$element}).{$jQueryCall}();";
66
-		if ($immediatly)
67
-			$this->jquery_code_for_compile[]=$str;
65
+		} else {
66
+					$str="$({$element}).{$jQueryCall}();";
67
+		}
68
+		if ($immediatly) {
69
+					$this->jquery_code_for_compile[]=$str;
70
+		}
68 71
 		return $str;
69 72
 	}
70 73
 
@@ -80,8 +83,9 @@  discard block
 block discarded – undo
80 83
 		$to=Javascript::prep_element($to);
81 84
 		$element=Javascript::prep_element($element);
82 85
 		$str="$({$to}).{$jQueryCall}({$element});";
83
-		if ($immediatly)
84
-			$this->jquery_code_for_compile[]=$str;
86
+		if ($immediatly) {
87
+					$this->jquery_code_for_compile[]=$str;
88
+		}
85 89
 		return $str;
86 90
 	}
87 91
 	/**
@@ -130,10 +134,12 @@  discard block
 block discarded – undo
130 134
 		if (isset($value)) {
131 135
 			$value=Javascript::prep_value($value);
132 136
 			$str="$({$element}).attr(\"$attributeName\",{$value});";
133
-		} else
134
-			$str="$({$element}).attr(\"$attributeName\");";
135
-		if ($immediatly)
136
-			$this->jquery_code_for_compile[]=$str;
137
+		} else {
138
+					$str="$({$element}).attr(\"$attributeName\");";
139
+		}
140
+		if ($immediatly) {
141
+					$this->jquery_code_for_compile[]=$str;
142
+		}
137 143
 		return $str;
138 144
 	}
139 145
 
@@ -189,8 +195,9 @@  discard block
 block discarded – undo
189 195
 
190 196
 		$str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");";
191 197
 
192
-		if ($immediatly)
193
-			$this->jquery_code_for_compile[]=$str;
198
+		if ($immediatly) {
199
+					$this->jquery_code_for_compile[]=$str;
200
+		}
194 201
 		return $str;
195 202
 	}
196 203
 
@@ -340,8 +347,9 @@  discard block
 block discarded – undo
340 347
 		$element=Javascript::prep_element($element);
341 348
 		$str="$({$element}).trigger(\"$event\");";
342 349
 
343
-		if ($immediatly)
344
-			$this->jquery_code_for_compile[]=$str;
350
+		if ($immediatly) {
351
+					$this->jquery_code_for_compile[]=$str;
352
+		}
345 353
 		return $str;
346 354
 	}
347 355
 
@@ -403,8 +411,9 @@  discard block
 block discarded – undo
403 411
 			$str.="else{".$jsCodeIfFalse."}";
404 412
 		}
405 413
 
406
-		if ($immediatly)
407
-			$this->jquery_code_for_compile[]=$str;
414
+		if ($immediatly) {
415
+					$this->jquery_code_for_compile[]=$str;
416
+		}
408 417
 		return $str;
409 418
 	}
410 419
 
@@ -420,11 +429,13 @@  discard block
 block discarded – undo
420 429
 	private function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) {
421 430
 		$param=Javascript::prep_value($param);
422 431
 		$callback="";
423
-		if ($jsCallback!="")
424
-			$callback=", function(event){\n{$jsCallback}\n}";
432
+		if ($jsCallback!="") {
433
+					$callback=", function(event){\n{$jsCallback}\n}";
434
+		}
425 435
 			$script="$(".Javascript::prep_element($element).").".$jqueryCall."(".$param.$callback.");\n";
426
-			if ($immediatly)
427
-				$this->jquery_code_for_compile[]=$script;
436
+			if ($immediatly) {
437
+							$this->jquery_code_for_compile[]=$script;
438
+			}
428 439
 				return $script;
429 440
 	}
430 441
 
@@ -495,8 +506,9 @@  discard block
 block discarded – undo
495 506
 	 */
496 507
 	public function exec($js, $immediatly=false) {
497 508
 		$script=$js."\n";
498
-		if ($immediatly)
499
-			$this->jquery_code_for_compile[]=$script;
509
+		if ($immediatly) {
510
+					$this->jquery_code_for_compile[]=$script;
511
+		}
500 512
 		return $script;
501 513
 	}
502 514
 
Please login to merge, or discard this patch.
Ajax/common/components/SimpleComponent.php 1 patch
Braces   +11 added lines, -8 removed lines patch added patch discarded remove patch
@@ -26,9 +26,9 @@  discard block
 block discarded – undo
26 26
 			$itemSelector=JString::getValueBetween($event);
27 27
 			if($event=="execute"){
28 28
 				$this->jquery_code_for_compile []=$jsCode;
29
-			}else if($event=="beforeExecute"){
29
+			} else if($event=="beforeExecute"){
30 30
 				\array_unshift($this->jquery_code_for_compile, $jsCode);
31
-			}else{
31
+			} else{
32 32
 				$selector=$this->_createSelector($itemSelector, $this->attachTo);
33 33
 				$this->jquery_code_for_compile []="$( \"".$selector."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});";
34 34
 			}
@@ -36,10 +36,12 @@  discard block
 block discarded – undo
36 36
 	}
37 37
 
38 38
 	protected function _createSelector($itemSelector,$selector){
39
-		if(!isset($itemSelector))
40
-			$itemSelector=$this->itemSelector;
41
-		if(isset($itemSelector) && $itemSelector!=="")
42
-			$selector.=" ".$itemSelector;
39
+		if(!isset($itemSelector)) {
40
+					$itemSelector=$this->itemSelector;
41
+		}
42
+		if(isset($itemSelector) && $itemSelector!=="") {
43
+					$selector.=" ".$itemSelector;
44
+		}
43 45
 		return $selector;
44 46
 	}
45 47
 
@@ -82,8 +84,9 @@  discard block
 block discarded – undo
82 84
 
83 85
 	protected function setParamCtrl($key, $value, $typeCtrl) {
84 86
 		if (\is_array($typeCtrl)) {
85
-			if (array_search($value, $typeCtrl)===false)
86
-				throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
87
+			if (array_search($value, $typeCtrl)===false) {
88
+							throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
89
+			}
87 90
 		} else {
88 91
 			if (!$typeCtrl($value)) {
89 92
 				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." au composant ".$this->uiName);
Please login to merge, or discard this patch.
Ajax/semantic/widgets/base/InstanceViewer.php 1 patch
Braces   +42 added lines, -36 removed lines patch added patch discarded remove patch
@@ -23,8 +23,9 @@  discard block
 block discarded – undo
23 23
 		$this->widgetIdentifier=$identifier;
24 24
 		$this->values=[];
25 25
 		$this->afterCompile=[];
26
-		if(isset($instance))
27
-			$this->setInstance($instance);
26
+		if(isset($instance)) {
27
+					$this->setInstance($instance);
28
+		}
28 29
 		$this->setCaptions($captions);
29 30
 		$this->captionCallback=NULL;
30 31
 		$this->defaultValueFunction=function($name,$value){return $value;};
@@ -62,14 +63,16 @@  discard block
 block discarded – undo
62 63
 	}
63 64
 
64 65
 	public function getIdentifier($index=NULL){
65
-		if(!isset($index))
66
-			$index=self::$index;
66
+		if(!isset($index)) {
67
+					$index=self::$index;
68
+		}
67 69
 		$value=$index;
68 70
 		if(isset($this->values["identifier"])){
69
-			if(\is_string($this->values["identifier"]))
70
-				$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
71
-			else
72
-				$value=$this->values["identifier"]($index,$this->instance);
71
+			if(\is_string($this->values["identifier"])) {
72
+							$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
73
+			} else {
74
+							$value=$this->values["identifier"]($index,$this->instance);
75
+			}
73 76
 		}
74 77
 		return $value;
75 78
 	}
@@ -99,16 +102,16 @@  discard block
 block discarded – undo
99 102
 		if($property instanceof \ReflectionProperty){
100 103
 			$value=$this->_getPropertyValue($property, $index);
101 104
 			$propertyName=$property->getName();
102
-		}elseif(\is_callable($property))
103
-			$value=$property($this->instance);
104
-		elseif(\is_array($property)){
105
+		} elseif(\is_callable($property)) {
106
+					$value=$property($this->instance);
107
+		} elseif(\is_array($property)){
105 108
 			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
106 109
 			$value=\implode("", $values);
107
-		}elseif(\is_string($property)){
110
+		} elseif(\is_string($property)){
108 111
 			$value=$property;
109 112
 			if(isset($this->instance->{$property})){
110 113
 				$value=$this->instance->{$property};
111
-			}elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
114
+			} elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
112 115
 				$value=JReflection::callMethod($this->instance, $getter, []);
113 116
 			}
114 117
 		}
@@ -118,7 +121,7 @@  discard block
 block discarded – undo
118 121
 	protected function _postGetValue($index,$propertyName,$value){
119 122
 		if(isset($this->values[$index])){
120 123
 			$value= $this->values[$index]($value,$this->instance,$index);
121
-		}else{
124
+		} else{
122 125
 			$value=$this->_getDefaultValue($propertyName,$value, $index);
123 126
 		}
124 127
 		if(isset($this->afterCompile[$index])){
@@ -139,10 +142,10 @@  discard block
 block discarded – undo
139 142
 		if(isset($vb[$index])){
140 143
 			if(\is_array($vb[$index])){
141 144
 				$this->visibleProperties[$index][]=$field;
142
-			}else{
145
+			} else{
143 146
 				$this->visibleProperties[$index]=[$vb[$index],$field];
144 147
 			}
145
-		}else{
148
+		} else{
146 149
 			return $this->insertField($index, $field);
147 150
 		}
148 151
 		return $this;
@@ -169,9 +172,9 @@  discard block
 block discarded – undo
169 172
 		$property=$this->getProperty($index);
170 173
 		if($property instanceof \ReflectionProperty){
171 174
 			$result=$property->getName();
172
-		}elseif(\is_callable($property)){
175
+		} elseif(\is_callable($property)){
173 176
 			$result=$this->visibleProperties[$index];
174
-		}else{
177
+		} else{
175 178
 			$result=$property;
176 179
 		}
177 180
 		return $result;
@@ -191,7 +194,7 @@  discard block
 block discarded – undo
191 194
 		$this->reflect=new \ReflectionClass($instance);
192 195
 		if(\sizeof($this->visibleProperties)===0){
193 196
 			$this->properties=$this->getDefaultProperties();
194
-		}else{
197
+		} else{
195 198
 			foreach ($this->visibleProperties as $property){
196 199
 				$this->setInstanceProperty($property);
197 200
 			}
@@ -202,22 +205,23 @@  discard block
 block discarded – undo
202 205
 	private function setInstanceProperty($property){
203 206
 		if(\is_callable($property)){
204 207
 			$this->properties[]=$property;
205
-		}elseif(\is_string($property)){
208
+		} elseif(\is_string($property)){
206 209
 			try{
207 210
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
208 211
 				$rProperty=$this->reflect->getProperty($property);
209 212
 				$this->properties[]=$rProperty;
210
-			}catch(\Exception $e){
213
+			} catch(\Exception $e){
211 214
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
212 215
 				$this->properties[]=$property;
213 216
 			}
214
-		}elseif(\is_int($property)){
217
+		} elseif(\is_int($property)){
215 218
 			$props=$this->getDefaultProperties();
216
-			if(isset($props[$property]))
217
-				$this->properties[]=$props[$property];
218
-				else
219
-					$this->properties[]=$property;
220
-		}else{
219
+			if(isset($props[$property])) {
220
+							$this->properties[]=$props[$property];
221
+			} else {
222
+									$this->properties[]=$property;
223
+				}
224
+		} else{
221 225
 			$this->properties[]=$property;
222 226
 		}
223 227
 	}
@@ -261,12 +265,13 @@  discard block
 block discarded – undo
261 265
 		if(isset($this->captions[$index])){
262 266
 			return $this->captions[$index];
263 267
 		}
264
-		if($this->properties[$index] instanceof \ReflectionProperty)
265
-			return $this->properties[$index]->getName();
266
-		elseif(\is_callable($this->properties[$index]))
267
-			return "";
268
-		else
269
-			return $this->properties[$index];
268
+		if($this->properties[$index] instanceof \ReflectionProperty) {
269
+					return $this->properties[$index]->getName();
270
+		} elseif(\is_callable($this->properties[$index])) {
271
+					return "";
272
+		} else {
273
+					return $this->properties[$index];
274
+		}
270 275
 	}
271 276
 
272 277
 	public function getCaptions(){
@@ -277,7 +282,7 @@  discard block
 block discarded – undo
277 282
 			for($i=$captionsSize;$i<$count;$i++){
278 283
 				$captions[]="";
279 284
 			}
280
-		}else{
285
+		} else{
281 286
 			$captions=[];
282 287
 			$index=0;
283 288
 			while($index<$count){
@@ -292,8 +297,9 @@  discard block
 block discarded – undo
292 297
 	}
293 298
 
294 299
 	public function setCaption($index,$caption){
295
-		if(isset($this->captions)===false)
296
-			$this->captions=[];
300
+		if(isset($this->captions)===false) {
301
+					$this->captions=[];
302
+		}
297 303
 		$this->captions[$index]=$caption;
298 304
 		return $this;
299 305
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormInput.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,16 +9,18 @@
 block discarded – undo
9 9
 	use TextFieldsTrait;
10 10
 
11 11
 	public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) {
12
-		if(!isset($placeholder) && $type==="text")
13
-			$placeholder=$label;
12
+		if(!isset($placeholder) && $type==="text") {
13
+					$placeholder=$label;
14
+		}
14 15
 		parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label);
15 16
 		$this->_identifier=$identifier;
16 17
 	}
17 18
 
18 19
 	public function getDataField(){
19 20
 		$field= $this->getField();
20
-		if($field instanceof HtmlInput)
21
-			$field=$field->getDataField();
21
+		if($field instanceof HtmlInput) {
22
+					$field=$field->getDataField();
23
+		}
22 24
 		return $field;
23 25
 	}
24 26
 }
Please login to merge, or discard this patch.