Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix dispatching event

Browse Source
This commit is contained in:
Pig Fang 2019-09-02 20:42:26 +08:00
parent 3f7a4212d1
commit ed80b2373b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/PlayerController.php
View File

@ -124,7 +124,7 @@ class PlayerController extends Controller
])['name'];
$player = Player::find($pid);
$dispatcher->dispatch('player.renaming', $player, $newName);
$dispatcher->dispatch('player.renaming', [$player, $newName]);
if (! Player::where('name', $newName)->get()->isEmpty()) {
return json(trans('user.player.rename.repeated'), 6);
@ -140,7 +140,7 @@ class PlayerController extends Controller
$user->save();
}
$dispatcher->dispatch('player.renamed', $player, $oldName);
$dispatcher->dispatch('player.renamed', [$player, $oldName]);
return json(trans('user.player.rename.success', ['old' => $oldName, 'new' => $newName]), 0, $player->toArray());
}

6
tests/PlayerControllerTest.php
View File

@ -199,12 +199,14 @@ class PlayerControllerTest extends TestCase
),
]);
Event::assertDispatched(Events\PlayerProfileUpdated::class);
Event::assertDispatched('player.renaming', function ($event, $player, $newName) use ($pid) {
Event::assertDispatched('player.renaming', function ($event, $payload) use ($pid) {
[$player, $newName] = $payload;
$this->assertEquals($pid, $player->pid);
$this->assertEquals('new_name', $newName);
return true;
});
Event::assertDispatched('player.renamed', function ($event, $player, $oldName) use ($pid) {
Event::assertDispatched('player.renamed', function ($event, $payload) use ($pid) {
[$player, $oldName] = $payload;
$this->assertEquals($pid, $player->pid);
$this->assertNotEquals('new_name', $oldName);
return true;