Merge branch '6.4' into 7.3

* 6.4:
  [Cache] Fix internal representation of non-static values
  [Cache] Make `TagAwareAdapter` registrable as a service
  refactor: Unify & more humane translation message
  fix Resources translations validators.pt.xlf
  [Security] Pass attributes to nested `ChainUserProviders`
  [Validator] Update translation for the Video constraint
  [Messenger] Firebird Database - incompatibility with expected lowercase columns
  SQLSRV: Change column type from TEXT to STRING
  Fix exception catch when deleting temporary table in the sameDatabaseChecker
  [Serializer] Fix serializer crash due to asymmetric visibility on `protected(set)` properties

Author: nicolas-grekas

src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaListener.php

@@ -12,6 +12,7 @@
 namespace Symfony\Bridge\Doctrine\SchemaListener;
 
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Exception\DatabaseObjectNotFoundException;
 use Doctrine\DBAL\Exception\TableNotFoundException;
 use Doctrine\DBAL\Schema\Name\Identifier;
 use Doctrine\DBAL\Schema\Name\UnqualifiedName;
@@ -52,7 +53,7 @@ protected function getIsSameDatabaseChecker(Connection $connection): \Closure
                 $schemaManager->dropTable($checkTable);
 
                 return false;
-            } catch (TableNotFoundException) {
+            } catch (DatabaseObjectNotFoundException) {
                 return true;
             }
         };

src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php

@@ -17,6 +17,7 @@
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Component\Cache\Traits\CachedValueInterface;
 use Symfony\Component\Cache\Traits\ContractsTrait;
 use Symfony\Component\Cache\Traits\ProxyTrait;
 use Symfony\Component\VarExporter\VarExporter;
@@ -96,16 +97,15 @@ public function get(string $key, callable $callback, ?float $beta = null, ?array
         if ('N;' === $value) {
             return null;
         }
+        if (!$value instanceof CachedValueInterface) {
+            return $value;
+        }
         try {
-            if ($value instanceof \Closure) {
-                return $value();
-            }
+            return $value->getValue();
         } catch (\Throwable) {
             unset($this->keys[$key]);
             goto get_from_pool;
         }
-
-        return $value;
     }
 
     public function getItem(mixed $key): CacheItem
@@ -125,9 +125,9 @@ public function getItem(mixed $key): CacheItem
 
         if ('N;' === $value) {
             $value = null;
-        } elseif ($value instanceof \Closure) {
+        } elseif ($value instanceof CachedValueInterface) {
             try {
-                $value = $value();
+                $value = $value->getValue();
             } catch (\Throwable) {
                 $value = null;
                 $isHit = false;
@@ -306,8 +306,7 @@ public function warmUp(array $values): array
             }
 
             if (!$isStaticValue) {
-                $value = str_replace("\n", "\n    ", $value);
-                $value = "static function () {\n    return {$value};\n}";
+                $value = 'new class() implements \\'.CachedValueInterface::class." { public function getValue(): mixed { return {$value}; } }";
             }
             $hash = hash('xxh128', $value);
 
@@ -368,9 +367,9 @@ private function generateItems(array $keys): \Generator
 
                 if ('N;' === $value) {
                     yield $key => $f($key, null, true);
-                } elseif ($value instanceof \Closure) {
+                } elseif ($value instanceof CachedValueInterface) {
                     try {
-                        yield $key => $f($key, $value(), true);
+                        yield $key => $f($key, $value->getValue(), true);
                     } catch (\Throwable) {
                         yield $key => $f($key, null, false);
                     }

src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php

@@ -14,6 +14,7 @@
 use Symfony\Component\Cache\Exception\CacheException;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\Cache\Traits\CachedValueInterface;
 use Symfony\Component\Cache\Traits\FilesystemCommonTrait;
 use Symfony\Component\VarExporter\VarExporter;
 
@@ -113,8 +114,10 @@ protected function doFetch(array $ids): iterable
                     $values[$id] = null;
                 } elseif (!\is_object($value)) {
                     $values[$id] = $value;
+                } elseif ($value instanceof CachedValueInterface) {
+                    $values[$id] = $value->getValue();
                 } elseif (!$value instanceof LazyValue) {
-                    $values[$id] = $value();
+                    $values[$id] = $value;
                 } elseif (false === $values[$id] = include $value->file) {
                     unset($values[$id], $this->values[$id]);
                     $missingIds[] = $id;
@@ -235,7 +238,7 @@ protected function doSave(array $values, int $lifetime): array|bool
             if ($isStaticValue) {
                 $value = "return [{$expiry}, {$value}];";
             } elseif ($this->appendOnly) {
-                $value = "return [{$expiry}, static fn () => {$value}];";
+                $value = "return [{$expiry}, new class() implements \\".CachedValueInterface::class." { public function getValue(): mixed { return {$value}; } }];";
             } else {
                 // We cannot use a closure here because of https://bugs.php.net/76982
                 $value = str_replace('\Symfony\Component\VarExporter\Internal\\', '', $value);

src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php

@@ -16,6 +16,7 @@
 use Symfony\Component\Cache\Adapter\ChainAdapter;
 use Symfony\Component\Cache\Adapter\NullAdapter;
 use Symfony\Component\Cache\Adapter\ParameterNormalizer;
+use Symfony\Component\Cache\Adapter\TagAwareAdapter;
 use Symfony\Component\Cache\Messenger\EarlyExpirationDispatcher;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -153,7 +154,7 @@ public function process(ContainerBuilder $container): void
                         ),
                     ]);
                     $pool->addTag('container.reversible');
-                } elseif ('namespace' !== $attr || !\in_array($class, [ArrayAdapter::class, NullAdapter::class], true)) {
+                } elseif ('namespace' !== $attr || !\in_array($class, [ArrayAdapter::class, NullAdapter::class, TagAwareAdapter::class], true)) {
                     $argument = $tags[0][$attr];
 
                     if ('default_lifetime' === $attr && !is_numeric($argument)) {

src/Symfony/Component/Cache/Tests/DependencyInjection/CachePoolPassTest.php

@@ -17,6 +17,7 @@
 use Symfony\Component\Cache\Adapter\ChainAdapter;
 use Symfony\Component\Cache\Adapter\NullAdapter;
 use Symfony\Component\Cache\Adapter\RedisAdapter;
+use Symfony\Component\Cache\Adapter\TagAwareAdapter;
 use Symfony\Component\Cache\DependencyInjection\CachePoolPass;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -102,15 +103,18 @@ public function testNamespaceArgumentIsSeededWithAdapterClassNameWithoutAffectin
         $this->assertSame('mVXLns1cYU', $cachePool->getArgument(0));
     }
 
-    public function testNamespaceArgumentIsNotReplacedIfArrayAdapterIsUsed()
+    /**
+     * @dataProvider providerAdaptersNotNamespace
+     */
+    public function testNamespaceArgumentIsNotReplacedIfAdapterWithoutNamespace(string $adapterClass)
     {
         $container = new ContainerBuilder();
         $container->setParameter('kernel.container_class', 'app');
         $container->setParameter('kernel.project_dir', 'foo');
 
-        $container->register('cache.adapter.array', ArrayAdapter::class)->addArgument(0);
+        $container->register('cache.adapter', $adapterClass)->addArgument(0);
 
-        $cachePool = new ChildDefinition('cache.adapter.array');
+        $cachePool = new ChildDefinition('cache.adapter');
         $cachePool->addTag('cache.pool');
         $container->setDefinition('app.cache_pool', $cachePool);
 
@@ -119,21 +123,11 @@ public function testNamespaceArgumentIsNotReplacedIfArrayAdapterIsUsed()
         $this->assertCount(0, $container->getDefinition('app.cache_pool')->getArguments());
     }
 
-    public function testNamespaceArgumentIsNotReplacedIfNullAdapterIsUsed()
+    public static function providerAdaptersNotNamespace(): iterable
     {
-        $container = new ContainerBuilder();
-        $container->setParameter('kernel.container_class', 'app');
-        $container->setParameter('kernel.project_dir', 'foo');
-
-        $container->register('cache.adapter.null', NullAdapter::class);
-
-        $cachePool = new ChildDefinition('cache.adapter.null');
-        $cachePool->addTag('cache.pool');
-        $container->setDefinition('app.cache_pool', $cachePool);
-
-        $this->cachePoolPass->process($container);
-
-        $this->assertCount(0, $container->getDefinition('app.cache_pool')->getArguments());
+        yield [ArrayAdapter::class];
+        yield [NullAdapter::class];
+        yield [TagAwareAdapter::class];
     }
 
     public function testArgsAreReplaced()

src/Symfony/Component/Cache/Traits/CachedValueInterface.php

@@ -0,0 +1,20 @@
+<?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\Cache\Traits;
+
+/**
+ * @internal
+ */
+interface CachedValueInterface
+{
+    public function getValue(): mixed;
+}

src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php

@@ -219,7 +219,7 @@ public function configureSchema(Schema $schema, ?\Closure $isSameDatabase = null
                 $table->addColumn($this->timeCol, Types::INTEGER)->setNotnull(true);
                 break;
             case 'sqlsrv':
-                $table->addColumn($this->idCol, Types::TEXT)->setLength(128)->setNotnull(true);
+                $table->addColumn($this->idCol, Types::STRING)->setLength(128)->setNotnull(true);
                 $table->addColumn($this->dataCol, Types::BLOB)->setNotnull(true);
                 $table->addColumn($this->lifetimeCol, Types::INTEGER)->setUnsigned(true)->setNotnull(true);
                 $table->addColumn($this->timeCol, Types::INTEGER)->setUnsigned(true)->setNotnull(true);

src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php

@@ -33,6 +33,7 @@
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Types\Types;
+use Satag\DoctrineFirebirdDriver\Platforms\FirebirdPlatform;
 use Symfony\Component\Messenger\Exception\InvalidArgumentException;
 use Symfony\Component\Messenger\Exception\TransportException;
 use Symfony\Contracts\Service\ResetInterface;
@@ -431,7 +432,9 @@ private function createQueryBuilder(string $alias = 'm'): QueryBuilder
 
         $alias .= '.';
 
-        if (!$this->driverConnection->getDatabasePlatform() instanceof OraclePlatform) {
+        if (!$this->driverConnection->getDatabasePlatform() instanceof FirebirdPlatform
+            && !$this->driverConnection->getDatabasePlatform() instanceof OraclePlatform
+        ) {
             return $queryBuilder->select($alias.'*');
         }
 

src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php

@@ -49,6 +49,14 @@ public function testLoadUserByIdentifier()
 
     public function testLoadUserByIdentifierWithAttributes()
     {
+        $provider0 = $this->createMock(ChainUserProvider::class);
+        $provider0
+            ->expects($this->once())
+            ->method('loadUserByIdentifier')
+            ->with($this->equalTo('foo'), $this->equalTo(['attr' => 5]))
+            ->willThrowException(new UserNotFoundException('not found'))
+        ;
+
         $provider1 = $this->createMock(UserProviderInterface::class);
         $provider1
             ->expects($this->once())
@@ -65,7 +73,7 @@ public function testLoadUserByIdentifierWithAttributes()
             ->willReturn($account = $this->createMock(UserInterface::class))
         ;
 
-        $provider = new ChainUserProvider([$provider1, $provider2]);
+        $provider = new ChainUserProvider([$provider0, $provider1, $provider2]);
         $this->assertSame($account, $provider->loadUserByIdentifier('foo', ['attr' => 5]));
     }
 

src/Symfony/Component/Security/Core/User/ChainUserProvider.php

@@ -54,7 +54,7 @@ public function loadUserByIdentifier(string $identifier/* , array $attributes =
         $attributes = \func_num_args() > 1 ? func_get_arg(1) : [];
         foreach ($this->providers as $provider) {
             try {
-                if ($provider instanceof AttributesBasedUserProviderInterface) {
+                if ($provider instanceof AttributesBasedUserProviderInterface || $provider instanceof self) {
                     return $provider->loadUserByIdentifier($identifier, $attributes);
                 }