Merge pull request doctrine#11811 from greg0ire/quoteIdentifier-depr

greg0ire · web-flow · commit aff82af7debf · 2025-01-28T23:17:29.000+01:00
Address quoteIdentifier() deprecation
diff --git a/src/Mapping/DefaultQuoteStrategy.php b/src/Mapping/DefaultQuoteStrategy.php
@@ -24,7 +24,7 @@ class DefaultQuoteStrategy implements QuoteStrategy
     public function getColumnName(string $fieldName, ClassMetadata $class, AbstractPlatform $platform): string
     {
         return isset($class->fieldMappings[$fieldName]->quoted)
-            ? $platform->quoteIdentifier($class->fieldMappings[$fieldName]->columnName)
+            ? $platform->quoteSingleIdentifier($class->fieldMappings[$fieldName]->columnName)
             : $class->fieldMappings[$fieldName]->columnName;
     }
 
@@ -42,7 +42,7 @@ public function getTableName(ClassMetadata $class, AbstractPlatform $platform):
         }
 
         return isset($class->table['quoted'])
-            ? $platform->quoteIdentifier($tableName)
+            ? $platform->quoteSingleIdentifier($tableName)
             : $tableName;
     }
 
@@ -52,14 +52,14 @@ public function getTableName(ClassMetadata $class, AbstractPlatform $platform):
     public function getSequenceName(array $definition, ClassMetadata $class, AbstractPlatform $platform): string
     {
         return isset($definition['quoted'])
-            ? $platform->quoteIdentifier($definition['sequenceName'])
+            ? $platform->quoteSingleIdentifier($definition['sequenceName'])
             : $definition['sequenceName'];
     }
 
     public function getJoinColumnName(JoinColumnMapping $joinColumn, ClassMetadata $class, AbstractPlatform $platform): string
     {
         return isset($joinColumn->quoted)
-            ? $platform->quoteIdentifier($joinColumn->name)
+            ? $platform->quoteSingleIdentifier($joinColumn->name)
             : $joinColumn->name;
     }
 
@@ -69,7 +69,7 @@ public function getReferencedJoinColumnName(
         AbstractPlatform $platform,
     ): string {
         return isset($joinColumn->quoted)
-            ? $platform->quoteIdentifier($joinColumn->referencedColumnName)
+            ? $platform->quoteSingleIdentifier($joinColumn->referencedColumnName)
             : $joinColumn->referencedColumnName;
     }
 
@@ -87,7 +87,7 @@ public function getJoinTableName(
         $tableName = $association->joinTable->name;
 
         if (isset($association->joinTable->quoted)) {
-            $tableName = $platform->quoteIdentifier($tableName);
+            $tableName = $platform->quoteSingleIdentifier($tableName);
         }
 
         return $schema . $tableName;
@@ -113,7 +113,7 @@ public function getIdentifierColumnNames(ClassMetadata $class, AbstractPlatform
             $joinColumns            = $assoc->joinColumns;
             $assocQuotedColumnNames = array_map(
                 static fn (JoinColumnMapping $joinColumn) => isset($joinColumn->quoted)
-                    ? $platform->quoteIdentifier($joinColumn->name)
+                    ? $platform->quoteSingleIdentifier($joinColumn->name)
                     : $joinColumn->name,
                 $joinColumns,
             );
diff --git a/tests/Tests/ORM/Functional/Ticket/DDC832Test.php b/tests/Tests/ORM/Functional/Ticket/DDC832Test.php
@@ -42,14 +42,14 @@ public function tearDown(): void
         $platform = $this->_em->getConnection()->getDatabasePlatform();
 
         $sm = $this->createSchemaManager();
-        $sm->dropTable($platform->quoteIdentifier('TREE_INDEX'));
-        $sm->dropTable($platform->quoteIdentifier('INDEX'));
-        $sm->dropTable($platform->quoteIdentifier('LIKE'));
+        $sm->dropTable($platform->quoteSingleIdentifier('TREE_INDEX'));
+        $sm->dropTable($platform->quoteSingleIdentifier('INDEX'));
+        $sm->dropTable($platform->quoteSingleIdentifier('LIKE'));
 
         // DBAL 3
         if ($platform instanceof PostgreSQLPlatform && method_exists($platform, 'getIdentitySequenceName')) {
-            $sm->dropSequence($platform->quoteIdentifier('INDEX_id_seq'));
-            $sm->dropSequence($platform->quoteIdentifier('LIKE_id_seq'));
+            $sm->dropSequence($platform->quoteSingleIdentifier('INDEX_id_seq'));
+            $sm->dropSequence($platform->quoteSingleIdentifier('LIKE_id_seq'));
         }
     }
 
diff --git a/tests/Tests/OrmFunctionalTestCase.php b/tests/Tests/OrmFunctionalTestCase.php
@@ -614,7 +614,7 @@ protected function tearDown(): void
         }
 
         if (isset($this->_usedModelSets['directorytree'])) {
-            $conn->executeStatement('DELETE FROM ' . $platform->quoteIdentifier('file'));
+            $conn->executeStatement('DELETE FROM ' . $platform->quoteSingleIdentifier('file'));
             // MySQL doesn't know deferred deletions therefore only executing the second query gives errors.
             $conn->executeStatement('DELETE FROM Directory WHERE parentDirectory_id IS NOT NULL');
             $conn->executeStatement('DELETE FROM Directory');
@@ -707,17 +707,17 @@ protected function tearDown(): void
             $conn->executeStatement(
                 sprintf(
                     'UPDATE %s SET %s = NULL',
-                    $platform->quoteIdentifier('quote-address'),
-                    $platform->quoteIdentifier('user-id'),
+                    $platform->quoteSingleIdentifier('quote-address'),
+                    $platform->quoteSingleIdentifier('user-id'),
                 ),
             );
 
-            $conn->executeStatement('DELETE FROM ' . $platform->quoteIdentifier('quote-users-groups'));
-            $conn->executeStatement('DELETE FROM ' . $platform->quoteIdentifier('quote-group'));
-            $conn->executeStatement('DELETE FROM ' . $platform->quoteIdentifier('quote-phone'));
-            $conn->executeStatement('DELETE FROM ' . $platform->quoteIdentifier('quote-user'));
-            $conn->executeStatement('DELETE FROM ' . $platform->quoteIdentifier('quote-address'));
-            $conn->executeStatement('DELETE FROM ' . $platform->quoteIdentifier('quote-city'));
+            $conn->executeStatement('DELETE FROM ' . $platform->quoteSingleIdentifier('quote-users-groups'));
+            $conn->executeStatement('DELETE FROM ' . $platform->quoteSingleIdentifier('quote-group'));
+            $conn->executeStatement('DELETE FROM ' . $platform->quoteSingleIdentifier('quote-phone'));
+            $conn->executeStatement('DELETE FROM ' . $platform->quoteSingleIdentifier('quote-user'));
+            $conn->executeStatement('DELETE FROM ' . $platform->quoteSingleIdentifier('quote-address'));
+            $conn->executeStatement('DELETE FROM ' . $platform->quoteSingleIdentifier('quote-city'));
         }
 
         if (isset($this->_usedModelSets['vct_onetoone'])) {

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class DefaultQuoteStrategy implements QuoteStrategy`
`24`	`24`	`public function getColumnName(string $fieldName, ClassMetadata $class, AbstractPlatform $platform): string`
`25`	`25`	`{`
`26`	`26`	`return isset($class->fieldMappings[$fieldName]->quoted)`
`27`		`- ? $platform->quoteIdentifier($class->fieldMappings[$fieldName]->columnName)`
	`27`	`+ ? $platform->quoteSingleIdentifier($class->fieldMappings[$fieldName]->columnName)`
`28`	`28`	`: $class->fieldMappings[$fieldName]->columnName;`
`29`	`29`	`}`
`30`	`30`
`@@ -42,7 +42,7 @@ public function getTableName(ClassMetadata $class, AbstractPlatform $platform):`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`return isset($class->table['quoted'])`
`45`		`- ? $platform->quoteIdentifier($tableName)`
	`45`	`+ ? $platform->quoteSingleIdentifier($tableName)`
`46`	`46`	`: $tableName;`
`47`	`47`	`}`
`48`	`48`
`@@ -52,14 +52,14 @@ public function getTableName(ClassMetadata $class, AbstractPlatform $platform):`
`52`	`52`	`public function getSequenceName(array $definition, ClassMetadata $class, AbstractPlatform $platform): string`
`53`	`53`	`{`
`54`	`54`	`return isset($definition['quoted'])`
`55`		`- ? $platform->quoteIdentifier($definition['sequenceName'])`
	`55`	`+ ? $platform->quoteSingleIdentifier($definition['sequenceName'])`
`56`	`56`	`: $definition['sequenceName'];`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public function getJoinColumnName(JoinColumnMapping $joinColumn, ClassMetadata $class, AbstractPlatform $platform): string`
`60`	`60`	`{`
`61`	`61`	`return isset($joinColumn->quoted)`
`62`		`- ? $platform->quoteIdentifier($joinColumn->name)`
	`62`	`+ ? $platform->quoteSingleIdentifier($joinColumn->name)`
`63`	`63`	`: $joinColumn->name;`
`64`	`64`	`}`
`65`	`65`
`@@ -69,7 +69,7 @@ public function getReferencedJoinColumnName(`
`69`	`69`	`AbstractPlatform $platform,`
`70`	`70`	`): string {`
`71`	`71`	`return isset($joinColumn->quoted)`
`72`		`- ? $platform->quoteIdentifier($joinColumn->referencedColumnName)`
	`72`	`+ ? $platform->quoteSingleIdentifier($joinColumn->referencedColumnName)`
`73`	`73`	`: $joinColumn->referencedColumnName;`
`74`	`74`	`}`
`75`	`75`
`@@ -87,7 +87,7 @@ public function getJoinTableName(`
`87`	`87`	`$tableName = $association->joinTable->name;`
`88`	`88`
`89`	`89`	`if (isset($association->joinTable->quoted)) {`
`90`		`- $tableName = $platform->quoteIdentifier($tableName);`
	`90`	`+ $tableName = $platform->quoteSingleIdentifier($tableName);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`return $schema . $tableName;`
`@@ -113,7 +113,7 @@ public function getIdentifierColumnNames(ClassMetadata $class, AbstractPlatform`
`113`	`113`	`$joinColumns = $assoc->joinColumns;`
`114`	`114`	`$assocQuotedColumnNames = array_map(`
`115`	`115`	`static fn (JoinColumnMapping $joinColumn) => isset($joinColumn->quoted)`
`116`		`- ? $platform->quoteIdentifier($joinColumn->name)`
	`116`	`+ ? $platform->quoteSingleIdentifier($joinColumn->name)`
`117`	`117`	`: $joinColumn->name,`
`118`	`118`	`$joinColumns,`
`119`	`119`	`);`