[DoctrineBridge]rm BC layer configureSchema check database

alli83 · alli83 · commit 098a7479d6f6 · 2023-06-26T17:35:39.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
@@ -179,17 +179,13 @@ 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
+    public function configureSchema(Schema $schema, Connection $forConnection, \Closure $isSameDatabase): void
     {
         if ($schema->hasTable('rememberme_token')) {
             return;
         }
 
-        $isSameDatabase = 2 < \func_num_args() ? func_get_arg(2) : static fn () => false;
-
         if ($forConnection !== $this->conn && !$isSameDatabase($this->conn->executeStatement(...))) {
             return;
         }
diff --git a/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php b/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php
@@ -117,17 +117,12 @@ public function createTable(): void
         }
     }
 
-    /**
-     * @param \Closure $isSameDatabase
-     */
-    public function configureSchema(Schema $schema, Connection $forConnection/* , \Closure $isSameDatabase */): void
+    public function configureSchema(Schema $schema, Connection $forConnection, \Closure $isSameDatabase): void
     {
         if ($schema->hasTable($this->table)) {
             return;
         }
 
-        $isSameDatabase = 2 < \func_num_args() ? func_get_arg(2) : static fn () => false;
-
         if ($forConnection !== $this->conn && !$isSameDatabase($this->conn->executeStatement(...))) {
             return;
         }
diff --git a/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php b/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php
@@ -199,7 +199,7 @@ public function exists(Key $key): bool
     public function createTable(): void
     {
         $schema = new Schema();
-        $this->configureSchema($schema);
+        $this->configureSchema($schema, static fn () => true);
 
         foreach ($schema->toSql($this->conn->getDatabasePlatform()) as $sql) {
             $this->conn->executeStatement($sql);
@@ -208,17 +208,13 @@ public function createTable(): void
 
     /**
      * Adds the Table to the Schema if it doesn't exist.
-     *
-     * @param \Closure $isSameDatabase
      */
-    public function configureSchema(Schema $schema/* , \Closure $isSameDatabase */): void
+    public function configureSchema(Schema $schema, \Closure $isSameDatabase): void
     {
         if ($schema->hasTable($this->table)) {
             return;
         }
 
-        $isSameDatabase = 1 < \func_num_args() ? func_get_arg(1) : static fn () => true;
-
         if (!$isSameDatabase($this->conn->executeStatement(...))) {
             return;
         }
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransport.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransport.php
@@ -79,13 +79,9 @@ 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
+    public function configureSchema(Schema $schema, DbalConnection $forConnection, \Closure $isSameDatabase): void
     {
-        $isSameDatabase = 2 < \func_num_args() ? func_get_arg(2) : static fn () => false;
-
         $this->connection->configureSchema($schema, $forConnection, $isSameDatabase);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -179,17 +179,13 @@ public function updateExistingToken(PersistentTokenInterface $token, #[\Sensitiv`
`179`	`179`
`180`	`180`	`/**`
`181`	`181`	`* Adds the Table to the Schema if "remember me" uses this Connection.`
`182`		`- *`
`183`		`- * @param \Closure $isSameDatabase`
`184`	`182`	`*/`
`185`		`- public function configureSchema(Schema $schema, Connection $forConnection/* , \Closure $isSameDatabase */): void`
	`183`	`+ public function configureSchema(Schema $schema, Connection $forConnection, \Closure $isSameDatabase): void`
`186`	`184`	`{`
`187`	`185`	`if ($schema->hasTable('rememberme_token')) {`
`188`	`186`	`return;`
`189`	`187`	`}`
`190`	`188`
`191`		`- $isSameDatabase = 2 < \func_num_args() ? func_get_arg(2) : static fn () => false;`
`192`		`-`
`193`	`189`	`if ($forConnection !== $this->conn && !$isSameDatabase($this->conn->executeStatement(...))) {`
`194`	`190`	`return;`
`195`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,17 +117,12 @@ public function createTable(): void`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`
`120`		`- /**`
`121`		`- * @param \Closure $isSameDatabase`
`122`		`- */`
`123`		`- public function configureSchema(Schema $schema, Connection $forConnection/* , \Closure $isSameDatabase */): void`
	`120`	`+ public function configureSchema(Schema $schema, Connection $forConnection, \Closure $isSameDatabase): void`
`124`	`121`	`{`
`125`	`122`	`if ($schema->hasTable($this->table)) {`
`126`	`123`	`return;`
`127`	`124`	`}`
`128`	`125`
`129`		`- $isSameDatabase = 2 < \func_num_args() ? func_get_arg(2) : static fn () => false;`
`130`		`-`
`131`	`126`	`if ($forConnection !== $this->conn && !$isSameDatabase($this->conn->executeStatement(...))) {`
`132`	`127`	`return;`
`133`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ public function exists(Key $key): bool`
`199`	`199`	`public function createTable(): void`
`200`	`200`	`{`
`201`	`201`	`$schema = new Schema();`
`202`		`- $this->configureSchema($schema);`
	`202`	`+ $this->configureSchema($schema, static fn () => true);`
`203`	`203`
`204`	`204`	`foreach ($schema->toSql($this->conn->getDatabasePlatform()) as $sql) {`
`205`	`205`	`$this->conn->executeStatement($sql);`
`@@ -208,17 +208,13 @@ public function createTable(): void`
`208`	`208`
`209`	`209`	`/**`
`210`	`210`	`* Adds the Table to the Schema if it doesn't exist.`
`211`		`- *`
`212`		`- * @param \Closure $isSameDatabase`
`213`	`211`	`*/`
`214`		`- public function configureSchema(Schema $schema/* , \Closure $isSameDatabase */): void`
	`212`	`+ public function configureSchema(Schema $schema, \Closure $isSameDatabase): void`
`215`	`213`	`{`
`216`	`214`	`if ($schema->hasTable($this->table)) {`
`217`	`215`	`return;`
`218`	`216`	`}`
`219`	`217`
`220`		`- $isSameDatabase = 1 < \func_num_args() ? func_get_arg(1) : static fn () => true;`
`221`		`-`
`222`	`218`	`if (!$isSameDatabase($this->conn->executeStatement(...))) {`
`223`	`219`	`return;`
`224`	`220`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,13 +79,9 @@ 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`		`- public function configureSchema(Schema $schema, DbalConnection $forConnection/* , \Closure $isSameDatabase */): void`
	`83`	`+ public function configureSchema(Schema $schema, DbalConnection $forConnection, \Closure $isSameDatabase): void`
`86`	`84`	`{`
`87`		`- $isSameDatabase = 2 < \func_num_args() ? func_get_arg(2) : static fn () => false;`
`88`		`-`
`89`	`85`	`$this->connection->configureSchema($schema, $forConnection, $isSameDatabase);`
`90`	`86`	`}`
`91`	`87`