Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit 58217d2d5b58 · 2023-06-05T17:31:55.000+02:00
* 6.4:
  Fix .github/expected-missing-return-types.diff
  [DoctrineBridge] Work around "Doctrine\DBAL\Connection::getEventManager()" deprecations
  [Routing] Fix Psalm
  [Lock] Fix sprintf
  Fix Crawler::filter throw phpdoc
diff --git a/.github/deprecations-baseline.json b/.github/deprecations-baseline.json
diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php b/src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bridge\Doctrine\Tests;
 
 use Doctrine\Common\Annotations\AnnotationReader;
+use Doctrine\Common\EventManager;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
 use Doctrine\ORM\Configuration;
@@ -51,7 +52,9 @@ public static function createTestEntityManager(Configuration $config = null): En
             return EntityManager::create($params, $config);
         }
 
-        return new EntityManager(DriverManager::getConnection($params, $config), $config);
+        $eventManager = new EventManager();
+
+        return new EntityManager(DriverManager::getConnection($params, $config, $eventManager), $config, $eventManager);
     }
 
     public static function createTestConfiguration(): Configuration
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bridge\Doctrine\Tests\PropertyInfo;
 
 use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\EventManager;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
 use Doctrine\DBAL\Types\Type as DBALType;
@@ -45,7 +46,8 @@ private function createExtractor()
         if (!(new \ReflectionMethod(EntityManager::class, '__construct'))->isPublic()) {
             $entityManager = EntityManager::create(['driver' => 'pdo_sqlite'], $config);
         } else {
-            $entityManager = new EntityManager(DriverManager::getConnection(['driver' => 'pdo_sqlite'], $config), $config);
+            $eventManager = new EventManager();
+            $entityManager = new EntityManager(DriverManager::getConnection(['driver' => 'pdo_sqlite'], $config, $eventManager), $config, $eventManager);
         }
 
         if (!DBALType::hasType('foo')) {
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -733,7 +733,7 @@ public function filterXPath(string $xpath): static
      *
      * This method only works if you have installed the CssSelector Symfony Component.
      *
-     * @throws \RuntimeException if the CssSelector Component is not available
+     * @throws \LogicException if the CssSelector Component is not available
      */
     public function filter(string $selector): static
     {
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
@@ -139,7 +139,8 @@ private function generateCompiledRoutes(): string
         foreach ($staticRoutes as $path => $routes) {
             $code .= sprintf("    %s => [\n", self::export($path));
             foreach ($routes as $route) {
-                $code .= sprintf("        [%s, %s, %s, %s, %s, %s, %s],\n", ...array_map([__CLASS__, 'export'], $route));
+                $r = array_map([__CLASS__, 'export'], $route);
+                $code .= sprintf("        [%s, %s, %s, %s, %s, %s, %s],\n", $r[0], $r[1], $r[2], $r[3], $r[4], $r[5], $r[6]);
             }
             $code .= "    ],\n";
         }
@@ -151,7 +152,8 @@ private function generateCompiledRoutes(): string
         foreach ($dynamicRoutes as $path => $routes) {
             $code .= sprintf("    %s => [\n", self::export($path));
             foreach ($routes as $route) {
-                $code .= sprintf("        [%s, %s, %s, %s, %s, %s, %s],\n", ...array_map([__CLASS__, 'export'], $route));
+                $r = array_map([__CLASS__, 'export'], $route);
+                $code .= sprintf("        [%s, %s, %s, %s, %s, %s, %s],\n", $r[0], $r[1], $r[2], $r[3], $r[4], $r[5], $r[6]);
             }
             $code .= "    ],\n";
         }

Original file line number	Diff line number	Diff line change
`@@ -733,7 +733,7 @@ public function filterXPath(string $xpath): static`
`733`	`733`	`*`
`734`	`734`	`* This method only works if you have installed the CssSelector Symfony Component.`
`735`	`735`	`*`
`736`		`- * @throws \RuntimeException if the CssSelector Component is not available`
	`736`	`+ * @throws \LogicException if the CssSelector Component is not available`
`737`	`737`	`*/`
`738`	`738`	`public function filter(string $selector): static`
`739`	`739`	`{`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,8 @@ private function generateCompiledRoutes(): string`
`139`	`139`	`foreach ($staticRoutes as $path => $routes) {`
`140`	`140`	`$code .= sprintf(" %s => [\n", self::export($path));`
`141`	`141`	`foreach ($routes as $route) {`
`142`		`- $code .= sprintf(" [%s, %s, %s, %s, %s, %s, %s],\n", ...array_map([__CLASS__, 'export'], $route));`
	`142`	`+ $r = array_map([__CLASS__, 'export'], $route);`
	`143`	`+ $code .= sprintf(" [%s, %s, %s, %s, %s, %s, %s],\n", $r[0], $r[1], $r[2], $r[3], $r[4], $r[5], $r[6]);`
`143`	`144`	`}`
`144`	`145`	`$code .= " ],\n";`
`145`	`146`	`}`
`@@ -151,7 +152,8 @@ private function generateCompiledRoutes(): string`
`151`	`152`	`foreach ($dynamicRoutes as $path => $routes) {`
`152`	`153`	`$code .= sprintf(" %s => [\n", self::export($path));`
`153`	`154`	`foreach ($routes as $route) {`
`154`		`- $code .= sprintf(" [%s, %s, %s, %s, %s, %s, %s],\n", ...array_map([__CLASS__, 'export'], $route));`
	`155`	`+ $r = array_map([__CLASS__, 'export'], $route);`
	`156`	`+ $code .= sprintf(" [%s, %s, %s, %s, %s, %s, %s],\n", $r[0], $r[1], $r[2], $r[3], $r[4], $r[5], $r[6]);`
`155`	`157`	`}`
`156`	`158`	`$code .= " ],\n";`
`157`	`159`	`}`