Merge branch '7.1' into 7.2

* 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

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/Bridge/Doctrine/Tests/Fixtures/AssociatedEntityDto.php

@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures;
+
+class AssociatedEntityDto
+{
+    public $singleId;
+}

src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php

@@ -21,6 +21,7 @@
 use Doctrine\Persistence\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Bridge\Doctrine\Tests\DoctrineTestHelper;
+use Symfony\Bridge\Doctrine\Tests\Fixtures\AssociatedEntityDto;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\AssociationEntity;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\AssociationEntity2;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeIntIdEntity;
@@ -609,6 +610,40 @@ public function testAssociatedEntityWithNull()
         $this->assertNoViolation();
     }
 
+    public function testAssociatedEntityReferencedByPrimaryKey()
+    {
+        $this->registry = $this->createRegistryMock($this->em);
+        $this->registry->expects($this->any())
+            ->method('getManagerForClass')
+            ->willReturn($this->em);
+        $this->validator = $this->createValidator();
+        $this->validator->initialize($this->context);
+
+        $entity = new SingleIntIdEntity(1, 'foo');
+        $associated = new AssociationEntity();
+        $associated->single = $entity;
+
+        $this->em->persist($entity);
+        $this->em->persist($associated);
+        $this->em->flush();
+
+        $dto = new AssociatedEntityDto();
+        $dto->singleId = 1;
+
+        $this->validator->validate($dto, new UniqueEntity(
+            fields: ['singleId' => 'single'],
+            entityClass: AssociationEntity::class,
+        ));
+
+        $this->buildViolation('This value is already used.')
+            ->atPath('property.path.single')
+            ->setParameter('{{ value }}', 1)
+            ->setInvalidValue(1)
+            ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
+            ->setCause([$associated])
+            ->assertRaised();
+    }
+
     public function testValidateUniquenessWithArrayValue()
     {
         $repository = $this->createRepositoryMock(SingleIntIdEntity::class);

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 = [],