@@ -17,8 +17,9 @@ discard block |
||
17 | 17 | $value1=reset($input); |
18 | 18 | if (is_object($value1)) { |
19 | 19 | $output=PropertyWrapper::wrapObjects($input, $js, $separator=' '); |
20 | - } else |
|
21 | - $output=PropertyWrapper::wrapStrings($input, $separator=' ', $valueQuote='"'); |
|
20 | + } else { |
|
21 | + $output=PropertyWrapper::wrapStrings($input, $separator=' ', $valueQuote='"'); |
|
22 | + } |
|
22 | 23 | } |
23 | 24 | } |
24 | 25 | return $output; |
@@ -37,10 +38,11 @@ discard block |
||
37 | 38 | |
38 | 39 | public static function wrapObjects($input, $js=NULL, $separator=' ') { |
39 | 40 | return implode($separator, array_map(function ($v) use($js) { |
40 | - if (is_object($v)) |
|
41 | - return $v->compile($js); |
|
42 | - else |
|
43 | - return $v; |
|
41 | + if (is_object($v)) { |
|
42 | + return $v->compile($js); |
|
43 | + } else { |
|
44 | + return $v; |
|
45 | + } |
|
44 | 46 | }, $input)); |
45 | 47 | } |
46 | 48 | } |
47 | 49 | \ No newline at end of file |
@@ -29,15 +29,17 @@ |
||
29 | 29 | |
30 | 30 | public function addContent($content,$before=false) { |
31 | 31 | if (is_array($this->content)===false) { |
32 | - if(isset($this->content)) |
|
33 | - $this->content=array ($this->content); |
|
34 | - else |
|
35 | - $this->content=array(); |
|
32 | + if(isset($this->content)) { |
|
33 | + $this->content=array ($this->content); |
|
34 | + } else { |
|
35 | + $this->content=array(); |
|
36 | + } |
|
37 | + } |
|
38 | + if($before) { |
|
39 | + array_unshift($this->content,$content); |
|
40 | + } else { |
|
41 | + $this->content []=$content; |
|
36 | 42 | } |
37 | - if($before) |
|
38 | - array_unshift($this->content,$content); |
|
39 | - else |
|
40 | - $this->content []=$content; |
|
41 | 43 | return $this; |
42 | 44 | } |
43 | 45 |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | public function addOption($element,$value="",$selected=false){ |
29 | 29 | if($element instanceof HtmlOption){ |
30 | 30 | $option=$element; |
31 | - }else{ |
|
31 | + } else{ |
|
32 | 32 | $option=new HtmlOption($this->identifier."-".count($this->options), $element,$value); |
33 | 33 | } |
34 | 34 | if($selected || $option->getValue()==$this->getProperty("value")){ |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | foreach ($array as $k=>$v){ |
68 | 68 | $this->addOption($v, $k); |
69 | 69 | } |
70 | - }else{ |
|
70 | + } else{ |
|
71 | 71 | foreach ($array as $v){ |
72 | 72 | $this->addOption($v, $v); |
73 | 73 | } |
@@ -65,9 +65,9 @@ discard block |
||
65 | 65 | if(is_array($element)){ |
66 | 66 | $elm=new HtmlLink("lnk-".$this->identifier."-".$size); |
67 | 67 | $elm->fromArray($element); |
68 | - }else if($element instanceof HtmlLink){ |
|
68 | + } else if($element instanceof HtmlLink){ |
|
69 | 69 | $elm=$element; |
70 | - }else{ |
|
70 | + } else{ |
|
71 | 71 | $elm=new HtmlLink("lnk-".$this->identifier."-".$size,$href,$element); |
72 | 72 | if(isset($glyph)){ |
73 | 73 | $elm->wrapContentWithGlyph($glyph); |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | } |
115 | 115 | if($this->absolutePaths===true){ |
116 | 116 | return $this->_hrefFunction($this->content[$index]); |
117 | - }else{ |
|
117 | + } else{ |
|
118 | 118 | return $this->root.implode($separator, array_slice(array_map(function($e){return $this->_hrefFunction($e);}, $this->content),$this->startIndex,$index+1)); |
119 | 119 | } |
120 | 120 | } |
@@ -204,8 +204,9 @@ discard block |
||
204 | 204 | if(\sizeof($params)>0 || \strtolower($action)!="index" ){ |
205 | 205 | $items[]=$action; |
206 | 206 | foreach ($params as $p){ |
207 | - if(\is_object($p)===false) |
|
208 | - $items[]=$p; |
|
207 | + if(\is_object($p)===false) { |
|
208 | + $items[]=$p; |
|
209 | + } |
|
209 | 210 | } |
210 | 211 | } |
211 | 212 | return $this->addElements($items); |
@@ -92,8 +92,9 @@ discard block |
||
92 | 92 | |
93 | 93 | public function setCircular($inverted=false){ |
94 | 94 | $invertedStr=""; |
95 | - if($inverted!==false) |
|
96 | - $invertedStr=" inverted"; |
|
95 | + if($inverted!==false) { |
|
96 | + $invertedStr=" inverted"; |
|
97 | + } |
|
97 | 98 | return $this->addToMember($this->attributes, "circular".$invertedStr); |
98 | 99 | } |
99 | 100 | |
@@ -110,8 +111,9 @@ discard block |
||
110 | 111 | */ |
111 | 112 | public function setBordered($inverted=false){ |
112 | 113 | $invertedStr=""; |
113 | - if($inverted!==false) |
|
114 | - $invertedStr=" inverted"; |
|
114 | + if($inverted!==false) { |
|
115 | + $invertedStr=" inverted"; |
|
116 | + } |
|
115 | 117 | return $this->addToMember($this->attributes, "bordered".$invertedStr); |
116 | 118 | } |
117 | 119 |
@@ -22,8 +22,9 @@ |
||
22 | 22 | } |
23 | 23 | |
24 | 24 | public function setAlignement($value="justified"){ |
25 | - if($value!=="justified") |
|
26 | - $value.=" aligned"; |
|
25 | + if($value!=="justified") { |
|
26 | + $value.=" aligned"; |
|
27 | + } |
|
27 | 28 | return $this->addToProperty("class", $value); |
28 | 29 | } |
29 | 30 |
@@ -15,8 +15,9 @@ discard block |
||
15 | 15 | parent::__construct($identifier, "div"); |
16 | 16 | $this->setProperty("class", "ui buttons"); |
17 | 17 | $this->content=array(); |
18 | - if($asIcons===true) |
|
19 | - $this->asIcons(); |
|
18 | + if($asIcons===true) { |
|
19 | + $this->asIcons(); |
|
20 | + } |
|
20 | 21 | $this->addElements($elements,$asIcons); |
21 | 22 | } |
22 | 23 | public function addElement($element,$asIcon=false){ |
@@ -25,8 +26,9 @@ discard block |
||
25 | 26 | if($asIcon){ |
26 | 27 | $elementO=new HtmlButton("button-".\sizeof($this->content)); |
27 | 28 | $elementO->asIcon($element); |
28 | - }else |
|
29 | - $elementO=new HtmlButton("button-".\sizeof($this->content),$element); |
|
29 | + } else { |
|
30 | + $elementO=new HtmlButton("button-".\sizeof($this->content),$element); |
|
31 | + } |
|
30 | 32 | } |
31 | 33 | $this->addContent($elementO); |
32 | 34 | } |
@@ -72,9 +74,9 @@ discard block |
||
72 | 74 | * @return HtmlButton |
73 | 75 | */ |
74 | 76 | public function getElement($index) { |
75 | - if (is_int($index)) |
|
76 | - return $this->content[$index]; |
|
77 | - else { |
|
77 | + if (is_int($index)) { |
|
78 | + return $this->content[$index]; |
|
79 | + } else { |
|
78 | 80 | $elm=$this->getElementById($index, $this->content); |
79 | 81 | return $elm; |
80 | 82 | } |
@@ -39,8 +39,9 @@ discard block |
||
39 | 39 | |
40 | 40 | public function getParam($key) { |
41 | 41 | $value=null; |
42 | - if (array_key_exists($key, $this->params)) |
|
43 | - $value=$this->params [$key]; |
|
42 | + if (array_key_exists($key, $this->params)) { |
|
43 | + $value=$this->params [$key]; |
|
44 | + } |
|
44 | 45 | return $value; |
45 | 46 | } |
46 | 47 | |
@@ -49,16 +50,18 @@ discard block |
||
49 | 50 | } |
50 | 51 | |
51 | 52 | public function compile(JsUtils $js=NULL) { |
52 | - if ($js==NULL) |
|
53 | - $js=$this->js; |
|
53 | + if ($js==NULL) { |
|
54 | + $js=$this->js; |
|
55 | + } |
|
54 | 56 | $script=$this->getScript(); |
55 | 57 | $js->addToCompile($script); |
56 | 58 | } |
57 | 59 | |
58 | 60 | protected function setParamCtrl($key, $value, $typeCtrl) { |
59 | 61 | if (is_array($typeCtrl)) { |
60 | - if (array_search($value, $typeCtrl)===false) |
|
61 | - throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
62 | + if (array_search($value, $typeCtrl)===false) { |
|
63 | + throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
64 | + } |
|
62 | 65 | } else { |
63 | 66 | if (!$typeCtrl($value)) { |
64 | 67 | throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key); |
@@ -70,9 +73,9 @@ discard block |
||
70 | 73 | public function setParams($params) { |
71 | 74 | foreach ( $params as $k => $v ) { |
72 | 75 | $method="set".ucfirst($k); |
73 | - if (method_exists($this, $method)) |
|
74 | - $this->$method($v); |
|
75 | - else { |
|
76 | + if (method_exists($this, $method)) { |
|
77 | + $this->$method($v); |
|
78 | + } else { |
|
76 | 79 | $this->setParam($k, $v); |
77 | 80 | trigger_error("`".$k."` property n'existe pas", E_USER_NOTICE); |
78 | 81 | } |
@@ -64,8 +64,9 @@ |
||
64 | 64 | |
65 | 65 | protected function setParamCtrl($key, $value, $typeCtrl) { |
66 | 66 | if (is_array($typeCtrl)) { |
67 | - if (array_search($value, $typeCtrl)===false) |
|
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)."}"); |
|
67 | + if (array_search($value, $typeCtrl)===false) { |
|
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 | + } |
|
69 | 70 | } else { |
70 | 71 | if (!$typeCtrl($value)) { |
71 | 72 | throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." au composant ".$this->uiName); |