@@ -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 | } |
@@ -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 | /** |
@@ -189,30 +189,30 @@ discard block |
||
| 189 | 189 | |
| 190 | 190 | |
| 191 | 191 | /** |
| 192 | - * Get the parent column name. |
|
| 193 | - * |
|
| 194 | - * @return string |
|
| 195 | - */ |
|
| 192 | + * Get the parent column name. |
|
| 193 | + * |
|
| 194 | + * @return string |
|
| 195 | + */ |
|
| 196 | 196 | public function getParentColumnName(): string |
| 197 | 197 | { |
| 198 | 198 | return $this->parentColumn; |
| 199 | 199 | } |
| 200 | 200 | |
| 201 | 201 | /** |
| 202 | - * Get the table qualified parent column name. |
|
| 203 | - * |
|
| 204 | - * @return string |
|
| 205 | - */ |
|
| 202 | + * Get the table qualified parent column name. |
|
| 203 | + * |
|
| 204 | + * @return string |
|
| 205 | + */ |
|
| 206 | 206 | public function getQualifiedParentColumnName(): string |
| 207 | 207 | { |
| 208 | 208 | return $this->getTable().'.'.$this->getParentColumnName(); |
| 209 | 209 | } |
| 210 | 210 | |
| 211 | 211 | /** |
| 212 | - * Get the value of the models "parent_id" field. |
|
| 213 | - * |
|
| 214 | - * @return int|string |
|
| 215 | - */ |
|
| 212 | + * Get the value of the models "parent_id" field. |
|
| 213 | + * |
|
| 214 | + * @return int|string |
|
| 215 | + */ |
|
| 216 | 216 | public function getParentId() |
| 217 | 217 | { |
| 218 | 218 | return $this->getAttribute($this->getparentColumnName()); |
@@ -378,20 +378,20 @@ discard block |
||
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | /** |
| 381 | - * Parent relation (self-referential) 1-1. |
|
| 382 | - * |
|
| 383 | - * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
| 384 | - */ |
|
| 381 | + * Parent relation (self-referential) 1-1. |
|
| 382 | + * |
|
| 383 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
| 384 | + */ |
|
| 385 | 385 | public function parent(): BelongsTo |
| 386 | 386 | { |
| 387 | 387 | return $this->belongsTo(get_class($this), $this->getParentColumnName()); |
| 388 | 388 | } |
| 389 | 389 | |
| 390 | 390 | /** |
| 391 | - * Children relation (self-referential) 1-N. |
|
| 392 | - * |
|
| 393 | - * @return \Illuminate\Database\Eloquent\Relations\HasMany |
|
| 394 | - */ |
|
| 391 | + * Children relation (self-referential) 1-N. |
|
| 392 | + * |
|
| 393 | + * @return \Illuminate\Database\Eloquent\Relations\HasMany |
|
| 394 | + */ |
|
| 395 | 395 | public function children(): HasMany |
| 396 | 396 | { |
| 397 | 397 | return $this->hasMany(get_class($this), $this->getParentColumnName()) |
@@ -905,11 +905,11 @@ discard block |
||
| 905 | 905 | } |
| 906 | 906 | |
| 907 | 907 | /** |
| 908 | - * Returns the level of this node in the tree. |
|
| 909 | - * Root level is 0. |
|
| 910 | - * |
|
| 911 | - * @return int |
|
| 912 | - */ |
|
| 908 | + * Returns the level of this node in the tree. |
|
| 909 | + * Root level is 0. |
|
| 910 | + * |
|
| 911 | + * @return int |
|
| 912 | + */ |
|
| 913 | 913 | public function getLevel(): int |
| 914 | 914 | { |
| 915 | 915 | if (is_null($this->getParentId())) { |
@@ -928,7 +928,7 @@ discard block |
||
| 928 | 928 | public function isDescendantOf($other): bool |
| 929 | 929 | { |
| 930 | 930 | return ( |
| 931 | - $this->getLeft() > $other->getLeft() && |
|
| 931 | + $this->getLeft() > $other->getLeft() && |
|
| 932 | 932 | $this->getLeft() < $other->getRight() && |
| 933 | 933 | $this->inSameScope($other) |
| 934 | 934 | ); |
@@ -943,7 +943,7 @@ discard block |
||
| 943 | 943 | public function isSelfOrDescendantOf($other): bool |
| 944 | 944 | { |
| 945 | 945 | return ( |
| 946 | - $this->getLeft() >= $other->getLeft() && |
|
| 946 | + $this->getLeft() >= $other->getLeft() && |
|
| 947 | 947 | $this->getLeft() < $other->getRight() && |
| 948 | 948 | $this->inSameScope($other) |
| 949 | 949 | ); |
@@ -958,7 +958,7 @@ discard block |
||
| 958 | 958 | public function isAncestorOf($other): bool |
| 959 | 959 | { |
| 960 | 960 | return ( |
| 961 | - $this->getLeft() < $other->getLeft() && |
|
| 961 | + $this->getLeft() < $other->getLeft() && |
|
| 962 | 962 | $this->getRight() > $other->getLeft() && |
| 963 | 963 | $this->inSameScope($other) |
| 964 | 964 | ); |
@@ -973,7 +973,7 @@ discard block |
||
| 973 | 973 | public function isSelfOrAncestorOf($other): bool |
| 974 | 974 | { |
| 975 | 975 | return ( |
| 976 | - $this->getLeft() <= $other->getLeft() && |
|
| 976 | + $this->getLeft() <= $other->getLeft() && |
|
| 977 | 977 | $this->getRight() > $other->getLeft() && |
| 978 | 978 | $this->inSameScope($other) |
| 979 | 979 | ); |
@@ -1345,8 +1345,8 @@ discard block |
||
| 1345 | 1345 | ->where($self->getLeftColumnName(), '>', $self->getLeft()) |
| 1346 | 1346 | ->where($self->getRightColumnName(), '<', $self->getRight()) |
| 1347 | 1347 | ->update([ |
| 1348 | - $self->getDeletedAtColumn() => null, |
|
| 1349 | - $self->getUpdatedAtColumn() => $self->{$self->getUpdatedAtColumn()}, |
|
| 1348 | + $self->getDeletedAtColumn() => null, |
|
| 1349 | + $self->getUpdatedAtColumn() => $self->{$self->getUpdatedAtColumn()}, |
|
| 1350 | 1350 | ]); |
| 1351 | 1351 | }); |
| 1352 | 1352 | } |