Completed
Push — master ( 189ad5...73e21a )
by Jean-Christophe
04:04
created
Ajax/semantic/html/collections/HtmlGrid.php 2 patches
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,6 +22,9 @@  discard block
 block discarded – undo
22 22
 	private $_colSizing=true;
23 23
 	private $_implicitRows=false;
24 24
 
25
+	/**
26
+	 * @param string $identifier
27
+	 */
25 28
 	public function __construct($identifier, $numRows=1, $numCols=NULL, $createCols=true, $implicitRows=false) {
26 29
 		parent::__construct($identifier, "div", "ui grid");
27 30
 		$this->_implicitRows=$implicitRows;
@@ -158,7 +161,7 @@  discard block
 block discarded – undo
158 161
 	/**
159 162
 	 * return the row at $index
160 163
 	 * @param int $index
161
-	 * @return \Ajax\semantic\html\collections\HtmlGridRow
164
+	 * @return \Ajax\common\html\HtmlDoubleElement
162 165
 	 */
163 166
 	public function getRow($index) {
164 167
 		return $this->getItem($index);
@@ -297,7 +300,7 @@  discard block
 block discarded – undo
297 300
 
298 301
 	/**
299 302
 	 * stretch the row contents to take up the entire column height
300
-	 * @return \Ajax\semantic\html\content\HtmlGridRow
303
+	 * @return HtmlGrid
301 304
 	 */
302 305
 	public function setStretched() {
303 306
 		return $this->addToProperty("class", "stretched");
Please login to merge, or discard this patch.
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -36,11 +36,11 @@  discard block
 block discarded – undo
36 36
 	}
37 37
 
38 38
 	public function asSegment() {
39
-		return $this->addToPropertyCtrl("class", "segment", array ("segment" ));
39
+		return $this->addToPropertyCtrl("class", "segment", array("segment"));
40 40
 	}
41 41
 
42 42
 	public function asContainer() {
43
-		return $this->addToPropertyCtrl("class", "container", array ("container" ));
43
+		return $this->addToPropertyCtrl("class", "container", array("container"));
44 44
 	}
45 45
 
46 46
 	/**
@@ -48,9 +48,9 @@  discard block
 block discarded – undo
48 48
 	 * @param int $wide
49 49
 	 */
50 50
 	public function setWide($wide) {
51
-		$wide=Wide::getConstants()["W" . $wide];
51
+		$wide=Wide::getConstants()["W".$wide];
52 52
 		$this->addToPropertyCtrl("class", $wide, Wide::getConstants());
53
-		return $this->addToPropertyCtrl("class", "column", array ("column" ));
53
+		return $this->addToPropertyCtrl("class", "column", array("column"));
54 54
 	}
55 55
 
56 56
 	/**
@@ -68,9 +68,9 @@  discard block
 block discarded – undo
68 68
 	 * @return mixed
69 69
 	 */
70 70
 	public function addRow($colsCount=NULL) {
71
-		$rowCount=$this->rowCount() + 1;
71
+		$rowCount=$this->rowCount()+1;
72 72
 		$this->setRowsCount($rowCount, $colsCount, true);
73
-		return $this->content[$rowCount - 1];
73
+		return $this->content[$rowCount-1];
74 74
 	}
75 75
 
76 76
 	/**
@@ -79,10 +79,10 @@  discard block
 block discarded – undo
79 79
 	 * @return mixed|\Ajax\semantic\html\collections\HtmlGrid
80 80
 	 */
81 81
 	public function addCol($width=NULL) {
82
-		$colCount=$this->colCount() + 1;
82
+		$colCount=$this->colCount()+1;
83 83
 		$this->setColsCount($colCount, true, $width);
84 84
 		if ($this->hasOnlyCols($this->count()))
85
-			return $this->content[$colCount - 1];
85
+			return $this->content[$colCount-1];
86 86
 		return $this;
87 87
 	}
88 88
 
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
93 93
 	 */
94 94
 	public function addCols($sizes=array()) {
95
-		foreach ( $sizes as $size ) {
95
+		foreach ($sizes as $size) {
96 96
 			$this->addCol($size);
97 97
 		}
98 98
 		return $this;
@@ -106,19 +106,19 @@  discard block
 block discarded – undo
106 106
 	 */
107 107
 	public function setRowsCount($rowsCount, $colsCount=NULL, $force=false) {
108 108
 		$count=$this->count();
109
-		if ($rowsCount < 2 && $force === false) {
110
-			for($i=$count; $i < $colsCount; $i++) {
111
-				$this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i));
109
+		if ($rowsCount<2 && $force===false) {
110
+			for ($i=$count; $i<$colsCount; $i++) {
111
+				$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i));
112 112
 			}
113
-		} else {
113
+		}else {
114 114
 			if ($this->hasOnlyCols($count)) {
115 115
 				$tmpContent=$this->content;
116 116
 				$item=$this->addItem($colsCount);
117 117
 				$item->setContent($tmpContent);
118
-				$this->content=array ();
118
+				$this->content=array();
119 119
 				$count=1;
120 120
 			}
121
-			for($i=$count; $i < $rowsCount; $i++) {
121
+			for ($i=$count; $i<$rowsCount; $i++) {
122 122
 				$this->addItem($colsCount);
123 123
 			}
124 124
 		}
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 	}
127 127
 
128 128
 	protected function hasOnlyCols($count) {
129
-		return $count > 0 && $this->content[0] instanceof HtmlGridCol;
129
+		return $count>0 && $this->content[0] instanceof HtmlGridCol;
130 130
 	}
131 131
 
132 132
 	/**
@@ -140,14 +140,14 @@  discard block
 block discarded – undo
140 140
 		if (isset($width)==false) {
141 141
 			$this->setWide($numCols);
142 142
 		}
143
-		if ($toCreate == true) {
143
+		if ($toCreate==true) {
144 144
 			$count=$this->count();
145
-			if ($count == 0 || $this->hasOnlyCols($count)) {
146
-				for($i=$count; $i < $numCols; $i++) {
147
-					$this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i, $width));
145
+			if ($count==0 || $this->hasOnlyCols($count)) {
146
+				for ($i=$count; $i<$numCols; $i++) {
147
+					$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i, $width));
148 148
 				}
149
-			} else {
150
-				for($i=0; $i < $count; $i++) {
149
+			}else {
150
+				for ($i=0; $i<$count; $i++) {
151 151
 					$this->getItem($i)->setColsCount($numCols);
152 152
 				}
153 153
 			}
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
 		$count=$this->count();
184 184
 		if ($this->hasOnlyCols($count))
185 185
 			return $count;
186
-		if ($count > 0)
186
+		if ($count>0)
187 187
 			return $this->getItem(0)->count();
188 188
 		return 0;
189 189
 	}
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 	 * @return \Ajax\semantic\html\collections\HtmlGridCol
196 196
 	 */
197 197
 	public function getCell($row, $col) {
198
-		if ($row < 2 && $this->hasOnlyCols($this->count()))
198
+		if ($row<2 && $this->hasOnlyCols($this->count()))
199 199
 			return $this->getItem($col);
200 200
 		$row=$this->getItem($row);
201 201
 		if (isset($row)) {
@@ -210,8 +210,8 @@  discard block
 block discarded – undo
210 210
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
211 211
 	 */
212 212
 	public function setDivided($vertically=false) {
213
-		$value=($vertically === true) ? "vertically divided" : "divided";
214
-		return $this->addToPropertyCtrl("class", $value, array ("divided" ));
213
+		$value=($vertically===true) ? "vertically divided" : "divided";
214
+		return $this->addToPropertyCtrl("class", $value, array("divided"));
215 215
 	}
216 216
 
217 217
 	/**
@@ -220,15 +220,15 @@  discard block
 block discarded – undo
220 220
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
221 221
 	 */
222 222
 	public function setCelled($internally=false) {
223
-		$value=($internally === true) ? "internally celled" : "celled";
224
-		return $this->addToPropertyCtrl("class", $value, array ("celled","internally celled" ));
223
+		$value=($internally===true) ? "internally celled" : "celled";
224
+		return $this->addToPropertyCtrl("class", $value, array("celled", "internally celled"));
225 225
 	}
226 226
 
227 227
 	/**
228 228
 	 * A grid can have its columns centered
229 229
 	 */
230 230
 	public function setCentered() {
231
-		return $this->addToPropertyCtrl("class", "centered", array ("centered" ));
231
+		return $this->addToPropertyCtrl("class", "centered", array("centered"));
232 232
 	}
233 233
 
234 234
 	/**
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
 	 */
247 247
 	public function setPadded($value=NULL) {
248 248
 		if (isset($value))
249
-			$this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" ));
249
+			$this->addToPropertyCtrl("class", $value, array("vertically", "horizontally"));
250 250
 		return $this->addToProperty("class", "padded");
251 251
 	}
252 252
 
@@ -256,12 +256,12 @@  discard block
 block discarded – undo
256 256
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
257 257
 	 */
258 258
 	public function setRelaxed($very=false) {
259
-		$value=($very === true) ? "very relaxed" : "relaxed";
260
-		return $this->addToPropertyCtrl("class", $value, array ("relaxed","very relaxed" ));
259
+		$value=($very===true) ? "very relaxed" : "relaxed";
260
+		return $this->addToPropertyCtrl("class", $value, array("relaxed", "very relaxed"));
261 261
 	}
262 262
 
263 263
 	public function setVerticalAlignment($value=VerticalAlignment::MIDDLE) {
264
-		return $this->addToPropertyCtrl("class", $value . " aligned", VerticalAlignment::getConstantValues("aligned"));
264
+		return $this->addToPropertyCtrl("class", $value." aligned", VerticalAlignment::getConstantValues("aligned"));
265 265
 	}
266 266
 
267 267
 	/**
@@ -271,9 +271,9 @@  discard block
 block discarded – undo
271 271
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
272 272
 	 */
273 273
 	protected function createItem($value) {
274
-		if ($this->_createCols === false)
274
+		if ($this->_createCols===false)
275 275
 			$value=null;
276
-		$item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows);
276
+		$item=new HtmlGridRow($this->identifier."-row-".($this->count()+1), $value, $this->_colSizing, $this->_implicitRows);
277 277
 		return $item;
278 278
 	}
279 279
 
@@ -283,15 +283,15 @@  discard block
 block discarded – undo
283 283
 	 */
284 284
 	public function setValues($values, $force=true) {
285 285
 		$count=$this->count();
286
-		if ($this->_createCols === false || $force === true) {
287
-			for($i=$count; $i < \sizeof($values); $i++) {
286
+		if ($this->_createCols===false || $force===true) {
287
+			for ($i=$count; $i<\sizeof($values); $i++) {
288 288
 				$colSize=\sizeof($values[$i]);
289
-				$this->addItem(new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $colSize, $this->_colSizing, $this->_implicitRows));
289
+				$this->addItem(new HtmlGridRow($this->identifier."-row-".($this->count()+1), $colSize, $this->_colSizing, $this->_implicitRows));
290 290
 			}
291 291
 		}
292
-		$count=\min(array ($this->count(),\sizeof($values) ));
293
-		for($i=0; $i < $count; $i++) {
294
-			$this->content[$i]->setValues($values[$i], $this->_createCols === false);
292
+		$count=\min(array($this->count(), \sizeof($values)));
293
+		for ($i=0; $i<$count; $i++) {
294
+			$this->content[$i]->setValues($values[$i], $this->_createCols===false);
295 295
 		}
296 296
 	}
297 297
 
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlLabel.php 3 patches
Doc Comments   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,6 +11,9 @@  discard block
 block discarded – undo
11 11
 class HtmlLabel extends HtmlSemDoubleElement {
12 12
 	use LabeledIconTrait;
13 13
 
14
+	/**
15
+	 * @param string $icon
16
+	 */
14 17
 	public function __construct($identifier, $caption="", $icon=NULL, $tagName="div") {
15 18
 		parent::__construct($identifier, $tagName, "ui label");
16 19
 		$this->content=$caption;
@@ -20,7 +23,6 @@  discard block
 block discarded – undo
20 23
 
21 24
 	/**
22 25
 	 *
23
-	 * @param string $side
24 26
 	 * @return \Ajax\semantic\html\elements\HtmlLabel
25 27
 	 */
26 28
 	public function setPointing($value=Direction::NONE) {
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 	 * @return \Ajax\semantic\html\elements\HtmlLabel
25 25
 	 */
26 26
 	public function setPointing($value=Direction::NONE) {
27
-		return $this->addToPropertyCtrl("class", $value . " pointing", Direction::getConstantValues("pointing"));
27
+		return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
28 28
 	}
29 29
 
30 30
 	/**
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 	 * @return \Ajax\semantic\html\elements\HtmlLabel
34 34
 	 */
35 35
 	public function toCorner($side="left") {
36
-		return $this->addToPropertyCtrl("class", $side . " corner", array ("right corner","left corner" ));
36
+		return $this->addToPropertyCtrl("class", $side." corner", array("right corner", "left corner"));
37 37
 	}
38 38
 
39 39
 	/**
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 	 */
68 68
 	public function addImage($src, $alt="", $before=true) {
69 69
 		$this->addToProperty("class", "image");
70
-		return $this->addContent(new HtmlImg("image-" . $this->identifier, $src, $alt), $before);
70
+		return $this->addContent(new HtmlImg("image-".$this->identifier, $src, $alt), $before);
71 71
 	}
72 72
 
73 73
 	/**
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 * @return \Ajax\common\html\HtmlDoubleElement
77 77
 	 */
78 78
 	public function addDetail($detail) {
79
-		$div=new HtmlDoubleElement("detail-" . $this->identifier, $this->tagName);
79
+		$div=new HtmlDoubleElement("detail-".$this->identifier, $this->tagName);
80 80
 		$div->setClass("detail");
81 81
 		$div->setContent($detail);
82 82
 		$this->addContent($div);
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 	}
85 85
 
86 86
 	public function asRibbon() {
87
-		return $this->addToPropertyCtrl("class", "ribbon", array ("ribbon" ));
87
+		return $this->addToPropertyCtrl("class", "ribbon", array("ribbon"));
88 88
 	}
89 89
 
90 90
 	public static function ribbon($identifier, $caption) {
Please login to merge, or discard this patch.
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -14,8 +14,9 @@  discard block
 block discarded – undo
14 14
 	public function __construct($identifier, $caption="", $icon=NULL, $tagName="div") {
15 15
 		parent::__construct($identifier, $tagName, "ui label");
16 16
 		$this->content=$caption;
17
-		if (isset($icon))
18
-			$this->addIcon($icon);
17
+		if (isset($icon)) {
18
+					$this->addIcon($icon);
19
+		}
19 20
 	}
20 21
 
21 22
 	/**
@@ -49,8 +50,9 @@  discard block
 block discarded – undo
49 50
 	 * @return \Ajax\semantic\html\elements\HtmlLabel
50 51
 	 */
51 52
 	public function asLink($href=NULL) {
52
-		if (isset($href))
53
-			$this->setProperty("href", $href);
53
+		if (isset($href)) {
54
+					$this->setProperty("href", $href);
55
+		}
54 56
 		return $this->setTagName("a");
55 57
 	}
56 58
 
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlSegment.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -18,12 +18,12 @@  discard block
 block discarded – undo
18 18
  * @version 1.001
19 19
  */
20 20
 class HtmlSegment extends HtmlSemDoubleElement {
21
-	use AttachedTrait,TextAlignmentTrait;
21
+	use AttachedTrait, TextAlignmentTrait;
22 22
 
23 23
 	public function __construct($identifier, $content="") {
24 24
 		parent::__construct($identifier, "div", "ui segment");
25
-		$this->_variations=\array_merge($this->_variations, [ Variation::PADDED,Variation::COMPACT ]);
26
-		$this->_states=\array_merge($this->_states, [ State::LOADING ]);
25
+		$this->_variations=\array_merge($this->_variations, [Variation::PADDED, Variation::COMPACT]);
26
+		$this->_states=\array_merge($this->_states, [State::LOADING]);
27 27
 		$this->content=$content;
28 28
 	}
29 29
 
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 	}
38 38
 
39 39
 	public function setSens($sens="vertical") {
40
-		return $this->addToPropertyCtrl("class", $sens, array ("vertical","horizontal" ));
40
+		return $this->addToPropertyCtrl("class", $sens, array("vertical", "horizontal"));
41 41
 	}
42 42
 
43 43
 	public function setEmphasis($value=Emphasis::SECONDARY) {
@@ -61,11 +61,11 @@  discard block
 block discarded – undo
61 61
 	}
62 62
 
63 63
 	public function asContainer() {
64
-		return $this->addToPropertyCtrl("class", "container", array ("container" ));
64
+		return $this->addToPropertyCtrl("class", "container", array("container"));
65 65
 	}
66 66
 
67
-	public function addGrid($numRows=1, $numCols=NULL){
68
-		$grid=new HtmlGrid("Grid-".$this->identifier,$numRows,$numCols);
67
+	public function addGrid($numRows=1, $numCols=NULL) {
68
+		$grid=new HtmlGrid("Grid-".$this->identifier, $numRows, $numCols);
69 69
 		$this->content=$grid;
70 70
 		return $grid;
71 71
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlContainer.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,11 +13,11 @@
 block discarded – undo
13 13
 class HtmlContainer extends HtmlSemDoubleElement {
14 14
 	use TextAlignmentTrait;
15 15
 	public function __construct($identifier, $content="") {
16
-		parent::__construct($identifier, "div","ui container");
16
+		parent::__construct($identifier, "div", "ui container");
17 17
 		$this->content=$content;
18 18
 	}
19 19
 
20
-	public function asText(){
20
+	public function asText() {
21 21
 		return $this->addToProperty("class", "text");
22 22
 	}
23 23
 }
24 24
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlButton.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 	}
56 56
 
57 57
 	public function setFocusable($value=true) {
58
-		if ($value === true)
58
+		if ($value===true)
59 59
 			$this->setProperty("tabindex", "0");
60 60
 		else {
61 61
 			$this->removeProperty("tabindex");
@@ -65,14 +65,14 @@  discard block
 block discarded – undo
65 65
 
66 66
 	public function setAnimated($content, $animation="") {
67 67
 		$this->setTagName("div");
68
-		$this->addToProperty("class", "animated " . $animation);
69
-		$visible=new HtmlSemDoubleElement("visible-" . $this->identifier, "div");
68
+		$this->addToProperty("class", "animated ".$animation);
69
+		$visible=new HtmlSemDoubleElement("visible-".$this->identifier, "div");
70 70
 		$visible->setClass("visible content");
71 71
 		$visible->setContent($this->content);
72
-		$hidden=new HtmlSemDoubleElement("hidden-" . $this->identifier, "div");
72
+		$hidden=new HtmlSemDoubleElement("hidden-".$this->identifier, "div");
73 73
 		$hidden->setClass("hidden content");
74 74
 		$hidden->setContent($content);
75
-		$this->content=array ($visible,$hidden );
75
+		$this->content=array($visible, $hidden);
76 76
 		return $hidden;
77 77
 	}
78 78
 
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 	public function asIcon($icon) {
85 85
 		$iconO=$icon;
86 86
 		if (\is_string($icon)) {
87
-			$iconO=new HtmlIcon("icon-" . $this->identifier, $icon);
87
+			$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
88 88
 		}
89 89
 		$this->addToProperty("class", "icon");
90 90
 		$this->content=$iconO;
@@ -105,9 +105,9 @@  discard block
 block discarded – undo
105 105
 	public function addLabel($caption, $before=false) {
106 106
 		$this->tagName="div";
107 107
 		$this->addToProperty("class", "labeled");
108
-		$this->content=new HtmlButton("button-" . $this->identifier, $this->content);
108
+		$this->content=new HtmlButton("button-".$this->identifier, $this->content);
109 109
 		$this->content->setTagName("div");
110
-		$label=new HtmlLabel("label-" . $this->identifier, $caption, "a");
110
+		$label=new HtmlLabel("label-".$this->identifier, $caption, "a");
111 111
 		$label->setBasic();
112 112
 		$this->addContent($label, $before);
113 113
 		return $label;
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 	 */
120 120
 	public function fromArray($array) {
121 121
 		$array=parent::fromArray($array);
122
-		foreach ( $array as $key => $value ) {
122
+		foreach ($array as $key => $value) {
123 123
 			$this->setProperty($key, $value);
124 124
 		}
125 125
 		return $array;
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 	}
183 183
 
184 184
 	public static function social($identifier, $social, $value=NULL) {
185
-		if ($value === NULL)
185
+		if ($value===NULL)
186 186
 			$value=\ucfirst($social);
187 187
 		$return=new HtmlButton($identifier, $value);
188 188
 		$return->addIcon($social);
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 	}
203 203
 
204 204
 	public function asLink($href=NULL) {
205
-		$lnk=new HtmlLink("lnk-".$this->identifier,$href,$this->content);
205
+		$lnk=new HtmlLink("lnk-".$this->identifier, $href, $this->content);
206 206
 		$this->content=$lnk;
207 207
 		return $this;
208 208
 	}
Please login to merge, or discard this patch.