Fix for compatibility with Laravel 6

Author: bennothommo

.gitignore

@@ -1,20 +1,8 @@
-# phpstorm project files
-.idea
-
-# netbeans project files
-nbproject
-
-# zend studio for eclipse project files
-.buildpath
-.project
-.settings
-
 # windows thumbnail cache
 Thumbs.db
 
 # composer vendor dir
 /vendor
-
 /composer.lock
 
 # composer itself is not needed
@@ -23,13 +11,13 @@ composer.phar
 # Mac DS_Store Files
 .DS_Store
 
-# phpunit itself is not needed
-phpunit.phar
 # local phpunit config
 /phpunit.xml
+/.phpunit.cache
+.phpunit.result.cache
 
 # local tests configuration
 /tests/data/config.local.php
 
 # runtime cache
-/tests/runtime
+/tests/runtime

composer.json

@@ -13,14 +13,15 @@
         }
     ],
     "require": {
-        "php": ">=7.1",
-        "illuminate/database": "~5.5",
-        "illuminate/support": "~5.5"
+        "php": ">=7.4",
+        "illuminate/database": "~5.5|^6.0",
+        "illuminate/support": "~5.5|^6.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "~2.0",
-        "phpunit/phpunit": "~6.0",
-        "orchestra/testbench": "~3.5.0"
+        "phpunit/phpunit": "~9.0",
+        "dms/phpunit-arraysubset-asserts": "^0.5.0",
+        "orchestra/testbench": "~3.5.0|^4.0"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -1,17 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="./vendor/autoload.php">
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         cacheResultFile=".phpunit.cache/test-results"
+         executionOrder="depends,defects"
+         forceCoversAnnotation="false"
+         beStrictAboutCoversAnnotation="false"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         convertDeprecationsToExceptions="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         verbose="true">
     <testsuites>
         <testsuite name="Laravel Fixtures Test Suite">
-            <directory suffix=".php">./tests</directory>
+            <directory suffix=".php">tests</directory>
         </testsuite>
     </testsuites>
+
+    <coverage cacheDirectory=".phpunit.cache/code-coverage"
+              processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
 </phpunit>

tests/FixtureTest.php

@@ -3,6 +3,7 @@
 namespace CorpSoft\Tests\Fixture;
 
 use CorpSoft\Fixture\Exceptions\InvalidConfigException;
+use DMS\PHPUnitExtensions\ArraySubset\Assert;
 
 /**
  * Class FixtureTest
@@ -62,7 +63,7 @@ public function testGetFixtureData()
 
         $this->assertCount(2, $fixture->data);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             ['email' => '[email protected]'],
         ], $fixture->data);
     }

tests/TestCase.php

@@ -3,19 +3,19 @@
 namespace CorpSoft\Tests\Fixture;
 
 use Illuminate\Database\Schema\Blueprint;
-use Orchestra\Testbench\TestCase as Orchestra;
+use Orchestra\Testbench\TestCase as BaseTestCase;
 
 /**
  * Class TestCase
  *
  * @package CorpSoft\Tests\Fixture
  */
-abstract class TestCase extends Orchestra
+abstract class TestCase extends BaseTestCase
 {
     /**
      * @inheritdoc
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();