Completed
Push — master ( a07245...010ee5 )
by Jean-Christophe
03:13
created
Ajax/common/html/BaseHtml.php 1 patch
Spacing   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -17,9 +17,9 @@  discard block
 block discarded – undo
17 17
 	use BaseHtmlEventsTrait;
18 18
 	protected $_template;
19 19
 	protected $tagName;
20
-	protected $properties=array ();
21
-	protected $_wrapBefore=array ();
22
-	protected $_wrapAfter=array ();
20
+	protected $properties=array();
21
+	protected $_wrapBefore=array();
22
+	protected $_wrapAfter=array();
23 23
 	protected $_bsComponent;
24 24
 
25 25
 	public function getBsComponent() {
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 	}
33 33
 
34 34
 	protected function getTemplate(JsUtils $js=NULL) {
35
-		return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js);
35
+		return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js);
36 36
 	}
37 37
 
38 38
 	public function getProperties() {
@@ -56,13 +56,13 @@  discard block
 block discarded – undo
56 56
 
57 57
 	public function addToProperty($name, $value, $separator=" ") {
58 58
 		if (\is_array($value)) {
59
-			foreach ( $value as $v ) {
59
+			foreach ($value as $v) {
60 60
 				$this->addToProperty($name, $v, $separator);
61 61
 			}
62
-		} else if ($value !== "" && $this->propertyContains($name, $value) === false) {
62
+		} else if ($value!=="" && $this->propertyContains($name, $value)===false) {
63 63
 			$v=@$this->properties[$name];
64
-			if (isset($v) && $v !== "")
65
-				$v=$v . $separator . $value;
64
+			if (isset($v) && $v!=="")
65
+				$v=$v.$separator.$value;
66 66
 			else
67 67
 				$v=$value;
68 68
 
@@ -78,19 +78,19 @@  discard block
 block discarded – undo
78 78
 
79 79
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
80 80
 		$result=$this->getTemplate($js);
81
-		foreach ( $this as $key => $value ) {
82
-			if (JString::startswith($key, "_") === false && $key !== "events") {
81
+		foreach ($this as $key => $value) {
82
+			if (JString::startswith($key, "_")===false && $key!=="events") {
83 83
 				if (is_array($value)) {
84 84
 					$v=PropertyWrapper::wrap($value, $js);
85 85
 				} else {
86 86
 					$v=$value;
87 87
 				}
88
-				$result=str_ireplace("%" . $key . "%", $v, $result);
88
+				$result=str_ireplace("%".$key."%", $v, $result);
89 89
 			}
90 90
 		}
91 91
 		if (isset($js)===true) {
92 92
 			$this->run($js);
93
-			if (isset($view) === true) {
93
+			if (isset($view)===true) {
94 94
 				$js->addViewElement($this->identifier, $result, $view);
95 95
 			}
96 96
 		}
@@ -99,12 +99,12 @@  discard block
 block discarded – undo
99 99
 
100 100
 	protected function ctrl($name, $value, $typeCtrl) {
101 101
 		if (is_array($typeCtrl)) {
102
-			if (array_search($value, $typeCtrl) === false) {
103
-				throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}");
102
+			if (array_search($value, $typeCtrl)===false) {
103
+				throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
104 104
 			}
105 105
 		} else {
106 106
 			if (!$typeCtrl($value)) {
107
-				throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name);
107
+				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
108 108
 			}
109 109
 		}
110 110
 		return true;
@@ -119,13 +119,13 @@  discard block
 block discarded – undo
119 119
 	}
120 120
 
121 121
 	protected function setPropertyCtrl($name, $value, $typeCtrl) {
122
-		if ($this->ctrl($name, $value, $typeCtrl) === true)
122
+		if ($this->ctrl($name, $value, $typeCtrl)===true)
123 123
 			return $this->setProperty($name, $value);
124 124
 		return $this;
125 125
 	}
126 126
 
127 127
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
128
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
128
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
129 129
 			return $name=$value;
130 130
 		}
131 131
 		return $this;
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
135 135
 		if (is_array($typeCtrl)) {
136 136
 			$this->removeOldValues($name, $typeCtrl);
137
-			$name.=$separator . $value;
137
+			$name.=$separator.$value;
138 138
 		}
139 139
 		return $this;
140 140
 	}
@@ -156,17 +156,17 @@  discard block
 block discarded – undo
156 156
 	}
157 157
 
158 158
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
159
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
159
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
160 160
 			if (is_array($typeCtrl)) {
161 161
 				$this->removeOldValues($name, $typeCtrl);
162 162
 			}
163
-			$name.=$separator . $value;
163
+			$name.=$separator.$value;
164 164
 		}
165 165
 		return $this;
166 166
 	}
167 167
 
168 168
 	protected function addToMember(&$name, $value, $separator=" ") {
169
-		$name=str_ireplace($value, "", $name) . $separator . $value;
169
+		$name=str_ireplace($value, "", $name).$separator.$value;
170 170
 		return $this;
171 171
 	}
172 172
 
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 	}
185 185
 
186 186
 	public function addToPropertyCtrlCheck($name, $value, $typeCtrl) {
187
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
187
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
188 188
 			return $this->addToProperty($name, $value);
189 189
 		}
190 190
 		return $this;
@@ -212,26 +212,26 @@  discard block
 block discarded – undo
212 212
 	}
213 213
 
214 214
 	public function fromArray($array) {
215
-		foreach ( $this as $key => $value ) {
216
-			if(array_key_exists($key, $array)===true)
217
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
215
+		foreach ($this as $key => $value) {
216
+			if (array_key_exists($key, $array)===true)
217
+				$this->_callSetter("set".ucfirst($key), $key, $array[$key], $array);
218 218
 		}
219
-		foreach ( $array as $key => $value ) {
220
-			if($this->_callSetter($key, $key, $value, $array)===false){
221
-				$this->_callSetter("set" . ucfirst($key), $key, $value, $array);
219
+		foreach ($array as $key => $value) {
220
+			if ($this->_callSetter($key, $key, $value, $array)===false) {
221
+				$this->_callSetter("set".ucfirst($key), $key, $value, $array);
222 222
 			}
223 223
 		}
224 224
 		return $array;
225 225
 	}
226 226
 
227
-	private function _callSetter($setter,$key,$value,&$array){
227
+	private function _callSetter($setter, $key, $value, &$array) {
228 228
 		$result=false;
229 229
 		if (method_exists($this, $setter) && !JString::startswith($key, "_")) {
230 230
 			try {
231 231
 				$this->$setter($value);
232 232
 				unset($array[$key]);
233 233
 				$result=true;
234
-			} catch ( \Exception $e ) {
234
+			}catch (\Exception $e) {
235 235
 				$result=false;
236 236
 			}
237 237
 		}
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 
241 241
 	public function fromDatabaseObjects($objects, $function) {
242 242
 		if (isset($objects)) {
243
-			foreach ( $objects as $object ) {
243
+			foreach ($objects as $object) {
244 244
 				$this->fromDatabaseObject($object, $function);
245 245
 			}
246 246
 		}
@@ -264,33 +264,33 @@  discard block
 block discarded – undo
264 264
 		if (is_array($elements)) {
265 265
 			$flag=false;
266 266
 			$index=0;
267
-			while ( !$flag && $index < sizeof($elements) ) {
267
+			while (!$flag && $index<sizeof($elements)) {
268 268
 				if ($elements[$index] instanceof BaseHtml)
269
-					$flag=($elements[$index]->getIdentifier() === $identifier);
269
+					$flag=($elements[$index]->getIdentifier()===$identifier);
270 270
 				$index++;
271 271
 			}
272
-			if ($flag === true)
273
-				return $elements[$index - 1];
272
+			if ($flag===true)
273
+				return $elements[$index-1];
274 274
 		} elseif ($elements instanceof BaseHtml) {
275
-			if ($elements->getIdentifier() === $identifier)
275
+			if ($elements->getIdentifier()===$identifier)
276 276
 				return $elements;
277 277
 		}
278 278
 		return null;
279 279
 	}
280 280
 
281
-	protected function getElementByPropertyValue($propertyName,$value, $elements) {
281
+	protected function getElementByPropertyValue($propertyName, $value, $elements) {
282 282
 		if (is_array($elements)) {
283 283
 			$flag=false;
284 284
 			$index=0;
285
-			while ( !$flag && $index < sizeof($elements) ) {
285
+			while (!$flag && $index<sizeof($elements)) {
286 286
 				if ($elements[$index] instanceof BaseHtml)
287
-					$flag=($elements[$index]->propertyContains($propertyName, $value) === true);
287
+					$flag=($elements[$index]->propertyContains($propertyName, $value)===true);
288 288
 					$index++;
289 289
 			}
290
-			if ($flag === true)
291
-				return $elements[$index - 1];
290
+			if ($flag===true)
291
+				return $elements[$index-1];
292 292
 		} elseif ($elements instanceof BaseHtml) {
293
-			if ($elements->propertyContains($propertyName, $value) === true)
293
+			if ($elements->propertyContains($propertyName, $value)===true)
294 294
 				return $elements;
295 295
 		}
296 296
 		return null;
Please login to merge, or discard this patch.
Ajax/common/html/html5/HtmlLinkTrait.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@
 block discarded – undo
4 4
 
5 5
 trait HtmlLinkTrait {
6 6
 
7
-	abstract public function setProperty($name,$value);
7
+	abstract public function setProperty($name, $value);
8 8
 	abstract public function getProperty($name);
9 9
 
10 10
 	public function setHref($value) {
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/BaseTrait.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
12 12
  * @property string $identifier
13 13
  */
14 14
 trait BaseTrait {
15
-	protected $_variations=[ ];
16
-	protected $_states=[ ];
15
+	protected $_variations=[];
16
+	protected $_states=[];
17 17
 	protected $_baseClass;
18 18
 
19 19
 	abstract protected function setPropertyCtrl($name, $value, $typeCtrl);
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 
27 27
 	abstract public function setProperty($name, $value);
28 28
 
29
-	abstract public function addContent($content,$before=false);
29
+	abstract public function addContent($content, $before=false);
30 30
 
31 31
 	abstract public function onCreate($jsCode);
32 32
 
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 		$this->setProperty("class", $this->_baseClass);
48 48
 		if (\is_string($variations))
49 49
 			$variations=\explode(" ", $variations);
50
-		foreach ( $variations as $variation ) {
50
+		foreach ($variations as $variation) {
51 51
 			$this->addVariation($variation);
52 52
 		}
53 53
 		return $this;
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 	public function addVariations($variations=array()) {
62 62
 		if (\is_string($variations))
63 63
 			$variations=\explode(" ", $variations);
64
-		foreach ( $variations as $variation ) {
64
+		foreach ($variations as $variation) {
65 65
 			$this->addVariation($variation);
66 66
 		}
67 67
 		return $this;
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 	public function addStates($states=array()) {
71 71
 		if (\is_string($states))
72 72
 			$states=\explode(" ", $states);
73
-		foreach ( $states as $state ) {
73
+		foreach ($states as $state) {
74 74
 			$this->addState($state);
75 75
 		}
76 76
 		return $this;
@@ -80,17 +80,17 @@  discard block
 block discarded – undo
80 80
 		$this->setProperty("class", $this->_baseClass);
81 81
 		if (\is_string($states))
82 82
 			$states=\explode(" ", $states);
83
-		foreach ( $states as $state ) {
83
+		foreach ($states as $state) {
84 84
 			$this->addState($state);
85 85
 		}
86 86
 		return $this;
87 87
 	}
88 88
 
89 89
 	public function addIcon($icon, $before=true) {
90
-		return $this->addContent(new HtmlIcon("icon-" . $this->identifier, $icon), $before);
90
+		return $this->addContent(new HtmlIcon("icon-".$this->identifier, $icon), $before);
91 91
 	}
92 92
 
93
-	public function addSticky($context="body"){
93
+	public function addSticky($context="body") {
94 94
 		$this->onCreate("$('#".$this->identifier."').sticky({ context: '".$context."'});");
95 95
 		return $this;
96 96
 	}
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 	 *
135 135
 	 * @return \Ajax\semantic\html\base\HtmlSemDoubleElement
136 136
 	 */
137
-	public function asHeader(){
137
+	public function asHeader() {
138 138
 		return $this->addToProperty("class", "header");
139 139
 	}
140 140
 
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 	 * show it is currently the active user selection
143 143
 	 * @return \Ajax\semantic\html\base\HtmlSemDoubleElement
144 144
 	 */
145
-	public function setActive($value=true){
145
+	public function setActive($value=true) {
146 146
 		return $this->addToProperty("class", "active");
147 147
 	}
148 148
 
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 	}
159 159
 
160 160
 	public function setFloated($direction="right") {
161
-		return $this->addToPropertyCtrl("class", $direction . " floated", Direction::getConstantValues("floated"));
161
+		return $this->addToPropertyCtrl("class", $direction." floated", Direction::getConstantValues("floated"));
162 162
 	}
163 163
 
164 164
 	public function floatRight() {
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/AttachedTrait.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,8 +14,8 @@
 block discarded – undo
14 14
 	 */
15 15
 	public function setAttachment($toElement, $side=Side::BOTH) {
16 16
 		if (isset($toElement)) {
17
-			$toElement->addToPropertyCtrl("class", "attached", array ("attached" ));
17
+			$toElement->addToPropertyCtrl("class", "attached", array("attached"));
18 18
 		}
19
-		return $this->addToPropertyCtrl("class", $side . " attached", Side::getConstantValues("attached"));
19
+		return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached"));
20 20
 	}
21 21
 }
22 22
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/LabeledIconTrait.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 trait LabeledIconTrait {
14 14
 
15 15
 	abstract public function addToProperty($name, $value, $separator=" ");
16
-	abstract public function addContent($content,$before=false);
16
+	abstract public function addContent($content, $before=false);
17 17
 
18 18
 	/**
19 19
 	 * Adds an icon before or after
@@ -22,17 +22,17 @@  discard block
 block discarded – undo
22 22
 	 * @param boolean $labeled
23 23
 	 * @return \Ajax\semantic\html\elements\HtmlIcon
24 24
 	 */
25
-	public function addIcon($icon,$before=true,$labeled=false){
25
+	public function addIcon($icon, $before=true, $labeled=false) {
26 26
 		$iconO=$icon;
27
-		if(\is_string($icon)){
27
+		if (\is_string($icon)) {
28 28
 			$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
29 29
 		}
30
-		if($labeled!==false){
31
-			$direction=($before===true)?Direction::LEFT:Direction::RIGHT;
30
+		if ($labeled!==false) {
31
+			$direction=($before===true) ? Direction::LEFT : Direction::RIGHT;
32 32
 			$this->addToProperty("class", $direction." labeled icon");
33 33
 			$this->tagName="div";
34 34
 		}
35
-		$this->addContent($iconO,$before);
35
+		$this->addContent($iconO, $before);
36 36
 		return $iconO;
37 37
 	}
38 38
 }
39 39
\ No newline at end of file
Please login to merge, or discard this patch.