Skip to content

Commit 60d0e1d

Browse files
committed
drop support of PHP 7.1 and Monolog 1.x
1 parent e7a90da commit 60d0e1d

File tree

4 files changed

+27
-26
lines changed

4 files changed

+27
-26
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ using the [Keep a CHANGELOG](http://keepachangelog.com) principles.
99

1010
- `CHANGELOG.md` file to follow changes to this project
1111

12+
### Changed
13+
14+
- drop PHP 7.1 support
15+
- drop Monolog 1.x support
16+
1217
## [2.0.0] - 2019-01-05
1318

1419
### Changed

composer.json

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,13 @@
99
"issues": "https://github.com/llaville/phpunit-LoggerTestListener/issues"
1010
},
1111
"require": {
12-
"php": "^7.1",
13-
"psr/log": "^1.0",
14-
"phpunit/phpunit": "^7.0"
12+
"php": "^7.2|^8.0",
13+
"psr/log": "^1.0|^2.0|^3.0",
14+
"phpunit/phpunit": "^8.0|^9.0"
1515
},
1616
"require-dev": {
17-
"monolog/monolog": "^1.10",
18-
"bartlett/monolog-callbackfilterhandler": "^1.0"
19-
},
20-
"suggest": {
21-
"monolog/monolog": "For advanced logging strategies",
22-
"bartlett/monolog-callbackfilterhandler": "Advanced filtering strategies for Monolog",
23-
"bartlett/monolog-growlhandler": "Sends notifications to Growl for Monolog"
17+
"monolog/monolog": "^2.0",
18+
"bartlett/monolog-callbackfilterhandler": "^2.0"
2419
},
2520
"authors": [
2621
{

examples/bootstrap.monolog.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<?php
22

3-
$baseDir = dirname(__DIR__);
4-
$vendorDir = $baseDir . '/vendor';
5-
6-
require_once $vendorDir . '/autoload.php';
3+
require_once dirname(__DIR__) . '/vendor' . '/autoload.php';
74

85
use Monolog\Logger;
96
use Monolog\Handler\RotatingFileHandler;

src/LoggerTestListener.php

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
<?php
2-
3-
declare(strict_types=1);
4-
1+
<?php declare(strict_types=1);
52
/**
63
* A PHPUnit Test Listener pushing the test results to any logger compatible PSR-3.
74
*
@@ -15,6 +12,10 @@
1512

1613
namespace Bartlett;
1714

15+
use Monolog\Handler\HandlerInterface;
16+
use Monolog\Handler\ProcessableHandlerInterface;
17+
use Monolog\Logger;
18+
1819
use Psr\Log\LoggerInterface;
1920

2021
/**
@@ -30,26 +31,29 @@ class LoggerTestListener extends AbstractLoggerTestListener
3031
/**
3132
* Initialize test listener.
3233
*
33-
* @param LoggerInterface $logger Any logger compatible PSR-3
34-
* @param \Monolog\Handler\HandlerInterface[] $handlers Optional stack of handlers
35-
* @param callable[] $processors Optional array of processors
34+
* @param LoggerInterface $logger Any logger compatible PSR-3
35+
* @param HandlerInterface[] $handlers Optional stack of handlers
36+
* @param callable[] $processors Optional array of processors
3637
*/
3738
public function __construct(
3839
LoggerInterface $logger,
3940
array $handlers = [],
4041
array $processors = []
4142
) {
42-
$this->logger = $logger;
43-
44-
if ($logger instanceof \Monolog\Logger) {
43+
if ($logger instanceof Logger) {
4544
// add some handlers
4645
foreach ($handlers as $handler) {
47-
$this->logger->pushHandler($handler);
46+
$logger->pushHandler($handler);
4847
}
48+
}
49+
50+
if ($logger instanceof ProcessableHandlerInterface) {
4951
// add some processors
5052
foreach ($processors as $processor) {
51-
$this->logger->pushProcessor($processor);
53+
$logger->pushProcessor($processor);
5254
}
5355
}
56+
57+
$this->logger = $logger;
5458
}
5559
}

0 commit comments

Comments
 (0)