@@ -23,8 +23,9 @@ discard block |
||
| 23 | 23 | $this->widgetIdentifier=$identifier; |
| 24 | 24 | $this->values=[]; |
| 25 | 25 | $this->afterCompile=[]; |
| 26 | - if(isset($instance)) |
|
| 27 | - $this->setInstance($instance); |
|
| 26 | + if(isset($instance)) { |
|
| 27 | + $this->setInstance($instance); |
|
| 28 | + } |
|
| 28 | 29 | $this->setCaptions($captions); |
| 29 | 30 | $this->captionCallback=NULL; |
| 30 | 31 | $this->defaultValueFunction=function($name,$value){return $value;}; |
@@ -62,14 +63,16 @@ discard block |
||
| 62 | 63 | } |
| 63 | 64 | |
| 64 | 65 | public function getIdentifier($index=NULL){ |
| 65 | - if(!isset($index)) |
|
| 66 | - $index=self::$index; |
|
| 66 | + if(!isset($index)) { |
|
| 67 | + $index=self::$index; |
|
| 68 | + } |
|
| 67 | 69 | $value=$index; |
| 68 | 70 | if(isset($this->values["identifier"])){ |
| 69 | - if(\is_string($this->values["identifier"])) |
|
| 70 | - $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
| 71 | - else |
|
| 72 | - $value=$this->values["identifier"]($index,$this->instance); |
|
| 71 | + if(\is_string($this->values["identifier"])) { |
|
| 72 | + $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
| 73 | + } else { |
|
| 74 | + $value=$this->values["identifier"]($index,$this->instance); |
|
| 75 | + } |
|
| 73 | 76 | } |
| 74 | 77 | return $value; |
| 75 | 78 | } |
@@ -100,16 +103,16 @@ discard block |
||
| 100 | 103 | if($property instanceof \ReflectionProperty){ |
| 101 | 104 | $value=$this->_getPropertyValue($property, $index); |
| 102 | 105 | $propertyName=$property->getName(); |
| 103 | - }elseif(\is_callable($property)) |
|
| 104 | - $value=$property($this->instance); |
|
| 105 | - elseif(\is_array($property)){ |
|
| 106 | + } elseif(\is_callable($property)) { |
|
| 107 | + $value=$property($this->instance); |
|
| 108 | + } elseif(\is_array($property)){ |
|
| 106 | 109 | $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
| 107 | 110 | $value=\implode("", $values); |
| 108 | - }elseif(\is_string($property)){ |
|
| 111 | + } elseif(\is_string($property)){ |
|
| 109 | 112 | $value=$property; |
| 110 | 113 | if(isset($this->instance->{$property})){ |
| 111 | 114 | $value=$this->instance->{$property}; |
| 112 | - }elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
| 115 | + } elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
| 113 | 116 | $value=JReflection::callMethod($this->instance, $getter, []); |
| 114 | 117 | } |
| 115 | 118 | } |
@@ -119,7 +122,7 @@ discard block |
||
| 119 | 122 | protected function _postGetValue($index,$propertyName,$value){ |
| 120 | 123 | if(isset($this->values[$index])){ |
| 121 | 124 | $value= $this->values[$index]($value,$this->instance,$index,self::$index); |
| 122 | - }else{ |
|
| 125 | + } else{ |
|
| 123 | 126 | $value=$this->_getDefaultValue($propertyName,$value, $index,self::$index); |
| 124 | 127 | } |
| 125 | 128 | if(isset($this->afterCompile[$index])){ |
@@ -140,10 +143,10 @@ discard block |
||
| 140 | 143 | if(isset($vb[$index])){ |
| 141 | 144 | if(\is_array($vb[$index])){ |
| 142 | 145 | $this->visibleProperties[$index][]=$field; |
| 143 | - }else{ |
|
| 146 | + } else{ |
|
| 144 | 147 | $this->visibleProperties[$index]=[$vb[$index],$field]; |
| 145 | 148 | } |
| 146 | - }else{ |
|
| 149 | + } else{ |
|
| 147 | 150 | return $this->insertField($index, $field); |
| 148 | 151 | } |
| 149 | 152 | return $this; |
@@ -175,9 +178,9 @@ discard block |
||
| 175 | 178 | $property=$this->getProperty($index); |
| 176 | 179 | if($property instanceof \ReflectionProperty){ |
| 177 | 180 | $result=$property->getName(); |
| 178 | - }elseif(\is_callable($property)){ |
|
| 181 | + } elseif(\is_callable($property)){ |
|
| 179 | 182 | $result=$this->visibleProperties[$index]; |
| 180 | - }else{ |
|
| 183 | + } else{ |
|
| 181 | 184 | $result=$property; |
| 182 | 185 | } |
| 183 | 186 | return $result; |
@@ -197,7 +200,7 @@ discard block |
||
| 197 | 200 | $this->reflect=new \ReflectionClass($instance); |
| 198 | 201 | if(JArray::count($this->visibleProperties)===0){ |
| 199 | 202 | $this->properties=$this->getDefaultProperties(); |
| 200 | - }else{ |
|
| 203 | + } else{ |
|
| 201 | 204 | foreach ($this->visibleProperties as $property){ |
| 202 | 205 | $this->setInstanceProperty($property); |
| 203 | 206 | } |
@@ -208,22 +211,23 @@ discard block |
||
| 208 | 211 | private function setInstanceProperty($property){ |
| 209 | 212 | if(\is_callable($property)){ |
| 210 | 213 | $this->properties[]=$property; |
| 211 | - }elseif(\is_string($property)){ |
|
| 214 | + } elseif(\is_string($property)){ |
|
| 212 | 215 | try{ |
| 213 | 216 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
| 214 | 217 | $rProperty=$this->reflect->getProperty($property); |
| 215 | 218 | $this->properties[]=$rProperty; |
| 216 | - }catch(\Exception $e){ |
|
| 219 | + } catch(\Exception $e){ |
|
| 217 | 220 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
| 218 | 221 | $this->properties[]=$property; |
| 219 | 222 | } |
| 220 | - }elseif(\is_int($property)){ |
|
| 223 | + } elseif(\is_int($property)){ |
|
| 221 | 224 | $props=$this->getDefaultProperties(); |
| 222 | - if(isset($props[$property])) |
|
| 223 | - $this->properties[]=$props[$property]; |
|
| 224 | - else |
|
| 225 | - $this->properties[]=$property; |
|
| 226 | - }else{ |
|
| 225 | + if(isset($props[$property])) { |
|
| 226 | + $this->properties[]=$props[$property]; |
|
| 227 | + } else { |
|
| 228 | + $this->properties[]=$property; |
|
| 229 | + } |
|
| 230 | + } else{ |
|
| 227 | 231 | $this->properties[]=$property; |
| 228 | 232 | } |
| 229 | 233 | } |
@@ -267,12 +271,13 @@ discard block |
||
| 267 | 271 | if(isset($this->captions[$index])){ |
| 268 | 272 | return $this->captions[$index]; |
| 269 | 273 | } |
| 270 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
| 271 | - return $this->properties[$index]->getName(); |
|
| 272 | - elseif(\is_callable($this->properties[$index])) |
|
| 273 | - return ""; |
|
| 274 | - else |
|
| 275 | - return $this->properties[$index]; |
|
| 274 | + if($this->properties[$index] instanceof \ReflectionProperty) { |
|
| 275 | + return $this->properties[$index]->getName(); |
|
| 276 | + } elseif(\is_callable($this->properties[$index])) { |
|
| 277 | + return ""; |
|
| 278 | + } else { |
|
| 279 | + return $this->properties[$index]; |
|
| 280 | + } |
|
| 276 | 281 | } |
| 277 | 282 | |
| 278 | 283 | public function getCaptions(){ |
@@ -283,7 +288,7 @@ discard block |
||
| 283 | 288 | for($i=$captionsSize;$i<$count;$i++){ |
| 284 | 289 | $captions[]=""; |
| 285 | 290 | } |
| 286 | - }else{ |
|
| 291 | + } else{ |
|
| 287 | 292 | $captions=[]; |
| 288 | 293 | $index=0; |
| 289 | 294 | while($index<$count){ |
@@ -298,8 +303,9 @@ discard block |
||
| 298 | 303 | } |
| 299 | 304 | |
| 300 | 305 | public function setCaption($index,$caption){ |
| 301 | - if(isset($this->captions)===false) |
|
| 302 | - $this->captions=[]; |
|
| 306 | + if(isset($this->captions)===false) { |
|
| 307 | + $this->captions=[]; |
|
| 308 | + } |
|
| 303 | 309 | $this->captions[$index]=$caption; |
| 304 | 310 | return $this; |
| 305 | 311 | } |