From b2a5ee18fda29e7a7f400fc391c0f49d23f7f2db Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Tue, 14 Sep 2021 23:05:57 +0200
Subject: [PATCH] Allow psr/log 3

Signed-off-by: Alexander M. Turek <me@derrabus.de>
---
 .github/workflows/continuous-integration.yml | 20 ++++++++++----------
 composer.json                                |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 19806498c..9a36cd964 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -51,10 +51,6 @@ jobs:
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
 
-      - name: Remove elasticsearch/elasticsearch on PHP 8
-        if: "startsWith(matrix.php-version, '8.')"
-        run: 'composer remove elasticsearch/elasticsearch --dev --no-update'
-
       - name: Add require for mongodb/mongodb to make tests runnable
         run: 'composer require ${{ env.COMPOSER_FLAGS }} mongodb/mongodb --dev --no-update'
 
@@ -62,9 +58,11 @@ jobs:
         if: "contains(matrix.dependencies, 'lowest')"
         run: "echo \"COMPOSER_FLAGS=$COMPOSER_FLAGS --prefer-lowest\" >> $GITHUB_ENV"
 
-      - name: "Ensure psr/log v2 is installed"
+      - name: "Ensure psr/log v3 is installed"
         if: "contains(matrix.dependencies, 'highest') && matrix.php-version >= '8.0'"
-        run: composer require -W psr/log:^2
+        run: |
+          composer remove --no-update --dev graylog2/gelf-php ruflin/elastica elasticsearch/elasticsearch
+          composer require --no-update psr/log:^3
 
       - name: "Install latest dependencies"
         run: |
@@ -73,9 +71,11 @@ jobs:
       - name: "Run tests"
         run: "composer exec phpunit -- --verbose"
 
-      - name: "Run tests with rollbar"
+      - name: "Run tests with rollbar, elastica, gelf"
         run: |
-          composer require psr/log:'^1.1|^2' --no-update
-          composer require rollbar/rollbar:^1.3 --no-update
+          composer require --no-update psr/log:'^1.1|^2|^3'
+          composer require --no-update --dev rollbar/rollbar:^1.3
+          composer require --no-update --dev 'ruflin/elastica:>=0.90,<8'
+          composer require --no-update --dev graylog2/gelf-php:^1.4.2
           composer update -W ${{ env.COMPOSER_FLAGS }}
-          composer exec phpunit -- --verbose --filter Rollbar
+          composer exec phpunit -- --verbose
diff --git a/composer.json b/composer.json
index 605f8d139..4cfaf35ba 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
     ],
     "require": {
         "php": ">=7.2",
-        "psr/log": "^1.0.1 || ^2.0"
+        "psr/log": "^1.0.1 || ^2.0 || ^3.0"
     },
     "require-dev": {
         "aws/aws-sdk-php": "^2.4.9 || ^3.0",