@@ -11,7 +11,7 @@ |
||
| 11 | 11 | $dict = $this->getDictionary(); |
| 12 | 12 | |
| 13 | 13 | // Enforce sorting by $orderColumn setting in Baum\Node instance |
| 14 | - uasort($dict, function ($a, $b) { |
|
| 14 | + uasort($dict, function($a, $b) { |
|
| 15 | 15 | return ($a->getOrder() >= $b->getOrder()) ? 1 : -1; |
| 16 | 16 | }); |
| 17 | 17 | |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | { |
| 39 | 39 | $self = $this; |
| 40 | 40 | |
| 41 | - return $this->wrapInTransaction(function () use ($self, $nodeList) { |
|
| 41 | + return $this->wrapInTransaction(function() use ($self, $nodeList) { |
|
| 42 | 42 | forward_static_call([get_class($self->node), 'unguard']); |
| 43 | 43 | |
| 44 | 44 | $result = $self->mapTree($nodeList); |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | |
| 127 | 127 | $columns = array_merge($this->node->getQualifiedScopedColumns(), [$column]); |
| 128 | 128 | |
| 129 | - $columnsForSelect = implode(', ', array_map(function ($col) use ($grammar) { |
|
| 129 | + $columnsForSelect = implode(', ', array_map(function($col) use ($grammar) { |
|
| 130 | 130 | return $grammar->wrap($col); |
| 131 | 131 | }, $columns)); |
| 132 | 132 | |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | */ |
| 226 | 226 | protected function keyForScope(Model $node): string |
| 227 | 227 | { |
| 228 | - return implode('-', array_map(function ($column) use ($node) { |
|
| 228 | + return implode('-', array_map(function($column) use ($node) { |
|
| 229 | 229 | $value = $node->getAttribute($column); |
| 230 | 230 | |
| 231 | 231 | if (is_null($value)) { |
@@ -76,29 +76,29 @@ discard block |
||
| 76 | 76 | */ |
| 77 | 77 | protected static function bootHasNestedSets(): void |
| 78 | 78 | { |
| 79 | - static::creating(function ($node) { |
|
| 79 | + static::creating(function($node) { |
|
| 80 | 80 | $node->setDefaultLeftAndRight(); |
| 81 | 81 | }); |
| 82 | 82 | |
| 83 | - static::saving(function ($node) { |
|
| 83 | + static::saving(function($node) { |
|
| 84 | 84 | $node->storeNewParent(); |
| 85 | 85 | }); |
| 86 | 86 | |
| 87 | - static::saved(function ($node) { |
|
| 87 | + static::saved(function($node) { |
|
| 88 | 88 | $node->moveToNewParent(); |
| 89 | 89 | $node->setDepth(); |
| 90 | 90 | }); |
| 91 | 91 | |
| 92 | - static::deleting(function ($node) { |
|
| 92 | + static::deleting(function($node) { |
|
| 93 | 93 | $node->destroyDescendants(); |
| 94 | 94 | }); |
| 95 | 95 | |
| 96 | 96 | if (static::softDeletesEnabled()) { |
| 97 | - static::restoring(function ($node) { |
|
| 97 | + static::restoring(function($node) { |
|
| 98 | 98 | $node->shiftSiblingsForRestore(); |
| 99 | 99 | }); |
| 100 | 100 | |
| 101 | - static::restored(function ($node) { |
|
| 101 | + static::restored(function($node) { |
|
| 102 | 102 | $node->restoreDescendants(); |
| 103 | 103 | }); |
| 104 | 104 | } |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | |
| 278 | 278 | $prefix = $this->getTable().'.'; |
| 279 | 279 | |
| 280 | - return array_map(function ($c) use ($prefix) { |
|
| 280 | + return array_map(function($c) use ($prefix) { |
|
| 281 | 281 | return $prefix.$c; |
| 282 | 282 | }, $this->getScopedColumns()); |
| 283 | 283 | } |
@@ -1138,7 +1138,7 @@ discard block |
||
| 1138 | 1138 | { |
| 1139 | 1139 | $self = $this; |
| 1140 | 1140 | |
| 1141 | - $this->getConnection()->transaction(function () use ($self) { |
|
| 1141 | + $this->getConnection()->transaction(function() use ($self) { |
|
| 1142 | 1142 | $self->reload(); |
| 1143 | 1143 | |
| 1144 | 1144 | $level = $self->getLevel(); |
@@ -1159,7 +1159,7 @@ discard block |
||
| 1159 | 1159 | { |
| 1160 | 1160 | $self = $this; |
| 1161 | 1161 | |
| 1162 | - $this->getConnection()->transaction(function () use ($self) { |
|
| 1162 | + $this->getConnection()->transaction(function() use ($self) { |
|
| 1163 | 1163 | $self->reload(); |
| 1164 | 1164 | |
| 1165 | 1165 | $self->descendantsAndSelf()->select($self->getKeyName())->lockForUpdate()->get(); |
@@ -1194,7 +1194,7 @@ discard block |
||
| 1194 | 1194 | |
| 1195 | 1195 | $self = $this; |
| 1196 | 1196 | |
| 1197 | - $this->getConnection()->transaction(function () use ($self) { |
|
| 1197 | + $this->getConnection()->transaction(function() use ($self) { |
|
| 1198 | 1198 | $self->reload(); |
| 1199 | 1199 | |
| 1200 | 1200 | $lftCol = $self->getLeftColumnName(); |
@@ -1229,7 +1229,7 @@ discard block |
||
| 1229 | 1229 | |
| 1230 | 1230 | $self = $this; |
| 1231 | 1231 | |
| 1232 | - $this->getConnection()->transaction(function () use ($self) { |
|
| 1232 | + $this->getConnection()->transaction(function() use ($self) { |
|
| 1233 | 1233 | $lftCol = $self->getLeftColumnName(); |
| 1234 | 1234 | $rgtCol = $self->getRightColumnName(); |
| 1235 | 1235 | $lft = $self->getLeft(); |
@@ -1255,7 +1255,7 @@ discard block |
||
| 1255 | 1255 | |
| 1256 | 1256 | $self = $this; |
| 1257 | 1257 | |
| 1258 | - $this->getConnection()->transaction(function () use ($self) { |
|
| 1258 | + $this->getConnection()->transaction(function() use ($self) { |
|
| 1259 | 1259 | $self->newNestedSetQuery() |
| 1260 | 1260 | ->withTrashed() |
| 1261 | 1261 | ->where($self->getLeftColumnName(), '>', $self->getLeft()) |
@@ -1281,9 +1281,9 @@ discard block |
||
| 1281 | 1281 | |
| 1282 | 1282 | $nodes = $instance->newNestedSetQuery()->get()->toArray(); |
| 1283 | 1283 | |
| 1284 | - return array_combine(array_map(function ($node) use ($key) { |
|
| 1284 | + return array_combine(array_map(function($node) use ($key) { |
|
| 1285 | 1285 | return $node[$key]; |
| 1286 | - }, $nodes), array_map(function ($node) use ($seperator, $depthColumn, $column) { |
|
| 1286 | + }, $nodes), array_map(function($node) use ($seperator, $depthColumn, $column) { |
|
| 1287 | 1287 | return str_repeat($seperator, $node[$depthColumn]).$node[$column]; |
| 1288 | 1288 | }, $nodes)); |
| 1289 | 1289 | } |
@@ -137,14 +137,14 @@ discard block |
||
| 137 | 137 | abstract public function isDirty($attributes = null); |
| 138 | 138 | |
| 139 | 139 | /** |
| 140 | - * Define an inverse one-to-one or many relationship. |
|
| 141 | - * |
|
| 142 | - * @param string $related |
|
| 143 | - * @param string|null $foreignKey |
|
| 144 | - * @param string|null $ownerKey |
|
| 145 | - * @param string|null $relation |
|
| 146 | - * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
| 147 | - */ |
|
| 140 | + * Define an inverse one-to-one or many relationship. |
|
| 141 | + * |
|
| 142 | + * @param string $related |
|
| 143 | + * @param string|null $foreignKey |
|
| 144 | + * @param string|null $ownerKey |
|
| 145 | + * @param string|null $relation |
|
| 146 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
| 147 | + */ |
|
| 148 | 148 | abstract public function belongsTo($related, $foreignKey = null, $ownerKey = null, $relation = null); |
| 149 | 149 | |
| 150 | 150 | /** |
@@ -186,30 +186,30 @@ discard block |
||
| 186 | 186 | abstract public function getKeyName(); |
| 187 | 187 | |
| 188 | 188 | /** |
| 189 | - * Get the parent column name. |
|
| 190 | - * |
|
| 191 | - * @return string |
|
| 192 | - */ |
|
| 189 | + * Get the parent column name. |
|
| 190 | + * |
|
| 191 | + * @return string |
|
| 192 | + */ |
|
| 193 | 193 | public function getParentColumnName(): string |
| 194 | 194 | { |
| 195 | 195 | return $this->parentColumn; |
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | /** |
| 199 | - * Get the table qualified parent column name. |
|
| 200 | - * |
|
| 201 | - * @return string |
|
| 202 | - */ |
|
| 199 | + * Get the table qualified parent column name. |
|
| 200 | + * |
|
| 201 | + * @return string |
|
| 202 | + */ |
|
| 203 | 203 | public function getQualifiedParentColumnName(): string |
| 204 | 204 | { |
| 205 | 205 | return $this->getTable().'.'.$this->getParentColumnName(); |
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | /** |
| 209 | - * Get the value of the models "parent_id" field. |
|
| 210 | - * |
|
| 211 | - * @return int|string |
|
| 212 | - */ |
|
| 209 | + * Get the value of the models "parent_id" field. |
|
| 210 | + * |
|
| 211 | + * @return int|string |
|
| 212 | + */ |
|
| 213 | 213 | public function getParentId() |
| 214 | 214 | { |
| 215 | 215 | return $this->getAttribute($this->getparentColumnName()); |
@@ -375,20 +375,20 @@ discard block |
||
| 375 | 375 | } |
| 376 | 376 | |
| 377 | 377 | /** |
| 378 | - * Parent relation (self-referential) 1-1. |
|
| 379 | - * |
|
| 380 | - * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
| 381 | - */ |
|
| 378 | + * Parent relation (self-referential) 1-1. |
|
| 379 | + * |
|
| 380 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
| 381 | + */ |
|
| 382 | 382 | public function parent(): BelongsTo |
| 383 | 383 | { |
| 384 | 384 | return $this->belongsTo(get_class($this), $this->getParentColumnName()); |
| 385 | 385 | } |
| 386 | 386 | |
| 387 | 387 | /** |
| 388 | - * Children relation (self-referential) 1-N. |
|
| 389 | - * |
|
| 390 | - * @return \Illuminate\Database\Eloquent\Relations\HasMany |
|
| 391 | - */ |
|
| 388 | + * Children relation (self-referential) 1-N. |
|
| 389 | + * |
|
| 390 | + * @return \Illuminate\Database\Eloquent\Relations\HasMany |
|
| 391 | + */ |
|
| 392 | 392 | public function children(): HasMany |
| 393 | 393 | { |
| 394 | 394 | return $this->hasMany(get_class($this), $this->getParentColumnName()) |
@@ -902,11 +902,11 @@ discard block |
||
| 902 | 902 | } |
| 903 | 903 | |
| 904 | 904 | /** |
| 905 | - * Returns the level of this node in the tree. |
|
| 906 | - * Root level is 0. |
|
| 907 | - * |
|
| 908 | - * @return int |
|
| 909 | - */ |
|
| 905 | + * Returns the level of this node in the tree. |
|
| 906 | + * Root level is 0. |
|
| 907 | + * |
|
| 908 | + * @return int |
|
| 909 | + */ |
|
| 910 | 910 | public function getLevel(): int |
| 911 | 911 | { |
| 912 | 912 | if (is_null($this->getParentId())) { |
@@ -925,7 +925,7 @@ discard block |
||
| 925 | 925 | public function isDescendantOf($other): bool |
| 926 | 926 | { |
| 927 | 927 | return ( |
| 928 | - $this->getLeft() > $other->getLeft() && |
|
| 928 | + $this->getLeft() > $other->getLeft() && |
|
| 929 | 929 | $this->getLeft() < $other->getRight() && |
| 930 | 930 | $this->inSameScope($other) |
| 931 | 931 | ); |
@@ -940,7 +940,7 @@ discard block |
||
| 940 | 940 | public function isSelfOrDescendantOf($other): bool |
| 941 | 941 | { |
| 942 | 942 | return ( |
| 943 | - $this->getLeft() >= $other->getLeft() && |
|
| 943 | + $this->getLeft() >= $other->getLeft() && |
|
| 944 | 944 | $this->getLeft() < $other->getRight() && |
| 945 | 945 | $this->inSameScope($other) |
| 946 | 946 | ); |
@@ -955,7 +955,7 @@ discard block |
||
| 955 | 955 | public function isAncestorOf($other): bool |
| 956 | 956 | { |
| 957 | 957 | return ( |
| 958 | - $this->getLeft() < $other->getLeft() && |
|
| 958 | + $this->getLeft() < $other->getLeft() && |
|
| 959 | 959 | $this->getRight() > $other->getLeft() && |
| 960 | 960 | $this->inSameScope($other) |
| 961 | 961 | ); |
@@ -970,7 +970,7 @@ discard block |
||
| 970 | 970 | public function isSelfOrAncestorOf($other): bool |
| 971 | 971 | { |
| 972 | 972 | return ( |
| 973 | - $this->getLeft() <= $other->getLeft() && |
|
| 973 | + $this->getLeft() <= $other->getLeft() && |
|
| 974 | 974 | $this->getRight() > $other->getLeft() && |
| 975 | 975 | $this->inSameScope($other) |
| 976 | 976 | ); |
@@ -1342,8 +1342,8 @@ discard block |
||
| 1342 | 1342 | ->where($self->getLeftColumnName(), '>', $self->getLeft()) |
| 1343 | 1343 | ->where($self->getRightColumnName(), '<', $self->getRight()) |
| 1344 | 1344 | ->update([ |
| 1345 | - $self->getDeletedAtColumn() => null, |
|
| 1346 | - $self->getUpdatedAtColumn() => $self->{$self->getUpdatedAtColumn()}, |
|
| 1345 | + $self->getDeletedAtColumn() => null, |
|
| 1346 | + $self->getUpdatedAtColumn() => $self->{$self->getUpdatedAtColumn()}, |
|
| 1347 | 1347 | ]); |
| 1348 | 1348 | }); |
| 1349 | 1349 | } |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | // setting the right indexes and saving the nodes... |
| 41 | 41 | $self = $this; |
| 42 | 42 | |
| 43 | - $this->node->getConnection()->transaction(function () use ($self) { |
|
| 43 | + $this->node->getConnection()->transaction(function() use ($self) { |
|
| 44 | 44 | foreach ($self->roots() as $root) { |
| 45 | 45 | $self->rebuildBounds($root, 0); |
| 46 | 46 | } |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | return []; |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | - $values = array_map(function ($column) use ($node) { |
|
| 124 | + $values = array_map(function($column) use ($node) { |
|
| 125 | 125 | return $node->getAttribute($column); |
| 126 | 126 | }, $keys); |
| 127 | 127 | |
@@ -135,9 +135,9 @@ discard block |
||
| 135 | 135 | ELSE ${wrappedParent} END"; |
| 136 | 136 | |
| 137 | 137 | $updateConditions = [ |
| 138 | - $leftColumn => $connection->raw($lftSql), |
|
| 139 | - $rightColumn => $connection->raw($rgtSql), |
|
| 140 | - $parentColumn => $connection->raw($parentSql), |
|
| 138 | + $leftColumn => $connection->raw($lftSql), |
|
| 139 | + $rightColumn => $connection->raw($rgtSql), |
|
| 140 | + $parentColumn => $connection->raw($parentSql), |
|
| 141 | 141 | ]; |
| 142 | 142 | |
| 143 | 143 | if ($this->node->timestamps) { |
@@ -220,22 +220,22 @@ discard block |
||
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | switch ($this->position) { |
| 223 | - case 'child': |
|
| 223 | + case 'child': |
|
| 224 | 224 | $this->_bound1 = $this->target->getRight(); |
| 225 | 225 | |
| 226 | 226 | break; |
| 227 | 227 | |
| 228 | - case 'left': |
|
| 228 | + case 'left': |
|
| 229 | 229 | $this->_bound1 = $this->target->getLeft(); |
| 230 | 230 | |
| 231 | 231 | break; |
| 232 | 232 | |
| 233 | - case 'right': |
|
| 233 | + case 'right': |
|
| 234 | 234 | $this->_bound1 = $this->target->getRight() + 1; |
| 235 | 235 | |
| 236 | 236 | break; |
| 237 | 237 | |
| 238 | - case 'root': |
|
| 238 | + case 'root': |
|
| 239 | 239 | $this->_bound1 = $this->node->newNestedSetQuery()->max($this->node->getRightColumnName()) + 1; |
| 240 | 240 | |
| 241 | 241 | break; |
@@ -277,10 +277,10 @@ discard block |
||
| 277 | 277 | // we have defined the boundaries of two non-overlapping intervals, |
| 278 | 278 | // so sorting puts both the intervals and their boundaries in order |
| 279 | 279 | $this->_boundaries = [ |
| 280 | - $this->node->getLeft(), |
|
| 281 | - $this->node->getRight(), |
|
| 282 | - $this->bound1(), |
|
| 283 | - $this->bound2(), |
|
| 280 | + $this->node->getLeft(), |
|
| 281 | + $this->node->getRight(), |
|
| 282 | + $this->bound1(), |
|
| 283 | + $this->bound2(), |
|
| 284 | 284 | ]; |
| 285 | 285 | sort($this->_boundaries); |
| 286 | 286 | |
@@ -295,13 +295,13 @@ discard block |
||
| 295 | 295 | protected function parentId() |
| 296 | 296 | { |
| 297 | 297 | switch ($this->position) { |
| 298 | - case 'root': |
|
| 298 | + case 'root': |
|
| 299 | 299 | return null; |
| 300 | 300 | |
| 301 | - case 'child': |
|
| 301 | + case 'child': |
|
| 302 | 302 | return $this->target->getKey(); |
| 303 | 303 | |
| 304 | - default: |
|
| 304 | + default: |
|
| 305 | 305 | return $this->target->getParentId(); |
| 306 | 306 | } |
| 307 | 307 | } |
@@ -399,10 +399,10 @@ discard block |
||
| 399 | 399 | protected function applyLockBetween(int $lft, int $rgt): void |
| 400 | 400 | { |
| 401 | 401 | $this->node->newQuery() |
| 402 | - ->where($this->node->getLeftColumnName(), '>=', $lft) |
|
| 403 | - ->where($this->node->getRightColumnName(), '<=', $rgt) |
|
| 404 | - ->select($this->node->getKeyName()) |
|
| 405 | - ->lockForUpdate() |
|
| 406 | - ->get(); |
|
| 402 | + ->where($this->node->getLeftColumnName(), '>=', $lft) |
|
| 403 | + ->where($this->node->getRightColumnName(), '<=', $rgt) |
|
| 404 | + ->select($this->node->getKeyName()) |
|
| 405 | + ->lockForUpdate() |
|
| 406 | + ->get(); |
|
| 407 | 407 | } |
| 408 | 408 | } |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | if ($this->hasChange()) { |
| 79 | 79 | $self = $this; |
| 80 | 80 | |
| 81 | - $this->node->getConnection()->transaction(function () use ($self) { |
|
| 81 | + $this->node->getConnection()->transaction(function() use ($self) { |
|
| 82 | 82 | $self->updateStructure(); |
| 83 | 83 | }); |
| 84 | 84 | |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | |
| 147 | 147 | return $this->node |
| 148 | 148 | ->newNestedSetQuery() |
| 149 | - ->where(function ($query) use ($leftColumn, $rightColumn, $a, $d) { |
|
| 149 | + ->where(function($query) use ($leftColumn, $rightColumn, $a, $d) { |
|
| 150 | 150 | $query->whereBetween($leftColumn, [$a, $d]) |
| 151 | 151 | ->orWhereBetween($rightColumn, [$a, $d]); |
| 152 | 152 | }) |