minor #50699 [DoctrineBridge] add missing UPGRADE notes for #50689 and update tests (alli83)

nicolas-grekas · nicolas-grekas · commit 8648df561013 · 2023-06-21T11:32:24.000+02:00
This PR was merged into the 6.3 branch. Discussion ---------- [DoctrineBridge] add missing UPGRADE notes for #50689 and update tests | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | no | New feature? | no | Deprecations? | yes | Tickets | | License | MIT | Doc PR | `$isSameDatabase` parameter was introduced in #48059. It has been added in order to know whether the database used by doctrine is the same as the one used by the component when integrating the latter with doctrine migrations. Also related to #50689 Commits ------- 5d2817d [DoctrineBridge] add missing UPGRADE notes for #50689
diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
@@ -1,6 +1,11 @@
 UPGRADE FROM 6.2 to 6.3
 =======================
 
+Cache
+-----
+
+ * `DoctrineDbalAdapter` now takes an optional `$isSameDatabase` parameter
+
 Console
 -------
 
@@ -22,6 +27,8 @@ DoctrineBridge
  * Deprecate `DoctrineDbalCacheAdapterSchemaSubscriber` in favor of `DoctrineDbalCacheAdapterSchemaListener`
  * Deprecate `MessengerTransportDoctrineSchemaSubscriber` in favor of `MessengerTransportDoctrineSchemaListener`
  * Deprecate `RememberMeTokenProviderDoctrineSchemaSubscriber` in favor of `RememberMeTokenProviderDoctrineSchemaListener`
+ * `DoctrineTransport` now takes an optional `$isSameDatabase` parameter
+ * `DoctrineTokenProvider` now takes an optional `$isSameDatabase` parameter
 
 Form
 ----
diff --git a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/DoctrineDbalCacheAdapterSchemaListenerTest.php b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/DoctrineDbalCacheAdapterSchemaListenerTest.php
@@ -35,7 +35,7 @@ public function testPostGenerateSchema()
         $dbalAdapter = $this->createMock(DoctrineDbalAdapter::class);
         $dbalAdapter->expects($this->once())
             ->method('configureSchema')
-            ->with($schema, $dbalConnection);
+            ->with($schema, $dbalConnection, fn () => true);
 
         $subscriber = new DoctrineDbalCacheAdapterSchemaListener([$dbalAdapter]);
         $subscriber->postGenerateSchema($event);
diff --git a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/MessengerTransportDoctrineSchemaListenerTest.php b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/MessengerTransportDoctrineSchemaListenerTest.php
@@ -38,7 +38,7 @@ public function testPostGenerateSchema()
         $doctrineTransport = $this->createMock(DoctrineTransport::class);
         $doctrineTransport->expects($this->once())
             ->method('configureSchema')
-            ->with($schema, $dbalConnection);
+            ->with($schema, $dbalConnection, fn () => true);
         $otherTransport = $this->createMock(TransportInterface::class);
         $otherTransport->expects($this->never())
             ->method($this->anything());
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportTest.php
@@ -64,9 +64,9 @@ public function testConfigureSchema()
 
         $connection->expects($this->once())
             ->method('configureSchema')
-            ->with($schema, $dbalConnection);
+            ->with($schema, $dbalConnection, static fn () => true);
 
-        $transport->configureSchema($schema, $dbalConnection);
+        $transport->configureSchema($schema, $dbalConnection, static fn () => true);
     }
 
     private function getTransport(SerializerInterface $serializer = null, Connection $connection = null): DoctrineTransport

Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,9 @@ public function testConfigureSchema()`
`64`	`64`
`65`	`65`	`$connection->expects($this->once())`
`66`	`66`	`->method('configureSchema')`
`67`		`- ->with($schema, $dbalConnection);`
	`67`	`+ ->with($schema, $dbalConnection, static fn () => true);`
`68`	`68`
`69`		`- $transport->configureSchema($schema, $dbalConnection);`
	`69`	`+ $transport->configureSchema($schema, $dbalConnection, static fn () => true);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`private function getTransport(SerializerInterface $serializer = null, Connection $connection = null): DoctrineTransport`