Skip to content

Fire model.relation.beforeAdd/afterAdd events from AttachOneOrMany::create() #244

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.

Sign up for GitHub

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

Open
wakqasahmed wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fire model.relation.beforeAdd/afterAdd events from AttachOneOrMany::create() #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8d34e5
Fire model.relation.beforeAdd/afterAdd events from AttachOneOrMany::c…
wakqasahmed Sep 4, 2026
347e6f5
phpstan: correct expected-occurrence count for AttachOne::delete() to 2
wakqasahmed Sep 4, 2026
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
2 changes: 1 addition & 1 deletion phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ parameters:

-
message: "#^Call to private method delete\\(\\) of parent class Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\MorphOne\\<Illuminate\\\\Database\\\\Eloquent\\\\Model\\>\\.$#"
count: 3
count: 2
path: src/Database/Relations/AttachOne.php

-
Expand Down
13 changes: 4 additions & 9 deletions src/Database/Relations/Concerns/AttachOneOrMany.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,22 +150,17 @@ public function save(Model $model, $sessionKey = null)
*/
public function create(array $attributes = [], $sessionKey = null)
{
// Delete siblings for single attachments
if ($sessionKey === null && $this instanceof AttachOne) {
$this->delete();
}

if (!array_key_exists('is_public', $attributes)) {
$attributes = array_merge(['is_public' => $this->isPublic()], $attributes);
}

$attributes['field'] = $this->fieldName;

$model = parent::create($attributes);
$model = $sessionKey === null
? $this->related->newInstance($attributes)
: parent::create($attributes);

if ($sessionKey !== null) {
$this->add($model, $sessionKey);
}
$this->add($model, $sessionKey);

return $model;
}
Expand Down
41 changes: 41 additions & 0 deletions tests/Database/Relations/AttachManyTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,45 @@ public function testDeleteFlagDeleteModelLaravelRelation()
$user->delete();
$this->assertNull(File::find($photoId));
}

public function testCreateFiresRelationEvents()
{
Model::unguard();
$user = User::create(['name' => 'Stevie', 'email' => 'stevie@example.com']);
Model::reguard();

$beforeAddCalls = [];
$afterAddCalls = [];
$user->bindEvent('model.relation.beforeAdd', function ($relationName, $relatedModel) use (&$beforeAddCalls) {
$beforeAddCalls[] = [$relationName, $relatedModel];
});
$user->bindEvent('model.relation.afterAdd', function ($relationName, $relatedModel) use (&$afterAddCalls) {
$afterAddCalls[] = [$relationName, $relatedModel];
});

$photo = $user->photos()->create(['data' => dirname(dirname(__DIR__)) . '/fixtures/attach/avatar.png']);

$this->assertCount(1, $beforeAddCalls);
$this->assertSame('photos', $beforeAddCalls[0][0]);
$this->assertTrue($photo->is($beforeAddCalls[0][1]));

$this->assertCount(1, $afterAddCalls);
$this->assertSame('photos', $afterAddCalls[0][0]);
$this->assertTrue($photo->is($afterAddCalls[0][1]));
}

public function testCreateDoesNotReplaceExistingAttachments()
{
Model::unguard();
$user = User::create(['name' => 'Stevie', 'email' => 'stevie@example.com']);
Model::reguard();

$first = $user->photos()->create(['data' => dirname(dirname(__DIR__)) . '/fixtures/attach/avatar.png']);
$second = $user->photos()->create(['data' => dirname(dirname(__DIR__)) . '/fixtures/attach/avatar.png']);

$this->assertNotNull(File::find($first->id));
$this->assertNotNull(File::find($second->id));
$user->reloadRelations();
$this->assertCount(2, $user->photos);
}
}
42 changes: 42 additions & 0 deletions tests/Database/Relations/AttachOneTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,4 +176,46 @@ public function testDeleteFlagSoftDeleteModel()
$user->delete();
$this->assertNotNull(File::find($avatarId));
}

public function testCreateFiresRelationEvents()
{
Model::unguard();
$user = User::create(['name' => 'Stevie', 'email' => 'stevie@example.com']);
Model::reguard();

$beforeAddCalls = [];
$afterAddCalls = [];
$user->bindEvent('model.relation.beforeAdd', function ($relationName, $relatedModel) use (&$beforeAddCalls) {
$beforeAddCalls[] = [$relationName, $relatedModel];
});
$user->bindEvent('model.relation.afterAdd', function ($relationName, $relatedModel) use (&$afterAddCalls) {
$afterAddCalls[] = [$relationName, $relatedModel];
});

$avatar = $user->avatar()->create(['data' => dirname(dirname(__DIR__)) . '/fixtures/attach/avatar.png']);

$this->assertCount(1, $beforeAddCalls);
$this->assertSame('avatar', $beforeAddCalls[0][0]);
$this->assertTrue($avatar->is($beforeAddCalls[0][1]));

$this->assertCount(1, $afterAddCalls);
$this->assertSame('avatar', $afterAddCalls[0][0]);
$this->assertTrue($avatar->is($afterAddCalls[0][1]));
}

public function testCreateReplacesExistingSingleAttachment()
{
Model::unguard();
$user = User::create(['name' => 'Stevie', 'email' => 'stevie@example.com']);
Model::reguard();

$first = $user->avatar()->create(['data' => dirname(dirname(__DIR__)) . '/fixtures/attach/avatar.png']);
$firstId = $first->id;

$second = $user->avatar()->create(['data' => dirname(dirname(__DIR__)) . '/fixtures/attach/avatar.png']);

$this->assertNull(File::find($firstId));
$this->assertNotNull(File::find($second->id));
$this->assertNotSame($firstId, $second->id);
}
}
Loading