phpMv /
phpMv-UI
@@ -19,221 +19,221 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | public static $index=0; |
| 21 | 21 | |
| 22 | - public function __construct($identifier,$instance=NULL,$captions=NULL){ |
|
| 22 | + public function __construct($identifier, $instance=NULL, $captions=NULL) { |
|
| 23 | 23 | $this->widgetIdentifier=$identifier; |
| 24 | 24 | $this->values=[]; |
| 25 | 25 | $this->afterCompile=[]; |
| 26 | - if(isset($instance)) |
|
| 26 | + if (isset($instance)) |
|
| 27 | 27 | $this->setInstance($instance); |
| 28 | 28 | $this->setCaptions($captions); |
| 29 | 29 | $this->captionCallback=NULL; |
| 30 | - $this->defaultValueFunction=function($name,$value){return $value;}; |
|
| 30 | + $this->defaultValueFunction=function($name, $value) {return $value; }; |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - public function moveFieldTo($from,$to){ |
|
| 34 | - if(JArray::moveElementTo($this->visibleProperties, $from, $to)){ |
|
| 33 | + public function moveFieldTo($from, $to) { |
|
| 34 | + if (JArray::moveElementTo($this->visibleProperties, $from, $to)) { |
|
| 35 | 35 | return JArray::moveElementTo($this->values, $from, $to); |
| 36 | 36 | } |
| 37 | 37 | return false; |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - public function swapFields($index1,$index2){ |
|
| 41 | - if(JArray::swapElements($this->visibleProperties, $index1, $index2)){ |
|
| 40 | + public function swapFields($index1, $index2) { |
|
| 41 | + if (JArray::swapElements($this->visibleProperties, $index1, $index2)) { |
|
| 42 | 42 | return JArray::swapElements($this->values, $index1, $index2); |
| 43 | 43 | } |
| 44 | 44 | return false; |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - public function removeField($index){ |
|
| 48 | - \array_splice($this->visibleProperties,$index,1); |
|
| 49 | - \array_splice($this->values,$index,1); |
|
| 50 | - \array_splice($this->captions,$index,1); |
|
| 47 | + public function removeField($index) { |
|
| 48 | + \array_splice($this->visibleProperties, $index, 1); |
|
| 49 | + \array_splice($this->values, $index, 1); |
|
| 50 | + \array_splice($this->captions, $index, 1); |
|
| 51 | 51 | return $this; |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - public function getValues(){ |
|
| 54 | + public function getValues() { |
|
| 55 | 55 | $values=[]; |
| 56 | 56 | $index=0; |
| 57 | 57 | $count=$this->count(); |
| 58 | - while($index<$count){ |
|
| 58 | + while ($index<$count) { |
|
| 59 | 59 | $values[]=$this->getValue($index++); |
| 60 | 60 | } |
| 61 | 61 | return $values; |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - public function getIdentifier($index=NULL){ |
|
| 65 | - if(!isset($index)) |
|
| 64 | + public function getIdentifier($index=NULL) { |
|
| 65 | + if (!isset($index)) |
|
| 66 | 66 | $index=self::$index; |
| 67 | 67 | $value=$index; |
| 68 | - if(isset($this->values["identifier"])){ |
|
| 69 | - if(\is_string($this->values["identifier"])) |
|
| 68 | + if (isset($this->values["identifier"])) { |
|
| 69 | + if (\is_string($this->values["identifier"])) |
|
| 70 | 70 | $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
| 71 | 71 | else |
| 72 | - $value=$this->values["identifier"]($index,$this->instance); |
|
| 72 | + $value=$this->values["identifier"]($index, $this->instance); |
|
| 73 | 73 | } |
| 74 | 74 | return $value; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - public function getValue($index){ |
|
| 77 | + public function getValue($index) { |
|
| 78 | 78 | $property=$this->properties[$index]; |
| 79 | 79 | return $this->_getValue($property, $index); |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | - protected function _beforeAddProperty($index,&$field){ |
|
| 82 | + protected function _beforeAddProperty($index, &$field) { |
|
| 83 | 83 | |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - protected function _getDefaultValue($name,$value,$index){ |
|
| 86 | + protected function _getDefaultValue($name, $value, $index) { |
|
| 87 | 87 | $func=$this->defaultValueFunction; |
| 88 | 88 | //TODO Check bug on index |
| 89 | - return $func($name,$value,$index,$this->instance); |
|
| 89 | + return $func($name, $value, $index, $this->instance); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | - protected function _getPropertyValue(\ReflectionProperty $property,$index){ |
|
| 92 | + protected function _getPropertyValue(\ReflectionProperty $property, $index) { |
|
| 93 | 93 | $property->setAccessible(true); |
| 94 | 94 | return $property->getValue($this->instance); |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - protected function _getValue($property,$index){ |
|
| 97 | + protected function _getValue($property, $index) { |
|
| 98 | 98 | $value=null; |
| 99 | 99 | $propertyName=$property; |
| 100 | - if($property instanceof \ReflectionProperty){ |
|
| 100 | + if ($property instanceof \ReflectionProperty) { |
|
| 101 | 101 | $value=$this->_getPropertyValue($property, $index); |
| 102 | 102 | $propertyName=$property->getName(); |
| 103 | - }elseif(\is_callable($property)) |
|
| 103 | + }elseif (\is_callable($property)) |
|
| 104 | 104 | $value=$property($this->instance); |
| 105 | - elseif(\is_array($property)){ |
|
| 106 | - $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
|
| 105 | + elseif (\is_array($property)) { |
|
| 106 | + $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property); |
|
| 107 | 107 | $value=\implode("", $values); |
| 108 | - }elseif(\is_string($property)){ |
|
| 108 | + }elseif (\is_string($property)) { |
|
| 109 | 109 | $value=$property; |
| 110 | - if(isset($this->instance->{$property})){ |
|
| 110 | + if (isset($this->instance->{$property})) { |
|
| 111 | 111 | $value=$this->instance->{$property}; |
| 112 | - }elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
| 112 | + }elseif (\method_exists($this->instance, $getter=JReflection::getterName($property))) { |
|
| 113 | 113 | $value=JReflection::callMethod($this->instance, $getter, []); |
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | 116 | return $this->_postGetValue($index, $propertyName, $value); |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | - protected function _postGetValue($index,$propertyName,$value){ |
|
| 120 | - if(isset($this->values[$index])){ |
|
| 121 | - $value= $this->values[$index]($value,$this->instance,$index,self::$index); |
|
| 122 | - }else{ |
|
| 123 | - $value=$this->_getDefaultValue($propertyName,$value, $index,self::$index); |
|
| 119 | + protected function _postGetValue($index, $propertyName, $value) { |
|
| 120 | + if (isset($this->values[$index])) { |
|
| 121 | + $value=$this->values[$index]($value, $this->instance, $index, self::$index); |
|
| 122 | + } else { |
|
| 123 | + $value=$this->_getDefaultValue($propertyName, $value, $index, self::$index); |
|
| 124 | 124 | } |
| 125 | - if(isset($this->afterCompile[$index])){ |
|
| 126 | - if(\is_callable($this->afterCompile[$index])){ |
|
| 127 | - $this->afterCompile[$index]($value,$this->instance,self::$index); |
|
| 125 | + if (isset($this->afterCompile[$index])) { |
|
| 126 | + if (\is_callable($this->afterCompile[$index])) { |
|
| 127 | + $this->afterCompile[$index]($value, $this->instance, self::$index); |
|
| 128 | 128 | } |
| 129 | 129 | } |
| 130 | 130 | return $value; |
| 131 | 131 | } |
| 132 | 132 | |
| 133 | - public function insertField($index,$field){ |
|
| 134 | - array_splice( $this->visibleProperties, $index, 0, $field ); |
|
| 133 | + public function insertField($index, $field) { |
|
| 134 | + array_splice($this->visibleProperties, $index, 0, $field); |
|
| 135 | 135 | return $this; |
| 136 | 136 | } |
| 137 | 137 | |
| 138 | - public function insertInField($index,$field){ |
|
| 138 | + public function insertInField($index, $field) { |
|
| 139 | 139 | $vb=$this->visibleProperties; |
| 140 | - if(isset($vb[$index])){ |
|
| 141 | - if(\is_array($vb[$index])){ |
|
| 140 | + if (isset($vb[$index])) { |
|
| 141 | + if (\is_array($vb[$index])) { |
|
| 142 | 142 | $this->visibleProperties[$index][]=$field; |
| 143 | - }else{ |
|
| 144 | - $this->visibleProperties[$index]=[$vb[$index],$field]; |
|
| 143 | + } else { |
|
| 144 | + $this->visibleProperties[$index]=[$vb[$index], $field]; |
|
| 145 | 145 | } |
| 146 | - }else{ |
|
| 146 | + } else { |
|
| 147 | 147 | return $this->insertField($index, $field); |
| 148 | 148 | } |
| 149 | 149 | return $this; |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | - public function addField($field){ |
|
| 152 | + public function addField($field) { |
|
| 153 | 153 | $this->visibleProperties[]=$field; |
| 154 | 154 | return $this; |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | - public function addFields($fields){ |
|
| 158 | - $this->visibleProperties=\array_merge($this->visibleProperties,$fields); |
|
| 157 | + public function addFields($fields) { |
|
| 158 | + $this->visibleProperties=\array_merge($this->visibleProperties, $fields); |
|
| 159 | 159 | return $this; |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | - public function count(){ |
|
| 162 | + public function count() { |
|
| 163 | 163 | return \sizeof($this->properties); |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | - public function visiblePropertiesCount(){ |
|
| 166 | + public function visiblePropertiesCount() { |
|
| 167 | 167 | return \sizeof($this->visibleProperties); |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | - public function getProperty($index){ |
|
| 170 | + public function getProperty($index) { |
|
| 171 | 171 | return $this->properties[$index]; |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | - public function getFieldName($index){ |
|
| 174 | + public function getFieldName($index) { |
|
| 175 | 175 | $property=$this->getProperty($index); |
| 176 | - if($property instanceof \ReflectionProperty){ |
|
| 176 | + if ($property instanceof \ReflectionProperty) { |
|
| 177 | 177 | $result=$property->getName(); |
| 178 | - }elseif(\is_callable($property)){ |
|
| 178 | + }elseif (\is_callable($property)) { |
|
| 179 | 179 | $result=$this->visibleProperties[$index]; |
| 180 | - }else{ |
|
| 180 | + } else { |
|
| 181 | 181 | $result=$property; |
| 182 | 182 | } |
| 183 | 183 | return $result; |
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | |
| 187 | - protected function showableProperty(\ReflectionProperty $rProperty){ |
|
| 188 | - return JString::startswith($rProperty->getName(),"_")===false; |
|
| 187 | + protected function showableProperty(\ReflectionProperty $rProperty) { |
|
| 188 | + return JString::startswith($rProperty->getName(), "_")===false; |
|
| 189 | 189 | } |
| 190 | 190 | |
| 191 | 191 | public function setInstance($instance) { |
| 192 | - if(\is_string($instance)){ |
|
| 192 | + if (\is_string($instance)) { |
|
| 193 | 193 | $instance=new $instance(); |
| 194 | 194 | } |
| 195 | 195 | $this->instance=$instance; |
| 196 | 196 | $this->properties=[]; |
| 197 | 197 | $this->reflect=new \ReflectionClass($instance); |
| 198 | - if(JArray::count($this->visibleProperties)===0){ |
|
| 198 | + if (JArray::count($this->visibleProperties)===0) { |
|
| 199 | 199 | $this->properties=$this->getDefaultProperties(); |
| 200 | - }else{ |
|
| 201 | - foreach ($this->visibleProperties as $property){ |
|
| 200 | + } else { |
|
| 201 | + foreach ($this->visibleProperties as $property) { |
|
| 202 | 202 | $this->setInstanceProperty($property); |
| 203 | 203 | } |
| 204 | 204 | } |
| 205 | 205 | return $this; |
| 206 | 206 | } |
| 207 | 207 | |
| 208 | - private function setInstanceProperty($property){ |
|
| 209 | - if(\is_callable($property)){ |
|
| 208 | + private function setInstanceProperty($property) { |
|
| 209 | + if (\is_callable($property)) { |
|
| 210 | 210 | $this->properties[]=$property; |
| 211 | - }elseif(\is_string($property)){ |
|
| 212 | - try{ |
|
| 211 | + }elseif (\is_string($property)) { |
|
| 212 | + try { |
|
| 213 | 213 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
| 214 | 214 | $rProperty=$this->reflect->getProperty($property); |
| 215 | 215 | $this->properties[]=$rProperty; |
| 216 | - }catch(\Exception $e){ |
|
| 216 | + }catch (\Exception $e) { |
|
| 217 | 217 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
| 218 | 218 | $this->properties[]=$property; |
| 219 | 219 | } |
| 220 | - }elseif(\is_int($property)){ |
|
| 220 | + }elseif (\is_int($property)) { |
|
| 221 | 221 | $props=$this->getDefaultProperties(); |
| 222 | - if(isset($props[$property])) |
|
| 222 | + if (isset($props[$property])) |
|
| 223 | 223 | $this->properties[]=$props[$property]; |
| 224 | 224 | else |
| 225 | 225 | $this->properties[]=$property; |
| 226 | - }else{ |
|
| 226 | + } else { |
|
| 227 | 227 | $this->properties[]=$property; |
| 228 | 228 | } |
| 229 | 229 | } |
| 230 | 230 | |
| 231 | - protected function getDefaultProperties(){ |
|
| 231 | + protected function getDefaultProperties() { |
|
| 232 | 232 | $result=[]; |
| 233 | 233 | $properties=$this->reflect->getProperties(); |
| 234 | - foreach ($properties as $property){ |
|
| 234 | + foreach ($properties as $property) { |
|
| 235 | 235 | $showable=$this->showableProperty($property); |
| 236 | - if($showable!==false){ |
|
| 236 | + if ($showable!==false) { |
|
| 237 | 237 | $result[]=$property; |
| 238 | 238 | } |
| 239 | 239 | } |
@@ -245,12 +245,12 @@ discard block |
||
| 245 | 245 | return $this; |
| 246 | 246 | } |
| 247 | 247 | |
| 248 | - public function setValueFunction($index,$callback){ |
|
| 248 | + public function setValueFunction($index, $callback) { |
|
| 249 | 249 | $this->values[$index]=$callback; |
| 250 | 250 | return $this; |
| 251 | 251 | } |
| 252 | 252 | |
| 253 | - public function setIdentifierFunction($callback){ |
|
| 253 | + public function setIdentifierFunction($callback) { |
|
| 254 | 254 | $this->values["identifier"]=$callback; |
| 255 | 255 | return $this; |
| 256 | 256 | } |
@@ -263,42 +263,42 @@ discard block |
||
| 263 | 263 | return $this->properties; |
| 264 | 264 | } |
| 265 | 265 | |
| 266 | - public function getCaption($index){ |
|
| 267 | - if(isset($this->captions[$index])){ |
|
| 266 | + public function getCaption($index) { |
|
| 267 | + if (isset($this->captions[$index])) { |
|
| 268 | 268 | return $this->captions[$index]; |
| 269 | 269 | } |
| 270 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
| 270 | + if ($this->properties[$index] instanceof \ReflectionProperty) |
|
| 271 | 271 | return $this->properties[$index]->getName(); |
| 272 | - elseif(\is_callable($this->properties[$index])) |
|
| 272 | + elseif (\is_callable($this->properties[$index])) |
|
| 273 | 273 | return ""; |
| 274 | 274 | else |
| 275 | 275 | return $this->properties[$index]; |
| 276 | 276 | } |
| 277 | 277 | |
| 278 | - public function getCaptions(){ |
|
| 278 | + public function getCaptions() { |
|
| 279 | 279 | $count=$this->count(); |
| 280 | - if(isset($this->captions)){ |
|
| 281 | - $captions= \array_values($this->captions); |
|
| 280 | + if (isset($this->captions)) { |
|
| 281 | + $captions=\array_values($this->captions); |
|
| 282 | 282 | $captionsSize=\sizeof($captions); |
| 283 | - for($i=$captionsSize;$i<$count;$i++){ |
|
| 283 | + for ($i=$captionsSize; $i<$count; $i++) { |
|
| 284 | 284 | $captions[]=""; |
| 285 | 285 | } |
| 286 | - }else{ |
|
| 286 | + } else { |
|
| 287 | 287 | $captions=[]; |
| 288 | 288 | $index=0; |
| 289 | - while($index<$count){ |
|
| 289 | + while ($index<$count) { |
|
| 290 | 290 | $captions[]=$this->getCaption($index++); |
| 291 | 291 | } |
| 292 | 292 | } |
| 293 | - if(isset($this->captionCallback) && \is_callable($this->captionCallback)){ |
|
| 293 | + if (isset($this->captionCallback) && \is_callable($this->captionCallback)) { |
|
| 294 | 294 | $callback=$this->captionCallback; |
| 295 | - $callback($captions,$this->instance); |
|
| 295 | + $callback($captions, $this->instance); |
|
| 296 | 296 | } |
| 297 | 297 | return $captions; |
| 298 | 298 | } |
| 299 | 299 | |
| 300 | - public function setCaption($index,$caption){ |
|
| 301 | - if(isset($this->captions)===false) |
|
| 300 | + public function setCaption($index, $caption) { |
|
| 301 | + if (isset($this->captions)===false) |
|
| 302 | 302 | $this->captions=[]; |
| 303 | 303 | $this->captions[$index]=$caption; |
| 304 | 304 | return $this; |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | * @param callable $callback function called after the field compilation |
| 317 | 317 | * @return \Ajax\semantic\widgets\datatable\InstanceViewer |
| 318 | 318 | */ |
| 319 | - public function afterCompile($index,$callback){ |
|
| 319 | + public function afterCompile($index, $callback) { |
|
| 320 | 320 | $this->afterCompile[$index]=$callback; |
| 321 | 321 | return $this; |
| 322 | 322 | } |
@@ -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 | } |
