mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-06 21:26:43 +02:00
Code Issues Releases Wiki Activity

Allow psr/log 3 (#1589)

Browse Source 
Signed-off-by: Alexander M. Turek <me@derrabus.de>
This commit is contained in:
Alexander M. Turek
2021-09-15 13:13:55 +02:00
committed by GitHub
parent 3962ebfe20
commit 0f79359548
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
.github/workflows/continuous-integration.yml vendored
View File

@@ -51,10 +51,6 @@ jobs:
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-composer- 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 - name: Add require for mongodb/mongodb to make tests runnable
run: 'composer require ${{ env.COMPOSER_FLAGS }} mongodb/mongodb --dev --no-update' run: 'composer require ${{ env.COMPOSER_FLAGS }} mongodb/mongodb --dev --no-update'
@@ -62,10 +58,6 @@ jobs:
if: "contains(matrix.dependencies, 'lowest')" if: "contains(matrix.dependencies, 'lowest')"
run: "echo \"COMPOSER_FLAGS=$COMPOSER_FLAGS --prefer-lowest\" >> $GITHUB_ENV" run: "echo \"COMPOSER_FLAGS=$COMPOSER_FLAGS --prefer-lowest\" >> $GITHUB_ENV"
- name: "Ensure psr/log v2 is installed"
if: "contains(matrix.dependencies, 'highest') && matrix.php-version >= '8.0'"
run: composer require -W psr/log:^2
- name: "Install latest dependencies" - name: "Install latest dependencies"
run: | run: |
composer update ${{ env.COMPOSER_FLAGS }} composer update ${{ env.COMPOSER_FLAGS }}
@@ -73,9 +65,10 @@ jobs:
- name: "Run tests" - name: "Run tests"
run: "composer exec phpunit -- --verbose" run: "composer exec phpunit -- --verbose"
- name: "Run tests with rollbar" - name: "Run tests with psr/log 3"
if: "contains(matrix.dependencies, 'highest') && matrix.php-version >= '8.0'"
run: | run: |
composer require psr/log:'^1.1|^2' --no-update composer remove --no-update --dev graylog2/gelf-php ruflin/elastica elasticsearch/elasticsearch rollbar/rollbar
composer require rollbar/rollbar:^1.3 --no-update composer require --no-update psr/log:^3
composer update -W ${{ env.COMPOSER_FLAGS }} composer update -W ${{ env.COMPOSER_FLAGS }}
composer exec phpunit -- --verbose --filter Rollbar composer exec phpunit -- --verbose

5
composer.json
View File

@@ -14,7 +14,7 @@
], ],
"require": { "require": {
"php": ">=7.2", "php": ">=7.2",
"psr/log": "^1.0.1 || ^2.0" "psr/log": "^1.0.1 || ^2.0 || ^3.0"
}, },
"require-dev": { "require-dev": {
"aws/aws-sdk-php": "^2.4.9 || ^3.0", "aws/aws-sdk-php": "^2.4.9 || ^3.0",
@@ -27,6 +27,7 @@
"phpspec/prophecy": "^1.6.1", "phpspec/prophecy": "^1.6.1",
"phpunit/phpunit": "^8.5", "phpunit/phpunit": "^8.5",
"predis/predis": "^1.1", "predis/predis": "^1.1",
"rollbar/rollbar": "^1.3",
"ruflin/elastica": ">=0.90@dev", "ruflin/elastica": ">=0.90@dev",
"swiftmailer/swiftmailer": "^5.3|^6.0", "swiftmailer/swiftmailer": "^5.3|^6.0",
"phpstan/phpstan": "^0.12.91" "phpstan/phpstan": "^0.12.91"
@@ -55,7 +56,7 @@
"psr-4": {"Monolog\\": "tests/Monolog"} "psr-4": {"Monolog\\": "tests/Monolog"}
}, },
"provide": { "provide": {
"psr/log-implementation": "1.0.0 || 2.0.0" "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0"
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {