Merge branch '5.4' into 6.3

nicolas-grekas · nicolas-grekas · commit 645bc90d6ead · 2023-08-08T12:20:07.000+02:00
* 5.4:
  [DoctrineBridge] Silence ORM deprecation
  add missing default-doctrine-dbal-provider cache pool attribute to XSD
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php b/src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php
@@ -73,6 +73,10 @@ public static function createTestConfiguration(): Configuration
             $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
         }
 
+        if (method_exists(Configuration::class, 'setLazyGhostObjectEnabled')) {
+            $config->setLazyGhostObjectEnabled(true);
+        }
+
         return $config;
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -339,6 +339,7 @@
             <xsd:element name="default-psr6-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
             <xsd:element name="default-redis-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
             <xsd:element name="default-memcached-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="default-doctrine-dbal-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
             <xsd:element name="default-pdo-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
             <xsd:element name="pool" type="cache_pool" minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,10 @@ public static function createTestConfiguration(): Configuration`
`73`	`73`	`$config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());`
`74`	`74`	`}`
`75`	`75`
	`76`	`+ if (method_exists(Configuration::class, 'setLazyGhostObjectEnabled')) {`
	`77`	`+ $config->setLazyGhostObjectEnabled(true);`
	`78`	`+ }`
	`79`	`+`
`76`	`80`	`return $config;`
`77`	`81`	`}`
`78`	`82`