mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-30 00:10:06 +02:00
Code Issues Releases Wiki Activity

CS fixes

Browse Source
This commit is contained in:
Jordi Boggiano
2016-05-26 20:54:06 +01:00
parent 85e43a5e7b
commit f200e79879
115 changed files with 1138 additions and 1123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/Monolog/ErrorHandlerTest.php
View File

@@ -17,10 +17,10 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
{
public function testHandleError()
{
$logger = new Logger('test', array($handler = new TestHandler));
$logger = new Logger('test', [$handler = new TestHandler]);
$errHandler = new ErrorHandler($logger);
$errHandler->registerErrorHandler(array(E_USER_NOTICE => Logger::EMERGENCY), false);
$errHandler->registerErrorHandler([E_USER_NOTICE => Logger::EMERGENCY], false);
trigger_error('Foo', E_USER_ERROR);
$this->assertCount(1, $handler->getRecords());
$this->assertTrue($handler->hasErrorRecords());
@@ -31,28 +31,35 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
public function testHandleException()
{
$logger = new Logger('test', array($handler = new TestHandler));
$logger = new Logger('test', [$handler = new TestHandler]);
$errHandler = new ErrorHandler($logger);
$errHandler->registerExceptionHandler(array('Monolog\CustomTestException' => Logger::ALERT, 'Throwable' => Logger::WARNING), false);
$errHandler->registerExceptionHandler(['Monolog\CustomTestException' => Logger::ALERT, 'Throwable' => Logger::WARNING], false);
try {
throw new CustomCustomException();
$this->assertCount(1, $handler->getRecords());
$this->assertTrue($handler->hasAlertRecords());
} catch (\Throwable $e) {}
} catch (\Throwable $e) {
}
try {
throw new CustomTestException();
$this->assertCount(2, $handler->getRecords());
$this->assertTrue($handler->hasAlertRecords());
} catch (\Throwable $e) {}
} catch (\Throwable $e) {
}
try {
throw new RuntimeException();
$this->assertCount(3, $handler->getRecords());
$this->assertTrue($handler->hasWarningRecords());
} catch (\Throwable $e) {}
} catch (\Throwable $e) {
}
}
}
class CustomTestException extends \Exception {}
class CustomCustomException extends CustomTestException {}
class CustomTestException extends \Exception
{
}
class CustomCustomException extends CustomTestException
{
}

84
tests/Monolog/Formatter/ChromePHPFormatterTest.php
View File

@@ -21,29 +21,29 @@ class ChromePHPFormatterTest extends \PHPUnit_Framework_TestCase
public function testDefaultFormat()
{
$formatter = new ChromePHPFormatter();
$record = array(
$record = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array('from' => 'logger'),
'context' => ['from' => 'logger'],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array('ip' => '127.0.0.1'),
'extra' => ['ip' => '127.0.0.1'],
'message' => 'log',
);
];
$message = $formatter->format($record);
$this->assertEquals(
array(
[
'meh',
array(
[
'message' => 'log',
'context' => array('from' => 'logger'),
'extra' => array('ip' => '127.0.0.1'),
),
'context' => ['from' => 'logger'],
'extra' => ['ip' => '127.0.0.1'],
],
'unknown',
'error',
),
],
$message
);
}
@@ -54,29 +54,29 @@ class ChromePHPFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormatWithFileAndLine()
{
$formatter = new ChromePHPFormatter();
$record = array(
$record = [
'level' => Logger::CRITICAL,
'level_name' => 'CRITICAL',
'channel' => 'meh',
'context' => array('from' => 'logger'),
'context' => ['from' => 'logger'],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array('ip' => '127.0.0.1', 'file' => 'test', 'line' => 14),
'extra' => ['ip' => '127.0.0.1', 'file' => 'test', 'line' => 14],
'message' => 'log',
);
];
$message = $formatter->format($record);
$this->assertEquals(
array(
[
'meh',
array(
[
'message' => 'log',
'context' => array('from' => 'logger'),
'extra' => array('ip' => '127.0.0.1'),
),
'context' => ['from' => 'logger'],
'extra' => ['ip' => '127.0.0.1'],
],
'test : 14',
'error',
),
],
$message
);
}
@@ -87,25 +87,25 @@ class ChromePHPFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormatWithoutContext()
{
$formatter = new ChromePHPFormatter();
$record = array(
$record = [
'level' => Logger::DEBUG,
'level_name' => 'DEBUG',
'channel' => 'meh',
'context' => array(),
'context' => [],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array(),
'extra' => [],
'message' => 'log',
);
];
$message = $formatter->format($record);
$this->assertEquals(
array(
[
'meh',
'log',
'unknown',
'log',
),
],
$message
);
}
@@ -116,42 +116,42 @@ class ChromePHPFormatterTest extends \PHPUnit_Framework_TestCase
public function testBatchFormatThrowException()
{
$formatter = new ChromePHPFormatter();
$records = array(
array(
$records = [
[
'level' => Logger::INFO,
'level_name' => 'INFO',
'channel' => 'meh',
'context' => array(),
'context' => [],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array(),
'extra' => [],
'message' => 'log',
),
array(
],
[
'level' => Logger::WARNING,
'level_name' => 'WARNING',
'channel' => 'foo',
'context' => array(),
'context' => [],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array(),
'extra' => [],
'message' => 'log2',
),
);
],
];
$this->assertEquals(
array(
array(
[
[
'meh',
'log',
'unknown',
'info',
),
array(
],
[
'foo',
'log2',
'unknown',
'warn',
),
),
],
],
$formatter->formatBatch($records)
);
}

12
tests/Monolog/Formatter/ElasticaFormatterTest.php
View File

@@ -30,24 +30,24 @@ class ElasticaFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormat()
{
// test log message
$msg = array(
$msg = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array('foo' => 7, 'bar', 'class' => new \stdClass),
'context' => ['foo' => 7, 'bar', 'class' => new \stdClass],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array(),
'extra' => [],
'message' => 'log',
);
];
// expected values
$expected = $msg;
$expected['datetime'] = '1970-01-01T00:00:00.000000+00:00';
$expected['context'] = array(
$expected['context'] = [
'class' => ['stdClass' => []],
'foo' => 7,
0 => 'bar',
);
];
// format log message
$formatter = new ElasticaFormatter('my_index', 'doc_type');

10
tests/Monolog/Formatter/FlowdockFormatterTest.php
View File

@@ -24,14 +24,14 @@ class FlowdockFormatterTest extends TestCase
$formatter = new FlowdockFormatter('test_source', 'source@test.com');
$record = $this->getRecord();
$expected = array(
$expected = [
'source' => 'test_source',
'from_address' => 'source@test.com',
'subject' => 'in test_source: WARNING - test',
'content' => 'test',
'tags' => array('#logs', '#warning', '#test'),
'tags' => ['#logs', '#warning', '#test'],
'project' => 'test_source',
);
];
$formatted = $formatter->format($record);
$this->assertEquals($expected, $formatted['flowdock']);
@@ -43,10 +43,10 @@ class FlowdockFormatterTest extends TestCase
public function testFormatBatch()
{
$formatter = new FlowdockFormatter('test_source', 'source@test.com');
$records = array(
$records = [
$this->getRecord(Logger::WARNING),
$this->getRecord(Logger::DEBUG),
);
];
$formatted = $formatter->formatBatch($records);
$this->assertArrayHasKey('flowdock', $formatted[0]);

60
tests/Monolog/Formatter/GelfMessageFormatterTest.php
View File

@@ -28,15 +28,15 @@ class GelfMessageFormatterTest extends \PHPUnit_Framework_TestCase
public function testDefaultFormatter()
{
$formatter = new GelfMessageFormatter();
$record = array(
$record = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array(),
'context' => [],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array(),
'extra' => [],
'message' => 'log',
);
];
$message = $formatter->format($record);
@@ -63,15 +63,15 @@ class GelfMessageFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormatWithFileAndLine()
{
$formatter = new GelfMessageFormatter();
$record = array(
$record = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array('from' => 'logger'),
'context' => ['from' => 'logger'],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array('file' => 'test', 'line' => 14),
'extra' => ['file' => 'test', 'line' => 14],
'message' => 'log',
);
];
$message = $formatter->format($record);
@@ -87,10 +87,10 @@ class GelfMessageFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormatInvalidFails()
{
$formatter = new GelfMessageFormatter();
$record = array(
$record = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
);
];
$formatter->format($record);
}
@@ -101,15 +101,15 @@ class GelfMessageFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormatWithContext()
{
$formatter = new GelfMessageFormatter();
$record = array(
$record = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array('from' => 'logger'),
'context' => ['from' => 'logger'],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array('key' => 'pair'),
'extra' => ['key' => 'pair'],
'message' => 'log',
);
];
$message = $formatter->format($record);
@@ -138,19 +138,19 @@ class GelfMessageFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormatWithContextContainingException()
{
$formatter = new GelfMessageFormatter();
$record = array(
$record = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array('from' => 'logger', 'exception' => array(
'context' => ['from' => 'logger', 'exception' => [
'class' => '\Exception',
'file' => '/some/file/in/dir.php:56',
'trace' => array('/some/file/1.php:23', '/some/file/2.php:3'),
)),
'trace' => ['/some/file/1.php:23', '/some/file/2.php:3'],
]],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array(),
'extra' => [],
'message' => 'log',
);
];
$message = $formatter->format($record);
@@ -166,15 +166,15 @@ class GelfMessageFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormatWithExtra()
{
$formatter = new GelfMessageFormatter();
$record = array(
$record = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array('from' => 'logger'),
'context' => ['from' => 'logger'],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array('key' => 'pair'),
'extra' => ['key' => 'pair'],
'message' => 'log',
);
];
$message = $formatter->format($record);
@@ -200,15 +200,15 @@ class GelfMessageFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormatWithLargeData()
{
$formatter = new GelfMessageFormatter();
$record = array(
$record = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array('exception' => str_repeat(' ', 32767)),
'context' => ['exception' => str_repeat(' ', 32767)],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array('key' => str_repeat(' ', 32767)),
'message' => 'log'
);
'extra' => ['key' => str_repeat(' ', 32767)],
'message' => 'log',
];
$message = $formatter->format($record);
$messageArray = $message->toArray();
@@ -216,7 +216,7 @@ class GelfMessageFormatterTest extends \PHPUnit_Framework_TestCase
$length = 200;
foreach ($messageArray as $key => $value) {
if (!in_array($key, array('level', 'timestamp'))) {
if (!in_array($key, ['level', 'timestamp'])) {
$length += strlen($value);
}
}

24
tests/Monolog/Formatter/JsonFormatterTest.php
View File

@@ -52,10 +52,10 @@ class JsonFormatterTest extends TestCase
public function testFormatBatch()
{
$formatter = new JsonFormatter();
$records = array(
$records = [
$this->getRecord(Logger::WARNING),
$this->getRecord(Logger::DEBUG),
);
];
$this->assertEquals(json_encode($records), $formatter->formatBatch($records));
}
@@ -66,10 +66,10 @@ class JsonFormatterTest extends TestCase
public function testFormatBatchNewlines()
{
$formatter = new JsonFormatter(JsonFormatter::BATCH_MODE_NEWLINES);
$records = $expected = array(
$records = $expected = [
$this->getRecord(Logger::WARNING),
$this->getRecord(Logger::DEBUG),
);
];
array_walk($expected, function (&$value, $key) {
$value = json_encode($value);
});
@@ -80,14 +80,14 @@ class JsonFormatterTest extends TestCase
{
$formatter = new JsonFormatter();
$exception = new \RuntimeException('Foo');
$message = $formatter->format(array(
$message = $formatter->format([
'level_name' => 'CRITICAL',
'channel' => 'core',
'context' => array('exception' => $exception),
'context' => ['exception' => $exception],
'datetime' => new \DateTimeImmutable(),
'extra' => array(),
'extra' => [],
'message' => 'foobar',
));
]);
if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
$path = substr(json_encode($exception->getFile(), JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), 1, -1);
@@ -101,14 +101,14 @@ class JsonFormatterTest extends TestCase
{
$formatter = new JsonFormatter();
$exception = new \RuntimeException('Foo', 0, new \LogicException('Wut?'));
$message = $formatter->format(array(
$message = $formatter->format([
'level_name' => 'CRITICAL',
'channel' => 'core',
'context' => array('exception' => $exception),
'context' => ['exception' => $exception],
'datetime' => new \DateTimeImmutable(),
'extra' => array(),
'extra' => [],
'message' => 'foobar',
));
]);
if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
$pathPrevious = substr(json_encode($exception->getPrevious()->getFile(), JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), 1, -1);

110
tests/Monolog/Formatter/LineFormatterTest.php
View File

@@ -19,103 +19,103 @@ class LineFormatterTest extends \PHPUnit_Framework_TestCase
public function testDefFormatWithString()
{
$formatter = new LineFormatter(null, 'Y-m-d');
$message = $formatter->format(array(
$message = $formatter->format([
'level_name' => 'WARNING',
'channel' => 'log',
'context' => array(),
'context' => [],
'message' => 'foo',
'datetime' => new \DateTimeImmutable,
'extra' => array(),
));
'extra' => [],
]);
$this->assertEquals('['.date('Y-m-d').'] log.WARNING: foo [] []'."\n", $message);
}
public function testDefFormatWithArrayContext()
{
$formatter = new LineFormatter(null, 'Y-m-d');
$message = $formatter->format(array(
$message = $formatter->format([
'level_name' => 'ERROR',
'channel' => 'meh',
'message' => 'foo',
'datetime' => new \DateTimeImmutable,
'extra' => array(),
'context' => array(
'extra' => [],
'context' => [
'foo' => 'bar',
'baz' => 'qux',
'bool' => false,
'null' => null,
),
));
],
]);
$this->assertEquals('['.date('Y-m-d').'] meh.ERROR: foo {"foo":"bar","baz":"qux","bool":false,"null":null} []'."\n", $message);
}
public function testDefFormatExtras()
{
$formatter = new LineFormatter(null, 'Y-m-d');
$message = $formatter->format(array(
$message = $formatter->format([
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array(),
'context' => [],
'datetime' => new \DateTimeImmutable,
'extra' => array('ip' => '127.0.0.1'),
'extra' => ['ip' => '127.0.0.1'],
'message' => 'log',
));
]);
$this->assertEquals('['.date('Y-m-d').'] meh.ERROR: log [] {"ip":"127.0.0.1"}'."\n", $message);
}
public function testFormatExtras()
{
$formatter = new LineFormatter("[%datetime%] %channel%.%level_name%: %message% %context% %extra.file% %extra%\n", 'Y-m-d');
$message = $formatter->format(array(
$message = $formatter->format([
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array(),
'context' => [],
'datetime' => new \DateTimeImmutable,
'extra' => array('ip' => '127.0.0.1', 'file' => 'test'),
'extra' => ['ip' => '127.0.0.1', 'file' => 'test'],
'message' => 'log',
));
]);
$this->assertEquals('['.date('Y-m-d').'] meh.ERROR: log [] test {"ip":"127.0.0.1"}'."\n", $message);
}
public function testContextAndExtraOptionallyNotShownIfEmpty()
{
$formatter = new LineFormatter(null, 'Y-m-d', false, true);
$message = $formatter->format(array(
$message = $formatter->format([
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array(),
'context' => [],
'datetime' => new \DateTimeImmutable,
'extra' => array(),
'extra' => [],
'message' => 'log',
));
]);
$this->assertEquals('['.date('Y-m-d').'] meh.ERROR: log '."\n", $message);
}
public function testContextAndExtraReplacement()
{
$formatter = new LineFormatter('%context.foo% => %extra.foo%');
$message = $formatter->format(array(
$message = $formatter->format([
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array('foo' => 'bar'),
'context' => ['foo' => 'bar'],
'datetime' => new \DateTimeImmutable,
'extra' => array('foo' => 'xbar'),
'extra' => ['foo' => 'xbar'],
'message' => 'log',
));
]);
$this->assertEquals('bar => xbar', $message);
}
public function testDefFormatWithObject()
{
$formatter = new LineFormatter(null, 'Y-m-d');
$message = $formatter->format(array(
$message = $formatter->format([
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array(),
'context' => [],
'datetime' => new \DateTimeImmutable,
'extra' => array('foo' => new TestFoo, 'bar' => new TestBar, 'baz' => array(), 'res' => fopen('php://memory', 'rb')),
'extra' => ['foo' => new TestFoo, 'bar' => new TestBar, 'baz' => [], 'res' => fopen('php://memory', 'rb')],
'message' => 'foobar',
));
]);
$this->assertEquals('['.date('Y-m-d').'] meh.ERROR: foobar [] {"foo":{"Monolog\\\\Formatter\\\\TestFoo":{"foo":"fooValue"}},"bar":{"Monolog\\\\Formatter\\\\TestBar":"bar"},"baz":[],"res":"[resource(stream)]"}'."\n", $message);
}
@@ -123,14 +123,14 @@ class LineFormatterTest extends \PHPUnit_Framework_TestCase
public function testDefFormatWithException()
{
$formatter = new LineFormatter(null, 'Y-m-d');
$message = $formatter->format(array(
$message = $formatter->format([
'level_name' => 'CRITICAL',
'channel' => 'core',
'context' => array('exception' => new \RuntimeException('Foo')),
'context' => ['exception' => new \RuntimeException('Foo')],
'datetime' => new \DateTimeImmutable,
'extra' => array(),
'extra' => [],
'message' => 'foobar',
));
]);
$path = str_replace('\\/', '/', json_encode(__FILE__));
@@ -141,14 +141,14 @@ class LineFormatterTest extends \PHPUnit_Framework_TestCase
{
$formatter = new LineFormatter(null, 'Y-m-d');
$previous = new \LogicException('Wut?');
$message = $formatter->format(array(
$message = $formatter->format([
'level_name' => 'CRITICAL',
'channel' => 'core',
'context' => array('exception' => new \RuntimeException('Foo', 0, $previous)),
'context' => ['exception' => new \RuntimeException('Foo', 0, $previous)],
'datetime' => new \DateTimeImmutable,
'extra' => array(),
'extra' => [],
'message' => 'foobar',
));
]);
$path = str_replace('\\/', '/', json_encode(__FILE__));
@@ -158,24 +158,24 @@ class LineFormatterTest extends \PHPUnit_Framework_TestCase
public function testBatchFormat()
{
$formatter = new LineFormatter(null, 'Y-m-d');
$message = $formatter->formatBatch(array(
array(
$message = $formatter->formatBatch([
[
'level_name' => 'CRITICAL',
'channel' => 'test',
'message' => 'bar',
'context' => array(),
'context' => [],
'datetime' => new \DateTimeImmutable,
'extra' => array(),
),
array(
'extra' => [],
],
[
'level_name' => 'WARNING',
'channel' => 'log',
'message' => 'foo',
'context' => array(),
'context' => [],
'datetime' => new \DateTimeImmutable,
'extra' => array(),
),
));
'extra' => [],
],
]);
$this->assertEquals('['.date('Y-m-d').'] test.CRITICAL: bar [] []'."\n".'['.date('Y-m-d').'] log.WARNING: foo [] []'."\n", $message);
}
@@ -183,11 +183,11 @@ class LineFormatterTest extends \PHPUnit_Framework_TestCase
{
$formatter = new LineFormatter(null, 'Y-m-d');
$message = $formatter->format(
array(
[
'message' => "foo\nbar",
'context' => array(),
'extra' => array(),
)
'context' => [],
'extra' => [],
]
);
$this->assertRegExp('/foo bar/', $message);
@@ -197,11 +197,11 @@ class LineFormatterTest extends \PHPUnit_Framework_TestCase
{
$formatter = new LineFormatter(null, 'Y-m-d', true);
$message = $formatter->format(
array(
[
'message' => "foo\nbar",
'context' => array(),
'extra' => array(),
)
'context' => [],
'extra' => [],
]
);
$this->assertRegExp('/foo\nbar/', $message);

50
tests/Monolog/Formatter/LogstashFormatterTest.php
View File

@@ -28,15 +28,15 @@ class LogstashFormatterTest extends \PHPUnit_Framework_TestCase
public function testDefaultFormatterV1()
{
$formatter = new LogstashFormatter('test', 'hostname', null, 'ctxt_');
$record = array(
$record = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array(),
'context' => [],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array(),
'extra' => [],
'message' => 'log',
);
];
$message = json_decode($formatter->format($record), true);
@@ -61,15 +61,15 @@ class LogstashFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormatWithFileAndLineV1()
{
$formatter = new LogstashFormatter('test', null, null, 'ctxt_');
$record = array(
$record = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array('from' => 'logger'),
'context' => ['from' => 'logger'],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array('file' => 'test', 'line' => 14),
'extra' => ['file' => 'test', 'line' => 14],
'message' => 'log',
);
];
$message = json_decode($formatter->format($record), true);
@@ -83,15 +83,15 @@ class LogstashFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormatWithContextV1()
{
$formatter = new LogstashFormatter('test', null, null, 'ctxt_');
$record = array(
$record = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array('from' => 'logger'),
'context' => ['from' => 'logger'],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array('key' => 'pair'),
'extra' => ['key' => 'pair'],
'message' => 'log',
);
];
$message = json_decode($formatter->format($record), true);
@@ -112,15 +112,15 @@ class LogstashFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormatWithExtraV1()
{
$formatter = new LogstashFormatter('test', null, null, 'ctxt_');
$record = array(
$record = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array('from' => 'logger'),
'context' => ['from' => 'logger'],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array('key' => 'pair'),
'extra' => ['key' => 'pair'],
'message' => 'log',
);
];
$message = json_decode($formatter->format($record), true);
@@ -138,15 +138,15 @@ class LogstashFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormatWithApplicationNameV1()
{
$formatter = new LogstashFormatter('app', 'test', null, 'ctxt_');
$record = array(
$record = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array('from' => 'logger'),
'context' => ['from' => 'logger'],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array('key' => 'pair'),
'extra' => ['key' => 'pair'],
'message' => 'log',
);
];
$message = json_decode($formatter->format($record), true);
@@ -157,17 +157,17 @@ class LogstashFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormatWithLatin9Data()
{
$formatter = new LogstashFormatter('test', 'hostname');
$record = array(
$record = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => '¯\_(ツ)_/¯',
'context' => array(),
'context' => [],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array(
'extra' => [
'user_agent' => "\xD6WN; FBCR/OrangeEspa\xF1a; Vers\xE3o/4.0; F\xE4rist",
),
],
'message' => 'log',
);
];
$message = json_decode($formatter->format($record), true);

126
tests/Monolog/Formatter/MongoDBFormatterTest.php
View File

@@ -27,10 +27,10 @@ class MongoDBFormatterTest extends \PHPUnit_Framework_TestCase
public function constructArgumentProvider()
{
return array(
array(1, true, 1, true),
array(0, false, 0, false),
);
return [
[1, true, 1, true],
[0, false, 0, false],
];
}
/**
@@ -56,28 +56,28 @@ class MongoDBFormatterTest extends \PHPUnit_Framework_TestCase
public function testSimpleFormat()
{
$record = array(
$record = [
'message' => 'some log message',
'context' => array(),
'context' => [],
'level' => Logger::WARNING,
'level_name' => Logger::getLevelName(Logger::WARNING),
'channel' => 'test',
'datetime' => new \DateTimeImmutable('2016-01-21T21:11:30.123456+00:00'),
'extra' => array(),
);
'extra' => [],
];
$formatter = new MongoDBFormatter();
$formattedRecord = $formatter->format($record);
$this->assertCount(7, $formattedRecord);
$this->assertEquals('some log message', $formattedRecord['message']);
$this->assertEquals(array(), $formattedRecord['context']);
$this->assertEquals([], $formattedRecord['context']);
$this->assertEquals(Logger::WARNING, $formattedRecord['level']);
$this->assertEquals(Logger::getLevelName(Logger::WARNING), $formattedRecord['level_name']);
$this->assertEquals('test', $formattedRecord['channel']);
$this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $formattedRecord['datetime']);
$this->assertEquals('1453410690123', $formattedRecord['datetime']->__toString());
$this->assertEquals(array(), $formattedRecord['extra']);
$this->assertEquals([], $formattedRecord['extra']);
}
public function testRecursiveFormat()
@@ -86,21 +86,21 @@ class MongoDBFormatterTest extends \PHPUnit_Framework_TestCase
$someObject->foo = 'something';
$someObject->bar = 'stuff';
$record = array(
$record = [
'message' => 'some log message',
'context' => array(
'context' => [
'stuff' => new \DateTimeImmutable('1969-01-21T21:11:30.123456+00:00'),
'some_object' => $someObject,
'context_string' => 'some string',
'context_int' => 123456,
'except' => new \Exception('exception message', 987),
),
],
'level' => Logger::WARNING,
'level_name' => Logger::getLevelName(Logger::WARNING),
'channel' => 'test',
'datetime' => new \DateTimeImmutable('2016-01-21T21:11:30.123456+00:00'),
'extra' => array(),
);
'extra' => [],
];
$formatter = new MongoDBFormatter();
$formattedRecord = $formatter->format($record);
@@ -110,11 +110,11 @@ class MongoDBFormatterTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('-29731710123', $formattedRecord['context']['stuff']->__toString());
$this->assertEquals(
array(
[
'foo' => 'something',
'bar' => 'stuff',
'class' => 'stdClass',
),
],
$formattedRecord['context']['some_object']
);
$this->assertEquals('some string', $formattedRecord['context']['context_string']);
@@ -131,75 +131,75 @@ class MongoDBFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormatDepthArray()
{
$record = array(
$record = [
'message' => 'some log message',
'context' => array(
'nest2' => array(
'context' => [
'nest2' => [
'property' => 'anything',
'nest3' => array(
'nest3' => [
'nest4' => 'value',
'property' => 'nothing',
),
),
),
],
],
],
'level' => Logger::WARNING,
'level_name' => Logger::getLevelName(Logger::WARNING),
'channel' => 'test',
'datetime' => new \DateTimeImmutable('2016-01-21T21:11:30.123456+00:00'),
'extra' => array(),
);
'extra' => [],
];
$formatter = new MongoDBFormatter(2);
$formattedResult = $formatter->format($record);
$this->assertEquals(
array(
'nest2' => array(
[
'nest2' => [
'property' => 'anything',
'nest3' => '[...]',
),
),
],
],
$formattedResult['context']
);
}
public function testFormatDepthArrayInfiniteNesting()
{
$record = array(
$record = [
'message' => 'some log message',
'context' => array(
'nest2' => array(
'context' => [
'nest2' => [
'property' => 'something',
'nest3' => array(
'nest3' => [
'property' => 'anything',
'nest4' => array(
'nest4' => [
'property' => 'nothing',
),
),
),
),
],
],
],
],
'level' => Logger::WARNING,
'level_name' => Logger::getLevelName(Logger::WARNING),
'channel' => 'test',
'datetime' => new \DateTimeImmutable('2016-01-21T21:11:30.123456+00:00'),
'extra' => array(),
);
'extra' => [],
];
$formatter = new MongoDBFormatter(0);
$formattedResult = $formatter->format($record);
$this->assertEquals(
array(
'nest2' => array(
[
'nest2' => [
'property' => 'something',
'nest3' => array(
'nest3' => [
'property' => 'anything',
'nest4' => array(
'nest4' => [
'property' => 'nothing',
),
),
),
),
],
],
],
],
$formattedResult['context']
);
}
@@ -212,46 +212,46 @@ class MongoDBFormatterTest extends \PHPUnit_Framework_TestCase
$someObject->nest3->property = 'nothing';
$someObject->nest3->nest4 = 'invisible';
$record = array(
$record = [
'message' => 'some log message',
'context' => array(
'context' => [
'nest2' => $someObject,
),
],
'level' => Logger::WARNING,
'level_name' => Logger::getLevelName(Logger::WARNING),
'channel' => 'test',
'datetime' => new \DateTimeImmutable('2016-01-21T21:11:30.123456+00:00'),
'extra' => array(),
);
'extra' => [],
];
$formatter = new MongoDBFormatter(2, true);
$formattedResult = $formatter->format($record);
$this->assertEquals(
array(
'nest2' => array(
[
'nest2' => [
'property' => 'anything',
'nest3' => '[...]',
'class' => 'stdClass',
),
),
],
],
$formattedResult['context']
);
}
public function testFormatDepthException()
{
$record = array(
$record = [
'message' => 'some log message',
'context' => array(
'context' => [
'nest2' => new \Exception('exception message', 987),
),
],
'level' => Logger::WARNING,
'level_name' => Logger::getLevelName(Logger::WARNING),
'channel' => 'test',
'datetime' => new \DateTimeImmutable('2016-01-21T21:11:30.123456+00:00'),
'extra' => array(),
);
'extra' => [],
];
$formatter = new MongoDBFormatter(2, false);
$formattedRecord = $formatter->format($record);

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

@@ -26,40 +26,40 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormat()
{
$formatter = new NormalizerFormatter('Y-m-d');
$formatted = $formatter->format(array(
$formatted = $formatter->format([
'level_name' => 'ERROR',
'channel' => 'meh',
'message' => 'foo',
'datetime' => new \DateTimeImmutable,
'extra' => array('foo' => new TestFooNorm, 'bar' => new TestBarNorm, 'baz' => array(), 'res' => fopen('php://memory', 'rb')),
'context' => array(
'extra' => ['foo' => new TestFooNorm, 'bar' => new TestBarNorm, 'baz' => [], 'res' => fopen('php://memory', 'rb')],
'context' => [
'foo' => 'bar',
'baz' => 'qux',
'inf' => INF,
'-inf' => -INF,
'nan' => acos(4),
),
));
],
]);
$this->assertEquals(array(
$this->assertEquals([
'level_name' => 'ERROR',
'channel' => 'meh',
'message' => 'foo',
'datetime' => date('Y-m-d'),
'extra' => array(
'extra' => [
'foo' => ['Monolog\\Formatter\\TestFooNorm' => ["foo" => "fooValue"]],
'bar' => ['Monolog\\Formatter\\TestBarNorm' => 'bar'],
'baz' => array(),
'baz' => [],
'res' => '[resource(stream)]',
),
'context' => array(
],
'context' => [
'foo' => 'bar',
'baz' => 'qux',
'inf' => 'INF',
'-inf' => '-INF',
'nan' => 'NaN',
),
), $formatted);
],
], $formatted);
}
public function testFormatExceptions()
@@ -67,72 +67,72 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
$formatter = new NormalizerFormatter('Y-m-d');
$e = new \LogicException('bar');
$e2 = new \RuntimeException('foo', 0, $e);
$formatted = $formatter->format(array(
$formatted = $formatter->format([
'exception' => $e2,
));
]);
$this->assertGreaterThan(5, count($formatted['exception']['trace']));
$this->assertTrue(isset($formatted['exception']['previous']));
unset($formatted['exception']['trace'], $formatted['exception']['previous']);
$this->assertEquals(array(
'exception' => array(
$this->assertEquals([
'exception' => [
'class' => get_class($e2),
'message' => $e2->getMessage(),
'code' => $e2->getCode(),
'file' => $e2->getFile().':'.$e2->getLine(),
),
), $formatted);
],
], $formatted);
}
public function testFormatToStringExceptionHandle()
{
$formatter = new NormalizerFormatter('Y-m-d');
$this->setExpectedException('RuntimeException', 'Could not convert to string');
$formatter->format(array(
$formatter->format([
'myObject' => new TestToStringError(),
));
]);
}
public function testBatchFormat()
{
$formatter = new NormalizerFormatter('Y-m-d');
$formatted = $formatter->formatBatch(array(
array(
$formatted = $formatter->formatBatch([
[
'level_name' => 'CRITICAL',
'channel' => 'test',
'message' => 'bar',
'context' => array(),
'context' => [],
'datetime' => new \DateTimeImmutable,
'extra' => array(),
),
array(
'extra' => [],
],
[
'level_name' => 'WARNING',
'channel' => 'log',
'message' => 'foo',
'context' => array(),
'context' => [],
'datetime' => new \DateTimeImmutable,
'extra' => array(),
),
));
$this->assertEquals(array(
array(
'extra' => [],
],
]);
$this->assertEquals([
[
'level_name' => 'CRITICAL',
'channel' => 'test',
'message' => 'bar',
'context' => array(),
'context' => [],
'datetime' => date('Y-m-d'),
'extra' => array(),
),
array(
'extra' => [],
],
[
'level_name' => 'WARNING',
'channel' => 'log',
'message' => 'foo',
'context' => array(),
'context' => [],
'datetime' => date('Y-m-d'),
'extra' => array(),
),
), $formatted);
'extra' => [],
],
], $formatted);
}
/**
@@ -159,11 +159,11 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
$formatter = new NormalizerFormatter();
$reflMethod = new \ReflectionMethod($formatter, 'toJson');
$reflMethod->setAccessible(true);
$res = $reflMethod->invoke($formatter, array($foo, $bar), true);
$res = $reflMethod->invoke($formatter, [$foo, $bar], true);
restore_error_handler();
$this->assertEquals(@json_encode(array($foo, $bar)), $res);
$this->assertEquals(@json_encode([$foo, $bar]), $res);
}
public function testIgnoresInvalidTypes()
@@ -183,11 +183,11 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
$formatter = new NormalizerFormatter();
$reflMethod = new \ReflectionMethod($formatter, 'toJson');
$reflMethod->setAccessible(true);
$res = $reflMethod->invoke($formatter, array($resource), true);
$res = $reflMethod->invoke($formatter, [$resource], true);
restore_error_handler();
$this->assertEquals(@json_encode(array($resource)), $res);
$this->assertEquals(@json_encode([$resource]), $res);
}
/**
@@ -211,7 +211,7 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
$reflMethod = new \ReflectionMethod($formatter, 'toJson');
$reflMethod->setAccessible(true);
$res = $reflMethod->invoke($formatter, array('message' => "\xA4\xA6\xA8\xB4\xB8\xBC\xBD\xBE"));
$res = $reflMethod->invoke($formatter, ['message' => "\xA4\xA6\xA8\xB4\xB8\xBC\xBD\xBE"]);
$this->assertSame('{"message":"€ŠšŽžŒœŸ"}', $res);
}
@@ -233,19 +233,19 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
{
$obj = new \stdClass;
return array(
'null' => array(null, null),
'int' => array(123, 123),
'float' => array(123.45, 123.45),
'bool false' => array(false, false),
'bool true' => array(true, true),
'ascii string' => array('abcdef', 'abcdef'),
'latin9 string' => array("\xB1\x31\xA4\xA6\xA8\xB4\xB8\xBC\xBD\xBE\xFF", '±1€ŠšŽžŒœŸÿ'),
'unicode string' => array('¤¦¨´¸¼½¾€ŠšŽžŒœŸ', '¤¦¨´¸¼½¾€ŠšŽžŒœŸ'),
'empty array' => array(array(), array()),
'array' => array(array('abcdef'), array('abcdef')),
'object' => array($obj, $obj),
);
return [
'null' => [null, null],
'int' => [123, 123],
'float' => [123.45, 123.45],
'bool false' => [false, false],
'bool true' => [true, true],
'ascii string' => ['abcdef', 'abcdef'],
'latin9 string' => ["\xB1\x31\xA4\xA6\xA8\xB4\xB8\xBC\xBD\xBE\xFF", '±1€ŠšŽžŒœŸÿ'],
'unicode string' => ['¤¦¨´¸¼½¾€ŠšŽžŒœŸ', '¤¦¨´¸¼½¾€ŠšŽžŒœŸ'],
'empty array' => [[], []],
'array' => [['abcdef'], ['abcdef']],
'object' => [$obj, $obj],
];
}
/**
@@ -265,12 +265,12 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
public function providesHandleJsonErrorFailure()
{
return array(
'depth' => array(JSON_ERROR_DEPTH, 'Maximum stack depth exceeded'),
'state' => array(JSON_ERROR_STATE_MISMATCH, 'Underflow or the modes mismatch'),
'ctrl' => array(JSON_ERROR_CTRL_CHAR, 'Unexpected control character found'),
'default' => array(-1, 'Unknown error'),
);
return [
'depth' => [JSON_ERROR_DEPTH, 'Maximum stack depth exceeded'],
'state' => [JSON_ERROR_STATE_MISMATCH, 'Underflow or the modes mismatch'],
'ctrl' => [JSON_ERROR_CTRL_CHAR, 'Unexpected control character found'],
'default' => [-1, 'Unknown error'],
];
}
public function testExceptionTraceWithArgs()
@@ -298,7 +298,7 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
}
$formatter = new NormalizerFormatter();
$record = array('context' => array('exception' => $e));
$record = ['context' => ['exception' => $e]];
$result = $formatter->format($record);
$this->assertRegExp(

52
tests/Monolog/Formatter/ScalarFormatterTest.php
View File

@@ -24,7 +24,7 @@ class ScalarFormatterTest extends \PHPUnit_Framework_TestCase
public function buildTrace(\Exception $e)
{
$data = array();
$data = [];
$trace = $e->getTrace();
foreach ($trace as $frame) {
if (isset($frame['file'])) {
@@ -45,64 +45,64 @@ class ScalarFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormat()
{
$exception = new \Exception('foo');
$formatted = $this->formatter->format(array(
$formatted = $this->formatter->format([
'foo' => 'string',
'bar' => 1,
'baz' => false,
'bam' => array(1, 2, 3),
'bat' => array('foo' => 'bar'),
'bam' => [1, 2, 3],
'bat' => ['foo' => 'bar'],
'bap' => $dt = new DateTimeImmutable(true),
'ban' => $exception,
));
]);
$this->assertSame(array(
$this->assertSame([
'foo' => 'string',
'bar' => 1,
'baz' => false,
'bam' => $this->encodeJson(array(1, 2, 3)),
'bat' => $this->encodeJson(array('foo' => 'bar')),
'bam' => $this->encodeJson([1, 2, 3]),
'bat' => $this->encodeJson(['foo' => 'bar']),
'bap' => (string) $dt,
'ban' => $this->encodeJson(array(
'ban' => $this->encodeJson([
'class' => get_class($exception),
'message' => $exception->getMessage(),
'code' => $exception->getCode(),
'file' => $exception->getFile() . ':' . $exception->getLine(),
'trace' => $this->buildTrace($exception),
)),
), $formatted);
]),
], $formatted);
}
public function testFormatWithErrorContext()
{
$context = array('file' => 'foo', 'line' => 1);
$formatted = $this->formatter->format(array(
$context = ['file' => 'foo', 'line' => 1];
$formatted = $this->formatter->format([
'context' => $context,
));
]);
$this->assertSame(array(
$this->assertSame([
'context' => $this->encodeJson($context),
), $formatted);
], $formatted);
}
public function testFormatWithExceptionContext()
{
$exception = new \Exception('foo');
$formatted = $this->formatter->format(array(
'context' => array(
$formatted = $this->formatter->format([
'context' => [
'exception' => $exception,
),
));
],
]);
$this->assertSame(array(
'context' => $this->encodeJson(array(
'exception' => array(
$this->assertSame([
'context' => $this->encodeJson([
'exception' => [
'class' => get_class($exception),
'message' => $exception->getMessage(),
'code' => $exception->getCode(),
'file' => $exception->getFile() . ':' . $exception->getLine(),
'trace' => $this->buildTrace($exception),
),
)),
), $formatted);
],
]),
], $formatted);
}
}

56
tests/Monolog/Formatter/WildfireFormatterTest.php
View File

@@ -21,15 +21,15 @@ class WildfireFormatterTest extends \PHPUnit_Framework_TestCase
public function testDefaultFormat()
{
$wildfire = new WildfireFormatter();
$record = array(
$record = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array('from' => 'logger'),
'context' => ['from' => 'logger'],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array('ip' => '127.0.0.1'),
'extra' => ['ip' => '127.0.0.1'],
'message' => 'log',
);
];
$message = $wildfire->format($record);
@@ -46,15 +46,15 @@ class WildfireFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormatWithFileAndLine()
{
$wildfire = new WildfireFormatter();
$record = array(
$record = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array('from' => 'logger'),
'context' => ['from' => 'logger'],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array('ip' => '127.0.0.1', 'file' => 'test', 'line' => 14),
'extra' => ['ip' => '127.0.0.1', 'file' => 'test', 'line' => 14],
'message' => 'log',
);
];
$message = $wildfire->format($record);
@@ -71,15 +71,15 @@ class WildfireFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormatWithoutContext()
{
$wildfire = new WildfireFormatter();
$record = array(
$record = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array(),
'context' => [],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array(),
'extra' => [],
'message' => 'log',
);
];
$message = $wildfire->format($record);
@@ -96,17 +96,17 @@ class WildfireFormatterTest extends \PHPUnit_Framework_TestCase
public function testBatchFormatThrowException()
{
$wildfire = new WildfireFormatter();
$record = array(
$record = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array(),
'context' => [],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array(),
'extra' => [],
'message' => 'log',
);
];
$wildfire->formatBatch(array($record));
$wildfire->formatBatch([$record]);
}
/**
@@ -115,22 +115,22 @@ class WildfireFormatterTest extends \PHPUnit_Framework_TestCase
public function testTableFormat()
{
$wildfire = new WildfireFormatter();
$record = array(
$record = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'table-channel',
'context' => array(
WildfireFormatter::TABLE => array(
array('col1', 'col2', 'col3'),
array('val1', 'val2', 'val3'),
array('foo1', 'foo2', 'foo3'),
array('bar1', 'bar2', 'bar3'),
),
),
'context' => [
WildfireFormatter::TABLE => [
['col1', 'col2', 'col3'],
['val1', 'val2', 'val3'],
['foo1', 'foo2', 'foo3'],
['bar1', 'bar2', 'bar3'],
],
],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array(),
'extra' => [],
'message' => 'table-message',
);
];
$message = $wildfire->format($record);

8
tests/Monolog/Handler/AbstractHandlerTest.php
View File

@@ -25,7 +25,7 @@ class AbstractHandlerTest extends TestCase
*/
public function testConstructAndGetSet()
{
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler', array(Logger::WARNING, false));
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler', [Logger::WARNING, false]);
$this->assertEquals(Logger::WARNING, $handler->getLevel());
$this->assertEquals(false, $handler->getBubble());
@@ -43,7 +43,7 @@ class AbstractHandlerTest extends TestCase
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler');
$handler->expects($this->exactly(2))
->method('handle');
$handler->handleBatch(array($this->getRecord(), $this->getRecord()));
$handler->handleBatch([$this->getRecord(), $this->getRecord()]);
}
/**
@@ -51,7 +51,7 @@ class AbstractHandlerTest extends TestCase
*/
public function testIsHandling()
{
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler', array(Logger::WARNING, false));
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler', [Logger::WARNING, false]);
$this->assertTrue($handler->isHandling($this->getRecord()));
$this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG)));
}
@@ -61,7 +61,7 @@ class AbstractHandlerTest extends TestCase
*/
public function testHandlesPsrStyleLevels()
{
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler', array('warning', false));
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler', ['warning', false]);
$this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG)));
$handler->setLevel('debug');
$this->assertTrue($handler->isHandling($this->getRecord(Logger::DEBUG)));

14
tests/Monolog/Handler/AbstractProcessingHandlerTest.php
View File

@@ -24,7 +24,7 @@ class AbstractProcessingHandlerTest extends TestCase
*/
public function testConstructAndGetSet()
{
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', array(Logger::WARNING, false));
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', [Logger::WARNING, false]);
$handler->setFormatter($formatter = new LineFormatter);
$this->assertSame($formatter, $handler->getFormatter());
}
@@ -34,7 +34,7 @@ class AbstractProcessingHandlerTest extends TestCase
*/
public function testHandleLowerLevelMessage()
{
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', array(Logger::WARNING, true));
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', [Logger::WARNING, true]);
$this->assertFalse($handler->handle($this->getRecord(Logger::DEBUG)));
}
@@ -43,7 +43,7 @@ class AbstractProcessingHandlerTest extends TestCase
*/
public function testHandleBubbling()
{
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', array(Logger::DEBUG, true));
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', [Logger::DEBUG, true]);
$this->assertFalse($handler->handle($this->getRecord()));
}
@@ -52,7 +52,7 @@ class AbstractProcessingHandlerTest extends TestCase
*/
public function testHandleNotBubbling()
{
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', array(Logger::DEBUG, false));
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', [Logger::DEBUG, false]);
$this->assertTrue($handler->handle($this->getRecord()));
}
@@ -61,7 +61,7 @@ class AbstractProcessingHandlerTest extends TestCase
*/
public function testHandleIsFalseWhenNotHandled()
{
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', array(Logger::WARNING, false));
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', [Logger::WARNING, false]);
$this->assertTrue($handler->handle($this->getRecord()));
$this->assertFalse($handler->handle($this->getRecord(Logger::DEBUG)));
}
@@ -72,13 +72,13 @@ class AbstractProcessingHandlerTest extends TestCase
public function testProcessRecord()
{
$handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler');
$handler->pushProcessor(new WebProcessor(array(
$handler->pushProcessor(new WebProcessor([
'REQUEST_URI' => '',
'REQUEST_METHOD' => '',
'REMOTE_ADDR' => '',
'SERVER_NAME' => '',
'UNIQUE_ID' => '',
)));
]));
$handledRecord = null;
$handler->expects($this->once())
->method('write')

58
tests/Monolog/Handler/AmqpHandlerTest.php
View File

@@ -31,43 +31,43 @@ class AmqpHandlerTest extends TestCase
$this->markTestSkipped("Please update AMQP to version >= 1.0");
}
$messages = array();
$messages = [];
$exchange = $this->getMock('AMQPExchange', array('publish', 'setName'), array(), '', false);
$exchange = $this->getMock('AMQPExchange', ['publish', 'setName'], [], '', false);
$exchange->expects($this->once())
->method('setName')
->with('log')
;
$exchange->expects($this->any())
->method('publish')
->will($this->returnCallback(function ($message, $routing_key, $flags = 0, $attributes = array()) use (&$messages) {
$messages[] = array($message, $routing_key, $flags, $attributes);
->will($this->returnCallback(function ($message, $routing_key, $flags = 0, $attributes = []) use (&$messages) {
$messages[] = [$message, $routing_key, $flags, $attributes];
}))
;
$handler = new AmqpHandler($exchange, 'log');
$record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
$record = $this->getRecord(Logger::WARNING, 'test', ['data' => new \stdClass, 'foo' => 34]);
$expected = array(
array(
$expected = [
[
'message' => 'test',
'context' => array(
'data' => array(),
'context' => [
'data' => [],
'foo' => 34,
),
],
'level' => 300,
'level_name' => 'WARNING',
'channel' => 'test',
'extra' => array(),
),
'extra' => [],
],
'warning.test',
0,
array(
[
'delivery_mode' => 2,
'content_type' => 'application/json',
),
);
],
];
$handler->handle($record);
@@ -83,43 +83,43 @@ class AmqpHandlerTest extends TestCase
$this->markTestSkipped("php-amqplib not installed");
}
$messages = array();
$messages = [];
$exchange = $this->getMock('PhpAmqpLib\Channel\AMQPChannel', array('basic_publish', '__destruct'), array(), '', false);
$exchange = $this->getMock('PhpAmqpLib\Channel\AMQPChannel', ['basic_publish', '__destruct'], [], '', false);
$exchange->expects($this->any())
->method('basic_publish')
->will($this->returnCallback(function (AMQPMessage $msg, $exchange = "", $routing_key = "", $mandatory = false, $immediate = false, $ticket = null) use (&$messages) {
$messages[] = array($msg, $exchange, $routing_key, $mandatory, $immediate, $ticket);
$messages[] = [$msg, $exchange, $routing_key, $mandatory, $immediate, $ticket];
}))
;
$handler = new AmqpHandler($exchange, 'log');
$record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
$record = $this->getRecord(Logger::WARNING, 'test', ['data' => new \stdClass, 'foo' => 34]);
$expected = array(
array(
$expected = [
[
'message' => 'test',
'context' => array(
'data' => array(),
'context' => [
'data' => [],
'foo' => 34,
),
],
'level' => 300,
'level_name' => 'WARNING',
'channel' => 'test',
'extra' => array(),
),
'extra' => [],
],
'log',
'warning.test',
false,
false,
null,
array(
[
'delivery_mode' => 2,
'content_type' => 'application/json',
),
);
],
];
$handler->handle($record);

2
tests/Monolog/Handler/BrowserConsoleHandlerTest.php
View File

@@ -89,7 +89,7 @@ EOF;
$handler = new BrowserConsoleHandler();
$handler->setFormatter($this->getIdentityFormatter());
$handler->handle($this->getRecord(Logger::DEBUG, 'test', array('foo' => 'bar')));
$handler->handle($this->getRecord(Logger::DEBUG, 'test', ['foo' => 'bar']));
$expected = <<<EOF
(function (c) {if (c && c.groupCollapsed) {

2
tests/Monolog/Handler/BufferHandlerTest.php
View File

@@ -47,7 +47,7 @@ class BufferHandlerTest extends TestCase
$handler->handle($this->getRecord(Logger::WARNING));
$handler->handle($this->getRecord(Logger::DEBUG));
$this->shutdownCheckHandler = $test;
register_shutdown_function(array($this, 'checkPropagation'));
register_shutdown_function([$this, 'checkPropagation']);
}
public function checkPropagation()

58
tests/Monolog/Handler/ChromePHPHandlerTest.php
View File

@@ -32,17 +32,17 @@ class ChromePHPHandlerTest extends TestCase
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::WARNING));
$expected = array(
'X-ChromeLogger-Data' => base64_encode(utf8_encode(json_encode(array(
$expected = [
'X-ChromeLogger-Data' => base64_encode(utf8_encode(json_encode([
'version' => ChromePHPHandler::VERSION,
'columns' => array('label', 'log', 'backtrace', 'type'),
'rows' => array(
'columns' => ['label', 'log', 'backtrace', 'type'],
'rows' => [
'test',
'test',
),
],
'request_uri' => '',
)))),
);
]))),
];
$this->assertEquals($expected, $handler->getHeaders());
}
@@ -56,33 +56,33 @@ class ChromePHPHandlerTest extends TestCase
// overflow chrome headers limit
$handler->handle($this->getRecord(Logger::WARNING, str_repeat('a', 100 * 1024)));
$expected = array(
'X-ChromeLogger-Data' => base64_encode(utf8_encode(json_encode(array(
$expected = [
'X-ChromeLogger-Data' => base64_encode(utf8_encode(json_encode([
'version' => ChromePHPHandler::VERSION,
'columns' => array('label', 'log', 'backtrace', 'type'),
'rows' => array(
array(
'columns' => ['label', 'log', 'backtrace', 'type'],
'rows' => [
[
'test',
'test',
'unknown',
'log',
),
array(
],
[
'test',
str_repeat('a', 150 * 1024),
'unknown',
'warn',
),
array(
],
[
'monolog',
'Incomplete logs, chrome header size limit reached',
'unknown',
'warn',
),
),
],
],
'request_uri' => '',
)))),
);
]))),
];
$this->assertEquals($expected, $handler->getHeaders());
}
@@ -99,19 +99,19 @@ class ChromePHPHandlerTest extends TestCase
$handler2->handle($this->getRecord(Logger::DEBUG));
$handler2->handle($this->getRecord(Logger::WARNING));
$expected = array(
'X-ChromeLogger-Data' => base64_encode(utf8_encode(json_encode(array(
$expected = [
'X-ChromeLogger-Data' => base64_encode(utf8_encode(json_encode([
'version' => ChromePHPHandler::VERSION,
'columns' => array('label', 'log', 'backtrace', 'type'),
'rows' => array(
'columns' => ['label', 'log', 'backtrace', 'type'],
'rows' => [
'test',
'test',
'test',
'test',
),
],
'request_uri' => '',
)))),
);
]))),
];
$this->assertEquals($expected, $handler2->getHeaders());
}
@@ -119,14 +119,14 @@ class ChromePHPHandlerTest extends TestCase
class TestChromePHPHandler extends ChromePHPHandler
{
protected $headers = array();
protected $headers = [];
public static function reset()
{
self::$initialized = false;
self::$overflowed = false;
self::$sendHeaders = true;
self::$json['rows'] = array();
self::$json['rows'] = [];
}
protected function sendHeader($header, $content)

2
tests/Monolog/Handler/CouchDBHandlerTest.php
View File

@@ -18,7 +18,7 @@ class CouchDBHandlerTest extends TestCase
{
public function testHandle()
{
$record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
$record = $this->getRecord(Logger::WARNING, 'test', ['data' => new \stdClass, 'foo' => 34]);
$handler = new CouchDBHandler();

12
tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php
View File

@@ -26,21 +26,21 @@ class DoctrineCouchDBHandlerTest extends TestCase
public function testHandle()
{
$client = $this->getMockBuilder('Doctrine\\CouchDB\\CouchDBClient')
->setMethods(array('postDocument'))
->setMethods(['postDocument'])
->disableOriginalConstructor()
->getMock();
$record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
$record = $this->getRecord(Logger::WARNING, 'test', ['data' => new \stdClass, 'foo' => 34]);
$expected = array(
$expected = [
'message' => 'test',
'context' => array('data' => ['stdClass' => []], 'foo' => 34),
'context' => ['data' => ['stdClass' => []], 'foo' => 34],
'level' => Logger::WARNING,
'level_name' => 'WARNING',
'channel' => 'test',
'datetime' => (string) $record['datetime'],
'extra' => array(),
);
'extra' => [],
];
$client->expects($this->once())
->method('postDocument')

8
tests/Monolog/Handler/DynamoDbHandlerTest.php
View File

@@ -24,7 +24,7 @@ class DynamoDbHandlerTest extends TestCase
}
$this->client = $this->getMockBuilder('Aws\DynamoDb\DynamoDbClient')
->setMethods(array('formatAttributes', '__call'))
->setMethods(['formatAttributes', '__call'])
->disableOriginalConstructor()->getMock();
}
@@ -48,7 +48,7 @@ class DynamoDbHandlerTest extends TestCase
{
$record = $this->getRecord();
$formatter = $this->getMock('Monolog\Formatter\FormatterInterface');
$formatted = array('foo' => 1, 'bar' => 2);
$formatted = ['foo' => 1, 'bar' => 2];
$handler = new DynamoDbHandler($this->client, 'foo');
$handler->setFormatter($formatter);
@@ -65,10 +65,10 @@ class DynamoDbHandlerTest extends TestCase
$this->client
->expects($this->once())
->method('__call')
->with('putItem', array(array(
->with('putItem', [[
'TableName' => 'foo',
'Item' => $formatted,
)));
]]);
$handler->handle($record);
}

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

@@ -29,10 +29,10 @@ class ElasticSearchHandlerTest extends TestCase
/**
* @var array Default handler options
*/
protected $options = array(
protected $options = [
'index' => 'my_index',
'type' => 'doc_type',
);
];
public function setUp()
{
@@ -43,7 +43,7 @@ class ElasticSearchHandlerTest extends TestCase
// base mock Elastica Client object
$this->client = $this->getMockBuilder('Elastica\Client')
->setMethods(array('addDocuments'))
->setMethods(['addDocuments'])
->disableOriginalConstructor()
->getMock();
}
@@ -57,19 +57,19 @@ class ElasticSearchHandlerTest extends TestCase
public function testHandle()
{
// log message
$msg = array(
$msg = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array('foo' => 7, 'bar', 'class' => new \stdClass),
'context' => ['foo' => 7, 'bar', 'class' => new \stdClass],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array(),
'extra' => [],
'message' => 'log',
);
];
// format expected result
$formatter = new ElasticaFormatter($this->options['index'], $this->options['type']);
$expected = array($formatter->format($msg));
$expected = [$formatter->format($msg)];
// setup ES client mock
$this->client->expects($this->any())
@@ -79,7 +79,7 @@ class ElasticSearchHandlerTest extends TestCase
// perform tests
$handler = new ElasticSearchHandler($this->client, $this->options);
$handler->handle($msg);
$handler->handleBatch(array($msg));
$handler->handleBatch([$msg]);
}
/**
@@ -113,11 +113,11 @@ class ElasticSearchHandlerTest extends TestCase
*/
public function testOptions()
{
$expected = array(
$expected = [
'index' => $this->options['index'],
'type' => $this->options['type'],
'ignore_error' => false,
);
];
$handler = new ElasticSearchHandler($this->client, $this->options);
$this->assertEquals($expected, $handler->getOptions());
}
@@ -128,9 +128,9 @@ class ElasticSearchHandlerTest extends TestCase
*/
public function testConnectionErrors($ignore, $expectedError)
{
$clientOpts = array('host' => '127.0.0.1', 'port' => 1);
$clientOpts = ['host' => '127.0.0.1', 'port' => 1];
$client = new Client($clientOpts);
$handlerOpts = array('ignore_error' => $ignore);
$handlerOpts = ['ignore_error' => $ignore];
$handler = new ElasticSearchHandler($client, $handlerOpts);
if ($expectedError) {
@@ -146,10 +146,10 @@ class ElasticSearchHandlerTest extends TestCase
*/
public function providerTestConnectionErrors()
{
return array(
array(false, array('RuntimeException', 'Error sending messages to Elasticsearch')),
array(true, false),
);
return [
[false, ['RuntimeException', 'Error sending messages to Elasticsearch']],
[true, false],
];
}
/**
@@ -162,28 +162,28 @@ class ElasticSearchHandlerTest extends TestCase
*/
public function testHandleIntegration()
{
$msg = array(
$msg = [
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => array('foo' => 7, 'bar', 'class' => new \stdClass),
'context' => ['foo' => 7, 'bar', 'class' => new \stdClass],
'datetime' => new \DateTimeImmutable("@0"),
'extra' => array(),
'extra' => [],
'message' => 'log',
);
];
$expected = $msg;
$expected['datetime'] = $msg['datetime']->format(\DateTime::ISO8601);
$expected['context'] = array(
$expected['context'] = [
'class' => '[object] (stdClass: {})',
'foo' => 7,
0 => 'bar',
);
];
$client = new Client();
$handler = new ElasticSearchHandler($client, $this->options);
try {
$handler->handleBatch(array($msg));
$handler->handleBatch([$msg]);
} catch (\RuntimeException $e) {
$this->markTestSkipped("Cannot connect to Elastic Search server on localhost");
}
@@ -234,6 +234,6 @@ class ElasticSearchHandlerTest extends TestCase
return $data['_source'];
}
return array();
return [];
}
}

2
tests/Monolog/Handler/ErrorLogHandlerTest.php
View File

@@ -24,7 +24,7 @@ class ErrorLogHandlerTest extends TestCase
{
protected function setUp()
{
$GLOBALS['error_log'] = array();
$GLOBALS['error_log'] = [];
}
/**

8
tests/Monolog/Handler/FilterHandlerTest.php
View File

@@ -63,7 +63,7 @@ class FilterHandlerTest extends TestCase
$this->assertFalse($test->hasEmergencyRecords());
$test = new TestHandler();
$handler = new FilterHandler($test, array(Logger::INFO, Logger::ERROR));
$handler = new FilterHandler($test, [Logger::INFO, Logger::ERROR]);
$handler->handle($this->getRecord(Logger::DEBUG));
$this->assertFalse($test->hasDebugRecords());
@@ -86,14 +86,14 @@ class FilterHandlerTest extends TestCase
$test = new TestHandler();
$handler = new FilterHandler($test);
$levels = array(Logger::INFO, Logger::ERROR);
$levels = [Logger::INFO, Logger::ERROR];
$handler->setAcceptedLevels($levels);
$this->assertSame($levels, $handler->getAcceptedLevels());
$handler->setAcceptedLevels(array('info', 'error'));
$handler->setAcceptedLevels(['info', 'error']);
$this->assertSame($levels, $handler->getAcceptedLevels());
$levels = array(Logger::CRITICAL, Logger::ALERT, Logger::EMERGENCY);
$levels = [Logger::CRITICAL, Logger::ALERT, Logger::EMERGENCY];
$handler->setAcceptedLevels(Logger::CRITICAL, Logger::EMERGENCY);
$this->assertSame($levels, $handler->getAcceptedLevels());

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

@@ -203,7 +203,7 @@ class FingersCrossedHandlerTest extends TestCase
public function testChannelLevelActivationStrategy()
{
$test = new TestHandler();
$handler = new FingersCrossedHandler($test, new ChannelLevelActivationStrategy(Logger::ERROR, array('othertest' => Logger::DEBUG)));
$handler = new FingersCrossedHandler($test, new ChannelLevelActivationStrategy(Logger::ERROR, ['othertest' => Logger::DEBUG]));
$handler->handle($this->getRecord(Logger::WARNING));
$this->assertFalse($test->hasWarningRecords());
$record = $this->getRecord(Logger::DEBUG);
@@ -220,7 +220,7 @@ class FingersCrossedHandlerTest extends TestCase
public function testChannelLevelActivationStrategyWithPsrLevels()
{
$test = new TestHandler();
$handler = new FingersCrossedHandler($test, new ChannelLevelActivationStrategy('error', array('othertest' => 'debug')));
$handler = new FingersCrossedHandler($test, new ChannelLevelActivationStrategy('error', ['othertest' => 'debug']));
$handler->handle($this->getRecord(Logger::WARNING));
$this->assertFalse($test->hasWarningRecords());
$record = $this->getRecord(Logger::DEBUG);

14
tests/Monolog/Handler/FirePHPHandlerTest.php
View File

@@ -32,13 +32,13 @@ class FirePHPHandlerTest extends TestCase
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::WARNING));
$expected = array(
$expected = [
'X-Wf-Protocol-1' => 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2',
'X-Wf-1-Structure-1' => 'http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1',
'X-Wf-1-Plugin-1' => 'http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/0.3',
'X-Wf-1-1-1-1' => 'test',
'X-Wf-1-1-1-2' => 'test',
);
];
$this->assertEquals($expected, $handler->getHeaders());
}
@@ -55,18 +55,18 @@ class FirePHPHandlerTest extends TestCase
$handler2->handle($this->getRecord(Logger::DEBUG));
$handler2->handle($this->getRecord(Logger::WARNING));
$expected = array(
$expected = [
'X-Wf-Protocol-1' => 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2',
'X-Wf-1-Structure-1' => 'http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1',
'X-Wf-1-Plugin-1' => 'http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/0.3',
'X-Wf-1-1-1-1' => 'test',
'X-Wf-1-1-1-2' => 'test',
);
];
$expected2 = array(
$expected2 = [
'X-Wf-1-1-1-3' => 'test',
'X-Wf-1-1-1-4' => 'test',
);
];
$this->assertEquals($expected, $handler->getHeaders());
$this->assertEquals($expected2, $handler2->getHeaders());
@@ -75,7 +75,7 @@ class FirePHPHandlerTest extends TestCase
class TestFirePHPHandler extends FirePHPHandler
{
protected $headers = array();
protected $headers = [];
public static function reset()
{

8
tests/Monolog/Handler/FleepHookHandlerTest.php
View File

@@ -56,15 +56,15 @@ class FleepHookHandlerTest extends TestCase
*/
public function testHandlerUsesLineFormatterWhichIgnoresEmptyArrays()
{
$record = array(
$record = [
'message' => 'msg',
'context' => array(),
'context' => [],
'level' => Logger::DEBUG,
'level_name' => Logger::getLevelName(Logger::DEBUG),
'channel' => 'channel',
'datetime' => new \DateTimeImmutable(),
'extra' => array(),
);
'extra' => [],
];
$expectedFormatter = new LineFormatter(null, null, true, true);
$expected = $expectedFormatter->format($record);

4
tests/Monolog/Handler/FlowdockHandlerTest.php
View File

@@ -61,11 +61,11 @@ class FlowdockHandlerTest extends TestCase
private function createHandler($token = 'myToken')
{
$constructorArgs = array($token, Logger::DEBUG);
$constructorArgs = [$token, Logger::DEBUG];
$this->res = fopen('php://memory', 'a');
$this->handler = $this->getMock(
'\Monolog\Handler\FlowdockHandler',
array('fsockopen', 'streamSetTimeout', 'closeSocket'),
['fsockopen', 'streamSetTimeout', 'closeSocket'],
$constructorArgs
);

2
tests/Monolog/Handler/GelfHandlerTest.php
View File

@@ -43,7 +43,7 @@ class GelfHandlerTest extends TestCase
protected function getMessagePublisher()
{
return $this->getMock('Gelf\Publisher', array('publish'), array(), '', false);
return $this->getMock('Gelf\Publisher', ['publish'], [], '', false);
}
public function testDebug()

12
tests/Monolog/Handler/GroupHandlerTest.php
View File

@@ -22,7 +22,7 @@ class GroupHandlerTest extends TestCase
*/
public function testConstructorOnlyTakesHandler()
{
new GroupHandler(array(new TestHandler(), "foo"));
new GroupHandler([new TestHandler(), "foo"]);
}
/**
@@ -31,7 +31,7 @@ class GroupHandlerTest extends TestCase
*/
public function testHandle()
{
$testHandlers = array(new TestHandler(), new TestHandler());
$testHandlers = [new TestHandler(), new TestHandler()];
$handler = new GroupHandler($testHandlers);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::INFO));
@@ -47,9 +47,9 @@ class GroupHandlerTest extends TestCase
*/
public function testHandleBatch()
{
$testHandlers = array(new TestHandler(), new TestHandler());
$testHandlers = [new TestHandler(), new TestHandler()];
$handler = new GroupHandler($testHandlers);
$handler->handleBatch(array($this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO)));
$handler->handleBatch([$this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO)]);
foreach ($testHandlers as $test) {
$this->assertTrue($test->hasDebugRecords());
$this->assertTrue($test->hasInfoRecords());
@@ -62,7 +62,7 @@ class GroupHandlerTest extends TestCase
*/
public function testIsHandling()
{
$testHandlers = array(new TestHandler(Logger::ERROR), new TestHandler(Logger::WARNING));
$testHandlers = [new TestHandler(Logger::ERROR), new TestHandler(Logger::WARNING)];
$handler = new GroupHandler($testHandlers);
$this->assertTrue($handler->isHandling($this->getRecord(Logger::ERROR)));
$this->assertTrue($handler->isHandling($this->getRecord(Logger::WARNING)));
@@ -75,7 +75,7 @@ class GroupHandlerTest extends TestCase
public function testHandleUsesProcessors()
{
$test = new TestHandler();
$handler = new GroupHandler(array($test));
$handler = new GroupHandler([$test]);
$handler->pushProcessor(function ($record) {
$record['extra']['foo'] = true;

8
tests/Monolog/Handler/HandlerWrapperTest.php
View File

@@ -37,10 +37,10 @@ class HandlerWrapperTest extends TestCase
*/
public function trueFalseDataProvider()
{
return array(
array(true),
array(false),
);
return [
[true],
[false],
];
}
/**

76
tests/Monolog/Handler/HipChatHandlerTest.php
View File

@@ -139,16 +139,16 @@ class HipChatHandlerTest extends TestCase
public function provideLevelColors()
{
return array(
array(Logger::DEBUG, 'gray'),
array(Logger::INFO, 'green'),
array(Logger::WARNING, 'yellow'),
array(Logger::ERROR, 'red'),
array(Logger::CRITICAL, 'red'),
array(Logger::ALERT, 'red'),
array(Logger::EMERGENCY,'red'),
array(Logger::NOTICE, 'green'),
);
return [
[Logger::DEBUG, 'gray'],
[Logger::INFO, 'green'],
[Logger::WARNING, 'yellow'],
[Logger::ERROR, 'red'],
[Logger::CRITICAL, 'red'],
[Logger::ALERT, 'red'],
[Logger::EMERGENCY,'red'],
[Logger::NOTICE, 'green'],
];
}
/**
@@ -168,45 +168,45 @@ class HipChatHandlerTest extends TestCase
public function provideBatchRecords()
{
return array(
array(
array(
array('level' => Logger::WARNING, 'message' => 'Oh bugger!', 'level_name' => 'warning', 'datetime' => new \DateTimeImmutable()),
array('level' => Logger::NOTICE, 'message' => 'Something noticeable happened.', 'level_name' => 'notice', 'datetime' => new \DateTimeImmutable()),
array('level' => Logger::CRITICAL, 'message' => 'Everything is broken!', 'level_name' => 'critical', 'datetime' => new \DateTimeImmutable()),
),
return [
[
[
['level' => Logger::WARNING, 'message' => 'Oh bugger!', 'level_name' => 'warning', 'datetime' => new \DateTimeImmutable()],
['level' => Logger::NOTICE, 'message' => 'Something noticeable happened.', 'level_name' => 'notice', 'datetime' => new \DateTimeImmutable()],
['level' => Logger::CRITICAL, 'message' => 'Everything is broken!', 'level_name' => 'critical', 'datetime' => new \DateTimeImmutable()],
],
'red',
),
array(
array(
array('level' => Logger::WARNING, 'message' => 'Oh bugger!', 'level_name' => 'warning', 'datetime' => new \DateTimeImmutable()),
array('level' => Logger::NOTICE, 'message' => 'Something noticeable happened.', 'level_name' => 'notice', 'datetime' => new \DateTimeImmutable()),
),
],
[
[
['level' => Logger::WARNING, 'message' => 'Oh bugger!', 'level_name' => 'warning', 'datetime' => new \DateTimeImmutable()],
['level' => Logger::NOTICE, 'message' => 'Something noticeable happened.', 'level_name' => 'notice', 'datetime' => new \DateTimeImmutable()],
],
'yellow',
),
array(
array(
array('level' => Logger::DEBUG, 'message' => 'Just debugging.', 'level_name' => 'debug', 'datetime' => new \DateTimeImmutable()),
array('level' => Logger::NOTICE, 'message' => 'Something noticeable happened.', 'level_name' => 'notice', 'datetime' => new \DateTimeImmutable()),
),
],
[
[
['level' => Logger::DEBUG, 'message' => 'Just debugging.', 'level_name' => 'debug', 'datetime' => new \DateTimeImmutable()],
['level' => Logger::NOTICE, 'message' => 'Something noticeable happened.', 'level_name' => 'notice', 'datetime' => new \DateTimeImmutable()],
],
'green',
),
array(
array(
array('level' => Logger::DEBUG, 'message' => 'Just debugging.', 'level_name' => 'debug', 'datetime' => new \DateTimeImmutable()),
),
],
[
[
['level' => Logger::DEBUG, 'message' => 'Just debugging.', 'level_name' => 'debug', 'datetime' => new \DateTimeImmutable()],
],
'gray',
),
);
],
];
}
private function createHandler($token = 'myToken', $room = 'room1', $name = 'Monolog', $notify = false, $host = 'api.hipchat.com', $version = 'v1')
{
$constructorArgs = array($token, $room, $name, $notify, Logger::DEBUG, true, true, 'text', $host, $version);
$constructorArgs = [$token, $room, $name, $notify, Logger::DEBUG, true, true, 'text', $host, $version];
$this->res = fopen('php://memory', 'a');
$this->handler = $this->getMock(
'\Monolog\Handler\HipChatHandler',
array('fsockopen', 'streamSetTimeout', 'closeSocket'),
['fsockopen', 'streamSetTimeout', 'closeSocket'],
$constructorArgs
);

8
tests/Monolog/Handler/LogEntriesHandlerTest.php
View File

@@ -42,11 +42,11 @@ class LogEntriesHandlerTest extends TestCase
public function testWriteBatchContent()
{
$records = array(
$records = [
$this->getRecord(),
$this->getRecord(),
$this->getRecord(),
);
];
$this->createHandler();
$this->handler->handleBatch($records);
@@ -59,11 +59,11 @@ class LogEntriesHandlerTest extends TestCase
private function createHandler()
{
$useSSL = extension_loaded('openssl');
$args = array('testToken', $useSSL, Logger::DEBUG, true);
$args = ['testToken', $useSSL, Logger::DEBUG, true];
$this->res = fopen('php://memory', 'a');
$this->handler = $this->getMock(
'\Monolog\Handler\LogEntriesHandler',
array('fsockopen', 'streamSetTimeout', 'closeSocket'),
['fsockopen', 'streamSetTimeout', 'closeSocket'],
$args
);

6
tests/Monolog/Handler/MailHandlerTest.php
View File

@@ -41,11 +41,11 @@ class MailHandlerTest extends TestCase
*/
public function testHandleBatchNotSendsMailIfMessagesAreBelowLevel()
{
$records = array(
$records = [
$this->getRecord(Logger::DEBUG, 'debug message 1'),
$this->getRecord(Logger::DEBUG, 'debug message 2'),
$this->getRecord(Logger::INFO, 'information'),
);
];
$handler = $this->getMockForAbstractClass('Monolog\\Handler\\MailHandler');
$handler->expects($this->never())
@@ -63,7 +63,7 @@ class MailHandlerTest extends TestCase
$handler = $this->getMockForAbstractClass('Monolog\\Handler\\MailHandler');
$record = $this->getRecord();
$records = array($record);
$records = [$record];
$records[0]['formatted'] = '['.$record['datetime'].'] test.WARNING: test [] []'."\n";
$handler->expects($this->once())

6
tests/Monolog/Handler/NativeMailerHandlerTest.php
View File

@@ -24,7 +24,7 @@ class NativeMailerHandlerTest extends TestCase
{
protected function setUp()
{
$GLOBALS['mail'] = array();
$GLOBALS['mail'] = [];
}
/**
@@ -50,7 +50,7 @@ class NativeMailerHandlerTest extends TestCase
public function testSetterArrayHeaderInjection()
{
$mailer = new NativeMailerHandler('spammer@example.org', 'dear victim', 'receiver@example.org');
$mailer->addHeader(array("Content-Type: text/html\r\nFrom: faked@attacker.org"));
$mailer->addHeader(["Content-Type: text/html\r\nFrom: faked@attacker.org"]);
}
/**
@@ -78,7 +78,7 @@ class NativeMailerHandlerTest extends TestCase
$from = 'receiver@example.org';
$mailer = new NativeMailerHandler($to, $subject, $from);
$mailer->handleBatch(array());
$mailer->handleBatch([]);
// batch is empty, nothing sent
$this->assertEmpty($GLOBALS['mail']);

30
tests/Monolog/Handler/NewRelicHandlerTest.php
View File

@@ -24,7 +24,7 @@ class NewRelicHandlerTest extends TestCase
public function setUp()
{
self::$appname = null;
self::$customParameters = array();
self::$customParameters = [];
self::$transactionName = null;
}
@@ -46,8 +46,8 @@ class NewRelicHandlerTest extends TestCase
public function testThehandlerCanAddContextParamsToTheNewRelicTrace()
{
$handler = new StubNewRelicHandler();
$handler->handle($this->getRecord(Logger::ERROR, 'log message', array('a' => 'b')));
$this->assertEquals(array('context_a' => 'b'), self::$customParameters);
$handler->handle($this->getRecord(Logger::ERROR, 'log message', ['a' => 'b']));
$this->assertEquals(['context_a' => 'b'], self::$customParameters);
}
public function testThehandlerCanAddExplodedContextParamsToTheNewRelicTrace()
@@ -56,10 +56,10 @@ class NewRelicHandlerTest extends TestCase
$handler->handle($this->getRecord(
Logger::ERROR,
'log message',
array('a' => array('key1' => 'value1', 'key2' => 'value2'))
['a' => ['key1' => 'value1', 'key2' => 'value2']]
));
$this->assertEquals(
array('context_a_key1' => 'value1', 'context_a_key2' => 'value2'),
['context_a_key1' => 'value1', 'context_a_key2' => 'value2'],
self::$customParameters
);
}
@@ -67,40 +67,40 @@ class NewRelicHandlerTest extends TestCase
public function testThehandlerCanAddExtraParamsToTheNewRelicTrace()
{
$record = $this->getRecord(Logger::ERROR, 'log message');
$record['extra'] = array('c' => 'd');
$record['extra'] = ['c' => 'd'];
$handler = new StubNewRelicHandler();
$handler->handle($record);
$this->assertEquals(array('extra_c' => 'd'), self::$customParameters);
$this->assertEquals(['extra_c' => 'd'], self::$customParameters);
}
public function testThehandlerCanAddExplodedExtraParamsToTheNewRelicTrace()
{
$record = $this->getRecord(Logger::ERROR, 'log message');
$record['extra'] = array('c' => array('key1' => 'value1', 'key2' => 'value2'));
$record['extra'] = ['c' => ['key1' => 'value1', 'key2' => 'value2']];
$handler = new StubNewRelicHandler(Logger::ERROR, true, self::$appname, true);
$handler->handle($record);
$this->assertEquals(
array('extra_c_key1' => 'value1', 'extra_c_key2' => 'value2'),
['extra_c_key1' => 'value1', 'extra_c_key2' => 'value2'],
self::$customParameters
);
}
public function testThehandlerCanAddExtraContextAndParamsToTheNewRelicTrace()
{
$record = $this->getRecord(Logger::ERROR, 'log message', array('a' => 'b'));
$record['extra'] = array('c' => 'd');
$record = $this->getRecord(Logger::ERROR, 'log message', ['a' => 'b']);
$record['extra'] = ['c' => 'd'];
$handler = new StubNewRelicHandler();
$handler->handle($record);
$expected = array(
$expected = [
'context_a' => 'b',
'extra_c' => 'd',
);
];
$this->assertEquals($expected, self::$customParameters);
}
@@ -131,7 +131,7 @@ class NewRelicHandlerTest extends TestCase
public function testTheAppNameCanBeOverriddenFromEachLog()
{
$handler = new StubNewRelicHandler(Logger::DEBUG, false, 'myAppName');
$handler->handle($this->getRecord(Logger::ERROR, 'log message', array('appname' => 'logAppName')));
$handler->handle($this->getRecord(Logger::ERROR, 'log message', ['appname' => 'logAppName']));
$this->assertEquals('logAppName', self::$appname);
}
@@ -155,7 +155,7 @@ class NewRelicHandlerTest extends TestCase
public function testTheTransactionNameCanBeOverriddenFromEachLog()
{
$handler = new StubNewRelicHandler(Logger::DEBUG, false, null, false, 'myTransaction');
$handler->handle($this->getRecord(Logger::ERROR, 'log message', array('transaction_name' => 'logTransactName')));
$handler->handle($this->getRecord(Logger::ERROR, 'log message', ['transaction_name' => 'logTransactName']));
$this->assertEquals('logTransactName', self::$transactionName);
}

86
tests/Monolog/Handler/PHPConsoleHandlerTest.php
View File

@@ -52,8 +52,8 @@ class PHPConsoleHandlerTest extends TestCase
{
return $this->getMockBuilder('PhpConsole\Dispatcher\Debug')
->disableOriginalConstructor()
->setMethods(array('dispatchDebug'))
->setConstructorArgs(array($connector, $connector->getDumper()))
->setMethods(['dispatchDebug'])
->setConstructorArgs([$connector, $connector->getDumper()])
->getMock();
}
@@ -61,8 +61,8 @@ class PHPConsoleHandlerTest extends TestCase
{
return $this->getMockBuilder('PhpConsole\Dispatcher\Errors')
->disableOriginalConstructor()
->setMethods(array('dispatchError', 'dispatchException'))
->setConstructorArgs(array($connector, $connector->getDumper()))
->setMethods(['dispatchError', 'dispatchException'])
->setConstructorArgs([$connector, $connector->getDumper()])
->getMock();
}
@@ -70,7 +70,7 @@ class PHPConsoleHandlerTest extends TestCase
{
$connector = $this->getMockBuilder('PhpConsole\Connector')
->disableOriginalConstructor()
->setMethods(array(
->setMethods([
'sendMessage',
'onShutDown',
'isActiveClient',
@@ -81,7 +81,7 @@ class PHPConsoleHandlerTest extends TestCase
'setAllowedIpMasks',
'setHeadersLimit',
'startEvalRequestsListener',
))
])
->getMock();
$connector->expects($this->any())
@@ -93,17 +93,17 @@ class PHPConsoleHandlerTest extends TestCase
protected function getHandlerDefaultOption($name)
{
$handler = new PHPConsoleHandler(array(), $this->connector);
$handler = new PHPConsoleHandler([], $this->connector);
$options = $handler->getOptions();
return $options[$name];
}
protected function initLogger($handlerOptions = array(), $level = Logger::DEBUG)
protected function initLogger($handlerOptions = [], $level = Logger::DEBUG)
{
return new Logger('test', array(
return new Logger('test', [
new PHPConsoleHandler($handlerOptions, $this->connector, $level),
));
]);
}
public function testInitWithDefaultConnector()
@@ -114,7 +114,7 @@ class PHPConsoleHandlerTest extends TestCase
public function testInitWithCustomConnector()
{
$handler = new PHPConsoleHandler(array(), $this->connector);
$handler = new PHPConsoleHandler([], $this->connector);
$this->assertEquals(spl_object_hash($this->connector), spl_object_hash($handler->getConnector()));
}
@@ -128,7 +128,7 @@ class PHPConsoleHandlerTest extends TestCase
{
$message = 'test';
$tag = 'tag';
$context = array($tag, 'custom' => mt_rand());
$context = [$tag, 'custom' => mt_rand()];
$expectedMessage = $message . ' ' . json_encode(array_slice($context, 1));
$this->debugDispatcher->expects($this->once())->method('dispatchDebug')->with(
$this->equalTo($expectedMessage),
@@ -140,7 +140,7 @@ class PHPConsoleHandlerTest extends TestCase
public function testDebugTags($tagsContextKeys = null)
{
$expectedTags = mt_rand();
$logger = $this->initLogger($tagsContextKeys ? array('debugTagsKeysInContext' => $tagsContextKeys) : array());
$logger = $this->initLogger($tagsContextKeys ? ['debugTagsKeysInContext' => $tagsContextKeys] : []);
if (!$tagsContextKeys) {
$tagsContextKeys = $this->getHandlerDefaultOption('debugTagsKeysInContext');
}
@@ -151,7 +151,7 @@ class PHPConsoleHandlerTest extends TestCase
$this->equalTo($expectedTags)
);
$this->connector->setDebugDispatcher($debugDispatcher);
$logger->debug('test', array($key => $expectedTags));
$logger->debug('test', [$key => $expectedTags]);
}
}
@@ -168,8 +168,8 @@ class PHPConsoleHandlerTest extends TestCase
$this->equalTo($line),
$classesPartialsTraceIgnore ?: $this->equalTo($this->getHandlerDefaultOption('classesPartialsTraceIgnore'))
);
$errorHandler = ErrorHandler::register($this->initLogger($classesPartialsTraceIgnore ? array('classesPartialsTraceIgnore' => $classesPartialsTraceIgnore) : array()), false);
$errorHandler->registerErrorHandler(array(), false, E_USER_WARNING);
$errorHandler = ErrorHandler::register($this->initLogger($classesPartialsTraceIgnore ? ['classesPartialsTraceIgnore' => $classesPartialsTraceIgnore] : []), false);
$errorHandler->registerErrorHandler([], false, E_USER_WARNING);
$errorHandler->handleError($code, $message, $file, $line);
}
@@ -183,7 +183,7 @@ class PHPConsoleHandlerTest extends TestCase
$handler->log(
\Psr\Log\LogLevel::ERROR,
sprintf('Uncaught Exception %s: "%s" at %s line %s', get_class($e), $e->getMessage(), $e->getFile(), $e->getLine()),
array('exception' => $e)
['exception' => $e]
);
}
@@ -192,45 +192,45 @@ class PHPConsoleHandlerTest extends TestCase
*/
public function testWrongOptionsThrowsException()
{
new PHPConsoleHandler(array('xxx' => 1));
new PHPConsoleHandler(['xxx' => 1]);
}
public function testOptionEnabled()
{
$this->debugDispatcher->expects($this->never())->method('dispatchDebug');
$this->initLogger(array('enabled' => false))->debug('test');
$this->initLogger(['enabled' => false])->debug('test');
}
public function testOptionClassesPartialsTraceIgnore()
{
$this->testError(array('Class', 'Namespace\\'));
$this->testError(['Class', 'Namespace\\']);
}
public function testOptionDebugTagsKeysInContext()
{
$this->testDebugTags(array('key1', 'key2'));
$this->testDebugTags(['key1', 'key2']);
}
public function testOptionUseOwnErrorsAndExceptionsHandler()
{
$this->initLogger(array('useOwnErrorsHandler' => true, 'useOwnExceptionsHandler' => true));
$this->assertEquals(array(VendorPhpConsoleHandler::getInstance(), 'handleError'), set_error_handler(function () {
$this->initLogger(['useOwnErrorsHandler' => true, 'useOwnExceptionsHandler' => true]);
$this->assertEquals([VendorPhpConsoleHandler::getInstance(), 'handleError'], set_error_handler(function () {
}));
$this->assertEquals(array(VendorPhpConsoleHandler::getInstance(), 'handleException'), set_exception_handler(function () {
$this->assertEquals([VendorPhpConsoleHandler::getInstance(), 'handleException'], set_exception_handler(function () {
}));
}
public static function provideConnectorMethodsOptionsSets()
{
return array(
array('sourcesBasePath', 'setSourcesBasePath', __DIR__),
array('serverEncoding', 'setServerEncoding', 'cp1251'),
array('password', 'setPassword', '******'),
array('enableSslOnlyMode', 'enableSslOnlyMode', true, false),
array('ipMasks', 'setAllowedIpMasks', array('127.0.0.*')),
array('headersLimit', 'setHeadersLimit', 2500),
array('enableEvalListener', 'startEvalRequestsListener', true, false),
);
return [
['sourcesBasePath', 'setSourcesBasePath', __DIR__],
['serverEncoding', 'setServerEncoding', 'cp1251'],
['password', 'setPassword', '******'],
['enableSslOnlyMode', 'enableSslOnlyMode', true, false],
['ipMasks', 'setAllowedIpMasks', ['127.0.0.*']],
['headersLimit', 'setHeadersLimit', 2500],
['enableEvalListener', 'startEvalRequestsListener', true, false],
];
}
/**
@@ -242,24 +242,24 @@ class PHPConsoleHandlerTest extends TestCase
if ($isArgument) {
$expectCall->with($value);
}
new PHPConsoleHandler(array($option => $value), $this->connector);
new PHPConsoleHandler([$option => $value], $this->connector);
}
public function testOptionDetectDumpTraceAndSource()
{
new PHPConsoleHandler(array('detectDumpTraceAndSource' => true), $this->connector);
new PHPConsoleHandler(['detectDumpTraceAndSource' => true], $this->connector);
$this->assertTrue($this->connector->getDebugDispatcher()->detectTraceAndSource);
}
public static function provideDumperOptionsValues()
{
return array(
array('dumperLevelLimit', 'levelLimit', 1001),
array('dumperItemsCountLimit', 'itemsCountLimit', 1002),
array('dumperItemSizeLimit', 'itemSizeLimit', 1003),
array('dumperDumpSizeLimit', 'dumpSizeLimit', 1004),
array('dumperDetectCallbacks', 'detectCallbacks', true),
);
return [
['dumperLevelLimit', 'levelLimit', 1001],
['dumperItemsCountLimit', 'itemsCountLimit', 1002],
['dumperItemSizeLimit', 'itemSizeLimit', 1003],
['dumperDumpSizeLimit', 'dumpSizeLimit', 1004],
['dumperDetectCallbacks', 'detectCallbacks', true],
];
}
/**
@@ -267,7 +267,7 @@ class PHPConsoleHandlerTest extends TestCase
*/
public function testDumperOptions($option, $dumperProperty, $value)
{
new PHPConsoleHandler(array($option => $value), $this->connector);
new PHPConsoleHandler([$option => $value], $this->connector);
$this->assertEquals($value, $this->connector->getDumper()->$dumperProperty);
}
}

18
tests/Monolog/Handler/ProcessHandlerTest.php
View File

@@ -34,15 +34,15 @@ class ProcessHandlerTest extends TestCase
*/
public function testWriteOpensProcessAndWritesToStdInOfProcess()
{
$fixtures = array(
$fixtures = [
'chuck norris',
'foobar1337'
);
'foobar1337',
];
$mockBuilder = $this->getMockBuilder('Monolog\Handler\ProcessHandler');
$mockBuilder->setMethods(array('writeProcessInput'));
$mockBuilder->setMethods(['writeProcessInput']);
// using echo as command, as it is most probably available
$mockBuilder->setConstructorArgs(array(self::DUMMY_COMMAND));
$mockBuilder->setConstructorArgs([self::DUMMY_COMMAND]);
$handler = $mockBuilder->getMock();
@@ -126,8 +126,8 @@ class ProcessHandlerTest extends TestCase
public function testStartupWithFailingToSelectErrorStreamThrowsUnexpectedValueException()
{
$mockBuilder = $this->getMockBuilder('Monolog\Handler\ProcessHandler');
$mockBuilder->setMethods(array('selectErrorStream'));
$mockBuilder->setConstructorArgs(array(self::DUMMY_COMMAND));
$mockBuilder->setMethods(['selectErrorStream']);
$mockBuilder->setConstructorArgs([self::DUMMY_COMMAND]);
$handler = $mockBuilder->getMock();
@@ -157,9 +157,9 @@ class ProcessHandlerTest extends TestCase
public function testWritingWithErrorsOnStdOutOfProcessThrowsInvalidArgumentException()
{
$mockBuilder = $this->getMockBuilder('Monolog\Handler\ProcessHandler');
$mockBuilder->setMethods(array('readProcessErrors'));
$mockBuilder->setMethods(['readProcessErrors']);
// using echo as command, as it is most probably available
$mockBuilder->setConstructorArgs(array(self::DUMMY_COMMAND));
$mockBuilder->setConstructorArgs([self::DUMMY_COMMAND]);
$handler = $mockBuilder->getMock();

8
tests/Monolog/Handler/PsrHandlerTest.php
View File

@@ -21,11 +21,11 @@ class PsrHandlerTest extends TestCase
{
public function logLevelProvider()
{
$levels = array();
$levels = [];
$monologLogger = new Logger('');
foreach ($monologLogger->getLevels() as $levelName => $level) {
$levels[] = array($levelName, $level);
$levels[] = [$levelName, $level];
}
return $levels;
@@ -37,7 +37,7 @@ class PsrHandlerTest extends TestCase
public function testHandlesAllLevels($levelName, $level)
{
$message = 'Hello, world! ' . $level;
$context = array('foo' => 'bar', 'level' => $level);
$context = ['foo' => 'bar', 'level' => $level];
$psrLogger = $this->getMock('Psr\Log\NullLogger');
$psrLogger->expects($this->once())
@@ -45,6 +45,6 @@ class PsrHandlerTest extends TestCase
->with(strtolower($levelName), $message, $context);
$handler = new PsrHandler($psrLogger);
$handler->handle(array('level' => $level, 'level_name' => $levelName, 'message' => $message, 'context' => $context));
$handler->handle(['level' => $level, 'level_name' => $levelName, 'message' => $message, 'context' => $context]);
}
}

6
tests/Monolog/Handler/PushoverHandlerTest.php
View File

@@ -103,7 +103,7 @@ class PushoverHandlerTest extends TestCase
public function testWriteToMultipleUsers()
{
$this->createHandler('myToken', array('userA', 'userB'));
$this->createHandler('myToken', ['userA', 'userB']);
$this->handler->handle($this->getRecord(Logger::EMERGENCY, 'test1'));
fseek($this->res, 0);
$content = fread($this->res, 1024);
@@ -114,11 +114,11 @@ class PushoverHandlerTest extends TestCase
private function createHandler($token = 'myToken', $user = 'myUser', $title = 'Monolog')
{
$constructorArgs = array($token, $user, $title);
$constructorArgs = [$token, $user, $title];
$this->res = fopen('php://memory', 'a');
$this->handler = $this->getMock(
'\Monolog\Handler\PushoverHandler',
array('fsockopen', 'streamSetTimeout', 'closeSocket'),
['fsockopen', 'streamSetTimeout', 'closeSocket'],
$constructorArgs
);

28
tests/Monolog/Handler/RavenHandlerTest.php
View File

@@ -78,8 +78,8 @@ class RavenHandlerTest extends TestCase
$ravenClient = $this->getRavenClient();
$handler = $this->getHandler($ravenClient);
$tags = array(1, 2, 'foo');
$record = $this->getRecord(Logger::INFO, 'test', array('tags' => $tags));
$tags = [1, 2, 'foo'];
$record = $this->getRecord(Logger::INFO, 'test', ['tags' => $tags]);
$handler->handle($record);
$this->assertEquals($tags, $ravenClient->lastData['tags']);
@@ -92,7 +92,7 @@ class RavenHandlerTest extends TestCase
$checksum = '098f6bcd4621d373cade4e832627b4f6';
$release = '05a671c66aefea124cc08b76ea6d30bb';
$record = $this->getRecord(Logger::INFO, 'test', array('checksum' => $checksum, 'release' => $release));
$record = $this->getRecord(Logger::INFO, 'test', ['checksum' => $checksum, 'release' => $release]);
$handler->handle($record);
$this->assertEquals($checksum, $ravenClient->lastData['checksum']);
@@ -104,8 +104,8 @@ class RavenHandlerTest extends TestCase
$ravenClient = $this->getRavenClient();
$handler = $this->getHandler($ravenClient);
$fingerprint = array('{{ default }}', 'other value');
$record = $this->getRecord(Logger::INFO, 'test', array('fingerprint' => $fingerprint));
$fingerprint = ['{{ default }}', 'other value'];
$record = $this->getRecord(Logger::INFO, 'test', ['fingerprint' => $fingerprint]);
$handler->handle($record);
$this->assertEquals($fingerprint, $ravenClient->lastData['fingerprint']);
@@ -119,14 +119,14 @@ class RavenHandlerTest extends TestCase
$recordWithNoContext = $this->getRecord(Logger::INFO, 'test with default user context');
// set user context 'externally'
$user = array(
$user = [
'id' => '123',
'email' => 'test@test.com',
);
];
$recordWithContext = $this->getRecord(Logger::INFO, 'test', array('user' => $user));
$recordWithContext = $this->getRecord(Logger::INFO, 'test', ['user' => $user]);
$ravenClient->user_context(array('id' => 'test_user_id'));
$ravenClient->user_context(['id' => 'test_user_id']);
// handle context
$handler->handle($recordWithContext);
$this->assertEquals($user, $ravenClient->lastData['user']);
@@ -154,7 +154,7 @@ class RavenHandlerTest extends TestCase
try {
$this->methodThatThrowsAnException();
} catch (\Exception $e) {
$record = $this->getRecord(Logger::ERROR, $e->getMessage(), array('exception' => $e));
$record = $this->getRecord(Logger::ERROR, $e->getMessage(), ['exception' => $e]);
$handler->handle($record);
}
@@ -183,13 +183,13 @@ class RavenHandlerTest extends TestCase
public function testHandleBatchDoNothingIfRecordsAreBelowLevel()
{
$records = array(
$records = [
$this->getRecord(Logger::DEBUG, 'debug message 1'),
$this->getRecord(Logger::DEBUG, 'debug message 2'),
$this->getRecord(Logger::INFO, 'information'),
);
];
$handler = $this->getMock('Monolog\Handler\RavenHandler', null, array($this->getRavenClient()));
$handler = $this->getMock('Monolog\Handler\RavenHandler', null, [$this->getRavenClient()]);
$handler->expects($this->never())->method('handle');
$handler->setLevel(Logger::ERROR);
$handler->handleBatch($records);
@@ -215,7 +215,7 @@ class RavenHandlerTest extends TestCase
$this->assertEquals($release, $ravenClient->lastData['release']);
$localRelease = 'v41.41.41';
$record = $this->getRecord(Logger::INFO, 'test', array('release' => $localRelease));
$record = $this->getRecord(Logger::INFO, 'test', ['release' => $localRelease]);
$handler->handle($record);
$this->assertEquals($localRelease, $ravenClient->lastData['release']);
}

18
tests/Monolog/Handler/RedisHandlerTest.php
View File

@@ -39,14 +39,14 @@ class RedisHandlerTest extends TestCase
public function testPredisHandle()
{
$redis = $this->getMock('Predis\Client', array('rpush'));
$redis = $this->getMock('Predis\Client', ['rpush']);
// Predis\Client uses rpush
$redis->expects($this->once())
->method('rpush')
->with('key', 'test');
$record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
$record = $this->getRecord(Logger::WARNING, 'test', ['data' => new \stdClass, 'foo' => 34]);
$handler = new RedisHandler($redis, 'key');
$handler->setFormatter(new LineFormatter("%message%"));
@@ -55,14 +55,14 @@ class RedisHandlerTest extends TestCase
public function testRedisHandle()
{
$redis = $this->getMock('Redis', array('rpush'));
$redis = $this->getMock('Redis', ['rpush']);
// Redis uses rPush
$redis->expects($this->once())
->method('rPush')
->with('key', 'test');
$record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
$record = $this->getRecord(Logger::WARNING, 'test', ['data' => new \stdClass, 'foo' => 34]);
$handler = new RedisHandler($redis, 'key');
$handler->setFormatter(new LineFormatter("%message%"));
@@ -71,7 +71,7 @@ class RedisHandlerTest extends TestCase
public function testRedisHandleCapped()
{
$redis = $this->getMock('Redis', array('multi', 'rpush', 'ltrim', 'exec'));
$redis = $this->getMock('Redis', ['multi', 'rpush', 'ltrim', 'exec']);
// Redis uses multi
$redis->expects($this->once())
@@ -90,7 +90,7 @@ class RedisHandlerTest extends TestCase
->method('exec')
->will($this->returnSelf());
$record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
$record = $this->getRecord(Logger::WARNING, 'test', ['data' => new \stdClass, 'foo' => 34]);
$handler = new RedisHandler($redis, 'key', Logger::DEBUG, true, 10);
$handler->setFormatter(new LineFormatter("%message%"));
@@ -99,9 +99,9 @@ class RedisHandlerTest extends TestCase
public function testPredisHandleCapped()
{
$redis = $this->getMock('Predis\Client', array('transaction'));
$redis = $this->getMock('Predis\Client', ['transaction']);
$redisTransaction = $this->getMock('Predis\Client', array('rpush', 'ltrim'));
$redisTransaction = $this->getMock('Predis\Client', ['rpush', 'ltrim']);
$redisTransaction->expects($this->once())
->method('rpush')
@@ -118,7 +118,7 @@ class RedisHandlerTest extends TestCase
$cb($redisTransaction);
}));
$record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
$record = $this->getRecord(Logger::WARNING, 'test', ['data' => new \stdClass, 'foo' => 34]);
$handler = new RedisHandler($redis, 'key', Logger::DEBUG, true, 10);
$handler->setFormatter(new LineFormatter("%message%"));

61
tests/Monolog/Handler/RotatingFileHandlerTest.php
View File

@@ -13,7 +13,6 @@ namespace Monolog\Handler;
use InvalidArgumentException;
use Monolog\Test\TestCase;
use PHPUnit_Framework_Error_Deprecated;
/**
* @covers Monolog\Handler\RotatingFileHandler
@@ -38,11 +37,11 @@ class RotatingFileHandlerTest extends TestCase
$this->lastError = null;
$self = $this;
// workaround with &$self used for PHP 5.3
set_error_handler(function($code, $message) use (&$self) {
$self->lastError = array(
set_error_handler(function ($code, $message) use (&$self) {
$self->lastError = [
'code' => $code,
'message' => $message,
);
];
});
}
@@ -108,32 +107,32 @@ class RotatingFileHandlerTest extends TestCase
public function rotationTests()
{
$now = time();
$dayCallback = function($ago) use ($now) {
$dayCallback = function ($ago) use ($now) {
return $now + 86400 * $ago;
};
$monthCallback = function($ago) {
$monthCallback = function ($ago) {
return gmmktime(0, 0, 0, date('n') + $ago, date('d'), date('Y'));
};
$yearCallback = function($ago) {
$yearCallback = function ($ago) {
return gmmktime(0, 0, 0, date('n'), date('d'), date('Y') + $ago);
};
return array(
return [
'Rotation is triggered when the file of the current day is not present'
=> array(true, RotatingFileHandler::FILE_PER_DAY, $dayCallback),
=> [true, RotatingFileHandler::FILE_PER_DAY, $dayCallback],
'Rotation is not triggered when the file of the current day is already present'
=> array(false, RotatingFileHandler::FILE_PER_DAY, $dayCallback),
=> [false, RotatingFileHandler::FILE_PER_DAY, $dayCallback],
'Rotation is triggered when the file of the current month is not present'
=> array(true, RotatingFileHandler::FILE_PER_MONTH, $monthCallback),
=> [true, RotatingFileHandler::FILE_PER_MONTH, $monthCallback],
'Rotation is not triggered when the file of the current month is already present'
=> array(false, RotatingFileHandler::FILE_PER_MONTH, $monthCallback),
=> [false, RotatingFileHandler::FILE_PER_MONTH, $monthCallback],
'Rotation is triggered when the file of the current year is not present'
=> array(true, RotatingFileHandler::FILE_PER_YEAR, $yearCallback),
=> [true, RotatingFileHandler::FILE_PER_YEAR, $yearCallback],
'Rotation is not triggered when the file of the current year is already present'
=> array(false, RotatingFileHandler::FILE_PER_YEAR, $yearCallback),
);
=> [false, RotatingFileHandler::FILE_PER_YEAR, $yearCallback],
];
}
/**
@@ -150,13 +149,13 @@ class RotatingFileHandlerTest extends TestCase
public function dateFormatProvider()
{
return array(
array(RotatingFileHandler::FILE_PER_DAY, true),
array(RotatingFileHandler::FILE_PER_MONTH, true),
array(RotatingFileHandler::FILE_PER_YEAR, true),
array('m-d-Y', false),
array('Y-m-d-h-i', false)
);
return [
[RotatingFileHandler::FILE_PER_DAY, true],
[RotatingFileHandler::FILE_PER_MONTH, true],
[RotatingFileHandler::FILE_PER_YEAR, true],
['m-d-Y', false],
['Y-m-d-h-i', false],
];
}
/**
@@ -174,15 +173,15 @@ class RotatingFileHandlerTest extends TestCase
public function filenameFormatProvider()
{
return array(
array('{filename}', false),
array('{filename}-{date}', true),
array('{date}', true),
array('foobar-{date}', true),
array('foo-{date}-bar', true),
array('{date}-foobar', true),
array('foobar', false),
);
return [
['{filename}', false],
['{filename}-{date}', true],
['{date}', true],
['foobar-{date}', true],
['foo-{date}-bar', true],
['{date}-foobar', true],
['foobar', false],
];
}
public function testReuseCurrentFile()

24
tests/Monolog/Handler/SlackHandlerTest.php
View File

@@ -92,25 +92,25 @@ class SlackHandlerTest extends TestCase
public function provideLevelColors()
{
return array(
array(Logger::DEBUG, '%23e3e4e6'), // escaped #e3e4e6
array(Logger::INFO, 'good'),
array(Logger::NOTICE, 'good'),
array(Logger::WARNING, 'warning'),
array(Logger::ERROR, 'danger'),
array(Logger::CRITICAL, 'danger'),
array(Logger::ALERT, 'danger'),
array(Logger::EMERGENCY,'danger'),
);
return [
[Logger::DEBUG, '%23e3e4e6'], // escaped #e3e4e6
[Logger::INFO, 'good'],
[Logger::NOTICE, 'good'],
[Logger::WARNING, 'warning'],
[Logger::ERROR, 'danger'],
[Logger::CRITICAL, 'danger'],
[Logger::ALERT, 'danger'],
[Logger::EMERGENCY,'danger'],
];
}
private function createHandler($token = 'myToken', $channel = 'channel1', $username = 'Monolog', $useAttachment = true, $iconEmoji = null, $useShortAttachment = false, $includeExtra = false)
{
$constructorArgs = array($token, $channel, $username, $useAttachment, $iconEmoji, Logger::DEBUG, true, $useShortAttachment, $includeExtra);
$constructorArgs = [$token, $channel, $username, $useAttachment, $iconEmoji, Logger::DEBUG, true, $useShortAttachment, $includeExtra];
$this->res = fopen('php://memory', 'a');
$this->handler = $this->getMock(
'\Monolog\Handler\SlackHandler',
array('fsockopen', 'streamSetTimeout', 'closeSocket'),
['fsockopen', 'streamSetTimeout', 'closeSocket'],
$constructorArgs
);

40
tests/Monolog/Handler/SocketHandlerTest.php
View File

@@ -88,7 +88,7 @@ class SocketHandlerTest extends TestCase
*/
public function testExceptionIsThrownOnFsockopenError()
{
$this->setMockHandler(array('fsockopen'));
$this->setMockHandler(['fsockopen']);
$this->handler->expects($this->once())
->method('fsockopen')
->will($this->returnValue(false));
@@ -100,7 +100,7 @@ class SocketHandlerTest extends TestCase
*/
public function testExceptionIsThrownOnPfsockopenError()
{
$this->setMockHandler(array('pfsockopen'));
$this->setMockHandler(['pfsockopen']);
$this->handler->expects($this->once())
->method('pfsockopen')
->will($this->returnValue(false));
@@ -113,7 +113,7 @@ class SocketHandlerTest extends TestCase
*/
public function testExceptionIsThrownIfCannotSetTimeout()
{
$this->setMockHandler(array('streamSetTimeout'));
$this->setMockHandler(['streamSetTimeout']);
$this->handler->expects($this->once())
->method('streamSetTimeout')
->will($this->returnValue(false));
@@ -125,13 +125,13 @@ class SocketHandlerTest extends TestCase
*/
public function testWriteFailsOnIfFwriteReturnsFalse()
{
$this->setMockHandler(array('fwrite'));
$this->setMockHandler(['fwrite']);
$callback = function ($arg) {
$map = array(
$map = [
'Hello world' => 6,
'world' => false,
);
];
return $map[$arg];
};
@@ -148,13 +148,13 @@ class SocketHandlerTest extends TestCase
*/
public function testWriteFailsIfStreamTimesOut()
{
$this->setMockHandler(array('fwrite', 'streamGetMetadata'));
$this->setMockHandler(['fwrite', 'streamGetMetadata']);
$callback = function ($arg) {
$map = array(
$map = [
'Hello world' => 6,
'world' => 5,
);
];
return $map[$arg];
};
@@ -164,7 +164,7 @@ class SocketHandlerTest extends TestCase
->will($this->returnCallback($callback));
$this->handler->expects($this->exactly(1))
->method('streamGetMetadata')
->will($this->returnValue(array('timed_out' => true)));
->will($this->returnValue(['timed_out' => true]));
$this->writeRecord('Hello world');
}
@@ -174,7 +174,7 @@ class SocketHandlerTest extends TestCase
*/
public function testWriteFailsOnIncompleteWrite()
{
$this->setMockHandler(array('fwrite', 'streamGetMetadata'));
$this->setMockHandler(['fwrite', 'streamGetMetadata']);
$res = $this->res;
$callback = function ($string) use ($res) {
@@ -188,7 +188,7 @@ class SocketHandlerTest extends TestCase
->will($this->returnCallback($callback));
$this->handler->expects($this->exactly(1))
->method('streamGetMetadata')
->will($this->returnValue(array('timed_out' => false)));
->will($this->returnValue(['timed_out' => false]));
$this->writeRecord('Hello world');
}
@@ -205,13 +205,13 @@ class SocketHandlerTest extends TestCase
public function testWriteWithMock()
{
$this->setMockHandler(array('fwrite'));
$this->setMockHandler(['fwrite']);
$callback = function ($arg) {
$map = array(
$map = [
'Hello world' => 6,
'world' => 5,
);
];
return $map[$arg];
};
@@ -247,7 +247,7 @@ class SocketHandlerTest extends TestCase
*/
public function testAvoidInfiniteLoopWhenNoDataIsWrittenForAWritingTimeoutSeconds()
{
$this->setMockHandler(array('fwrite', 'streamGetMetadata'));
$this->setMockHandler(['fwrite', 'streamGetMetadata']);
$this->handler->expects($this->any())
->method('fwrite')
@@ -255,7 +255,7 @@ class SocketHandlerTest extends TestCase
$this->handler->expects($this->any())
->method('streamGetMetadata')
->will($this->returnValue(array('timed_out' => false)));
->will($this->returnValue(['timed_out' => false]));
$this->handler->setWritingTimeout(1);
@@ -273,17 +273,17 @@ class SocketHandlerTest extends TestCase
$this->handler->handle($this->getRecord(Logger::WARNING, $string));
}
private function setMockHandler(array $methods = array())
private function setMockHandler(array $methods = [])
{
$this->res = fopen('php://memory', 'a');
$defaultMethods = array('fsockopen', 'pfsockopen', 'streamSetTimeout');
$defaultMethods = ['fsockopen', 'pfsockopen', 'streamSetTimeout'];
$newMethods = array_diff($methods, $defaultMethods);
$finalMethods = array_merge($defaultMethods, $newMethods);
$this->handler = $this->getMock(
'\Monolog\Handler\SocketHandler', $finalMethods, array('localhost:1234')
'\Monolog\Handler\SocketHandler', $finalMethods, ['localhost:1234']
);
if (!in_array('fsockopen', $methods)) {

10
tests/Monolog/Handler/StreamHandlerTest.php
View File

@@ -93,11 +93,11 @@ class StreamHandlerTest extends TestCase
public function invalidArgumentProvider()
{
return array(
array(1),
array(array()),
array(array('bogus://url')),
);
return [
[1],
[[]],
[['bogus://url']],
];
}
/**

19
tests/Monolog/Handler/SwiftMailerHandlerTest.php
View File

@@ -37,10 +37,10 @@ class SwiftMailerHandlerTest extends TestCase
};
$handler = new SwiftMailerHandler($this->mailer, $callback);
$records = array(
$records = [
$this->getRecord(Logger::DEBUG),
$this->getRecord(Logger::INFO),
);
];
$handler->handleBatch($records);
}
@@ -66,9 +66,9 @@ class SwiftMailerHandlerTest extends TestCase
$handler = new SwiftMailerHandler($this->mailer, $callback);
// Logging 1 record makes this an Emergency
$records = array(
$records = [
$this->getRecord(Logger::EMERGENCY),
);
];
$handler->handleBatch($records);
}
@@ -83,14 +83,15 @@ class SwiftMailerHandlerTest extends TestCase
->method('send')
->with($this->callback(function ($value) use (&$receivedMessage) {
$receivedMessage = $value;
return true;
}));
$handler = new SwiftMailerHandler($this->mailer, $messageTemplate);
$records = array(
$records = [
$this->getRecord(Logger::EMERGENCY),
);
];
$handler->handleBatch($records);
$this->assertEquals('Alert: EMERGENCY test', $receivedMessage->getSubject());
@@ -103,10 +104,10 @@ class SwiftMailerHandlerTest extends TestCase
$method = new \ReflectionMethod('Monolog\Handler\SwiftMailerHandler', 'buildMessage');
$method->setAccessible(true);
$method->invokeArgs($handler, array($messageTemplate, array()));
$method->invokeArgs($handler, [$messageTemplate, []]);
$builtMessage1 = $method->invoke($handler, $messageTemplate, array());
$builtMessage2 = $method->invoke($handler, $messageTemplate, array());
$builtMessage1 = $method->invoke($handler, $messageTemplate, []);
$builtMessage2 = $method->invoke($handler, $messageTemplate, []);
$this->assertFalse($builtMessage1->getId() === $builtMessage2->getId(), 'Two different messages have the same id');
}

4
tests/Monolog/Handler/SyslogUdpHandlerTest.php
View File

@@ -29,7 +29,7 @@ class SyslogUdpHandlerTest extends \PHPUnit_Framework_TestCase
$handler = new SyslogUdpHandler("127.0.0.1", 514, "authpriv");
$handler->setFormatter(new \Monolog\Formatter\ChromePHPFormatter());
$socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', array('write'), array('lol', 'lol'));
$socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', ['write'], ['lol', 'lol']);
$socket->expects($this->at(0))
->method('write')
->with("lol", "<".(LOG_AUTHPRIV + LOG_WARNING).">1 ");
@@ -44,6 +44,6 @@ class SyslogUdpHandlerTest extends \PHPUnit_Framework_TestCase
protected function getRecordWithMessage($msg)
{
return array('message' => $msg, 'level' => \Monolog\Logger::WARNING, 'context' => null, 'extra' => array(), 'channel' => 'lol');
return ['message' => $msg, 'level' => \Monolog\Logger::WARNING, 'context' => null, 'extra' => [], 'channel' => 'lol'];
}
}

22
tests/Monolog/Handler/TestHandlerTest.php
View File

@@ -47,20 +47,20 @@ class TestHandlerTest extends TestCase
$records = $handler->getRecords();
unset($records[0]['formatted']);
$this->assertEquals(array($record), $records);
$this->assertEquals([$record], $records);
}
public function methodProvider()
{
return array(
array('Emergency', Logger::EMERGENCY),
array('Alert' , Logger::ALERT),
array('Critical' , Logger::CRITICAL),
array('Error' , Logger::ERROR),
array('Warning' , Logger::WARNING),
array('Info' , Logger::INFO),
array('Notice' , Logger::NOTICE),
array('Debug' , Logger::DEBUG),
);
return [
['Emergency', Logger::EMERGENCY],
['Alert' , Logger::ALERT],
['Critical' , Logger::CRITICAL],
['Error' , Logger::ERROR],
['Warning' , Logger::WARNING],
['Info' , Logger::INFO],
['Notice' , Logger::NOTICE],
['Debug' , Logger::DEBUG],
];
}
}

4
tests/Monolog/Handler/UdpSocketTest.php
View File

@@ -21,7 +21,7 @@ class UdpSocketTest extends TestCase
{
public function testWeDoNotTruncateShortMessages()
{
$socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', array('send'), array('lol', 'lol'));
$socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', ['send'], ['lol', 'lol']);
$socket->expects($this->at(0))
->method('send')
@@ -32,7 +32,7 @@ class UdpSocketTest extends TestCase
public function testLongMessagesAreTruncated()
{
$socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', array('send'), array('lol', 'lol'));
$socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', ['send'], ['lol', 'lol']);
$truncatedString = str_repeat("derp", 16254).'d';

14
tests/Monolog/Handler/WhatFailureGroupHandlerTest.php
View File

@@ -22,7 +22,7 @@ class WhatFailureGroupHandlerTest extends TestCase
*/
public function testConstructorOnlyTakesHandler()
{
new WhatFailureGroupHandler(array(new TestHandler(), "foo"));
new WhatFailureGroupHandler([new TestHandler(), "foo"]);
}
/**
@@ -31,7 +31,7 @@ class WhatFailureGroupHandlerTest extends TestCase
*/
public function testHandle()
{
$testHandlers = array(new TestHandler(), new TestHandler());
$testHandlers = [new TestHandler(), new TestHandler()];
$handler = new WhatFailureGroupHandler($testHandlers);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::INFO));
@@ -47,9 +47,9 @@ class WhatFailureGroupHandlerTest extends TestCase
*/
public function testHandleBatch()
{
$testHandlers = array(new TestHandler(), new TestHandler());
$testHandlers = [new TestHandler(), new TestHandler()];
$handler = new WhatFailureGroupHandler($testHandlers);
$handler->handleBatch(array($this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO)));
$handler->handleBatch([$this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO)]);
foreach ($testHandlers as $test) {
$this->assertTrue($test->hasDebugRecords());
$this->assertTrue($test->hasInfoRecords());
@@ -62,7 +62,7 @@ class WhatFailureGroupHandlerTest extends TestCase
*/
public function testIsHandling()
{
$testHandlers = array(new TestHandler(Logger::ERROR), new TestHandler(Logger::WARNING));
$testHandlers = [new TestHandler(Logger::ERROR), new TestHandler(Logger::WARNING)];
$handler = new WhatFailureGroupHandler($testHandlers);
$this->assertTrue($handler->isHandling($this->getRecord(Logger::ERROR)));
$this->assertTrue($handler->isHandling($this->getRecord(Logger::WARNING)));
@@ -75,7 +75,7 @@ class WhatFailureGroupHandlerTest extends TestCase
public function testHandleUsesProcessors()
{
$test = new TestHandler();
$handler = new WhatFailureGroupHandler(array($test));
$handler = new WhatFailureGroupHandler([$test]);
$handler->pushProcessor(function ($record) {
$record['extra']['foo'] = true;
@@ -94,7 +94,7 @@ class WhatFailureGroupHandlerTest extends TestCase
{
$test = new TestHandler();
$exception = new ExceptionTestHandler();
$handler = new WhatFailureGroupHandler(array($exception, $test, $exception));
$handler = new WhatFailureGroupHandler([$exception, $test, $exception]);
$handler->pushProcessor(function ($record) {
$record['extra']['foo'] = true;

6
tests/Monolog/Handler/ZendMonitorHandlerTest.php
View File

@@ -29,12 +29,12 @@ class ZendMonitorHandlerTest extends TestCase
public function testWrite()
{
$record = $this->getRecord();
$formatterResult = array(
$formatterResult = [
'message' => $record['message'],
);
];
$zendMonitor = $this->getMockBuilder('Monolog\Handler\ZendMonitorHandler')
->setMethods(array('writeZendMonitorCustomEvent', 'getDefaultFormatter'))
->setMethods(['writeZendMonitorCustomEvent', 'getDefaultFormatter'])
->getMock();
$formatterMock = $this->getMockBuilder('Monolog\Formatter\NormalizerFormatter')

54
tests/Monolog/LoggerTest.php
View File

@@ -38,7 +38,7 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
*/
public function testWithName()
{
$first = new Logger('first', array($handler = new TestHandler()));
$first = new Logger('first', [$handler = new TestHandler()]);
$second = $first->withName('second');
$this->assertSame('first', $first->getName());
@@ -90,7 +90,7 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
{
$logger = new Logger(__METHOD__);
$handler = $this->getMock('Monolog\Handler\NullHandler', array('handle'));
$handler = $this->getMock('Monolog\Handler\NullHandler', ['handle']);
$handler->expects($this->once())
->method('handle');
$logger->pushHandler($handler);
@@ -105,7 +105,7 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
{
$logger = new Logger(__METHOD__);
$handler = $this->getMock('Monolog\Handler\NullHandler', array('handle'), array(Logger::ERROR));
$handler = $this->getMock('Monolog\Handler\NullHandler', ['handle'], [Logger::ERROR]);
$handler->expects($this->never())
->method('handle');
$logger->pushHandler($handler);
@@ -117,7 +117,7 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
{
$handler1 = new TestHandler;
$handler2 = new TestHandler;
$logger = new Logger(__METHOD__, array($handler1, $handler2));
$logger = new Logger(__METHOD__, [$handler1, $handler2]);
$this->assertEquals($handler1, $logger->popHandler());
$this->assertEquals($handler2, $logger->popHandler());
@@ -127,7 +127,7 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
{
$processor1 = new WebProcessor;
$processor2 = new WebProcessor;
$logger = new Logger(__METHOD__, array(), array($processor1, $processor2));
$logger = new Logger(__METHOD__, [], [$processor1, $processor2]);
$this->assertEquals($processor1, $logger->popProcessor());
$this->assertEquals($processor2, $logger->popProcessor());
@@ -162,18 +162,18 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
$handler2 = new TestHandler;
$logger->pushHandler($handler1);
$logger->setHandlers(array($handler2));
$logger->setHandlers([$handler2]);
// handler1 has been removed
$this->assertEquals(array($handler2), $logger->getHandlers());
$this->assertEquals([$handler2], $logger->getHandlers());
$logger->setHandlers(array(
$logger->setHandlers([
"AMapKey" => $handler1,
"Woop" => $handler2,
));
]);
// Keys have been scrubbed
$this->assertEquals(array($handler1, $handler2), $logger->getHandlers());
$this->assertEquals([$handler1, $handler2], $logger->getHandlers());
}
/**
@@ -232,7 +232,7 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
$processor = $this->getMockBuilder('Monolog\Processor\WebProcessor')
->disableOriginalConstructor()
->setMethods(array('__invoke'))
->setMethods(['__invoke'])
->getMock()
;
$processor->expects($this->once())
@@ -339,7 +339,7 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
->method('handle')
;
$logger = new Logger(__METHOD__, array('last' => $handler3, 'second' => $handler2, 'first' => $handler1));
$logger = new Logger(__METHOD__, ['last' => $handler3, 'second' => $handler2, 'first' => $handler1]);
$logger->debug('test');
}
@@ -456,17 +456,17 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
public function logMethodProvider()
{
return array(
return [
// PSR-3 methods
array('debug', Logger::DEBUG),
array('info', Logger::INFO),
array('notice', Logger::NOTICE),
array('warning', Logger::WARNING),
array('error', Logger::ERROR),
array('critical', Logger::CRITICAL),
array('alert', Logger::ALERT),
array('emergency', Logger::EMERGENCY),
);
['debug', Logger::DEBUG],
['info', Logger::INFO],
['notice', Logger::NOTICE],
['warning', Logger::WARNING],
['error', Logger::ERROR],
['critical', Logger::CRITICAL],
['alert', Logger::ALERT],
['emergency', Logger::EMERGENCY],
];
}
/**
@@ -487,7 +487,7 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
public function setTimezoneProvider()
{
return array_map(
function ($tz) { return array(new \DateTimeZone($tz)); },
function ($tz) { return [new \DateTimeZone($tz)]; },
\DateTimeZone::listIdentifiers()
);
}
@@ -510,10 +510,10 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
public function useMicrosecondTimestampsProvider()
{
return array(
return [
// this has a very small chance of a false negative (1/10^6)
'with microseconds' => array(true, 'assertNotSame'),
'without microseconds' => array(false, 'assertSame'),
);
'with microseconds' => [true, 'assertNotSame'],
'without microseconds' => [false, 'assertSame'],
];
}
}

26
tests/Monolog/Processor/IntrospectionProcessorTest.php
View File

@@ -66,10 +66,10 @@ class IntrospectionProcessorTest extends TestCase
public function testLevelTooLow()
{
$input = array(
$input = [
'level' => Logger::DEBUG,
'extra' => array(),
);
'extra' => [],
];
$expected = $input;
@@ -81,18 +81,18 @@ class IntrospectionProcessorTest extends TestCase
public function testLevelEqual()
{
$input = array(
$input = [
'level' => Logger::CRITICAL,
'extra' => array(),
);
'extra' => [],
];
$expected = $input;
$expected['extra'] = array(
$expected['extra'] = [
'file' => null,
'line' => null,
'class' => 'ReflectionMethod',
'function' => 'invokeArgs',
);
];
$processor = new IntrospectionProcessor(Logger::CRITICAL);
$actual = $processor($input);
@@ -102,18 +102,18 @@ class IntrospectionProcessorTest extends TestCase
public function testLevelHigher()
{
$input = array(
$input = [
'level' => Logger::EMERGENCY,
'extra' => array(),
);
'extra' => [],
];
$expected = $input;
$expected['extra'] = array(
$expected['extra'] = [
'file' => null,
'line' => null,
'class' => 'ReflectionMethod',
'function' => 'invokeArgs',
);
];
$processor = new IntrospectionProcessor(Logger::CRITICAL);
$actual = $processor($input);

26
tests/Monolog/Processor/PsrLogMessageProcessorTest.php
View File

@@ -20,24 +20,24 @@ class PsrLogMessageProcessorTest extends \PHPUnit_Framework_TestCase
{
$proc = new PsrLogMessageProcessor;
$message = $proc(array(
$message = $proc([
'message' => '{foo}',
'context' => array('foo' => $val),
));
'context' => ['foo' => $val],
]);
$this->assertEquals($expected, $message['message']);
}
public function getPairs()
{
return array(
array('foo', 'foo'),
array('3', '3'),
array(3, '3'),
array(null, ''),
array(true, '1'),
array(false, ''),
array(new \stdClass, '[object stdClass]'),
array(array(), '[array]'),
);
return [
['foo', 'foo'],
['3', '3'],
[3, '3'],
[null, ''],
[true, '1'],
[false, ''],
[new \stdClass, '[object stdClass]'],
[[], '[array]'],
];
}
}

12
tests/Monolog/Processor/TagProcessorTest.php
View File

@@ -20,7 +20,7 @@ class TagProcessorTest extends TestCase
*/
public function testProcessor()
{
$tags = array(1, 2, 3);
$tags = [1, 2, 3];
$processor = new TagProcessor($tags);
$record = $processor($this->getRecord());
@@ -32,18 +32,18 @@ class TagProcessorTest extends TestCase
*/
public function testProcessorTagModification()
{
$tags = array(1, 2, 3);
$tags = [1, 2, 3];
$processor = new TagProcessor($tags);
$record = $processor($this->getRecord());
$this->assertEquals($tags, $record['extra']['tags']);
$processor->setTags(array('a', 'b'));
$processor->setTags(['a', 'b']);
$record = $processor($this->getRecord());
$this->assertEquals(array('a', 'b'), $record['extra']['tags']);
$this->assertEquals(['a', 'b'], $record['extra']['tags']);
$processor->addTags(array('a', 'c', 'foo' => 'bar'));
$processor->addTags(['a', 'c', 'foo' => 'bar']);
$record = $processor($this->getRecord());
$this->assertEquals(array('a', 'b', 'a', 'c', 'foo' => 'bar'), $record['extra']['tags']);
$this->assertEquals(['a', 'b', 'a', 'c', 'foo' => 'bar'], $record['extra']['tags']);
}
}

32
tests/Monolog/Processor/WebProcessorTest.php
View File

@@ -17,14 +17,14 @@ class WebProcessorTest extends TestCase
{
public function testProcessor()
{
$server = array(
$server = [
'REQUEST_URI' => 'A',
'REMOTE_ADDR' => 'B',
'REQUEST_METHOD' => 'C',
'HTTP_REFERER' => 'D',
'SERVER_NAME' => 'F',
'UNIQUE_ID' => 'G',
);
];
$processor = new WebProcessor($server);
$record = $processor($this->getRecord());
@@ -38,10 +38,10 @@ class WebProcessorTest extends TestCase
public function testProcessorDoNothingIfNoRequestUri()
{
$server = array(
$server = [
'REMOTE_ADDR' => 'B',
'REQUEST_METHOD' => 'C',
);
];
$processor = new WebProcessor($server);
$record = $processor($this->getRecord());
$this->assertEmpty($record['extra']);
@@ -49,12 +49,12 @@ class WebProcessorTest extends TestCase
public function testProcessorReturnNullIfNoHttpReferer()
{
$server = array(
$server = [
'REQUEST_URI' => 'A',
'REMOTE_ADDR' => 'B',
'REQUEST_METHOD' => 'C',
'SERVER_NAME' => 'F',
);
];
$processor = new WebProcessor($server);
$record = $processor($this->getRecord());
$this->assertNull($record['extra']['referrer']);
@@ -62,12 +62,12 @@ class WebProcessorTest extends TestCase
public function testProcessorDoesNotAddUniqueIdIfNotPresent()
{
$server = array(
$server = [
'REQUEST_URI' => 'A',
'REMOTE_ADDR' => 'B',
'REQUEST_METHOD' => 'C',
'SERVER_NAME' => 'F',
);
];
$processor = new WebProcessor($server);
$record = $processor($this->getRecord());
$this->assertFalse(isset($record['extra']['unique_id']));
@@ -75,32 +75,32 @@ class WebProcessorTest extends TestCase
public function testProcessorAddsOnlyRequestedExtraFields()
{
$server = array(
$server = [
'REQUEST_URI' => 'A',
'REMOTE_ADDR' => 'B',
'REQUEST_METHOD' => 'C',
'SERVER_NAME' => 'F',
);
];
$processor = new WebProcessor($server, array('url', 'http_method'));
$processor = new WebProcessor($server, ['url', 'http_method']);
$record = $processor($this->getRecord());
$this->assertSame(array('url' => 'A', 'http_method' => 'C'), $record['extra']);
$this->assertSame(['url' => 'A', 'http_method' => 'C'], $record['extra']);
}
public function testProcessorConfiguringOfExtraFields()
{
$server = array(
$server = [
'REQUEST_URI' => 'A',
'REMOTE_ADDR' => 'B',
'REQUEST_METHOD' => 'C',
'SERVER_NAME' => 'F',
);
];
$processor = new WebProcessor($server, array('url' => 'REMOTE_ADDR'));
$processor = new WebProcessor($server, ['url' => 'REMOTE_ADDR']);
$record = $processor($this->getRecord());
$this->assertSame(array('url' => 'B'), $record['extra']);
$this->assertSame(['url' => 'B'], $record['extra']);
}
/**

42
tests/Monolog/RegistryTest.php
View File

@@ -38,26 +38,26 @@ class RegistryTest extends \PHPUnit_Framework_TestCase
$logger2 = new Logger('test2');
$logger3 = new Logger('test3');
return array(
return [
// only instances
array(
array($logger1),
array($logger1, $logger2),
array(true, false),
),
[
[$logger1],
[$logger1, $logger2],
[true, false],
],
// only names
array(
array($logger1),
array('test1', 'test2'),
array(true, false),
),
[
[$logger1],
['test1', 'test2'],
[true, false],
],
// mixed case
array(
array($logger1, $logger2),
array('test1', $logger2, 'test3', $logger3),
array(true, true, false, false),
),
);
[
[$logger1, $logger2],
['test1', $logger2, 'test3', $logger3],
[true, true, false, false],
],
];
}
/**
@@ -90,10 +90,10 @@ class RegistryTest extends \PHPUnit_Framework_TestCase
{
$logger1 = new Logger('test1');
return array(
array($logger1, $logger1),
array($logger1, 'test1'),
);
return [
[$logger1, $logger1],
[$logger1, 'test1'],
];
}
/**