From 9d8fd9a9ab66a4173b500e7c211252172310c6f6 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 16 Feb 2024 11:23:22 +0000 Subject: [PATCH] Update to PHP 8.2 across the board --- .github/workflows/00-lint.yml | 2 +- .github/workflows/10-calendars.yml | 2 +- .github/workflows/20-site.yml | 2 +- composer.json | 2 +- composer.lock | 4 ++-- docker/gocal/dockerfile.yml | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/00-lint.yml b/.github/workflows/00-lint.yml index c51cf2ca..4022fee6 100644 --- a/.github/workflows/00-lint.yml +++ b/.github/workflows/00-lint.yml @@ -26,7 +26,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.1 + php-version: 8.2 coverage: none tools: composer:v2 diff --git a/.github/workflows/10-calendars.yml b/.github/workflows/10-calendars.yml index ad9bd26f..be4e9cf8 100644 --- a/.github/workflows/10-calendars.yml +++ b/.github/workflows/10-calendars.yml @@ -28,7 +28,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.1 + php-version: 8.2 coverage: none tools: composer:v2 diff --git a/.github/workflows/20-site.yml b/.github/workflows/20-site.yml index bc3e5df5..59710291 100644 --- a/.github/workflows/20-site.yml +++ b/.github/workflows/20-site.yml @@ -38,7 +38,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.1 + php-version: 8.2 coverage: none tools: composer:v2 diff --git a/composer.json b/composer.json index 462d16fd..b57eeed9 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ ], "license": "MIT", "require": { - "php": "^8.1", + "php": "^8.2", "spatie/icalendar-generator": "^2.5", "symfony/console": "^6.2", "friendsofphp/php-cs-fixer": "^3.13", diff --git a/composer.lock b/composer.lock index 5bd5d53e..843a14c9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b3da3cae17e714dcf1da410952954a9a", + "content-hash": "eedda6969fbc9df3a44839d86bb1403c", "packages": [ { "name": "carbonphp/carbon-doctrine-types", @@ -2501,7 +2501,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^8.1" + "php": "^8.2" }, "platform-dev": [], "plugin-api-version": "2.6.0" diff --git a/docker/gocal/dockerfile.yml b/docker/gocal/dockerfile.yml index 833485dc..736463ca 100644 --- a/docker/gocal/dockerfile.yml +++ b/docker/gocal/dockerfile.yml @@ -1,6 +1,6 @@ -FROM php:8.1.13-cli-alpine +FROM php:8.2.15-cli-alpine -COPY --from=composer:2.4.4 /usr/bin/composer /usr/local/bin/composer +COPY --from=composer:2.7.1 /usr/bin/composer /usr/local/bin/composer COPY . /gocal