1
0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-20 11:51:32 +02:00
This commit is contained in:
Jordi Boggiano
2016-09-25 17:46:38 +02:00
parent 941c21b793
commit 96f4fd718f
15 changed files with 39 additions and 36 deletions

View File

@@ -125,21 +125,22 @@ class JsonFormatterTest extends TestCase
}
/**
* @param JsonFormatter $formatter
* @param JsonFormatter $formatter
* @param \Exception|\Throwable $exception
*
* @return string
*/
private function formatRecordWithExceptionInContext(JsonFormatter $formatter, $exception)
{
$message = $formatter->format(array(
$message = $formatter->format([
'level_name' => 'CRITICAL',
'channel' => 'core',
'context' => array('exception' => $exception),
'context' => ['exception' => $exception],
'datetime' => null,
'extra' => array(),
'extra' => [],
'message' => 'foobar',
));
]);
return $message;
}

View File

@@ -93,14 +93,14 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
$formatter = new NormalizerFormatter('Y-m-d');
$e = new \SoapFault('foo', 'bar', 'hello', 'world');
$formatted = $formatter->format(array(
$formatted = $formatter->format([
'exception' => $e,
));
]);
unset($formatted['exception']['trace']);
$this->assertEquals(array(
'exception' => array(
$this->assertEquals([
'exception' => [
'class' => 'SoapFault',
'message' => 'bar',
'code' => 0,
@@ -108,8 +108,8 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
'faultcode' => 'foo',
'faultactor' => 'hello',
'detail' => 'world',
),
), $formatted);
],
], $formatted);
}
public function testFormatToStringExceptionHandle()

View File

@@ -68,7 +68,7 @@ class FlowdockHandlerTest extends TestCase
->setMethods(['fsockopen', 'streamSetTimeout', 'closeSocket'])
->getMock();
$reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
$reflectionProperty = new \ReflectionProperty('Monolog\Handler\SocketHandler', 'connectionString');
$reflectionProperty->setAccessible(true);
$reflectionProperty->setValue($this->handler, 'localhost:1234');

View File

@@ -209,7 +209,7 @@ class HipChatHandlerTest extends TestCase
->setMethods(['fsockopen', 'streamSetTimeout', 'closeSocket'])
->getMock();
$reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
$reflectionProperty = new \ReflectionProperty('Monolog\Handler\SocketHandler', 'connectionString');
$reflectionProperty->setAccessible(true);
$reflectionProperty->setValue($this->handler, 'localhost:1234');

View File

@@ -66,7 +66,7 @@ class LogEntriesHandlerTest extends TestCase
->setMethods(['fsockopen', 'streamSetTimeout', 'closeSocket'])
->getMock();
$reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
$reflectionProperty = new \ReflectionProperty('Monolog\Handler\SocketHandler', 'connectionString');
$reflectionProperty->setAccessible(true);
$reflectionProperty->setValue($this->handler, 'localhost:1234');

View File

@@ -66,7 +66,7 @@ class LogmaticHandlerTest extends TestCase
->setMethods(['fsockopen', 'streamSetTimeout', 'closeSocket'])
->getMock();
$reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
$reflectionProperty = new \ReflectionProperty('Monolog\Handler\SocketHandler', 'connectionString');
$reflectionProperty->setAccessible(true);
$reflectionProperty->setValue($this->handler, 'localhost:1234');

View File

@@ -121,7 +121,7 @@ class PushoverHandlerTest extends TestCase
->setMethods(['fsockopen', 'streamSetTimeout', 'closeSocket'])
->getMock();
$reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
$reflectionProperty = new \ReflectionProperty('Monolog\Handler\SocketHandler', 'connectionString');
$reflectionProperty->setAccessible(true);
$reflectionProperty->setValue($this->handler, 'localhost:1234');

View File

@@ -170,7 +170,7 @@ class RotatingFileHandlerTest extends TestCase
['Y-m-', false],
['Y--', false],
['m-d', false],
['Y-d', false]
['Y-d', false],
];
}

View File

@@ -131,7 +131,7 @@ class SlackHandlerTest extends TestCase
->setMethods(['fsockopen', 'streamSetTimeout', 'closeSocket'])
->getMock();
$reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
$reflectionProperty = new \ReflectionProperty('Monolog\Handler\SocketHandler', 'connectionString');
$reflectionProperty->setAccessible(true);
$reflectionProperty->setValue($this->handler, 'localhost:1234');

View File

@@ -31,7 +31,7 @@ class SyslogUdpHandlerTest extends TestCase
$handler = new SyslogUdpHandler("127.0.0.1", 514, "authpriv");
$handler->setFormatter(new \Monolog\Formatter\ChromePHPFormatter());
$socket = $this->getMockBuilder('\Monolog\Handler\SyslogUdp\UdpSocket')
$socket = $this->getMockBuilder('Monolog\Handler\SyslogUdp\UdpSocket')
->setMethods(['write'])
->setConstructorArgs(['lol', 'lol'])
->getMock();
@@ -52,7 +52,7 @@ class SyslogUdpHandlerTest extends TestCase
$handler = new SyslogUdpHandler("127.0.0.1", 514, "authpriv");
$handler->setFormatter($this->getIdentityFormatter());
$socket = $this->getMockBuilder('\Monolog\Handler\SyslogUdp\UdpSocket')
$socket = $this->getMockBuilder('Monolog\Handler\SyslogUdp\UdpSocket')
->setMethods(['write'])
->setConstructorArgs(['lol', 'lol'])
->getMock();

View File

@@ -21,7 +21,7 @@ class UdpSocketTest extends TestCase
{
public function testWeDoNotTruncateShortMessages()
{
$socket = $this->getMockBuilder('\Monolog\Handler\SyslogUdp\UdpSocket')
$socket = $this->getMockBuilder('Monolog\Handler\SyslogUdp\UdpSocket')
->setMethods(['send'])
->setConstructorArgs(['lol', 'lol'])
->getMock();
@@ -35,7 +35,7 @@ class UdpSocketTest extends TestCase
public function testLongMessagesAreTruncated()
{
$socket = $this->getMockBuilder('\Monolog\Handler\SyslogUdp\UdpSocket')
$socket = $this->getMockBuilder('Monolog\Handler\SyslogUdp\UdpSocket')
->setMethods(['send'])
->setConstructorArgs(['lol', 'lol'])
->getMock();

View File

@@ -3,7 +3,7 @@
/*
* This file is part of the Monolog package.
*
* (c) Jonathan A. Schweder <jonathanschweder@gmail.com>
* (c) Jordi Boggiano <j.boggiano@seld.be>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -27,6 +27,7 @@ class MercurialProcessorTest extends TestCase
}
if ($result != 0) {
$this->markTestSkipped('hg is missing');
return;
}