Adjust Neos.Flow.Log

Author: Bernhard Schmitt

Neos.Flow.Log/Classes/Backend/AbstractBackend.php

@@ -42,7 +42,7 @@ abstract class AbstractBackend implements BackendInterface
      */
     public function __construct($options = [])
     {
-        if (is_array($options) || $options instanceof \ArrayAccess) {
+        if (is_iterable($options)) {
             foreach ($options as $optionKey => $optionValue) {
                 $methodName = 'set' . ucfirst($optionKey);
                 if (method_exists($this, $methodName)) {

Neos.Flow.Log/Classes/Backend/AnsiConsoleBackend.php

@@ -40,7 +40,7 @@ class AnsiConsoleBackend extends ConsoleBackend
     const END = "\033[0m";
 
     /**
-     * @var array
+     * @var array<string,string>
      */
     protected $tagFormats = [];
 
@@ -75,12 +75,7 @@ public function open(): void
     /**
      * Appends the given message along with the additional information into the log.
      *
-     * @param string $message
-     * @param int $severity
-     * @param array $additionalData
-     * @param string $packageKey
-     * @param string $className
-     * @param string $methodName
+     * @param array<mixed>|null $additionalData
      * @return void
      */
     public function append(string $message, int $severity = LOG_INFO, $additionalData = null, ?string $packageKey = null, ?string $className = null, ?string $methodName = null): void
@@ -118,15 +113,15 @@ protected function formatOutput($output)
                 } else {
                     return str_replace('|', $matches[3], $format);
                 }
-            }, $output);
+            }, $output) ?: '';
         } while ($lastOutput !== $output);
         return $output;
     }
 
     /**
      * @param boolean $disableAnsi
      */
-    public function setDisableAnsi($disableAnsi)
+    public function setDisableAnsi($disableAnsi): void
     {
         $this->disableAnsi = $disableAnsi;
     }

Neos.Flow.Log/Classes/Backend/ConsoleBackend.php

@@ -25,7 +25,7 @@ class ConsoleBackend extends AbstractBackend
 {
     /**
      * An array of severity labels, indexed by their integer constant
-     * @var array
+     * @var array<int,string>
      */
     protected $severityLabels;
 
@@ -61,10 +61,11 @@ public function open(): void
             LOG_DEBUG => 'DEBUG    ',
         ];
 
-        $this->streamHandle = fopen('php://' . $this->streamName, 'w');
-        if (!is_resource($this->streamHandle)) {
+        $streamHandle = fopen('php://' . $this->streamName, 'w');
+        if (!is_resource($streamHandle)) {
             throw new CouldNotOpenResourceException('Could not open stream "' . $this->streamName . '" for write access.', 1310986609);
         }
+        $this->streamHandle = $streamHandle;
     }
 
     /**

Neos.Flow.Log/Classes/Backend/FileBackend.php

@@ -27,7 +27,7 @@ class FileBackend extends AbstractBackend
 {
     /**
      * An array of severity labels, indexed by their integer constant
-     * @var array
+     * @var array<int,string>
      */
     protected $severityLabels;
 

Neos.Flow.Log/Classes/PlainTextFormatter.php

@@ -22,10 +22,9 @@ public function __construct($variable)
     }
 
     /**
-     * @param $spaces
-     * @return string
+     * @return ?string
      */
-    public function format($spaces = 4)
+    public function format(int $spaces = 4)
     {
         return $this->renderVariableAsPlaintext($this->variable, $spaces);
     }

Neos.Flow.Log/Classes/Psr/Logger.php

@@ -45,7 +45,7 @@ class Logger implements LoggerInterface
     /**
      * Constructs the PSR-3 Logger.
      *
-     * @param iterable $backends
+     * @param iterable<mixed> $backends
      */
     public function __construct(iterable $backends)
     {
@@ -61,7 +61,7 @@ public function __construct(iterable $backends)
     /**
      * @param mixed $level
      * @param string|\Stringable $message
-     * @param array $context
+     * @param array<string,mixed> $context
      * @api
      */
     public function log($level, string|\Stringable $message, array $context = []): void
@@ -80,8 +80,8 @@ public function log($level, string|\Stringable $message, array $context = []): v
     }
 
     /**
-     * @param array $context
-     * @return array list of packageKey, className and methodName either string or null
+     * @param array<string,mixed> $context
+     * @return array<int,string|null> list of packageKey, className and methodName either string or null
      */
     protected function extractLegacyDataFromContext(array $context): array
     {
@@ -93,8 +93,8 @@ protected function extractLegacyDataFromContext(array $context): array
     }
 
     /**
-     * @param array $context
-     * @return array
+     * @param array<string,mixed> $context
+     * @return array<string,mixed>
      */
     protected function removeLegacyDataFromContext(array $context): array
     {