Merge branch '5.4' into 6.0

* 5.4:
  [Lock] Release Locks from Internal Store on Postgres waitAndSave*
  [Serializer] Fix passing null to str_contains()
  [DependencyInjection] Don't reset env placeholders during compilation
  [HttpClient] Fix overriding default options with null
  [DependencyInjection] Clarify that using expressions in parameters is not allowed
  [GHA] Cancel running CI jobs when a PR is updated
  [Validator] Improve tests for the Image and File constraints
  [Validator][Tests] Fix AssertingContextualValidator not throwing on remaining expectations

Author: nicolas-grekas

HttpClientTrait.php

@@ -199,11 +199,7 @@ private static function mergeDefaultOptions(array $options, array $defaultOption
         // Option "query" is never inherited from defaults
         $options['query'] = $options['query'] ?? [];
 
-        foreach ($defaultOptions as $k => $v) {
-            if ('normalized_headers' !== $k && !isset($options[$k])) {
-                $options[$k] = $v;
-            }
-        }
+        $options += $defaultOptions;
 
         if (isset($defaultOptions['extra'])) {
             $options['extra'] += $defaultOptions['extra'];

Tests/MockHttpClientTest.php

@@ -14,6 +14,7 @@
 use Symfony\Component\HttpClient\Chunk\DataChunk;
 use Symfony\Component\HttpClient\Chunk\ErrorChunk;
 use Symfony\Component\HttpClient\Chunk\FirstChunk;
+use Symfony\Component\HttpClient\Exception\InvalidArgumentException;
 use Symfony\Component\HttpClient\Exception\TransportException;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\NativeHttpClient;
@@ -271,6 +272,15 @@ public function testThrowExceptionInBodyGenerator()
         $this->assertSame('bar ccc', $chunks[2]->getError());
     }
 
+    public function testMergeDefaultOptions()
+    {
+        $mockHttpClient = new MockHttpClient(null, 'https://example.com');
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Invalid URL: scheme is missing');
+        $mockHttpClient->request('GET', '/foo', ['base_uri' => null]);
+    }
+
     protected function getHttpClient(string $testCase): HttpClientInterface
     {
         $responses = [];