From 879010485b677e040f988ee682ca14cbd44e46a5 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 10 Feb 2023 09:54:26 +0100 Subject: [PATCH] Drop PHP 8.0 support --- .github/workflows/CI.yml | 8 ++++---- composer.json | 2 +- composer.lock | 4 ++-- docker-compose.yml | 4 ++-- shell.nix | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5e5530e4..ab46fc2c 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -19,7 +19,7 @@ jobs: - 6379/tcp strategy: matrix: - php: ['8.0', '8.1', '8.2'] + php: ['8.1', '8.2'] dependencies: ['', '--prefer-lowest --prefer-stable'] steps: - name: Checkout @@ -57,7 +57,7 @@ jobs: uses: actions/checkout@v3 - uses: shivammathur/setup-php@2.24.0 with: - php-version: '8.0' + php-version: '8.1' extensions: mbstring, redis, apcu ini-values: apc.enable_cli=1, zend.assertions=1 coverage: pcov @@ -78,7 +78,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - php: ['8.0', '8.1', '8.2'] + php: ['8.1', '8.2'] steps: - name: Checkout uses: actions/checkout@v3 @@ -107,7 +107,7 @@ jobs: uses: actions/checkout@v3 - uses: shivammathur/setup-php@2.24.0 with: - php-version: '8.0' + php-version: '8.1' extensions: mbstring, redis, apcu coverage: none - name: Install dependencies diff --git a/composer.json b/composer.json index 45586780..66ecfefb 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Prometheus instrumentation library", "license": "Apache-2.0", "require": { - "php": "~8.0.0|~8.1.0|~8.2.0", + "php": "~8.1.0|~8.2.0", "ext-json": "*", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", diff --git a/composer.lock b/composer.lock index ea3d88d8..96d5dbc0 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": "8adaa3245df4fd1f3394a006fcdd4493", + "content-hash": "ab7c41a2b23a615f6342cbd9a5c60e1a", "packages": [ { "name": "psr/http-client", @@ -6459,7 +6459,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~8.0.0|~8.1.0|~8.2.0", + "php": "~8.1.0|~8.2.0", "ext-json": "*" }, "platform-dev": [], diff --git a/docker-compose.yml b/docker-compose.yml index cd41ef96..c4e8d718 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: build: context: php-fpm/ args: - PHP_VERSION: ${PHP_VERSION:-8.0} + PHP_VERSION: ${PHP_VERSION:-8.1} volumes: - .:/var/www/html environment: @@ -26,7 +26,7 @@ services: build: context: php-fpm/ args: - PHP_VERSION: ${PHP_VERSION:-8.0} + PHP_VERSION: ${PHP_VERSION:-8.1} volumes: - .:/var/www/html environment: diff --git a/shell.nix b/shell.nix index 157a0f07..e23250ca 100644 --- a/shell.nix +++ b/shell.nix @@ -4,7 +4,7 @@ }) {} }: let - php = pkgs.php80.withExtensions ({ enabled, all }: with all; enabled ++ [ redis apcu ]); + php = pkgs.php81.withExtensions ({ enabled, all }: with all; enabled ++ [ redis apcu ]); in pkgs.mkShell { nativeBuildInputs = [