Completed
Push — master ( 6e3264...0dd83f )
by Jean-Christophe
03:39
created
Ajax/ui/properties/Animation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
 	 * @param string $value default : swing
31 31
 	 */
32 32
 	public function setEasing($value) {
33
-		$this->setParamCtrl("easing", $value, array (
33
+		$this->setParamCtrl("easing", $value, array(
34 34
 				"linear",
35 35
 				"swing",
36 36
 				"easeInQuad",
Please login to merge, or discard this patch.
Ajax/ui/properties/Position.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
 	protected function setParamCtrl($key, $value, $typeCtrl) {
75 75
 		if (!$typeCtrl($value)) {
76 76
 			throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." à la position");
77
-		} else
77
+		}else
78 78
 			$this->setParam($key, $value);
79 79
 	}
80 80
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -74,8 +74,9 @@
 block discarded – undo
74 74
 	protected function setParamCtrl($key, $value, $typeCtrl) {
75 75
 		if (!$typeCtrl($value)) {
76 76
 			throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." à la position");
77
-		} else
78
-			$this->setParam($key, $value);
77
+		} else {
78
+					$this->setParam($key, $value);
79
+		}
79 80
 	}
80 81
 
81 82
 	/*
Please login to merge, or discard this patch.
Ajax/bootstrap/html/base/HtmlNavElement.php 2 patches
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,6 +20,10 @@  discard block
 block discarded – undo
20 20
 	protected $attr;
21 21
 	
22 22
 	
23
+	/**
24
+	 * @param string $identifier
25
+	 * @param string $tagName
26
+	 */
23 27
 	public function __construct($identifier,$tagName){
24 28
 		parent::__construct($identifier,$tagName);
25 29
 		$this->root="";
@@ -30,7 +34,6 @@  discard block
 block discarded – undo
30 34
 	 * Associate an ajax get to the elements, displayed in $targetSelector
31 35
 	 * $attr member is used to build each element url
32 36
 	 * @param string $targetSelector the target of the get
33
-	 * @param string $attr the html attribute used to build the elements url
34 37
 	 * @return HtmlNavElement
35 38
 	 */
36 39
 	public function autoGetOnClick($targetSelector){
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -20,8 +20,8 @@  discard block
 block discarded – undo
20 20
 	protected $attr;
21 21
 	
22 22
 	
23
-	public function __construct($identifier,$tagName){
24
-		parent::__construct($identifier,$tagName);
23
+	public function __construct($identifier, $tagName) {
24
+		parent::__construct($identifier, $tagName);
25 25
 		$this->root="";
26 26
 		$this->attr="data-ajax";
27 27
 	}
@@ -33,11 +33,11 @@  discard block
 block discarded – undo
33 33
 	 * @param string $attr the html attribute used to build the elements url
34 34
 	 * @return HtmlNavElement
35 35
 	 */
36
-	public function autoGetOnClick($targetSelector){
37
-		return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr));
36
+	public function autoGetOnClick($targetSelector) {
37
+		return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr));
38 38
 	}
39 39
 	
40
-	public function contentAsString(){
40
+	public function contentAsString() {
41 41
 		return implode("", $this->content);
42 42
 	}
43 43
 	
@@ -45,15 +45,15 @@  discard block
 block discarded – undo
45 45
 	 * Generate the jquery script to set the elements to the HtmlNavElement
46 46
 	 * @param JsUtils $jsUtils
47 47
 	 */
48
-	public function jsSetContent(JsUtils $jsUtils){
49
-		$jsUtils->html("#".$this->identifier,str_replace("\"","'", $this->contentAsString()),true);
48
+	public function jsSetContent(JsUtils $jsUtils) {
49
+		$jsUtils->html("#".$this->identifier, str_replace("\"", "'", $this->contentAsString()), true);
50 50
 	}
51 51
 	
52 52
 	public function getRoot() {
53 53
 		return $this->root;
54 54
 	}
55 55
 	public function setRoot($root) {
56
-		$this->root = $root;
56
+		$this->root=$root;
57 57
 		return $this;
58 58
 	}
59 59
 	public function getAttr() {
@@ -66,12 +66,12 @@  discard block
 block discarded – undo
66 66
 	 * @return HtmlNavElement
67 67
 	 */
68 68
 	public function setAttr($attr) {
69
-		$this->attr = $attr;
69
+		$this->attr=$attr;
70 70
 		return $this;
71 71
 	}
72 72
 
73 73
 	public function __call($method, $args) {
74
-		if(isset($this->$method) && is_callable($this->$method)) {
74
+		if (isset($this->$method) && is_callable($this->$method)) {
75 75
 			return call_user_func_array(
76 76
 					$this->$method,
77 77
 					$args
Please login to merge, or discard this patch.
Ajax/Bootstrap.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -268,8 +268,8 @@  discard block
 block discarded – undo
268 268
 	 * @param string $tagName container tagName
269 269
 	 * @return HtmlListgroup
270 270
 	 */
271
-	public function htmlListgroup($identifier,$items=array(),$tagName="ul"){
272
-		$listGroup=new HtmlListgroup($identifier,$tagName);
271
+	public function htmlListgroup($identifier, $items=array(), $tagName="ul") {
272
+		$listGroup=new HtmlListgroup($identifier, $tagName);
273 273
 		$listGroup->addItems($items);
274 274
 		return $this->addHtmlComponent($listGroup);
275 275
 	}
@@ -294,8 +294,8 @@  discard block
 block discarded – undo
294 294
 	 * @param string $onClick
295 295
 	 * @return HtmlSplitbutton
296 296
 	 */
297
-	public function htmlSplitbutton($identifier,$value="", $items=array(), $cssStyle="btn-default", $onClick=NULL) {
298
-		return $this->addHtmlComponent(new HtmlSplitbutton($identifier, $value, $items, $cssStyle,$onClick));
297
+	public function htmlSplitbutton($identifier, $value="", $items=array(), $cssStyle="btn-default", $onClick=NULL) {
298
+		return $this->addHtmlComponent(new HtmlSplitbutton($identifier, $value, $items, $cssStyle, $onClick));
299 299
 	}
300 300
 
301 301
 	/**
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
 	 * @param string $identifier
304 304
 	 * @return HtmlInputgroup
305 305
 	 */
306
-	public function htmlInputgroup($identifier){
306
+	public function htmlInputgroup($identifier) {
307 307
 		return $this->addHtmlComponent(new HtmlInputgroup($identifier));
308 308
 	}
309 309
 	
@@ -315,8 +315,8 @@  discard block
 block discarded – undo
315 315
 	 * @param function $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()}
316 316
 	 * @return HtmlBreadcrumbs
317 317
 	 */
318
-	public function htmlBreadcrumbs($identifier,$elements=array(),$autoActive=true,$hrefFunction=NULL){
319
-		return $this->addHtmlComponent(new HtmlBreadcrumbs($identifier,$elements,$autoActive,$hrefFunction));
318
+	public function htmlBreadcrumbs($identifier, $elements=array(), $autoActive=true, $hrefFunction=NULL) {
319
+		return $this->addHtmlComponent(new HtmlBreadcrumbs($identifier, $elements, $autoActive, $hrefFunction));
320 320
 	}
321 321
 	
322 322
 	/**
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
 	 * @param int $active The active page
329 329
 	 * @return HtmlPagination
330 330
 	 */
331
-	public function htmlPagination($identifier,$from=1,$to=1,$active=NULL,$countVisible=NULL){
332
-		return $this->addHtmlComponent(new HtmlPagination($identifier,$from,$to,$active,$countVisible));
331
+	public function htmlPagination($identifier, $from=1, $to=1, $active=NULL, $countVisible=NULL) {
332
+		return $this->addHtmlComponent(new HtmlPagination($identifier, $from, $to, $active, $countVisible));
333 333
 	}
334 334
 }
335 335
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlGlyphicon.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -149,7 +149,7 @@
 block discarded – undo
149 149
 		$glyph->setGlyphicon($glyphicon);
150 150
 		if ($left) {
151 151
 			$this->content=$glyph->compile().$separator.$this->content;
152
-		} else {
152
+		}else {
153 153
 			$this->content.=$separator.$glyph->compile();
154 154
 		}
155 155
 		return $this;
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlPagination.php 2 patches
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -45,70 +45,70 @@  discard block
 block discarded – undo
45 45
 	/**
46 46
 	 * @param string $identifier
47 47
 	 */
48
-	public function __construct($identifier,$from=1,$to=1,$active=NULL,$countVisible=NULL){
49
-		parent::__construct($identifier,"ul");
48
+	public function __construct($identifier, $from=1, $to=1, $active=NULL, $countVisible=NULL) {
49
+		parent::__construct($identifier, "ul");
50 50
 		$this->setProperty("class", "pagination");
51 51
 		$this->active=$active;
52 52
 		$this->from=$from;
53 53
 		$this->to=$to;
54 54
 		$this->urlMask="%page%";
55
-		if(!isset($countVisible))
55
+		if (!isset($countVisible))
56 56
 			$this->countVisible=$to-$from+1;
57 57
 		else
58 58
 			$this->countVisible=$countVisible;
59 59
 		$this->createContent();
60 60
 	}
61 61
 	
62
-	private function createElement($num,$content,$disabled=false,$current=false){
62
+	private function createElement($num, $content, $disabled=false, $current=false) {
63 63
 		$count=sizeof($this->content)+1;
64
-		$elem=new HtmlDoubleElement("li-".$this->identifier."-".$count,"li");
65
-		if($disabled){
64
+		$elem=new HtmlDoubleElement("li-".$this->identifier."-".$count, "li");
65
+		if ($disabled) {
66 66
 			$elem->setProperty("class", "disabled");
67 67
 		}
68
-		if($current){
68
+		if ($current) {
69 69
 			$content.="<span class='sr-only'>(current)</span>";
70 70
 			$elem->setProperty("class", "active");
71 71
 		}
72
-		if(!$disabled){
72
+		if (!$disabled) {
73 73
 			$url=$this->getUrl($num);
74
-			$href=new HtmlLink("a-".$this->identifier."-".$count,$url,$content);
74
+			$href=new HtmlLink("a-".$this->identifier."-".$count, $url, $content);
75 75
 			$href->setProperty($this->attr, $url);
76 76
 			$elem->setContent($href);
77
-		}else{
77
+		}else {
78 78
 			$elem->setContent($content);
79 79
 		}
80 80
 		$this->content[]=$elem;
81 81
 		return $this;
82 82
 	}
83 83
 	
84
-	protected function createContent(){
84
+	protected function createContent() {
85 85
 		$this->content=array();
86
-		$this->createElement($this->active-1,"<span aria-hidden='true'>&laquo;</span>",$this->active===1);
86
+		$this->createElement($this->active-1, "<span aria-hidden='true'>&laquo;</span>", $this->active===1);
87 87
 		$start=$this->getStart();
88
-		$end=min($start+$this->countVisible-1,$this->to);
89
-		for($index=$start;$index<=$end;$index++){
90
-			$this->createElement($index,$index,false,$index===$this->active);
88
+		$end=min($start+$this->countVisible-1, $this->to);
89
+		for ($index=$start; $index<=$end; $index++) {
90
+			$this->createElement($index, $index, false, $index===$this->active);
91 91
 		}
92
-		$this->createElement($this->active+1,"<span aria-hidden='true'>&raquo;</span>",$this->active===$this->to);
92
+		$this->createElement($this->active+1, "<span aria-hidden='true'>&raquo;</span>", $this->active===$this->to);
93 93
 	}
94 94
 	
95
-	protected function half(){
96
-		return (int)($this->countVisible/2);
95
+	protected function half() {
96
+		return (int) ($this->countVisible / 2);
97 97
 	}
98 98
 	
99
-	protected function getStart(){
99
+	protected function getStart() {
100 100
 		$result=1;
101
-		if($this->countVisible!==$this->to-$this->from+1){
102
-			$result=max($this->active-$this->half(),$result);
101
+		if ($this->countVisible!==$this->to-$this->from+1) {
102
+			$result=max($this->active-$this->half(), $result);
103 103
 		}
104 104
 		return $result;
105 105
 	}
106 106
 
107 107
 	public function _addEvent($event, $jsCode) {
108
-		foreach ($this->content as $li){
108
+		foreach ($this->content as $li) {
109 109
 			$content=$li->getContent();
110
-			if($content instanceof BaseHtml)
111
-				$content->_addEvent($event,$jsCode);
110
+			if ($content instanceof BaseHtml)
111
+				$content->_addEvent($event, $jsCode);
112 112
 		}
113 113
 	}
114 114
 	/**
@@ -116,15 +116,15 @@  discard block
 block discarded – undo
116 116
 	 * @param Dispatcher $dispatcher the request dispatcher
117 117
 	 * @return \Ajax\bootstrap\html\HtmlPagination
118 118
 	 */
119
-	public function fromDispatcher($dispatcher){
120
-		$items=array($dispatcher->getControllerName(),$dispatcher->getActionName());
121
-		$items=array_merge($items,$dispatcher->getParams());
119
+	public function fromDispatcher($dispatcher) {
120
+		$items=array($dispatcher->getControllerName(), $dispatcher->getActionName());
121
+		$items=array_merge($items, $dispatcher->getParams());
122 122
 		$url=implode("/", $items);
123
-		if($this->urlMask==="%page%"){
123
+		if ($this->urlMask==="%page%") {
124 124
 			$this->urlMask=preg_replace("/[0-9]/", "%page%", $url);
125 125
 		}
126
-		for($index=$this->from;$index<=$this->to;$index++){
127
-			if($this->getUrl($index)==$url){
126
+		for ($index=$this->from; $index<=$this->to; $index++) {
127
+			if ($this->getUrl($index)==$url) {
128 128
 				$this->setActive($index);
129 129
 				break;
130 130
 			}
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 		return $this;
133 133
 	}
134 134
 	
135
-	public function getUrl($index){
135
+	public function getUrl($index) {
136 136
 		return str_ireplace("%page%", $index, $this->urlMask);
137 137
 	}
138 138
 	
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 		if (is_int($size)) {
147 147
 			return $this->addToPropertyUnique("class", CssRef::sizes("pagination")[$size], CssRef::sizes("pagination"));
148 148
 		}
149
-		if(!PhalconUtils::startsWith($size, "pagination-") && $size!=="")
149
+		if (!PhalconUtils::startsWith($size, "pagination-") && $size!=="")
150 150
 			$size="pagination-".$size;
151 151
 		return $this->addToPropertyCtrl("class", $size, CssRef::sizes("pagination"));
152 152
 	}
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 		return $this->from;
156 156
 	}
157 157
 	public function setFrom($from) {
158
-		$this->from = $from;
158
+		$this->from=$from;
159 159
 		$this->createContent();
160 160
 		return $this;
161 161
 	}
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 		return $this->to;
164 164
 	}
165 165
 	public function setTo($to) {
166
-		$this->to = $to;
166
+		$this->to=$to;
167 167
 		$this->createContent();
168 168
 		return $this;
169 169
 	}
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 		return $this->active;
172 172
 	}
173 173
 	public function setActive($active) {
174
-		$this->active = $active;
174
+		$this->active=$active;
175 175
 		$this->createContent();
176 176
 		return $this;
177 177
 	}
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 		return $this->urlMask;
180 180
 	}
181 181
 	public function setUrlMask($urlMask) {
182
-		$this->urlMask = $urlMask;
182
+		$this->urlMask=$urlMask;
183 183
 		$this->createContent();
184 184
 		return $this;
185 185
 	}
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 		return $this->countVisible;
188 188
 	}
189 189
 	public function setCountVisible($countVisible) {
190
-		$this->countVisible = $countVisible;
190
+		$this->countVisible=$countVisible;
191 191
 		$this->createContent();
192 192
 		return $this;
193 193
 	}
Please login to merge, or discard this patch.
Braces   +12 added lines, -9 removed lines patch added patch discarded remove patch
@@ -52,10 +52,11 @@  discard block
 block discarded – undo
52 52
 		$this->from=$from;
53 53
 		$this->to=$to;
54 54
 		$this->urlMask="%page%";
55
-		if(!isset($countVisible))
56
-			$this->countVisible=$to-$from+1;
57
-		else
58
-			$this->countVisible=$countVisible;
55
+		if(!isset($countVisible)) {
56
+					$this->countVisible=$to-$from+1;
57
+		} else {
58
+					$this->countVisible=$countVisible;
59
+		}
59 60
 		$this->createContent();
60 61
 	}
61 62
 	
@@ -74,7 +75,7 @@  discard block
 block discarded – undo
74 75
 			$href=new HtmlLink("a-".$this->identifier."-".$count,$url,$content);
75 76
 			$href->setProperty($this->attr, $url);
76 77
 			$elem->setContent($href);
77
-		}else{
78
+		} else{
78 79
 			$elem->setContent($content);
79 80
 		}
80 81
 		$this->content[]=$elem;
@@ -107,8 +108,9 @@  discard block
 block discarded – undo
107 108
 	public function _addEvent($event, $jsCode) {
108 109
 		foreach ($this->content as $li){
109 110
 			$content=$li->getContent();
110
-			if($content instanceof BaseHtml)
111
-				$content->_addEvent($event,$jsCode);
111
+			if($content instanceof BaseHtml) {
112
+							$content->_addEvent($event,$jsCode);
113
+			}
112 114
 		}
113 115
 	}
114 116
 	/**
@@ -146,8 +148,9 @@  discard block
 block discarded – undo
146 148
 		if (is_int($size)) {
147 149
 			return $this->addToPropertyUnique("class", CssRef::sizes("pagination")[$size], CssRef::sizes("pagination"));
148 150
 		}
149
-		if(!PhalconUtils::startsWith($size, "pagination-") && $size!=="")
150
-			$size="pagination-".$size;
151
+		if(!PhalconUtils::startsWith($size, "pagination-") && $size!=="") {
152
+					$size="pagination-".$size;
153
+		}
151 154
 		return $this->addToPropertyCtrl("class", $size, CssRef::sizes("pagination"));
152 155
 	}
153 156
 	
Please login to merge, or discard this patch.