[Refactor] PHP 8.1 support (#1)

* PHP 8.1 support
* Update Eloquent dependency

Author: X-Coder264

.github/workflows/tests.yml

@@ -2,19 +2,19 @@ name: Tests
 
 on:
   push:
-    branches: [ main, develop ]
+    branches: [ main, develop, 2.x ]
   pull_request:
-    branches: [ main, develop ]
+    branches: [ main, develop, 2.x ]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
-    
+
     strategy:
       fail-fast: true
       matrix:
-        php: ['7.4', '8.0']
+        php: ['7.4', '8.0', '8.1']
         laravel: ['^8.0']
 
     steps:
@@ -28,6 +28,7 @@ jobs:
         extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd
         tools: composer:v2
         coverage: none
+        ini-values: error_reporting=E_ALL
 
     - name: Set Laravel Version
       run: composer require "laravel/framework:${{ matrix.laravel }}" --no-update -n
@@ -38,6 +39,6 @@ jobs:
         timeout_minutes: 5
         max_attempts: 5
         command: composer install --no-suggest --prefer-dist -n -o
-        
+
     - name: Execute tests
       run: vendor/bin/phpunit

composer.json

@@ -28,11 +28,11 @@
         "illuminate/database": "^8.0",
         "illuminate/pagination": "^8.0",
         "illuminate/support": "^8.0",
-        "laravel-json-api/eloquent": "^1.0.0"
+        "laravel-json-api/eloquent": "^2.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.9",
-        "phpunit/phpunit": "^9.5"
+        "orchestra/testbench": "^6.23",
+        "phpunit/phpunit": "^9.5.10"
     },
     "autoload": {
         "psr-4": {
@@ -48,10 +48,11 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "1.x-dev"
+            "dev-develop": "1.x-dev",
+            "dev-2.x": "2.x-dev"
         }
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
         "sort-packages": true

phpunit.xml

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

src/Cursor/CursorPaginator.php

@@ -24,6 +24,7 @@
 use Illuminate\Pagination\Paginator;
 use IteratorAggregate;
 use LogicException;
+use Traversable;
 
 class CursorPaginator implements IteratorAggregate, Countable
 {
@@ -154,15 +155,15 @@ public function getTo(): ?string
     /**
      * @inheritDoc
      */
-    public function getIterator()
+    public function getIterator(): Traversable
     {
         yield from $this->items;
     }
 
     /**
      * @inheritDoc
      */
-    public function count()
+    public function count(): int
     {
         return $this->items->count();
     }

src/CursorPage.php

@@ -23,6 +23,7 @@
 use LaravelJsonApi\Core\Document\Link;
 use LaravelJsonApi\Core\Pagination\AbstractPage;
 use LaravelJsonApi\CursorPagination\Cursor\CursorPaginator;
+use Traversable;
 
 class CursorPage extends AbstractPage
 {
@@ -179,15 +180,15 @@ public function url(array $page): string
     /**
      * @inheritDoc
      */
-    public function getIterator()
+    public function getIterator(): Traversable
     {
         yield from $this->paginator;
     }
 
     /**
      * @inheritDoc
      */
-    public function count()
+    public function count(): int
     {
         return $this->paginator->count();
     }

tests/lib/Acceptance/TestCase.php

@@ -19,28 +19,34 @@
 
 namespace LaravelJsonApi\CursorPagination\Tests\Acceptance;
 
+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;
+
     /**
      * @inheritDoc
      */
     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), [
                 \App\VideoSchema::class,
-            ])
-        );
+            ]);
+        });
 
         $this->app->singleton(Server::class, function () {
             $server = $this->createMock(Server::class);