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/Migration/MigrateTest.php                    | 6 +++---
 tests/Unit/Database/Migration/MigrationServiceProviderTest.php   | 8 ++++----
 tests/Unit/Database/Migration/MigrationTest.php                  | 2 +-
 .../Database/Migration/Stub/2017_12_24_053300_another_stuff.php  | 9 +++++++++
 4 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'tests/Unit/Database/Migration')

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;
+    }
 }
-- 
cgit v1.2.3-54-g00ecf