From 25580ef96197bb3aa55664ca1004c5abbe5a0b0c Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 5 Nov 2018 13:13:11 +0100 Subject: [PATCH 1/4] Add BC notice to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bcf679c4..0c5f93bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ### 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 `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 From 14e38f5ccb60ac7c3f3ce9ac32dc463674469966 Mon Sep 17 00:00:00 2001 From: Ankur Kumar Date: Tue, 13 Nov 2018 19:08:44 +0530 Subject: [PATCH 2/4] Exclude files and folder from release archive This file is same as master branch --- .gitattributes | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitattributes b/.gitattributes index 4afe7924..ed6e29a8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ -.gitattributes export-ignore -.gitignore export-ignore -.travis.yml export-ignore +/doc export-ignore +/tests export-ignore +/.* export-ignore +/phpunit.xml.dist export-ignore From 9ba4f228321b3c556556e47c7c6ede683cbe7115 Mon Sep 17 00:00:00 2001 From: George Mponos Date: Sat, 17 Nov 2018 20:30:52 +0200 Subject: [PATCH 3/4] Reset test handler --- src/Monolog/Handler/TestHandler.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Monolog/Handler/TestHandler.php b/src/Monolog/Handler/TestHandler.php index b6b1343b..65ef12e3 100644 --- a/src/Monolog/Handler/TestHandler.php +++ b/src/Monolog/Handler/TestHandler.php @@ -79,6 +79,11 @@ class TestHandler extends AbstractProcessingHandler $this->recordsByLevel = array(); } + public function reset() + { + $this->clear(); + } + public function hasRecords($level) { return isset($this->recordsByLevel[$level]); From a335f6f1a564f43d2c63f2eeeca381e6c78f9006 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 30 Nov 2018 08:43:17 +0100 Subject: [PATCH 4/4] Fix tests for TestHandler reset support --- src/Monolog/Handler/TestHandler.php | 10 ++++++++- .../Handler/FingersCrossedHandlerTest.php | 1 + tests/Monolog/LoggerTest.php | 21 ++++++++++--------- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/Monolog/Handler/TestHandler.php b/src/Monolog/Handler/TestHandler.php index 65ef12e3..478db0ac 100644 --- a/src/Monolog/Handler/TestHandler.php +++ b/src/Monolog/Handler/TestHandler.php @@ -67,6 +67,7 @@ class TestHandler extends AbstractProcessingHandler { protected $records = array(); protected $recordsByLevel = array(); + private $skipReset = false; public function getRecords() { @@ -81,7 +82,14 @@ class TestHandler extends AbstractProcessingHandler public function reset() { - $this->clear(); + if (!$this->skipReset) { + $this->clear(); + } + } + + public function setSkipReset($skipReset) + { + $this->skipReset = $skipReset; } public function hasRecords($level) diff --git a/tests/Monolog/Handler/FingersCrossedHandlerTest.php b/tests/Monolog/Handler/FingersCrossedHandlerTest.php index 0ec36531..5d51de1f 100644 --- a/tests/Monolog/Handler/FingersCrossedHandlerTest.php +++ b/tests/Monolog/Handler/FingersCrossedHandlerTest.php @@ -61,6 +61,7 @@ class FingersCrossedHandlerTest extends TestCase public function testHandleResetBufferingAfterReset() { $test = new TestHandler(); + $test->setSkipReset(true); $handler = new FingersCrossedHandler($test); $handler->handle($this->getRecord(Logger::WARNING)); $handler->handle($this->getRecord(Logger::DEBUG)); diff --git a/tests/Monolog/LoggerTest.php b/tests/Monolog/LoggerTest.php index 442e87de..d96c7b1d 100644 --- a/tests/Monolog/LoggerTest.php +++ b/tests/Monolog/LoggerTest.php @@ -620,6 +620,7 @@ class LoggerTest extends \PHPUnit_Framework_TestCase $logger = new Logger('app'); $testHandler = new Handler\TestHandler(); + $testHandler->setSkipReset(true); $bufferHandler = new Handler\BufferHandler($testHandler); $groupHandler = new Handler\GroupHandler(array($bufferHandler)); $fingersCrossedHandler = new Handler\FingersCrossedHandler($groupHandler); @@ -649,7 +650,7 @@ class LoggerTest extends \PHPUnit_Framework_TestCase $that->assertEmpty($getProperty($fingersCrossedHandler, 'buffer')); }; - $logger->debug('debug'); + $logger->debug('debug1'); $logger->reset(); $assertBuffersEmpty(); $this->assertFalse($testHandler->hasDebugRecords()); @@ -657,16 +658,16 @@ class LoggerTest extends \PHPUnit_Framework_TestCase $this->assertNotSame($uid1, $uid1 = $processorUid1->getUid()); $this->assertNotSame($uid2, $uid2 = $processorUid2->getUid()); - $logger->debug('debug'); - $logger->error('error'); + $logger->debug('debug2'); + $logger->error('error2'); $logger->reset(); $assertBuffersEmpty(); - $this->assertTrue($testHandler->hasDebugRecords()); - $this->assertTrue($testHandler->hasErrorRecords()); + $this->assertTrue($testHandler->hasRecordThatContains('debug2', Logger::DEBUG)); + $this->assertTrue($testHandler->hasRecordThatContains('error2', Logger::ERROR)); $this->assertNotSame($uid1, $uid1 = $processorUid1->getUid()); $this->assertNotSame($uid2, $uid2 = $processorUid2->getUid()); - $logger->info('info'); + $logger->info('info3'); $this->assertNotEmpty($getProperty($fingersCrossedHandler, 'buffer')); $assertBufferOfBufferHandlerEmpty(); $this->assertFalse($testHandler->hasInfoRecords()); @@ -677,13 +678,13 @@ class LoggerTest extends \PHPUnit_Framework_TestCase $this->assertNotSame($uid1, $uid1 = $processorUid1->getUid()); $this->assertNotSame($uid2, $uid2 = $processorUid2->getUid()); - $logger->notice('notice'); - $logger->emergency('emergency'); + $logger->notice('notice4'); + $logger->emergency('emergency4'); $logger->reset(); $assertBuffersEmpty(); $this->assertFalse($testHandler->hasInfoRecords()); - $this->assertTrue($testHandler->hasNoticeRecords()); - $this->assertTrue($testHandler->hasEmergencyRecords()); + $this->assertTrue($testHandler->hasRecordThatContains('notice4', Logger::NOTICE)); + $this->assertTrue($testHandler->hasRecordThatContains('emergency4', Logger::EMERGENCY)); $this->assertNotSame($uid1, $processorUid1->getUid()); $this->assertNotSame($uid2, $processorUid2->getUid()); }