Merge branch 'release/2.0.0'

Author: lindyhopchris

.github/workflows/tests.yml

@@ -10,12 +10,15 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
-    
+
     strategy:
       fail-fast: true
       matrix:
-        php: ['7.4', '8.0']
-        laravel: ['^8.0']
+        php: [7.4, '8.0', 8.1]
+        laravel: [8, 9]
+        exclude:
+          - php: 7.4
+            laravel: 9
 
     steps:
     - name: Checkout Code
@@ -25,19 +28,20 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php }}
-        extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd
+        extensions: dom, curl, libxml, mbstring, zip
         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
+      run: composer require "illuminate/contracts:^${{ matrix.laravel }}" --no-update
 
     - name: Install dependencies
       uses: nick-invision/retry@v1
       with:
         timeout_minutes: 5
         max_attempts: 5
-        command: composer install --no-suggest --prefer-dist -n -o
-        
+        command: composer update --prefer-dist --no-interaction --no-progress
+
     - name: Execute tests
       run: vendor/bin/phpunit

CHANGELOG.md

@@ -3,6 +3,15 @@
 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/).
 
+## [2.0.0] - 2022-02-09
+
+### Added
+
+- Package now supports Laravel 9.
+- Added support for PHP 8.1.
+- Added return types to internal methods to remove deprecation messages in PHP 8.1
+- Package now requires v2 of the `laravel-json-api/core` dependency.
+
 ## [1.0.0] - 2021-07-31
 
 Initial stable release, with no changes from `1.0.0-beta.1`.

composer.json

@@ -24,11 +24,11 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "laravel-json-api/core": "^1.0.0"
+        "laravel-json-api/core": "^2.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.15",
-        "phpunit/phpunit": "^9.5"
+        "orchestra/testbench": "^6.23|^7.0",
+        "phpunit/phpunit": "^9.5.10"
     },
     "autoload": {
         "psr-4": {
@@ -43,7 +43,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "1.x-dev"
+            "dev-develop": "2.x-dev"
         }
     },
     "minimum-stability": "stable",

phpunit.xml

@@ -8,6 +8,7 @@
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
+         convertDeprecationsToExceptions="true"
          processIsolation="false"
          stopOnError="false"
          stopOnFailure="false"
@@ -30,4 +31,7 @@
             <directory suffix="Test.php">./tests/lib/Acceptance/</directory>
         </testsuite>
     </testsuites>
+    <php>
+        <ini name="error_reporting" value="E_ALL"/>
+    </php>
 </phpunit>

src/AbstractRepository.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2021 Cloud Creativity Limited
+ * Copyright 2022 Cloud Creativity Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/Capabilities/Capability.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2021 Cloud Creativity Limited
+ * Copyright 2022 Cloud Creativity Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/Capabilities/CrudRelations.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2021 Cloud Creativity Limited
+ * Copyright 2022 Cloud Creativity Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/Capabilities/CrudResource.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2021 Cloud Creativity Limited
+ * Copyright 2022 Cloud Creativity Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/Capabilities/QueryAll.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2021 Cloud Creativity Limited
+ * Copyright 2022 Cloud Creativity Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/Concerns/HasCrudCapability.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2021 Cloud Creativity Limited
+ * Copyright 2022 Cloud Creativity Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.