Merge branch '7.1' into 7.2

* 7.1:
  [Notifier] [Lox24] Fix request body format to JSON string
  inject the missing logger service
  fix handling of special "value" constraint option
  send the recipient phone number as an array
  [DependencyInjection] Fix ternary in AutowireCallable attribute
  [Security] Change to `BadCredentialsException` when empty username / password
  Add a note about the change in the default cache namespace generation to the upgrade guide
  fix test
  Fix CS
  [Messenger] Added postgres asset filter integration test
  change notifier type for brevo from chatter to texter
  avoid calling undefined built-in is_*() functions
  [AssetMapper] fix npm version constraint conversion
  Bump Symfony version to 7.1.2
  Update VERSION for 7.1.1
  Update CHANGELOG for 7.1.1

Author: derrabus

CHANGELOG-7.1.md

@@ -7,6 +7,21 @@ in 7.1 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v7.1.0...v7.1.1
 
+* 7.1.1 (2024-06-04)
+
+ * bug #57110 [PhpUnitBridge] Fix error handler triggered outside of tests (HypeMC)
+ * bug #57305 [Validator] do not modify a constraint during validation to not leak its context (xabbuh)
+ * bug #57297 [FrameworkBundle] not registered definitions must not be modified (xabbuh)
+ * bug #57234 [String] Fix Inflector for 'hardware' (podhy)
+ * bug #57224 [Mime] Use streams instead of loading raw message generator into memory (bytestream)
+ * bug #57284 [Mime] Fix TextPart using an unknown File (fabpot)
+ * bug #57282 [Scheduler] Throw an exception when no dispatcher has been passed to a Schedule (fabpot)
+ * bug #57276 Fix autoload configs to avoid warnings when building optimized autoloaders (Seldaek)
+ * bug #57275 Fix autoload configs to avoid warnings when building optimized autoloaders (Seldaek)
+ * bug #57263 [SecurityBundle] Fix `container.build_hash` parameter binding (alexandre-daubois)
+ * bug #57197 [Serializer] Fix denormalizing a collection of union types (HypeMC)
+ * bug #57188 [DoctrineBridge] Fix `UniqueEntityValidator` with proxy object (HypeMC)
+
 * 7.1.0 (2024-05-31)
 
  * bug #57248 [DoctrineBridge] Revert deprecating by-{id} mapping of entities (nicolas-grekas)

UPGRADE-7.1.md

@@ -45,6 +45,7 @@ Cache
 -----
 
  * Deprecate `CouchbaseBucketAdapter`, use `CouchbaseCollectionAdapter` with Couchbase 3 instead
+ * The algorithm for the default cache namespace changed from SHA256 to XXH128
 
 DependencyInjection
 -------------------

src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityTest.php

@@ -60,6 +60,13 @@ public function testAttributeWithGroupsAndPaylod()
         self::assertSame('some attached data', $constraint->payload);
         self::assertSame(['some_group'], $constraint->groups);
     }
+
+    public function testValueOptionConfiguresFields()
+    {
+        $constraint = new UniqueEntity(['value' => 'email']);
+
+        $this->assertSame('email', $constraint->fields);
+    }
 }
 
 #[UniqueEntity(['email'], message: 'myMessage')]

src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php

@@ -60,7 +60,7 @@ public function __construct(
         $payload = null,
         array $options = [],
     ) {
-        if (\is_array($fields) && \is_string(key($fields)) && [] === array_diff(array_keys($fields), array_keys(get_class_vars(static::class)))) {
+        if (\is_array($fields) && \is_string(key($fields)) && [] === array_diff(array_keys($fields), array_merge(array_keys(get_class_vars(static::class)), ['value']))) {
             $options = array_merge($fields, $options);
         } else {
             $options['fields'] = $fields;

src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php

@@ -27,7 +27,6 @@
 
     $chatterFactories = [
         'bluesky' => Bridge\Bluesky\BlueskyTransportFactory::class,
-        'brevo' => Bridge\Brevo\BrevoTransportFactory::class,
         'chatwork' => Bridge\Chatwork\ChatworkTransportFactory::class,
         'discord' => Bridge\Discord\DiscordTransportFactory::class,
         'fake-chat' => Bridge\FakeChat\FakeChatTransportFactory::class,
@@ -59,6 +58,7 @@
     $texterFactories = [
         'all-my-sms' => Bridge\AllMySms\AllMySmsTransportFactory::class,
         'bandwidth' => Bridge\Bandwidth\BandwidthTransportFactory::class,
+        'brevo' => Bridge\Brevo\BrevoTransportFactory::class,
         'click-send' => Bridge\ClickSend\ClickSendTransportFactory::class,
         'clickatell' => Bridge\Clickatell\ClickatellTransportFactory::class,
         'contact-everyone' => Bridge\ContactEveryone\ContactEveryoneTransportFactory::class,

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/Cache/CHANGELOG.md

@@ -8,6 +8,7 @@ CHANGELOG
  * Deprecate `CouchbaseBucketAdapter`, use `CouchbaseCollectionAdapter`
  * Add support for URL encoded characters in Couchbase DSN
  * Add support for using DSN with PDOAdapter
+ * The algorithm for the default cache namespace changed from SHA256 to XXH128
 
 7.0
 ---

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

@@ -45,7 +45,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;
+    }
+}