@@ -53,9 +53,9 @@ |
||
| 53 | 53 | * @return $this |
| 54 | 54 | */ |
| 55 | 55 | public function setAnimate($value) { |
| 56 | - if ($value instanceof Animation) |
|
| 57 | - $value = $value->getParams(); |
|
| 58 | - else if (is_string($value)) { |
|
| 56 | + if ($value instanceof Animation) { |
|
| 57 | + $value = $value->getParams(); |
|
| 58 | + } else if (is_string($value)) { |
|
| 59 | 59 | $animation = new Animation(); |
| 60 | 60 | $animation->setEasing($value); |
| 61 | 61 | } |
@@ -14,8 +14,9 @@ |
||
| 14 | 14 | class DialogButton extends BaseComponent { |
| 15 | 15 | |
| 16 | 16 | private function addFunction($jsCode) { |
| 17 | - if (! JString::startsWith($jsCode, "function")) |
|
| 18 | - $jsCode = "%function(){" . $jsCode . "}%"; |
|
| 17 | + if (! JString::startsWith($jsCode, "function")) { |
|
| 18 | + $jsCode = "%function(){" . $jsCode . "}%"; |
|
| 19 | + } |
|
| 19 | 20 | return $jsCode; |
| 20 | 21 | } |
| 21 | 22 | |
@@ -84,8 +84,9 @@ |
||
| 84 | 84 | protected function setParamCtrl($key, $value, $typeCtrl) { |
| 85 | 85 | if (! $typeCtrl($value)) { |
| 86 | 86 | throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $key . " à la position"); |
| 87 | - } else |
|
| 88 | - $this->setParam($key, $value); |
|
| 87 | + } else { |
|
| 88 | + $this->setParam($key, $value); |
|
| 89 | + } |
|
| 89 | 90 | } |
| 90 | 91 | |
| 91 | 92 | /* |
@@ -49,8 +49,9 @@ discard block |
||
| 49 | 49 | * @param string $popupEvent |
| 50 | 50 | */ |
| 51 | 51 | public function setPopupAttributes($variation = NULL, $popupEvent = NULL) { |
| 52 | - if (isset($this->_popup)) |
|
| 53 | - $this->_popup->setAttributes($variation, $popupEvent); |
|
| 52 | + if (isset($this->_popup)) { |
|
| 53 | + $this->_popup->setAttributes($variation, $popupEvent); |
|
| 54 | + } |
|
| 54 | 55 | } |
| 55 | 56 | |
| 56 | 57 | /** |
@@ -109,8 +110,9 @@ discard block |
||
| 109 | 110 | $labelO = $label; |
| 110 | 111 | if (\is_object($label) === false) { |
| 111 | 112 | $labelO = new HtmlLabel("label-" . $this->identifier, $label); |
| 112 | - if (isset($icon)) |
|
| 113 | - $labelO->addIcon($icon); |
|
| 113 | + if (isset($icon)) { |
|
| 114 | + $labelO->addIcon($icon); |
|
| 115 | + } |
|
| 114 | 116 | } else { |
| 115 | 117 | $labelO->addToPropertyCtrl("class", "label", array( |
| 116 | 118 | "label" |
@@ -141,10 +143,12 @@ discard block |
||
| 141 | 143 | * @return HtmlSemDoubleElement |
| 142 | 144 | */ |
| 143 | 145 | public function asLink($href = NULL, $target = NULL) { |
| 144 | - if (isset($href)) |
|
| 145 | - $this->setProperty("href", $href); |
|
| 146 | - if (isset($target)) |
|
| 147 | - $this->setProperty("target", $target); |
|
| 146 | + if (isset($href)) { |
|
| 147 | + $this->setProperty("href", $href); |
|
| 148 | + } |
|
| 149 | + if (isset($target)) { |
|
| 150 | + $this->setProperty("target", $target); |
|
| 151 | + } |
|
| 148 | 152 | return $this->setTagName("a"); |
| 149 | 153 | } |
| 150 | 154 | |
@@ -156,8 +160,9 @@ discard block |
||
| 156 | 160 | */ |
| 157 | 161 | public function jsShowDimmer($show = true) { |
| 158 | 162 | $status = "hide"; |
| 159 | - if ($show === true) |
|
| 160 | - $status = "show"; |
|
| 163 | + if ($show === true) { |
|
| 164 | + $status = "show"; |
|
| 165 | + } |
|
| 161 | 166 | return '$("#.' . $this->identifier . ').dimmer("' . $status . '");'; |
| 162 | 167 | } |
| 163 | 168 | |
@@ -15,8 +15,9 @@ |
||
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | public function compile(JsUtils $js = null) { |
| 18 | - if ($js === null) |
|
| 19 | - return; |
|
| 18 | + if ($js === null) { |
|
| 19 | + return; |
|
| 20 | + } |
|
| 20 | 21 | $params = "{}"; |
| 21 | 22 | $stopPropagation = true; |
| 22 | 23 | $preventDefault = true; |
@@ -82,16 +82,19 @@ discard block |
||
| 82 | 82 | "stopPropagation" => true |
| 83 | 83 | ]); |
| 84 | 84 | } |
| 85 | - if (\is_array($this->_deleteBehavior)) |
|
| 86 | - $this->_generateBehavior("delete", $this->_deleteBehavior, $js); |
|
| 87 | - if (\is_array($this->_editBehavior)) |
|
| 88 | - $this->_generateBehavior("edit", $this->_editBehavior, $js); |
|
| 85 | + if (\is_array($this->_deleteBehavior)) { |
|
| 86 | + $this->_generateBehavior("delete", $this->_deleteBehavior, $js); |
|
| 87 | + } |
|
| 88 | + if (\is_array($this->_editBehavior)) { |
|
| 89 | + $this->_generateBehavior("edit", $this->_editBehavior, $js); |
|
| 90 | + } |
|
| 89 | 91 | if (\is_array($this->_displayBehavior)) { |
| 90 | 92 | $this->_generateBehavior("display", $this->_displayBehavior, $js); |
| 91 | 93 | } |
| 92 | 94 | parent::run($js); |
| 93 | - if (isset($this->_pagination)) |
|
| 94 | - $this->_associatePaginationBehavior($js, $offset); |
|
| 95 | + if (isset($this->_pagination)) { |
|
| 96 | + $this->_associatePaginationBehavior($js, $offset); |
|
| 97 | + } |
|
| 95 | 98 | $this->_associateSearchFieldBehavior($js, $offset); |
| 96 | 99 | $this->_runned = true; |
| 97 | 100 | } |
@@ -142,8 +145,9 @@ discard block |
||
| 142 | 145 | $table->setRowCount(0, \sizeof($captions)); |
| 143 | 146 | $this->_generateHeader($table, $captions); |
| 144 | 147 | |
| 145 | - if (isset($this->_compileParts)) |
|
| 146 | - $table->setCompileParts($this->_compileParts); |
|
| 148 | + if (isset($this->_compileParts)) { |
|
| 149 | + $table->setCompileParts($this->_compileParts); |
|
| 150 | + } |
|
| 147 | 151 | |
| 148 | 152 | $this->_generateContent($table); |
| 149 | 153 | |
@@ -178,8 +182,9 @@ discard block |
||
| 178 | 182 | } |
| 179 | 183 | |
| 180 | 184 | protected function _applyStyleAttributes($table) { |
| 181 | - if (isset($this->_hiddenColumns)) |
|
| 182 | - $this->_hideColumns(); |
|
| 185 | + if (isset($this->_hiddenColumns)) { |
|
| 186 | + $this->_hideColumns(); |
|
| 187 | + } |
|
| 183 | 188 | if (isset($this->_colWidths)) { |
| 184 | 189 | foreach ($this->_colWidths as $colIndex => $width) { |
| 185 | 190 | $table->setColWidth($colIndex, $width); |
@@ -288,8 +293,9 @@ discard block |
||
| 288 | 293 | $field = $ck->getField(); |
| 289 | 294 | $field->setProperty("value", $dataAjax); |
| 290 | 295 | $field->setProperty("name", "selection[]"); |
| 291 | - if (isset($checkedClass)) |
|
| 292 | - $field->setClass($checkedClass); |
|
| 296 | + if (isset($checkedClass)) { |
|
| 297 | + $field->setClass($checkedClass); |
|
| 298 | + } |
|
| 293 | 299 | \array_unshift($values, $ck); |
| 294 | 300 | } |
| 295 | 301 | $result = $table->newRow(); |
@@ -306,8 +312,9 @@ discard block |
||
| 306 | 312 | |
| 307 | 313 | protected function _generatePagination($table) { |
| 308 | 314 | if (isset($this->_toolbar)) { |
| 309 | - if ($this->_toolbarPosition == PositionInTable::FOOTER) |
|
| 310 | - $this->_toolbar->setFloated("left"); |
|
| 315 | + if ($this->_toolbarPosition == PositionInTable::FOOTER) { |
|
| 316 | + $this->_toolbar->setFloated("left"); |
|
| 317 | + } |
|
| 311 | 318 | } |
| 312 | 319 | $footer = $table->getFooter(); |
| 313 | 320 | $footer->mergeCol(); |
@@ -347,8 +354,9 @@ discard block |
||
| 347 | 354 | |
| 348 | 355 | protected function _getFieldName($index) { |
| 349 | 356 | $fieldName = parent::_getFieldName($index); |
| 350 | - if (\is_object($fieldName)) |
|
| 351 | - $fieldName = "field-" . $index; |
|
| 357 | + if (\is_object($fieldName)) { |
|
| 358 | + $fieldName = "field-" . $index; |
|
| 359 | + } |
|
| 352 | 360 | return $fieldName . "[]"; |
| 353 | 361 | } |
| 354 | 362 | |
@@ -527,8 +535,9 @@ discard block |
||
| 527 | 535 | |
| 528 | 536 | protected function getTargetSelector($op) { |
| 529 | 537 | $result = $this->_targetSelector; |
| 530 | - if (! isset($result[$op])) |
|
| 531 | - $result = "#" . $this->identifier; |
|
| 538 | + if (! isset($result[$op])) { |
|
| 539 | + $result = "#" . $this->identifier; |
|
| 540 | + } |
|
| 532 | 541 | return $result[$op]; |
| 533 | 542 | } |
| 534 | 543 | |
@@ -551,8 +560,9 @@ discard block |
||
| 551 | 560 | } |
| 552 | 561 | |
| 553 | 562 | public function getRefreshSelector() { |
| 554 | - if (isset($this->_refreshSelector)) |
|
| 555 | - return $this->_refreshSelector; |
|
| 563 | + if (isset($this->_refreshSelector)) { |
|
| 564 | + return $this->_refreshSelector; |
|
| 565 | + } |
|
| 556 | 566 | return "#" . $this->identifier . " tbody"; |
| 557 | 567 | } |
| 558 | 568 | |
@@ -573,8 +583,9 @@ discard block |
||
| 573 | 583 | */ |
| 574 | 584 | public function show($modelInstance) { |
| 575 | 585 | if (\is_array($modelInstance)) { |
| 576 | - if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) |
|
| 577 | - $modelInstance = \json_decode(\json_encode($modelInstance), FALSE); |
|
| 586 | + if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) { |
|
| 587 | + $modelInstance = \json_decode(\json_encode($modelInstance), FALSE); |
|
| 588 | + } |
|
| 578 | 589 | } |
| 579 | 590 | $this->_modelInstance = $modelInstance; |
| 580 | 591 | } |
@@ -616,8 +627,9 @@ discard block |
||
| 616 | 627 | } |
| 617 | 628 | |
| 618 | 629 | public function hideColumn($colIndex) { |
| 619 | - if (! \is_array($this->_hiddenColumns)) |
|
| 620 | - $this->_hiddenColumns = []; |
|
| 630 | + if (! \is_array($this->_hiddenColumns)) { |
|
| 631 | + $this->_hiddenColumns = []; |
|
| 632 | + } |
|
| 621 | 633 | $this->_hiddenColumns[] = $colIndex; |
| 622 | 634 | return $this; |
| 623 | 635 | } |
@@ -126,8 +126,9 @@ discard block |
||
| 126 | 126 | public function fieldAsLabel($index, $icon = NULL, $attributes = NULL) { |
| 127 | 127 | return $this->_fieldAs(function ($id, $name, $value) use ($icon) { |
| 128 | 128 | $lbl = new HtmlLabel($id, $value); |
| 129 | - if (isset($icon)) |
|
| 130 | - $lbl->addIcon($icon); |
|
| 129 | + if (isset($icon)) { |
|
| 130 | + $lbl->addIcon($icon); |
|
| 131 | + } |
|
| 131 | 132 | return $lbl; |
| 132 | 133 | }, $index, $attributes, "label"); |
| 133 | 134 | } |
@@ -135,8 +136,9 @@ discard block |
||
| 135 | 136 | public function fieldAsHeader($index, $niveau = 1, $icon = NULL, $attributes = NULL) { |
| 136 | 137 | return $this->_fieldAs(function ($id, $name, $value) use ($niveau, $icon) { |
| 137 | 138 | $header = new HtmlHeader($id, $niveau, $value); |
| 138 | - if (isset($icon)) |
|
| 139 | - $header->asIcon($icon, $value); |
|
| 139 | + if (isset($icon)) { |
|
| 140 | + $header->asIcon($icon, $value); |
|
| 141 | + } |
|
| 140 | 142 | return $header; |
| 141 | 143 | }, $index, $attributes, "header"); |
| 142 | 144 | } |
@@ -145,8 +147,9 @@ discard block |
||
| 145 | 147 | $this->setValueFunction($index, function ($img) use ($size, $circular) { |
| 146 | 148 | $image = new HtmlImage($this->_getFieldIdentifier("image"), $img); |
| 147 | 149 | $image->setSize($size); |
| 148 | - if ($circular) |
|
| 149 | - $image->setCircular(); |
|
| 150 | + if ($circular) { |
|
| 151 | + $image->setCircular(); |
|
| 152 | + } |
|
| 150 | 153 | return $image; |
| 151 | 154 | }); |
| 152 | 155 | return $this; |
@@ -251,8 +254,9 @@ discard block |
||
| 251 | 254 | |
| 252 | 255 | public function fieldAsCheckbox($index, $attributes = NULL) { |
| 253 | 256 | return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) { |
| 254 | - if ($caption === null || $caption === "") |
|
| 255 | - $caption = ""; |
|
| 257 | + if ($caption === null || $caption === "") { |
|
| 258 | + $caption = ""; |
|
| 259 | + } |
|
| 256 | 260 | $input = new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier()); |
| 257 | 261 | $input->setChecked(JString::isBooleanTrue($value)); |
| 258 | 262 | return $this->_prepareFormFields($input, $name, $attributes); |
@@ -292,9 +296,9 @@ discard block |
||
| 292 | 296 | $i = 0; |
| 293 | 297 | if (JArray::isAssociative($types)) { |
| 294 | 298 | foreach ($types as $type => $attributes) { |
| 295 | - if (\is_int($type)) |
|
| 296 | - $this->fieldAs($i ++, $attributes, []); |
|
| 297 | - else { |
|
| 299 | + if (\is_int($type)) { |
|
| 300 | + $this->fieldAs($i ++, $attributes, []); |
|
| 301 | + } else { |
|
| 298 | 302 | $type = preg_replace('/\d/', '', $type); |
| 299 | 303 | $this->fieldAs($i ++, $type, $attributes); |
| 300 | 304 | } |
@@ -34,8 +34,9 @@ discard block |
||
| 34 | 34 | $callback = ", function(){\n{$callback}\n}"; |
| 35 | 35 | } |
| 36 | 36 | $str = "$({$element}).{$action}({$speed}{$callback});"; |
| 37 | - if ($immediatly) |
|
| 38 | - $this->jquery_code_for_compile [] = $str; |
|
| 37 | + if ($immediatly) { |
|
| 38 | + $this->jquery_code_for_compile [] = $str; |
|
| 39 | + } |
|
| 39 | 40 | return $str; |
| 40 | 41 | } |
| 41 | 42 | |
@@ -73,10 +74,12 @@ discard block |
||
| 73 | 74 | if (isset ( $param )) { |
| 74 | 75 | $param = Javascript::prep_value ( $param ); |
| 75 | 76 | $str = "$({$element}).{$jQueryCall}({$param});"; |
| 76 | - } else |
|
| 77 | - $str = "$({$element}).{$jQueryCall}();"; |
|
| 78 | - if ($immediatly) |
|
| 79 | - $this->jquery_code_for_compile [] = $str; |
|
| 77 | + } else { |
|
| 78 | + $str = "$({$element}).{$jQueryCall}();"; |
|
| 79 | + } |
|
| 80 | + if ($immediatly) { |
|
| 81 | + $this->jquery_code_for_compile [] = $str; |
|
| 82 | + } |
|
| 80 | 83 | return $str; |
| 81 | 84 | } |
| 82 | 85 | |
@@ -94,8 +97,9 @@ discard block |
||
| 94 | 97 | $to = Javascript::prep_element ( $to ); |
| 95 | 98 | $element = Javascript::prep_element ( $element ); |
| 96 | 99 | $str = "$({$to}).{$jQueryCall}({$element});"; |
| 97 | - if ($immediatly) |
|
| 98 | - $this->jquery_code_for_compile [] = $str; |
|
| 100 | + if ($immediatly) { |
|
| 101 | + $this->jquery_code_for_compile [] = $str; |
|
| 102 | + } |
|
| 99 | 103 | return $str; |
| 100 | 104 | } |
| 101 | 105 | |
@@ -153,10 +157,12 @@ discard block |
||
| 153 | 157 | if (isset ( $value )) { |
| 154 | 158 | $value = Javascript::prep_value ( $value ); |
| 155 | 159 | $str = "$({$element}).attr(\"$attributeName\",{$value});"; |
| 156 | - } else |
|
| 157 | - $str = "$({$element}).attr(\"$attributeName\");"; |
|
| 158 | - if ($immediatly) |
|
| 159 | - $this->jquery_code_for_compile [] = $str; |
|
| 160 | + } else { |
|
| 161 | + $str = "$({$element}).attr(\"$attributeName\");"; |
|
| 162 | + } |
|
| 163 | + if ($immediatly) { |
|
| 164 | + $this->jquery_code_for_compile [] = $str; |
|
| 165 | + } |
|
| 160 | 166 | return $str; |
| 161 | 167 | } |
| 162 | 168 | |
@@ -219,8 +225,9 @@ discard block |
||
| 219 | 225 | |
| 220 | 226 | $str = "$({$element}).animate({\n$animations\n\t\t}" . $speed . $extra . ");"; |
| 221 | 227 | |
| 222 | - if ($immediatly) |
|
| 223 | - $this->jquery_code_for_compile [] = $str; |
|
| 228 | + if ($immediatly) { |
|
| 229 | + $this->jquery_code_for_compile [] = $str; |
|
| 230 | + } |
|
| 224 | 231 | return $str; |
| 225 | 232 | } |
| 226 | 233 | |
@@ -410,8 +417,9 @@ discard block |
||
| 410 | 417 | $element = Javascript::prep_element ( $element ); |
| 411 | 418 | $str = "$({$element}).trigger(\"$event\");"; |
| 412 | 419 | |
| 413 | - if ($immediatly) |
|
| 414 | - $this->jquery_code_for_compile [] = $str; |
|
| 420 | + if ($immediatly) { |
|
| 421 | + $this->jquery_code_for_compile [] = $str; |
|
| 422 | + } |
|
| 415 | 423 | return $str; |
| 416 | 424 | } |
| 417 | 425 | |
@@ -481,8 +489,9 @@ discard block |
||
| 481 | 489 | $str .= "else{" . $jsCodeIfFalse . "}"; |
| 482 | 490 | } |
| 483 | 491 | |
| 484 | - if ($immediatly) |
|
| 485 | - $this->jquery_code_for_compile [] = $str; |
|
| 492 | + if ($immediatly) { |
|
| 493 | + $this->jquery_code_for_compile [] = $str; |
|
| 494 | + } |
|
| 486 | 495 | return $str; |
| 487 | 496 | } |
| 488 | 497 | |
@@ -500,11 +509,13 @@ discard block |
||
| 500 | 509 | private function _doJQuery($element, $jqueryCall, $param = "", $jsCallback = "", $immediatly = false) { |
| 501 | 510 | $param = Javascript::prep_value ( $param ); |
| 502 | 511 | $callback = ""; |
| 503 | - if ($jsCallback != "") |
|
| 504 | - $callback = ", function(event){\n{$jsCallback}\n}"; |
|
| 512 | + if ($jsCallback != "") { |
|
| 513 | + $callback = ", function(event){\n{$jsCallback}\n}"; |
|
| 514 | + } |
|
| 505 | 515 | $script = "$(" . Javascript::prep_element ( $element ) . ")." . $jqueryCall . "(" . $param . $callback . ");\n"; |
| 506 | - if ($immediatly) |
|
| 507 | - $this->jquery_code_for_compile [] = $script; |
|
| 516 | + if ($immediatly) { |
|
| 517 | + $this->jquery_code_for_compile [] = $script; |
|
| 518 | + } |
|
| 508 | 519 | return $script; |
| 509 | 520 | } |
| 510 | 521 | |
@@ -591,8 +602,9 @@ discard block |
||
| 591 | 602 | */ |
| 592 | 603 | public function exec($js, $immediatly = false) { |
| 593 | 604 | $script = $js . "\n"; |
| 594 | - if ($immediatly) |
|
| 595 | - $this->jquery_code_for_compile [] = $script; |
|
| 605 | + if ($immediatly) { |
|
| 606 | + $this->jquery_code_for_compile [] = $script; |
|
| 607 | + } |
|
| 596 | 608 | return $script; |
| 597 | 609 | } |
| 598 | 610 | |
@@ -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 | } |
@@ -124,9 +127,8 @@ discard block |
||
| 124 | 127 | } elseif (\is_callable($property) && \array_search($property, ['system','date']) === false){ |
| 125 | 128 | try{ |
| 126 | 129 | $value = $property($this->instance); |
| 127 | - }catch(\Error $e){} |
|
| 128 | - } |
|
| 129 | - elseif (\is_array($property)) { |
|
| 130 | + } catch(\Error $e){} |
|
| 131 | + } elseif (\is_array($property)) { |
|
| 130 | 132 | $values = \array_map(function ($v) use ($index) { |
| 131 | 133 | return $this->_getValue($v, $index); |
| 132 | 134 | }, $property); |
@@ -280,10 +282,11 @@ discard block |
||
| 280 | 282 | } |
| 281 | 283 | } elseif (\is_int($property)) { |
| 282 | 284 | $props = $this->getDefaultProperties(); |
| 283 | - if (isset($props[$property])) |
|
| 284 | - $this->properties[] = $props[$property]; |
|
| 285 | - else |
|
| 286 | - $this->properties[] = $property; |
|
| 285 | + if (isset($props[$property])) { |
|
| 286 | + $this->properties[] = $props[$property]; |
|
| 287 | + } else { |
|
| 288 | + $this->properties[] = $property; |
|
| 289 | + } |
|
| 287 | 290 | } else { |
| 288 | 291 | $this->properties[] = $property; |
| 289 | 292 | } |
@@ -328,12 +331,13 @@ discard block |
||
| 328 | 331 | if (isset($this->captions[$index])) { |
| 329 | 332 | return $this->captions[$index]; |
| 330 | 333 | } |
| 331 | - if ($this->properties[$index] instanceof \ReflectionProperty) |
|
| 332 | - return $this->properties[$index]->getName(); |
|
| 333 | - elseif (\is_callable($this->properties[$index])) |
|
| 334 | - return ""; |
|
| 335 | - else |
|
| 336 | - 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 | + } |
|
| 337 | 341 | } |
| 338 | 342 | |
| 339 | 343 | public function getCaptions() { |
@@ -366,8 +370,9 @@ discard block |
||
| 366 | 370 | } |
| 367 | 371 | |
| 368 | 372 | public function setCaption($index, $caption) { |
| 369 | - if (isset($this->captions) === false) |
|
| 370 | - $this->captions = []; |
|
| 373 | + if (isset($this->captions) === false) { |
|
| 374 | + $this->captions = []; |
|
| 375 | + } |
|
| 371 | 376 | $this->captions[$index] = $caption; |
| 372 | 377 | return $this; |
| 373 | 378 | } |