Merge branch '5.4' into 6.0

* 5.4: (35 commits)
  fix: Improve FR validators translation
  [Notifier] Add push channel to notifier
  Fix CS
  [Lock] Split PdoStore into DoctrineDbalStore
  [Cache] Split PdoAdapter into DoctrineDbalAdapter
  Add swedish translation for issue #43458
  [HttpClient] fix collecting debug info on destruction of CurlResponse
  Fix CS
  added missing thai translations
  Add missing translations for Chinese (zh_TW)
  [DependencyInjection] fix "url" env var processor
  update translation
  [Serializer] symfony#36594 attributes cache breaks normalization
  Remove untranslated translation for Afrikaans
  [Validator] Add missing validator polish translation
  [Security,Validator] Added missing Latvian translations #41053
  Add the missing translations for Indonesian (id)
  [Validator] Add missing Lithuanian translation
  [Validator] Add missing Czech translation
  replace "ispravna" with "važeća" in translating "valid HTML/CSS"
  ...

Author: derrabus

CHANGELOG.md

@@ -10,6 +10,7 @@ CHANGELOG
 ---
 
  * Add `DoctrineOpenTransactionLoggerMiddleware` to log when a transaction has been left open
+ * Deprecate `PdoCacheAdapterDoctrineSchemaSubscriber` and add `DoctrineDbalCacheAdapterSchemaSubscriber` instead
 
 5.3
 ---

SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriber.php

@@ -0,0 +1,55 @@
+<?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\Bridge\Doctrine\SchemaListener;
+
+use Doctrine\Common\EventSubscriber;
+use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
+use Doctrine\ORM\Tools\ToolEvents;
+use Symfony\Component\Cache\Adapter\DoctrineSchemaConfiguratorInterface;
+
+/**
+ * Automatically adds the cache table needed for the DoctrineDbalAdapter of
+ * the Cache component.
+ *
+ * @author Ryan Weaver <[email protected]>
+ */
+final class DoctrineDbalCacheAdapterSchemaSubscriber implements EventSubscriber
+{
+    private $dbalAdapters;
+
+    /**
+     * @param iterable<mixed, DoctrineSchemaConfiguratorInterface> $dbalAdapters
+     */
+    public function __construct(iterable $dbalAdapters)
+    {
+        $this->dbalAdapters = $dbalAdapters;
+    }
+
+    public function postGenerateSchema(GenerateSchemaEventArgs $event): void
+    {
+        $dbalConnection = $event->getEntityManager()->getConnection();
+        foreach ($this->dbalAdapters as $dbalAdapter) {
+            $dbalAdapter->configureSchema($event->getSchema(), $dbalConnection);
+        }
+    }
+
+    public function getSubscribedEvents(): array
+    {
+        if (!class_exists(ToolEvents::class)) {
+            return [];
+        }
+
+        return [
+            ToolEvents::postGenerateSchema,
+        ];
+    }
+}

SchemaListener/PdoCacheAdapterDoctrineSchemaSubscriber.php

@@ -16,10 +16,14 @@
 use Doctrine\ORM\Tools\ToolEvents;
 use Symfony\Component\Cache\Adapter\PdoAdapter;
 
+trigger_deprecation('symfony/doctrine-bridge', '5.4', 'The "%s" class is deprecated, use "%s" instead.', PdoCacheAdapterDoctrineSchemaSubscriber::class, DoctrineDbalCacheAdapterSchemaSubscriber::class);
+
 /**
  * Automatically adds the cache table needed for the PdoAdapter.
  *
  * @author Ryan Weaver <[email protected]>
+ *
+ * @deprecated since symfony 5.4 use DoctrineDbalCacheAdapterSchemaSubscriber
  */
 final class PdoCacheAdapterDoctrineSchemaSubscriber implements EventSubscriber
 {

Tests/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriberTest.php

@@ -0,0 +1,42 @@
+<?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\Bridge\Doctrine\Tests\SchemaListener;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Doctrine\SchemaListener\DoctrineDbalCacheAdapterSchemaSubscriber;
+use Symfony\Component\Cache\Adapter\DoctrineSchemaConfiguratorInterface;
+
+class DoctrineDbalCacheAdapterSchemaSubscriberTest extends TestCase
+{
+    public function testPostGenerateSchema()
+    {
+        $schema = new Schema();
+        $dbalConnection = $this->createMock(Connection::class);
+        $entityManager = $this->createMock(EntityManagerInterface::class);
+        $entityManager->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($dbalConnection);
+        $event = new GenerateSchemaEventArgs($entityManager, $schema);
+
+        $pdoAdapter = $this->createMock(DoctrineSchemaConfiguratorInterface::class);
+        $pdoAdapter->expects($this->once())
+            ->method('configureSchema')
+            ->with($schema, $dbalConnection);
+
+        $subscriber = new DoctrineDbalCacheAdapterSchemaSubscriber([$pdoAdapter]);
+        $subscriber->postGenerateSchema($event);
+    }
+}

Tests/SchemaListener/PdoCacheAdapterDoctrineSchemaSubscriberTest.php

@@ -19,6 +19,9 @@
 use Symfony\Bridge\Doctrine\SchemaListener\PdoCacheAdapterDoctrineSchemaSubscriber;
 use Symfony\Component\Cache\Adapter\PdoAdapter;
 
+/**
+ * @group legacy
+ */
 class PdoCacheAdapterDoctrineSchemaSubscriberTest extends TestCase
 {
     public function testPostGenerateSchema()

composer.json

@@ -46,14 +46,15 @@
         "doctrine/annotations": "^1.10.4",
         "doctrine/collections": "~1.0",
         "doctrine/data-fixtures": "^1.1",
-        "doctrine/dbal": "^2.13|^3.0",
+        "doctrine/dbal": "^2.13.1|^3.0",
         "doctrine/orm": "^2.7.3",
         "psr/log": "^1|^2|^3"
     },
     "conflict": {
-        "doctrine/dbal": "<2.13",
+        "doctrine/dbal": "<2.13.1",
         "doctrine/orm": "<2.7.3",
         "phpunit/phpunit": "<5.4.3",
+        "symfony/cache": "<5.4",
         "symfony/dependency-injection": "<5.4",
         "symfony/form": "<5.4",
         "symfony/http-kernel": "<5.4",