Merge branch 'release/1.1.0'

lindyhopchris · lindyhopchris · commit 271c9fe47d88 · 2022-02-09T18:44:45.000Z
diff --git a/.github/workflows/tests.yml b/.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
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,14 @@
 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/).
 
+## [1.1.0] - 2022-02-09
+
+### Added
+
+- Package now supports Laravel 9.
+- Added support for PHP 8.1.
+- Package now supports v2 of the `laravel-json-api/core` and `laravel-json-api/validation` dependencies.
+
 ## [1.0.0] - 2021-07-31
 
 Initial stable release, with no changes from `1.0.0-beta.4`.
diff --git a/composer.json b/composer.json
@@ -25,15 +25,15 @@
     "require": {
         "php": "^7.4|^8.0",
         "ext-json": "*",
-        "illuminate/contracts": "^8.0",
-        "illuminate/pipeline": "^8.0",
-        "laravel-json-api/core": "^1.0.0",
-        "laravel-json-api/validation": "^1.0.0"
+        "illuminate/contracts": "^8.0|^9.0",
+        "illuminate/pipeline": "^8.0|^9.0",
+        "laravel-json-api/core": "^1.0|^2.0",
+        "laravel-json-api/validation": "^1.0|^2.0"
     },
     "require-dev": {
-        "laravel-json-api/testing": "^1.0.0",
-        "orchestra/testbench": "^6.9",
-        "phpunit/phpunit": "^9.5"
+        "laravel-json-api/testing": "^1.1",
+        "orchestra/testbench": "^6.23|^7.0",
+        "phpunit/phpunit": "^9.5.10"
     },
     "autoload": {
         "psr-4": {
@@ -51,7 +51,7 @@
         }
     },
     "minimum-stability": "stable",
-    "prefer-stable": true,
+    "prefer-stable": false,
     "config": {
         "sort-packages": true
     }
diff --git a/phpunit.xml b/phpunit.xml
@@ -8,6 +8,7 @@
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
+         convertDeprecationsToExceptions="true"
          processIsolation="false"
          stopOnError="false"
          stopOnFailure="false"
@@ -28,6 +29,7 @@
         </testsuite>
     </testsuites>
     <php>
+        <ini name="error_reporting" value="E_ALL"/>
         <env name="DB_CONNECTION" value="testing"/>
     </php>
 </phpunit>
diff --git a/src/ExceptionParser.php b/src/ExceptionParser.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.
diff --git a/src/Pipes/AuthenticationExceptionHandler.php b/src/Pipes/AuthenticationExceptionHandler.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.
diff --git a/src/Pipes/Concerns/SetsHttpTitle.php b/src/Pipes/Concerns/SetsHttpTitle.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.
diff --git a/src/Pipes/HttpExceptionHandler.php b/src/Pipes/HttpExceptionHandler.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.
diff --git a/src/Pipes/RequestExceptionHandler.php b/src/Pipes/RequestExceptionHandler.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.
diff --git a/src/Pipes/ValidationExceptionHandler.php b/src/Pipes/ValidationExceptionHandler.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.
diff --git a/tests/Integration/AcceptHeaderTest.php b/tests/Integration/AcceptHeaderTest.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.
diff --git a/tests/Integration/ExceptionsTest.php b/tests/Integration/ExceptionsTest.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.
@@ -177,7 +177,7 @@ public function testMaintenanceMode(): void
 
     public function testMaintenanceModeWithoutMessage(): void
     {
-        $this->ex = new MaintenanceModeException(Carbon::now()->getTimestamp(), 60);
+        $this->ex = new MaintenanceModeException(Carbon::now()->getTimestamp(), 60, '');
 
         $expected = [
             'errors' => [
@@ -321,11 +321,12 @@ public function testAuthenticationException(): void
 
     public function testAuthenticationExceptionWithoutMessage(): void
     {
-        $this->ex = new AuthenticationException(null);
+        $this->ex = new AuthenticationException('Denied');
 
         $expected = [
             'errors' => [
                 [
+                    'detail' => 'Denied',
                     'status' => '401',
                     'title' => 'Unauthorized',
                 ],
diff --git a/tests/Integration/Handler.php b/tests/Integration/Handler.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.
diff --git a/tests/Integration/TestCase.php b/tests/Integration/TestCase.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.
@@ -20,11 +20,20 @@
 namespace LaravelJsonApi\Exceptions\Tests\Integration;
 
 use Illuminate\Contracts\Debug\ExceptionHandler;
+use Illuminate\Foundation\Testing\Concerns\InteractsWithDeprecationHandling;
 use LaravelJsonApi\Testing\TestExceptionHandler;
 use Orchestra\Testbench\TestCase as BaseTestCase;
 
 class TestCase extends BaseTestCase
 {
+    use InteractsWithDeprecationHandling;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->withoutDeprecationHandling();
+    }
 
     /**
      * @inheritDoc

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`	`/*`
`3`		`- * Copyright 2021 Cloud Creativity Limited`
	`3`	`+ * Copyright 2022 Cloud Creativity Limited`
`4`	`4`	`*`
`5`	`5`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`6`	`6`	`* you may not use this file except in compliance with the License.`