Merge branch '7.1' into 7.2

xabbuh · xabbuh · commit ff4df2b68d1c · 2024-12-07T09:50:44.000+01:00
* 7.1:
  [Console] Fix division by 0 error
  [ErrorHandler] Fix error message with PHP 8.5
  add test covering associated entities referenced by their primary key
  Add an experimental CI job for PHP 8.5
  Fix change log to mentioned thrown exception
  [HttpClient] Always set CURLOPT_CUSTOMREQUEST to the correct HTTP method in CurlHttpClient
  evaluate access flags for properties with asymmetric visibility
  [Mime] Fix wrong PHPDoc in `FormDataPart` constructor
diff --git a/CurlHttpClient.php b/CurlHttpClient.php
@@ -197,13 +197,12 @@ public function request(string $method, string $url, array $options = []): Respo
             $curlopts[\CURLOPT_RESOLVE] = $resolve;
         }
 
+        $curlopts[\CURLOPT_CUSTOMREQUEST] = $method;
         if ('POST' === $method) {
             // Use CURLOPT_POST to have browser-like POST-to-GET redirects for 301, 302 and 303
             $curlopts[\CURLOPT_POST] = true;
         } elseif ('HEAD' === $method) {
             $curlopts[\CURLOPT_NOBODY] = true;
-        } else {
-            $curlopts[\CURLOPT_CUSTOMREQUEST] = $method;
         }
 
         if ('\\' !== \DIRECTORY_SEPARATOR && $options['timeout'] < 1) {
diff --git a/Tests/HttpClientTestCase.php b/Tests/HttpClientTestCase.php
@@ -656,4 +656,26 @@ public function testDefaultContentType()
 
         $this->assertSame(['abc' => 'def', 'content-type' => 'application/json', 'REQUEST_METHOD' => 'POST'], $response->toArray());
     }
+
+    public function testHeadRequestWithClosureBody()
+    {
+        $p = TestHttpServer::start(8067);
+
+        try {
+            $client = $this->getHttpClient(__FUNCTION__);
+
+            $response = $client->request('HEAD', 'http://localhost:8057/head', [
+                'body' => fn () => '',
+            ]);
+            $headers = $response->getHeaders();
+        } finally {
+            $p->stop();
+        }
+
+        $this->assertArrayHasKey('x-request-vars', $headers);
+
+        $vars = json_decode($headers['x-request-vars'][0], true);
+        $this->assertIsArray($vars);
+        $this->assertSame('HEAD', $vars['REQUEST_METHOD']);
+    }
 }
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "php": ">=8.2",
         "psr/log": "^1|^2|^3",
         "symfony/deprecation-contracts": "^2.5|^3",
-        "symfony/http-client-contracts": "~3.4.3|^3.5.1",
+        "symfony/http-client-contracts": "~3.4.4|^3.5.2",
         "symfony/service-contracts": "^2.5|^3"
     },
     "require-dev": {

Original file line number	Diff line number	Diff line change
`@@ -197,13 +197,12 @@ public function request(string $method, string $url, array $options = []): Respo`
`197`	`197`	`$curlopts[\CURLOPT_RESOLVE] = $resolve;`
`198`	`198`	`}`
`199`	`199`
	`200`	`+ $curlopts[\CURLOPT_CUSTOMREQUEST] = $method;`
`200`	`201`	`if ('POST' === $method) {`
`201`	`202`	`// Use CURLOPT_POST to have browser-like POST-to-GET redirects for 301, 302 and 303`
`202`	`203`	`$curlopts[\CURLOPT_POST] = true;`
`203`	`204`	`} elseif ('HEAD' === $method) {`
`204`	`205`	`$curlopts[\CURLOPT_NOBODY] = true;`
`205`		`- } else {`
`206`		`- $curlopts[\CURLOPT_CUSTOMREQUEST] = $method;`
`207`	`206`	`}`
`208`	`207`
`209`	`208`	`if ('\\' !== \DIRECTORY_SEPARATOR && $options['timeout'] < 1) {`