Update tests to be compatible with upgraded phpunit

Author: Thomas

tests/EntrustTest.php

@@ -1,19 +1,21 @@
 <?php
 
 use Zizaco\Entrust\Entrust;
-use Illuminate\Support\Facades\Facade;
+use PHPUnit\Framework\TestCase;
 use Mockery as m;
 
-class EntrustTest extends PHPUnit_Framework_TestCase
+class EntrustTest extends TestCase
 {
     protected $nullFilterTest;
     protected $abortFilterTest;
     protected $customResponseFilterTest;
 
     protected $expectedResponse;
 
-    public function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
+
         $this->nullFilterTest = function($filterClosure) {
             if (!($filterClosure instanceof Closure)) {
                 return false;
@@ -54,8 +56,9 @@ public function setUp()
         };
     }
 
-    public function tearDown()
+    protected function tearDown(): void
     {
+        parent::tearDown();
         m::close();
     }
 
@@ -214,6 +217,8 @@ public function testRouteNeedsRole()
         */
         $entrust->routeNeedsRole($route, $oneRole);
         $entrust->routeNeedsRole($route, $manyRole);
+
+        $this->assertTrueWithoutException();
     }
 
     public function testRouteNeedsPermission()
@@ -254,6 +259,8 @@ public function testRouteNeedsPermission()
         */
         $entrust->routeNeedsPermission($route, $onePerm);
         $entrust->routeNeedsPermission($route, $manyPerm);
+
+        $this->assertTrueWithoutException();
     }
 
     public function testRouteNeedsRoleOrPermission()
@@ -316,6 +323,8 @@ public function testRouteNeedsRoleOrPermission()
         $entrust->routeNeedsRoleOrPermission($route, $oneRole, $manyPerm);
         $entrust->routeNeedsRoleOrPermission($route, $manyRole, $onePerm);
         $entrust->routeNeedsRoleOrPermission($route, $manyRole, $manyPerm);
+
+        $this->assertTrueWithoutException();
     }
 
     public function simpleFilterDataProvider()
@@ -432,4 +441,9 @@ protected function makeFilterName($route, array $roles, array $permissions = nul
             return implode('_', $roles) . '_' . implode('_', $permissions) . '_' . substr(md5($route), 0, 6);
         }
     }
+
+    private function assertTrueWithoutException()
+    {
+        $this->assertTrue(true, 'Make it to the end without exception');
+    }
 }

tests/EntrustUserTest.php

@@ -1,13 +1,14 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use Zizaco\Entrust\Contracts\EntrustUserInterface;
 use Zizaco\Entrust\Traits\EntrustUserTrait;
 use Illuminate\Support\Facades\Config;
 use Mockery as m;
 
-class EntrustUserTest extends PHPUnit_Framework_TestCase
+class EntrustUserTest extends TestCase
 {
-    public function tearDown()
+    protected function tearDown(): void
     {
         m::close();
     }
@@ -817,6 +818,8 @@ public function testAttachRole()
         $user->attachRole($roleObject);
         $user->attachRole($roleArray);
         $user->attachRole(3);
+
+        $this->assertTrueWithoutException();
     }
 
     public function testDetachRole()
@@ -860,6 +863,8 @@ public function testDetachRole()
         $user->detachRole($roleObject);
         $user->detachRole($roleArray);
         $user->detachRole(3);
+
+        $this->assertTrueWithoutException();
     }
 
     public function testAttachRoles()
@@ -892,6 +897,8 @@ public function testAttachRoles()
         |------------------------------------------------------------
         */
         $user->attachRoles([1, 2, 3]);
+
+        $this->assertTrueWithoutException();
     }
 
     public function testDetachRoles()
@@ -924,6 +931,8 @@ public function testDetachRoles()
         |------------------------------------------------------------
         */
         $user->detachRoles([1, 2, 3]);
+
+        $this->assertTrueWithoutException();
     }
 
     protected function mockPermission($permName)
@@ -944,6 +953,11 @@ protected function mockRole($roleName)
 
         return $roleMock;
     }
+
+    private function assertTrueWithoutException()
+    {
+        $this->assertTrue(true, 'Make it to the end without exception');
+    }
 }
 
 class HasRoleUser implements EntrustUserInterface