From a2d8690164d40ea885fe79d3a9af6f0610edb3d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20Eugon=C3=A9?= Date: Tue, 18 Nov 2025 09:54:43 +0100 Subject: [PATCH 1/3] Fixed DBAL schema asset filter argument --- .../src/DoctrineDBALJobExecutionStorage.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php b/src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php index d4db908..8c9a0c9 100644 --- a/src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php +++ b/src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php @@ -8,6 +8,7 @@ use Doctrine\DBAL\Driver\Result; use Doctrine\DBAL\Exception as DBALException; use Doctrine\DBAL\Query\QueryBuilder; +use Doctrine\DBAL\Schema\AbstractAsset; use Doctrine\DBAL\Schema\Comparator; use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Types\Types; @@ -62,7 +63,11 @@ public function setup(): void { $assetFilter = $this->connection->getConfiguration()->getSchemaAssetsFilter(); $this->connection->getConfiguration()->setSchemaAssetsFilter( - fn(string $tableName) => $tableName === $this->table, + function (string|AbstractAsset $table) { + $table = $table instanceof AbstractAsset ? $table->getName() : $table; + + return $table === $this->table; + }, ); $schemaManager = \method_exists($this->connection, 'createSchemaManager') From 80026ae9e51d5216586a6c4f98793899649b2a77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20Eugon=C3=A9?= Date: Tue, 18 Nov 2025 09:55:11 +0100 Subject: [PATCH 2/3] Fixed deprecated using null schema asset filter --- .../src/DoctrineDBALJobExecutionStorage.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php b/src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php index 8c9a0c9..95b0e0b 100644 --- a/src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php +++ b/src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php @@ -61,7 +61,8 @@ public function __construct(ConnectionRegistry $doctrine, array $options) */ public function setup(): void { - $assetFilter = $this->connection->getConfiguration()->getSchemaAssetsFilter(); + $assetFilter = $this->connection->getConfiguration()->getSchemaAssetsFilter() + ?? fn() => true; $this->connection->getConfiguration()->setSchemaAssetsFilter( function (string|AbstractAsset $table) { $table = $table instanceof AbstractAsset ? $table->getName() : $table; From d0ec8f293262afac91116b4b91978ab4c60493fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20Eugon=C3=A9?= Date: Tue, 18 Nov 2025 09:58:05 +0100 Subject: [PATCH 3/3] Fixed checkstyle --- .../src/DoctrineDBALJobExecutionStorage.php | 10 ++++------ .../src/MessengerJobsConfiguration.php | 4 +++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php b/src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php index 95b0e0b..0632180 100644 --- a/src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php +++ b/src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php @@ -63,13 +63,11 @@ public function setup(): void { $assetFilter = $this->connection->getConfiguration()->getSchemaAssetsFilter() ?? fn() => true; - $this->connection->getConfiguration()->setSchemaAssetsFilter( - function (string|AbstractAsset $table) { - $table = $table instanceof AbstractAsset ? $table->getName() : $table; + $this->connection->getConfiguration()->setSchemaAssetsFilter(function (string|AbstractAsset $table) { + $table = $table instanceof AbstractAsset ? $table->getName() : $table; - return $table === $this->table; - }, - ); + return $table === $this->table; + }); $schemaManager = \method_exists($this->connection, 'createSchemaManager') ? $this->connection->createSchemaManager() diff --git a/src/batch-symfony-messenger/src/MessengerJobsConfiguration.php b/src/batch-symfony-messenger/src/MessengerJobsConfiguration.php index 4f1ad0f..2d87d87 100644 --- a/src/batch-symfony-messenger/src/MessengerJobsConfiguration.php +++ b/src/batch-symfony-messenger/src/MessengerJobsConfiguration.php @@ -10,7 +10,9 @@ final class MessengerJobsConfiguration { public function __construct( - /** @var array */ + /** + * @var array + */ private array $routing, ) { }