[Http-Foundation] fix: test + coding standards

alli83 · alli83 · commit f95d8825557f · 2022-11-10T15:42:55.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaSubscriber.php
@@ -31,7 +31,7 @@ public function postGenerateSchema(GenerateSchemaEventArgs $event): void
         $connection = $event->getEntityManager()->getConnection();
 
         foreach ($this->pdoSessionHandlers as $pdoSessionHandler) {
-            $pdoSessionHandler->configureSchema($event->getSchema(), $connection, $this->getIsSameDatabaseChecker($connection));
+            $pdoSessionHandler->configureSchema($event->getSchema(), $this->getIsSameDatabaseChecker($connection));
         }
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
@@ -188,8 +188,6 @@ public function updateExistingToken(PersistentTokenInterface $token, #[\Sensitiv
 
     /**
      * Adds the Table to the Schema if "remember me" uses this Connection.
-     *
-     * @param \Closure $isSameDatabase
      */
     public function configureSchema(Schema $schema, Connection $forConnection/* , \Closure $isSameDatabase */): void
     {
diff --git a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaSubscriberTest.php b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaSubscriberTest.php
@@ -32,11 +32,12 @@ public function testPostGenerateSchemaPdo()
         $event = new GenerateSchemaEventArgs($entityManager, $schema);
 
         $pdoSessionHandler = $this->createMock(PdoSessionHandler::class);
+        $someFunction = function() { return true; };
         $pdoSessionHandler->expects($this->once())
             ->method('configureSchema')
-            ->with($schema, $dbalConnection);
+            ->with($schema, $someFunction);
 
-        $subscriber = new PdoSessionHandlerSchemaSubscriber($pdoSessionHandler);
+        $subscriber = new PdoSessionHandlerSchemaSubscriber([$pdoSessionHandler]);
         $subscriber->postGenerateSchema($event);
     }
 }
diff --git a/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php b/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php
@@ -98,9 +98,6 @@ public function createTable(): void
         }
     }
 
-    /**
-     * @param \Closure $isSameDatabase
-     */
     public function configureSchema(Schema $schema, Connection $forConnection/* , \Closure $isSameDatabase */): void
     {
         if ($schema->hasTable($this->table)) {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -179,7 +179,7 @@ public function __construct(\PDO|string $pdoOrDsn = null, array $options = [])
         $this->ttl = $options['ttl'] ?? null;
     }
 
-    public function configureSchema(Schema $schema, Connection $connection, \Closure $isSameDatabase): void
+    public function configureSchema(Schema $schema, \Closure $isSameDatabase): void
     {
         if ($schema->hasTable($this->table) || !$isSameDatabase($this->getConnection()->exec(...))) {
             return;
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
 
+use Doctrine\DBAL\Schema\Schema;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler;
 
@@ -326,6 +327,38 @@ public function testUrlDsn($url, $expectedDsn, $expectedUser = null, $expectedPa
         }
     }
 
+    public function testConfigureSchemaDifferentDatabase()
+    {
+        $someFunction = function() { return false; };
+        $schema = new Schema();
+
+        $pdoSessionHandler = new PdoSessionHandler($this->getMemorySqlitePdo());
+        $pdoSessionHandler->configureSchema($schema, $someFunction);
+        $this->assertFalse($schema->hasTable('sessions'));
+    }
+
+    public function testConfigureSchemaSameDatabase()
+    {
+        $someFunction = function() { return true; };
+        $schema = new Schema();
+
+        $pdoSessionHandler = new PdoSessionHandler($this->getMemorySqlitePdo());
+        $pdoSessionHandler->configureSchema($schema, $someFunction);
+        $this->assertTrue($schema->hasTable('sessions'));
+    }
+
+    public function testConfigureSchemaTableExistsPdo()
+    {
+        $schema = new Schema();
+        $schema->createTable('sessions');
+
+        $pdoSessionHandler = new PdoSessionHandler($this->getMemorySqlitePdo());
+        $someFunction = function() { return true; };
+        $pdoSessionHandler->configureSchema($schema, $someFunction);
+        $table = $schema->getTable('sessions');
+        $this->assertEmpty($table->getColumns(), 'The table was not overwritten');
+    }
+
     public function provideUrlDsnPairs()
     {
         yield ['mysql://localhost/test', 'mysql:host=localhost;dbname=test;'];
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php
@@ -408,32 +408,35 @@ public function providePlatformSql(): iterable
     public function testConfigureSchema()
     {
         $driverConnection = $this->getDBALConnectionMock();
+        $someFunction = function() { return true; };
         $schema = new Schema();
 
         $connection = new Connection(['table_name' => 'queue_table'], $driverConnection);
-        $connection->configureSchema($schema, $driverConnection);
+        $connection->configureSchema($schema, $driverConnection, $someFunction);
         $this->assertTrue($schema->hasTable('queue_table'));
     }
 
     public function testConfigureSchemaDifferentDbalConnection()
     {
         $driverConnection = $this->getDBALConnectionMock();
         $driverConnection2 = $this->getDBALConnectionMock();
+        $someFunction = function() { return false; };
         $schema = new Schema();
 
         $connection = new Connection([], $driverConnection);
-        $connection->configureSchema($schema, $driverConnection2);
+        $connection->configureSchema($schema, $driverConnection2, $someFunction);
         $this->assertFalse($schema->hasTable('messenger_messages'));
     }
 
     public function testConfigureSchemaTableExists()
     {
         $driverConnection = $this->getDBALConnectionMock();
+        $someFunction = function() { return true; };
         $schema = new Schema();
         $schema->createTable('messenger_messages');
 
         $connection = new Connection([], $driverConnection);
-        $connection->configureSchema($schema, $driverConnection);
+        $connection->configureSchema($schema, $driverConnection, $someFunction);
         $table = $schema->getTable('messenger_messages');
         $this->assertEmpty($table->getColumns(), 'The table was not overwritten');
     }
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransport.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransport.php
@@ -79,8 +79,6 @@ public function setup(): void
 
     /**
      * Adds the Table to the Schema if this transport uses this connection.
-     *
-     * @param \Closure $isSameDatabase
      */
     public function configureSchema(Schema $schema, DbalConnection $forConnection/* , \Closure $isSameDatabase */): void
     {

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function postGenerateSchema(GenerateSchemaEventArgs $event): void`
`31`	`31`	`$connection = $event->getEntityManager()->getConnection();`
`32`	`32`
`33`	`33`	`foreach ($this->pdoSessionHandlers as $pdoSessionHandler) {`
`34`		`- $pdoSessionHandler->configureSchema($event->getSchema(), $connection, $this->getIsSameDatabaseChecker($connection));`
	`34`	`+ $pdoSessionHandler->configureSchema($event->getSchema(), $this->getIsSameDatabaseChecker($connection));`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,8 +188,6 @@ public function updateExistingToken(PersistentTokenInterface $token, #[\Sensitiv`
`188`	`188`
`189`	`189`	`/**`
`190`	`190`	`* Adds the Table to the Schema if "remember me" uses this Connection.`
`191`		`- *`
`192`		`- * @param \Closure $isSameDatabase`
`193`	`191`	`*/`
`194`	`192`	`public function configureSchema(Schema $schema, Connection $forConnection/* , \Closure $isSameDatabase */): void`
`195`	`193`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,12 @@ public function testPostGenerateSchemaPdo()`
`32`	`32`	`$event = new GenerateSchemaEventArgs($entityManager, $schema);`
`33`	`33`
`34`	`34`	`$pdoSessionHandler = $this->createMock(PdoSessionHandler::class);`
	`35`	`+ $someFunction = function() { return true; };`
`35`	`36`	`$pdoSessionHandler->expects($this->once())`
`36`	`37`	`->method('configureSchema')`
`37`		`- ->with($schema, $dbalConnection);`
	`38`	`+ ->with($schema, $someFunction);`
`38`	`39`
`39`		`- $subscriber = new PdoSessionHandlerSchemaSubscriber($pdoSessionHandler);`
	`40`	`+ $subscriber = new PdoSessionHandlerSchemaSubscriber([$pdoSessionHandler]);`
`40`	`41`	`$subscriber->postGenerateSchema($event);`
`41`	`42`	`}`
`42`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,9 +98,6 @@ public function createTable(): void`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
`101`		`- /**`
`102`		`- * @param \Closure $isSameDatabase`
`103`		`- */`
`104`	`101`	`public function configureSchema(Schema $schema, Connection $forConnection/* , \Closure $isSameDatabase */): void`
`105`	`102`	`{`
`106`	`103`	`if ($schema->hasTable($this->table)) {`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ public function __construct(\PDO\|string $pdoOrDsn = null, array $options = [])`
`179`	`179`	`$this->ttl = $options['ttl'] ?? null;`
`180`	`180`	`}`
`181`	`181`
`182`		`- public function configureSchema(Schema $schema, Connection $connection, \Closure $isSameDatabase): void`
	`182`	`+ public function configureSchema(Schema $schema, \Closure $isSameDatabase): void`
`183`	`183`	`{`
`184`	`184`	`if ($schema->hasTable($this->table) \|\| !$isSameDatabase($this->getConnection()->exec(...))) {`
`185`	`185`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -408,32 +408,35 @@ public function providePlatformSql(): iterable`
`408`	`408`	`public function testConfigureSchema()`
`409`	`409`	`{`
`410`	`410`	`$driverConnection = $this->getDBALConnectionMock();`
	`411`	`+ $someFunction = function() { return true; };`
`411`	`412`	`$schema = new Schema();`
`412`	`413`
`413`	`414`	`$connection = new Connection(['table_name' => 'queue_table'], $driverConnection);`
`414`		`- $connection->configureSchema($schema, $driverConnection);`
	`415`	`+ $connection->configureSchema($schema, $driverConnection, $someFunction);`
`415`	`416`	`$this->assertTrue($schema->hasTable('queue_table'));`
`416`	`417`	`}`
`417`	`418`
`418`	`419`	`public function testConfigureSchemaDifferentDbalConnection()`
`419`	`420`	`{`
`420`	`421`	`$driverConnection = $this->getDBALConnectionMock();`
`421`	`422`	`$driverConnection2 = $this->getDBALConnectionMock();`
	`423`	`+ $someFunction = function() { return false; };`
`422`	`424`	`$schema = new Schema();`
`423`	`425`
`424`	`426`	`$connection = new Connection([], $driverConnection);`
`425`		`- $connection->configureSchema($schema, $driverConnection2);`
	`427`	`+ $connection->configureSchema($schema, $driverConnection2, $someFunction);`
`426`	`428`	`$this->assertFalse($schema->hasTable('messenger_messages'));`
`427`	`429`	`}`
`428`	`430`
`429`	`431`	`public function testConfigureSchemaTableExists()`
`430`	`432`	`{`
`431`	`433`	`$driverConnection = $this->getDBALConnectionMock();`
	`434`	`+ $someFunction = function() { return true; };`
`432`	`435`	`$schema = new Schema();`
`433`	`436`	`$schema->createTable('messenger_messages');`
`434`	`437`
`435`	`438`	`$connection = new Connection([], $driverConnection);`
`436`		`- $connection->configureSchema($schema, $driverConnection);`
	`439`	`+ $connection->configureSchema($schema, $driverConnection, $someFunction);`
`437`	`440`	`$table = $schema->getTable('messenger_messages');`
`438`	`441`	`$this->assertEmpty($table->getColumns(), 'The table was not overwritten');`
`439`	`442`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,8 +79,6 @@ public function setup(): void`
`79`	`79`
`80`	`80`	`/**`
`81`	`81`	`* Adds the Table to the Schema if this transport uses this connection.`
`82`		`- *`
`83`		`- * @param \Closure $isSameDatabase`
`84`	`82`	`*/`
`85`	`83`	`public function configureSchema(Schema $schema, DbalConnection $forConnection/* , \Closure $isSameDatabase */): void`
`86`	`84`	`{`