Merge pull request #81 from scoutapp/upgrade-scout-apm-php-7

Upgraded scout-apm-php to new ^7 series
scoutapp · Jan 19, 2022 · 6495485 · 6495485
2 parents a22c79f + 7cffd2a
commit 6495485
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 5 deletions.
diff --git a/.github/workflows/validate-composer.yml b/.github/workflows/validate-composer.yml
@@ -24,11 +24,22 @@ jobs:
           - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
         exclude:
-          - { php-version: "7.1", laravel-version: "6.*" } # Laravel 6 requires 7.2+
-          - { php-version: "7.1", laravel-version: "7.*" } # Laravel 7 requires 7.2+
-          - { php-version: "7.1", laravel-version: "8.*" } # Laravel 8 requires 7.3+
-          - { php-version: "7.2", laravel-version: "8.*" } # Laravel 8 requires 7.3+
+          # See - https://laravel.com/docs/8.x/releases#support-policy
+          # See - https://github.com/laravel/framework/issues/40339
+          # Laravel 5.5 supports PHP 7.1 - 7.4
+          - {laravel-version: "5.5.*", php-version: "8.0"} # Laravel 5.5.* does not support PHP 8.0+
+          - {laravel-version: "5.5.*", php-version: "8.1"} # Laravel 5.5.* does not support PHP 8.0+
+          # Laravel 6 supports PHP 7.2 - 8.0
+          - {laravel-version: "6.*", php-version: "7.1"} # Laravel 6 requires 7.2+
+          - {laravel-version: "6.*", php-version: "8.1"} # Laravel 6 does not support PHP 8.1+
+          # Laravel 7 supports PHP 7.2 - 8.0
+          - {laravel-version: "7.*", php-version: "7.1"} # Laravel 7 requires 7.2+
+          - {laravel-version: "7.*", php-version: "8.1"} # Laravel 7 does not support PHP 8.1+
+          # Laravel 8 supports PHP 7.3 - 8.1
+          - {laravel-version: "8.*", php-version: "7.1"} # Laravel 8 requires 7.3+
+          - {laravel-version: "8.*", php-version: "7.2"} # Laravel 8 requires 7.3+
     steps:
       - uses: actions/checkout@v2
       - name: "Install PHP"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.1.0 - 2022-01-19
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- [#81](https://github.com/scoutapp/scout-apm-laravel/pull/81) Updated to require `scout-apm-php` ^7.0
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 2.0.0 - 2021-02-23
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
         "illuminate/routing": "^5.5.0|^6.0|^7.0|^8.0",
         "illuminate/support": "^5.5.0|^6.0|^7.0|^8.0",
         "illuminate/view": "^5.5.0|^6.0|^7.0|^8.0",
-        "scoutapp/scout-apm-php": "^6.0"
+        "scoutapp/scout-apm-php": "^7.0"
     },
     "config": {
         "preferred-install": "dist",