Removed all Warnings from PHPUnit 8

tests/BattleTest.php

@@ -6,14 +6,14 @@ namespace LotGD\Core\Tests\Models;
 use Doctrine\Common\Collections\Collection;
 
 use Doctrine\Common\Util\Debug;
-use LotGD\Core\{
-    Battle,
+use LotGD\Core\{Battle,
     DiceBag,
+    Exceptions\BattleIsOverException,
+    Exceptions\BattleNotOverException,
     Game,
     Models\Buff,
     Models\Character,
-    Models\Monster
-};
+    Models\Monster};
 use LotGD\Core\Models\BattleEvents\{
     BuffMessageEvent,
     CriticalHitEvent,
@@ -202,9 +202,6 @@ class BattleTest extends CoreModelTestCase
         $this->assertSame($battle->getWinner(), $highLevelMonster);
     }
 
-    /**
-     * @expectedException LotGD\Core\Exceptions\BattleNotOverException
-     */
     public function testBattleNotOverExceptionFromWinner()
     {
         $em = $this->getEntityManager();
@@ -214,12 +211,11 @@ class BattleTest extends CoreModelTestCase
 
         $battle = new Battle($this->getMockGame($character), $character, $monster);
 
+        $this->expectException(BattleNotOverException::class);
+
         $battle->getWinner();
     }
 
-    /**
-     * @expectedException LotGD\Core\Exceptions\BattleNotOverException
-     */
     public function testBattleNotOverExceptionFromLoser()
     {
         $em = $this->getEntityManager();
@@ -229,12 +225,13 @@ class BattleTest extends CoreModelTestCase
 
         $battle = new Battle($this->getMockGame($character), $character, $monster);
 
+        $this->expectException(BattleNotOverException::class);
+
         $battle->getLoser();
     }
 
     /**
      * Tests if the BattleIsOverException gets thrown.
-     * @expectedException LotGD\Core\Exceptions\BattleIsOverException
      */
     public function testBattleIsOverException()
     {
@@ -245,6 +242,8 @@ class BattleTest extends CoreModelTestCase
 
         $battle = new Battle($this->getMockGame($character), $character, $monster);
 
+        $this->expectException(BattleIsOverException::class);
+
         // Fighting for 99 rounds should be enough for determining a loser - and to
         // throw the exception.
         for ($n = 0; $n < 99; $n++) {
@@ -1358,7 +1357,7 @@ class BattleTest extends CoreModelTestCase
         ]));
 
         $modifier = $player->getBuffs()->getGoodguyAttackModifier();
-        $this->assertEquals(0.15498, $modifier, '', 0.001);
+        $this->assertEqualsWithDelta(0.15498, $modifier, 0.001);
     }
 
     public function testBufflistGoodguyDefenseModifier()
@@ -1387,7 +1386,7 @@ class BattleTest extends CoreModelTestCase
         ]));
 
         $modifier = $player->getBuffs()->getGoodguyDefenseModifier();
-        $this->assertEquals(7.2408, $modifier, '', 0.001);
+        $this->assertEqualsWithDelta(7.2408, $modifier, 0.001);
     }
 
     public function testBufflistGoodguyDamageModifier()
@@ -1416,7 +1415,7 @@ class BattleTest extends CoreModelTestCase
         ]));
 
         $modifier = $player->getBuffs()->getGoodguyDamageModifier();
-        $this->assertEquals(2.5, $modifier, '', 0.001);
+        $this->assertEqualsWithDelta(2.5, $modifier, 0.001);
     }
 
     public function testBufflistBadguyAttackModifier()
@@ -1445,7 +1444,7 @@ class BattleTest extends CoreModelTestCase
         ]));
 
         $modifier = $player->getBuffs()->getBadguyAttackModifier();
-        $this->assertEquals(0.15498, $modifier, '', 0.001);
+        $this->assertEqualsWithDelta(0.15498, $modifier, 0.001);
     }
 
     public function testBufflistBadguyDefenseModifier()
@@ -1474,7 +1473,7 @@ class BattleTest extends CoreModelTestCase
         ]));
 
         $modifier = $player->getBuffs()->getBadguyDefenseModifier();
-        $this->assertEquals(7.2408, $modifier, '', 0.001);
+        $this->assertEqualsWithDelta(7.2408, $modifier, 0.001);
     }
 
     public function testBufflistBadguyDamageModifier()
@@ -1503,7 +1502,7 @@ class BattleTest extends CoreModelTestCase
         ]));
 
         $modifier = $player->getBuffs()->getBadguyDamageModifier();
-        $this->assertEquals(2.5, $modifier, '', 0.001);
+        $this->assertEqualsWithDelta(2.5, $modifier, 0.001);
     }
 
     public function testBuffActivatedAt()

tests/BootstrapTest.php

@@ -83,11 +83,11 @@ class BootstrapTest extends TestCase
         $game->getEntityManager()->persist($user);
         $game->getEntityManager()->flush();
         $id = $user->getId();
-        $this->assertInternalType("int", $id);
+        $this->assertIsInt($id);
         $game->getEntityManager()->clear();
         $user = $game->getEntityManager()->getRepository(UserEntity::class)->find($id);
-        $this->assertInternalType("int", $user->getId());
-        $this->assertInternalType("string", $user->getName());
+        $this->assertIsInt($user->getId());
+        $this->assertIsSTring($user->getName());
         $this->assertSame("Monthy", $user->getName());
     }
 
@@ -146,7 +146,7 @@ class BootstrapTest extends TestCase
         $game->getEntityManager()->persist($user);
         $game->getEntityManager()->flush();
         $id = $user->getId();
-        $this->assertInternalType("int", $id);
+        $this->assertIsInt($id);
         $game->getEntityManager()->clear();
         $user = $game->getEntityManager()->getRepository(UserEntity::class)->find($id);
 

tests/Models/CharacterModelTest.php

@@ -6,6 +6,7 @@ namespace LotGD\Core\Tests\Models;
 use LotGD\Core\EventHandler;
 use LotGD\Core\EventManager;
 use LotGD\Core\Events\EventContext;
+use LotGD\Core\Exceptions\UnexpectedArrayKeyException;
 use LotGD\Core\Game;
 use LotGD\Core\GameBuilder;
 use LotGD\Core\Models\Character;
@@ -110,21 +111,21 @@ class CharacterModelTest extends CoreModelTestCase
 
     /**
      * Tests character creation with faulty data
-     * @param type $characterData
+     * @param array $characterData
      * @dataProvider invalidCharacters
-     * @expectedException TypeError
      */
     public function testFaultyCreation(array $characterData)
     {
+        $this->expectException(\TypeError::class);
         Character::create($characterData);
     }
 
     /**
      * Tests if invalid array key given during Character::create throws an exception
-     * @expectedException \LotGD\Core\Exceptions\UnexpectedArrayKeyException
      */
     public function testUnknownArrayKey()
     {
+        $this->expectException(UnexpectedArrayKeyException::class);
         Character::create([
             "name" => "Walter",
             "maxHealth" => 15,

tests/Models/MessageModelTest.php

@@ -48,7 +48,7 @@ class MessageModelTest extends CoreModelTestCase
         $thread1 = $em->getRepository(MessageThread::class)->findOrCreateFor([$character1, $character2]);
         
         // $thread1 should come from the database
-        $this->assertInternalType("int", $thread1->getId());
+        $this->assertIsInt($thread1->getId());
         
         $this->assertSame(3, count($thread1->getMessages()));
         $this->assertSame(2, count($character1->getMessageThreads()));
@@ -98,7 +98,7 @@ class MessageModelTest extends CoreModelTestCase
         $thread1 = $em->getRepository(MessageThread::class)->findOrCreateFor([$character1, $character2, $character3, $character4]);
         
         // $thread1 should come from the database
-        $this->assertInternalType("int", $thread1->getId());
+        $this->assertIsInt($thread1->getId());
         $this->assertSame(3, count($thread1->getMessages()));
         $this->assertSame(2, count($character1->getMessageThreads()));
         $this->assertSame(2, count($character2->getMessageThreads()));