8000 Merge branch '6.3' into 6.4 · symfony/symfony@fe77631 · GitHub
[go: up one dir, main page]
Skip to content

Commit fe77631

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.3' into 6.4
* 6.3: 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
2 parents 0d51271 + eeb92df commit fe77631

File tree

6 files changed

+119
-487
lines changed

6 files changed

+119
-487
lines changed

‎.github/deprecations-baseline.json

Lines changed: 1 addition & 411 deletions
Large diffs are not rendered by default.

‎.github/expected-missing-return-types.diff

Lines changed: 106 additions & 71 deletions
Large diffs are not rendered by default.

‎src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bridge\Doctrine\Tests;
1313

1414
use Doctrine\Common\Annotations\AnnotationReader;
15+
use Doctrine\Common\EventManager;
1516
use Doctrine\DBAL\DriverManager;
1617
use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
1718
use Doctrine\ORM\Configuration;
@@ -51,7 +52,9 @@ public static function createTestEntityManager(Configuration $config = null): En
5152
return EntityManager::create($params, $config);
5253
}
5354

54-
return new EntityManager(DriverManager::getConnection($params, $config), $config);
55+
$eventManager = new EventManager();
56+
57+
return new EntityManager(DriverManager::getConnection($params, $config, $eventManager), $config, $eventManager);
5558
}
5659

5760
public static function createTestConfiguration(): Configuration

‎src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bridge\Doctrine\Tests\PropertyInfo;
1313

1414
use Doctrine\Common\Collections\Collection;
15+
use Doctrine\Common\EventManager;
1516
use Doctrine\DBAL\DriverManager;
1617
use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
1718
use Doctrine\DBAL\Types\Type as DBALType;
@@ -45,7 +46,8 @@ private function createExtractor()
4546
if (!(new \ReflectionMethod(EntityManager::class, '__construct'))->isPublic()) {
4647
$entityManager = EntityManager::create(['driver' => 'pdo_sqlite'], $config);
4748
} else {
48-
$entityManager = new EntityManager(DriverManager::getConnection(['driver' => 'pdo_sqlite'], $config), $config);
49+
$eventManager = new EventManager();
50+
$entityManager = new EntityManager(DriverManager::getConnection(['driver' => 'pdo_sqlite'], $config, $eventManager), $config, $eventManager);
4951
}
5052

5153
if (!DBALType::hasType('foo')) {

‎src/Symfony/Component/DomCrawler/Crawler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ public function filterXPath(string $xpath): static
733733
*
734734
* This method only works if you have installed the CssSelector Symfony Component.
735735
*
736-
* @throws \RuntimeException if the CssSelector Component is not available
736+
* @throws \LogicException if the CssSelector Component is not available
737737
*/
738738
public function filter(string $selector): static
739739
{

‎src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ private function generateCompiledRoutes(): string
139139
foreach ($staticRoutes as $path => $routes) {
140140
$code .= sprintf(" %s => [\n", self::export($path));
141141
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]);
143144
}
144145
$code .= " ],\n";
145146
}
@@ -151,7 +152,8 @@ private function generateCompiledRoutes(): string
151152
foreach ($dynamicRoutes as $path => $routes) {
152153
$code .= sprintf(" %s => [\n", self::export($path));
153154
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]);
155157
}
156158
$code .= " ],\n";
157159
}

0 commit comments

Comments
 (0)
0