Completed
Push — master ( ef9455...966ba4 )
by Jean-Christophe
02:39
created
Ajax/semantic/html/base/traits/BaseTrait.php 1 patch
Braces   +28 added lines, -20 removed lines patch added patch discarded remove patch
@@ -48,8 +48,9 @@  discard block
 block discarded – undo
48 48
 
49 49
 	public function setVariations($variations) {
50 50
 		$this->_self->setProperty("class", $this->_self->getBaseClass());
51
-		if (\is_string($variations))
52
-			$variations=\explode(" ", $variations);
51
+		if (\is_string($variations)) {
52
+					$variations=\explode(" ", $variations);
53
+		}
53 54
 		foreach ( $variations as $variation ) {
54 55
 			$this->_self->addVariation($variation);
55 56
 		}
@@ -62,8 +63,9 @@  discard block
 block discarded – undo
62 63
 	}
63 64
 
64 65
 	public function addVariations($variations=array()) {
65
-		if (\is_string($variations))
66
-			$variations=\explode(" ", $variations);
66
+		if (\is_string($variations)) {
67
+					$variations=\explode(" ", $variations);
68
+		}
67 69
 		foreach ( $variations as $variation ) {
68 70
 			$this->_self->addVariation($variation);
69 71
 		}
@@ -71,8 +73,9 @@  discard block
 block discarded – undo
71 73
 	}
72 74
 
73 75
 	public function addStates($states=array()) {
74
-		if (\is_string($states))
75
-			$states=\explode(" ", $states);
76
+		if (\is_string($states)) {
77
+					$states=\explode(" ", $states);
78
+		}
76 79
 		foreach ( $states as $state ) {
77 80
 			$this->_self->addState($state);
78 81
 		}
@@ -81,8 +84,9 @@  discard block
 block discarded – undo
81 84
 
82 85
 	public function setStates($states) {
83 86
 		$this->_self->setProperty("class", $this->_self->getBaseClass());
84
-		if (\is_string($states))
85
-			$states=\explode(" ", $states);
87
+		if (\is_string($states)) {
88
+					$states=\explode(" ", $states);
89
+		}
86 90
 		foreach ( $states as $state ) {
87 91
 			$this->_self->addState($state);
88 92
 		}
@@ -114,8 +118,9 @@  discard block
 block discarded – undo
114 118
 	 * @return HtmlSemDoubleElement
115 119
 	 */
116 120
 	public function setDisabled($disable=true) {
117
-		if($disable)
118
-			$this->_self->addToProperty("class", "disabled");
121
+		if($disable) {
122
+					$this->_self->addToProperty("class", "disabled");
123
+		}
119 124
 		return $this;
120 125
 	}
121 126
 
@@ -149,14 +154,16 @@  discard block
 block discarded – undo
149 154
 	 * @return HtmlSemDoubleElement
150 155
 	 */
151 156
 	public function setActive($value=true){
152
-		if($value)
153
-			$this->_self->addToProperty("class", "active");
157
+		if($value) {
158
+					$this->_self->addToProperty("class", "active");
159
+		}
154 160
 		return $this;
155 161
 	}
156 162
 
157 163
 	public function setAttached($value=true){
158
-		if($value)
159
-			$this->_self->addToPropertyCtrl("class", "attached", array ("attached" ));
164
+		if($value) {
165
+					$this->_self->addToPropertyCtrl("class", "attached", array ("attached" ));
166
+		}
160 167
 		return $this;
161 168
 	}
162 169
 
@@ -166,9 +173,9 @@  discard block
 block discarded – undo
166 173
 	public function setInverted($recursive=true) {
167 174
 		if($recursive===true){
168 175
 			$content=$this->_self->getContent();
169
-			if($content instanceof HtmlSemDoubleElement)
170
-				$content->setInverted($recursive);
171
-			elseif(\is_array($content) || $content instanceof \Traversable){
176
+			if($content instanceof HtmlSemDoubleElement) {
177
+							$content->setInverted($recursive);
178
+			} elseif(\is_array($content) || $content instanceof \Traversable){
172 179
 				foreach ($content as $elm){
173 180
 					if($elm instanceof  HtmlSemDoubleElement){
174 181
 						$elm->setInverted($recursive);
@@ -204,9 +211,10 @@  discard block
 block discarded – undo
204 211
 			if(isset($array[$key])){
205 212
 				$p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, "");
206 213
 				$array[$key]=$before.$p.$value.$after;
207
-			}else
208
-				$array[$key]=$before.$value.$after;
209
-		}else{
214
+			} else {
215
+							$array[$key]=$before.$value.$after;
216
+			}
217
+		} else{
210 218
 			$array[$key]=$value;
211 219
 		}
212 220
 		return $this;
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsInternalTrait.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,8 +16,9 @@  discard block
 block discarded – undo
16 16
 	 */
17 17
 	protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL){
18 18
 		if ($library!=NULL) {
19
-			if(isset($view))
20
-				$library->compileHtml($this, $view);
19
+			if(isset($view)) {
20
+							$library->compileHtml($this, $view);
21
+			}
21 22
 			if ($library->isAutoCompile()) {
22 23
 				$library->compile(true);
23 24
 			}
@@ -37,7 +38,9 @@  discard block
 block discarded – undo
37 38
 	}
38 39
 
39 40
 	protected function minify($input) {
40
-		if(trim($input) === "") return $input;
41
+		if(trim($input) === "") {
42
+			return $input;
43
+		}
41 44
 		return preg_replace(
42 45
 				array(
43 46
 						// Remove comment(s)
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/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.
Ajax/semantic/html/elements/HtmlButton.php 1 patch
Braces   +17 added lines, -13 removed lines patch added patch discarded remove patch
@@ -55,9 +55,9 @@  discard block
 block discarded – undo
55 55
 	}
56 56
 
57 57
 	public function setFocusable($value=true) {
58
-		if ($value === true)
59
-			$this->setProperty("tabindex", "0");
60
-		else {
58
+		if ($value === true) {
59
+					$this->setProperty("tabindex", "0");
60
+		} else {
61 61
 			$this->removeProperty("tabindex");
62 62
 		}
63 63
 		return $this;
@@ -105,8 +105,9 @@  discard block
 block discarded – undo
105 105
 	 */
106 106
 	public function addLabel($label, $before=false, $icon=NULL) {
107 107
 		$this->tagName="div";$prefix="";
108
-		if($before)
109
-			$prefix="left ";
108
+		if($before) {
109
+					$prefix="left ";
110
+		}
110 111
 		$this->addToProperty("class", $prefix."labeled");
111 112
 		$isIcon=(isset($this->content[0]) && $this->content[0] instanceof HtmlIcon);
112 113
 		$this->content=new HtmlButton("button-" . $this->identifier, $this->content);
@@ -143,12 +144,13 @@  discard block
 block discarded – undo
143 144
 	public function setColor($color){
144 145
 		if(\is_array($this->content)){
145 146
 			foreach ($this->content as $content){
146
-				if($content instanceof HtmlButton)
147
-					$content->setColor($color);
147
+				if($content instanceof HtmlButton) {
148
+									$content->setColor($color);
149
+				}
148 150
 			}
151
+		} else {
152
+					parent::setColor($color);
149 153
 		}
150
-		else
151
-			parent::setColor($color);
152 154
 		return $this;
153 155
 	}
154 156
 
@@ -201,8 +203,9 @@  discard block
 block discarded – undo
201 203
 	 * @return HtmlButton
202 204
 	 */
203 205
 	public static function social($identifier, $social, $value=NULL) {
204
-		if ($value === NULL)
205
-			$value=\ucfirst($social);
206
+		if ($value === NULL) {
207
+					$value=\ucfirst($social);
208
+		}
206 209
 		$return=new HtmlButton($identifier, $value);
207 210
 		$return->addIcon($social);
208 211
 		return $return->addToPropertyCtrl("class", $social, Social::getConstants());
@@ -255,8 +258,9 @@  discard block
 block discarded – undo
255 258
 	public static function dropdown($identifier,$value,$items=[],$asCombo=false,$icon=null){
256 259
 		$result=new HtmlButtonGroups($identifier,[$value]);
257 260
 		$result->addDropdown($items,$asCombo);
258
-		if(isset($icon))
259
-			$result->setIcon($icon);
261
+		if(isset($icon)) {
262
+					$result->setIcon($icon);
263
+		}
260 264
 		return $result;
261 265
 	}
262 266
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/content/HtmlAbsractItem.php 1 patch
Braces   +10 added lines, -7 removed lines patch added patch discarded remove patch
@@ -24,8 +24,9 @@  discard block
 block discarded – undo
24 24
 	}
25 25
 
26 26
 	public function removeIcon(){
27
-		if(isset($this->content["icon"]))
28
-			unset($this->content["icon"]);
27
+		if(isset($this->content["icon"])) {
28
+					unset($this->content["icon"]);
29
+		}
29 30
 		return $this;
30 31
 	}
31 32
 
@@ -63,7 +64,7 @@  discard block
 block discarded – undo
63 64
 			$this->setTagName("div");
64 65
 			$this->removeProperty("href");
65 66
 			$this->addToPropertyCtrl("class", "active", array("active"));
66
-		}else{
67
+		} else{
67 68
 			$this->removePropertyValue("class", "active");
68 69
 		}
69 70
 		return $this;
@@ -71,8 +72,9 @@  discard block
 block discarded – undo
71 72
 
72 73
 	public function asLink($href=NULL,$part=NULL){
73 74
 		$this->setTagName("a");
74
-		if(isset($href))
75
-			$this->setProperty("href", $href);
75
+		if(isset($href)) {
76
+					$this->setProperty("href", $href);
77
+		}
76 78
 		return $this;
77 79
 	}
78 80
 
@@ -83,8 +85,9 @@  discard block
 block discarded – undo
83 85
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
84 86
 	 */
85 87
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
86
-		if(\is_array($this->content) && JArray::isAssociative($this->content))
87
-			$this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]);
88
+		if(\is_array($this->content) && JArray::isAssociative($this->content)) {
89
+					$this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]);
90
+		}
88 91
 		return parent::compile($js, $view);
89 92
 	}
90 93
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlStep.php 1 patch
Braces   +14 added lines, -11 removed lines patch added patch discarded remove patch
@@ -55,26 +55,29 @@
 block discarded – undo
55 55
 			for($i=$this->_startStep;$i<$count;$i++){
56 56
 				$step=$this->content[$i];
57 57
 				$step->removeStatus();
58
-				if($i<$activestep)
59
-					$step->setCompleted();
60
-				elseif ($i===$activestep)
61
-					$step->setActive();
62
-				else
63
-					$step->setDisabled();
58
+				if($i<$activestep) {
59
+									$step->setCompleted();
60
+				} elseif ($i===$activestep) {
61
+									$step->setActive();
62
+				} else {
63
+									$step->setDisabled();
64
+				}
64 65
 			}
65
-		}else{
66
+		} else{
66 67
 			foreach ($this->content as $step){
67 68
 				$step->removeStatus();
68 69
 			}
69
-			if($activestep<$count)
70
-				$this->content[$activestep]->setActive();
70
+			if($activestep<$count) {
71
+							$this->content[$activestep]->setActive();
72
+			}
71 73
 		}
72 74
 		return $this;
73 75
 	}
74 76
 
75 77
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
76
-		if(isset($this->_activeStep) && \is_numeric($this->_activeStep))
77
-			$this->defineActiveStep();
78
+		if(isset($this->_activeStep) && \is_numeric($this->_activeStep)) {
79
+					$this->defineActiveStep();
80
+		}
78 81
 		return parent::compile($js,$view);
79 82
 	}
80 83
 
Please login to merge, or discard this patch.