Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[11.x] Fix casts + withAttributes #54422

Merged
merged 6 commits into from
Feb 5, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Clean up
tontonsb authored Jan 31, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 1999cd634a3a63ee98df14fa0e9fc518783b6b38
10 changes: 5 additions & 5 deletions src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
namespace Illuminate\Database\Eloquent\Relations;

use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Collection as EloquentCollection;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\Concerns\InteractsWithDictionary;
use Illuminate\Database\Eloquent\Relations\Concerns\SupportsInverseRelations;
@@ -119,7 +119,7 @@ public function addEagerConstraints(array $models)
* @param string $relation
* @return array<int, TDeclaringModel>
*/
public function matchOne(array $models, Collection $results, $relation)
public function matchOne(array $models, EloquentCollection $results, $relation)
{
return $this->matchOneOrMany($models, $results, $relation, 'one');
}
@@ -132,7 +132,7 @@ public function matchOne(array $models, Collection $results, $relation)
* @param string $relation
* @return array<int, TDeclaringModel>
*/
public function matchMany(array $models, Collection $results, $relation)
public function matchMany(array $models, EloquentCollection $results, $relation)
{
return $this->matchOneOrMany($models, $results, $relation, 'many');
}
@@ -146,7 +146,7 @@ public function matchMany(array $models, Collection $results, $relation)
* @param string $type
* @return array<int, TDeclaringModel>
*/
protected function matchOneOrMany(array $models, Collection $results, $relation, $type)
protected function matchOneOrMany(array $models, EloquentCollection $results, $relation, $type)
{
$dictionary = $this->buildDictionary($results);

@@ -189,7 +189,7 @@ protected function getRelationValue(array $dictionary, $key, $type)
* @param \Illuminate\Database\Eloquent\Collection<int, TRelatedModel> $results
* @return array<array<int, TRelatedModel>>
*/
protected function buildDictionary(Collection $results)
protected function buildDictionary(EloquentCollection $results)
{
$foreign = $this->getForeignKeyName();