From 1926fae0ae121f7d19262d86c96e25e9aaa3b394 Mon Sep 17 00:00:00 2001
From: Jeremy Fehr <117788025+jrmfg@users.noreply.github.com>
Date: Fri, 20 Sep 2024 01:17:20 +0000
Subject: [PATCH] fix: drop support for php 8.0 and earlier, add testing for
 php 8.3

also update phpunit
---
 .github/workflows/buildpack-integration-test.yml | 16 ++++++++--------
 .github/workflows/conformance.yml                |  2 +-
 .github/workflows/unit.yml                       |  2 +-
 composer.json                                    |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/buildpack-integration-test.yml b/.github/workflows/buildpack-integration-test.yml
index b7073434..5a748c62 100644
--- a/.github/workflows/buildpack-integration-test.yml
+++ b/.github/workflows/buildpack-integration-test.yml
@@ -11,7 +11,7 @@ on:
 permissions: read-all
 
 jobs:
-  php74-buildpack-test:
+  php81-buildpack-test:
     if: github.event.pull_request.head.repo.full_name == github.repository
     uses: GoogleCloudPlatform/functions-framework-conformance/.github/workflows/buildpack-integration-test.yml@main
     with:
@@ -21,9 +21,9 @@ jobs:
       cloudevent-builder-target: 'declarativeCloudEventFunc'
       prerun: 'tests/conformance/prerun.sh ${{ github.sha }}'
       output-file: 'vendor/bin/function_output.json'
-      builder-runtime: 'php74'
-      builder-runtime-version: '">=7.4,<7.5"'
-  php81-buildpack-test:
+      builder-runtime: 'php81'
+      builder-runtime-version: '">=8.1,<8.2"'
+  php82-buildpack-test:
     if: github.event.pull_request.head.repo.full_name == github.repository
     uses: GoogleCloudPlatform/functions-framework-conformance/.github/workflows/buildpack-integration-test.yml@main
     with:
@@ -33,8 +33,8 @@ jobs:
       cloudevent-builder-target: 'declarativeCloudEventFunc'
       prerun: 'tests/conformance/prerun.sh ${{ github.sha }}'
       output-file: 'vendor/bin/function_output.json'
-      builder-runtime: 'php81'
-      builder-runtime-version: '">=8.1,<8.2"'
+      builder-runtime: 'php82'
+      builder-runtime-version: '">=8.2,<8.3"'
   php82-buildpack-test:
     if: github.event.pull_request.head.repo.full_name == github.repository
     uses: GoogleCloudPlatform/functions-framework-conformance/.github/workflows/buildpack-integration-test.yml@main
@@ -45,5 +45,5 @@ jobs:
       cloudevent-builder-target: 'declarativeCloudEventFunc'
       prerun: 'tests/conformance/prerun.sh ${{ github.sha }}'
       output-file: 'vendor/bin/function_output.json'
-      builder-runtime: 'php82'
-      builder-runtime-version: '">=8.2,<8.3"'
+      builder-runtime: 'php83'
+      builder-runtime-version: '">=8.3,<8.4"'
\ No newline at end of file
diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml
index 9420d3cb..51c0ef72 100644
--- a/.github/workflows/conformance.yml
+++ b/.github/workflows/conformance.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: [ '7.4','8.0','8.1','8.2' ]
+        php-version: [ '8.1','8.2','8.3' ]
     name: PHP ${{ matrix.php-version }} Conformance Test
     steps:
     - name: Harden Runner
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
index 1261972d..967156b2 100644
--- a/.github/workflows/unit.yml
+++ b/.github/workflows/unit.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: [ '7.4','8.0','8.1','8.2' ]
+        php-versions: [ '8.1','8.2','8.3' ]
     name: PHP ${{ matrix.php-versions }} Unit Test
     steps:
     - name: Harden Runner
diff --git a/composer.json b/composer.json
index ce329a37..e11f2f21 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
   "description": "Google Cloud Functions Framework for PHP",
   "license": "Apache-2.0",
   "require": {
-    "php": ">=7.4",
+    "php": ">=8.1",
     "guzzlehttp/psr7": "^1.7|^2.0",
     "psr/http-message": "^2.0",
     "cloudevents/sdk-php": "^1.0"
@@ -17,7 +17,7 @@
     }
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.5|^8.0",
+    "phpunit/phpunit": "^10.5|^11.3",
     "guzzlehttp/guzzle": "^7.2"
   },
   "autoload-dev": {