Completed
Push — master ( b9b816...db82f0 )
by Jean-Christophe
05:53 queued 02:39
created
Ajax/common/components/GenericComponent.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@
 block discarded – undo
9 9
 	 * @see \Ajax\bootstrap\components\SimpleBsComponent::getScript()
10 10
 	 */
11 11
 	public function getScript() {
12
-		$this->jquery_code_for_compile=array ();
13
-		foreach ( $this->jsCodes as $jsCode ) {
14
-			$this->jquery_code_for_compile []=$jsCode->compile(array (
12
+		$this->jquery_code_for_compile=array();
13
+		foreach ($this->jsCodes as $jsCode) {
14
+			$this->jquery_code_for_compile []=$jsCode->compile(array(
15 15
 					"identifier" => $this->attachTo 
16 16
 			));
17 17
 		}
Please login to merge, or discard this patch.
Ajax/common/components/SimpleComponent.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -16,11 +16,11 @@  discard block
 block discarded – undo
16 16
 
17 17
 	public function __construct(JsUtils $js) {
18 18
 		parent::__construct($js);
19
-		$this->events=array ();
19
+		$this->events=array();
20 20
 	}
21 21
 
22 22
 	protected function compileEvents() {
23
-		foreach ( $this->events as $event => $jsCode ) {
23
+		foreach ($this->events as $event => $jsCode) {
24 24
 			$this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});";
25 25
 		}
26 26
 	}
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 		$result=implode("\n", $this->jquery_code_for_compile);
30 30
 		$result=str_ireplace("\"%", "", $result);
31 31
 		$result=str_ireplace("%\"", "", $result);
32
-		$result=str_replace(array (
32
+		$result=str_replace(array(
33 33
 				"\\n",
34 34
 				"\\r",
35 35
 				"\\t" 
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 
40 40
 	public function getScript() {
41 41
 		$allParams=$this->params;
42
-		$this->jquery_code_for_compile=array ();
42
+		$this->jquery_code_for_compile=array();
43 43
 		$this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).");";
44 44
 		$this->compileEvents();
45 45
 		return $this->compileJQueryCode();
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 		if (is_array($typeCtrl)) {
67 67
 			if (array_search($value, $typeCtrl)===false)
68 68
 				throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
69
-		} else {
69
+		}else {
70 70
 			if (!$typeCtrl($value)) {
71 71
 				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." au composant ".$this->uiName);
72 72
 			}
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlContainer.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -17,13 +17,13 @@
 block discarded – undo
17 17
 		$this->setProperty("class", "ui container");
18 18
 	}
19 19
 
20
-	public function setAlignement($value="justified"){
21
-		if($value!=="justified")
20
+	public function setAlignement($value="justified") {
21
+		if ($value!=="justified")
22 22
 			$value.=" aligned";
23 23
 		return $this->addToProperty("class", $value);
24 24
 	}
25 25
 
26
-	public function setTextContainer(){
26
+	public function setTextContainer() {
27 27
 		return $this->addToProperty("class", "text");
28 28
 	}
29 29
 }
30 30
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlIconGroups.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -11,22 +11,22 @@
 block discarded – undo
11 11
  */
12 12
 class HtmlIconGroups extends HtmlSemDoubleElement {
13 13
 
14
-	public function __construct($identifier,$size="") {
14
+	public function __construct($identifier, $size="") {
15 15
 		parent::__construct($identifier, "i");
16 16
 		$this->setProperty("class", "icons");
17 17
 		$this->setSize($size);
18 18
 	}
19 19
 
20
-	public function add($icon,$size=""){
20
+	public function add($icon, $size="") {
21 21
 		$iconO=$icon;
22
-		if(\is_string($icon)){
22
+		if (\is_string($icon)) {
23 23
 			$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
24 24
 			$iconO->setSize($size);
25 25
 		}
26 26
 		$this->addContent($iconO);
27 27
 	}
28 28
 
29
-	public function getIcon($index){
29
+	public function getIcon($index) {
30 30
 		return $this->content[$index];
31 31
 	}
32 32
 }
33 33
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/content/InternalPopup.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -11,11 +11,11 @@  discard block
 block discarded – undo
11 11
 	protected $variation;
12 12
 	protected $params;
13 13
 	protected $semElement;
14
-	public function __construct($semElement,$title="",$content="",$variation=NULL,$params=array()){
14
+	public function __construct($semElement, $title="", $content="", $variation=NULL, $params=array()) {
15 15
 		$this->semElement=$semElement;
16 16
 		$this->title=$title;
17 17
 		$this->content=$content;
18
-		$this->setAttributes($variation,$params);
18
+		$this->setAttributes($variation, $params);
19 19
 	}
20 20
 
21 21
 	public function setHtml($html) {
@@ -23,32 +23,32 @@  discard block
 block discarded – undo
23 23
 		return $this;
24 24
 	}
25 25
 
26
-	public function setAttributes($variation=NULL,$params=array()){
26
+	public function setAttributes($variation=NULL, $params=array()) {
27 27
 		$this->variation=$variation;
28 28
 		$this->params=$params;
29 29
 	}
30 30
 
31
-	public function onShow($jsCode){
31
+	public function onShow($jsCode) {
32 32
 		$this->params["onShow"]=$jsCode;
33 33
 	}
34 34
 
35
-	public function compile(){
36
-		if(JString::isNotNull($this->title)){
35
+	public function compile() {
36
+		if (JString::isNotNull($this->title)) {
37 37
 			$this->semElement->addToProperty("data-title", $this->title);
38 38
 		}
39
-		if(JString::isNotNull($this->content)){
39
+		if (JString::isNotNull($this->content)) {
40 40
 			$this->semElement->addToProperty("data-content", $this->content);
41 41
 		}
42
-		if(JString::isNotNull($this->html)){
42
+		if (JString::isNotNull($this->html)) {
43 43
 			$this->semElement->addToProperty("data-html", $this->html);
44 44
 		}
45
-		if(JString::isNotNull($this->variation)){
45
+		if (JString::isNotNull($this->variation)) {
46 46
 			$this->semElement->addToProperty("data-variation", $this->variation);
47 47
 		}
48 48
 	}
49 49
 
50
-	public function run(JsUtils $js){
51
-		$js->semantic()->popup("#".$this->semElement->getIdentifier(),$this->params);
50
+	public function run(JsUtils $js) {
51
+		$js->semantic()->popup("#".$this->semElement->getIdentifier(), $this->params);
52 52
 	}
53 53
 
54 54
 }
55 55
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/components/Dropdown.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 	 * @param string $action one of "select","auto","activate","combo","nothing","hide"
18 18
 	 * @return \Ajax\semantic\components\Dropdown
19 19
 	 */
20
-	public function setAction($action){
21
-		return $this->setParamCtrl("action", $action,array("select","auto","activate","combo","nothing","hide"));
20
+	public function setAction($action) {
21
+		return $this->setParamCtrl("action", $action, array("select", "auto", "activate", "combo", "nothing", "hide"));
22 22
 	}
23 23
 }
24 24
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/content/HtmlDropdownItem.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -10,30 +10,30 @@  discard block
 block discarded – undo
10 10
 
11 11
 class HtmlDropdownItem extends HtmlSemDoubleElement {
12 12
 
13
-	public function __construct($identifier, $content="",$value=NULL,$image=NULL) {
13
+	public function __construct($identifier, $content="", $value=NULL, $image=NULL) {
14 14
 		parent::__construct($identifier, "div");
15 15
 		$this->setClass("item");
16 16
 		$this->setContent($content);
17
-		if($value!==NULL)
17
+		if ($value!==NULL)
18 18
 			$this->setData($value);
19
-		if($image!==NULL)
19
+		if ($image!==NULL)
20 20
 			$this->asMiniAvatar($image);
21 21
 	}
22 22
 
23
-	public function setDescription($description){
24
-		$descO=new HtmlDoubleElement("desc-".$this->identifier,"span");
23
+	public function setDescription($description) {
24
+		$descO=new HtmlDoubleElement("desc-".$this->identifier, "span");
25 25
 		$descO->setClass("description");
26 26
 		$descO->setContent($description);
27
-		return $this->addContent($descO,true);
27
+		return $this->addContent($descO, true);
28 28
 	}
29 29
 
30
-	public function setData($value){
30
+	public function setData($value) {
31 31
 		$this->setProperty("data-value", $value);
32 32
 	}
33 33
 
34
-	public function asOption(){
34
+	public function asOption() {
35 35
 		$this->tagName="option";
36
-		if($this->getProperty("data-value")!==null)
36
+		if ($this->getProperty("data-value")!==null)
37 37
 			$this->setProperty("value", $this->getProperty("data-value"));
38 38
 	}
39 39
 
@@ -41,58 +41,58 @@  discard block
 block discarded – undo
41 41
 	 * @param string $image the image src
42 42
 	 * @return \Ajax\common\html\html5\HtmlImg
43 43
 	 */
44
-	public function asMiniAvatar($image){
44
+	public function asMiniAvatar($image) {
45 45
 		$this->tagName="div";
46
-		$img=new HtmlImg("image-".$this->identifier,$image);
46
+		$img=new HtmlImg("image-".$this->identifier, $image);
47 47
 		$img->setClass("ui mini avatar image");
48
-		$this->addContent($img,true);
48
+		$this->addContent($img, true);
49 49
 		return $img;
50 50
 	}
51 51
 
52
-	public function asSearchInput($placeholder=NULL,$icon=NULL){
52
+	public function asSearchInput($placeholder=NULL, $icon=NULL) {
53 53
 		$this->setClass("ui icon search input");
54 54
 		$input=new HtmlInput("search-".$this->identifier);
55
-		if(isset($placeholder))
55
+		if (isset($placeholder))
56 56
 			$input->setProperty("placeholder", $placeholder);
57 57
 		$this->content=$input;
58
-		if(isset($icon))
58
+		if (isset($icon))
59 59
 			$this->addIcon($icon);
60 60
 		return $this;
61 61
 	}
62 62
 
63
-	public function setContent($content){
64
-		if($content==="-"){
63
+	public function setContent($content) {
64
+		if ($content==="-") {
65 65
 			$this->asDivider();
66
-		}elseif($content==="-search-"){
67
-			$values=\explode(",",$content,-1);
68
-			$this->asSearchInput(JArray::getDefaultValue($values, 0, "Search..."),JArray::getDefaultValue($values, 1, "search"));
66
+		}elseif ($content==="-search-") {
67
+			$values=\explode(",", $content, -1);
68
+			$this->asSearchInput(JArray::getDefaultValue($values, 0, "Search..."), JArray::getDefaultValue($values, 1, "search"));
69 69
 		}else
70 70
 			parent::setContent($content);
71 71
 		return $this;
72 72
 	}
73 73
 
74
-	public function asDivider(){
74
+	public function asDivider() {
75 75
 		$this->content=NULL;
76 76
 		$this->setClass("divider");
77 77
 	}
78 78
 
79
-	public function asHeader($caption=NULL,$icon=NULL){
79
+	public function asHeader($caption=NULL, $icon=NULL) {
80 80
 		$this->setClass("header");
81 81
 		$this->content=$caption;
82
-		if(isset($icon))
83
-			$this->addIcon($icon,true);
82
+		if (isset($icon))
83
+			$this->addIcon($icon, true);
84 84
 		return $this;
85 85
 	}
86 86
 
87
-	public static function searchInput($placeholder=NULL,$icon=NULL){
88
-		return (new HtmlDropdownItem(""))->asSearchInput($placeholder,$icon);
87
+	public static function searchInput($placeholder=NULL, $icon=NULL) {
88
+		return (new HtmlDropdownItem(""))->asSearchInput($placeholder, $icon);
89 89
 	}
90 90
 
91
-	public static function divider($placeholder=NULL,$icon=NULL){
91
+	public static function divider($placeholder=NULL, $icon=NULL) {
92 92
 		return (new HtmlDropdownItem(""))->asDivider();
93 93
 	}
94 94
 
95
-	public static function header($caption=NULL,$icon=NULL){
96
-		return (new HtmlDropdownItem(""))->asHeader($caption,$icon);
95
+	public static function header($caption=NULL, $icon=NULL) {
96
+		return (new HtmlDropdownItem(""))->asHeader($caption, $icon);
97 97
 	}
98 98
 }
99 99
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/common/html/BaseHtml.php 1 patch
Spacing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -16,8 +16,8 @@  discard block
 block discarded – undo
16 16
 abstract class BaseHtml extends BaseWidget {
17 17
 	protected $_template;
18 18
 	protected $tagName;
19
-	protected $properties=array ();
20
-	protected $events=array ();
19
+	protected $properties=array();
20
+	protected $events=array();
21 21
 	protected $wrapBefore="";
22 22
 	protected $wrapAfter="";
23 23
 	protected $_bsComponent;
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 
57 57
 	public function addToProperty($name, $value, $separator=" ") {
58 58
 		$v=@$this->properties[$name];
59
-		if (isset($v)&&$v!=="")
59
+		if (isset($v) && $v!=="")
60 60
 			$v=$v.$separator.$value;
61 61
 		else
62 62
 			$v=$value;
@@ -71,11 +71,11 @@  discard block
 block discarded – undo
71 71
 
72 72
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
73 73
 		$result=$this->getTemplate();
74
-		foreach ( $this as $key => $value ) {
75
-			if (PhalconUtils::startsWith($key, "_")===false&&$key!=="events") {
74
+		foreach ($this as $key => $value) {
75
+			if (PhalconUtils::startsWith($key, "_")===false && $key!=="events") {
76 76
 				if (is_array($value)) {
77 77
 					$v=PropertyWrapper::wrap($value, $js);
78
-				} else {
78
+				}else {
79 79
 					$v=$value;
80 80
 				}
81 81
 				$result=str_ireplace("%".$key."%", $v, $result);
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 		if (isset($view)===true) {
88 88
 			$controls=$view->getVar("q");
89 89
 			if (isset($controls)===false) {
90
-				$controls=array ();
90
+				$controls=array();
91 91
 			}
92 92
 			$controls [$this->identifier]=$result;
93 93
 			$view->setVar("q", $controls);
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 			if (array_search($value, $typeCtrl)===false) {
101 101
 				throw new \Exception("La valeur passée a propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
102 102
 			}
103
-		} else {
103
+		}else {
104 104
 			if (!$typeCtrl($value)) {
105 105
 				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
106 106
 			}
@@ -108,9 +108,9 @@  discard block
 block discarded – undo
108 108
 		return true;
109 109
 	}
110 110
 
111
-	protected function propertyContains($propertyName,$value){
111
+	protected function propertyContains($propertyName, $value) {
112 112
 		$values=$this->getProperty($propertyName);
113
-		if(isset($values)){
113
+		if (isset($values)) {
114 114
 			return JString::contains($values, $value);
115 115
 		}
116 116
 		return false;
@@ -185,28 +185,28 @@  discard block
 block discarded – undo
185 185
 	}
186 186
 
187 187
 	public function fromArray($array) {
188
-		foreach ( $this as $key => $value ) {
188
+		foreach ($this as $key => $value) {
189 189
 			if (array_key_exists($key, $array) && !PhalconUtils::startsWith($key, "_")) {
190 190
 					$setter="set".ucfirst($key);
191 191
 					$this->$setter($array [$key]);
192 192
 				unset($array [$key]);
193 193
 			}
194 194
 		}
195
-		foreach ( $array as $key => $value ) {
195
+		foreach ($array as $key => $value) {
196 196
 			if (method_exists($this, $key)) {
197 197
 				try {
198 198
 					$this->$key($value);
199 199
 					unset($array [$key]);
200
-				} catch ( \Exception $e ) {
200
+				} catch (\Exception $e) {
201 201
 					// Nothing to do
202 202
 				}
203
-			} else {
203
+			}else {
204 204
 				$setter="set".ucfirst($key);
205 205
 				if (method_exists($this, $setter)) {
206 206
 					try {
207 207
 						$this->$setter($value);
208 208
 						unset($array [$key]);
209
-					} catch ( \Exception $e ) {
209
+					} catch (\Exception $e) {
210 210
 						// Nothing to do
211 211
 					}
212 212
 				}
@@ -215,21 +215,21 @@  discard block
 block discarded – undo
215 215
 		return $array;
216 216
 	}
217 217
 
218
-	public function fromDatabaseObjects($objects,$function) {
219
-		if(isset($objects)){
220
-			foreach ($objects as $object){
221
-				$this->fromDatabaseObject($object,$function);
218
+	public function fromDatabaseObjects($objects, $function) {
219
+		if (isset($objects)) {
220
+			foreach ($objects as $object) {
221
+				$this->fromDatabaseObject($object, $function);
222 222
 			}
223 223
 		}
224 224
 		return $this;
225 225
 	}
226 226
 
227
-	public function fromDatabaseObject($object,$function){
227
+	public function fromDatabaseObject($object, $function) {
228 228
 
229 229
 	}
230 230
 
231 231
 	public function wrap($before, $after="") {
232
-		if(isset($before)){
232
+		if (isset($before)) {
233 233
 			$this->wrapBefore.=$before;
234 234
 		}
235 235
 		$this->wrapAfter=$after.$this->wrapAfter;
@@ -251,13 +251,13 @@  discard block
 block discarded – undo
251 251
 		if (array_key_exists($event, $this->events)) {
252 252
 			if (is_array($this->events [$event])) {
253 253
 				$this->events [$event] []=$jsCode;
254
-			} else {
255
-				$this->events [$event]=array (
254
+			}else {
255
+				$this->events [$event]=array(
256 256
 						$this->events [$event],
257 257
 						$jsCode
258 258
 				);
259 259
 			}
260
-		} else {
260
+		}else {
261 261
 			$this->events [$event]=$jsCode;
262 262
 		}
263 263
 	}
@@ -276,14 +276,14 @@  discard block
 block discarded – undo
276 276
 
277 277
 	public function addEventsOnRun(JsUtils $js) {
278 278
 		if (isset($this->_bsComponent)) {
279
-			foreach ( $this->events as $event => $jsCode ) {
279
+			foreach ($this->events as $event => $jsCode) {
280 280
 				$code=$jsCode;
281 281
 				if (is_array($jsCode)) {
282 282
 					$code="";
283
-					foreach ( $jsCode as $jsC ) {
283
+					foreach ($jsCode as $jsC) {
284 284
 						if ($jsC instanceof AjaxCall) {
285 285
 							$code.="\n".$jsC->compile($js);
286
-						} else {
286
+						}else {
287 287
 							$code.="\n".$jsC;
288 288
 						}
289 289
 					}
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
 	}
298 298
 
299 299
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
300
-		$params=array (
300
+		$params=array(
301 301
 				"url" => $url,
302 302
 				"responseElement" => $responseElement
303 303
 		);
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
 		if (is_array($elements)) {
337 337
 			$flag=false;
338 338
 			$index=0;
339
-			while ( !$flag&&$index<sizeof($elements) ) {
339
+			while (!$flag && $index<sizeof($elements)) {
340 340
 				if ($elements [$index] instanceof BaseHtml)
341 341
 					$flag=($elements [$index]->getIdentifier()===$identifier);
342 342
 				$index++;
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
 		return null;
351 351
 	}
352 352
 
353
-	public function __toString(){
353
+	public function __toString() {
354 354
 		return $this->compile();
355 355
 	}
356 356
 
@@ -366,25 +366,25 @@  discard block
 block discarded – undo
366 366
 		if (is_array($value)) {
367 367
 			$value=implode(",", $value);
368 368
 		}
369
-		if (strrpos($value, 'this')===false&&strrpos($value, 'event')===false) {
369
+		if (strrpos($value, 'this')===false && strrpos($value, 'event')===false) {
370 370
 			$value='"'.$value.'"';
371 371
 		}
372 372
 		return $value;
373 373
 	}
374 374
 
375
-	public function jsDoJquery($jqueryCall, $param=""){
375
+	public function jsDoJquery($jqueryCall, $param="") {
376 376
 		return "$('#".$this->identifier."').".$jqueryCall."(".$this->_prep_value($param).");";
377 377
 	}
378 378
 
379
-	public function jsHtml($content=""){
380
-		return $this->jsDoJquery("html",$content);
379
+	public function jsHtml($content="") {
380
+		return $this->jsDoJquery("html", $content);
381 381
 	}
382 382
 
383
-	public function jsShow(){
383
+	public function jsShow() {
384 384
 		return $this->jsDoJquery("show");
385 385
 	}
386 386
 
387
-	public function jsHide(){
387
+	public function jsHide() {
388 388
 		return $this->jsDoJquery("hide");
389 389
 	}
390 390
 }
391 391
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/service/JString.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,21 +2,21 @@
 block discarded – undo
2 2
 namespace Ajax\service;
3 3
 class JString {
4 4
 
5
-	public static function contains($hay,$needle){
6
-		return strpos($hay, $needle) !== false;
5
+	public static function contains($hay, $needle) {
6
+		return strpos($hay, $needle)!==false;
7 7
 	}
8 8
 	public static function startswith($hay, $needle) {
9
-		return substr($hay, 0, strlen($needle)) === $needle;
9
+		return substr($hay, 0, strlen($needle))===$needle;
10 10
 	}
11 11
 
12 12
 	public static function endswith($hay, $needle) {
13
-		return substr($hay, -strlen($needle)) === $needle;
13
+		return substr($hay, -strlen($needle))===$needle;
14 14
 	}
15 15
 
16
-	public static function isNull($s){
16
+	public static function isNull($s) {
17 17
 		return (!isset($s) || NULL===$s || ""===$s);
18 18
 	}
19
-	public static function isNotNull($s){
19
+	public static function isNotNull($s) {
20 20
 		return (isset($s) && NULL!==$s && ""!==$s);
21 21
 	}
22 22
 }
23 23
\ No newline at end of file
Please login to merge, or discard this patch.