@@ -151,25 +151,29 @@ discard block |
||
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | public function getColPosition($colIndex) { |
| 154 | - if ($this->_container->_isMerged() !== true) |
|
| 155 | - return $colIndex; |
|
| 154 | + if ($this->_container->_isMerged() !== true) { |
|
| 155 | + return $colIndex; |
|
| 156 | + } |
|
| 156 | 157 | $pos = 0; |
| 157 | 158 | $rows = $this->_container->getContent(); |
| 158 | 159 | for ($i = 0; $i < $this->_row; $i ++) { |
| 159 | 160 | $max = \min($colIndex, $rows[$i]->count()); |
| 160 | 161 | for ($j = 0; $j < $max; $j ++) { |
| 161 | 162 | $rowspan = $rows[$i]->getItem($j)->getRowspan(); |
| 162 | - if ($rowspan + $i > $this->_row) |
|
| 163 | - $pos ++; |
|
| 163 | + if ($rowspan + $i > $this->_row) { |
|
| 164 | + $pos ++; |
|
| 165 | + } |
|
| 164 | 166 | } |
| 165 | 167 | } |
| 166 | - if ($pos > $colIndex) |
|
| 167 | - return NULL; |
|
| 168 | + if ($pos > $colIndex) { |
|
| 169 | + return NULL; |
|
| 170 | + } |
|
| 168 | 171 | $count = $this->count(); |
| 169 | 172 | for ($i = 0; $i < $count; $i ++) { |
| 170 | 173 | $pos += $this->content[$i]->getColspan(); |
| 171 | - if ($pos >= $colIndex + 1) |
|
| 172 | - return $i; |
|
| 174 | + if ($pos >= $colIndex + 1) { |
|
| 175 | + return $i; |
|
| 176 | + } |
|
| 173 | 177 | } |
| 174 | 178 | return null; |
| 175 | 179 | } |
@@ -192,8 +196,9 @@ discard block |
||
| 192 | 196 | public function containsStr($needle) { |
| 193 | 197 | $cells = $this->content; |
| 194 | 198 | foreach ($cells as $cell) { |
| 195 | - if (\strpos($cell->getContent(), $needle) !== false) |
|
| 196 | - return true; |
|
| 199 | + if (\strpos($cell->getContent(), $needle) !== false) { |
|
| 200 | + return true; |
|
| 201 | + } |
|
| 197 | 202 | } |
| 198 | 203 | return false; |
| 199 | 204 | } |
@@ -108,15 +108,17 @@ discard block |
||
| 108 | 108 | |
| 109 | 109 | public function getColspan() { |
| 110 | 110 | $colspan = 1; |
| 111 | - if (\array_key_exists("colspan", $this->properties)) |
|
| 112 | - $colspan = $this->getProperty("colspan"); |
|
| 111 | + if (\array_key_exists("colspan", $this->properties)) { |
|
| 112 | + $colspan = $this->getProperty("colspan"); |
|
| 113 | + } |
|
| 113 | 114 | return $colspan; |
| 114 | 115 | } |
| 115 | 116 | |
| 116 | 117 | public function getRowspan() { |
| 117 | 118 | $rowspan = 1; |
| 118 | - if (\array_key_exists("rowspan", $this->properties)) |
|
| 119 | - $rowspan = $this->getProperty("rowspan"); |
|
| 119 | + if (\array_key_exists("rowspan", $this->properties)) { |
|
| 120 | + $rowspan = $this->getProperty("rowspan"); |
|
| 121 | + } |
|
| 120 | 122 | return $rowspan; |
| 121 | 123 | } |
| 122 | 124 | |
@@ -155,7 +157,8 @@ discard block |
||
| 155 | 157 | } |
| 156 | 158 | |
| 157 | 159 | public function compile(JsUtils $js = NULL, &$view = NULL) { |
| 158 | - if (! $this->_deleted) |
|
| 159 | - return parent::compile($js, $view); |
|
| 160 | + if (! $this->_deleted) { |
|
| 161 | + return parent::compile($js, $view); |
|
| 162 | + } |
|
| 160 | 163 | } |
| 161 | 164 | } |
@@ -32,8 +32,9 @@ discard block |
||
| 32 | 32 | */ |
| 33 | 33 | public function __construct($identifier, $tagName = "tbody", $rowCount = NULL, $colCount = NULL) { |
| 34 | 34 | parent::__construct($identifier, $tagName, ""); |
| 35 | - if (isset($rowCount) && isset($colCount)) |
|
| 36 | - $this->setRowCount($rowCount, $colCount); |
|
| 35 | + if (isset($rowCount) && isset($colCount)) { |
|
| 36 | + $this->setRowCount($rowCount, $colCount); |
|
| 37 | + } |
|
| 37 | 38 | } |
| 38 | 39 | |
| 39 | 40 | /** |
@@ -193,10 +194,11 @@ discard block |
||
| 193 | 194 | $values = \array_fill(0, $count, $values); |
| 194 | 195 | $isArray = false; |
| 195 | 196 | } |
| 196 | - if (JArray::dimension($values) == 1 && $isArray) |
|
| 197 | - $values = [ |
|
| 197 | + if (JArray::dimension($values) == 1 && $isArray) { |
|
| 198 | + $values = [ |
|
| 198 | 199 | $values |
| 199 | 200 | ]; |
| 201 | + } |
|
| 200 | 202 | |
| 201 | 203 | $count = \min(\sizeof($values), $count); |
| 202 | 204 | |
@@ -223,8 +225,9 @@ discard block |
||
| 223 | 225 | $count = $this->count(); |
| 224 | 226 | for ($i = 0; $i < $count; $i ++) { |
| 225 | 227 | $cell = $this->getCell($i, $colIndex); |
| 226 | - if ($cell instanceof BaseTrait) |
|
| 227 | - $cell->addVariations($variations); |
|
| 228 | + if ($cell instanceof BaseTrait) { |
|
| 229 | + $cell->addVariations($variations); |
|
| 230 | + } |
|
| 228 | 231 | } |
| 229 | 232 | return $this; |
| 230 | 233 | } |
@@ -233,8 +236,9 @@ discard block |
||
| 233 | 236 | $count = $this->count(); |
| 234 | 237 | for ($i = 0; $i < $count; $i ++) { |
| 235 | 238 | $cell = $this->getCell($i, $colIndex); |
| 236 | - if (isset($cell)) |
|
| 237 | - $cell->addToProperty($name, $value); |
|
| 239 | + if (isset($cell)) { |
|
| 240 | + $cell->addToProperty($name, $value); |
|
| 241 | + } |
|
| 238 | 242 | } |
| 239 | 243 | return $this; |
| 240 | 244 | } |
@@ -252,8 +256,9 @@ discard block |
||
| 252 | 256 | $count = $this->count(); |
| 253 | 257 | for ($i = 0; $i < $count; $i ++) { |
| 254 | 258 | $index = $this->content[$i]->getColPosition($colIndex); |
| 255 | - if ($index !== NULL) |
|
| 256 | - $this->getCell($i, $index)->$function(); |
|
| 259 | + if ($index !== NULL) { |
|
| 260 | + $this->getCell($i, $index)->$function(); |
|
| 261 | + } |
|
| 257 | 262 | } |
| 258 | 263 | return $this; |
| 259 | 264 | } |
@@ -264,8 +269,9 @@ discard block |
||
| 264 | 269 | $maxRow = $this->content[$i]->count(); |
| 265 | 270 | $index = $maxRow - $colIndex - 1; |
| 266 | 271 | if (($cell = $this->getCell($i, $index)) !== NULL) { |
| 267 | - if ($cell->getColspan() == 1) |
|
| 268 | - $cell->$function(); |
|
| 272 | + if ($cell->getColspan() == 1) { |
|
| 273 | + $cell->$function(); |
|
| 274 | + } |
|
| 269 | 275 | } |
| 270 | 276 | } |
| 271 | 277 | return $this; |
@@ -311,8 +317,9 @@ discard block |
||
| 311 | 317 | */ |
| 312 | 318 | public function getColCount() { |
| 313 | 319 | $result = 0; |
| 314 | - if ($this->count() > 0) |
|
| 315 | - $result = $this->getItem(0)->count(); |
|
| 320 | + if ($this->count() > 0) { |
|
| 321 | + $result = $this->getItem(0)->count(); |
|
| 322 | + } |
|
| 316 | 323 | return $result; |
| 317 | 324 | } |
| 318 | 325 | |
@@ -337,15 +344,17 @@ discard block |
||
| 337 | 344 | |
| 338 | 345 | public function toDelete($rowIndex, $colIndex) { |
| 339 | 346 | $row = $this->getItem($rowIndex); |
| 340 | - if (isset($row) === true) |
|
| 341 | - $row->toDelete($colIndex); |
|
| 347 | + if (isset($row) === true) { |
|
| 348 | + $row->toDelete($colIndex); |
|
| 349 | + } |
|
| 342 | 350 | return $this; |
| 343 | 351 | } |
| 344 | 352 | |
| 345 | 353 | public function toRowspanned($rowIndex, $colIndex) { |
| 346 | 354 | $row = $this->getItem($rowIndex); |
| 347 | - if (isset($row) === true) |
|
| 348 | - $row->toRowspanned($colIndex); |
|
| 355 | + if (isset($row) === true) { |
|
| 356 | + $row->toRowspanned($colIndex); |
|
| 357 | + } |
|
| 349 | 358 | return $this; |
| 350 | 359 | } |
| 351 | 360 | |
@@ -455,8 +464,9 @@ discard block |
||
| 455 | 464 | foreach ($rows as $row) { |
| 456 | 465 | $cell = $row->getItem($colIndex); |
| 457 | 466 | $value = $cell->getContent(); |
| 458 | - if ($functionExists) |
|
| 459 | - $value = \call_user_func($function, $value); |
|
| 467 | + if ($functionExists) { |
|
| 468 | + $value = \call_user_func($function, $value); |
|
| 469 | + } |
|
| 460 | 470 | if ($value !== $identiqual) { |
| 461 | 471 | if ($counter > 0 && isset($cellToMerge)) { |
| 462 | 472 | $cellToMerge->setRowspanned($counter); |