|
@@ -71,7 +71,7 @@ discard block |
|
|
block discarded – undo |
|
71
|
71
|
$related = get_class($relation->getRelated()); |
|
72
|
72
|
|
|
73
|
73
|
if ((new $related())->getTable() !== $relation->getRelated()->getTable()) { |
|
74
|
|
- $related .= ' from ' . $relation->getRelated()->getTable(); |
|
|
74
|
+ $related .= ' from '.$relation->getRelated()->getTable(); |
|
75
|
75
|
} |
|
76
|
76
|
} else { |
|
77
|
77
|
$through[] = $this->hasOneOrManyThroughParent($relation, $relations[$i + 1]); |
|
@@ -280,7 +280,7 @@ discard block |
|
|
block discarded – undo |
|
280
|
280
|
$through = get_class($relation->getRelated()); |
|
281
|
281
|
|
|
282
|
282
|
if ((new $through())->getTable() !== $relation->getRelated()->getTable()) { |
|
283
|
|
- $through .= ' from ' . $relation->getRelated()->getTable(); |
|
|
283
|
+ $through .= ' from '.$relation->getRelated()->getTable(); |
|
284
|
284
|
} |
|
285
|
285
|
|
|
286
|
286
|
if (get_class($relation->getRelated()) === get_class($successor->getParent())) { |
|
@@ -329,14 +329,14 @@ discard block |
|
|
block discarded – undo |
|
329
|
329
|
* @param callable[] $relations |
|
330
|
330
|
* @return \Staudenmeir\EloquentHasManyDeep\HasManyDeep|\Staudenmeir\EloquentHasManyDeep\HasOneDeep |
|
331
|
331
|
*/ |
|
332
|
|
- protected function addConstraintsToHasOneOrManyDeepRelationship(HasManyDeep $deepRelation, array $relations): HasManyDeep|HasOneDeep |
|
|
332
|
+ protected function addConstraintsToHasOneOrManyDeepRelationship(HasManyDeep $deepRelation, array $relations): HasManyDeep | HasOneDeep |
|
333
|
333
|
{ |
|
334
|
334
|
if (is_array($relations[0]) && !is_callable($relations[0])) { |
|
335
|
335
|
$relations = $relations[0]; |
|
336
|
336
|
} |
|
337
|
337
|
|
|
338
|
338
|
foreach ($relations as $i => $relation) { |
|
339
|
|
- $relationWithoutConstraints = Relation::noConstraints(function () use ($relation) { |
|
|
339
|
+ $relationWithoutConstraints = Relation::noConstraints(function() use ($relation) { |
|
340
|
340
|
return $relation(); |
|
341
|
341
|
}); |
|
342
|
342
|
|
|
@@ -366,7 +366,7 @@ discard block |
|
|
block discarded – undo |
|
366
|
366
|
$deepRelation->withTrashed($deletedAtColumn); |
|
367
|
367
|
} |
|
368
|
368
|
|
|
369
|
|
- if (str_starts_with($scope, HasManyDeep::class . ':')) { |
|
|
369
|
+ if (str_starts_with($scope, HasManyDeep::class.':')) { |
|
370
|
370
|
$deletedAtColumn = explode(':', $scope)[1]; |
|
371
|
371
|
|
|
372
|
372
|
$deepRelation->withTrashed($deletedAtColumn); |