From ed80b2373bb2f04a4c5061f3b0597e5056c2e2d8 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Mon, 2 Sep 2019 20:42:26 +0800
Subject: [PATCH] Fix dispatching event

---
 app/Http/Controllers/PlayerController.php | 4 ++--
 tests/PlayerControllerTest.php            | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/PlayerController.php b/app/Http/Controllers/PlayerController.php
index 2cdff229..e8c7c186 100644
--- a/app/Http/Controllers/PlayerController.php
+++ b/app/Http/Controllers/PlayerController.php
@@ -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());
     }
diff --git a/tests/PlayerControllerTest.php b/tests/PlayerControllerTest.php
index ba6b609e..72077f7e 100644
--- a/tests/PlayerControllerTest.php
+++ b/tests/PlayerControllerTest.php
@@ -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;