Completed
Push — master ( e5e3c8...8b49e3 )
by Jean-Christophe
03:02
created
Ajax/semantic/widgets/datatable/DataTable.php 3 patches
Doc Comments   +19 added lines, -3 removed lines patch added patch discarded remove patch
@@ -39,6 +39,10 @@  discard block
 block discarded – undo
39 39
 		parent::run($js);
40 40
 	}
41 41
 
42
+	/**
43
+	 * @param string $identifier
44
+	 * @param string $model
45
+	 */
42 46
 	public function __construct($identifier,$model,$modelInstance=NULL) {
43 47
 		parent::__construct($identifier, $model,$modelInstance);
44 48
 		$this->_instanceViewer=new InstanceViewer();
@@ -141,6 +145,9 @@  discard block
 block discarded – undo
141 145
 		return $this;
142 146
 	}
143 147
 
148
+	/**
149
+	 * @param PositionInTable $part
150
+	 */
144 151
 	private function addToolbarRow($part,$table,$captions){
145 152
 		$row=$table->getPart($part)->addRow(\sizeof($captions));
146 153
 		$row->mergeCol();
@@ -180,16 +187,17 @@  discard block
 block discarded – undo
180 187
 	/**
181 188
 	 * @param string $caption
182 189
 	 * @param callable $callback
183
-	 * @return callable
190
+	 * @return \Closure
184 191
 	 */
185 192
 	private function getFieldButtonCallable($caption,$callback=null){
186 193
 		return $this->getCallable("getFieldButton",[$caption],$callback);
187 194
 	}
188 195
 
189 196
 	/**
190
-	 * @param mixed $object
191 197
 	 * @param callable $callback
192
-	 * @return callable
198
+	 * @param string $thisCallback
199
+	 * @param string[] $parameters
200
+	 * @return \Closure
193 201
 	 */
194 202
 	private function getCallable($thisCallback,$parameters,$callback=null){
195 203
 		$result=function($instance) use($thisCallback,$parameters,$callback){
@@ -250,11 +258,19 @@  discard block
 block discarded – undo
250 258
 		return $this;
251 259
 	}
252 260
 
261
+	/**
262
+	 * @param string $icon
263
+	 * @param string $class
264
+	 */
253 265
 	private function addDefaultButton($icon,$class=null,$callback=null){
254 266
 		$this->addField($this->getCallable("getDefaultButton",[$icon,$class],$callback));
255 267
 		return $this;
256 268
 	}
257 269
 
270
+	/**
271
+	 * @param string $icon
272
+	 * @param string $class
273
+	 */
258 274
 	private function insertDefaultButtonIn($index,$icon,$class=null,$callback=null){
259 275
 		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class],$callback));
260 276
 		return $this;
Please login to merge, or discard this patch.
Spacing   +78 added lines, -78 removed lines patch added patch discarded remove patch
@@ -30,8 +30,8 @@  discard block
 block discarded – undo
30 30
 	protected $_hasCheckboxes;
31 31
 	protected $_compileParts;
32 32
 
33
-	public function run(JsUtils $js){
34
-		if($this->_hasCheckboxes && isset($js)){
33
+	public function run(JsUtils $js) {
34
+		if ($this->_hasCheckboxes && isset($js)) {
35 35
 			$js->execOn("change", "#".$this->identifier." [name='selection[]']", "
36 36
 		var \$parentCheckbox=\$('#ck-main-ck-{$this->identifier}'),\$checkbox=\$('#{$this->identifier} [name=\"selection[]\"]'),allChecked=true,allUnchecked=true;
37 37
 		\$checkbox.each(function() {if($(this).prop('checked')){allUnchecked = false;}else{allChecked = false;}});
@@ -40,10 +40,10 @@  discard block
 block discarded – undo
40 40
 		parent::run($js);
41 41
 	}
42 42
 
43
-	public function __construct($identifier,$model,$modelInstance=NULL) {
44
-		parent::__construct($identifier, $model,$modelInstance);
43
+	public function __construct($identifier, $model, $modelInstance=NULL) {
44
+		parent::__construct($identifier, $model, $modelInstance);
45 45
 		$this->_instanceViewer=new InstanceViewer($identifier);
46
-		$this->content=["table"=>new HtmlTable($identifier, 0,0)];
46
+		$this->content=["table"=>new HtmlTable($identifier, 0, 0)];
47 47
 		$this->_toolbarPosition=PositionInTable::BEFORETABLE;
48 48
 	}
49 49
 
@@ -56,61 +56,61 @@  discard block
 block discarded – undo
56 56
 	}
57 57
 
58 58
 
59
-	public function compile(JsUtils $js=NULL,&$view=NULL){
59
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
60 60
 		$this->_instanceViewer->setInstance($this->_model);
61 61
 		$captions=$this->_instanceViewer->getCaptions();
62 62
 
63 63
 		$table=$this->content["table"];
64 64
 
65
-		if($this->_hasCheckboxes){
65
+		if ($this->_hasCheckboxes) {
66 66
 			$this->_generateMainCheckbox($captions);
67 67
 		}
68 68
 
69 69
 		$table->setRowCount(0, \sizeof($captions));
70 70
 		$table->setHeaderValues($captions);
71
-		if(isset($this->_compileParts))
71
+		if (isset($this->_compileParts))
72 72
 			$table->setCompileParts($this->_compileParts);
73
-		if(isset($this->_searchField) && isset($js)){
74
-			$this->_searchField->postOn("change", $this->_urls,"{'s':$(this).val()}","-#".$this->identifier." tbody",["preventDefault"=>false]);
73
+		if (isset($this->_searchField) && isset($js)) {
74
+			$this->_searchField->postOn("change", $this->_urls, "{'s':$(this).val()}", "-#".$this->identifier." tbody", ["preventDefault"=>false]);
75 75
 		}
76 76
 
77 77
 		$this->_generateContent($table);
78 78
 
79
-		if($this->_hasCheckboxes && $table->hasPart("thead")){
80
-				$table->getHeader()->getCell(0, 0)->addToProperty("class","no-sort");
79
+		if ($this->_hasCheckboxes && $table->hasPart("thead")) {
80
+				$table->getHeader()->getCell(0, 0)->addToProperty("class", "no-sort");
81 81
 		}
82 82
 
83
-		if(isset($this->_pagination) && $this->_pagination->getVisible()){
83
+		if (isset($this->_pagination) && $this->_pagination->getVisible()) {
84 84
 			$this->_generatePagination($table);
85 85
 		}
86
-		if(isset($this->_toolbar)){
86
+		if (isset($this->_toolbar)) {
87 87
 			$this->_setToolbarPosition($table, $captions);
88 88
 		}
89
-		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
90
-		return parent::compile($js,$view);
89
+		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
90
+		return parent::compile($js, $view);
91 91
 	}
92 92
 
93
-	private function _generateMainCheckbox(&$captions){
94
-		$ck=new HtmlCheckbox("main-ck-".$this->identifier,"");
93
+	private function _generateMainCheckbox(&$captions) {
94
+		$ck=new HtmlCheckbox("main-ck-".$this->identifier, "");
95 95
 		$ck->setOnChecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',true);");
96 96
 		$ck->setOnUnchecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',false);");
97 97
 		\array_unshift($captions, $ck);
98 98
 	}
99 99
 
100
-	protected function _generateContent($table){
100
+	protected function _generateContent($table) {
101 101
 		$objects=$this->_modelInstance;
102
-		if(isset($this->_pagination)){
102
+		if (isset($this->_pagination)) {
103 103
 			$objects=$this->_pagination->getObjects($this->_modelInstance);
104 104
 		}
105 105
 		InstanceViewer::setIndex(0);
106
-		$table->fromDatabaseObjects($objects, function($instance){
106
+		$table->fromDatabaseObjects($objects, function($instance) {
107 107
 			$this->_instanceViewer->setInstance($instance);
108 108
 			InstanceViewer::$index++;
109
-			$result= $this->_instanceViewer->getValues();
110
-			if($this->_hasCheckboxes){
111
-				$ck=new HtmlCheckbox("ck-".$this->identifier,"");
109
+			$result=$this->_instanceViewer->getValues();
110
+			if ($this->_hasCheckboxes) {
111
+				$ck=new HtmlCheckbox("ck-".$this->identifier, "");
112 112
 				$field=$ck->getField();
113
-				$field->setProperty("value",$this->_instanceViewer->getIdentifier());
113
+				$field->setProperty("value", $this->_instanceViewer->getIdentifier());
114 114
 				$field->setProperty("name", "selection[]");
115 115
 				\array_unshift($result, $ck);
116 116
 			}
@@ -118,25 +118,25 @@  discard block
 block discarded – undo
118 118
 		});
119 119
 	}
120 120
 
121
-	private function _generatePagination($table){
121
+	private function _generatePagination($table) {
122 122
 		$footer=$table->getFooter();
123 123
 		$footer->mergeCol();
124
-		$menu=new HtmlPaginationMenu("pagination-".$this->identifier,$this->_pagination->getPagesNumbers());
124
+		$menu=new HtmlPaginationMenu("pagination-".$this->identifier, $this->_pagination->getPagesNumbers());
125 125
 		$menu->floatRight();
126 126
 		$menu->setActiveItem($this->_pagination->getPage()-1);
127 127
 		$footer->setValues($menu);
128
-		$menu->postOnClick($this->_urls,"{'p':$(this).attr('data-page')}","-#".$this->identifier." tbody",["preventDefault"=>false]);
128
+		$menu->postOnClick($this->_urls, "{'p':$(this).attr('data-page')}", "-#".$this->identifier." tbody", ["preventDefault"=>false]);
129 129
 	}
130 130
 
131
-	protected function _setToolbarPosition($table,$captions=NULL){
132
-		switch ($this->_toolbarPosition){
131
+	protected function _setToolbarPosition($table, $captions=NULL) {
132
+		switch ($this->_toolbarPosition) {
133 133
 			case PositionInTable::BEFORETABLE:case PositionInTable::AFTERTABLE:
134
-				if(isset($this->_compileParts)===false){
134
+				if (isset($this->_compileParts)===false) {
135 135
 					$this->content[$this->_toolbarPosition]=$this->_toolbar;
136 136
 				}
137 137
 				break;
138 138
 			case PositionInTable::HEADER:case PositionInTable::FOOTER: case PositionInTable::BODY:
139
-				$this->addToolbarRow($this->_toolbarPosition,$table, $captions);
139
+				$this->addToolbarRow($this->_toolbarPosition, $table, $captions);
140 140
 				break;
141 141
 		}
142 142
 	}
@@ -148,18 +148,18 @@  discard block
 block discarded – undo
148 148
 	 * @param callable $callback function called after the field compilation
149 149
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
150 150
 	 */
151
-	public function afterCompile($index,$callback){
152
-		$this->_instanceViewer->afterCompile($index,$callback);
151
+	public function afterCompile($index, $callback) {
152
+		$this->_instanceViewer->afterCompile($index, $callback);
153 153
 		return $this;
154 154
 	}
155 155
 
156
-	private function addToolbarRow($part,$table,$captions){
156
+	private function addToolbarRow($part, $table, $captions) {
157 157
 		$row=$table->getPart($part)->addRow(\sizeof($captions));
158 158
 		$row->mergeCol();
159 159
 		$row->setValues([$this->_toolbar]);
160 160
 	}
161 161
 
162
-	public function getHtmlComponent(){
162
+	public function getHtmlComponent() {
163 163
 		return $this->content["table"];
164 164
 	}
165 165
 
@@ -172,8 +172,8 @@  discard block
 block discarded – undo
172 172
 		return $this;
173 173
 	}
174 174
 
175
-	public function paginate($items_per_page=10,$page=1){
176
-		$this->_pagination=new Pagination($items_per_page,4,$page);
175
+	public function paginate($items_per_page=10, $page=1) {
176
+		$this->_pagination=new Pagination($items_per_page, 4, $page);
177 177
 	}
178 178
 
179 179
 	public function getHasCheckboxes() {
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 		return $this;
186 186
 	}
187 187
 
188
-	public function refresh($compileParts=["tbody"]){
188
+	public function refresh($compileParts=["tbody"]) {
189 189
 		$this->_compileParts=$compileParts;
190 190
 		return $this;
191 191
 	}
@@ -194,8 +194,8 @@  discard block
 block discarded – undo
194 194
 	 * @param callable $callback
195 195
 	 * @return callable
196 196
 	 */
197
-	private function getFieldButtonCallable($caption,$callback=null){
198
-		return $this->getCallable("getFieldButton",[$caption],$callback);
197
+	private function getFieldButtonCallable($caption, $callback=null) {
198
+		return $this->getCallable("getFieldButton", [$caption], $callback);
199 199
 	}
200 200
 
201 201
 	/**
@@ -203,16 +203,16 @@  discard block
 block discarded – undo
203 203
 	 * @param callable $callback
204 204
 	 * @return callable
205 205
 	 */
206
-	private function getCallable($thisCallback,$parameters,$callback=null){
207
-		$result=function($instance) use($thisCallback,$parameters,$callback){
208
-			$object=call_user_func_array(array($this,$thisCallback), $parameters);
209
-			if(isset($callback)){
210
-				if(\is_callable($callback)){
211
-					$callback($object,$instance);
206
+	private function getCallable($thisCallback, $parameters, $callback=null) {
207
+		$result=function($instance) use($thisCallback, $parameters, $callback){
208
+			$object=call_user_func_array(array($this, $thisCallback), $parameters);
209
+			if (isset($callback)) {
210
+				if (\is_callable($callback)) {
211
+					$callback($object, $instance);
212 212
 				}
213 213
 			}
214
-			if($object instanceof HtmlSemDoubleElement){
215
-				$object->setProperty("data-ajax",$this->_instanceViewer->getIdentifier());
214
+			if ($object instanceof HtmlSemDoubleElement) {
215
+				$object->setProperty("data-ajax", $this->_instanceViewer->getIdentifier());
216 216
 			}
217 217
 			return $object;
218 218
 		};
@@ -223,8 +223,8 @@  discard block
 block discarded – undo
223 223
 	 * @param string $caption
224 224
 	 * @return HtmlButton
225 225
 	 */
226
-	private function getFieldButton($caption){
227
-		return new HtmlButton("",$caption);
226
+	private function getFieldButton($caption) {
227
+		return new HtmlButton("", $caption);
228 228
 	}
229 229
 
230 230
 	/**
@@ -233,8 +233,8 @@  discard block
 block discarded – undo
233 233
 	 * @param callable $callback
234 234
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
235 235
 	 */
236
-	public function addFieldButton($caption,$callback=null){
237
-		$this->addField($this->getCallable("getFieldButton",[$caption],$callback));
236
+	public function addFieldButton($caption, $callback=null) {
237
+		$this->addField($this->getCallable("getFieldButton", [$caption], $callback));
238 238
 		return $this;
239 239
 	}
240 240
 
@@ -245,8 +245,8 @@  discard block
 block discarded – undo
245 245
 	 * @param callable $callback
246 246
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
247 247
 	 */
248
-	public function insertFieldButton($index,$caption,$callback=null){
249
-		$this->insertField($index, $this->getFieldButtonCallable($caption,$callback));
248
+	public function insertFieldButton($index, $caption, $callback=null) {
249
+		$this->insertField($index, $this->getFieldButtonCallable($caption, $callback));
250 250
 		return $this;
251 251
 	}
252 252
 
@@ -257,60 +257,60 @@  discard block
 block discarded – undo
257 257
 	 * @param callable $callback
258 258
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
259 259
 	 */
260
-	public function insertInFieldButton($index,$caption,$callback=null){
261
-		$this->insertInField($index, $this->getFieldButtonCallable($caption,$callback));
260
+	public function insertInFieldButton($index, $caption, $callback=null) {
261
+		$this->insertInField($index, $this->getFieldButtonCallable($caption, $callback));
262 262
 		return $this;
263 263
 	}
264 264
 
265
-	private function addDefaultButton($icon,$class=null,$callback=null){
266
-		$this->addField($this->getCallable("getDefaultButton",[$icon,$class],$callback));
265
+	private function addDefaultButton($icon, $class=null, $callback=null) {
266
+		$this->addField($this->getCallable("getDefaultButton", [$icon, $class], $callback));
267 267
 		return $this;
268 268
 	}
269 269
 
270
-	private function insertDefaultButtonIn($index,$icon,$class=null,$callback=null){
271
-		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class],$callback));
270
+	private function insertDefaultButtonIn($index, $icon, $class=null, $callback=null) {
271
+		$this->insertInField($index, $this->getCallable("getDefaultButton", [$icon, $class], $callback));
272 272
 		return $this;
273 273
 	}
274 274
 
275
-	private function getDefaultButton($icon,$class=null){
275
+	private function getDefaultButton($icon, $class=null) {
276 276
 		$bt=$this->getFieldButton("");
277 277
 		$bt->asIcon($icon);
278
-		if(isset($class))
278
+		if (isset($class))
279 279
 			$bt->addToProperty("class", $class);
280 280
 		return $bt;
281 281
 	}
282 282
 
283
-	public function addDeleteButton($callback=null){
284
-		return $this->addDefaultButton("remove","delete red basic",$callback);
283
+	public function addDeleteButton($callback=null) {
284
+		return $this->addDefaultButton("remove", "delete red basic", $callback);
285 285
 	}
286 286
 
287
-	public function addEditButton($callback=null){
288
-		return $this->addDefaultButton("edit","edit basic",$callback);
287
+	public function addEditButton($callback=null) {
288
+		return $this->addDefaultButton("edit", "edit basic", $callback);
289 289
 	}
290 290
 
291
-	public function addEditDeleteButtons($callbackEdit=null,$callbackDelete=null){
291
+	public function addEditDeleteButtons($callbackEdit=null, $callbackDelete=null) {
292 292
 		$this->addEditButton($callbackEdit);
293 293
 		$index=$this->_instanceViewer->visiblePropertiesCount()-1;
294
-		$this->insertDeleteButtonIn($index,$callbackDelete);
294
+		$this->insertDeleteButtonIn($index, $callbackDelete);
295 295
 		return $this;
296 296
 	}
297 297
 
298
-	public function insertDeleteButtonIn($index,$callback=null){
299
-		return $this->insertDefaultButtonIn($index,"remove","delete red basic",$callback);
298
+	public function insertDeleteButtonIn($index, $callback=null) {
299
+		return $this->insertDefaultButtonIn($index, "remove", "delete red basic", $callback);
300 300
 	}
301 301
 
302
-	public function insertEditButtonIn($index,$callback=null){
303
-		return $this->insertDefaultButtonIn($index,"edit","edit basic",$callback);
302
+	public function insertEditButtonIn($index, $callback=null) {
303
+		return $this->insertDefaultButtonIn($index, "edit", "edit basic", $callback);
304 304
 	}
305 305
 
306
-	public function addSearchInToolbar($position=Direction::RIGHT){
306
+	public function addSearchInToolbar($position=Direction::RIGHT) {
307 307
 		return $this->addInToolbar($this->getSearchField())->setPosition($position);
308 308
 	}
309 309
 
310
-	public function getSearchField(){
311
-		if(isset($this->_searchField)===false){
312
-			$this->_searchField=new HtmlInput("search-".$this->identifier,"search","","Search...");
313
-			$this->_searchField->addIcon("search",Direction::RIGHT);
310
+	public function getSearchField() {
311
+		if (isset($this->_searchField)===false) {
312
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
313
+			$this->_searchField->addIcon("search", Direction::RIGHT);
314 314
 		}
315 315
 		return $this->_searchField;
316 316
 	}
Please login to merge, or discard this patch.
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -68,8 +68,9 @@  discard block
 block discarded – undo
68 68
 
69 69
 		$table->setRowCount(0, \sizeof($captions));
70 70
 		$table->setHeaderValues($captions);
71
-		if(isset($this->_compileParts))
72
-			$table->setCompileParts($this->_compileParts);
71
+		if(isset($this->_compileParts)) {
72
+					$table->setCompileParts($this->_compileParts);
73
+		}
73 74
 		if(isset($this->_searchField) && isset($js)){
74 75
 			$this->_searchField->postOn("change", $this->_urls,"{'s':$(this).val()}","-#".$this->identifier." tbody",["preventDefault"=>false]);
75 76
 		}
@@ -275,8 +276,9 @@  discard block
 block discarded – undo
275 276
 	private function getDefaultButton($icon,$class=null){
276 277
 		$bt=$this->getFieldButton("");
277 278
 		$bt->asIcon($icon);
278
-		if(isset($class))
279
-			$bt->addToProperty("class", $class);
279
+		if(isset($class)) {
280
+					$bt->addToProperty("class", $class);
281
+		}
280 282
 		return $bt;
281 283
 	}
282 284
 
Please login to merge, or discard this patch.
Ajax/semantic/widgets/dataform/DataForm.php 3 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -13,6 +13,9 @@
 block discarded – undo
13 13
  */
14 14
 class HtmlIconGroups extends HtmlSemCollection {
15 15
 
16
+	/**
17
+	 * @param string $identifier
18
+	 */
16 19
 	public function __construct($identifier, $icons=array(), $size="") {
17 20
 		parent::__construct($identifier, "i", "icons");
18 21
 		$this->addItems($icons);
Please login to merge, or discard this patch.
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -51,14 +51,15 @@
 block discarded – undo
51 51
 			foreach ($values as $v){
52 52
 				$form->addField($v);
53 53
 			}
54
-		}else{
54
+		} else{
55 55
 			$separators[]=$count;
56 56
 			for($i=0;$i<$size-1;$i++){
57 57
 				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
58 58
 				if(\sizeof($fields)===1){
59 59
 					$form->addField($fields[0]);
60
-				}else
61
-					$form->addFields($fields);
60
+				} else {
61
+									$form->addFields($fields);
62
+				}
62 63
 			}
63 64
 		}
64 65
 	}
Please login to merge, or discard this patch.
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -17,48 +17,48 @@  discard block
 block discarded – undo
17 17
  * @since 2.2
18 18
  */
19 19
 class DataForm extends Widget {
20
-	use FormFieldAsTrait,FormTrait;
20
+	use FormFieldAsTrait, FormTrait;
21 21
 
22 22
 	public function __construct($identifier, $modelInstance=NULL) {
23
-		parent::__construct($identifier, null,$modelInstance);
23
+		parent::__construct($identifier, null, $modelInstance);
24 24
 		$this->_instanceViewer=new FormInstanceViewer();
25 25
 		$this->content=["form"=>new HtmlForm($identifier)];
26 26
 		$this->_toolbarPosition=PositionInTable::BEFORETABLE;
27 27
 	}
28 28
 
29
-	public function compile(JsUtils $js=NULL,&$view=NULL){
29
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
30 30
 		$this->_instanceViewer->setInstance($this->_modelInstance);
31 31
 
32 32
 		$form=$this->content["form"];
33 33
 		$this->_generateContent($form);
34 34
 
35
-		if(isset($this->_toolbar)){
35
+		if (isset($this->_toolbar)) {
36 36
 			$this->_setToolbarPosition($form);
37 37
 		}
38
-		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]);
39
-		return parent::compile($js,$view);
38
+		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]);
39
+		return parent::compile($js, $view);
40 40
 	}
41 41
 
42 42
 	/**
43 43
 	 * @param HtmlForm $form
44 44
 	 */
45
-	protected function _generateContent($form){
46
-		$values= $this->_instanceViewer->getValues();
45
+	protected function _generateContent($form) {
46
+		$values=$this->_instanceViewer->getValues();
47 47
 		$count=$this->_instanceViewer->count();
48 48
 
49 49
 		$separators=$this->_instanceViewer->getSeparators();
50 50
 		$size=\sizeof($separators);
51
-		if($size===1){
52
-			foreach ($values as $v){
51
+		if ($size===1) {
52
+			foreach ($values as $v) {
53 53
 				$form->addField($v);
54 54
 			}
55
-		}else{
55
+		} else {
56 56
 			$separators[]=$count;
57
-			for($i=0;$i<$size;$i++){
58
-				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
59
-				if(\sizeof($fields)===1){
57
+			for ($i=0; $i<$size; $i++) {
58
+				$fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]);
59
+				if (\sizeof($fields)===1) {
60 60
 					$form->addField($fields[0]);
61
-				}else
61
+				} else
62 62
 					$form->addFields($fields);
63 63
 			}
64 64
 		}
@@ -67,11 +67,11 @@  discard block
 block discarded – undo
67 67
 	/**
68 68
 	 * @return HtmlForm
69 69
 	 */
70
-	protected function getForm(){
70
+	protected function getForm() {
71 71
 		return $this->content["form"];
72 72
 	}
73 73
 
74
-	public function addSeparatorAfter($fieldNum){
74
+	public function addSeparatorAfter($fieldNum) {
75 75
 		$this->_instanceViewer->addSeparatorAfter($fieldNum);
76 76
 		return $this;
77 77
 	}
@@ -85,26 +85,26 @@  discard block
 block discarded – undo
85 85
 		return $this;
86 86
 	}
87 87
 
88
-	public function addSubmitInToolbar($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL){
89
-		$button=new HtmlButton($identifier,$value,$cssStyle);
90
-		$this->_buttonAsSubmit($button,"click",$url,$responseElement);
88
+	public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL) {
89
+		$button=new HtmlButton($identifier, $value, $cssStyle);
90
+		$this->_buttonAsSubmit($button, "click", $url, $responseElement);
91 91
 		return $this->addInToolbar($button);
92 92
 	}
93 93
 
94
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
95
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle){
96
-			$button=new HtmlButton($id,$value,$cssStyle);
97
-			$this->_buttonAsSubmit($button,"click",$url,$responseElement);
94
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
95
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle){
96
+			$button=new HtmlButton($id, $value, $cssStyle);
97
+			$this->_buttonAsSubmit($button, "click", $url, $responseElement);
98 98
 			return $button;
99
-		}, $index,$attributes);
99
+		}, $index, $attributes);
100 100
 	}
101 101
 
102
-	public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){
103
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){
104
-			$button=new HtmlButton($id,$value,$cssStyle);
102
+	public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) {
103
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){
104
+			$button=new HtmlButton($id, $value, $cssStyle);
105 105
 			$button->setProperty("type", "reset");
106 106
 			return $button;
107
-		}, $index,$attributes);
107
+		}, $index, $attributes);
108 108
 	}
109 109
 
110 110
 	/**
Please login to merge, or discard this patch.
Ajax/semantic/widgets/dataform/FormInstanceViewer.php 2 patches
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -34,17 +34,18 @@
 block discarded – undo
34 34
 		$property=$this->getProperty($index);
35 35
 		if($property instanceof \ReflectionProperty){
36 36
 			$result=$property->getName();
37
-		}elseif(\is_callable($property)){
37
+		} elseif(\is_callable($property)){
38 38
 			$result=$this->visibleProperties[$index];
39
-		}else{
39
+		} else{
40 40
 			$result=\strtolower($this->getCaption($index));
41 41
 		}
42 42
 		return $result;
43 43
 	}
44 44
 
45 45
 	public function addSeparatorAfter($fieldNum){
46
-		if(\array_search($fieldNum, $this->separators)===false)
47
-			$this->separators[]=$fieldNum;
46
+		if(\array_search($fieldNum, $this->separators)===false) {
47
+					$this->separators[]=$fieldNum;
48
+		}
48 49
 			return $this;
49 50
 	}
50 51
 
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -9,42 +9,42 @@
 block discarded – undo
9 9
 class FormInstanceViewer extends InstanceViewer {
10 10
 	protected $separators;
11 11
 
12
-	public function __construct($identifier,$instance=NULL, $captions=NULL) {
13
-		parent::__construct($identifier,$instance=NULL, $captions=NULL);
12
+	public function __construct($identifier, $instance=NULL, $captions=NULL) {
13
+		parent::__construct($identifier, $instance=NULL, $captions=NULL);
14 14
 		$this->separators=[-1];
15 15
 	}
16 16
 
17
-	protected function _beforeAddProperty($index,&$field){
18
-		if(JString::endswith($field, "\n")===true){
17
+	protected function _beforeAddProperty($index, &$field) {
18
+		if (JString::endswith($field, "\n")===true) {
19 19
 			$this->addSeparatorAfter($index);
20 20
 		}
21
-		if($index>1 && JString::startswith($field, "\n")===true){
21
+		if ($index>1 && JString::startswith($field, "\n")===true) {
22 22
 			$this->addSeparatorAfter($index-1);
23 23
 		}
24 24
 		$field=\str_replace("\n", "", $field);
25 25
 	}
26 26
 
27
-	protected function _getDefaultValue($name,$value,$index){
27
+	protected function _getDefaultValue($name, $value, $index) {
28 28
 		$caption=$this->getCaption($index);
29
-		$input=new HtmlFormInput($this->widgetIdentifier."-".$name,$caption,"text",$value);
29
+		$input=new HtmlFormInput($this->widgetIdentifier."-".$name, $caption, "text", $value);
30 30
 		$input->setName($name);
31 31
 		return $input;
32 32
 	}
33 33
 
34
-	public function getFieldName($index){
34
+	public function getFieldName($index) {
35 35
 		$property=$this->getProperty($index);
36
-		if($property instanceof \ReflectionProperty){
36
+		if ($property instanceof \ReflectionProperty) {
37 37
 			$result=$property->getName();
38
-		}elseif(\is_callable($property)){
38
+		}elseif (\is_callable($property)) {
39 39
 			$result=$this->visibleProperties[$index];
40
-		}else{
40
+		} else {
41 41
 			$result=$property;
42 42
 		}
43 43
 		return $result;
44 44
 	}
45 45
 
46
-	public function addSeparatorAfter($fieldNum){
47
-		if(\array_search($fieldNum, $this->separators)===false)
46
+	public function addSeparatorAfter($fieldNum) {
47
+		if (\array_search($fieldNum, $this->separators)===false)
48 48
 			$this->separators[]=$fieldNum;
49 49
 			return $this;
50 50
 	}
Please login to merge, or discard this patch.
Ajax/semantic/traits/SemanticWidgetsTrait.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
 	 * @param array $instances
16 16
 	 * @return DataTable
17 17
 	 */
18
-	public function dataTable($identifier,$model, $instances){
19
-		return $this->addHtmlComponent(new DataTable($identifier,$model,$instances));
18
+	public function dataTable($identifier, $model, $instances) {
19
+		return $this->addHtmlComponent(new DataTable($identifier, $model, $instances));
20 20
 	}
21 21
 
22 22
 	/**
@@ -24,8 +24,8 @@  discard block
 block discarded – undo
24 24
 	 * @param object $instance
25 25
 	 * @return DataElement
26 26
 	 */
27
-	public function dataElement($identifier, $instance){
28
-		return $this->addHtmlComponent(new DataElement($identifier,$instance));
27
+	public function dataElement($identifier, $instance) {
28
+		return $this->addHtmlComponent(new DataElement($identifier, $instance));
29 29
 	}
30 30
 
31 31
 	/**
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 	 * @param object $instance
34 34
 	 * @return DataForm
35 35
 	 */
36
-	public function dataForm($identifier, $instance){
37
-		return $this->addHtmlComponent(new DataForm($identifier,$instance));
36
+	public function dataForm($identifier, $instance) {
37
+		return $this->addHtmlComponent(new DataForm($identifier, $instance));
38 38
 	}
39 39
 }
40 40
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/widgets/base/FieldAsTrait.php 3 patches
Doc Comments   +8 added lines patch added patch discarded remove patch
@@ -18,6 +18,10 @@  discard block
 block discarded – undo
18 18
 trait FieldAsTrait{
19 19
 
20 20
 	abstract protected function _getFieldIdentifier($prefix);
21
+
22
+	/**
23
+	 * @param \Closure $callback
24
+	 */
21 25
 	abstract public function setValueFunction($index,$callback);
22 26
 
23 27
 	private function _getLabelField($caption,$icon=NULL){
@@ -27,6 +31,10 @@  discard block
 block discarded – undo
27 31
 
28 32
 	protected function _addRules($element,$attributes){}
29 33
 
34
+	/**
35
+	 * @param \Closure $elementCallback
36
+	 * @param string $prefix
37
+	 */
30 38
 	protected function _fieldAs($elementCallback,$index,$attributes=NULL,$prefix=null){
31 39
 		$this->setValueFunction($index,function($value)use ($index,&$attributes,$elementCallback,$prefix){
32 40
 			$name=$this->_instanceViewer->getCaption($index)."[]";
Please login to merge, or discard this patch.
Braces   +9 added lines, -5 removed lines patch added patch discarded remove patch
@@ -35,8 +35,9 @@  discard block
 block discarded – undo
35 35
 				$name=$attributes["name"];
36 36
 			}
37 37
 			$element=$elementCallback($this->_getFieldIdentifier($prefix),$name,$value,"");
38
-			if(\is_array($attributes))
39
-				$this->_applyAttributes($element, $attributes,$index);
38
+			if(\is_array($attributes)) {
39
+							$this->_applyAttributes($element, $attributes,$index);
40
+			}
40 41
 			return $element;
41 42
 		});
42 43
 			return $this;
@@ -70,8 +71,9 @@  discard block
 block discarded – undo
70 71
 	public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){
71 72
 		return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){
72 73
 			$header=new HtmlHeader($id,$niveau,$value);
73
-			if(isset($icon))
74
-				$header->asIcon($icon, $value);
74
+			if(isset($icon)) {
75
+							$header->asIcon($icon, $value);
76
+			}
75 77
 			return $header;
76 78
 		}, $index,$attributes,"header");
77 79
 	}
@@ -79,7 +81,9 @@  discard block
 block discarded – undo
79 81
 
80 82
 	public function fieldAsImage($index,$size=Size::MINI,$circular=false){
81 83
 		$this->setValueFunction($index,function($img) use($size,$circular){
82
-			$image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular();
84
+			$image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular) {
85
+				$image->setCircular();
86
+			}
83 87
 			return $image;
84 88
 		});
85 89
 			return $this;
Please login to merge, or discard this patch.
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -16,121 +16,121 @@
 block discarded – undo
16 16
  * @property InstanceViewer $_instanceViewer
17 17
  */
18 18
 
19
-trait FieldAsTrait{
19
+trait FieldAsTrait {
20 20
 
21 21
 	abstract protected function _getFieldIdentifier($prefix);
22
-	abstract public function setValueFunction($index,$callback);
22
+	abstract public function setValueFunction($index, $callback);
23 23
 
24
-	private function _getLabelField($caption,$icon=NULL){
25
-		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"),$caption,$icon);
24
+	private function _getLabelField($caption, $icon=NULL) {
25
+		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon);
26 26
 		return $label;
27 27
 	}
28 28
 
29
-	protected function _addRules($element,&$attributes){}
29
+	protected function _addRules($element, &$attributes) {}
30 30
 
31
-	protected function _fieldAs($elementCallback,$index,$attributes=NULL,$prefix=null){
32
-		$this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback,$prefix){
31
+	protected function _fieldAs($elementCallback, $index, $attributes=NULL, $prefix=null) {
32
+		$this->setValueFunction($index, function($value) use ($index, &$attributes, $elementCallback, $prefix){
33 33
 			$name=$this->_instanceViewer->getCaption($index)."[]";
34
-			if(isset($attributes["name"])){
34
+			if (isset($attributes["name"])) {
35 35
 				$name=$attributes["name"];
36 36
 			}
37
-			$element=$elementCallback($this->_getFieldIdentifier($prefix),$name,$value,"");
38
-			if(\is_array($attributes))
39
-				$this->_applyAttributes($element, $attributes,$index);
37
+			$element=$elementCallback($this->_getFieldIdentifier($prefix), $name, $value, "");
38
+			if (\is_array($attributes))
39
+				$this->_applyAttributes($element, $attributes, $index);
40 40
 			return $element;
41 41
 		});
42 42
 			return $this;
43 43
 	}
44 44
 
45 45
 
46
-	public function fieldAsProgress($index,$label=NULL, $attributes=array()){
47
-		$this->setValueFunction($index,function($value) use($label,$attributes){
48
-			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"),$value,$label,$attributes);
46
+	public function fieldAsProgress($index, $label=NULL, $attributes=array()) {
47
+		$this->setValueFunction($index, function($value) use($label, $attributes){
48
+			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes);
49 49
 			return $pb;
50 50
 		});
51 51
 			return $this;
52 52
 	}
53 53
 
54
-	public function fieldAsRating($index,$max=5, $icon=""){
55
-		$this->setValueFunction($index,function($value) use($max,$icon){
56
-			$rating=new HtmlRating($this->_getFieldIdentifier("rat"),$value,$max,$icon);
54
+	public function fieldAsRating($index, $max=5, $icon="") {
55
+		$this->setValueFunction($index, function($value) use($max, $icon){
56
+			$rating=new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon);
57 57
 			return $rating;
58 58
 		});
59 59
 			return $this;
60 60
 	}
61 61
 
62
-	public function fieldAsLabel($index,$icon=NULL){
63
-		$this->setValueFunction($index,function($caption) use($icon){
64
-			$lbl=$this->_getLabelField($caption,$icon);
62
+	public function fieldAsLabel($index, $icon=NULL) {
63
+		$this->setValueFunction($index, function($caption) use($icon){
64
+			$lbl=$this->_getLabelField($caption, $icon);
65 65
 			return $lbl;
66 66
 		});
67 67
 			return $this;
68 68
 	}
69 69
 
70
-	public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){
71
-		return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){
72
-			$header=new HtmlHeader($id,$niveau,$value);
73
-			if(isset($icon))
70
+	public function fieldAsHeader($index, $niveau=1, $icon=NULL, $attributes=NULL) {
71
+		return $this->_fieldAs(function($id, $name, $value) use($niveau, $icon){
72
+			$header=new HtmlHeader($id, $niveau, $value);
73
+			if (isset($icon))
74 74
 				$header->asIcon($icon, $value);
75 75
 			return $header;
76
-		}, $index,$attributes,"header");
76
+		}, $index, $attributes, "header");
77 77
 	}
78 78
 
79 79
 
80
-	public function fieldAsImage($index,$size=Size::MINI,$circular=false){
81
-		$this->setValueFunction($index,function($img) use($size,$circular){
82
-			$image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular();
80
+	public function fieldAsImage($index, $size=Size::MINI, $circular=false) {
81
+		$this->setValueFunction($index, function($img) use($size, $circular){
82
+			$image=new HtmlImage($this->_getFieldIdentifier("image"), $img); $image->setSize($size); if ($circular)$image->setCircular();
83 83
 			return $image;
84 84
 		});
85 85
 			return $this;
86 86
 	}
87 87
 
88
-	public function fieldAsAvatar($index,$attributes=NULL){
89
-		return $this->_fieldAs(function($id,$name,$value){
90
-			$img=new HtmlImage($id,$value);
88
+	public function fieldAsAvatar($index, $attributes=NULL) {
89
+		return $this->_fieldAs(function($id, $name, $value) {
90
+			$img=new HtmlImage($id, $value);
91 91
 			$img->asAvatar();
92 92
 			return $img;
93
-		}, $index,$attributes,"avatar");
93
+		}, $index, $attributes, "avatar");
94 94
 	}
95 95
 
96
-	public function fieldAsRadio($index,$attributes=NULL){
97
-		return $this->_fieldAs(function($id,$name,$value){
98
-			$input= new HtmlRadio($id,$name,$value,$value);
96
+	public function fieldAsRadio($index, $attributes=NULL) {
97
+		return $this->_fieldAs(function($id, $name, $value) {
98
+			$input=new HtmlRadio($id, $name, $value, $value);
99 99
 			return $input;
100
-		}, $index,$attributes,"radio");
100
+		}, $index, $attributes, "radio");
101 101
 	}
102 102
 
103
-	public function fieldAsInput($index,$attributes=NULL){
104
-		return $this->_fieldAs(function($id,$name,$value){
105
-			$input= new HtmlInput($id,"text",$value);
103
+	public function fieldAsInput($index, $attributes=NULL) {
104
+		return $this->_fieldAs(function($id, $name, $value) {
105
+			$input=new HtmlInput($id, "text", $value);
106 106
 			//TODO check getField
107 107
 			$input->setName($name);
108 108
 			return $input;
109
-		}, $index,$attributes,"input");
109
+		}, $index, $attributes, "input");
110 110
 	}
111 111
 
112
-	public function fieldAsHidden($index,$attributes=NULL){
113
-		if(\is_array($attributes)===false){
112
+	public function fieldAsHidden($index, $attributes=NULL) {
113
+		if (\is_array($attributes)===false) {
114 114
 			$attributes=[];
115 115
 		}
116 116
 		$attributes["imputType"]="hidden";
117
-		return $this->fieldAsInput($index,$attributes);
117
+		return $this->fieldAsInput($index, $attributes);
118 118
 	}
119 119
 
120
-	public function fieldAsCheckbox($index,$attributes=NULL){
121
-		return $this->_fieldAs(function($id,$name,$value){
122
-			$input=new HtmlCheckbox($id,"",$this->_instanceViewer->getIdentifier());
120
+	public function fieldAsCheckbox($index, $attributes=NULL) {
121
+		return $this->_fieldAs(function($id, $name, $value) {
122
+			$input=new HtmlCheckbox($id, "", $this->_instanceViewer->getIdentifier());
123 123
 			$input->setChecked(JString::isBooleanTrue($value));
124 124
 			$input->getField()->setProperty("name", $name);
125 125
 			return $input;
126
-		}, $index,$attributes,"ck");
126
+		}, $index, $attributes, "ck");
127 127
 	}
128 128
 
129
-	public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){
130
-		return $this->_fieldAs(function($id,$name,$value) use($elements,$multiple){
131
-			$dd=new HtmlDropdown($id,$value,$elements);
132
-			$dd->asSelect($name,$multiple);
129
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
130
+		return $this->_fieldAs(function($id, $name, $value) use($elements, $multiple){
131
+			$dd=new HtmlDropdown($id, $value, $elements);
132
+			$dd->asSelect($name, $multiple);
133 133
 			return $dd;
134
-		}, $index,$attributes,"dd");
134
+		}, $index, $attributes, "dd");
135 135
 	}
136 136
 }
137 137
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/widgets/dataform/FormFieldAsTrait.php 3 patches
Doc Comments   +14 added lines patch added patch discarded remove patch
@@ -18,7 +18,14 @@  discard block
 block discarded – undo
18 18
 
19 19
 trait FormFieldAsTrait{
20 20
 
21
+	/**
22
+	 * @param string $prefix
23
+	 */
21 24
 	abstract protected function _getFieldIdentifier($prefix);
25
+
26
+	/**
27
+	 * @param \Closure $callback
28
+	 */
22 29
 	abstract public function setValueFunction($index,$callback);
23 30
 
24 31
 	private function _getLabelField($caption,$icon=NULL){
@@ -42,6 +49,9 @@  discard block
 block discarded – undo
42 49
 		$element->fromArray($attributes);
43 50
 	}
44 51
 
52
+	/**
53
+	 * @param HtmlFormField $element
54
+	 */
45 55
 	protected function _addRules($element,$attributes){
46 56
 		if(isset($attributes["rules"])){
47 57
 			$rules=$attributes["rules"];
@@ -53,6 +63,10 @@  discard block
 block discarded – undo
53 63
 		}
54 64
 	}
55 65
 
66
+	/**
67
+	 * @param \Closure $elementCallback
68
+	 * @param string $identifier
69
+	 */
56 70
 	protected function _fieldAs($elementCallback,$index,$attributes=NULL,$identifier=null){
57 71
 		$this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback){
58 72
 			$caption=$this->_instanceViewer->getCaption($index);
Please login to merge, or discard this patch.
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -16,13 +16,13 @@  discard block
 block discarded – undo
16 16
  * @property object $_modelInstance;
17 17
  */
18 18
 
19
-trait FormFieldAsTrait{
19
+trait FormFieldAsTrait {
20 20
 
21 21
 	abstract protected function _getFieldIdentifier($prefix);
22
-	abstract public function setValueFunction($index,$callback);
22
+	abstract public function setValueFunction($index, $callback);
23 23
 
24
-	private function _getLabelField($caption,$icon=NULL){
25
-		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"),$caption,$icon);
24
+	private function _getLabelField($caption, $icon=NULL) {
25
+		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon);
26 26
 		return $label;
27 27
 	}
28 28
 
@@ -30,22 +30,22 @@  discard block
 block discarded – undo
30 30
 	 * @param HtmlFormField $element
31 31
 	 * @param array $attributes
32 32
 	 */
33
-	protected function _applyAttributes($element,&$attributes,$index){
33
+	protected function _applyAttributes($element, &$attributes, $index) {
34 34
 		$this->_addRules($element, $attributes);
35
-		if(isset($attributes["callback"])){
35
+		if (isset($attributes["callback"])) {
36 36
 			$callback=$attributes["callback"];
37
-			if(\is_callable($callback)){
38
-				$callback($element,$this->_modelInstance,$index);
37
+			if (\is_callable($callback)) {
38
+				$callback($element, $this->_modelInstance, $index);
39 39
 				unset($attributes["callback"]);
40 40
 			}
41 41
 		}
42 42
 		$element->fromArray($attributes);
43 43
 	}
44 44
 
45
-	protected function _addRules($element,&$attributes){
46
-		if(isset($attributes["rules"])){
45
+	protected function _addRules($element, &$attributes) {
46
+		if (isset($attributes["rules"])) {
47 47
 			$rules=$attributes["rules"];
48
-			if(\is_array($rules)){
48
+			if (\is_array($rules)) {
49 49
 				$element->addRules($rules);
50 50
 			}
51 51
 			else
@@ -54,13 +54,13 @@  discard block
 block discarded – undo
54 54
 		}
55 55
 	}
56 56
 
57
-	protected function _fieldAs($elementCallback,$index,$attributes=NULL,$identifier=null){
58
-		$this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback){
57
+	protected function _fieldAs($elementCallback, $index, $attributes=NULL, $identifier=null) {
58
+		$this->setValueFunction($index, function($value) use ($index, &$attributes, $elementCallback){
59 59
 			$caption=$this->_instanceViewer->getCaption($index);
60 60
 			$name=$this->_instanceViewer->getFieldName($index);
61
-			$element=$elementCallback($this->getIdentifier()."-".$name,$name,$value,$caption);
62
-			if(\is_array($attributes)){
63
-				$this->_applyAttributes($element, $attributes,$index);
61
+			$element=$elementCallback($this->getIdentifier()."-".$name, $name, $value, $caption);
62
+			if (\is_array($attributes)) {
63
+				$this->_applyAttributes($element, $attributes, $index);
64 64
 			}
65 65
 			return $element;
66 66
 		});
@@ -68,53 +68,53 @@  discard block
 block discarded – undo
68 68
 	}
69 69
 
70 70
 
71
-	public function fieldAsRadio($index,$attributes=NULL){
72
-		return $this->_fieldAs(function($id,$name,$value,$caption){
73
-			return new HtmlFormRadio($id,$name,$caption,$value);
74
-		}, $index,$attributes);
71
+	public function fieldAsRadio($index, $attributes=NULL) {
72
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
73
+			return new HtmlFormRadio($id, $name, $caption, $value);
74
+		}, $index, $attributes);
75 75
 	}
76 76
 
77
-	public function fieldAsRadios($index,$elements=[],$attributes=NULL){
78
-		return $this->_fieldAs(function($id,$name,$value,$caption,$elements){
79
-			return HtmlFormFields::radios($name,$elements,$caption,$value);
80
-		}, $index,$attributes);
77
+	public function fieldAsRadios($index, $elements=[], $attributes=NULL) {
78
+		return $this->_fieldAs(function($id, $name, $value, $caption, $elements) {
79
+			return HtmlFormFields::radios($name, $elements, $caption, $value);
80
+		}, $index, $attributes);
81 81
 	}
82 82
 
83
-	public function fieldAsTextarea($index,$attributes=NULL){
84
-		return $this->_fieldAs(function($id,$name,$value,$caption){
85
-			$textarea=new HtmlFormTextarea($id,$caption,$value);
83
+	public function fieldAsTextarea($index, $attributes=NULL) {
84
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
85
+			$textarea=new HtmlFormTextarea($id, $caption, $value);
86 86
 			$textarea->setName($name);
87 87
 			return $textarea;
88
-		}, $index,$attributes);
88
+		}, $index, $attributes);
89 89
 	}
90 90
 
91
-	public function fieldAsInput($index,$attributes=NULL){
92
-		return $this->_fieldAs(function($id,$name,$value,$caption){
93
-			$input= new HtmlFormInput($id,$caption,"text",$value);
91
+	public function fieldAsInput($index, $attributes=NULL) {
92
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
93
+			$input=new HtmlFormInput($id, $caption, "text", $value);
94 94
 			$input->setName($name);
95 95
 			return $input;
96
-		}, $index,$attributes);
96
+		}, $index, $attributes);
97 97
 	}
98 98
 
99
-	public function fieldAsCheckbox($index,$attributes=NULL){
100
-		return $this->_fieldAs(function($id,$name,$value,$caption){
101
-			return new HtmlFormCheckbox($id,$caption,$value);
102
-		}, $index,$attributes);
99
+	public function fieldAsCheckbox($index, $attributes=NULL) {
100
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
101
+			return new HtmlFormCheckbox($id, $caption, $value);
102
+		}, $index, $attributes);
103 103
 	}
104 104
 
105
-	public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){
106
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($elements,$multiple){
107
-			$dd=new HtmlFormDropdown($id,$elements,$caption,$value,$multiple);
105
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
106
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements, $multiple){
107
+			$dd=new HtmlFormDropdown($id, $elements, $caption, $value, $multiple);
108 108
 			$dd->setName($name);
109 109
 			return $dd;
110
-		}, $index,$attributes);
110
+		}, $index, $attributes);
111 111
 	}
112 112
 
113
-	public function fieldAsMessage($index,$attributes=NULL){
114
-		return $this->_fieldAs(function($id,$name,$value,$caption){
115
-			$mess= new HtmlMessage("message-".$id,$value);
113
+	public function fieldAsMessage($index, $attributes=NULL) {
114
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
115
+			$mess=new HtmlMessage("message-".$id, $value);
116 116
 			$mess->addHeader($caption);
117 117
 			return $mess;
118
-		}, $index,$attributes,"message");
118
+		}, $index, $attributes, "message");
119 119
 	}
120 120
 }
121 121
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -47,9 +47,9 @@
 block discarded – undo
47 47
 			$rules=$attributes["rules"];
48 48
 			if(\is_array($rules)){
49 49
 				$element->addRules($rules);
50
+			} else {
51
+							$element->addRule($rules);
50 52
 			}
51
-			else
52
-				$element->addRule($rules);
53 53
 			unset($attributes["rules"]);
54 54
 		}
55 55
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormInput.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -8,16 +8,16 @@
 block discarded – undo
8 8
 class HtmlFormInput extends HtmlFormField {
9 9
 	use TextFieldsTrait;
10 10
 
11
-	public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) {
12
-		if(!isset($placeholder) && $type==="text")
11
+	public function __construct($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) {
12
+		if (!isset($placeholder) && $type==="text")
13 13
 			$placeholder=$label;
14
-		parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label);
14
+		parent::__construct("field-".$identifier, new HtmlInput($identifier, $type, $value, $placeholder), $label);
15 15
 	}
16 16
 
17
-	public function getDataField(){
18
-		$field= $this->getField();
17
+	public function getDataField() {
18
+		$field=$this->getField();
19 19
 		//TODO check getField
20
-		if($field instanceof HtmlInput)
20
+		if ($field instanceof HtmlInput)
21 21
 			$field=$field->getDataField();
22 22
 		return $field;
23 23
 	}
Please login to merge, or discard this 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
 	}
16 17
 
17 18
 	public function getDataField(){
18 19
 		$field= $this->getField();
19 20
 		//TODO check 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
 }
25 27
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/traits/TextFieldsTrait.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -6,19 +6,19 @@
 block discarded – undo
6 6
 
7 7
 	abstract public function getDataField();
8 8
 	abstract public function addToProperty($name, $value, $separator=" ");
9
-	public function setPlaceholder($value){
9
+	public function setPlaceholder($value) {
10 10
 		$this->getDataField()->setPlaceholder($value);
11 11
 		return $this;
12 12
 	}
13 13
 
14
-	public function setValue($value){
14
+	public function setValue($value) {
15 15
 		$this->getDataField()->setValue($value);
16 16
 		return $this;
17 17
 	}
18 18
 
19
-	public function setInputType($type){
20
-		if($type==="hidden")
21
-			$this->addToProperty("style","display:none;");
19
+	public function setInputType($type) {
20
+		if ($type==="hidden")
21
+			$this->addToProperty("style", "display:none;");
22 22
 		$this->getDataField()->setInputType($type);
23 23
 		return $this;
24 24
 	}
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,9 @@
 block discarded – undo
17 17
 	}
18 18
 
19 19
 	public function setInputType($type){
20
-		if($type==="hidden")
21
-			$this->addToProperty("style","display:none;");
20
+		if($type==="hidden") {
21
+					$this->addToProperty("style","display:none;");
22
+		}
22 23
 		$this->getDataField()->setInputType($type);
23 24
 		return $this;
24 25
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/HtmlMessage.php 2 patches
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -31,38 +31,38 @@  discard block
 block discarded – undo
31 31
 	 * @param string|HtmlSemDoubleElement $header
32 32
 	 * @return \Ajax\semantic\html\collections\HtmlMessage
33 33
 	 */
34
-	public function addHeader($header){
34
+	public function addHeader($header) {
35 35
 		$headerO=$header;
36
-		if(\is_string($header)){
37
-			$headerO=new HtmlSemDoubleElement("header-".$this->identifier,"div");
36
+		if (\is_string($header)) {
37
+			$headerO=new HtmlSemDoubleElement("header-".$this->identifier, "div");
38 38
 			$headerO->setClass("header");
39 39
 			$headerO->setContent($header);
40 40
 		}
41
-		return $this->addContent($headerO,true);
41
+		return $this->addContent($headerO, true);
42 42
 	}
43 43
 
44
-	public function addList($elements,$ordered=false){
45
-		$list=new HtmlList("list-".$this->identifier,$elements);
44
+	public function addList($elements, $ordered=false) {
45
+		$list=new HtmlList("list-".$this->identifier, $elements);
46 46
 		$list->setOrdered($ordered);
47 47
 		$list->setClass("ui list");
48 48
 		$this->addContent($list);
49 49
 	}
50 50
 
51
-	public function setIcon($icon){
51
+	public function setIcon($icon) {
52 52
 		$this->addToProperty("class", "icon");
53
-		$this->wrapContent("<div class='content'>","</div>");
53
+		$this->wrapContent("<div class='content'>", "</div>");
54 54
 		$this->icon=new HtmlIcon("icon-".$this->identifier, $icon);
55 55
 		return $this;
56 56
 	}
57 57
 
58
-	public function addLoader($loaderIcon="notched circle"){
58
+	public function addLoader($loaderIcon="notched circle") {
59 59
 		$this->setIcon($loaderIcon);
60 60
 		$this->icon->addToIcon("loading");
61 61
 		return $this;
62 62
 	}
63 63
 
64
-	public function setDismissable($dismiss=true){
65
-		if($dismiss===true)
64
+	public function setDismissable($dismiss=true) {
65
+		if ($dismiss===true)
66 66
 			$this->close=new HtmlIcon("close-".$this->identifier, "close");
67 67
 		else
68 68
 			$this->close=NULL;
@@ -73,34 +73,34 @@  discard block
 block discarded – undo
73 73
 	 * {@inheritDoc}
74 74
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
75 75
 	 */
76
-	public function run(JsUtils $js){
76
+	public function run(JsUtils $js) {
77 77
 		parent::run($js);
78
-		if(isset($this->close)){
78
+		if (isset($this->close)) {
79 79
 			$js->execOn("click", "#".$this->identifier." .close", "$(this).closest('.message').transition('fade')");
80 80
 		}
81 81
 	}
82 82
 
83
-	public function setState($visible=true){
84
-		$visible=($visible===true)?"visible":"hidden";
85
-		return $this->addToPropertyCtrl("class", $visible, array("visible","hidden"));
83
+	public function setState($visible=true) {
84
+		$visible=($visible===true) ? "visible" : "hidden";
85
+		return $this->addToPropertyCtrl("class", $visible, array("visible", "hidden"));
86 86
 	}
87 87
 
88
-	public function setVariation($value="floating"){
89
-		return $this->addToPropertyCtrl("class", $value, array("floating","compact"));
88
+	public function setVariation($value="floating") {
89
+		return $this->addToPropertyCtrl("class", $value, array("floating", "compact"));
90 90
 	}
91 91
 
92
-	public function setStyle($style){
92
+	public function setStyle($style) {
93 93
 		return $this->addToPropertyCtrl("class", $style, Style::getConstants());
94 94
 	}
95 95
 
96
-	public function setError(){
96
+	public function setError() {
97 97
 		return $this->setStyle("error");
98 98
 	}
99 99
 
100
-	public function setMessage($message){
101
-		if(\is_array($this->content)){
100
+	public function setMessage($message) {
101
+		if (\is_array($this->content)) {
102 102
 			$this->content[\sizeof($this->content)-1]=$message;
103
-		}else
103
+		} else
104 104
 			$this->setContent($message);
105 105
 	}
106 106
 }
107 107
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +8 added lines, -6 removed lines patch added patch discarded remove patch
@@ -62,10 +62,11 @@  discard block
 block discarded – undo
62 62
 	}
63 63
 
64 64
 	public function setDismissable($dismiss=true){
65
-		if($dismiss===true)
66
-			$this->close=new HtmlIcon("close-".$this->identifier, "close");
67
-		else
68
-			$this->close=NULL;
65
+		if($dismiss===true) {
66
+					$this->close=new HtmlIcon("close-".$this->identifier, "close");
67
+		} else {
68
+					$this->close=NULL;
69
+		}
69 70
 		return $this;
70 71
 	}
71 72
 
@@ -100,7 +101,8 @@  discard block
 block discarded – undo
100 101
 	public function setMessage($message){
101 102
 		if(\is_array($this->content)){
102 103
 			$this->content[\sizeof($this->content)-1]=$message;
103
-		}else
104
-			$this->setContent($message);
104
+		} else {
105
+					$this->setContent($message);
106
+		}
105 107
 	}
106 108
 }
107 109
\ No newline at end of file
Please login to merge, or discard this patch.