Merge branch '7.4' into 8.0

nicolas-grekas · nicolas-grekas · commit e05c906dca29 · 2025-06-15T12:09:48.000+02:00
* 7.4:
  Fix-type-error-when-revealing-broken-secret
  replace expectDeprecation() with expectUserDeprecationMessage()
  fix compatibility with Relay 0.11
  [Security] Handle non-callable implementations of `FirewallListenerInterface`
  [Console] Allow Usages to be specified via #[AsCommand]
  [DomCrawler] Allow selecting `button`s by their `value`
  flip excluded properties with keys with Doctrine-style constraint config
  [JsonPath] Test against official compliance test suite
  Silence E_DEPRECATED and E_USER_DEPRECATED
  [HttpCache] Hit the backend only once after waiting for the cache lock
  fix compatibility with Symfony 7.4
  [Form] Keep submitted values when keep_as_list option of collection type is enabled
  [Form] Fix `keep_as_list` when data is not an array
  [JsonPath] Fix subexpression evaluation in filters
  [JsonPath] Fix support for comma separated indices
diff --git a/Tests/Generator/UrlGeneratorTest.php b/Tests/Generator/UrlGeneratorTest.php
@@ -1116,7 +1116,7 @@ public function testQueryParametersWithScalarValue()
     {
         $routes = $this->getRoutes('user', new Route('/user/{id}'));
 
-        $this->expectDeprecation(
+        $this->expectUserDeprecationMessage(
             'Since symfony/routing 7.4: Parameter "_query" is reserved for passing an array of query parameters. ' .
             'Passing a scalar value is deprecated and will throw an exception in Symfony 8.0.',
         );

Original file line number	Diff line number	Diff line change
`@@ -1116,7 +1116,7 @@ public function testQueryParametersWithScalarValue()`
`1116`	`1116`	`{`
`1117`	`1117`	`$routes = $this->getRoutes('user', new Route('/user/{id}'));`
`1118`	`1118`
`1119`		`- $this->expectDeprecation(`
	`1119`	`+ $this->expectUserDeprecationMessage(`
`1120`	`1120`	`'Since symfony/routing 7.4: Parameter "_query" is reserved for passing an array of query parameters. ' .`
`1121`	`1121`	`'Passing a scalar value is deprecated and will throw an exception in Symfony 8.0.',`
`1122`	`1122`	`);`