Merge branch '6.4' into 7.1

* 6.4:
  [Console] Fix division by 0 error
  [ErrorHandler] Fix error message with PHP 8.5
  Add an experimental CI job for PHP 8.5
  [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

Author: xabbuh

.github/workflows/unit-tests.yml

@@ -33,6 +33,7 @@ jobs:
             mode: low-deps
           - php: '8.3'
           - php: '8.4'
+          - php: '8.5'
             #mode: experimental
       fail-fast: false
 

src/Symfony/Component/Console/Helper/ProgressBar.php

@@ -229,7 +229,7 @@ public function getEstimated(): float
 
     public function getRemaining(): float
     {
-        if (!$this->step) {
+        if (0 === $this->step || $this->step === $this->startingStep) {
             return 0;
         }
 

src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php

@@ -110,6 +110,14 @@ public function testRegularTimeEstimation()
         );
     }
 
+    public function testRegularTimeRemainingWithDifferentStartAtAndCustomDisplay()
+    {
+        ProgressBar::setFormatDefinition('custom', ' %current%/%max% [%bar%] %percent:3s%% %remaining% %estimated%');
+        $bar = new ProgressBar($output = $this->getOutputStream(), 1_200, 0);
+        $bar->setFormat('custom');
+        $bar->start(1_200, 600);
+    }
+
     public function testResumedTimeEstimation()
     {
         $bar = new ProgressBar($output = $this->getOutputStream(), 1_200, 0);

src/Symfony/Component/ErrorHandler/Tests/phpt/fatal_with_nested_handlers.phpt

@@ -24,7 +24,7 @@ var_dump([
 $eHandler[0]->setExceptionHandler('print_r');
 
 if (true) {
-    class Broken implements \JsonSerializable
+    class Broken implements \Iterator
     {
     }
 }
@@ -37,14 +37,14 @@ array(1) {
 }
 object(Symfony\Component\ErrorHandler\Error\FatalError)#%d (%d) {
   ["message":protected]=>
-  string(186) "Error: Class Symfony\Component\ErrorHandler\Broken contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (JsonSerializable::jsonSerialize)"
+  string(209) "Error: Class Symfony\Component\ErrorHandler\Broken contains 5 abstract methods and must therefore be declared abstract or implement the remaining methods (Iterator::current, Iterator::next, Iterator::key, ...)"
 %a
   ["error":"Symfony\Component\ErrorHandler\Error\FatalError":private]=>
   array(4) {
     ["type"]=>
     int(1)
     ["message"]=>
-    string(179) "Class Symfony\Component\ErrorHandler\Broken contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (JsonSerializable::jsonSerialize)"
+    string(202) "Class Symfony\Component\ErrorHandler\Broken contains 5 abstract methods and must therefore be declared abstract or implement the remaining methods (Iterator::current, Iterator::next, Iterator::key, ...)"
     ["file"]=>
     string(%d) "%s"
     ["line"]=>

src/Symfony/Component/HttpClient/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) {

src/Symfony/Component/HttpClient/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']);
+    }
 }

src/Symfony/Component/HttpClient/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": {

src/Symfony/Component/Mime/Part/Multipart/FormDataPart.php

@@ -24,7 +24,7 @@
 final class FormDataPart extends AbstractMultipartPart
 {
     /**
-     * @param array<string|array|DataPart> $fields
+     * @param array<string|array|TextPart> $fields
      */
     public function __construct(
         private array $fields = [],

src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php

@@ -705,8 +705,12 @@ private function isAllowedProperty(string $class, string $property, bool $writeA
                     return false;
                 }
 
-                if (\PHP_VERSION_ID >= 80400 && ($reflectionProperty->isProtectedSet() || $reflectionProperty->isPrivateSet())) {
-                    return false;
+                if (\PHP_VERSION_ID >= 80400 && $reflectionProperty->isProtectedSet()) {
+                    return (bool) ($this->propertyReflectionFlags & \ReflectionProperty::IS_PROTECTED);
+                }
+
+                if (\PHP_VERSION_ID >= 80400 && $reflectionProperty->isPrivateSet()) {
+                    return (bool) ($this->propertyReflectionFlags & \ReflectionProperty::IS_PRIVATE);
                 }
 
                 if (\PHP_VERSION_ID >= 80400 &&$reflectionProperty->isVirtual() && !$reflectionProperty->hasHook(\PropertyHookType::Set)) {

src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php

@@ -704,6 +704,51 @@ public function testAsymmetricVisibility()
         $this->assertFalse($this->extractor->isWritable(AsymmetricVisibility::class, 'protectedPrivate'));
     }
 
+    /**
+     * @requires PHP 8.4
+     */
+    public function testAsymmetricVisibilityAllowPublicOnly()
+    {
+        $extractor = new ReflectionExtractor(null, null, null, true, ReflectionExtractor::ALLOW_PUBLIC);
+
+        $this->assertTrue($extractor->isReadable(AsymmetricVisibility::class, 'publicPrivate'));
+        $this->assertTrue($extractor->isReadable(AsymmetricVisibility::class, 'publicProtected'));
+        $this->assertFalse($extractor->isReadable(AsymmetricVisibility::class, 'protectedPrivate'));
+        $this->assertFalse($extractor->isWritable(AsymmetricVisibility::class, 'publicPrivate'));
+        $this->assertFalse($extractor->isWritable(AsymmetricVisibility::class, 'publicProtected'));
+        $this->assertFalse($extractor->isWritable(AsymmetricVisibility::class, 'protectedPrivate'));
+    }
+
+    /**
+     * @requires PHP 8.4
+     */
+    public function testAsymmetricVisibilityAllowProtectedOnly()
+    {
+        $extractor = new ReflectionExtractor(null, null, null, true, ReflectionExtractor::ALLOW_PROTECTED);
+
+        $this->assertFalse($extractor->isReadable(AsymmetricVisibility::class, 'publicPrivate'));
+        $this->assertFalse($extractor->isReadable(AsymmetricVisibility::class, 'publicProtected'));
+        $this->assertTrue($extractor->isReadable(AsymmetricVisibility::class, 'protectedPrivate'));
+        $this->assertFalse($extractor->isWritable(AsymmetricVisibility::class, 'publicPrivate'));
+        $this->assertTrue($extractor->isWritable(AsymmetricVisibility::class, 'publicProtected'));
+        $this->assertFalse($extractor->isWritable(AsymmetricVisibility::class, 'protectedPrivate'));
+    }
+
+    /**
+     * @requires PHP 8.4
+     */
+    public function testAsymmetricVisibilityAllowPrivateOnly()
+    {
+        $extractor = new ReflectionExtractor(null, null, null, true, ReflectionExtractor::ALLOW_PRIVATE);
+
+        $this->assertFalse($extractor->isReadable(AsymmetricVisibility::class, 'publicPrivate'));
+        $this->assertFalse($extractor->isReadable(AsymmetricVisibility::class, 'publicProtected'));
+        $this->assertFalse($extractor->isReadable(AsymmetricVisibility::class, 'protectedPrivate'));
+        $this->assertTrue($extractor->isWritable(AsymmetricVisibility::class, 'publicPrivate'));
+        $this->assertFalse($extractor->isWritable(AsymmetricVisibility::class, 'publicProtected'));
+        $this->assertTrue($extractor->isWritable(AsymmetricVisibility::class, 'protectedPrivate'));
+    }
+
     /**
      * @requires PHP 8.4
      */