Browse Source

Update baseline

Jordi Boggiano 1 week ago
parent
commit
ed9fb78701
2 changed files with 25 additions and 31 deletions
  1. 24 30
      phpstan-baseline.neon
  2. 1 1
      src/Monolog/Formatter/WildfireFormatter.php

+ 24 - 30
phpstan-baseline.neon

@@ -1,151 +1,145 @@
 parameters:
 	ignoreErrors:
 		-
-			message: '#^Property Monolog\\ErrorHandler\:\:\$reservedMemory is never read, only written\.$#'
+			rawMessage: 'Property Monolog\ErrorHandler::$reservedMemory is never read, only written.'
 			identifier: property.onlyWritten
 			count: 1
 			path: src/Monolog/ErrorHandler.php
 
 		-
-			message: '#^Return type \(array\<array\<mixed\>\|bool\|float\|int\|object\|string\|null\>\|bool\|float\|int\|object\|string\|null\) of method Monolog\\Formatter\\JsonFormatter\:\:normalize\(\) should be covariant with return type \(array\<array\<mixed\>\|bool\|float\|int\|string\|null\>\|bool\|float\|int\|string\|null\) of method Monolog\\Formatter\\NormalizerFormatter\:\:normalize\(\)$#'
+			rawMessage: 'Return type (array<array<mixed>|bool|float|int|object|string|null>|bool|float|int|object|string|null) of method Monolog\Formatter\JsonFormatter::normalize() should be covariant with return type (array<array<mixed>|bool|float|int|string|null>|bool|float|int|string|null) of method Monolog\Formatter\NormalizerFormatter::normalize()'
 			identifier: method.childReturnType
 			count: 1
 			path: src/Monolog/Formatter/JsonFormatter.php
 
 		-
-			message: '#^Return type \(array\<array\<mixed\>\|bool\|float\|int\|stdClass\|string\|null\>\) of method Monolog\\Formatter\\JsonFormatter\:\:normalizeRecord\(\) should be covariant with return type \(array\<array\<mixed\>\|bool\|float\|int\|string\|null\>\) of method Monolog\\Formatter\\NormalizerFormatter\:\:normalizeRecord\(\)$#'
+			rawMessage: 'Return type (array<array<mixed>|bool|float|int|stdClass|string|null>) of method Monolog\Formatter\JsonFormatter::normalizeRecord() should be covariant with return type (array<array<mixed>|bool|float|int|string|null>) of method Monolog\Formatter\NormalizerFormatter::normalizeRecord()'
 			identifier: method.childReturnType
 			count: 1
 			path: src/Monolog/Formatter/JsonFormatter.php
 
 		-
-			message: '#^Return type \(string\) of method Monolog\\Formatter\\LineFormatter\:\:normalizeException\(\) should be compatible with return type \(array\<array\<array\<string\>\|int\|string\>\|int\|string\>\) of method Monolog\\Formatter\\NormalizerFormatter\:\:normalizeException\(\)$#'
+			rawMessage: 'Return type (string) of method Monolog\Formatter\LineFormatter::normalizeException() should be compatible with return type (array<array<array<string>|int|string>|int|string>) of method Monolog\Formatter\NormalizerFormatter::normalizeException()'
 			identifier: method.childReturnType
 			count: 1
 			path: src/Monolog/Formatter/LineFormatter.php
 
 		-
-			message: '#^Method Monolog\\Formatter\\NormalizerFormatter\:\:normalizeException\(\) should return array\<array\<array\<string\>\|int\|string\>\|int\|string\> but returns array\<string, array\<array\<array\<string\>\|int\|string\>\|int\|string\>\|int\|string\>\.$#'
+			rawMessage: 'Method Monolog\Formatter\NormalizerFormatter::normalizeException() should return array<array<array<string>|int|string>|int|string> but returns array<string, array<array<array<string>|int|string>|int|string>|int|string>.'
 			identifier: return.type
 			count: 1
 			path: src/Monolog/Formatter/NormalizerFormatter.php
 
 		-
-			message: '#^Cannot access offset ''table'' on array\<array\<mixed\>\|bool\|float\|int\|string\|null\>\|bool\|float\|int\|object\|string\.$#'
-			identifier: offsetAccess.nonOffsetAccessible
-			count: 1
-			path: src/Monolog/Formatter/WildfireFormatter.php
-
-		-
-			message: '#^Return type \(array\<array\<mixed\>\|bool\|float\|int\|string\|null\>\|bool\|float\|int\|object\|string\|null\) of method Monolog\\Formatter\\WildfireFormatter\:\:normalize\(\) should be covariant with return type \(array\<array\<mixed\>\|bool\|float\|int\|string\|null\>\|bool\|float\|int\|string\|null\) of method Monolog\\Formatter\\NormalizerFormatter\:\:normalize\(\)$#'
+			rawMessage: 'Return type (array<array<mixed>|bool|float|int|string|null>|bool|float|int|object|string|null) of method Monolog\Formatter\WildfireFormatter::normalize() should be covariant with return type (array<array<mixed>|bool|float|int|string|null>|bool|float|int|string|null) of method Monolog\Formatter\NormalizerFormatter::normalize()'
 			identifier: method.childReturnType
 			count: 1
 			path: src/Monolog/Formatter/WildfireFormatter.php
 
 		-
-			message: '#^Access to constant VERSION on an unknown class Elasticsearch\\Client\.$#'
+			rawMessage: Access to constant VERSION on an unknown class Elasticsearch\Client.
 			identifier: class.notFound
 			count: 1
 			path: src/Monolog/Handler/ElasticsearchHandler.php
 
 		-
-			message: '#^Call to method bulk\(\) on an unknown class Elasticsearch\\Client\.$#'
+			rawMessage: 'Call to method bulk() on an unknown class Elasticsearch\Client.'
 			identifier: class.notFound
 			count: 1
 			path: src/Monolog/Handler/ElasticsearchHandler.php
 
 		-
-			message: '#^Method Monolog\\Handler\\ElasticsearchHandler\:\:createExceptionFromError\(\) should return Throwable but returns Elasticsearch\\Common\\Exceptions\\RuntimeException\.$#'
+			rawMessage: 'Method Monolog\Handler\ElasticsearchHandler::createExceptionFromError() should return Throwable but returns Elasticsearch\Common\Exceptions\RuntimeException.'
 			identifier: return.type
 			count: 1
 			path: src/Monolog/Handler/ElasticsearchHandler.php
 
 		-
-			message: '#^Method Monolog\\Handler\\ElasticsearchHandler\:\:createExceptionFromResponses\(\) should return Throwable but returns Elasticsearch\\Common\\Exceptions\\RuntimeException\.$#'
+			rawMessage: 'Method Monolog\Handler\ElasticsearchHandler::createExceptionFromResponses() should return Throwable but returns Elasticsearch\Common\Exceptions\RuntimeException.'
 			identifier: return.type
 			count: 1
 			path: src/Monolog/Handler/ElasticsearchHandler.php
 
 		-
-			message: '#^Parameter \$client of method Monolog\\Handler\\ElasticsearchHandler\:\:__construct\(\) has invalid type Elasticsearch\\Client\.$#'
+			rawMessage: 'Parameter $client of method Monolog\Handler\ElasticsearchHandler::__construct() has invalid type Elasticsearch\Client.'
 			identifier: class.notFound
 			count: 2
 			path: src/Monolog/Handler/ElasticsearchHandler.php
 
 		-
-			message: '#^Property Monolog\\Handler\\ElasticsearchHandler\:\:\$client has unknown class Elasticsearch\\Client as its type\.$#'
+			rawMessage: Property Monolog\Handler\ElasticsearchHandler::$client has unknown class Elasticsearch\Client as its type.
 			identifier: class.notFound
 			count: 1
 			path: src/Monolog/Handler/ElasticsearchHandler.php
 
 		-
-			message: '#^Short ternary operator is not allowed\. Use null coalesce operator if applicable or consider using long ternary\.$#'
+			rawMessage: Short ternary operator is not allowed. Use null coalesce operator if applicable or consider using long ternary.
 			identifier: ternary.shortNotAllowed
 			count: 1
 			path: src/Monolog/Handler/FingersCrossedHandler.php
 
 		-
-			message: '#^Call to method setBody\(\) on an unknown class Swift_Message\.$#'
+			rawMessage: 'Call to method setBody() on an unknown class Swift_Message.'
 			identifier: class.notFound
 			count: 1
 			path: src/Monolog/Handler/MandrillHandler.php
 
 		-
-			message: '#^Call to method setDate\(\) on an unknown class Swift_Message\.$#'
+			rawMessage: 'Call to method setDate() on an unknown class Swift_Message.'
 			identifier: class.notFound
 			count: 1
 			path: src/Monolog/Handler/MandrillHandler.php
 
 		-
-			message: '#^Class Swift_Message not found\.$#'
+			rawMessage: Class Swift_Message not found.
 			identifier: class.notFound
 			count: 2
 			path: src/Monolog/Handler/MandrillHandler.php
 
 		-
-			message: '#^Cloning object of an unknown class Swift_Message\.$#'
+			rawMessage: Cloning object of an unknown class Swift_Message.
 			identifier: class.notFound
 			count: 1
 			path: src/Monolog/Handler/MandrillHandler.php
 
 		-
-			message: '#^Parameter \$message of method Monolog\\Handler\\MandrillHandler\:\:__construct\(\) has invalid type Swift_Message\.$#'
+			rawMessage: 'Parameter $message of method Monolog\Handler\MandrillHandler::__construct() has invalid type Swift_Message.'
 			identifier: class.notFound
 			count: 3
 			path: src/Monolog/Handler/MandrillHandler.php
 
 		-
-			message: '#^Property Monolog\\Handler\\MandrillHandler\:\:\$message has unknown class Swift_Message as its type\.$#'
+			rawMessage: Property Monolog\Handler\MandrillHandler::$message has unknown class Swift_Message as its type.
 			identifier: class.notFound
 			count: 1
 			path: src/Monolog/Handler/MandrillHandler.php
 
 		-
-			message: '#^Variable property access on \$this\(Monolog\\LogRecord\)\.$#'
+			rawMessage: 'Variable property access on $this(Monolog\LogRecord).'
 			identifier: property.dynamicName
 			count: 4
 			path: src/Monolog/LogRecord.php
 
 		-
-			message: '#^Cannot assign offset Fiber to WeakMap\<Fiber\<mixed, mixed, mixed, mixed\>, int\>\.$#'
+			rawMessage: 'Cannot assign offset Fiber to WeakMap<Fiber<mixed, mixed, mixed, mixed>, int>.'
 			identifier: offsetAssign.dimType
 			count: 1
 			path: src/Monolog/Logger.php
 
 		-
-			message: '#^Parameter \#1 \$level \(''alert''\|''critical''\|''debug''\|''emergency''\|''error''\|''info''\|''notice''\|''warning''\|Monolog\\Level\) of method Monolog\\Logger\:\:log\(\) should be contravariant with parameter \$level \(mixed\) of method Psr\\Log\\LoggerInterface\:\:log\(\)$#'
+			rawMessage: 'Parameter #1 $level (''alert''|''critical''|''debug''|''emergency''|''error''|''info''|''notice''|''warning''|Monolog\Level) of method Monolog\Logger::log() should be contravariant with parameter $level (mixed) of method Psr\Log\LoggerInterface::log()'
 			identifier: method.childParameterType
 			count: 1
 			path: src/Monolog/Logger.php
 
 		-
-			message: '#^Variable property access on \$this\(Monolog\\Logger\)\.$#'
+			rawMessage: 'Variable property access on $this(Monolog\Logger).'
 			identifier: property.dynamicName
 			count: 1
 			path: src/Monolog/Logger.php
 
 		-
-			message: '#^Parameter \#1 \$length of function random_bytes expects int\<1, max\>, int given\.$#'
+			rawMessage: 'Parameter #1 $length of function random_bytes expects int<1, max>, int given.'
 			identifier: argument.type
 			count: 1
 			path: src/Monolog/Processor/UidProcessor.php

+ 1 - 1
src/Monolog/Formatter/WildfireFormatter.php

@@ -83,7 +83,7 @@ class WildfireFormatter extends NormalizerFormatter
             $message = reset($message);
         }
 
-        if (\is_array($message) && isset($message['context']['table'])) {
+        if (is_array($message) && isset($message['context']) && \is_array($message['context']) && isset($message['context']['table'])) {
             $type  = 'TABLE';
             $label = $record->channel .': '. $record->message;
             $message = $message['context']['table'];