Add support for Laravel 6

.travis.yml

@@ -4,8 +4,9 @@ services:
   - mysql
 
 php:
-  - 5.6
-  - 7.0
+  - 7.2
+  - 7.3
+  - 7.4
 
 addons:
     code_climate:
@@ -35,7 +36,7 @@ before_script:
   - cd vendor/laravel/laravel
   - composer update --dev --prefer-source --no-interaction
   - perl -pi -w -e "s/'engine' => null,/'engine' => 'InnoDB ROW_FORMAT=DYNAMIC',/g;" config/database.php
-  - php artisan migrate
+  - php artisan migrate --force
   - cd -
 
 script:

composer.json

@@ -21,15 +21,18 @@
         }
     },
     "require": {
-        "php": ">=5.4.0"
+        "php": ">=7.2"
     },
     "require-dev": {
-        "phpunit/phpunit" : "5.*",
+        "beyondcode/laravel-dump-server": "^1.2",
+        "nunomaduro/collision": "3.*",
+        "phpunit/phpunit" : "^8.0",
         "fzaninotto/faker": "~1.4",
-        "laravel/laravel": "5.*",
+        "laravel/laravel": "^6.0",
         "codeclimate/php-test-reporter": "^0.3.2",
-        "mockery/mockery": "^0.9.5",
-        "doctrine/dbal": "^2.5"
+        "mockery/mockery": "^1.3",
+        "doctrine/dbal": "^2.5",
+        "facade/ignition": "^1.4"
     },
     "autoload": {
         "psr-4": {

src/Traits/Friendable.php

@@ -32,7 +32,7 @@ public function befriend(Model $recipient)
 
         $this->friends()->save($friendship);
 
-        Event::fire('friendships.sent', [$this, $recipient]);
+        Event::dispatch('friendships.sent', [$this, $recipient]);
 
         return $friendship;
 
@@ -47,7 +47,7 @@ public function unfriend(Model $recipient)
     {
         $deleted = $this->findFriendship($recipient)->delete();
 
-        Event::fire('friendships.cancelled', [$this, $recipient]);
+        Event::dispatch('friendships.cancelled', [$this, $recipient]);
 
         return $deleted;
     }
@@ -93,7 +93,7 @@ public function acceptFriendRequest(Model $recipient)
             'status' => Status::ACCEPTED,
         ]);
 
-        Event::fire('friendships.accepted', [$this, $recipient]);
+        Event::dispatch('friendships.accepted', [$this, $recipient]);
 
         return $updated;
     }
@@ -109,7 +109,7 @@ public function denyFriendRequest(Model $recipient)
             'status' => Status::DENIED,
         ]);
 
-        Event::fire('friendships.denied', [$this, $recipient]);
+        Event::dispatch('friendships.denied', [$this, $recipient]);
 
         return $updated;
     }
@@ -191,7 +191,7 @@ public function blockFriend(Model $recipient)
 
         $this->friends()->save($friendship);
 
-        Event::fire('friendships.blocked', [$this, $recipient]);
+        Event::dispatch('friendships.blocked', [$this, $recipient]);
 
         return $friendship;
     }
@@ -205,7 +205,7 @@ public function unblockFriend(Model $recipient)
     {
         $deleted = $this->findFriendship($recipient)->whereSender($this)->delete();
 
-        Event::fire('friendships.unblocked', [$this, $recipient]);
+        Event::dispatch('friendships.unblocked', [$this, $recipient]);
 
         return $deleted;
     }

tests/FriendshipsEventsTest.php

@@ -11,74 +11,76 @@
 class FriendshipsEventsTest extends TestCase
 {
     // use DatabaseTransactions;
-    
-    public function setUp()
+
+    public function setUp(): void
     {
         parent::setUp();
+
+        Event::fake();
 
         $this->sender    = createUser();
         $this->recipient = createUser();
     }
-  
-    public function tearDown()
+
+    public function tearDown(): void
     {
         Mockery::close();
     }
-  
+
     /** @test */
     public function friend_request_is_sent()
     {
-        Event::shouldReceive('fire')->once()->withArgs(['friendships.sent', Mockery::any()]);
-
         $this->sender->befriend($this->recipient);
+
+        Event::assertDispatched('friendships.sent');
     }
-  
+
     /** @test */
     public function friend_request_is_accepted()
     {
         $this->sender->befriend($this->recipient);
-        Event::shouldReceive('fire')->once()->withArgs(['friendships.accepted', Mockery::any()]);
-
         $this->recipient->acceptFriendRequest($this->sender);
+
+        Event::assertDispatched('friendships.accepted');
     }
 
     /** @test */
     public function friend_request_is_denied()
     {
         $this->sender->befriend($this->recipient);
-        Event::shouldReceive('fire')->once()->withArgs(['friendships.denied', Mockery::any()]);
-
         $this->recipient->denyFriendRequest($this->sender);
+
+        Event::assertDispatched('friendships.denied');
     }
 
     /** @test */
     public function friend_is_blocked()
     {
         $this->sender->befriend($this->recipient);
         $this->recipient->acceptFriendRequest($this->sender);
-        Event::shouldReceive('fire')->once()->withArgs(['friendships.blocked', Mockery::any()]);
-
         $this->recipient->blockFriend($this->sender);
+
+        Event::assertDispatched('friendships.blocked');
     }
-  
+
     /** @test */
     public function friend_is_unblocked()
     {
         $this->sender->befriend($this->recipient);
         $this->recipient->acceptFriendRequest($this->sender);
         $this->recipient->blockFriend($this->sender);
-        Event::shouldReceive('fire')->once()->withArgs(['friendships.unblocked', Mockery::any()]);
-
         $this->recipient->unblockFriend($this->sender);
+
+        Event::assertDispatched('friendships.unblocked');
     }
-  
+
     /** @test */
     public function friendship_is_cancelled()
     {
         $this->sender->befriend($this->recipient);
         $this->recipient->acceptFriendRequest($this->sender);
-        Event::shouldReceive('fire')->once()->withArgs(['friendships.cancelled', Mockery::any()]);
-
         $this->recipient->unfriend($this->sender);
+
+        Event::assertDispatched('friendships.cancelled');
     }
-}
+}