@@ -64,8 +64,7 @@ discard block |
||
64 | 64 | // Get initial data |
65 | 65 | if ($this->topLevelOnly) { |
66 | 66 | $data = $this->container->getTopLevel(); |
67 | - } |
|
68 | - else { |
|
67 | + } else { |
|
69 | 68 | $data = $this->container->get(); |
70 | 69 | } |
71 | 70 | |
@@ -105,8 +104,7 @@ discard block |
||
105 | 104 | } |
106 | 105 | $ids[] = $obj->getId(); |
107 | 106 | } |
108 | - } |
|
109 | - else { |
|
107 | + } else { |
|
110 | 108 | $data = array_unique($data); |
111 | 109 | } |
112 | 110 | } |
@@ -131,11 +129,9 @@ discard block |
||
131 | 129 | protected function sortData(array &$data) : void { |
132 | 130 | if (isset($this->sorter)) { |
133 | 131 | $data = $this->sorter->sort($data); |
134 | - } |
|
135 | - elseif (isset($this->sortClosure)) { |
|
132 | + } elseif (isset($this->sortClosure)) { |
|
136 | 133 | uasort($data, $this->sortClosure); |
137 | - } |
|
138 | - elseif (isset($this->sortProperty)) { |
|
134 | + } elseif (isset($this->sortProperty)) { |
|
139 | 135 | uasort($data, [$this, 'sortByPropertyCallback']); |
140 | 136 | } |
141 | 137 | } |
@@ -274,14 +270,12 @@ discard block |
||
274 | 270 | $property2 = null; |
275 | 271 | if (is_object($value1) && isset($value1->$property)) { |
276 | 272 | $property1 = $value1->$property; |
277 | - } |
|
278 | - elseif (is_array($value1) && isset($value1[$property])) { |
|
273 | + } elseif (is_array($value1) && isset($value1[$property])) { |
|
279 | 274 | $property1 = $value1[$property]; |
280 | 275 | } |
281 | 276 | if (is_object($value2) && isset($value2->$property)) { |
282 | 277 | $property2 = $value2->$property; |
283 | - } |
|
284 | - elseif (is_array($value2) && isset($value2[$property])) { |
|
278 | + } elseif (is_array($value2) && isset($value2[$property])) { |
|
285 | 279 | $property2 = $value2[$property]; |
286 | 280 | } |
287 | 281 |