Skip to content

Commit

Permalink
Merge branch '6.2' into 6.3
Browse files Browse the repository at this point in the history
* 6.2:
  [DoctrineBridge] Work around "Doctrine\DBAL\Connection::getEventManager()" deprecations
  [Routing] Fix Psalm
  [Lock] Fix sprintf
  Fix Crawler::filter throw phpdoc
  • Loading branch information
nicolas-grekas committed Jun 5, 2023
2 parents 827f59f + d59dc6a commit d37ad17
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Matcher/Dumper/CompiledUrlMatcherDumper.php
Expand Up @@ -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";
}
Expand All @@ -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";
}
Expand Down

0 comments on commit d37ad17

Please sign in to comment.