Merge branch 'release/2.0.0'

lindyhopchris · lindyhopchris · commit 3d7a6f0f7e87 · 2023-02-27T18:09:11.000Z
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,15 +14,12 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.4, '8.0', 8.1]
-        laravel: [8, 9]
-        exclude:
-          - php: 7.4
-            laravel: 9
+        php: [8.1, 8.2]
+        laravel: [10]
 
     steps:
     - name: Checkout Code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -37,7 +34,7 @@ jobs:
       run: composer require "laravel/framework:^${{ matrix.laravel }}" --no-update
 
     - name: Install dependencies
-      uses: nick-invision/retry@v1
+      uses: nick-fields/retry@v2
       with:
         timeout_minutes: 5
         max_attempts: 5
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 vendor/
 composer.lock
-.phpunit.result.cache
+.phpunit.cache/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,13 @@
 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] - 2023-02-27
+
+### Changed
+
+- Minimum PHP version is now 8.1.
+- Upgraded to Laravel 10, dropping support for 8 and 9.
+
 ## [1.1.0] - 2022-02-09
 
 ### Added
diff --git a/composer.json b/composer.json
@@ -23,14 +23,14 @@
         }
     ],
     "require": {
-        "php": "^7.4|^8.0",
-        "laravel-json-api/core": "^1.0|^2.0",
-        "laravel-json-api/eloquent": "^1.0.1|^2.0",
-        "vinkla/hashids": "^9.1|^10.0"
+        "php": "^8.1",
+        "laravel-json-api/core": "^3.0",
+        "laravel-json-api/eloquent": "^3.0",
+        "vinkla/hashids": "^11.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.23|^7.0",
-        "phpunit/phpunit": "^9.5.10"
+        "orchestra/testbench": "^8.0",
+        "phpunit/phpunit": "^10.0"
     },
     "autoload": {
         "psr-4": {
@@ -44,7 +44,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "1.x-dev"
+            "dev-develop": "2.x-dev"
         }
     },
     "minimum-stability": "stable",
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,34 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         beStrictAboutTestsThatDoNotTestAnything="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         convertDeprecationsToExceptions="true"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         verbose="true"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
->
-  <coverage>
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
-  </coverage>
-  <testsuites>
-    <testsuite name="Unit">
-      <directory suffix="Test.php">./tests/Unit/</directory>
-    </testsuite>
-    <testsuite name="Integration">
-      <directory suffix="Test.php">./tests/Integration/</directory>
-    </testsuite>
-  </testsuites>
-  <php>
-    <ini name="error_reporting" value="E_ALL"/>
-  </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false"
+         beStrictAboutTestsThatDoNotTestAnything="false" bootstrap="vendor/autoload.php" colors="true"
+         processIsolation="false" stopOnError="false" stopOnFailure="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache"
+         backupStaticProperties="false">
+    <coverage>
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+    </coverage>
+    <testsuites>
+        <testsuite name="Unit">
+            <directory suffix="Test.php">./tests/Unit/</directory>
+        </testsuite>
+        <testsuite name="Integration">
+            <directory suffix="Test.php">./tests/Integration/</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <ini name="error_reporting" value="E_ALL"/>
+    </php>
 </phpunit>
diff --git a/src/HashId.php b/src/HashId.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2022 Cloud Creativity Limited
+ * Copyright 2023 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/Test.php b/tests/Integration/Test.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2022 Cloud Creativity Limited
+ * Copyright 2023 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 2022 Cloud Creativity Limited
+ * Copyright 2023 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/TestModel.php b/tests/Integration/TestModel.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2022 Cloud Creativity Limited
+ * Copyright 2023 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.

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`	`/*`
`3`		`- * Copyright 2022 Cloud Creativity Limited`
	`3`	`+ * Copyright 2023 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.`