@@ -35,8 +35,9 @@ discard block |
||
| 35 | 35 | $this->widgetIdentifier = $identifier; |
| 36 | 36 | $this->values = []; |
| 37 | 37 | $this->afterCompile = []; |
| 38 | - if (isset($instance)) |
|
| 39 | - $this->setInstance($instance); |
|
| 38 | + if (isset($instance)) { |
|
| 39 | + $this->setInstance($instance); |
|
| 40 | + } |
|
| 40 | 41 | $this->setCaptions($captions); |
| 41 | 42 | $this->captionCallback = NULL; |
| 42 | 43 | $this->defaultValueFunction = function ($name, $value) { |
@@ -86,14 +87,16 @@ discard block |
||
| 86 | 87 | } |
| 87 | 88 | |
| 88 | 89 | public function getIdentifier($index = NULL) { |
| 89 | - if (! isset($index)) |
|
| 90 | - $index = self::$index; |
|
| 90 | + if (! isset($index)) { |
|
| 91 | + $index = self::$index; |
|
| 92 | + } |
|
| 91 | 93 | $value = $index; |
| 92 | 94 | if (isset($this->values["identifier"])) { |
| 93 | - if (\is_string($this->values["identifier"])) |
|
| 94 | - $value = JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
| 95 | - else |
|
| 96 | - $value = $this->values["identifier"]($index, $this->instance); |
|
| 95 | + if (\is_string($this->values["identifier"])) { |
|
| 96 | + $value = JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
| 97 | + } else { |
|
| 98 | + $value = $this->values["identifier"]($index, $this->instance); |
|
| 99 | + } |
|
| 97 | 100 | } |
| 98 | 101 | return $value; |
| 99 | 102 | } |
@@ -123,9 +126,9 @@ discard block |
||
| 123 | 126 | $propertyName = $property->getName(); |
| 124 | 127 | } elseif (\is_callable($property) && array_search($property, [ |
| 125 | 128 | "system" |
| 126 | - ]) === false) |
|
| 127 | - $value = $property($this->instance); |
|
| 128 | - elseif (\is_array($property)) { |
|
| 129 | + ]) === false) { |
|
| 130 | + $value = $property($this->instance); |
|
| 131 | + } elseif (\is_array($property)) { |
|
| 129 | 132 | $values = \array_map(function ($v) use ($index) { |
| 130 | 133 | return $this->_getValue($v, $index); |
| 131 | 134 | }, $property); |
@@ -279,10 +282,11 @@ discard block |
||
| 279 | 282 | } |
| 280 | 283 | } elseif (\is_int($property)) { |
| 281 | 284 | $props = $this->getDefaultProperties(); |
| 282 | - if (isset($props[$property])) |
|
| 283 | - $this->properties[] = $props[$property]; |
|
| 284 | - else |
|
| 285 | - $this->properties[] = $property; |
|
| 285 | + if (isset($props[$property])) { |
|
| 286 | + $this->properties[] = $props[$property]; |
|
| 287 | + } else { |
|
| 288 | + $this->properties[] = $property; |
|
| 289 | + } |
|
| 286 | 290 | } else { |
| 287 | 291 | $this->properties[] = $property; |
| 288 | 292 | } |
@@ -327,12 +331,13 @@ discard block |
||
| 327 | 331 | if (isset($this->captions[$index])) { |
| 328 | 332 | return $this->captions[$index]; |
| 329 | 333 | } |
| 330 | - if ($this->properties[$index] instanceof \ReflectionProperty) |
|
| 331 | - return $this->properties[$index]->getName(); |
|
| 332 | - elseif (\is_callable($this->properties[$index])) |
|
| 333 | - return ""; |
|
| 334 | - else |
|
| 335 | - return $this->properties[$index]; |
|
| 334 | + if ($this->properties[$index] instanceof \ReflectionProperty) { |
|
| 335 | + return $this->properties[$index]->getName(); |
|
| 336 | + } elseif (\is_callable($this->properties[$index])) { |
|
| 337 | + return ""; |
|
| 338 | + } else { |
|
| 339 | + return $this->properties[$index]; |
|
| 340 | + } |
|
| 336 | 341 | } |
| 337 | 342 | |
| 338 | 343 | public function getCaptions() { |
@@ -365,8 +370,9 @@ discard block |
||
| 365 | 370 | } |
| 366 | 371 | |
| 367 | 372 | public function setCaption($index, $caption) { |
| 368 | - if (isset($this->captions) === false) |
|
| 369 | - $this->captions = []; |
|
| 373 | + if (isset($this->captions) === false) { |
|
| 374 | + $this->captions = []; |
|
| 375 | + } |
|
| 370 | 376 | $this->captions[$index] = $caption; |
| 371 | 377 | return $this; |
| 372 | 378 | } |
@@ -81,16 +81,19 @@ discard block |
||
| 81 | 81 | "stopPropagation" => true |
| 82 | 82 | ]); |
| 83 | 83 | } |
| 84 | - if (\is_array($this->_deleteBehavior)) |
|
| 85 | - $this->_generateBehavior("delete", $this->_deleteBehavior, $js); |
|
| 86 | - if (\is_array($this->_editBehavior)) |
|
| 87 | - $this->_generateBehavior("edit", $this->_editBehavior, $js); |
|
| 84 | + if (\is_array($this->_deleteBehavior)) { |
|
| 85 | + $this->_generateBehavior("delete", $this->_deleteBehavior, $js); |
|
| 86 | + } |
|
| 87 | + if (\is_array($this->_editBehavior)) { |
|
| 88 | + $this->_generateBehavior("edit", $this->_editBehavior, $js); |
|
| 89 | + } |
|
| 88 | 90 | if (\is_array($this->_displayBehavior)) { |
| 89 | 91 | $this->_generateBehavior("display", $this->_displayBehavior, $js); |
| 90 | 92 | } |
| 91 | 93 | parent::run($js); |
| 92 | - if (isset($this->_pagination)) |
|
| 93 | - $this->_associatePaginationBehavior($js, $offset); |
|
| 94 | + if (isset($this->_pagination)) { |
|
| 95 | + $this->_associatePaginationBehavior($js, $offset); |
|
| 96 | + } |
|
| 94 | 97 | $this->_associateSearchFieldBehavior($js, $offset); |
| 95 | 98 | } |
| 96 | 99 | |
@@ -139,8 +142,9 @@ discard block |
||
| 139 | 142 | $table->setRowCount(0, \sizeof($captions)); |
| 140 | 143 | $this->_generateHeader($table, $captions); |
| 141 | 144 | |
| 142 | - if (isset($this->_compileParts)) |
|
| 143 | - $table->setCompileParts($this->_compileParts); |
|
| 145 | + if (isset($this->_compileParts)) { |
|
| 146 | + $table->setCompileParts($this->_compileParts); |
|
| 147 | + } |
|
| 144 | 148 | |
| 145 | 149 | $this->_generateContent($table); |
| 146 | 150 | |
@@ -175,8 +179,9 @@ discard block |
||
| 175 | 179 | } |
| 176 | 180 | |
| 177 | 181 | protected function _applyStyleAttributes($table) { |
| 178 | - if (isset($this->_hiddenColumns)) |
|
| 179 | - $this->_hideColumns(); |
|
| 182 | + if (isset($this->_hiddenColumns)) { |
|
| 183 | + $this->_hideColumns(); |
|
| 184 | + } |
|
| 180 | 185 | if (isset($this->_colWidths)) { |
| 181 | 186 | foreach ($this->_colWidths as $colIndex => $width) { |
| 182 | 187 | $table->setColWidth($colIndex, $width); |
@@ -285,8 +290,9 @@ discard block |
||
| 285 | 290 | $field = $ck->getField(); |
| 286 | 291 | $field->setProperty("value", $dataAjax); |
| 287 | 292 | $field->setProperty("name", "selection[]"); |
| 288 | - if (isset($checkedClass)) |
|
| 289 | - $field->setClass($checkedClass); |
|
| 293 | + if (isset($checkedClass)) { |
|
| 294 | + $field->setClass($checkedClass); |
|
| 295 | + } |
|
| 290 | 296 | \array_unshift($values, $ck); |
| 291 | 297 | } |
| 292 | 298 | $result = $table->newRow(); |
@@ -303,8 +309,9 @@ discard block |
||
| 303 | 309 | |
| 304 | 310 | protected function _generatePagination($table) { |
| 305 | 311 | if (isset($this->_toolbar)) { |
| 306 | - if ($this->_toolbarPosition == PositionInTable::FOOTER) |
|
| 307 | - $this->_toolbar->setFloated("left"); |
|
| 312 | + if ($this->_toolbarPosition == PositionInTable::FOOTER) { |
|
| 313 | + $this->_toolbar->setFloated("left"); |
|
| 314 | + } |
|
| 308 | 315 | } |
| 309 | 316 | $footer = $table->getFooter(); |
| 310 | 317 | $footer->mergeCol(); |
@@ -344,8 +351,9 @@ discard block |
||
| 344 | 351 | |
| 345 | 352 | protected function _getFieldName($index) { |
| 346 | 353 | $fieldName = parent::_getFieldName($index); |
| 347 | - if (\is_object($fieldName)) |
|
| 348 | - $fieldName = "field-" . $index; |
|
| 354 | + if (\is_object($fieldName)) { |
|
| 355 | + $fieldName = "field-" . $index; |
|
| 356 | + } |
|
| 349 | 357 | return $fieldName . "[]"; |
| 350 | 358 | } |
| 351 | 359 | |
@@ -522,8 +530,9 @@ discard block |
||
| 522 | 530 | |
| 523 | 531 | protected function getTargetSelector($op) { |
| 524 | 532 | $result = $this->_targetSelector; |
| 525 | - if (! isset($result[$op])) |
|
| 526 | - $result = "#" . $this->identifier; |
|
| 533 | + if (! isset($result[$op])) { |
|
| 534 | + $result = "#" . $this->identifier; |
|
| 535 | + } |
|
| 527 | 536 | return $result[$op]; |
| 528 | 537 | } |
| 529 | 538 | |
@@ -546,8 +555,9 @@ discard block |
||
| 546 | 555 | } |
| 547 | 556 | |
| 548 | 557 | public function getRefreshSelector() { |
| 549 | - if (isset($this->_refreshSelector)) |
|
| 550 | - return $this->_refreshSelector; |
|
| 558 | + if (isset($this->_refreshSelector)) { |
|
| 559 | + return $this->_refreshSelector; |
|
| 560 | + } |
|
| 551 | 561 | return "#" . $this->identifier . " tbody"; |
| 552 | 562 | } |
| 553 | 563 | |
@@ -568,8 +578,9 @@ discard block |
||
| 568 | 578 | */ |
| 569 | 579 | public function show($modelInstance) { |
| 570 | 580 | if (\is_array($modelInstance)) { |
| 571 | - if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) |
|
| 572 | - $modelInstance = \json_decode(\json_encode($modelInstance), FALSE); |
|
| 581 | + if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) { |
|
| 582 | + $modelInstance = \json_decode(\json_encode($modelInstance), FALSE); |
|
| 583 | + } |
|
| 573 | 584 | } |
| 574 | 585 | $this->_modelInstance = $modelInstance; |
| 575 | 586 | } |
@@ -611,8 +622,9 @@ discard block |
||
| 611 | 622 | } |
| 612 | 623 | |
| 613 | 624 | public function hideColumn($colIndex) { |
| 614 | - if (! \is_array($this->_hiddenColumns)) |
|
| 615 | - $this->_hiddenColumns = []; |
|
| 625 | + if (! \is_array($this->_hiddenColumns)) { |
|
| 626 | + $this->_hiddenColumns = []; |
|
| 627 | + } |
|
| 616 | 628 | $this->_hiddenColumns[] = $colIndex; |
| 617 | 629 | return $this; |
| 618 | 630 | } |
@@ -12,21 +12,24 @@ discard block |
||
| 12 | 12 | return $array[$key]; |
| 13 | 13 | } |
| 14 | 14 | $values = array_values($array); |
| 15 | - if ($pos < sizeof($values)) |
|
| 16 | - return $values[$pos]; |
|
| 15 | + if ($pos < sizeof($values)) { |
|
| 16 | + return $values[$pos]; |
|
| 17 | + } |
|
| 17 | 18 | } |
| 18 | 19 | |
| 19 | 20 | public static function getConditionalValue($array, $key, $condition) { |
| 20 | 21 | $result = NULL; |
| 21 | 22 | if (array_key_exists($key, $array)) { |
| 22 | 23 | $result = $array[$key]; |
| 23 | - if ($condition($result) === true) |
|
| 24 | - return $result; |
|
| 24 | + if ($condition($result) === true) { |
|
| 25 | + return $result; |
|
| 26 | + } |
|
| 25 | 27 | } |
| 26 | 28 | $values = array_values($array); |
| 27 | 29 | foreach ($values as $val) { |
| 28 | - if ($condition($val) === true) |
|
| 29 | - return $val; |
|
| 30 | + if ($condition($val) === true) { |
|
| 31 | + return $val; |
|
| 32 | + } |
|
| 30 | 33 | } |
| 31 | 34 | return $result; |
| 32 | 35 | } |
@@ -34,8 +37,9 @@ discard block |
||
| 34 | 37 | public static function getDefaultValue($array, $key, $default = NULL) { |
| 35 | 38 | if (array_key_exists($key, $array)) { |
| 36 | 39 | return $array[$key]; |
| 37 | - } else |
|
| 38 | - return $default; |
|
| 40 | + } else { |
|
| 41 | + return $default; |
|
| 42 | + } |
|
| 39 | 43 | } |
| 40 | 44 | |
| 41 | 45 | public static function implode($glue, $pieces) { |
@@ -116,12 +120,12 @@ discard block |
||
| 116 | 120 | } |
| 117 | 121 | |
| 118 | 122 | private static function callFunction($object, $callback) { |
| 119 | - if (\is_string($callback)) |
|
| 120 | - return \call_user_func(array( |
|
| 123 | + if (\is_string($callback)) { |
|
| 124 | + return \call_user_func(array( |
|
| 121 | 125 | $object, |
| 122 | 126 | $callback |
| 123 | 127 | ), []); |
| 124 | - else if (\is_callable($callback)) { |
|
| 128 | + } else if (\is_callable($callback)) { |
|
| 125 | 129 | return $callback($object); |
| 126 | 130 | } |
| 127 | 131 | } |