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

Skip to content

Commit 39fb557

Browse files
derrabusderrabus
committed
[MonologBridge] Add types to private properties
Signed-off-by: Alexander M. Turek <[email protected]>
1 parent 096fc6a commit 39fb557

15 files changed

+50
-45
lines changed

‎src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bridge\Monolog\Command;
1313

1414
use Monolog\Formatter\FormatterInterface;
15+
use Monolog\Handler\HandlerInterface;
1516
use Monolog\Logger;
1617
use Symfony\Bridge\Monolog\Formatter\ConsoleFormatter;
1718
use Symfony\Bridge\Monolog\Handler\ConsoleHandler;
@@ -30,8 +31,8 @@ class ServerLogCommand extends Command
3031
{
3132
private const BG_COLOR = ['black', 'blue', 'cyan', 'green', 'magenta', 'red', 'white', 'yellow'];
3233

33-
private $el;
34-
private $handler;
34+
private ExpressionLanguage $el;
35+
private HandlerInterface $handler;
3536

3637
protected static $defaultName = 'server:log';
3738
protected static $defaultDescription = 'Start a log server that displays logs in real time';

‎src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,15 @@ class ConsoleFormatter implements FormatterInterface
4141
Logger::EMERGENCY => 'fg=white;bg=red',
4242
];
4343

44-
private $options;
45-
private $cloner;
44+
private array $options;
45+
private VarCloner $cloner;
46+
47+
/**
48+
* @var resource|null
49+
*/
4650
private $outputBuffer;
47-
private $dumper;
51+
52+
private CliDumper $dumper;
4853

4954
/**
5055
* Available options:
@@ -180,7 +185,7 @@ private function replacePlaceHolder(array $record): array
180185

181186
private function dumpData(mixed $data, bool $colors = null): string
182187
{
183-
if (null === $this->dumper) {
188+
if (!isset($this->dumper)) {
184189
return '';
185190
}
186191

‎src/Symfony/Bridge/Monolog/Formatter/VarDumperFormatter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
class VarDumperFormatter implements FormatterInterface
2121
{
22-
private $cloner;
22+
private VarCloner $cloner;
2323

2424
public function __construct(VarCloner $cloner = null)
2525
{

‎src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,8 @@
2424
*/
2525
class ChromePhpHandler extends BaseChromePhpHandler
2626
{
27-
private $headers = [];
28-
29-
/**
30-
* @var Response
31-
*/
32-
private $response;
27+
private array $headers = [];
28+
private Response $response;
3329

3430
/**
3531
* Adds the headers to the response once it's created.

‎src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@
4343
*/
4444
class ConsoleHandler extends AbstractProcessingHandler implements EventSubscriberInterface
4545
{
46-
private $output;
47-
private $verbosityLevelMap = [
46+
private ?OutputInterface $output;
47+
private array $verbosityLevelMap = [
4848
OutputInterface::VERBOSITY_QUIET => Logger::ERROR,
4949
OutputInterface::VERBOSITY_NORMAL => Logger::WARNING,
5050
OutputInterface::VERBOSITY_VERBOSE => Logger::NOTICE,
5151
OutputInterface::VERBOSITY_VERY_VERBOSE => Logger::INFO,
5252
OutputInterface::VERBOSITY_DEBUG => Logger::DEBUG,
5353
];
54-
private $consoleFormatterOptions;
54+
private array $consoleFormatterOptions;
5555

5656
/**
5757
* @param OutputInterface|null $output The console output to use (the handler remains disabled when passing null

‎src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ class ElasticsearchLogstashHandler extends AbstractHandler
4444
use FormattableHandlerTrait;
4545
use ProcessableHandlerTrait;
4646

47-
private $endpoint;
48-
private $index;
49-
private $client;
50-
private $responses;
47+
private string $endpoint;
48+
private string $index;
49+
private HttpClientInterface $client;
50+
private \SplObjectStorage $responses;
5151

5252
public function __construct(string $endpoint = 'http://127.0.0.1:9200', string $index = 'monolog', HttpClientInterface $client = null, string|int $level = Logger::DEBUG, bool $bubble = true)
5353
{

‎src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
final class NotFoundActivationStrategy implements ActivationStrategyInterface
2626
{
27-
private $exclude;
27+
private string $exclude;
2828

2929
public function __construct(
3030
private RequestStack $requestStack,

‎src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,8 @@
2424
*/
2525
class FirePHPHandler extends BaseFirePHPHandler
2626
{
27-
private $headers = [];
28-
29-
/**
30-
* @var Response
31-
*/
32-
private $response;
27+
private array $headers = [];
28+
private Response $response;
3329

3430
/**
3531
* Adds the headers to the response once it's created.

‎src/Symfony/Bridge/Monolog/Handler/MailerHandler.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,15 @@
2424
*/
2525
class MailerHandler extends AbstractProcessingHandler
2626
{
27-
private $mailer;
28-
29-
private $messageTemplate;
27+
private MailerInterface $mailer;
28+
private \Closure|Email $messageTemplate;
3029

3130
public function __construct(MailerInterface $mailer, callable|Email $messageTemplate, string|int $level = Logger::DEBUG, bool $bubble = true)
3231
{
3332
parent::__construct($level, $bubble);
3433

3534
$this->mailer = $mailer;
36-
$this->messageTemplate = $messageTemplate;
35+
$this->messageTemplate = !\is_callable($messageTemplate) || $messageTemplate instanceof \Closure ? $messageTemplate : \Closure::fromCallable($messageTemplate);
3736
}
3837

3938
/**
@@ -96,7 +95,7 @@ protected function buildMessage(string $content, array $records): Email
9695
if ($this->messageTemplate instanceof Email) {
9796
$message = clone $this->messageTemplate;
9897
} elseif (\is_callable($this->messageTemplate)) {
99-
$message = \call_user_func($this->messageTemplate, $content, $records);
98+
$message = ($this->messageTemplate)($content, $records);
10099
if (!$message instanceof Email) {
101100
throw new \InvalidArgumentException(sprintf('Could not resolve message from a callable. Instance of "%s" is expected.', Email::class));
102101
}

‎src/Symfony/Bridge/Monolog/Handler/NotifierHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
class NotifierHandler extends AbstractHandler
2626
{
27-
private $notifier;
27+
private NotifierInterface $notifier;
2828

2929
public function __construct(NotifierInterface $notifier, string|int $level = Logger::ERROR, bool $bubble = true)
3030
{

‎src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,16 @@ protected function getDefaultFormatter()
5050
*/
5151
trait ServerLogHandlerTrait
5252
{
53-
private $host;
53+
private string $host;
54+
55+
/**
56+
* @var resource
57+
*/
5458
private $context;
59+
60+
/**
61+
* @var resource|null
62+
*/
5563
private $socket;
5664

5765
public function __construct(string $host, string|int $level = Logger::DEBUG, bool $bubble = true, array $context = [])

‎src/Symfony/Bridge/Monolog/Messenger/ResetLoggersWorkerSubscriber.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
class ResetLoggersWorkerSubscriber implements EventSubscriberInterface
2525
{
26-
private $loggers;
26+
private iterable $loggers;
2727

2828
public function __construct(iterable $loggers)
2929
{

‎src/Symfony/Bridge/Monolog/Processor/ConsoleCommandProcessor.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
*/
2424
class ConsoleCommandProcessor implements EventSubscriberInterface, ResetInterface
2525
{
26-
private $commandData;
27-
private $includeArguments;
28-
private $includeOptions;
26+
private array $commandData;
27+
private bool $includeArguments;
28+
private bool $includeOptions;
2929

3030
public function __construct(bool $includeArguments = true, bool $includeOptions = false)
3131
{
@@ -35,7 +35,7 @@ public function __construct(bool $includeArguments = true, bool $includeOptions
3535

3636
public function __invoke(array $records)
3737
{
38-
if (null !== $this->commandData && !isset($records['extra']['command'])) {
38+
if (isset($this->commandData) && !isset($records['extra']['command'])) {
3939
$records['extra']['command'] = $this->commandData;
4040
}
4141

@@ -44,7 +44,7 @@ public function __invoke(array $records)
4444

4545
public function reset()
4646
{
47-
$this->commandData = null;
47+
unset($this->commandData);
4848
}
4949

5050
public function addCommandData(ConsoleEvent $event)

‎src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
class DebugProcessor implements DebugLoggerInterface, ResetInterface
2121
{
22-
private $records = [];
23-
private $errorCount = [];
24-
private $requestStack;
22+
private array $records = [];
23+
private array $errorCount = [];
24+
private ?RequestStack $requestStack;
2525

2626
public function __construct(RequestStack $requestStack = null)
2727
{

‎src/Symfony/Bridge/Monolog/Processor/RouteProcessor.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
*/
2727
class RouteProcessor implements EventSubscriberInterface, ResetInterface
2828
{
29-
private $routeData;
30-
private $includeParams;
29+
private array $routeData = [];
30+
private bool $includeParams;
3131

3232
public function __construct(bool $includeParams = true)
3333
{

0 commit comments

Comments
 (0)