mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-05 12:47:39 +02:00
Code Issues Releases Wiki Activity

Merge branch '1.x'

Browse Source
This commit is contained in:
Jordi Boggiano
2018-11-30 08:44:17 +01:00
parent aaf61a47da a335f6f1a5
commit 204744df2e
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,5 +1,6 @@
### 1.24.0 (2018-11-05) ### 1.24.0 (2018-11-05)
* BC Notice: If you are extending any of the Monolog's Formatters' `normalize` method, make sure you add the new `$depth = 0` argument to your function signature to avoid strict PHP warnings.
* Added a `ResettableInterface` in order to reset/reset/clear/flush handlers and processors * Added a `ResettableInterface` in order to reset/reset/clear/flush handlers and processors
* Added a `ProcessorInterface` as an optional way to label a class as being a processor (mostly useful for autowiring dependency containers) * Added a `ProcessorInterface` as an optional way to label a class as being a processor (mostly useful for autowiring dependency containers)
* Added a way to log signals being received using Monolog\SignalHandler * Added a way to log signals being received using Monolog\SignalHandler

13
src/Monolog/Handler/TestHandler.php
View File

@@ -69,6 +69,7 @@ class TestHandler extends AbstractProcessingHandler
{ {
protected $records = []; protected $records = [];
protected $recordsByLevel = []; protected $recordsByLevel = [];
private $skipReset = false;
public function getRecords() public function getRecords()
{ {
@@ -81,6 +82,18 @@ class TestHandler extends AbstractProcessingHandler
$this->recordsByLevel = []; $this->recordsByLevel = [];
} }
public function reset()
{
if (!$this->skipReset) {
$this->clear();
}
}
public function setSkipReset(bool $skipReset)
{
$this->skipReset = $skipReset;
}
/** /**
* @param string|int $level Logging level value or name * @param string|int $level Logging level value or name
*/ */

1
tests/Monolog/Handler/FingersCrossedHandlerTest.php
View File

@@ -61,6 +61,7 @@ class FingersCrossedHandlerTest extends TestCase
public function testHandleResetBufferingAfterReset() public function testHandleResetBufferingAfterReset()
{ {
$test = new TestHandler(); $test = new TestHandler();
$test->setSkipReset(true);
$handler = new FingersCrossedHandler($test); $handler = new FingersCrossedHandler($test);
$handler->handle($this->getRecord(Logger::WARNING)); $handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Logger::DEBUG)); $handler->handle($this->getRecord(Logger::DEBUG));

21
tests/Monolog/LoggerTest.php
View File

@@ -641,6 +641,7 @@ class LoggerTest extends \PHPUnit\Framework\TestCase
$logger = new Logger('app'); $logger = new Logger('app');
$testHandler = new Handler\TestHandler(); $testHandler = new Handler\TestHandler();
$testHandler->setSkipReset(true);
$bufferHandler = new Handler\BufferHandler($testHandler); $bufferHandler = new Handler\BufferHandler($testHandler);
$groupHandler = new Handler\GroupHandler(array($bufferHandler)); $groupHandler = new Handler\GroupHandler(array($bufferHandler));
$fingersCrossedHandler = new Handler\FingersCrossedHandler($groupHandler); $fingersCrossedHandler = new Handler\FingersCrossedHandler($groupHandler);
@@ -670,7 +671,7 @@ class LoggerTest extends \PHPUnit\Framework\TestCase
$that->assertEmpty($getProperty($fingersCrossedHandler, 'buffer')); $that->assertEmpty($getProperty($fingersCrossedHandler, 'buffer'));
}; };
$logger->debug('debug'); $logger->debug('debug1');
$logger->reset(); $logger->reset();
$assertBuffersEmpty(); $assertBuffersEmpty();
$this->assertFalse($testHandler->hasDebugRecords()); $this->assertFalse($testHandler->hasDebugRecords());
@@ -678,16 +679,16 @@ class LoggerTest extends \PHPUnit\Framework\TestCase
$this->assertNotSame($uid1, $uid1 = $processorUid1->getUid()); $this->assertNotSame($uid1, $uid1 = $processorUid1->getUid());
$this->assertNotSame($uid2, $uid2 = $processorUid2->getUid()); $this->assertNotSame($uid2, $uid2 = $processorUid2->getUid());
$logger->debug('debug'); $logger->debug('debug2');
$logger->error('error'); $logger->error('error2');
$logger->reset(); $logger->reset();
$assertBuffersEmpty(); $assertBuffersEmpty();
$this->assertTrue($testHandler->hasDebugRecords()); $this->assertTrue($testHandler->hasRecordThatContains('debug2', Logger::DEBUG));
$this->assertTrue($testHandler->hasErrorRecords()); $this->assertTrue($testHandler->hasRecordThatContains('error2', Logger::ERROR));
$this->assertNotSame($uid1, $uid1 = $processorUid1->getUid()); $this->assertNotSame($uid1, $uid1 = $processorUid1->getUid());
$this->assertNotSame($uid2, $uid2 = $processorUid2->getUid()); $this->assertNotSame($uid2, $uid2 = $processorUid2->getUid());
$logger->info('info'); $logger->info('info3');
$this->assertNotEmpty($getProperty($fingersCrossedHandler, 'buffer')); $this->assertNotEmpty($getProperty($fingersCrossedHandler, 'buffer'));
$assertBufferOfBufferHandlerEmpty(); $assertBufferOfBufferHandlerEmpty();
$this->assertFalse($testHandler->hasInfoRecords()); $this->assertFalse($testHandler->hasInfoRecords());
@@ -698,13 +699,13 @@ class LoggerTest extends \PHPUnit\Framework\TestCase
$this->assertNotSame($uid1, $uid1 = $processorUid1->getUid()); $this->assertNotSame($uid1, $uid1 = $processorUid1->getUid());
$this->assertNotSame($uid2, $uid2 = $processorUid2->getUid()); $this->assertNotSame($uid2, $uid2 = $processorUid2->getUid());
$logger->notice('notice'); $logger->notice('notice4');
$logger->emergency('emergency'); $logger->emergency('emergency4');
$logger->reset(); $logger->reset();
$assertBuffersEmpty(); $assertBuffersEmpty();
$this->assertFalse($testHandler->hasInfoRecords()); $this->assertFalse($testHandler->hasInfoRecords());
$this->assertTrue($testHandler->hasNoticeRecords()); $this->assertTrue($testHandler->hasRecordThatContains('notice4', Logger::NOTICE));
$this->assertTrue($testHandler->hasEmergencyRecords()); $this->assertTrue($testHandler->hasRecordThatContains('emergency4', Logger::EMERGENCY));
$this->assertNotSame($uid1, $processorUid1->getUid()); $this->assertNotSame($uid1, $processorUid1->getUid());
$this->assertNotSame($uid2, $processorUid2->getUid()); $this->assertNotSame($uid2, $processorUid2->getUid());
} }