Merge branch '5.4' into 6.0

* 5.4:
  [Messenger] Fix calls to deprecated DBAL methods
  Check for null instead of type

Author: derrabus

src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php

@@ -24,6 +24,7 @@
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\Comparator;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Schema\SchemaDiff;
 use Doctrine\DBAL\Schema\Synchronizer\SchemaSynchronizer;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Types\Types;
@@ -467,8 +468,9 @@ private function updateSchema(): void
             return;
         }
 
-        $comparator = new Comparator();
-        $schemaDiff = $comparator->compare($this->createSchemaManager()->createSchema(), $this->getSchema());
+        $schemaManager = $this->createSchemaManager();
+        $comparator = $this->createComparator($schemaManager);
+        $schemaDiff = $this->compareSchemas($comparator, $schemaManager->createSchema(), $this->getSchema());
 
         foreach ($schemaDiff->toSaveSql($this->driverConnection->getDatabasePlatform()) as $sql) {
             if (method_exists($this->driverConnection, 'executeStatement')) {
@@ -485,6 +487,20 @@ private function createSchemaManager(): AbstractSchemaManager
             ? $this->driverConnection->createSchemaManager()
             : $this->driverConnection->getSchemaManager();
     }
+
+    private function createComparator(AbstractSchemaManager $schemaManager): Comparator
+    {
+        return method_exists($schemaManager, 'createComparator')
+            ? $schemaManager->createComparator()
+            : new Comparator();
+    }
+
+    private function compareSchemas(Comparator $comparator, Schema $from, Schema $to): SchemaDiff
+    {
+        return method_exists($comparator, 'compareSchemas')
+            ? $comparator->compareSchemas($from, $to)
+            : $comparator->compare($from, $to);
+    }
 }
 
 if (!class_exists(\Symfony\Component\Messenger\Transport\Doctrine\Connection::class, false)) {

src/Symfony/Component/Security/Http/Firewall/LogoutListener.php

@@ -86,8 +86,7 @@ public function authenticate(RequestEvent $event)
         $logoutEvent = new LogoutEvent($request, $this->tokenStorage->getToken());
         $this->eventDispatcher->dispatch($logoutEvent);
 
-        $response = $logoutEvent->getResponse();
-        if (!$response instanceof Response) {
+        if (!$response = $logoutEvent->getResponse()) {
             throw new \RuntimeException('No logout listener set the Response, make sure at least the DefaultLogoutListener is registered.');
         }