Drop PHP 8.0 support

Enalean · Feb 10, 2023 · a67483a · a67483a
1 parent 0e110ca
commit a67483a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git 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
@@ -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",
@@ -42,7 +42,8 @@
         "sort-packages": true,
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "infection/extension-installer": true
+            "infection/extension-installer": true,
+            "php-http/discovery": true
         }
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git 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
@@ -1,10 +1,10 @@
 { pkgs ? import (fetchTarball {
-  url = "https://github.com/NixOS/nixpkgs/archive/98747f27ecfee70c8c97b195cbb94df80a074dda.tar.gz";
-  sha256 = "04ss525ns5qqlggrdhvc6y4hqmshylda9yd0y99ddliyn15wmf27";
+  url = "https://github.com/NixOS/nixpkgs/archive/747927516efcb5e31ba03b7ff32f61f6d47e7d87.tar.gz";
+  sha256 = "1s4xabv59r99z8vd74w3r84kkxwqggqir3b0nh3ma04mni0m40gf";
 }) {} }:
 
 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 = [