Merge branch '5.4' into 6.0

* 5.4:
  [Notifier] fix firebase error handling so the transports doesn't try setting the success message, that doesn't exists.
  Remove wrong dep
  [Translation] Fix message key handling for the Localise provider
  [Serializer] Deprecate support for returning empty, iterable, countable, raw object when normalizing
  Fix ProgressBar to correctly clear multi-line formats
  [Mailer] Consume a PSR-14 event dispatcher
  Ignoring X-Transport header while signing email with DKIM
  Remove polyfills from ExpressionLanguage
  Update validators.tr.xlf
  [Form] fix typo in Danish translation
  [HttpKernel] Fix timestamp_rfc3339 in LoggerDataCollector
  Remove broken test case
  [PropertyInfo] Support for the never return type
  Show nice CLI output in Psalm action
  add more explicit error

Signed-off-by: Alexander M. Turek <me@derrabus.de>

Author: derrabus

DataCollector/LoggerDataCollector.php

@@ -208,7 +208,8 @@ private function getContainerDeprecationLogs(): array
         $logs = [];
         foreach (unserialize($logContent) as $log) {
             $log['context'] = ['exception' => new SilencedErrorContext($log['type'], $log['file'], $log['line'], $log['trace'], $log['count'])];
-            $log['timestamp'] = (new \DateTimeImmutable())->setTimestamp($bootTime)->format(\DateTimeInterface::RFC3339_EXTENDED);
+            $log['timestamp'] = $bootTime;
+            $log['timestamp_rfc3339'] = (new \DateTimeImmutable())->setTimestamp($bootTime)->format(\DateTimeInterface::RFC3339_EXTENDED);
             $log['priority'] = 100;
             $log['priorityName'] = 'DEBUG';
             $log['channel'] = null;

Tests/DataCollector/LoggerDataCollectorTest.php

@@ -18,6 +18,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\LoggerDataCollector;
 use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
+use Symfony\Component\VarDumper\Cloner\Data;
 
 class LoggerDataCollectorTest extends TestCase
 {
@@ -45,6 +46,52 @@ public function testCollectWithUnexpectedFormat()
         ], $compilerLogs['Unknown Compiler Pass']);
     }
 
+    public function testCollectFromDeprecationsLog()
+    {
+        $containerPathPrefix = __DIR__.'/';
+        $path = $containerPathPrefix.'Deprecations.log';
+        touch($path);
+        file_put_contents($path, serialize([[
+            'type' => 16384,
+            'message' => 'The "Symfony\Bundle\FrameworkBundle\Controller\Controller" class is deprecated since Symfony 4.2, use Symfony\Bundle\FrameworkBundle\Controller\AbstractController instead.',
+            'file' => '/home/hamza/projet/contrib/sf/vendor/symfony/framework-bundle/Controller/Controller.php',
+            'line' => 17,
+            'trace' => [[
+                'file' => '/home/hamza/projet/contrib/sf/src/Controller/DefaultController.php',
+                'line' => 9,
+                'function' => 'spl_autoload_call',
+            ]],
+            'count' => 1,
+        ]]));
+
+        $logger = $this
+            ->getMockBuilder(DebugLoggerInterface::class)
+            ->setMethods(['countErrors', 'getLogs', 'clear'])
+            ->getMock();
+
+        $logger->expects($this->once())->method('countErrors')->willReturn(0);
+        $logger->expects($this->exactly(2))->method('getLogs')->willReturn([]);
+
+        $c = new LoggerDataCollector($logger, $containerPathPrefix);
+        $c->lateCollect();
+
+        $processedLogs = $c->getProcessedLogs();
+
+        $this->assertCount(1, $processedLogs);
+
+        $this->assertEquals($processedLogs[0]['type'], 'deprecation');
+        $this->assertEquals($processedLogs[0]['errorCounter'], 1);
+        $this->assertEquals($processedLogs[0]['timestamp'], (new \DateTimeImmutable())->setTimestamp(filemtime($path))->format(\DateTimeInterface::RFC3339_EXTENDED));
+        $this->assertEquals($processedLogs[0]['priority'], 100);
+        $this->assertEquals($processedLogs[0]['priorityName'], 'DEBUG');
+        $this->assertNull($processedLogs[0]['channel']);
+
+        $this->assertInstanceOf(Data::class, $processedLogs[0]['message']);
+        $this->assertInstanceOf(Data::class, $processedLogs[0]['context']);
+
+        @unlink($path);
+    }
+
     public function testWithMainRequest()
     {
         $mainRequest = new Request();