From cf87d4e79c6eb926cc69fe65b1f65de7345f799b Mon Sep 17 00:00:00 2001
From: Marick van Tuil <marick@mac.home>
Date: Sat, 30 Nov 2024 13:12:37 +0100
Subject: [PATCH 1/2] Test package with PHP 8.4

---
 .github/workflows/run-tests.yml | 4 +++-
 app.Dockerfile                  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index fd6f374..009ff6a 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -64,11 +64,13 @@ jobs:
       matrix:
         db: ['mysql', 'pgsql']
         payload:
+          - { queue: 'github-actions-laravel10-php84', laravel: '10.*', php: '8.4', 'testbench': '8.*'}
           - { queue: 'github-actions-laravel10-php83', laravel: '10.*', php: '8.3', 'testbench': '8.*'}
           - { queue: 'github-actions-laravel10-php82', laravel: '10.*', php: '8.2', 'testbench': '8.*'}
           - { queue: 'github-actions-laravel10-php81', laravel: '10.*', php: '8.1', 'testbench': '8.*'}
           - { queue: 'github-actions-laravel11-php82', laravel: '11.*', php: '8.2', 'testbench': '9.*' }
-          - { queue: 'github-actions-laravel12-php83', laravel: '11.*', php: '8.3', 'testbench': '9.*' }
+          - { queue: 'github-actions-laravel11-php83', laravel: '11.*', php: '8.3', 'testbench': '9.*' }
+          - { queue: 'github-actions-laravel11-php84', laravel: '11.*', php: '8.4', 'testbench': '9.*' }
 
     name: PHP ${{ matrix.payload.php }} - Laravel ${{ matrix.payload.laravel }} - DB ${{ matrix.db }}
 
diff --git a/app.Dockerfile b/app.Dockerfile
index abe5ade..f43bf6f 100644
--- a/app.Dockerfile
+++ b/app.Dockerfile
@@ -1,4 +1,4 @@
-FROM serversideup/php:8.3-fpm
+FROM serversideup/php:8.4-fpm
 
 USER root
 RUN install-php-extensions bcmath

From 37e4634203ed15f5b2ad745a17c7fc04211a06d6 Mon Sep 17 00:00:00 2001
From: Marick van Tuil <marick@mac.home>
Date: Sun, 1 Dec 2024 12:18:05 +0100
Subject: [PATCH 2/2] Fix

---
 .env.example                    | 2 +-
 .github/workflows/run-tests.yml | 1 +
 docker-compose.yml              | 2 +-
 tests/CloudTasksApiTest.php     | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.env.example b/.env.example
index 6b69d37..769e33b 100644
--- a/.env.example
+++ b/.env.example
@@ -6,4 +6,4 @@ CI_CLOUD_TASKS_PROJECT_ID=
 CI_CLOUD_TASKS_QUEUE=
 CI_CLOUD_TASKS_LOCATION=
 CI_CLOUD_TASKS_SERVICE_ACCOUNT_EMAIL=
-CI_SERVICE_ACCOUNT_JSON_KEY=
+CI_SERVICE_ACCOUNT_JSON_KEY_PATH=
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 009ff6a..e3c8dc0 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -116,4 +116,5 @@ jobs:
           CI_CLOUD_TASKS_CUSTOM_QUEUE: ${{ matrix.payload.queue }}
         run: |
           echo $CI_SERVICE_ACCOUNT_JSON_KEY > tests/Support/gcloud-key-valid.json
+          touch .env
           vendor/bin/phpunit
diff --git a/docker-compose.yml b/docker-compose.yml
index df62891..c464e73 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       - .env
     volumes:
       - .:/var/www/html
-      - ${CI_SERVICE_ACCOUNT_JSON_KEY}:/var/www/html/tests/Support/gcloud-key-valid.json
+      - ${CI_SERVICE_ACCOUNT_JSON_KEY_PATH-./tests/Support/gcloud-key-valid.json}:/var/www/html/tests/Support/gcloud-key-valid.json
   mysql:
     image: mysql:8
     ports:
diff --git a/tests/CloudTasksApiTest.php b/tests/CloudTasksApiTest.php
index ebc08a1..6575285 100644
--- a/tests/CloudTasksApiTest.php
+++ b/tests/CloudTasksApiTest.php
@@ -24,7 +24,6 @@ protected function setUp(): void
             'CI_CLOUD_TASKS_QUEUE',
             'CI_CLOUD_TASKS_LOCATION',
             'CI_CLOUD_TASKS_SERVICE_ACCOUNT_EMAIL',
-            'CI_SERVICE_ACCOUNT_JSON_KEY',
         ];
 
         foreach ($requiredEnvs as $env) {