Merge branch '4.4' into 5.3

nicolas-grekas · nicolas-grekas · commit 485b9cc6343c · 2021-11-28T16:23:54.000+01:00
* 4.4:
  [Process] intersect with getenv() in case-insensitive manner to get default envs
  [Serializer] fix support for lazy/unset properties
  Fix redundant type casts
  Revert "[DoctrineBridge] add support for the JSON type"
diff --git a/DependencyInjection/SecurityExtension.php b/DependencyInjection/SecurityExtension.php
@@ -1027,7 +1027,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
`@@ -1027,7 +1027,7 @@ private function createExpression(ContainerBuilder $container, string $expressio`
`1027`	`1027`	`private function createRequestMatcher(ContainerBuilder $container, string $path = null, string $host = null, int $port = null, array $methods = [], array $ips = null, array $attributes = []): Reference`
`1028`	`1028`	`{`
`1029`	`1029`	`if ($methods) {`
`1030`		`- $methods = array_map('strtoupper', (array) $methods);`
	`1030`	`+ $methods = array_map('strtoupper', $methods);`
`1031`	`1031`	`}`
`1032`	`1032`
`1033`	`1033`	`if (null !== $ips) {`