@@ -61,9 +61,9 @@ discard block |
||
| 61 | 61 | if (\is_array($elements)) { |
| 62 | 62 | foreach ( $elements as $key => $element ) { |
| 63 | 63 | $iid=$this->getElementsCount()+1; |
| 64 | - if ($element instanceof HtmlDropdownItem) |
|
| 65 | - $this->elements []=$element; |
|
| 66 | - else if (\is_array($element)) { |
|
| 64 | + if ($element instanceof HtmlDropdownItem) { |
|
| 65 | + $this->elements []=$element; |
|
| 66 | + } else if (\is_array($element)) { |
|
| 67 | 67 | if (is_string($key)===true) { |
| 68 | 68 | $dropdown=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
| 69 | 69 | $dropdown->addItems($element); |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | $li=new HtmlBsDoubleElement($this->identifier."-li-".$iid, "li"); |
| 90 | 90 | if($caption instanceof HtmlLink){ |
| 91 | 91 | $link=$caption; |
| 92 | - }else{ |
|
| 92 | + } else{ |
|
| 93 | 93 | $link=new HtmlLink($this->identifier."-link-".$iid, $href, $caption); |
| 94 | 94 | } |
| 95 | 95 | $li->setContent($link); |
@@ -97,10 +97,11 @@ |
||
| 97 | 97 | |
| 98 | 98 | protected function setDivider($divider,$index){ |
| 99 | 99 | if(isset($index)){ |
| 100 | - if(!\is_array($this->_contentSeparator)) |
|
| 101 | - $this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator); |
|
| 100 | + if(!\is_array($this->_contentSeparator)) { |
|
| 101 | + $this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator); |
|
| 102 | + } |
|
| 102 | 103 | $this->_contentSeparator[$index]=$divider; |
| 103 | - }else{ |
|
| 104 | + } else{ |
|
| 104 | 105 | $this->_contentSeparator=$divider; |
| 105 | 106 | } |
| 106 | 107 | return $this; |
@@ -49,8 +49,9 @@ discard block |
||
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | public function setStyle($value) { |
| 52 | - foreach ( $this->elements as $element ) |
|
| 53 | - $element->setStyle($value); |
|
| 52 | + foreach ( $this->elements as $element ) { |
|
| 53 | + $element->setStyle($value); |
|
| 54 | + } |
|
| 54 | 55 | } |
| 55 | 56 | |
| 56 | 57 | private function dropdownAsButton($bt) { |
@@ -75,16 +76,18 @@ discard block |
||
| 75 | 76 | } elseif ($element instanceof HtmlButton) { |
| 76 | 77 | $this->elements[]=$element; |
| 77 | 78 | } elseif (\is_array($element)) { |
| 78 | - if (array_key_exists("glyph", $element)) |
|
| 79 | - $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
| 80 | - elseif (array_key_exists("btnCaption", $element)) { |
|
| 81 | - if (array_key_exists("split", $element)) |
|
| 82 | - $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
| 83 | - else |
|
| 84 | - $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
|
| 79 | + if (array_key_exists("glyph", $element)) { |
|
| 80 | + $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
| 81 | + } elseif (array_key_exists("btnCaption", $element)) { |
|
| 82 | + if (array_key_exists("split", $element)) { |
|
| 83 | + $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
| 84 | + } else { |
|
| 85 | + $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
|
| 86 | + } |
|
| 85 | 87 | $this->dropdownAsButton($bt); |
| 86 | - } else |
|
| 87 | - $bt=new HtmlButton($this->identifier."-button-".$iid); |
|
| 88 | + } else { |
|
| 89 | + $bt=new HtmlButton($this->identifier."-button-".$iid); |
|
| 90 | + } |
|
| 88 | 91 | $bt->fromArray($element); |
| 89 | 92 | $this->elements[]=$bt; |
| 90 | 93 | $result=$bt; |
@@ -115,8 +118,9 @@ discard block |
||
| 115 | 118 | public function setAlignment($value) { |
| 116 | 119 | if (is_int($value)) { |
| 117 | 120 | $value=CssRef::alignment("btn-group")[$value]; |
| 118 | - } else |
|
| 119 | - $value="btn-group-".$value; |
|
| 121 | + } else { |
|
| 122 | + $value="btn-group-".$value; |
|
| 123 | + } |
|
| 120 | 124 | if (strstr($value, "justified")) { |
| 121 | 125 | foreach ( $this->elements as $element ) { |
| 122 | 126 | $element->wrap('<div class="btn-group" role="group">', '</div>'); |
@@ -131,9 +135,9 @@ discard block |
||
| 131 | 135 | * @return HtmlButton |
| 132 | 136 | */ |
| 133 | 137 | public function getElement($index) { |
| 134 | - if (is_int($index)) |
|
| 135 | - return $this->elements[$index]; |
|
| 136 | - else { |
|
| 138 | + if (is_int($index)) { |
|
| 139 | + return $this->elements[$index]; |
|
| 140 | + } else { |
|
| 137 | 141 | $elm=$this->getElementById($index, $this->elements); |
| 138 | 142 | return $elm; |
| 139 | 143 | } |
@@ -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 | } |
@@ -75,27 +75,30 @@ |
||
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | private function getGlyph($sens="left") { |
| 78 | - if (array_key_exists($sens, $this->_glyphs)) |
|
| 79 | - return $this->_glyphs [$sens]; |
|
| 78 | + if (array_key_exists($sens, $this->_glyphs)) { |
|
| 79 | + return $this->_glyphs [$sens]; |
|
| 80 | + } |
|
| 80 | 81 | return "glyphicon-chevron-".$sens; |
| 81 | 82 | } |
| 82 | 83 | |
| 83 | 84 | public function setRightGlyph($glyphicon) { |
| 84 | 85 | $glyphs=CssRef::glyphIcons(); |
| 85 | - if (array_search($glyphicon, $glyphs)!==false) |
|
| 86 | - $this->_glyphs ["right"]=$glyphicon; |
|
| 86 | + if (array_search($glyphicon, $glyphs)!==false) { |
|
| 87 | + $this->_glyphs ["right"]=$glyphicon; |
|
| 88 | + } |
|
| 87 | 89 | } |
| 88 | 90 | |
| 89 | 91 | public function setLeftGlyph($glyphicon) { |
| 90 | 92 | $glyphs=CssRef::glyphIcons(); |
| 91 | - if (array_search($glyphicon, $glyphs)!==false) |
|
| 92 | - $this->_glyphs ["left"]=$glyphicon; |
|
| 93 | + if (array_search($glyphicon, $glyphs)!==false) { |
|
| 94 | + $this->_glyphs ["left"]=$glyphicon; |
|
| 95 | + } |
|
| 93 | 96 | } |
| 94 | 97 | |
| 95 | 98 | public function addImage($imageSrc, $imageAlt="", $caption=NULL, $description=NULL) { |
| 96 | 99 | if(\is_array($imageSrc)){ |
| 97 | 100 | $this->addImage($imageSrc[0],@$imageSrc[1],@$imageSrc[2],@$imageSrc[3]); |
| 98 | - }else{ |
|
| 101 | + } else{ |
|
| 99 | 102 | $image=new HtmlCarouselItem("item-".$this->identifier); |
| 100 | 103 | $image->setImageSrc($this->_base.$imageSrc); |
| 101 | 104 | $image->setImageAlt($imageAlt); |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | if(isset($router)){ |
| 14 | 14 | try { |
| 15 | 15 | $url=$router->generate($url); |
| 16 | - }catch (\Exception $e){ |
|
| 16 | + } catch (\Exception $e){ |
|
| 17 | 17 | return $router->getContext()->getBaseUrl(); |
| 18 | 18 | } |
| 19 | 19 | } |
@@ -51,14 +51,15 @@ |
||
| 51 | 51 | foreach ($values as $v){ |
| 52 | 52 | $form->addField($v); |
| 53 | 53 | } |
| 54 | - }else{ |
|
| 54 | + } else{ |
|
| 55 | 55 | $separators[]=$count; |
| 56 | 56 | for($i=0;$i<$size;$i++){ |
| 57 | 57 | $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
| 58 | 58 | if(\sizeof($fields)===1){ |
| 59 | 59 | $form->addField($fields[0]); |
| 60 | - }else |
|
| 61 | - $form->addFields($fields); |
|
| 60 | + } else { |
|
| 61 | + $form->addFields($fields); |
|
| 62 | + } |
|
| 62 | 63 | } |
| 63 | 64 | } |
| 64 | 65 | } |
@@ -34,17 +34,18 @@ |
||
| 34 | 34 | $property=$this->getProperty($index); |
| 35 | 35 | if($property instanceof \ReflectionProperty){ |
| 36 | 36 | $result=$property->getName(); |
| 37 | - }elseif(\is_callable($property)){ |
|
| 37 | + } elseif(\is_callable($property)){ |
|
| 38 | 38 | $result=$this->visibleProperties[$index]; |
| 39 | - }else{ |
|
| 39 | + } else{ |
|
| 40 | 40 | $result=$property; |
| 41 | 41 | } |
| 42 | 42 | return $result; |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | public function addSeparatorAfter($fieldNum){ |
| 46 | - if(\array_search($fieldNum, $this->separators)===false) |
|
| 47 | - $this->separators[]=$fieldNum; |
|
| 46 | + if(\array_search($fieldNum, $this->separators)===false) { |
|
| 47 | + $this->separators[]=$fieldNum; |
|
| 48 | + } |
|
| 48 | 49 | return $this; |
| 49 | 50 | } |
| 50 | 51 | |
@@ -21,8 +21,9 @@ discard block |
||
| 21 | 21 | $this->widgetIdentifier=$identifier; |
| 22 | 22 | $this->values=[]; |
| 23 | 23 | $this->afterCompile=[]; |
| 24 | - if(isset($instance)) |
|
| 25 | - $this->setInstance($instance); |
|
| 24 | + if(isset($instance)) { |
|
| 25 | + $this->setInstance($instance); |
|
| 26 | + } |
|
| 26 | 27 | $this->setCaptions($captions); |
| 27 | 28 | $this->captionCallback=NULL; |
| 28 | 29 | $this->defaultValueFunction=function($name,$value){return $value;}; |
@@ -40,8 +41,9 @@ discard block |
||
| 40 | 41 | |
| 41 | 42 | public function getIdentifier(){ |
| 42 | 43 | $value=self::$index; |
| 43 | - if(isset($this->values["identifier"])) |
|
| 44 | - $value=$this->values["identifier"](self::$index,$this->instance); |
|
| 44 | + if(isset($this->values["identifier"])) { |
|
| 45 | + $value=$this->values["identifier"](self::$index,$this->instance); |
|
| 46 | + } |
|
| 45 | 47 | return $value; |
| 46 | 48 | } |
| 47 | 49 | |
@@ -65,19 +67,19 @@ discard block |
||
| 65 | 67 | $value=$property->getValue($this->instance); |
| 66 | 68 | if(isset($this->values[$index])){ |
| 67 | 69 | $value= $this->values[$index]($value,$this->instance,$index); |
| 68 | - }else{ |
|
| 70 | + } else{ |
|
| 69 | 71 | $value=$this->_getDefaultValue($property->getName(),$value, $index); |
| 70 | 72 | } |
| 71 | - }else{ |
|
| 72 | - if(\is_callable($property)) |
|
| 73 | - $value=$property($this->instance); |
|
| 74 | - elseif(\is_array($property)){ |
|
| 73 | + } else{ |
|
| 74 | + if(\is_callable($property)) { |
|
| 75 | + $value=$property($this->instance); |
|
| 76 | + } elseif(\is_array($property)){ |
|
| 75 | 77 | $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
| 76 | 78 | $value=\implode("", $values); |
| 77 | - }else{ |
|
| 79 | + } else{ |
|
| 78 | 80 | if(isset($this->values[$index])){ |
| 79 | 81 | $value= $this->values[$index]($property,$this->instance,$index); |
| 80 | - }else{ |
|
| 82 | + } else{ |
|
| 81 | 83 | $value=$property; |
| 82 | 84 | } |
| 83 | 85 | } |
@@ -100,10 +102,10 @@ discard block |
||
| 100 | 102 | if(isset($vb[$index])){ |
| 101 | 103 | if(\is_array($vb[$index])){ |
| 102 | 104 | $this->visibleProperties[$index][]=$field; |
| 103 | - }else{ |
|
| 105 | + } else{ |
|
| 104 | 106 | $this->visibleProperties[$index]=[$vb[$index],$field]; |
| 105 | 107 | } |
| 106 | - }else{ |
|
| 108 | + } else{ |
|
| 107 | 109 | return $this->insertField($index, $field); |
| 108 | 110 | } |
| 109 | 111 | return $this; |
@@ -139,7 +141,7 @@ discard block |
||
| 139 | 141 | $this->reflect=new \ReflectionClass($instance); |
| 140 | 142 | if(\sizeof($this->visibleProperties)===0){ |
| 141 | 143 | $this->properties=$this->getDefaultProperties(); |
| 142 | - }else{ |
|
| 144 | + } else{ |
|
| 143 | 145 | foreach ($this->visibleProperties as $property){ |
| 144 | 146 | $this->setInstanceProperty($property); |
| 145 | 147 | } |
@@ -150,22 +152,23 @@ discard block |
||
| 150 | 152 | private function setInstanceProperty($property){ |
| 151 | 153 | if(\is_callable($property)){ |
| 152 | 154 | $this->properties[]=$property; |
| 153 | - }elseif(\is_string($property)){ |
|
| 155 | + } elseif(\is_string($property)){ |
|
| 154 | 156 | try{ |
| 155 | 157 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
| 156 | 158 | $rProperty=$this->reflect->getProperty($property); |
| 157 | 159 | $this->properties[]=$rProperty; |
| 158 | - }catch(\Exception $e){ |
|
| 160 | + } catch(\Exception $e){ |
|
| 159 | 161 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
| 160 | 162 | $this->properties[]=$property; |
| 161 | 163 | } |
| 162 | - }elseif(\is_int($property)){ |
|
| 164 | + } elseif(\is_int($property)){ |
|
| 163 | 165 | $props=$this->getDefaultProperties(); |
| 164 | - if(isset($props[$property])) |
|
| 165 | - $this->properties[]=$props[$property]; |
|
| 166 | - else |
|
| 167 | - $this->properties[]=$property; |
|
| 168 | - }else{ |
|
| 166 | + if(isset($props[$property])) { |
|
| 167 | + $this->properties[]=$props[$property]; |
|
| 168 | + } else { |
|
| 169 | + $this->properties[]=$property; |
|
| 170 | + } |
|
| 171 | + } else{ |
|
| 169 | 172 | $this->properties[]=$property; |
| 170 | 173 | } |
| 171 | 174 | } |
@@ -209,12 +212,13 @@ discard block |
||
| 209 | 212 | if(isset($this->captions[$index])){ |
| 210 | 213 | return $this->captions[$index]; |
| 211 | 214 | } |
| 212 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
| 213 | - return $this->properties[$index]->getName(); |
|
| 214 | - elseif(\is_callable($this->properties[$index])) |
|
| 215 | - return ""; |
|
| 216 | - else |
|
| 217 | - return $this->properties[$index]; |
|
| 215 | + if($this->properties[$index] instanceof \ReflectionProperty) { |
|
| 216 | + return $this->properties[$index]->getName(); |
|
| 217 | + } elseif(\is_callable($this->properties[$index])) { |
|
| 218 | + return ""; |
|
| 219 | + } else { |
|
| 220 | + return $this->properties[$index]; |
|
| 221 | + } |
|
| 218 | 222 | } |
| 219 | 223 | |
| 220 | 224 | public function getCaptions(){ |
@@ -223,7 +227,7 @@ discard block |
||
| 223 | 227 | for($i=\sizeof($captions);$i<$this->count();$i++){ |
| 224 | 228 | $captions[]=""; |
| 225 | 229 | } |
| 226 | - }else{ |
|
| 230 | + } else{ |
|
| 227 | 231 | $captions=[]; |
| 228 | 232 | $index=0; |
| 229 | 233 | $count=$this->count(); |
@@ -239,8 +243,9 @@ discard block |
||
| 239 | 243 | } |
| 240 | 244 | |
| 241 | 245 | public function setCaption($index,$caption){ |
| 242 | - if(isset($this->captions)===false) |
|
| 243 | - $this->captions=[]; |
|
| 246 | + if(isset($this->captions)===false) { |
|
| 247 | + $this->captions=[]; |
|
| 248 | + } |
|
| 244 | 249 | $this->captions[$index]=$caption; |
| 245 | 250 | return $this; |
| 246 | 251 | } |