Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit 1d86964942b5 · 2023-06-05T17:29:05.000+02:00
* 5.4:
  [DoctrineBridge] Work around "Doctrine\DBAL\Connection::getEventManager()" deprecations
  [Routing] Fix Psalm
  [Lock] Fix sprintf
  Fix Crawler::filter throw phpdoc
diff --git a/Store/DoctrineDbalPostgreSqlStore.php b/Store/DoctrineDbalPostgreSqlStore.php
@@ -271,7 +271,7 @@ private function unlockShared(Key $key): void
     private function filterDsn(string $dsn): string
     {
         if (!str_contains($dsn, '://')) {
-            throw new InvalidArgumentException(sprintf('String "%" is not a valid DSN for Doctrine DBAL.', $dsn));
+            throw new InvalidArgumentException(sprintf('String "%s" is not a valid DSN for Doctrine DBAL.', $dsn));
         }
 
         [$scheme, $rest] = explode(':', $dsn, 2);

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ private function unlockShared(Key $key): void`
`271`	`271`	`private function filterDsn(string $dsn): string`
`272`	`272`	`{`
`273`	`273`	`if (!str_contains($dsn, '://')) {`
`274`		`- throw new InvalidArgumentException(sprintf('String "%" is not a valid DSN for Doctrine DBAL.', $dsn));`
	`274`	`+ throw new InvalidArgumentException(sprintf('String "%s" is not a valid DSN for Doctrine DBAL.', $dsn));`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`[$scheme, $rest] = explode(':', $dsn, 2);`