mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-07 13:46:38 +02:00
Code Issues Releases Wiki Activity

Split expectException calls with two parameters into the proper two calls

Browse Source
This commit is contained in:
Chris Forrence
2017-03-21 10:29:05 -04:00
parent 85250d3c72
commit 763c3afb32
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Monolog/Formatter/NormalizerFormatterTest.php
View File

@@ -115,7 +115,8 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormatToStringExceptionHandle() public function testFormatToStringExceptionHandle()
{ {
$formatter = new NormalizerFormatter('Y-m-d'); $formatter = new NormalizerFormatter('Y-m-d');
$this->expectException('RuntimeException', 'Could not convert to string'); $this->expectException('RuntimeException');
$this->expectExceptionMessage('Could not convert to string');
$formatter->format([ $formatter->format([
'myObject' => new TestToStringError(), 'myObject' => new TestToStringError(),
]); ]);
@@ -313,7 +314,8 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
$reflMethod = new \ReflectionMethod($formatter, 'handleJsonError'); $reflMethod = new \ReflectionMethod($formatter, 'handleJsonError');
$reflMethod->setAccessible(true); $reflMethod->setAccessible(true);
$this->expectException('RuntimeException', $msg); $this->expectException('RuntimeException');
$this->expectExceptionMessage($msg);
$reflMethod->invoke($formatter, $code, 'faked'); $reflMethod->invoke($formatter, $code, 'faked');
} }

3
tests/Monolog/Handler/ElasticSearchHandlerTest.php
View File

@@ -134,7 +134,8 @@ class ElasticSearchHandlerTest extends TestCase
$handler = new ElasticSearchHandler($client, $handlerOpts); $handler = new ElasticSearchHandler($client, $handlerOpts);
if ($expectedError) { if ($expectedError) {
$this->expectException($expectedError[0], $expectedError[1]); $this->expectException($expectedError[0]);
$this->expectExceptionMessage($expectedError[1]);
$handler->handle($this->getRecord()); $handler->handle($this->getRecord());
} else { } else {
$this->assertFalse($handler->handle($this->getRecord())); $this->assertFalse($handler->handle($this->getRecord()));