Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit adeb9b28d3a0 · 2021-11-28T16:34:37.000+01:00
* 5.4:
  [Process] intersect with getenv() in case-insensitive manner to get default envs
  [Serializer] fix support for lazy/unset properties
  Fix redundant type casts
  [Notifier] Fix AllMySms bridge body content
  Revert "[DoctrineBridge] add support for the JSON type"
diff --git a/DependencyInjection/SecurityExtension.php b/DependencyInjection/SecurityExtension.php
@@ -846,7 +846,7 @@ private function createExpression(ContainerBuilder $container, string $expressio
     private function createRequestMatcher(ContainerBuilder $container, string $path = null, string $host = null, int $port = null, array $methods = [], array $ips = null, array $attributes = []): Reference
     {
         if ($methods) {
-            $methods = array_map('strtoupper', (array) $methods);
+            $methods = array_map('strtoupper', $methods);
         }
 
         if (null !== $ips) {

Original file line number	Diff line number	Diff line change
`@@ -846,7 +846,7 @@ private function createExpression(ContainerBuilder $container, string $expressio`
`846`	`846`	`private function createRequestMatcher(ContainerBuilder $container, string $path = null, string $host = null, int $port = null, array $methods = [], array $ips = null, array $attributes = []): Reference`
`847`	`847`	`{`
`848`	`848`	`if ($methods) {`
`849`		`- $methods = array_map('strtoupper', (array) $methods);`
	`849`	`+ $methods = array_map('strtoupper', $methods);`
`850`	`850`	`}`
`851`	`851`
`852`	`852`	`if (null !== $ips) {`