[8.x] Fix replacing request options (#40954)

* Fix replacing request options

* wip

* keep using array merge on headers and cookies

* formatting

Co-authored-by: Taylor Otwell <[email protected]>

Author: driesvints

src/Illuminate/Http/Client/PendingRequest.php

@@ -464,15 +464,15 @@ public function retry(int $times, int $sleep = 0, ?callable $when = null)
     }
 
     /**
-     * Merge new options into the client.
+     * Replace the specified options on the request.
      *
      * @param  array  $options
      * @return $this
      */
     public function withOptions(array $options)
     {
         return tap($this, function ($request) use ($options) {
-            return $this->options = array_merge_recursive($this->options, $options);
+            return $this->options = array_replace_recursive($this->options, $options);
         });
     }
 
@@ -980,14 +980,14 @@ public function runBeforeSendingCallbacks($request, array $options)
     }
 
     /**
-     * Merge the given options with the current request options.
+     * Replace the given options with the current request options.
      *
      * @param  array  $options
      * @return array
      */
     public function mergeOptions(...$options)
     {
-        return array_merge_recursive($this->options, ...$options);
+        return array_replace_recursive($this->options, ...$options);
     }
 
     /**
@@ -1093,4 +1093,14 @@ public function setHandler($handler)
 
         return $this;
     }
+
+    /**
+     * Get the pending request options.
+     *
+     * @return array
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
 }

tests/Http/HttpClientTest.php

@@ -941,6 +941,19 @@ public function testClientCanBeSet()
         $this->assertSame($client, $request->buildClient());
     }
 
+    public function testRequestsCanReplaceOptions()
+    {
+        $request = new PendingRequest($this->factory);
+
+        $request = $request->withOptions(['http_errors' => true, 'connect_timeout' => 10]);
+
+        $this->assertSame(['http_errors' => true, 'connect_timeout' => 10], $request->getOptions());
+
+        $request = $request->withOptions(['connect_timeout' => 20]);
+
+        $this->assertSame(['http_errors' => true, 'connect_timeout' => 20], $request->getOptions());
+    }
+
     public function testMultipleRequestsAreSentInThePool()
     {
         $this->factory->fake([