tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Fix rebase conflicts

Browse Source
This commit is contained in:
Robbie Averill 2018-11-13 11:09:33 +02:00
parent cbea5006b3
commit 8854f053c8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Logging/MonologErrorHandler.php
View File

@ -23,7 +23,7 @@ class MonologErrorHandler implements ErrorHandler
*/ */
public function setLogger(LoggerInterface $logger) public function setLogger(LoggerInterface $logger)
{ {
$this->logger = $logger; $this->loggers = [$logger];
return $this; return $this;
} }

2
tests/php/Logging/MonologErrorHandlerTest.php
View File

@ -10,7 +10,7 @@ class MonologErrorHandlerTest extends SapphireTest
{ {
/** /**
* @expectedException \InvalidArgumentException * @expectedException \InvalidArgumentException
* @expectedExceptionMessageRegExp /No Logger property passed to MonologErrorHandler/ * @expectedExceptionMessageRegExp /No Logger properties passed to MonologErrorHandler/
*/ */
public function testStartThrowsExceptionWithoutLoggerDefined() public function testStartThrowsExceptionWithoutLoggerDefined()
{ {