Completed
Push — master ( fb7dfb...db4c08 )
by Jean-Christophe
02:42
created
Ajax/semantic/widgets/base/InstanceViewer.php 1 patch
Braces   +41 added lines, -35 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,17 +102,17 @@  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_array($property)){
105
+		} elseif(\is_array($property)){
103 106
 			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
104 107
 			$value=\implode("", $values);
105
-		}elseif(\is_string($property)){
108
+		} elseif(\is_string($property)){
106 109
 			$value=$property;
107 110
 			if(isset($this->instance->{$property})){
108 111
 				$value=$this->instance->{$property};
109
-			}elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
112
+			} elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
110 113
 				$value=JReflection::callMethod($this->instance, $getter, []);
111 114
 			}
112
-		}elseif(\is_callable($property)){
115
+		} elseif(\is_callable($property)){
113 116
 			$value=$property($this->instance);
114 117
 		}
115 118
 		return $this->_postGetValue($index, $propertyName, $value);
@@ -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;
@@ -174,9 +177,9 @@  discard block
 block discarded – undo
174 177
 		$property=$this->getProperty($index);
175 178
 		if($property instanceof \ReflectionProperty){
176 179
 			$result=$property->getName();
177
-		}elseif(\is_callable($property)){
180
+		} elseif(\is_callable($property)){
178 181
 			$result=$this->visibleProperties[$index];
179
-		}else{
182
+		} else{
180 183
 			$result=$property;
181 184
 		}
182 185
 		return $result;
@@ -196,7 +199,7 @@  discard block
 block discarded – undo
196 199
 		$this->reflect=new \ReflectionClass($instance);
197 200
 		if(\sizeof($this->visibleProperties)===0){
198 201
 			$this->properties=$this->getDefaultProperties();
199
-		}else{
202
+		} else{
200 203
 			foreach ($this->visibleProperties as $property){
201 204
 				$this->setInstanceProperty($property);
202 205
 			}
@@ -207,22 +210,23 @@  discard block
 block discarded – undo
207 210
 	private function setInstanceProperty($property){
208 211
 		if(\is_callable($property)){
209 212
 			$this->properties[]=$property;
210
-		}elseif(\is_string($property)){
213
+		} elseif(\is_string($property)){
211 214
 			try{
212 215
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
213 216
 				$rProperty=$this->reflect->getProperty($property);
214 217
 				$this->properties[]=$rProperty;
215
-			}catch(\Exception $e){
218
+			} catch(\Exception $e){
216 219
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
217 220
 				$this->properties[]=$property;
218 221
 			}
219
-		}elseif(\is_int($property)){
222
+		} elseif(\is_int($property)){
220 223
 			$props=$this->getDefaultProperties();
221
-			if(isset($props[$property]))
222
-				$this->properties[]=$props[$property];
223
-				else
224
-					$this->properties[]=$property;
225
-		}else{
224
+			if(isset($props[$property])) {
225
+							$this->properties[]=$props[$property];
226
+			} else {
227
+									$this->properties[]=$property;
228
+				}
229
+		} else{
226 230
 			$this->properties[]=$property;
227 231
 		}
228 232
 	}
@@ -266,12 +270,13 @@  discard block
 block discarded – undo
266 270
 		if(isset($this->captions[$index])){
267 271
 			return $this->captions[$index];
268 272
 		}
269
-		if($this->properties[$index] instanceof \ReflectionProperty)
270
-			return $this->properties[$index]->getName();
271
-		elseif(\is_callable($this->properties[$index]))
272
-			return "";
273
-		else
274
-			return $this->properties[$index];
273
+		if($this->properties[$index] instanceof \ReflectionProperty) {
274
+					return $this->properties[$index]->getName();
275
+		} elseif(\is_callable($this->properties[$index])) {
276
+					return "";
277
+		} else {
278
+					return $this->properties[$index];
279
+		}
275 280
 	}
276 281
 
277 282
 	public function getCaptions(){
@@ -282,7 +287,7 @@  discard block
 block discarded – undo
282 287
 			for($i=$captionsSize;$i<$count;$i++){
283 288
 				$captions[]="";
284 289
 			}
285
-		}else{
290
+		} else{
286 291
 			$captions=[];
287 292
 			$index=0;
288 293
 			while($index<$count){
@@ -297,8 +302,9 @@  discard block
 block discarded – undo
297 302
 	}
298 303
 
299 304
 	public function setCaption($index,$caption){
300
-		if(isset($this->captions)===false)
301
-			$this->captions=[];
305
+		if(isset($this->captions)===false) {
306
+					$this->captions=[];
307
+		}
302 308
 		$this->captions[$index]=$caption;
303 309
 		return $this;
304 310
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/content/table/HtmlTableContent.php 1 patch
Braces   +18 added lines, -12 removed lines patch added patch discarded remove patch
@@ -22,8 +22,9 @@  discard block
 block discarded – undo
22 22
 	 */
23 23
 	public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) {
24 24
 		parent::__construct($identifier, $tagName, "");
25
-		if (isset($rowCount) && isset($colCount))
26
-			$this->setRowCount($rowCount, $colCount);
25
+		if (isset($rowCount) && isset($colCount)) {
26
+					$this->setRowCount($rowCount, $colCount);
27
+		}
27 28
 	}
28 29
 
29 30
 	/**
@@ -148,8 +149,9 @@  discard block
 block discarded – undo
148 149
 			$values=\array_fill(0, $count, $values);
149 150
 			$isArray=false;
150 151
 		}
151
-		if (JArray::dimension($values) == 1 && $isArray)
152
-			$values=[ $values ];
152
+		if (JArray::dimension($values) == 1 && $isArray) {
153
+					$values=[ $values ];
154
+		}
153 155
 
154 156
 		$count=\min(\sizeof($values), $count);
155 157
 
@@ -193,8 +195,9 @@  discard block
 block discarded – undo
193 195
 		$count=$this->count();
194 196
 		for($i=0; $i < $count; $i++) {
195 197
 			$index=$this->content[$i]->getColPosition($colIndex);
196
-			if ($index !== NULL)
197
-				$this->getCell($i, $index)->$function();
198
+			if ($index !== NULL) {
199
+							$this->getCell($i, $index)->$function();
200
+			}
198 201
 		}
199 202
 		return $this;
200 203
 	}
@@ -225,8 +228,9 @@  discard block
 block discarded – undo
225 228
 	 */
226 229
 	public function getColCount() {
227 230
 		$result=0;
228
-		if ($this->count() > 0)
229
-			$result=$this->getItem(0)->count();
231
+		if ($this->count() > 0) {
232
+					$result=$this->getItem(0)->count();
233
+		}
230 234
 		return $result;
231 235
 	}
232 236
 
@@ -250,8 +254,9 @@  discard block
 block discarded – undo
250 254
 
251 255
 	public function toDelete($rowIndex, $colIndex){
252 256
 		$row=$this->getItem($rowIndex);
253
-		if (isset($row) === true)
254
-			$row->toDelete($colIndex);
257
+		if (isset($row) === true) {
258
+					$row->toDelete($colIndex);
259
+		}
255 260
 		return $this;
256 261
 	}
257 262
 
@@ -349,8 +354,9 @@  discard block
 block discarded – undo
349 354
 		foreach ( $rows as $row ) {
350 355
 			$cell=$row->getItem($colIndex);
351 356
 			$value=$cell->getContent();
352
-			if($functionExists)
353
-				$value=\call_user_func($function,$value);
357
+			if($functionExists) {
358
+							$value=\call_user_func($function,$value);
359
+			}
354 360
 			if($value!==$identiqual){
355 361
 				if($counter>0 && isset($cellToMerge)){
356 362
 					$cellToMerge->setRowspan($counter);
Please login to merge, or discard this patch.
Ajax/semantic/html/content/table/HtmlTD.php 1 patch
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -84,15 +84,17 @@  discard block
 block discarded – undo
84 84
 
85 85
 	public function getColspan() {
86 86
 		$colspan=1;
87
-		if (\array_key_exists("colspan", $this->properties))
88
-			$colspan=$this->getProperty("colspan");
87
+		if (\array_key_exists("colspan", $this->properties)) {
88
+					$colspan=$this->getProperty("colspan");
89
+		}
89 90
 		return $colspan;
90 91
 	}
91 92
 
92 93
 	public function getRowspan() {
93 94
 		$rowspan=1;
94
-		if (\array_key_exists("rowspan", $this->properties))
95
-			$rowspan=$this->getProperty("rowspan");
95
+		if (\array_key_exists("rowspan", $this->properties)) {
96
+					$rowspan=$this->getProperty("rowspan");
97
+		}
96 98
 		return $rowspan;
97 99
 	}
98 100
 
@@ -129,8 +131,9 @@  discard block
 block discarded – undo
129 131
 	}
130 132
 
131 133
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
132
-		if(!$this->_deleted)
133
-			return parent::compile();
134
+		if(!$this->_deleted) {
135
+					return parent::compile();
136
+		}
134 137
 		return;
135 138
 	}
136 139
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/modules/HtmlDropdown.php 1 patch
Braces   +24 added lines, -19 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 		if(isset($value)){
35 35
 			if($value instanceof HtmlSemDoubleElement){
36 36
 				$text=$value;
37
-			}else{
37
+			} else{
38 38
 				$text=new HtmlSemDoubleElement("text-".$this->identifier,"div");
39 39
 				$text->setClass("text");
40 40
 				$this->setValue($value);
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 		}
108 108
 		if(!$item instanceof HtmlDropdownItem){
109 109
 			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image,$description);
110
-		}elseif($itemO instanceof HtmlDropdownItem){
110
+		} elseif($itemO instanceof HtmlDropdownItem){
111 111
 			$this->addToProperty("class", "vertical");
112 112
 		}
113 113
 		return $itemO;
@@ -121,8 +121,9 @@  discard block
 block discarded – undo
121 121
 	}
122 122
 
123 123
 	public function addInput($name){
124
-		if(!isset($name))
125
-			$name="input-".$this->identifier;
124
+		if(!isset($name)) {
125
+					$name="input-".$this->identifier;
126
+		}
126 127
 		$this->setAction("activate");
127 128
 		$this->input=new HtmlInput($name,"hidden");
128 129
 	}
@@ -179,7 +180,7 @@  discard block
 block discarded – undo
179 180
 			foreach ($items as $k=>$v){
180 181
 				$this->addItem($v)->setData($k);
181 182
 			}
182
-		}else{
183
+		} else{
183 184
 			foreach ($items as $item){
184 185
 				$this->addItem($item);
185 186
 			}
@@ -201,8 +202,7 @@  discard block
 block discarded – undo
201 202
 			$c=$this->items[$i++];
202 203
 			if(isset($c)){
203 204
 				$c->setProperty($property,$value);
204
-			}
205
-			else{
205
+			} else{
206 206
 				return $this;
207 207
 			}
208 208
 		}
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 		if($dropdown===false){
227 227
 			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
228 228
 			$dropdown="menu";
229
-		}else{
229
+		} else{
230 230
 			$dropdown="dropdown";
231 231
 			$this->mClass="menu";
232 232
 		}
@@ -247,22 +247,25 @@  discard block
 block discarded – undo
247 247
 
248 248
 	public function asButton($floating=false){
249 249
 		$this->removeArrow();
250
-		if($floating)
251
-			$this->addToProperty("class", "floating");
250
+		if($floating) {
251
+					$this->addToProperty("class", "floating");
252
+		}
252 253
 		$this->removePropertyValue("class", "selection");
253 254
 		return $this->addToProperty("class", "button");
254 255
 	}
255 256
 
256 257
 	public function asSelect($name=NULL,$multiple=false,$selection=true){
257 258
 		$this->_multiple=$multiple;
258
-		if(isset($name))
259
-			$this->addInput($name);
259
+		if(isset($name)) {
260
+					$this->addInput($name);
261
+		}
260 262
 		if($multiple){
261 263
 			$this->addToProperty("class", "multiple");
262 264
 		}
263 265
 		if ($selection){
264
-			if($this->propertyContains("class", "button")===false)
265
-				$this->addToPropertyCtrl("class", "selection",array("selection"));
266
+			if($this->propertyContains("class", "button")===false) {
267
+							$this->addToPropertyCtrl("class", "selection",array("selection"));
268
+			}
266 269
 		}
267 270
 		return $this;
268 271
 	}
@@ -273,8 +276,9 @@  discard block
 block discarded – undo
273 276
 	}
274 277
 
275 278
 	public function setSelect($name=NULL,$multiple=false){
276
-		if(!isset($name))
277
-			$name="select-".$this->identifier;
279
+		if(!isset($name)) {
280
+					$name="select-".$this->identifier;
281
+		}
278 282
 		$this->input=null;
279 283
 		if($multiple){
280 284
 			$this->setProperty("multiple", true);
@@ -310,12 +314,13 @@  discard block
 block discarded – undo
310 314
 		$value=$this->value;
311 315
 		if(isset($this->input) && isset($value)){
312 316
 			$this->input->setProperty("value", $value);
313
-		}else{
317
+		} else{
314 318
 			$this->setProperty("value", $value);
315 319
 		}
316 320
 			$textElement=$this->getElementById("text-".$this->identifier, $this->content);
317
-			if(isset($textElement) && !$this->_multiple)
318
-				$textElement->setContent($value);
321
+			if(isset($textElement) && !$this->_multiple) {
322
+							$textElement->setContent($value);
323
+			}
319 324
 		return $this;
320 325
 	}
321 326
 
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormFields.php 1 patch
Braces   +18 added lines, -12 removed lines patch added patch discarded remove patch
@@ -29,12 +29,14 @@  discard block
 block discarded – undo
29 29
 				if (\is_string($end)) {
30 30
 					$label=$end;
31 31
 					\array_pop($fields);
32
-				} else
33
-					$label=NULL;
32
+				} else {
33
+									$label=NULL;
34
+				}
34 35
 			}
35 36
 		}
36
-		if (isset($label))
37
-			$this->setLabel($label);
37
+		if (isset($label)) {
38
+					$this->setLabel($label);
39
+		}
38 40
 		foreach ( $fields as $field ) {
39 41
 			$this->addItem($field);
40 42
 		}
@@ -57,8 +59,9 @@  discard block
 block discarded – undo
57 59
 
58 60
 	public function addItem($item) {
59 61
 		$item=parent::addItem($item);
60
-		if($item instanceof HtmlFormField)
61
-			$item->setContainer($this);
62
+		if($item instanceof HtmlFormField) {
63
+					$item->setContainer($this);
64
+		}
62 65
 		return $item;
63 66
 	}
64 67
 
@@ -66,8 +69,9 @@  discard block
 block discarded – undo
66 69
 		if ($this->_equalWidth) {
67 70
 			$count=$this->count();
68 71
 			$this->addToProperty("class", Wide::getConstants()["W".$count]." fields");
69
-		} else
70
-			$this->addToProperty("class", "fields");
72
+		} else {
73
+					$this->addToProperty("class", "fields");
74
+		}
71 75
 		return parent::compile($js, $view);
72 76
 	}
73 77
 
@@ -108,8 +112,9 @@  discard block
 block discarded – undo
108 112
 			$fields[]=$itemO;
109 113
 		}
110 114
 		$radios=new HtmlFormFields("fields-".$name, $fields);
111
-		if (isset($label))
112
-			$radios->setLabel($label)->setProperty("for", $name);
115
+		if (isset($label)) {
116
+					$radios->setLabel($label)->setProperty("for", $name);
117
+		}
113 118
 		return $radios;
114 119
 	}
115 120
 
@@ -125,8 +130,9 @@  discard block
 block discarded – undo
125 130
 			$fields[]=$itemO;
126 131
 		}
127 132
 		$checkeds=new HtmlFormFields("fields-".$name, $fields);
128
-		if (isset($label))
129
-			$checkeds->setLabel($label)->setProperty("for", $name);
133
+		if (isset($label)) {
134
+					$checkeds->setLabel($label)->setProperty("for", $name);
135
+		}
130 136
 		return $checkeds;
131 137
 	}
132 138
 
Please login to merge, or discard this patch.
Ajax/semantic/html/modules/HtmlModal.php 1 patch
Braces   +7 added lines, -6 removed lines patch added patch discarded remove patch
@@ -43,8 +43,7 @@  discard block
 block discarded – undo
43 43
 			foreach ($actions as $action){
44 44
 				$this->addAction($action);
45 45
 			}
46
-		}
47
-		else{
46
+		} else{
48 47
 			$this->addAction($actions);
49 48
 		}
50 49
 		return $this;
@@ -64,8 +63,9 @@  discard block
 block discarded – undo
64 63
 				$class="cancel";
65 64
 			}
66 65
 			$action=new HtmlButton("action-".$this->identifier."-".\sizeof($this->content["actions"]->getContent()),$action);
67
-			if($class!=="")
68
-				$action->addToProperty("class", $class);
66
+			if($class!=="") {
67
+							$action->addToProperty("class", $class);
68
+			}
69 69
 		}
70 70
 		return $this->addElementInPart($action, "actions");
71 71
 	}
@@ -174,8 +174,9 @@  discard block
 block discarded – undo
174 174
 	 * @see BaseHtml::run()
175 175
 	 */
176 176
 	public function run(JsUtils $js) {
177
-		if(isset($this->_bsComponent)===false)
178
-			$this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts);
177
+		if(isset($this->_bsComponent)===false) {
178
+					$this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts);
179
+		}
179 180
 		$this->addEventsOnRun($js);
180 181
 		return $this->_bsComponent;
181 182
 	}
Please login to merge, or discard this patch.