Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 58217d2

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.4' into 7.0
* 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
2 parents 68b992b + fe77631 commit 58217d2
Copy full SHA for 58217d2

File tree

Expand file treeCollapse file tree

6 files changed

+119
-487
lines changed
Filter options
Expand file treeCollapse file tree

6 files changed

+119
-487
lines changed

‎.github/deprecations-baseline.json

Copy file name to clipboardExpand all lines: .github/deprecations-baseline.json
+1-411Lines changed: 1 addition & 411 deletions
Large diffs are not rendered by default.

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

Copy file name to clipboardExpand all lines: .github/expected-missing-return-types.diff
+106-71Lines changed: 106 additions & 71 deletions
Large diffs are not rendered by default.

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

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php
+4-1Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
+3-1Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/DomCrawler/Crawler.php
+1-1Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
+4-2Lines 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)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.