Merge branch '7.2' into 7.3

* 7.2:
  chore: fix CS
  [Console] Fix division by 0 error
  [ErrorHandler] Fix error message with PHP 8.5
  Update SendgridSmtpTransport.php
  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
  [FrameworkBundle] Make uri_signer lazy and improve error when kernel.secret is empty
  [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

@@ -36,6 +36,7 @@ jobs:
             # brotli and zstd extensions are optional, when not present the commands will be used instead,
             # we must test both scenarios
             extensions: amqp,apcu,brotli,igbinary,intl,mbstring,memcached,redis,relay,zstd
+          - 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 <fabien@symfony.com>
+ *
+ * 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/Security/RememberMe/DoctrineTokenProviderPostgresTest.php

@@ -10,6 +10,7 @@
 
 /**
  * @requires extension pdo_pgsql
+ *
  * @group integration
  */
 class DoctrineTokenProviderPostgresTest extends DoctrineTokenProviderTest

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/Bundle/FrameworkBundle/Command/AboutCommand.php

@@ -86,7 +86,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             ['Timezone', date_default_timezone_get().' (<comment>'.(new \DateTimeImmutable())->format(\DateTimeInterface::W3C).'</>)'],
             ['OPcache', \extension_loaded('Zend OPcache') ? (filter_var(\ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
             ['APCu', \extension_loaded('apcu') ? (filter_var(\ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
-            ['Xdebug', \extension_loaded('xdebug') ? ($xdebugMode && $xdebugMode !== 'off' ? 'Enabled (' . $xdebugMode . ')' : 'Not enabled') : 'Not installed'],
+            ['Xdebug', \extension_loaded('xdebug') ? ($xdebugMode && 'off' !== $xdebugMode ? 'Enabled (' . $xdebugMode . ')' : 'Not enabled') : 'Not installed'],
         ];
 
         $io->table([], $rows);

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -311,10 +311,17 @@ public function load(array $configs, ContainerBuilder $container): void
             }
         }
 
+        $emptySecretHint = '"framework.secret" option';
         if (isset($config['secret'])) {
             $container->setParameter('kernel.secret', $config['secret']);
+            $usedEnvs = [];
+            $container->resolveEnvPlaceholders($config['secret'], null, $usedEnvs);
+
+            if ($usedEnvs) {
+                $emptySecretHint = \sprintf('"%s" env var%s', implode('", "', $usedEnvs), 1 === \count($usedEnvs) ? '' : 's');
+            }
         }
-        $container->parameterCannotBeEmpty('kernel.secret', 'A non-empty value for the parameter "kernel.secret" is required. Did you forget to configure the "framework.secret" option?');
+        $container->parameterCannotBeEmpty('kernel.secret', 'A non-empty value for the parameter "kernel.secret" is required. Did you forget to configure the '.$emptySecretHint.'?');
 
         $container->setParameter('kernel.http_method_override', $config['http_method_override']);
         $container->setParameter('kernel.trust_x_sendfile_type_header', $config['trust_x_sendfile_type_header']);

src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php

@@ -157,6 +157,7 @@ class_exists(WorkflowEvents::class) ? WorkflowEvents::ALIASES : []
             ->args([
                 new Parameter('kernel.secret'),
             ])
+            ->lazy()
         ->alias(UriSigner::class, 'uri_signer')
 
         ->set('config_cache_factory', ResourceCheckerConfigCacheFactory::class)

src/Symfony/Component/Cache/Traits/Relay/MoveTrait.php

@@ -33,12 +33,12 @@ public function lmove($srckey, $dstkey, $srcpos, $dstpos): mixed
      */
     trait MoveTrait
     {
-        public function blmove($srckey, $dstkey, $srcpos, $dstpos, $timeout): \Relay\Relay|false|null|string
+        public function blmove($srckey, $dstkey, $srcpos, $dstpos, $timeout): \Relay\Relay|false|string|null
         {
             return $this->initializeLazyObject()->blmove(...\func_get_args());
         }
 
-        public function lmove($srckey, $dstkey, $srcpos, $dstpos): \Relay\Relay|false|null|string
+        public function lmove($srckey, $dstkey, $srcpos, $dstpos): \Relay\Relay|false|string|null
         {
             return $this->initializeLazyObject()->lmove(...\func_get_args());
         }

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);