From a2bbd8e49e003005e1d2302d21bf4cd480c484cb Mon Sep 17 00:00:00 2001 From: jayrughani9 <108751272+jrughani9@users.noreply.github.com> Date: Thu, 12 Jun 2025 13:39:50 -0500 Subject: [PATCH 1/4] use explicit nullable params --- src/MetricsDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MetricsDriver.php b/src/MetricsDriver.php index a853238..c406362 100644 --- a/src/MetricsDriver.php +++ b/src/MetricsDriver.php @@ -48,7 +48,7 @@ public function __construct( Driver $wrapped, CloudWatchClient $cloudwatch, $metricsNamespace=null, - LoggerInterface $logger=null + ?LoggerInterface $logger=null ) { $this->wrapped = $wrapped; $this->cloudwatch = $cloudwatch; From f86d620e17d29c2390c12af6ee1f43d15b1c4aff Mon Sep 17 00:00:00 2001 From: jayrughani9 <108751272+jrughani9@users.noreply.github.com> Date: Thu, 12 Jun 2025 13:40:04 -0500 Subject: [PATCH 2/4] Update dependencies in composer.json --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 6331c82..4204a6e 100644 --- a/composer.json +++ b/composer.json @@ -7,14 +7,14 @@ { "name": "Christopher Davis", "email": "chris@pmg.com" } ], "require": { - "php": "^8.2", - "pmg/queue": "^6.0", + "php": "^8.3", + "pmg/queue": "^6.2", "psr/log": "^1.0 || ^2.0 || ^3.0", "aws/aws-sdk-php": "^3.0" }, "require-dev": { - "phpunit/phpunit": "^9.5", - "symfony/phpunit-bridge": "^6.4" + "phpunit/phpunit": "^9.6.23", + "symfony/phpunit-bridge": "^6.4.16" }, "autoload": { "psr-4": { From a795c2bc811ccc55ba8c600471741e89b91f1820 Mon Sep 17 00:00:00 2001 From: jayrughani9 <108751272+jrughani9@users.noreply.github.com> Date: Thu, 12 Jun 2025 13:40:32 -0500 Subject: [PATCH 3/4] Update CI to use Ubuntu 24.04, PHP 8.4, and latest actions --- .github/actions/setup-php/action.yml | 4 ++-- .github/workflows/ci.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/setup-php/action.yml b/.github/actions/setup-php/action.yml index 3b98cee..253fd0b 100644 --- a/.github/actions/setup-php/action.yml +++ b/.github/actions/setup-php/action.yml @@ -7,7 +7,7 @@ inputs: required: false type: string description: the php version to use, defaults to 8.3 - default: '8.3' + default: '8.4' runs: using: composite @@ -26,7 +26,7 @@ runs: run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: cache php dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.composercache.outputs.dir }} key: ${{ runner.os }}-composer-${{ inputs.php-version }}-${{ hashFiles('**/composer.json') }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33665a9..5ad91a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,17 +8,17 @@ on: jobs: test: name: test - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-24.04" strategy: matrix: include: - - php-version: 8.2 - php-version: 8.3 + - php-version: 8.4 steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: start localstack run: ./bin/dev/up - name: PHP From 01370c29d1c143f3d7d22c0cedc86bf5454b7aaf Mon Sep 17 00:00:00 2001 From: jayrughani9 <108751272+jrughani9@users.noreply.github.com> Date: Thu, 12 Jun 2025 13:42:50 -0500 Subject: [PATCH 4/4] Switch to `docker compose` command for compatibility --- bin/dev/down | 2 +- bin/dev/up | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/dev/down b/bin/dev/down index b155a66..feebb12 100755 --- a/bin/dev/down +++ b/bin/dev/down @@ -2,4 +2,4 @@ pushd "$(git rev-parse --show-toplevel)" -exec docker-compose down +exec docker compose down diff --git a/bin/dev/up b/bin/dev/up index 4a7b0d5..c8e09d4 100755 --- a/bin/dev/up +++ b/bin/dev/up @@ -4,4 +4,4 @@ pushd "$(git rev-parse --show-toplevel)" rm -f var/localstack/ready -exec docker-compose up -d +exec docker compose up -d