Release 1.254.0

Author: dgafka

packages/Amqp/composer.json

@@ -42,7 +42,7 @@
     },
     "require": {
         "ext-amqp": "*",
-        "ecotone/enqueue": "~1.253.0",
+        "ecotone/enqueue": "~1.254.0",
         "enqueue/amqp-ext": "^0.10.18",
         "enqueue/dsn": "^0.10.4",
         "enqueue/enqueue": "^0.10.0"
@@ -65,7 +65,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.253.0-dev"
+            "dev-main": "1.254.0-dev"
         },
         "ecotone": {
             "repository": "amqp"
@@ -86,7 +86,7 @@
                 "description": "Allows to use Enterprise features of Ecotone. For more information please write to [email protected]"
             }
         },
-        "release-time": "2025-04-16 05:35:52"
+        "release-time": "2025-04-19 15:37:40"
     },
     "config": {
         "allow-plugins": {

packages/Dbal/composer.json

@@ -34,7 +34,7 @@
         }
     },
     "require": {
-        "ecotone/enqueue": "~1.253.0",
+        "ecotone/enqueue": "~1.254.0",
         "doctrine/dbal": "^3.9|^4.0",
         "enqueue/dsn": "^0.10.4"
     },
@@ -46,7 +46,7 @@
         "doctrine/cache": "^1.0.0|^2.0",
         "doctrine/annotations": "^1.13|^2.0",
         "wikimedia/composer-merge-plugin": "^2.1",
-        "ecotone/jms-converter": "~1.253.0",
+        "ecotone/jms-converter": "~1.254.0",
         "symfony/expression-language": "^6.0|^7.0"
     },
     "scripts": {
@@ -59,7 +59,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.253.0-dev"
+            "dev-main": "1.254.0-dev"
         },
         "ecotone": {
             "repository": "dbal"
@@ -80,7 +80,7 @@
                 "description": "Allows to use Enterprise features of Ecotone. For more information please write to [email protected]"
             }
         },
-        "release-time": "2025-04-16 05:35:52"
+        "release-time": "2025-04-19 15:37:40"
     },
     "config": {
         "allow-plugins": {

packages/Dbal/src/Compatibility/QueryBuilderProxy.php

@@ -4,11 +4,12 @@
 
 namespace Ecotone\Dbal\Compatibility;
 
-use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 use Doctrine\DBAL\Query\QueryBuilder;
 use Doctrine\DBAL\Result;
+use Exception;
 use InvalidArgumentException;
+use ReflectionMethod;
 
 /**
  * @package Ecotone\Dbal\Compatibility
@@ -41,7 +42,7 @@ private function detectDbal4(): bool
     {
         // Check if the select method has the DBAL 4 signature (with variadic string parameters)
         try {
-            $reflectionMethod = new \ReflectionMethod(QueryBuilder::class, 'select');
+            $reflectionMethod = new ReflectionMethod(QueryBuilder::class, 'select');
             $parameters = $reflectionMethod->getParameters();
 
             if (count($parameters) === 0) {
@@ -50,7 +51,7 @@ private function detectDbal4(): bool
 
             // In DBAL 4, the first parameter is named 'expressions' and is variadic
             return $parameters[0]->isVariadic() && $parameters[0]->getName() === 'expressions';
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             // If we can't determine the version, assume it's DBAL 3
             return false;
         }

packages/Dbal/src/Compatibility/SchemaManagerCompatibility.php

@@ -5,11 +5,9 @@
 namespace Ecotone\Dbal\Compatibility;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Schema\AbstractSchemaManager;
-use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Schema\Table;
+use RuntimeException;
 
 /**
  * @package Ecotone\Dbal\Compatibility
@@ -43,7 +41,7 @@ public static function getSchemaManager(Connection $connection): object
         }
 
         // If neither method exists, throw an exception
-        throw new \RuntimeException('Could not get schema manager from connection');
+        throw new RuntimeException('Could not get schema manager from connection');
     }
 
     public static function tableExists(Connection $connection, string $tableName): bool

packages/Dbal/src/DbaBusinessMethod/DbalBusinessMethodHandler.php

@@ -324,12 +324,12 @@ private function convertScalarParameterType($type)
         // If we're using DBAL 4.x with enum ParameterType
         if (enum_exists('\Doctrine\DBAL\ParameterType')) {
             return match($type) {
-                1 => \Doctrine\DBAL\ParameterType::INTEGER,
-                2 => \Doctrine\DBAL\ParameterType::STRING,
-                3 => \Doctrine\DBAL\ParameterType::LARGE_OBJECT,
-                5 => \Doctrine\DBAL\ParameterType::BOOLEAN,
-                16 => \Doctrine\DBAL\ParameterType::BINARY,
-                17 => \Doctrine\DBAL\ParameterType::ASCII,
+                1 => ParameterType::INTEGER,
+                2 => ParameterType::STRING,
+                3 => ParameterType::LARGE_OBJECT,
+                5 => ParameterType::BOOLEAN,
+                16 => ParameterType::BINARY,
+                17 => ParameterType::ASCII,
                 default => $type,
             };
         }

packages/Dbal/src/DbalReconnectableConnectionFactory.php

@@ -11,6 +11,7 @@
 use Interop\Queue\ConnectionFactory;
 use Interop\Queue\Context;
 use ReflectionClass;
+use ReflectionMethod;
 
 /**
  * licence Apache-2.0
@@ -66,11 +67,11 @@ public function reconnect(): void
     {
         $connection = $this->getConnection();
 
-        $reflectionMethod = new \ReflectionMethod($connection, 'close');
+        $reflectionMethod = new ReflectionMethod($connection, 'close');
         $reflectionMethod->setAccessible(true);
         $reflectionMethod->invoke($connection);
 
-        $reflectionMethod = new \ReflectionMethod($connection, 'connect');
+        $reflectionMethod = new ReflectionMethod($connection, 'connect');
         $reflectionMethod->setAccessible(true);
         $reflectionMethod->invoke($connection);
     }

packages/Dbal/src/DbalTransaction/DbalTransactionInterceptor.php

@@ -4,7 +4,6 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Exception\ConnectionException;
-use Ecotone\Dbal\Compatibility\ConnectionExceptionCompatibility;
 use Ecotone\Dbal\DbalReconnectableConnectionFactory;
 use Ecotone\Enqueue\CachedConnectionFactory;
 use Ecotone\Messaging\Attribute\Parameter\Reference;
@@ -18,7 +17,6 @@
 use Enqueue\Dbal\ManagerRegistryConnectionFactory;
 use Exception;
 use Interop\Queue\ConnectionFactory;
-use PDOException;
 use Throwable;
 
 /**
@@ -92,7 +90,7 @@ public function transactional(MethodInvocation $methodInvocation, Message $messa
                 try {
                     $connection->commit();
                     $logger->info('Database Transaction committed', $message);
-                } catch (\Exception $exception) {
+                } catch (Exception $exception) {
                     // Handle the case where a database did an implicit commit or the transaction is no longer active
                     if ($this->isImplicitCommitException($exception)) {
                         $logger->info(
@@ -135,7 +133,7 @@ public function transactional(MethodInvocation $methodInvocation, Message $messa
         return $result;
     }
 
-    private function isImplicitCommitException(\Throwable $exception): bool
+    private function isImplicitCommitException(Throwable $exception): bool
     {
         $patterns = [
             'No active transaction',

packages/Dbal/src/Deduplication/DeduplicationInterceptor.php

@@ -105,7 +105,7 @@ public function removeExpiredMessages(): void
             $this->getConnection($connectionFactory)->createQueryBuilder()
                 ->delete($this->getTableName())
                 ->andWhere('message_id IN (:messageIds)')
-                ->setParameter('messageIds', array_column($messageIds, 'message_id'), class_exists('\Doctrine\DBAL\ArrayParameterType') ? \Doctrine\DBAL\ArrayParameterType::STRING : (defined('\Doctrine\DBAL\Connection::PARAM_STR_ARRAY') ? \Doctrine\DBAL\Connection::PARAM_STR_ARRAY : 'string[]'))
+                ->setParameter('messageIds', array_column($messageIds, 'message_id'), class_exists('\Doctrine\DBAL\ArrayParameterType') ? \Doctrine\DBAL\ArrayParameterType::STRING : (defined('\Doctrine\DBAL\Connection::PARAM_STR_ARRAY') ? Connection::PARAM_STR_ARRAY : 'string[]'))
                 // In DBAL 4.x, execute() is replaced with executeStatement()
                 ->executeStatement();
         }

packages/Dbal/src/EnqueueDbal/DbalConnectionFactory.php

@@ -6,11 +6,13 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DriverManager;
-use Ecotone\Dbal\Compatibility\ConnectionConfigCompatibility;
-use Ecotone\Dbal\Compatibility\DbalTypeCompatibility;
 use Enqueue\Dsn\Dsn;
+use Exception;
 use Interop\Queue\ConnectionFactory;
 use Interop\Queue\Context;
+use LogicException;
+use ReflectionMethod;
+use Throwable;
 
 /**
  * licence MIT
@@ -56,7 +58,7 @@ public function __construct($config = 'mysql:')
                 unset($config['dsn']);
             }
         } else {
-            throw new \LogicException('The config must be either an array of options, a DSN string or null');
+            throw new LogicException('The config must be either an array of options, a DSN string or null');
         }
 
         $this->config = array_replace_recursive([
@@ -88,12 +90,12 @@ public function close(): void
             // Try to call close() if it's available, otherwise just set to null
             try {
                 if (method_exists($this->connection, 'close') && is_callable([$this->connection, 'close'])) {
-                    $reflection = new \ReflectionMethod($this->connection, 'close');
+                    $reflection = new ReflectionMethod($this->connection, 'close');
                     if ($reflection->isPublic()) {
                         $this->connection->close();
                     }
                 }
-            } catch (\Throwable $e) {
+            } catch (Throwable $e) {
                 // Ignore any errors, we'll set the connection to null anyway
             }
 
@@ -112,7 +114,7 @@ private function establishConnection(): Connection
             try {
                 // In DBAL 3.x, connect() is public
                 if (method_exists($this->connection, 'connect') && is_callable([$this->connection, 'connect'])) {
-                    $reflection = new \ReflectionMethod($this->connection, 'connect');
+                    $reflection = new ReflectionMethod($this->connection, 'connect');
                     if ($reflection->isPublic()) {
                         $this->connection->connect();
                     } else {
@@ -123,7 +125,7 @@ private function establishConnection(): Connection
                     // Fallback for any other case
                     $this->connection->getNativeConnection();
                 }
-            } catch (\Exception $e) {
+            } catch (Exception $e) {
                 // Connection failed, but we've already tried our best
             }
         }
@@ -152,7 +154,7 @@ private function parseDsn(string $dsn, ?array $config = null): array
         ];
 
         if ($parsedDsn && false == isset($supported[$parsedDsn->getScheme()])) {
-            throw new \LogicException(sprintf('The given DSN schema "%s" is not supported. There are supported schemes: "%s".', $parsedDsn->getScheme(), implode('", "', array_keys($supported))));
+            throw new LogicException(sprintf('The given DSN schema "%s" is not supported. There are supported schemes: "%s".', $parsedDsn->getScheme(), implode('", "', array_keys($supported))));
         }
 
         $doctrineScheme = $supported[$parsedDsn->getScheme()];

packages/Dbal/src/EnqueueDbal/DbalConsumerHelperTrait.php

@@ -6,6 +6,7 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Exception\RetryableException;
+use LogicException;
 use Ramsey\Uuid\Uuid;
 
 /**
@@ -25,7 +26,7 @@ abstract protected function getConnection(): Connection;
     protected function fetchMessage(array $queues, int $redeliveryDelay): ?DbalMessage
     {
         if (empty($queues)) {
-            throw new \LogicException('Queues must not be empty.');
+            throw new LogicException('Queues must not be empty.');
         }
 
         $now = time();
@@ -41,7 +42,7 @@ protected function fetchMessage(array $queues, int $redeliveryDelay): ?DbalMessa
             ->andWhere('delivery_id IS NULL')
             ->addOrderBy('priority', 'asc')
             ->addOrderBy('published_at', 'asc')
-            ->setParameter('queues', $queues, class_exists('\Doctrine\DBAL\ArrayParameterType') ? \Doctrine\DBAL\ArrayParameterType::STRING : (defined('\Doctrine\DBAL\Connection::PARAM_STR_ARRAY') ? \Doctrine\DBAL\Connection::PARAM_STR_ARRAY : 'string[]'))
+            ->setParameter('queues', $queues, class_exists('\Doctrine\DBAL\ArrayParameterType') ? \Doctrine\DBAL\ArrayParameterType::STRING : (defined('\Doctrine\DBAL\Connection::PARAM_STR_ARRAY') ? Connection::PARAM_STR_ARRAY : 'string[]'))
             ->setParameter('delayedUntil', $now, DbalType::INTEGER)
             ->setMaxResults(1);
 
@@ -166,7 +167,7 @@ protected function removeExpiredMessages(): void
     private function deleteMessage(string $deliveryId): void
     {
         if (empty($deliveryId)) {
-            throw new \LogicException(sprintf('Expected record was removed but it is not. Delivery id: "%s"', $deliveryId));
+            throw new LogicException(sprintf('Expected record was removed but it is not. Delivery id: "%s"', $deliveryId));
         }
 
         $this->getConnection()->delete(