Skip to content

Commit 0a7a18d

Browse files
authored
Add support for monolog 3.0 (#94)
1 parent 72f8bd7 commit 0a7a18d

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

.circleci/config.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ workflows:
99
- test-on-linux:
1010
matrix:
1111
parameters:
12-
php-version: ["7.3", "7.4", "8.0"]
12+
php-version: ["7.3", "7.4", "8.0", "8.1"]
1313
composer-dependencies: ["lowest", "highest"]
1414
- test-on-windows
1515

@@ -79,9 +79,14 @@ jobs:
7979
- run:
8080
name: psalm linting
8181
command: ./vendor/bin/psalm --no-cache
82-
- run:
83-
name: php-cs-fixer check
84-
command: composer cs-check
82+
- when:
83+
condition:
84+
not:
85+
equal: [ "8.1", <<parameters.php-version>> ]
86+
steps:
87+
- run:
88+
name: php-cs-fixer check
89+
command: composer cs-check
8590
- run:
8691
name: run tests
8792
command: php -d xdebug.mode=coverage vendor/bin/phpunit

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
],
1616
"require": {
1717
"php": ">=7.3",
18-
"monolog/monolog": "^1.6|^2.0",
18+
"monolog/monolog": "^1.6|^2.0|^3.0",
1919
"psr/log": "^1.0|^2.0|^3.0"
2020
},
2121
"require-dev": {
2222
"friendsofphp/php-cs-fixer": ">=2.18.0 <3.0",
2323
"guzzlehttp/guzzle": "^6.3 | ^7",
24-
"kevinrob/guzzle-cache-middleware": "^3",
24+
"kevinrob/guzzle-cache-middleware": "^4.0",
2525
"phpunit/php-code-coverage": "^9",
2626
"phpunit/phpunit": "^9",
27-
"vimeo/psalm": "^4.4"
27+
"vimeo/psalm": "^4.9"
2828
},
2929
"suggest": {
3030
"guzzlehttp/guzzle": "(^6.3 | ^7) Required when using GuzzleEventPublisher or the default FeatureRequester",

tests/LDClientTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ public function testSecureModeHash()
711711

712712
public function testLoggerInterfaceWarn()
713713
{
714-
// Use LoggerInterface impl, instead of concreate Logger from Monolog, to demonstrate the problem with `warn`.
714+
// Use LoggerInterface impl, instead of concrete Logger from Monolog, to demonstrate the problem with `warn`.
715715
$logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
716716

717717
$logger->expects(self::atLeastOnce())->method('warning');

0 commit comments

Comments
 (0)