Skip to content

Commit ef3d94d

Browse files
author
Marius
committed
fix eager loading retroactively laravel/framework#51825
1 parent 2c6b073 commit ef3d94d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/Eloquent/CustomRelations/RelationCleverTrait.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
trait RelationCleverTrait
88
{
9-
protected static ?string $noConstraintsForRelationName = null;
9+
public static ?string $noConstraintsForRelationName = null;
1010

1111
/**
1212
* Indicates if the relation is adding constraints.
@@ -19,10 +19,10 @@ trait RelationCleverTrait
1919
public static function noConstraints(\Closure $callback, ?string $relationName = null): mixed
2020
{
2121
$previous = static::$constraints;
22-
$previousNoConstraintsForRelationName = static::$noConstraintsForRelationName;
22+
$previousNoConstraintsForRelationName = RelationCleverTrait::$noConstraintsForRelationName;
2323

2424
if ('' !== (string)$relationName) {
25-
static::$noConstraintsForRelationName = $relationName;
25+
RelationCleverTrait::$noConstraintsForRelationName = $relationName;
2626
} else {
2727
static::$constraints = false;
2828
}
@@ -31,14 +31,14 @@ public static function noConstraints(\Closure $callback, ?string $relationName =
3131
return $callback();
3232
} finally {
3333
static::$constraints = $previous;
34-
static::$noConstraintsForRelationName = $previousNoConstraintsForRelationName;
34+
RelationCleverTrait::$noConstraintsForRelationName = $previousNoConstraintsForRelationName;
3535
}
3636
}
3737

3838
protected function setConstraintsStaticFlag(BaseModel $model): void
3939
{
4040
if (
41-
'' === (string)static::$noConstraintsForRelationName
41+
'' === (string)RelationCleverTrait::$noConstraintsForRelationName
4242
|| '' === (string)$model->nowEagerLoadingRelationNameWithNoConstraints
4343
) {
4444
return;
@@ -66,6 +66,6 @@ protected function setConstraintsStaticFlag(BaseModel $model): void
6666
with nowEagerLoadingRelationNameWithNoConstraints = null
6767
and with $noConstraintsForRelationName = 'rel' */
6868
static::$constraints =
69-
static::$noConstraintsForRelationName !== $model->nowEagerLoadingRelationNameWithNoConstraints;
69+
RelationCleverTrait::$noConstraintsForRelationName !== $model->nowEagerLoadingRelationNameWithNoConstraints;
7070
}
7171
}

0 commit comments

Comments
 (0)