Merge branch '6.4' into 7.0

* 6.4:
  fix typo
  Add types to private and internal properties
  [Workflow] Cleaning code
  [Scheduler] Fix NPE in debug:scheduler command

Author: nicolas-grekas

Messenger/AbstractDoctrineMiddleware.php

@@ -25,8 +25,8 @@
  */
 abstract class AbstractDoctrineMiddleware implements MiddlewareInterface
 {
-    protected $managerRegistry;
-    protected $entityManagerName;
+    protected ManagerRegistry $managerRegistry;
+    protected ?string $entityManagerName;
 
     public function __construct(ManagerRegistry $managerRegistry, string $entityManagerName = null)
     {

Messenger/DoctrineOpenTransactionLoggerMiddleware.php

@@ -14,7 +14,6 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ManagerRegistry;
 use Psr\Log\LoggerInterface;
-use Psr\Log\NullLogger;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Middleware\StackInterface;
 
@@ -25,13 +24,13 @@
  */
 class DoctrineOpenTransactionLoggerMiddleware extends AbstractDoctrineMiddleware
 {
-    private $logger;
+    private ?LoggerInterface $logger;
 
     public function __construct(ManagerRegistry $managerRegistry, string $entityManagerName = null, LoggerInterface $logger = null)
     {
         parent::__construct($managerRegistry, $entityManagerName);
 
-        $this->logger = $logger ?? new NullLogger();
+        $this->logger = $logger;
     }
 
     protected function handleForManager(EntityManagerInterface $entityManager, Envelope $envelope, StackInterface $stack): Envelope
@@ -40,7 +39,7 @@ protected function handleForManager(EntityManagerInterface $entityManager, Envel
             return $stack->next()->handle($envelope, $stack);
         } finally {
             if ($entityManager->getConnection()->isTransactionActive()) {
-                $this->logger->error('A handler opened a transaction but did not close it.', [
+                $this->logger?->error('A handler opened a transaction but did not close it.', [
                     'message' => $envelope->getMessage(),
                 ]);
             }