Merge branch '8.11.x' into 8.10.x-merge-up-into-8.11.x_uUYcMMai

scoutapp · Dec 4, 2023 · 81584b8 · 81584b8
2 parents 5f0b665 + ea09090
commit 81584b8
Show file tree

Hide file tree

Showing 4 changed files with 538 additions and 499 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -51,6 +51,7 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
     services:
       mongo:
         image: mongo
@@ -111,6 +112,7 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
     env:
       SCOUT_APM_KEY: ${{ secrets.SCOUT_APM_KEY }}
     steps:
@@ -189,6 +191,7 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
     env:
       SCOUT_APM_KEY: ${{ secrets.SCOUT_APM_KEY }}
     steps:
@@ -309,6 +312,7 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
         exclude:
           - { symfony-version: "6.*", php-version: "7.2" } # Symfony 6 requires 8.0+
           - { symfony-version: "6.*", php-version: "7.3" } # Symfony 6 requires 8.0+
@@ -361,27 +365,34 @@ jobs:
           - "7.4"
           - "8.0"
           - "8.1"
-          - "8.2" # @todo confirm which versions of Laravel will support PHP 8.2
+          - "8.2"
+          - "8.3" # @todo confirm which versions of Laravel will support PHP 8.3
         exclude:
           # See - https://laravel.com/docs/9.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-version: "5.5.*", php-version: "8.2"} # Laravel 5.5.* does not support PHP 8.0+
+          - {laravel-version: "5.5.*", php-version: "8.3"} # Laravel 5.5.* does not support PHP 8.0+
           # Laravel 6 supports PHP 7.2 - 8.0
           - {laravel-version: "6.*", php-version: "8.1"} # Laravel 6 does not support PHP 8.1+
           - {laravel-version: "6.*", php-version: "8.2"} # Laravel 6 does not support PHP 8.1+
+          - {laravel-version: "6.*", php-version: "8.3"} # Laravel 6 does not support PHP 8.1+
           # Laravel 7 supports PHP 7.2 - 8.0
           - {laravel-version: "7.*", php-version: "8.1"} # Laravel 7 does not support PHP 8.1+
           - {laravel-version: "7.*", php-version: "8.2"} # Laravel 7 does not support PHP 8.1+
+          - {laravel-version: "7.*", php-version: "8.3"} # Laravel 7 does not support PHP 8.1+
           # Laravel 8 supports PHP 7.3 - 8.1
           - {laravel-version: "8.*", php-version: "7.2"} # Laravel 8 requires 7.3+
-          # Laravel 9 supports PHP 8.0 - 8.1
+          - {laravel-version: "8.*", php-version: "8.2"} # Laravel 8 does not support PHP 8.2+
+          - {laravel-version: "8.*", php-version: "8.3"} # Laravel 8 does not support PHP 8.2+
+          # Laravel 9 supports PHP 8.0 - 8.2
           - {laravel-version: "9.*", php-version: "7.2"} # Laravel 9 requires 8.0+
           - {laravel-version: "9.*", php-version: "7.3"} # Laravel 9 requires 8.0+
           - {laravel-version: "9.*", php-version: "7.4"} # Laravel 9 requires 8.0+
-          # Laravel 10 supports PHP 8.1 - 8.2
+          - {laravel-version: "9.*", php-version: "8.3"} # Laravel 9 does not support PHP 8.3+
+          # Laravel 10 supports PHP 8.1 - 8.2 @todo tbc
           - {laravel-version: "10.*", php-version: "7.2"} # Laravel 10 requires 8.1+
           - {laravel-version: "10.*", php-version: "7.3"} # Laravel 10 requires 8.1+
           - {laravel-version: "10.*", php-version: "7.4"} # Laravel 10 requires 8.1+
@@ -408,7 +419,7 @@ jobs:
         if: ${{ (matrix.php-version == '8.0' || matrix.php-version == '8.1') && (matrix.laravel-version == '8.*' || matrix.laravel-version == '9.*') }}
         run: "composer require --dev spatie/laravel-ignition:^1.6 --no-update --no-interaction"
       - name: "Install spatie/laravel-ignition ^2.0 (if available)"
-        if: ${{ (matrix.php-version == '8.1' || matrix.php-version == '8.2') && (matrix.laravel-version == '10.*') }}
+        if: ${{ (matrix.php-version == '8.1' || matrix.php-version == '8.2' || matrix.php-version == '8.3') && (matrix.laravel-version == '10.*') }}
         run: "composer require --dev spatie/laravel-ignition:^2.0 --no-update --no-interaction"
       - name: "Unrestrict nesbot/carbon for older PHP versions"
         if: ${{ (matrix.php-version == '7.2' || matrix.php-version == '7.3' || matrix.php-version == '7.4' || matrix.php-version == '8.0' || matrix.php-version == '8.1') }}
@@ -440,27 +451,34 @@ jobs:
           - "7.4"
           - "8.0"
           - "8.1"
-          - "8.2" # @todo confirm which versions of Laravel will support PHP 8.2
+          - "8.2"
+          - "8.3" # @todo confirm which versions of Laravel will support PHP 8.3
         exclude:
           # See - https://laravel.com/docs/9.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-version: "5.5.*", php-version: "8.2"} # Laravel 5.5.* does not support PHP 8.0+
+          - {laravel-version: "5.5.*", php-version: "8.3"} # Laravel 5.5.* does not support PHP 8.0+
           # Laravel 6 supports PHP 7.2 - 8.0
           - {laravel-version: "6.*", php-version: "8.1"} # Laravel 6 does not support PHP 8.1+
           - {laravel-version: "6.*", php-version: "8.2"} # Laravel 6 does not support PHP 8.1+
+          - {laravel-version: "6.*", php-version: "8.3"} # Laravel 6 does not support PHP 8.1+
           # Laravel 7 supports PHP 7.2 - 8.0
           - {laravel-version: "7.*", php-version: "8.1"} # Laravel 7 does not support PHP 8.1+
           - {laravel-version: "7.*", php-version: "8.2"} # Laravel 7 does not support PHP 8.1+
+          - {laravel-version: "7.*", php-version: "8.3"} # Laravel 7 does not support PHP 8.1+
           # Laravel 8 supports PHP 7.3 - 8.1
           - {laravel-version: "8.*", php-version: "7.2"} # Laravel 8 requires 7.3+
-          # Laravel 9 supports PHP 8.0 - 8.1
+          - {laravel-version: "8.*", php-version: "8.2"} # Laravel 8 does not support PHP 8.2+
+          - {laravel-version: "8.*", php-version: "8.3"} # Laravel 8 does not support PHP 8.2+
+          # Laravel 9 supports PHP 8.0 - 8.2
           - {laravel-version: "9.*", php-version: "7.2"} # Laravel 9 requires 8.0+
           - {laravel-version: "9.*", php-version: "7.3"} # Laravel 9 requires 8.0+
           - {laravel-version: "9.*", php-version: "7.4"} # Laravel 9 requires 8.0+
-          # Laravel 10 supports PHP 8.1 - 8.2
+          - {laravel-version: "9.*", php-version: "8.3"} # Laravel 9 does not support PHP 8.3+
+          # Laravel 10 supports PHP 8.1 - 8.2 @todo tbc
           - {laravel-version: "10.*", php-version: "7.2"} # Laravel 10 requires 8.1+
           - {laravel-version: "10.*", php-version: "7.3"} # Laravel 10 requires 8.1+
           - {laravel-version: "10.*", php-version: "7.4"} # Laravel 10 requires 8.1+
@@ -560,27 +578,34 @@ jobs:
           - "7.4"
           - "8.0"
           - "8.1"
-          - "8.2" # @todo confirm which versions of Laravel will support PHP 8.2
+          - "8.2"
+          - "8.3" # @todo confirm which versions of Laravel will support PHP 8.2
         exclude:
           # See - https://laravel.com/docs/9.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-version: "5.5.*", php-version: "8.2"} # Laravel 5.5.* does not support PHP 8.0+
+          - {laravel-version: "5.5.*", php-version: "8.3"} # Laravel 5.5.* does not support PHP 8.0+
           # Laravel 6 supports PHP 7.2 - 8.0
           - {laravel-version: "6.*", php-version: "8.1"} # Laravel 6 does not support PHP 8.1+
           - {laravel-version: "6.*", php-version: "8.2"} # Laravel 6 does not support PHP 8.1+
+          - {laravel-version: "6.*", php-version: "8.3"} # Laravel 6 does not support PHP 8.1+
           # Laravel 7 supports PHP 7.2 - 8.0
           - {laravel-version: "7.*", php-version: "8.1"} # Laravel 7 does not support PHP 8.1+
           - {laravel-version: "7.*", php-version: "8.2"} # Laravel 7 does not support PHP 8.1+
+          - {laravel-version: "7.*", php-version: "8.3"} # Laravel 7 does not support PHP 8.1+
           # Laravel 8 supports PHP 7.3 - 8.1
           - {laravel-version: "8.*", php-version: "7.2"} # Laravel 8 requires 7.3+
-          # Laravel 9 supports PHP 8.0 - 8.1
+          - {laravel-version: "8.*", php-version: "8.2"} # Laravel 8 does not support PHP 8.2+
+          - {laravel-version: "8.*", php-version: "8.3"} # Laravel 8 does not support PHP 8.2+
+          # Laravel 9 supports PHP 8.0 - 8.2
           - {laravel-version: "9.*", php-version: "7.2"} # Laravel 9 requires 8.0+
           - {laravel-version: "9.*", php-version: "7.3"} # Laravel 9 requires 8.0+
           - {laravel-version: "9.*", php-version: "7.4"} # Laravel 9 requires 8.0+
-          # Laravel 10 supports PHP 8.1 - 8.2
+          - {laravel-version: "9.*", php-version: "8.3"} # Laravel 9 does not support PHP 8.3+
+          # Laravel 10 supports PHP 8.1 - 8.2 @todo tbc
           - {laravel-version: "10.*", php-version: "7.2"} # Laravel 10 requires 8.1+
           - {laravel-version: "10.*", php-version: "7.3"} # Laravel 10 requires 8.1+
           - {laravel-version: "10.*", php-version: "7.4"} # Laravel 10 requires 8.1+
@@ -651,28 +676,35 @@ jobs:
           - "7.4"
           - "8.0"
           - "8.1"
-          - "8.2" # @todo confirm which versions of Laravel will support PHP 8.2
+          - "8.2"
+          - "8.3" # @todo confirm which versions of Laravel will support PHP 8.2
         exclude:
           # Lumen 5.5 supports PHP 7.1 - 7.3
           - {lumen-version: "5.5.*", php-version: "7.4"} # Lumen 5.5 does not support PHP 7.4+
           - {lumen-version: "5.5.*", php-version: "8.0"} # Lumen 5.5 does not support PHP 7.4+
           - {lumen-version: "5.5.*", php-version: "8.1"} # Lumen 5.5 does not support PHP 7.4+
           - {lumen-version: "5.5.*", php-version: "8.2"} # Lumen 5.5 does not support PHP 7.4+
+          - {lumen-version: "5.5.*", php-version: "8.3"} # Lumen 5.5 does not support PHP 7.4+
           # Lumen 6 supports PHP 7.2 - 7.4
           - {lumen-version: "6.*", php-version: "8.0"} # Lumen 6 does not support PHP 8.0+
           - {lumen-version: "6.*", php-version: "8.1"} # Lumen 6 does not support PHP 8.0+
           - {lumen-version: "6.*", php-version: "8.2"} # Lumen 6 does not support PHP 8.0+
+          - {lumen-version: "6.*", php-version: "8.3"} # Lumen 6 does not support PHP 8.0+
           # Lumen 7 supports PHP 7.2 - 7.4
           - {lumen-version: "7.*", php-version: "8.0"} # Lumen 7 does not support PHP 8.0+
           - {lumen-version: "7.*", php-version: "8.1"} # Lumen 7 does not support PHP 8.0+
           - {lumen-version: "7.*", php-version: "8.2"} # Lumen 7 does not support PHP 8.0+
+          - {lumen-version: "7.*", php-version: "8.3"} # Lumen 7 does not support PHP 8.0+
           # Lumen 8 supports PHP 7.3 - 8.1
           - {lumen-version: "8.*", php-version: "7.2"} # Lumen 8 requires 7.3+
-          # Lumen 9 supports PHP 8.0 - 8.1
+          - {lumen-version: "8.*", php-version: "8.2"} # Lumen 8 does not support PHP 8.2+
+          - {lumen-version: "8.*", php-version: "8.3"} # Lumen 8 does not support PHP 8.2+
+          # Lumen 9 supports PHP 8.0 - 8.2
           - {lumen-version: "9.*", php-version: "7.2"} # Lumen 9 requires 8.0+
           - {lumen-version: "9.*", php-version: "7.3"} # Lumen 9 requires 8.0+
           - {lumen-version: "9.*", php-version: "7.4"} # Lumen 9 requires 8.0+
-          # Lumen 10 supports PHP 8.1 - 8.2
+          - {lumen-version: "9.*", php-version: "8.3"} # Lumen 9 does not support PHP 8.3+
+          # Lumen 10 supports PHP 8.1 - 8.2 @todo tbc
           - {lumen-version: "10.*", php-version: "7.2"} # Lumen 10 requires 8.1+
           - {lumen-version: "10.*", php-version: "7.3"} # Lumen 10 requires 8.1+
           - {lumen-version: "10.*", php-version: "7.4"} # Lumen 10 requires 8.1+
@@ -725,28 +757,35 @@ jobs:
           - "7.4"
           - "8.0"
           - "8.1"
-          - "8.2" # @todo confirm which versions of Laravel will support PHP 8.2
+          - "8.2"
+          - "8.3" # @todo confirm which versions of Laravel will support PHP 8.2
         exclude:
           # Lumen 5.5 supports PHP 7.1 - 7.3
           - {lumen-version: "5.5.*", php-version: "7.4"} # Lumen 5.5 does not support PHP 7.4+
           - {lumen-version: "5.5.*", php-version: "8.0"} # Lumen 5.5 does not support PHP 7.4+
           - {lumen-version: "5.5.*", php-version: "8.1"} # Lumen 5.5 does not support PHP 7.4+
           - {lumen-version: "5.5.*", php-version: "8.2"} # Lumen 5.5 does not support PHP 7.4+
+          - {lumen-version: "5.5.*", php-version: "8.3"} # Lumen 5.5 does not support PHP 7.4+
           # Lumen 6 supports PHP 7.2 - 7.4
           - {lumen-version: "6.*", php-version: "8.0"} # Lumen 6 does not support PHP 8.0+
           - {lumen-version: "6.*", php-version: "8.1"} # Lumen 6 does not support PHP 8.0+
           - {lumen-version: "6.*", php-version: "8.2"} # Lumen 6 does not support PHP 8.0+
+          - {lumen-version: "6.*", php-version: "8.3"} # Lumen 6 does not support PHP 8.0+
           # Lumen 7 supports PHP 7.2 - 7.4
           - {lumen-version: "7.*", php-version: "8.0"} # Lumen 7 does not support PHP 8.0+
           - {lumen-version: "7.*", php-version: "8.1"} # Lumen 7 does not support PHP 8.0+
           - {lumen-version: "7.*", php-version: "8.2"} # Lumen 7 does not support PHP 8.0+
+          - {lumen-version: "7.*", php-version: "8.3"} # Lumen 7 does not support PHP 8.0+
           # Lumen 8 supports PHP 7.3 - 8.1
           - {lumen-version: "8.*", php-version: "7.2"} # Lumen 8 requires 7.3+
-          # Lumen 9 supports PHP 8.0 - 8.1
+          - {lumen-version: "8.*", php-version: "8.2"} # Lumen 8 does not support PHP 8.2+
+          - {lumen-version: "8.*", php-version: "8.3"} # Lumen 8 does not support PHP 8.2+
+          # Lumen 9 supports PHP 8.0 - 8.2
           - {lumen-version: "9.*", php-version: "7.2"} # Lumen 9 requires 8.0+
           - {lumen-version: "9.*", php-version: "7.3"} # Lumen 9 requires 8.0+
           - {lumen-version: "9.*", php-version: "7.4"} # Lumen 9 requires 8.0+
-          # Lumen 10 supports PHP 8.1 - 8.2
+          - {lumen-version: "9.*", php-version: "8.3"} # Lumen 9 does not support PHP 8.3+
+          # Lumen 10 supports PHP 8.1 - 8.2 @todo tbc
           - {lumen-version: "10.*", php-version: "7.2"} # Lumen 10 requires 8.1+
           - {lumen-version: "10.*", php-version: "7.3"} # Lumen 10 requires 8.1+
           - {lumen-version: "10.*", php-version: "7.4"} # Lumen 10 requires 8.1+

diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "license": "MIT",
     "keywords": ["performance", "apm", "monitoring", "development"],
     "require": {
-        "php": "7.2.*|7.3.*|7.4.*|8.0.*|8.1.*|8.2.*",
+        "php": "7.2.*|7.3.*|7.4.*|8.0.*|8.1.*|8.2.*|8.3.*",
         "ext-json": "*",
         "ext-openssl": "*",
         "ext-sockets": "*",