[MonologBridge] Add types to private properties

derrabus · derrabus · commit 39fb557d5bc2 · 2021-09-07T23:04:11.000+02:00
Signed-off-by: Alexander M. Turek &lt;me@derrabus.de&gt;
diff --git a/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php b/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bridge\Monolog\Command;
 
 use Monolog\Formatter\FormatterInterface;
+use Monolog\Handler\HandlerInterface;
 use Monolog\Logger;
 use Symfony\Bridge\Monolog\Formatter\ConsoleFormatter;
 use Symfony\Bridge\Monolog\Handler\ConsoleHandler;
@@ -30,8 +31,8 @@ class ServerLogCommand extends Command
 {
     private const BG_COLOR = ['black', 'blue', 'cyan', 'green', 'magenta', 'red', 'white', 'yellow'];
 
-    private $el;
-    private $handler;
+    private ExpressionLanguage $el;
+    private HandlerInterface $handler;
 
     protected static $defaultName = 'server:log';
     protected static $defaultDescription = 'Start a log server that displays logs in real time';
diff --git a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
@@ -41,10 +41,15 @@ class ConsoleFormatter implements FormatterInterface
         Logger::EMERGENCY => 'fg=white;bg=red',
     ];
 
-    private $options;
-    private $cloner;
+    private array $options;
+    private VarCloner $cloner;
+
+    /**
+     * @var resource|null
+     */
     private $outputBuffer;
-    private $dumper;
+
+    private CliDumper $dumper;
 
     /**
      * Available options:
@@ -180,7 +185,7 @@ private function replacePlaceHolder(array $record): array
 
     private function dumpData(mixed $data, bool $colors = null): string
     {
-        if (null === $this->dumper) {
+        if (!isset($this->dumper)) {
             return '';
         }
 
diff --git a/src/Symfony/Bridge/Monolog/Formatter/VarDumperFormatter.php b/src/Symfony/Bridge/Monolog/Formatter/VarDumperFormatter.php
@@ -19,7 +19,7 @@
  */
 class VarDumperFormatter implements FormatterInterface
 {
-    private $cloner;
+    private VarCloner $cloner;
 
     public function __construct(VarCloner $cloner = null)
     {
diff --git a/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php b/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php
@@ -24,12 +24,8 @@
  */
 class ChromePhpHandler extends BaseChromePhpHandler
 {
-    private $headers = [];
-
-    /**
-     * @var Response
-     */
-    private $response;
+    private array $headers = [];
+    private Response $response;
 
     /**
      * Adds the headers to the response once it's created.
diff --git a/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php b/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php
@@ -43,15 +43,15 @@
  */
 class ConsoleHandler extends AbstractProcessingHandler implements EventSubscriberInterface
 {
-    private $output;
-    private $verbosityLevelMap = [
+    private ?OutputInterface $output;
+    private array $verbosityLevelMap = [
         OutputInterface::VERBOSITY_QUIET => Logger::ERROR,
         OutputInterface::VERBOSITY_NORMAL => Logger::WARNING,
         OutputInterface::VERBOSITY_VERBOSE => Logger::NOTICE,
         OutputInterface::VERBOSITY_VERY_VERBOSE => Logger::INFO,
         OutputInterface::VERBOSITY_DEBUG => Logger::DEBUG,
     ];
-    private $consoleFormatterOptions;
+    private array $consoleFormatterOptions;
 
     /**
      * @param OutputInterface|null $output            The console output to use (the handler remains disabled when passing null
diff --git a/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php b/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php
@@ -44,10 +44,10 @@ class ElasticsearchLogstashHandler extends AbstractHandler
     use FormattableHandlerTrait;
     use ProcessableHandlerTrait;
 
-    private $endpoint;
-    private $index;
-    private $client;
-    private $responses;
+    private string $endpoint;
+    private string $index;
+    private HttpClientInterface $client;
+    private \SplObjectStorage $responses;
 
     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)
     {
diff --git a/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php b/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php
@@ -24,7 +24,7 @@
  */
 final class NotFoundActivationStrategy implements ActivationStrategyInterface
 {
-    private $exclude;
+    private string $exclude;
 
     public function __construct(
         private RequestStack $requestStack,
diff --git a/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php b/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php
@@ -24,12 +24,8 @@
  */
 class FirePHPHandler extends BaseFirePHPHandler
 {
-    private $headers = [];
-
-    /**
-     * @var Response
-     */
-    private $response;
+    private array $headers = [];
+    private Response $response;
 
     /**
      * Adds the headers to the response once it's created.
diff --git a/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php b/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php
@@ -24,16 +24,15 @@
  */
 class MailerHandler extends AbstractProcessingHandler
 {
-    private $mailer;
-
-    private $messageTemplate;
+    private MailerInterface $mailer;
+    private \Closure|Email $messageTemplate;
 
     public function __construct(MailerInterface $mailer, callable|Email $messageTemplate, string|int $level = Logger::DEBUG, bool $bubble = true)
     {
         parent::__construct($level, $bubble);
 
         $this->mailer = $mailer;
-        $this->messageTemplate = $messageTemplate;
+        $this->messageTemplate = !\is_callable($messageTemplate) || $messageTemplate instanceof \Closure ? $messageTemplate : \Closure::fromCallable($messageTemplate);
     }
 
     /**
@@ -96,7 +95,7 @@ protected function buildMessage(string $content, array $records): Email
         if ($this->messageTemplate instanceof Email) {
             $message = clone $this->messageTemplate;
         } elseif (\is_callable($this->messageTemplate)) {
-            $message = \call_user_func($this->messageTemplate, $content, $records);
+            $message = ($this->messageTemplate)($content, $records);
             if (!$message instanceof Email) {
                 throw new \InvalidArgumentException(sprintf('Could not resolve message from a callable. Instance of "%s" is expected.', Email::class));
             }
diff --git a/src/Symfony/Bridge/Monolog/Handler/NotifierHandler.php b/src/Symfony/Bridge/Monolog/Handler/NotifierHandler.php
@@ -24,7 +24,7 @@
  */
 class NotifierHandler extends AbstractHandler
 {
-    private $notifier;
+    private NotifierInterface $notifier;
 
     public function __construct(NotifierInterface $notifier, string|int $level = Logger::ERROR, bool $bubble = true)
     {
diff --git a/src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php b/src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php
@@ -50,8 +50,16 @@ protected function getDefaultFormatter()
  */
 trait ServerLogHandlerTrait
 {
-    private $host;
+    private string $host;
+
+    /**
+     * @var resource
+     */
     private $context;
+
+    /**
+     * @var resource|null
+     */
     private $socket;
 
     public function __construct(string $host, string|int $level = Logger::DEBUG, bool $bubble = true, array $context = [])
diff --git a/src/Symfony/Bridge/Monolog/Messenger/ResetLoggersWorkerSubscriber.php b/src/Symfony/Bridge/Monolog/Messenger/ResetLoggersWorkerSubscriber.php
@@ -23,7 +23,7 @@
  */
 class ResetLoggersWorkerSubscriber implements EventSubscriberInterface
 {
-    private $loggers;
+    private iterable $loggers;
 
     public function __construct(iterable $loggers)
     {
diff --git a/src/Symfony/Bridge/Monolog/Processor/ConsoleCommandProcessor.php b/src/Symfony/Bridge/Monolog/Processor/ConsoleCommandProcessor.php
@@ -23,9 +23,9 @@
  */
 class ConsoleCommandProcessor implements EventSubscriberInterface, ResetInterface
 {
-    private $commandData;
-    private $includeArguments;
-    private $includeOptions;
+    private array $commandData;
+    private bool $includeArguments;
+    private bool $includeOptions;
 
     public function __construct(bool $includeArguments = true, bool $includeOptions = false)
     {
@@ -35,7 +35,7 @@ public function __construct(bool $includeArguments = true, bool $includeOptions
 
     public function __invoke(array $records)
     {
-        if (null !== $this->commandData && !isset($records['extra']['command'])) {
+        if (isset($this->commandData) && !isset($records['extra']['command'])) {
             $records['extra']['command'] = $this->commandData;
         }
 
@@ -44,7 +44,7 @@ public function __invoke(array $records)
 
     public function reset()
     {
-        $this->commandData = null;
+        unset($this->commandData);
     }
 
     public function addCommandData(ConsoleEvent $event)
diff --git a/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php b/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php
@@ -19,9 +19,9 @@
 
 class DebugProcessor implements DebugLoggerInterface, ResetInterface
 {
-    private $records = [];
-    private $errorCount = [];
-    private $requestStack;
+    private array $records = [];
+    private array $errorCount = [];
+    private ?RequestStack $requestStack;
 
     public function __construct(RequestStack $requestStack = null)
     {
diff --git a/src/Symfony/Bridge/Monolog/Processor/RouteProcessor.php b/src/Symfony/Bridge/Monolog/Processor/RouteProcessor.php
@@ -26,8 +26,8 @@
  */
 class RouteProcessor implements EventSubscriberInterface, ResetInterface
 {
-    private $routeData;
-    private $includeParams;
+    private array $routeData = [];
+    private bool $includeParams;
 
     public function __construct(bool $includeParams = true)
     {

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`*/`
`20`	`20`	`class VarDumperFormatter implements FormatterInterface`
`21`	`21`	`{`
`22`		`- private $cloner;`
	`22`	`+ private VarCloner $cloner;`
`23`	`23`
`24`	`24`	`public function __construct(VarCloner $cloner = null)`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`*/`
`25`	`25`	`final class NotFoundActivationStrategy implements ActivationStrategyInterface`
`26`	`26`	`{`
`27`		`- private $exclude;`
	`27`	`+ private string $exclude;`
`28`	`28`
`29`	`29`	`public function __construct(`
`30`	`30`	`private RequestStack $requestStack,`