phpunit: Upgrade to version 8, fixed tests, formatting

Use `dms/phpunit-arraysubset-asserts` after `assertArraySubset` got deprecated

7 files changed, 30 insertions, 21 deletions

diff --git a/tests/Unit/Database/DatabaseServiceProviderTest.php b/tests/Unit/Database/DatabaseServiceProviderTest.php
index 7dae065f..c9c6f9e3 100644
--- a/tests/Unit/Database/DatabaseServiceProviderTest.php
+++ b/tests/Unit/Database/DatabaseServiceProviderTest.php
@@ -13,7 +13,7 @@ use Illuminate\Database\Capsule\Manager as CapsuleManager;
 use Illuminate\Database\Connection;
 use PDO;
 use PDOException;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class DatabaseServiceProviderTest extends ServiceProviderTest
 {
@@ -78,13 +78,13 @@ class DatabaseServiceProviderTest extends ServiceProviderTest
      */
     protected function prepare($dbConfigData, $getPdoThrowException = false)
     {
-        /** @var MockObject|Config $config */
+        /** @var Config|MockObject $config */
         $config = $this->getMockBuilder(Config::class)
             ->getMock();
-        /** @var MockObject|CapsuleManager $config */
+        /** @var CapsuleManager|MockObject $config */
         $dbManager = $this->getMockBuilder(CapsuleManager::class)
             ->getMock();
-        /** @var MockObject|Connection $connection */
+        /** @var Connection|MockObject $connection */
         $connection = $this->getMockBuilder(Connection::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/tests/Unit/Database/DatabaseTest.php b/tests/Unit/Database/DatabaseTest.php
index 91d6a6c7..7aef51c3 100644
--- a/tests/Unit/Database/DatabaseTest.php
+++ b/tests/Unit/Database/DatabaseTest.php
@@ -6,8 +6,8 @@ use Engelsystem\Database\Database;
 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 DatabaseTest extends TestCase
 {
@@ -69,7 +69,7 @@ class DatabaseTest extends TestCase
         $this->assertEmpty($return);
 
         $return = $db->selectOne('SELECT * FROM test_data WHERE id = ?', [3]);
-        $this->assertTrue(!is_array($return));
+        $this->assertIsNotArray($return);
     }
 
     /**
@@ -114,7 +114,7 @@ class DatabaseTest extends TestCase
     /**
      * Setup in memory database
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $dbManager = new CapsuleManager();
         $dbManager->addConnection(['driver' => 'sqlite', 'database' => ':memory:']);
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:']);
diff --git a/tests/Unit/Database/Migration/MigrateTest.php b/tests/Unit/Database/Migration/MigrateTest.php
index 2adbed41..3a9adbe8 100644
--- a/tests/Unit/Database/Migration/MigrateTest.php
+++ b/tests/Unit/Database/Migration/MigrateTest.php
@@ -21,15 +21,15 @@ class MigrateTest extends TestCase
      */
     public function testRun()
     {
-        /** @var MockObject|Application $app */
+        /** @var Application|MockObject $app */
         $app = $this->getMockBuilder(Application::class)
             ->setMethods(['instance'])
             ->getMock();
-        /** @var MockObject|SchemaBuilder $builder */
+        /** @var SchemaBuilder|MockObject $builder */
         $builder = $this->getMockBuilder(SchemaBuilder::class)
             ->disableOriginalConstructor()
             ->getMock();
-        /** @var MockObject|Migrate $migration */
+        /** @var Migrate|MockObject $migration */
         $migration = $this->getMockBuilder(Migrate::class)
             ->setConstructorArgs([$builder, $app])
             ->setMethods(['initMigration', 'getMigrationFiles', 'getMigrated', 'migrate', 'setMigrated'])
diff --git a/tests/Unit/Database/Migration/MigrationServiceProviderTest.php b/tests/Unit/Database/Migration/MigrationServiceProviderTest.php
index 593da5c5..589bda9c 100644
--- a/tests/Unit/Database/Migration/MigrationServiceProviderTest.php
+++ b/tests/Unit/Database/Migration/MigrationServiceProviderTest.php
@@ -8,7 +8,7 @@ use Engelsystem\Database\Migration\MigrationServiceProvider;
 use Engelsystem\Test\Unit\ServiceProviderTest;
 use Illuminate\Database\Connection;
 use Illuminate\Database\Schema\Builder as SchemaBuilder;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class MigrationServiceProviderTest extends ServiceProviderTest
 {
@@ -17,7 +17,7 @@ class MigrationServiceProviderTest extends ServiceProviderTest
      */
     public function testRegister()
     {
-        /** @var MockObject|Migrate $migration */
+        /** @var Migrate|MockObject $migration */
         $migration = $this->getMockBuilder(Migrate::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -25,11 +25,11 @@ class MigrationServiceProviderTest extends ServiceProviderTest
         $database = $this->getMockBuilder(Database::class)
             ->disableOriginalConstructor()
             ->getMock();
-        /** @var MockObject|Connection $dbConnection */
+        /** @var Connection|MockObject $dbConnection */
         $dbConnection = $this->getMockBuilder(Connection::class)
             ->disableOriginalConstructor()
             ->getMock();
-        /** @var MockObject|SchemaBuilder $schemaBuilder */
+        /** @var SchemaBuilder|MockObject $schemaBuilder */
         $schemaBuilder = $this->getMockBuilder(SchemaBuilder::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/tests/Unit/Database/Migration/MigrationTest.php b/tests/Unit/Database/Migration/MigrationTest.php
index 2fa1b6c0..a9c70ecc 100644
--- a/tests/Unit/Database/Migration/MigrationTest.php
+++ b/tests/Unit/Database/Migration/MigrationTest.php
@@ -19,6 +19,6 @@ class MigrationTest extends TestCase
             ->getMock();
 
         $instance = new AnotherStuff($schemaBuilder);
-        $this->assertAttributeEquals($schemaBuilder, 'schema', $instance);
+        $this->assertEquals($schemaBuilder, $instance->getSchema());
     }
 }
diff --git a/tests/Unit/Database/Migration/Stub/2017_12_24_053300_another_stuff.php b/tests/Unit/Database/Migration/Stub/2017_12_24_053300_another_stuff.php
index 65846d16..4adaf3ed 100644
--- a/tests/Unit/Database/Migration/Stub/2017_12_24_053300_another_stuff.php
+++ b/tests/Unit/Database/Migration/Stub/2017_12_24_053300_another_stuff.php
@@ -3,6 +3,7 @@
 namespace Engelsystem\Migrations;
 
 use Engelsystem\Database\Migration\Migration;
+use Illuminate\Database\Schema\Builder as SchemaBuilder;
 
 class AnotherStuff extends Migration
 {
@@ -21,4 +22,12 @@ class AnotherStuff extends Migration
     {
         // nope
     }
+
+    /**
+     * @return SchemaBuilder
+     */
+    public function getSchema()
+    {
+        return $this->schema;
+    }
 }