8000 revert complicated changes · laravel/framework@dc5b445 · GitHub
[go: up one dir, main page]

Skip to content

Commit dc5b445

Browse files
committed
revert complicated changes
1 parent f5fba9c commit dc5b445

File tree

2 files changed

+1
-229
lines changed

2 files changed

+1
-229
lines changed

src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php

+1-30
Original file line numberDiff line numberDiff line change
@@ -1072,36 +1072,7 @@ public function getRelation($relation)
10721072
*/
10731073
public function relationLoaded($key)
10741074
{
1075-
if (array_key_exists($key, $this->relations)) {
1076-
return true;
1077-
}
1078-
1079-
[$relation, $nestedRelation] = array_replace(
1080-
[null, null],
1081-
explode('.', $key, 2),
1082-
);
1083-
1084-
if (! array_key_exists($relation, $this->relations)) {
1085-
return false;
1086-
}
1087-
1088-
if ($nestedRelation !== null) {
1089-
$relatedModels = is_iterable($relatedModels = $this->$relation)
1090-
? $relatedModels
1091-
: array_filter([$relatedModels]);
1092-
1093-
if (count($relatedModels) === 0) {
1094-
return false;
1095-
}
1096-
1097-
foreach ($relatedModels as $related) {
1098-
if (! $related->relationLoaded($nestedRelation)) {
1099-
return false;
1100-
}
1101-
}
1102-
}
1103-
1104-
return true;
1075+
return array_key_exists($key, $this->relations);
11051076
}
11061077

11071078
/**

tests/Integration/Database/EloquentModelRelationLoadedTest.php

-199
This file was deleted.

0 commit comments

Comments
 (0)
0