Merge branch '6.4' into 7.0

* 6.4:
  send the recipient phone number as an array
  [DependencyInjection] Fix ternary in AutowireCallable attribute
  fix test
  Fix CS
  [Messenger] Added postgres asset filter integration test
  [AssetMapper] fix npm version constraint conversion

Author: derrabus

src/Symfony/Component/AssetMapper/ImportMap/ImportMapVersionChecker.php

@@ -137,7 +137,7 @@ public static function convertNpmConstraint(string $versionConstraint): ?string
             if (str_contains($segment, '-') && !preg_match('/-(alpha|beta|rc)\./', $segment)) {
                 // This is a range
                 [$start, $end] = explode('-', $segment);
-                $processedSegments[] = '>='.self::cleanVersionSegment(trim($start)).' <='.self::cleanVersionSegment(trim($end));
+                $processedSegments[] = self::cleanVersionSegment(trim($start)).' - '.self::cleanVersionSegment(trim($end));
             } elseif (preg_match('/^~(\d+\.\d+)$/', $segment, $matches)) {
                 // Handle the tilde when only major.minor specified
                 $baseVersion = $matches[1];

src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapVersionCheckerTest.php

@@ -261,6 +261,26 @@ public static function getCheckVersionsTests()
                 new PackageVersionProblem('foo', 'bar', 'some/repo', '1.5.0'),
             ],
         ];
+
+        yield 'single with range constraint but no problem' => [
+            [
+                self::createRemoteEntry('foo', version: '1.0'),
+                self::createRemoteEntry('bar', version: '2.0.3'),
+            ],
+            [
+                'foo' => ['bar'],
+                'bar' => [],
+            ],
+            [
+                [
+                    'url' => '/foo/1.0',
+                    'response' => [
+                        'dependencies' => ['bar' => '1.11 - 2'],
+                    ],
+                ],
+            ],
+            [],
+        ];
     }
 
     /**
@@ -297,22 +317,22 @@ public static function getNpmSpecificVersionConstraints()
         // Hyphen Ranges
         yield 'hyphen range simple' => [
             '1.0.0 - 2.0.0',
-            '>=1.0.0 <=2.0.0',
+            '1.0.0 - 2.0.0',
         ];
 
         yield 'hyphen range with v prefix' => [
             'v1.0.0 - 2.0.0',
-            '>=1.0.0 <=2.0.0',
+            '1.0.0 - 2.0.0',
         ];
 
         yield 'hyphen range without patch' => [
             '1.0 - 2.0',
-            '>=1.0 <=2.0',
+            '1.0 - 2.0',
         ];
 
         yield 'hyphen range with no spaces' => [
             '1.0-v2.0',
-            '>=1.0 <=2.0',
+            '1.0 - 2.0',
         ];
 
         // .x Wildcards
@@ -386,7 +406,7 @@ public static function getNpmSpecificVersionConstraints()
 
         yield 'multiple constraints with space and or operator' => [
             '1.2.7 || 1.2.9- v2.0.0',
-            '1.2.7 || >=1.2.9 <=2.0.0',
+            '1.2.7 || 1.2.9 - 2.0.0',
         ];
 
         yield 'tilde constraint with patch version no change' => [

src/Symfony/Component/DependencyInjection/Attribute/AutowireCallable.php

@@ -42,7 +42,7 @@ public function __construct(
 
     public function buildDefinition(mixed $value, ?string $type, \ReflectionParameter $parameter): Definition
     {
-        return (new Definition($type = \is_string($this->lazy) ? $this->lazy : ($type ?: 'Closure')))
+        return (new Definition($type = \is_array($this->lazy) ? current($this->lazy) : ($type ?: 'Closure')))
             ->setFactory(['Closure', 'fromCallable'])
             ->setArguments([\is_array($value) ? $value + [1 => '__invoke'] : $value])
             ->setLazy($this->lazy || 'Closure' !== $type && 'callable' !== (string) $parameter->getType());

src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrinePostgreSqlFilterIntegrationTest.php

@@ -0,0 +1,119 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Messenger\Bridge\Doctrine\Tests\Transport;
+
+use Doctrine\DBAL\Configuration;
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\DriverManager;
+use Doctrine\DBAL\Schema\Column;
+use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
+use Doctrine\DBAL\Schema\Sequence;
+use Doctrine\DBAL\Schema\Table;
+use Doctrine\DBAL\Tools\DsnParser;
+use Doctrine\DBAL\Types\Type;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Messenger\Bridge\Doctrine\Transport\PostgreSqlConnection;
+
+/**
+ * This test checks on a postgres connection whether the doctrine asset filter works as expected.
+ *
+ * @requires extension pdo_pgsql
+ *
+ * @group integration
+ */
+class DoctrinePostgreSqlFilterIntegrationTest extends TestCase
+{
+    private Connection $driverConnection;
+
+    protected function setUp(): void
+    {
+        if (!$host = getenv('POSTGRES_HOST')) {
+            $this->markTestSkipped('Missing POSTGRES_HOST env variable');
+        }
+
+        $url = "pdo-pgsql://postgres:password@$host";
+        $params = (new DsnParser())->parse($url);
+        $config = new Configuration();
+        if (class_exists(DefaultSchemaManagerFactory::class)) {
+            $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
+        }
+
+        $this->driverConnection = DriverManager::getConnection($params, $config);
+
+        $this->createAssets();
+    }
+
+    protected function tearDown(): void
+    {
+        $this->removeAssets();
+
+        $this->driverConnection->close();
+    }
+
+    public function testFilterAssets()
+    {
+        $schemaManager = $this->driverConnection->createSchemaManager();
+
+        $this->assertFalse($schemaManager->tablesExist(['queue_table']));
+        $this->assertTrue($schemaManager->tablesExist(['app_table']));
+        $this->assertTrue($this->hasSequence('app_table_id'));
+
+        $connection = new PostgreSqlConnection(['table_name' => 'queue_table'], $this->driverConnection);
+        $connection->setup();
+
+        $schemaManager = $this->driverConnection->createSchemaManager();
+
+        $this->assertTrue($schemaManager->tablesExist(['queue_table']));
+        $this->assertTrue($schemaManager->tablesExist(['app_table']));
+        $this->assertTrue($this->hasSequence('app_table_id'));
+    }
+
+    private function createAssets(): void
+    {
+        $this->removeAssets();
+
+        $schemaManager = $this->driverConnection->createSchemaManager();
+        $schemaManager->createTable(new Table('app_table', [new Column('id', Type::getType('integer'))]));
+        $schemaManager->createSequence(new Sequence('app_table_id'));
+    }
+
+    private function removeAssets(): void
+    {
+        $schemaManager = $this->driverConnection->createSchemaManager();
+
+        if ($schemaManager->tablesExist(['queue_table'])) {
+            $schemaManager->dropTable('queue_table');
+        }
+
+        if ($schemaManager->tablesExist(['app_table'])) {
+            $schemaManager->dropTable('app_table');
+        }
+
+        if ($this->hasSequence('app_table_id')) {
+            $schemaManager->dropSequence('app_table_id');
+        }
+    }
+
+    private function hasSequence(string $name): bool
+    {
+        $schemaManager = $this->driverConnection->createSchemaManager();
+
+        $sequences = $schemaManager->listSequences();
+        foreach ($sequences as $sequence) {
+            if ($sequence->getName() === $name) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}

src/Symfony/Component/Notifier/Bridge/Clickatell/ClickatellTransport.php

@@ -63,7 +63,7 @@ protected function doSend(MessageInterface $message): SentMessage
 
         $options = [];
         $options['from'] = $message->getFrom() ?: $this->from;
-        $options['to'] = $message->getPhone();
+        $options['to'] = [$message->getPhone()];
         $options['text'] = $message->getSubject();
 
         $response = $this->client->request('POST', $endpoint, [