[Refactor] PHP 8.1 support (#4)

* PHP 8.1 support
* Update dependencies

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

@@ -26,11 +26,11 @@
         "php": "^7.4|^8.0",
         "ext-json": "*",
         "illuminate/support": "^8.0",
-        "laravel-json-api/core": "^1.1",
-        "laravel-json-api/neomerx-json-api": "^4.0.2"
+        "laravel-json-api/core": "^2.0",
+        "laravel-json-api/neomerx-json-api": "^5.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^9.5.10"
     },
     "autoload": {
         "psr-4": {
@@ -44,15 +44,16 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "1.x-dev"
+            "dev-develop": "1.x-dev",
+            "dev-2.x": "2.x-dev"
         },
         "laravel": {
             "providers": [
                 "LaravelJsonApi\\Encoder\\Neomerx\\ServiceProvider"
             ]
         }
     },
-    "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"
@@ -27,4 +28,8 @@
       <directory suffix="Test.php">./tests/Integration/</directory>
     </testsuite>
   </testsuites>
+
+  <php>
+    <ini name="error_reporting" value="E_ALL"/>
+  </php>
 </phpunit>

src/Schema/Relationships.php

@@ -28,6 +28,7 @@
 use LaravelJsonApi\Core\Resources\JsonApiResource;
 use LaravelJsonApi\Encoder\Neomerx\Mapper;
 use Neomerx\JsonApi\Contracts\Schema\ContextInterface;
+use Traversable;
 use UnexpectedValueException;
 
 /**
@@ -97,7 +98,7 @@ public function __construct(
     /**
      * @inheritDoc
      */
-    public function getIterator()
+    public function getIterator(): Traversable
     {
         foreach ($this->iterator() as $relation) {
             if (!$relation instanceof JsonApiRelation) {

src/ServiceProvider.php

@@ -31,7 +31,7 @@ class ServiceProvider extends BaseServiceProvider implements DeferrableProvider
     /**
      * @inheritDoc
      */
-    public function provides()
+    public function provides(): array
     {
         return [
             EncoderFactoryContract::class,