Merge branch '7.2' into 7.3

* 7.2:
  [DoctrineBridge] Fix Connection::createSchemaManager() for Doctrine DBAL v2
  CS: re-apply trailing_comma_in_multiline
  [HttpClient] Various cleanups after recent changes
  chore: fix some typos
  do not add child nodes to EmptyNode instances
  consider write property visibility to decide whether a property is writable
  Fix merge
  add comment explaining why HttpClient tests are run separately
  [HttpClient] Fix computing stats for PUSH with Amp
  silence warnings issued by Redis Sentinel on connection issues
  Revert "[FrameworkBundle] Deprecate making `cache.app` adapter taggable"

Author: nicolas-grekas

.github/workflows/windows.yml

@@ -111,6 +111,7 @@ jobs:
           Remove-Item -Path src\Symfony\Bridge\PhpUnit -Recurse
           mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml
           php phpunit src\Symfony --exclude-group tty,benchmark,intl-data,network,transient-on-windows || ($x = 1)
+          # HttpClient tests need to run separately, they block when run with other components' tests concurrently
           php phpunit src\Symfony\Component\HttpClient || ($x = 1)
 
           exit $x
@@ -124,6 +125,7 @@ jobs:
 
           Copy c:\php\php.ini-max c:\php\php.ini
           php phpunit src\Symfony --exclude-group tty,benchmark,intl-data,network,transient-on-windows || ($x = 1)
+          # HttpClient tests need to run separately, they block when run with other components' tests concurrently
           php phpunit src\Symfony\Component\HttpClient || ($x = 1)
 
           exit $x

.php-cs-fixer.dist.php

@@ -32,7 +32,6 @@
         '@Symfony:risky' => true,
         'protected_to_private' => false,
         'header_comment' => ['header' => $fileHeaderComment],
-        'trailing_comma_in_multiline' => ['elements' => ['arrays', 'match', 'parameters']],
     ])
     ->setRiskyAllowed(true)
     ->setFinder(

UPGRADE-7.2.md

@@ -12,7 +12,6 @@ Cache
 -----
 
  * `igbinary_serialize()` is not used by default when the igbinary extension is installed
- * Deprecate making `cache.app` adapter taggable, use the `cache.app.taggable` adapter instead
 
 Console
 -------

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

@@ -24,8 +24,7 @@ abstract public function postGenerateSchema(GenerateSchemaEventArgs $event): voi
     protected function getIsSameDatabaseChecker(Connection $connection): \Closure
     {
         return static function (\Closure $exec) use ($connection): bool {
-            $schemaManager = $connection->createSchemaManager();
-
+            $schemaManager = method_exists($connection, 'createSchemaManager') ? $connection->createSchemaManager() : $connection->getSchemaManager();
             $checkTable = 'schema_subscriber_check_'.bin2hex(random_bytes(7));
             $table = new Table($checkTable);
             $table->addColumn('id', Types::INTEGER)

src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php

@@ -15,6 +15,7 @@
 use Symfony\Bridge\Twig\Node\TransNode;
 use Twig\Environment;
 use Twig\Node\BlockNode;
+use Twig\Node\EmptyNode;
 use Twig\Node\Expression\ArrayExpression;
 use Twig\Node\Expression\AssignNameExpression;
 use Twig\Node\Expression\ConstantExpression;
@@ -75,6 +76,12 @@ public function enterNode(Node $node, Environment $env): Node
 
         if ($node instanceof FilterExpression && 'trans' === ($node->hasAttribute('twig_callable') ? $node->getAttribute('twig_callable')->getName() : $node->getNode('filter')->getAttribute('value'))) {
             $arguments = $node->getNode('arguments');
+
+            if ($arguments instanceof EmptyNode) {
+                $arguments = new Nodes();
+                $node->setNode('arguments', $arguments);
+            }
+
             if ($this->isNamedArguments($arguments)) {
                 if (!$arguments->hasNode('domain') && !$arguments->hasNode(1)) {
                     $arguments->setNode('domain', $this->scope->get('domain'));

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -2398,11 +2398,6 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con
             ];
         }
         foreach ($config['pools'] as $name => $pool) {
-            if (\in_array('cache.app', $pool['adapters'] ?? [], true) && $pool['tags']) {
-                trigger_deprecation('symfony/framework-bundle', '7.2', 'Using the "tags" option with the "cache.app" adapter is deprecated. You can use the "cache.app.taggable" adapter instead (aliased to the TagAwareCacheInterface for autowiring).');
-                // throw new LogicException('The "tags" option cannot be used with the "cache.app" adapter. You can use the "cache.app.taggable" adapter instead (aliased to the TagAwareCacheInterface for autowiring).');
-            }
-
             $pool['adapters'] = $pool['adapters'] ?: ['cache.app'];
 
             $isRedisTagAware = ['cache.adapter.redis_tag_aware'] === $pool['adapters'];

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache_cacheapp_tagaware.php

@@ -13,7 +13,6 @@
 
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Log\LoggerAwareInterface;
-use Symfony\Bridge\PhpUnit\ExpectUserDeprecationMessageTrait;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\FrameworkExtension;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage;
@@ -96,8 +95,6 @@
 
 abstract class FrameworkExtensionTestCase extends TestCase
 {
-    use ExpectUserDeprecationMessageTrait;
-
     private static array $containerCache = [];
 
     abstract protected function loadFromFile(ContainerBuilder $container, $file);
@@ -1856,16 +1853,6 @@ public function testCacheTaggableTagAppliedToPools()
         }
     }
 
-    /**
-     * @group legacy
-     */
-    public function testTaggableCacheAppIsDeprecated()
-    {
-        $this->expectUserDeprecationMessage('Since symfony/framework-bundle 7.2: Using the "tags" option with the "cache.app" adapter is deprecated. You can use the "cache.app.taggable" adapter instead (aliased to the TagAwareCacheInterface for autowiring).');
-
-        $this->createContainerFromFile('cache_cacheapp_tagaware');
-    }
-
     /**
      * @dataProvider appRedisTagAwareConfigProvider
      */