Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 571cc33

Browse files
SeldaekSeldaek
committed
Fix processor tests on Monolog 3.x
1 parent 9a27b16 commit 571cc33

File tree

5 files changed

+20
-49
lines changed

5 files changed

+20
-49
lines changed

‎src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function testConstructor()
4242
public function testIsHandling()
4343
{
4444
$handler = new ConsoleHandler();
45-
$this->assertFalse($handler->isHandling([]), '->isHandling returns false when no output is set');
45+
$this->assertFalse($handler->isHandling(RecordFactory::create()), '->isHandling returns false when no output is set');
4646
}
4747

4848
/**

‎src/Symfony/Bridge/Monolog/Tests/Processor/ConsoleCommandProcessorTest.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Bridge\Monolog\Processor\ConsoleCommandProcessor;
16+
use Symfony\Bridge\Monolog\Tests\RecordFactory;
1617
use Symfony\Component\Console\Command\Command;
1718
use Symfony\Component\Console\Event\ConsoleEvent;
1819
use Symfony\Component\Console\Input\InputInterface;
@@ -29,7 +30,7 @@ public function testProcessor()
2930
$processor = new ConsoleCommandProcessor();
3031
$processor->addCommandData($this->getConsoleEvent());
3132

32-
$record = $processor(['extra' => []]);
33+
$record = $processor(RecordFactory::create());
3334

3435
$this->assertArrayHasKey('command', $record['extra']);
3536
$this->assertEquals(
@@ -43,7 +44,7 @@ public function testProcessorWithOptions()
4344
$processor = new ConsoleCommandProcessor(true, true);
4445
$processor->addCommandData($this->getConsoleEvent());
4546

46-
$record = $processor(['extra' => []]);
47+
$record = $processor(RecordFactory::create());
4748

4849
$this->assertArrayHasKey('command', $record['extra']);
4950
$this->assertEquals(
@@ -56,8 +57,8 @@ public function testProcessorDoesNothingWhenNotInConsole()
5657
{
5758
$processor = new ConsoleCommandProcessor(true, true);
5859

59-
$record = $processor(['extra' => []]);
60-
$this->assertEquals(['extra' => []], $record);
60+
$record = $processor(RecordFactory::create());
61+
$this->assertEquals([], $record['extra']);
6162
}
6263

6364
private function getConsoleEvent(): ConsoleEvent

‎src/Symfony/Bridge/Monolog/Tests/Processor/DebugProcessorTest.php

Lines changed: 10 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -12,59 +12,35 @@
1212
namespace Symfony\Bridge\Monolog\Tests\Processor;
1313

1414
use Monolog\Logger;
15+
use Monolog\LogRecord;
1516
use PHPUnit\Framework\TestCase;
1617
use Symfony\Bridge\Monolog\Processor\DebugProcessor;
18+
use Symfony\Bridge\Monolog\Tests\RecordFactory;
1719
use Symfony\Component\HttpFoundation\Request;
1820
use Symfony\Component\HttpFoundation\RequestStack;
1921

2022
class DebugProcessorTest extends TestCase
2123
{
22-
/**
23-
* @dataProvider providerDatetimeFormatTests
24-
*/
25-
public function testDatetimeFormat(array $record, $expectedTimestamp)
24+
public function testDatetimeFormat()
2625
{
26+
$record = RecordFactory::create(datetime: new \DateTimeImmutable('2019-01-01T00:01:00+00:00'));
2727
$processor = new DebugProcessor();
2828
$processor($record);
2929

3030
$records = $processor->getLogs();
3131
self::assertCount(1, $records);
32-
self::assertSame($expectedTimestamp, $records[0]['timestamp']);
32+
self::assertSame(1546300860, $records[0]['timestamp']);
3333
}
3434

35-
public function providerDatetimeFormatTests(): array
36-
{
37-
$record = $this->getRecord();
38-
39-
return [
40-
[array_merge($record, ['datetime' => new \DateTime('2019-01-01T00:01:00+00:00')]), 1546300860],
41-
[array_merge($record, ['datetime' => '2019-01-01T00:01:00+00:00']), 1546300860],
42-
[array_merge($record, ['datetime' => 'foo']), false],
43-
];
44-
}
45-
46-
/**
47-
* @dataProvider providerDatetimeRfc3339FormatTests
48-
*/
49-
public function testDatetimeRfc3339Format(array $record, $expectedTimestamp)
35+
public function testDatetimeRfc3339Format()
5036
{
37+
$record = RecordFactory::create(datetime: new \DateTimeImmutable('2019-01-01T00:01:00+00:00'));
5138
$processor = new DebugProcessor();
5239
$processor($record);
5340

5441
$records = $processor->getLogs();
5542
self::assertCount(1, $records);
56-
self::assertSame($expectedTimestamp, $records[0]['timestamp_rfc3339']);
57-
}
58-
59-
public function providerDatetimeRfc3339FormatTests(): array
60-
{
61-
$record = $this->getRecord();
62-
63-
return [
64-
[array_merge($record, ['datetime' => new \DateTime('2019-01-01T00:01:00+00:00')]), '2019-01-01T00:01:00.000+00:00'],
65-
[array_merge($record, ['datetime' => '2019-01-01T00:01:00+00:00']), '2019-01-01T00:01:00.000+00:00'],
66-
[array_merge($record, ['datetime' => 'foo']), false],
67-
];
43+
self::assertSame('2019-01-01T00:01:00.000+00:00', $records[0]['timestamp_rfc3339']);
6844
}
6945

7046
public function testDebugProcessor()
@@ -123,16 +99,8 @@ public function testInheritedClassCallCountErrorsWithoutArgument()
12399
$this->assertEquals(0, $debugProcessorChild->countErrors());
124100
}
125101

126-
private function getRecord($level = Logger::WARNING, $message = 'test'): array
102+
private function getRecord($level = Logger::WARNING, $message = 'test'): array|LogRecord
127103
{
128-
return [
129-
'message' => $message,
130-
'context' => [],
131-
'level' => $level,
132-
'level_name' => Logger::getLevelName($level),
133-
'channel' => 'test',
134-
'datetime' => new \DateTime(),
135-
'extra' => [],
136-
];
104+
return RecordFactory::create($level, $message);
137105
}
138106
}

‎src/Symfony/Bridge/Monolog/Tests/Processor/SwitchUserTokenProcessorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Bridge\Monolog\Processor\SwitchUserTokenProcessor;
16+
use Symfony\Bridge\Monolog\Tests\RecordFactory;
1617
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
1718
use Symfony\Component\Security\Core\Authentication\Token\SwitchUserToken;
1819
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
@@ -33,7 +34,7 @@ public function testProcessor()
3334
$tokenStorage->method('getToken')->willReturn($switchUserToken);
3435

3536
$processor = new SwitchUserTokenProcessor($tokenStorage);
36-
$record = ['extra' => []];
37+
$record = RecordFactory::create();
3738
$record = $processor($record);
3839

3940
$expected = [

‎src/Symfony/Bridge/Monolog/Tests/Processor/TokenProcessorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Bridge\Monolog\Processor\TokenProcessor;
16+
use Symfony\Bridge\Monolog\Tests\RecordFactory;
1617
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
1718
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
1819
use Symfony\Component\Security\Core\User\InMemoryUser;
@@ -31,7 +32,7 @@ public function testProcessor()
3132
$tokenStorage->method('getToken')->willReturn($token);
3233

3334
$processor = new TokenProcessor($tokenStorage);
34-
$record = ['extra' => []];
35+
$record = RecordFactory::create();
3536
$record = $processor($record);
3637

3738
$this->assertArrayHasKey('token', $record['extra']);

0 commit comments

Comments
 (0)