Fix merge

nicolas-grekas · nicolas-grekas · commit bb6e4da210a8 · 2022-12-16T17:04:38.000+01:00
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/DoctrineDbalAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/DoctrineDbalAdapterTest.php
@@ -79,7 +79,7 @@ public function testConfigureSchema()
         $schema = new Schema();
 
         $adapter = new DoctrineDbalAdapter($connection);
-        $adapter->configureSchema($schema, $connection);
+        $adapter->configureSchema($schema, $connection, fn() => true);
         $this->assertTrue($schema->hasTable('cache_items'));
     }
 
@@ -89,7 +89,7 @@ public function testConfigureSchemaDifferentDbalConnection()
         $schema = new Schema();
 
         $adapter = $this->createCachePool();
-        $adapter->configureSchema($schema, $otherConnection);
+        $adapter->configureSchema($schema, $otherConnection, fn () => false);
         $this->assertFalse($schema->hasTable('cache_items'));
     }
 
@@ -100,7 +100,7 @@ public function testConfigureSchemaTableExists()
         $schema->createTable('cache_items');
 
         $adapter = new DoctrineDbalAdapter($connection);
-        $adapter->configureSchema($schema, $connection);
+        $adapter->configureSchema($schema, $connection, fn() => true);
         $table = $schema->getTable('cache_items');
         $this->assertEmpty($table->getColumns(), 'The table was not overwritten');
     }
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php
@@ -422,7 +422,7 @@ public function testConfigureSchemaDifferentDbalConnection()
         $schema = new Schema();
 
         $connection = new Connection([], $driverConnection);
-        $connection->configureSchema($schema, $driverConnection2, fn() => true);
+        $connection->configureSchema($schema, $driverConnection2, fn() => false);
         $this->assertFalse($schema->hasTable('messenger_messages'));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -422,7 +422,7 @@ public function testConfigureSchemaDifferentDbalConnection()`
`422`	`422`	`$schema = new Schema();`
`423`	`423`
`424`	`424`	`$connection = new Connection([], $driverConnection);`
`425`		`- $connection->configureSchema($schema, $driverConnection2, fn() => true);`
	`425`	`+ $connection->configureSchema($schema, $driverConnection2, fn() => false);`
`426`	`426`	`$this->assertFalse($schema->hasTable('messenger_messages'));`
`427`	`427`	`}`
`428`	`428`