8000 bug #32219 Make BuferringLogger classes internal and final (fabpot) · symfony/symfony@acd7bd6 · GitHub
[go: up one dir, main page]
Skip to content

Commit acd7bd6

Browse files
fabpotfabpot
committed
bug #32219 Make BuferringLogger classes internal and final (fabpot)
This PR was merged into the 4.4 branch. Discussion ---------- Make BuferringLogger classes internal and final | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | BC breaks? | no <!-- see https://symfony.com/bc --> | Deprecations? | yes <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tests pass? | yes <!-- please add some, will be required by reviewers --> | Fixed tickets | n/a | License | MIT | Doc PR | n/a The `BufferingLogger` classes are internal code that nobody should use directly. Let's make it clear. Commits ------- 7dd391e made BuferringLogger classes internal and final
2 parents 13a5e2d + 7dd391e commit acd7bd6

File tree

4 files changed

+38
-10
lines changed

4 files changed

+38
-10
lines changed

‎src/Symfony/Component/Debug/BufferingLogger.php

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,31 @@
1111

1212
namespace Symfony\Component\Debug;
1313

14-
use Symfony\Component\ErrorHandler\BufferingLogger as BaseBufferingLogger;
14+
@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.4 and will be removed in 5.0.', BufferingLogger::class), E_USER_DEPRECATED);
1515

16-
@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.4, use "%s" instead.', BufferingLogger::class, BaseBufferingLogger::class), E_USER_DEPRECATED);
16+
use Psr\Log\AbstractLogger;
1717

1818
/**
19-
* @deprecated since Symfony 4.4, use Symfony\Component\ErrorHandler\BufferingLogger instead.
19+
* A buffering logger that stacks logs for later.
20+
*
21+
* @author Nicolas Grekas <p@tchwork.com>
22+
*
23+
* @deprecated since Symfony 4.4 and will be removed in 5.0.
2024
*/
21-
class BufferingLogger extends BaseBufferingLogger
25+
class BufferingLogger extends AbstractLogger
2226
{
27+
private $logs = [];
28+
29+
public function log($level, $message, array $context = [])
30+
{
31+
$this->logs[] = [$level, $message, $context];
32+
}
33+
34+
public function cleanLogs()
35+
{
36+
$logs = $this->logs;
37+
$this->logs = [];
38+
39+
return $logs;
40+
}
2341
}

‎src/Symfony/Component/ErrorHandler/BufferingLogger.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*
1919
* @author Nicolas Grekas <p@tchwork.com>
2020
*/
21-
class BufferingLogger extends AbstractLogger
21+
final class BufferingLogger extends AbstractLogger
2222
{
2323
private $logs = [];
2424

@@ -27,7 +27,7 @@ public function log($level, $message, array $context = [])
2727
$this->logs[] = [$level, $message, $context];
2828
}
2929

30-
public function cleanLogs()
30+
public function cleanLogs(): array
3131
{
3232
$logs = $this->logs;
3333
$this->logs = [];

‎src/Symfony/Component/ErrorHandler/Tests/Fixtures/LoggerThatSetAnErrorHandler.php

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,24 @@
22

33
namespace Symfony\Component\ErrorHandler\Tests\Fixtures;
44

5-
use Symfony\Component\ErrorHandler\BufferingLogger;
5+
use Psr\Log\AbstractLogger;
66

7-
class LoggerThatSetAnErrorHandler extends BufferingLogger
7+
class LoggerThatSetAnErrorHandler extends AbstractLogger
88
{
9+
private $logs = [];
10+
911
public function log($level, $message, array $context = [])
1012
{
1113
set_error_handler('is_string');
12-
parent::log($level, $message, $context);
14+
$this->logs[] = [$level, $message, $context];
1315
restore_error_handler();
1416
}
17+
18+
public function cleanLogs(): array
19+
{
20+
$logs = $this->logs;
21+
$this->logs = [];
22+
23+
return $logs;
24+
}
1525
}

‎src/Symfony/Component/ErrorHandler/Tests/Fixtures2/RequiredTwice.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Symfony\Component\Debug\Tests\Fixtures2;
3+
namespace Symfony\Component\ErrorHandler\Tests\Fixtures2;
44

55
class RequiredTwice
66
{

0 commit comments

Comments
 (0)
0