Tests/Transport/ConnectionTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Messenger\Bridge\Doctrine\Tests\Transport;
 
+use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Connection as DBALConnection;
 use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
@@ -308,7 +309,7 @@ private function getDBALConnectionMock()
             $platform->method('getWriteLockSQL')->willReturn('FOR UPDATE SKIP LOCKED');
         }
 
-        $configuration = $this->createMock(\Doctrine\DBAL\Configuration::class);
+        $configuration = $this->createMock(Configuration::class);
         $driverConnection->method('getDatabasePlatform')->willReturn($platform);
         $driverConnection->method('getConfiguration')->willReturn($configuration);
 
@@ -647,7 +648,7 @@ class_exists(SQLServerPlatform::class) && !class_exists(SQLServer2012Platform::c
         if (!method_exists(QueryBuilder::class, 'forUpdate')) {
             yield 'Oracle & DBAL<3.8' => [
                 new OraclePlatform(),
-                sprintf('SELECT w.id AS "id", w.body AS "body", w.headers AS "headers", w.queue_name AS "queue_name", w.created_at AS "created_at", w.available_at AS "available_at", w.delivered_at AS "delivered_at" FROM messenger_messages w WHERE w.id IN (SELECT a.id FROM (SELECT m.id FROM messenger_messages m WHERE (m.queue_name = ?) AND (m.delivered_at is null OR m.delivered_at < ?) AND (m.available_at <= ?) ORDER BY available_at ASC) a WHERE ROWNUM <= 1) FOR UPDATE%s', method_exists(QueryBuilder::class, 'forUpdate') ? ' SKIP LOCKED' : ''),
+                \sprintf('SELECT w.id AS "id", w.body AS "body", w.headers AS "headers", w.queue_name AS "queue_name", w.created_at AS "created_at", w.available_at AS "available_at", w.delivered_at AS "delivered_at" FROM messenger_messages w WHERE w.id IN (SELECT a.id FROM (SELECT m.id FROM messenger_messages m WHERE (m.queue_name = ?) AND (m.delivered_at is null OR m.delivered_at < ?) AND (m.available_at <= ?) ORDER BY available_at ASC) a WHERE ROWNUM <= 1) FOR UPDATE%s', method_exists(QueryBuilder::class, 'forUpdate') ? ' SKIP LOCKED' : ''),
             ];
         } elseif (class_exists(MySQL57Platform::class)) {
             yield 'Oracle & 3.8<=DBAL<4' => [

Tests/Transport/DoctrineReceiverTest.php

@@ -314,10 +314,8 @@ private function createDoctrineEnvelope(): array
 
     private function createSerializer(): Serializer
     {
-        $serializer = new Serializer(
+        return new Serializer(
             new SerializerComponent\Serializer([new ObjectNormalizer()], ['json' => new JsonEncoder()])
         );
-
-        return $serializer;
     }
 }

Tests/Transport/PostgreSqlConnectionTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Messenger\Bridge\Doctrine\Tests\Transport;
 
+use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver\Result as DriverResult;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Query\QueryBuilder;
@@ -29,7 +30,7 @@ public function testSerialize()
         $this->expectException(\BadMethodCallException::class);
         $this->expectExceptionMessage('Cannot serialize '.PostgreSqlConnection::class);
 
-        $driverConnection = $this->createMock(\Doctrine\DBAL\Connection::class);
+        $driverConnection = $this->createMock(Connection::class);
         $driverConnection->method('executeStatement')->willReturn(1);
 
         $connection = new PostgreSqlConnection([], $driverConnection);
@@ -41,7 +42,7 @@ public function testUnserialize()
         $this->expectException(\BadMethodCallException::class);
         $this->expectExceptionMessage('Cannot unserialize '.PostgreSqlConnection::class);
 
-        $driverConnection = $this->createMock(\Doctrine\DBAL\Connection::class);
+        $driverConnection = $this->createMock(Connection::class);
         $driverConnection->method('executeStatement')->willReturn(1);
 
         $connection = new PostgreSqlConnection([], $driverConnection);
@@ -50,7 +51,7 @@ public function testUnserialize()
 
     public function testListenOnConnection()
     {
-        $driverConnection = $this->createMock(\Doctrine\DBAL\Connection::class);
+        $driverConnection = $this->createMock(Connection::class);
         $driverConnection->method('executeStatement')->willReturn(1);
 
         $driverConnection
@@ -63,7 +64,7 @@ public function testListenOnConnection()
             ->method('createQueryBuilder')
             ->willReturn(new QueryBuilder($driverConnection));
 
-        $wrappedConnection = new class() {
+        $wrappedConnection = new class {
             private int $notifyCalls = 0;
 
             public function pgsqlGetNotify()
@@ -103,7 +104,7 @@ public function countNotifyCalls()
 
     public function testGetExtraSetupSql()
     {
-        $driverConnection = $this->createMock(\Doctrine\DBAL\Connection::class);
+        $driverConnection = $this->createMock(Connection::class);
         $driverConnection->method('executeStatement')->willReturn(1);
         $connection = new PostgreSqlConnection(['table_name' => 'queue_table'], $driverConnection);
 
@@ -120,7 +121,7 @@ public function testGetExtraSetupSql()
 
     public function testTransformTableNameWithSchemaToValidProcedureName()
     {
-        $driverConnection = $this->createMock(\Doctrine\DBAL\Connection::class);
+        $driverConnection = $this->createMock(Connection::class);
         $driverConnection->method('executeStatement')->willReturn(1);
         $connection = new PostgreSqlConnection(['table_name' => 'schema.queue_table'], $driverConnection);
 
@@ -134,7 +135,7 @@ public function testTransformTableNameWithSchemaToValidProcedureName()
 
     public function testGetExtraSetupSqlWrongTable()
     {
-        $driverConnection = $this->createMock(\Doctrine\DBAL\Connection::class);
+        $driverConnection = $this->createMock(Connection::class);
         $driverConnection->method('executeStatement')->willReturn(1);
         $connection = new PostgreSqlConnection(['table_name' => 'queue_table'], $driverConnection);
 

Transport/Connection.php

@@ -104,13 +104,13 @@ public static function buildConfiguration(#[\SensitiveParameter] string $dsn, ar
         // check for extra keys in options
         $optionsExtraKeys = array_diff(array_keys($options), array_keys(static::DEFAULT_OPTIONS));
         if (0 < \count($optionsExtraKeys)) {
-            throw new InvalidArgumentException(sprintf('Unknown option found: [%s]. Allowed options are [%s].', implode(', ', $optionsExtraKeys), implode(', ', array_keys(static::DEFAULT_OPTIONS))));
+            throw new InvalidArgumentException(\sprintf('Unknown option found: [%s]. Allowed options are [%s].', implode(', ', $optionsExtraKeys), implode(', ', array_keys(static::DEFAULT_OPTIONS))));
         }
 
         // check for extra keys in options
         $queryExtraKeys = array_diff(array_keys($query), array_keys(static::DEFAULT_OPTIONS));
         if (0 < \count($queryExtraKeys)) {
-            throw new InvalidArgumentException(sprintf('Unknown option found in DSN: [%s]. Allowed options are [%s].', implode(', ', $queryExtraKeys), implode(', ', array_keys(static::DEFAULT_OPTIONS))));
+            throw new InvalidArgumentException(\sprintf('Unknown option found in DSN: [%s]. Allowed options are [%s].', implode(', ', $queryExtraKeys), implode(', ', array_keys(static::DEFAULT_OPTIONS))));
         }
 
         return $configuration;
@@ -126,7 +126,7 @@ public static function buildConfiguration(#[\SensitiveParameter] string $dsn, ar
     public function send(string $body, array $headers, int $delay = 0): string
     {
         $now = new \DateTimeImmutable('UTC');
-        $availableAt = $now->modify(sprintf('%+d seconds', $delay / 1000));
+        $availableAt = $now->modify(\sprintf('%+d seconds', $delay / 1000));
 
         $queryBuilder = $this->driverConnection->createQueryBuilder()
             ->insert($this->configuration['table_name'])
@@ -194,11 +194,11 @@ public function get(): ?array
             if (method_exists(QueryBuilder::class, 'forUpdate')) {
                 $sql = $this->addLockMode($query, $sql);
             } else {
-                if (preg_match('/FROM (.+) WHERE/', (string) $sql, $matches)) {
+                if (preg_match('/FROM (.+) WHERE/', $sql, $matches)) {
                     $fromClause = $matches[1];
                     $sql = str_replace(
-                        sprintf('FROM %s WHERE', $fromClause),
-                        sprintf('FROM %s WHERE', $this->driverConnection->getDatabasePlatform()->appendLockHint($fromClause, LockMode::PESSIMISTIC_WRITE)),
+                        \sprintf('FROM %s WHERE', $fromClause),
+                        \sprintf('FROM %s WHERE', $this->driverConnection->getDatabasePlatform()->appendLockHint($fromClause, LockMode::PESSIMISTIC_WRITE)),
                         $sql
                     );
                 }
@@ -296,7 +296,7 @@ public function setup(): void
             }
 
             if (!\is_string($tableName)) {
-                throw new \TypeError(sprintf('The table name must be an instance of "%s" or a string ("%s" given).', AbstractAsset::class, get_debug_type($tableName)));
+                throw new \TypeError(\sprintf('The table name must be an instance of "%s" or a string ("%s" given).', AbstractAsset::class, get_debug_type($tableName)));
             }
 
             return $tableName === $this->configuration['table_name'];
@@ -366,7 +366,7 @@ public function getExtraSetupSqlForTable(Table $createdTable): array
     private function createAvailableMessagesQueryBuilder(): QueryBuilder
     {
         $now = new \DateTimeImmutable('UTC');
-        $redeliverLimit = $now->modify(sprintf('-%d seconds', $this->configuration['redeliver_timeout']));
+        $redeliverLimit = $now->modify(\sprintf('-%d seconds', $this->configuration['redeliver_timeout']));
 
         return $this->createQueryBuilder()
             ->where('m.queue_name = ?')

Transport/DoctrineReceiver.php

@@ -67,14 +67,14 @@ public function get(): iterable
 
     public function ack(Envelope $envelope): void
     {
-        $this->withRetryableExceptionRetry(function() use ($envelope) {
+        $this->withRetryableExceptionRetry(function () use ($envelope) {
             $this->connection->ack($this->findDoctrineReceivedStamp($envelope)->getId());
         });
     }
 
     public function reject(Envelope $envelope): void
     {
-        $this->withRetryableExceptionRetry(function() use ($envelope) {
+        $this->withRetryableExceptionRetry(function () use ($envelope) {
             $this->connection->reject($this->findDoctrineReceivedStamp($envelope)->getId());
         });
     }
@@ -159,7 +159,7 @@ private function withRetryableExceptionRetry(callable $callable): void
             $callable();
         } catch (RetryableException $exception) {
             if (++$retries <= self::MAX_RETRIES) {
-                $delay *=  $multiplier;
+                $delay *= $multiplier;
 
                 $randomness = (int) ($delay * $jitter);
                 $delay += random_int(-$randomness, +$randomness);

Transport/PostgreSqlConnection.php

@@ -62,7 +62,7 @@ public function get(): ?array
 
         // This is secure because the table name must be a valid identifier:
         // https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
-        $this->executeStatement(sprintf('LISTEN "%s"', $this->configuration['table_name']));
+        $this->executeStatement(\sprintf('LISTEN "%s"', $this->configuration['table_name']));
 
         /** @var \PDO $nativeConnection */
         $nativeConnection = $this->driverConnection->getNativeConnection();
@@ -111,7 +111,7 @@ private function getTriggerSql(): array
 
         return [
             // create trigger function
-            sprintf(<<<'SQL'
+            \sprintf(<<<'SQL'
 CREATE OR REPLACE FUNCTION %1$s() RETURNS TRIGGER AS $$
     BEGIN
         PERFORM pg_notify('%2$s', NEW.queue_name::text);
@@ -121,8 +121,8 @@ private function getTriggerSql(): array
 SQL
                 , $functionName, $this->configuration['table_name']),
             // register trigger
-            sprintf('DROP TRIGGER IF EXISTS notify_trigger ON %s;', $this->configuration['table_name']),
-            sprintf('CREATE TRIGGER notify_trigger AFTER INSERT OR UPDATE ON %1$s FOR EACH ROW EXECUTE PROCEDURE %2$s();', $this->configuration['table_name'], $functionName),
+            \sprintf('DROP TRIGGER IF EXISTS notify_trigger ON %s;', $this->configuration['table_name']),
+            \sprintf('CREATE TRIGGER notify_trigger AFTER INSERT OR UPDATE ON %1$s FOR EACH ROW EXECUTE PROCEDURE %2$s();', $this->configuration['table_name'], $functionName),
         ];
     }
 
@@ -131,14 +131,14 @@ private function createTriggerFunctionName(): string
         $tableConfig = explode('.', $this->configuration['table_name']);
 
         if (1 === \count($tableConfig)) {
-            return sprintf('notify_%1$s', $tableConfig[0]);
+            return \sprintf('notify_%1$s', $tableConfig[0]);
         }
 
-        return sprintf('%1$s.notify_%2$s', $tableConfig[0], $tableConfig[1]);
+        return \sprintf('%1$s.notify_%2$s', $tableConfig[0], $tableConfig[1]);
     }
 
     private function unlisten(): void
     {
-        $this->executeStatement(sprintf('UNLISTEN "%s"', $this->configuration['table_name']));
+        $this->executeStatement(\sprintf('UNLISTEN "%s"', $this->configuration['table_name']));
     }
 }