[Build] Add support for PHP 8.1

Author: lindyhopchris

CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file. This project adheres to
 [Semantic Versioning](http://semver.org/) and [this changelog format](http://keepachangelog.com/).
 
+## Unreleased
+
+### Added
+
+- Package now supports PHP 8.1.
+
 ## [1.0.1] - 2021-07-31
 
 ### Fixed

composer.json

@@ -25,12 +25,12 @@
     "require": {
         "php": "^7.4|^8.0",
         "illuminate/support": "^8.0",
-        "laravel-json-api/eloquent": "^1.0.0",
+        "laravel-json-api/eloquent": "^1.0.1|^2.0",
         "tenantcloud/laravel-boolean-softdeletes": "^3.1"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.17",
-        "phpunit/phpunit": "^9.5"
+        "orchestra/testbench": "^6.23",
+        "phpunit/phpunit": "^9.5.10"
     },
     "autoload": {
         "psr-4": {
@@ -49,7 +49,7 @@
             "dev-develop": "1.x-dev"
         }
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
         "sort-packages": true

phpunit.xml

@@ -24,6 +24,7 @@
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
+         convertDeprecationsToExceptions="true"
          processIsolation="false"
          stopOnError="false"
          stopOnFailure="false"
@@ -47,6 +48,7 @@
         </testsuite>
     </testsuites>
     <php>
+        <ini name="error_reporting" value="E_ALL"/>
         <env name="DB_CONNECTION" value="testing"/>
     </php>
 </phpunit>

tests/lib/Acceptance/TestCase.php

@@ -20,13 +20,16 @@
 namespace LaravelJsonApi\BooleanSoftDeletes\Tests\Acceptance;
 
 use App\Schemas\PostSchema;
+use Illuminate\Foundation\Testing\Concerns\InteractsWithDeprecationHandling;
 use LaravelJsonApi\Contracts\Schema\Container as SchemaContainerContract;
 use LaravelJsonApi\Contracts\Server\Server;
 use LaravelJsonApi\Core\Schema\Container as SchemaContainer;
+use LaravelJsonApi\Core\Support\ContainerResolver;
 use Orchestra\Testbench\TestCase as BaseTestCase;
 
 class TestCase extends BaseTestCase
 {
+    use InteractsWithDeprecationHandling;
 
     /**
      * @return void
@@ -35,14 +38,16 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        $this->withoutDeprecationHandling();
+
         $this->loadMigrationsFrom(__DIR__ . '/../../database/migrations');
 
-        $this->app->singleton(
-            SchemaContainerContract::class,
-            fn($container) => new SchemaContainer($container, $container->make(Server::class), [
+        $this->app->singleton(SchemaContainerContract::class, static function ($container) {
+            $resolver = new ContainerResolver(static fn() => $container);
+            return new SchemaContainer($resolver, $container->make(Server::class), [
                 PostSchema::class,
-            ]),
-        );
+            ]);
+        });
 
         $this->app->singleton(Server::class, function () {
             $server = $this->createMock(Server::class);