From c74fa7955d9392aea954c2e45ed4137fb2bebcbe Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Wed, 24 Apr 2019 10:45:00 +0200
Subject: phpunit: Upgrade to version 8, fixed tests, formatting

Use `dms/phpunit-arraysubset-asserts` after `assertArraySubset` got deprecated
---
 tests/Unit/Database/DbTest.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'tests/Unit/Database/DbTest.php')

diff --git a/tests/Unit/Database/DbTest.php b/tests/Unit/Database/DbTest.php
index ca6ac52c..a408f78f 100644
--- a/tests/Unit/Database/DbTest.php
+++ b/tests/Unit/Database/DbTest.php
@@ -6,8 +6,8 @@ use Engelsystem\Database\Db;
 use Illuminate\Database\Capsule\Manager as CapsuleManager;
 use Illuminate\Database\Connection as DatabaseConnection;
 use PDO;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class DbTest extends TestCase
 {
@@ -17,15 +17,15 @@ class DbTest extends TestCase
      */
     public function testSetDbManager()
     {
-        /** @var MockObject|Pdo $pdo */
+        /** @var Pdo|MockObject $pdo */
         $pdo = $this->getMockBuilder(Pdo::class)
             ->disableOriginalConstructor()
             ->getMock();
-        /** @var MockObject|CapsuleManager $dbManager */
+        /** @var CapsuleManager|MockObject $dbManager */
         $dbManager = $this->getMockBuilder(CapsuleManager::class)
             ->disableOriginalConstructor()
             ->getMock();
-        /** @var MockObject|DatabaseConnection $dbManager */
+        /** @var DatabaseConnection|MockObject $dbManager */
         $databaseConnection = $this->getMockBuilder(DatabaseConnection::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -69,7 +69,7 @@ class DbTest extends TestCase
 
         $return = Db::selectOne('SELECT * FROM test_data WHERE id = ?', [3]);
         $return = array_pop($return);
-        $this->assertTrue(!is_array($return));
+        $this->assertIsNotArray($return);
     }
 
     /**
@@ -117,7 +117,7 @@ class DbTest extends TestCase
     /**
      * Setup in memory database
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $dbManager = new CapsuleManager();
         $dbManager->addConnection(['driver' => 'sqlite', 'database' => ':memory:']);
-- 
cgit v1.2.3-70-g09d2