Merge branch '5.4' into 6.0

* 5.4:
  Update ExceptionInterface.php
  Revert removal of Stringable check
  Flush with flush() after ob_end_flush()
  [Validator] : Fix "PHP Warning: Undefined array key 1" in NotCompromisedPasswordValidator
  [Validator] Fix traverse option on Valid constraint when used as Attribute
  [HttpFoundation] Fix deleteFileAfterSend on client abortion
  Prevent that bad Ignore method annotations lead to incorrect results
  also fix the test
  fix deprecation
  fix sending request to paths containing multiple slashes
  Fix generated validation error message for wrong exception mapping status code

Author: derrabus

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

@@ -1207,7 +1207,7 @@ private function addExceptionsSection(ArrayNodeDefinition $rootNode)
                                 ->info('The status code of the response. Null to let Symfony decide.')
                                 ->validate()
                                     ->ifTrue(function ($v) { return $v < 100 || $v > 599; })
-                                    ->thenInvalid('The log level is not valid. Pick a value between 100 and 599.')
+                                    ->thenInvalid('The status code is not valid. Pick a value between 100 and 599.')
                                 ->end()
                                 ->defaultNull()
                             ->end()

src/Symfony/Component/BrowserKit/AbstractBrowser.php

@@ -618,7 +618,7 @@ protected function getAbsoluteUri(string $uri): string
         }
 
         // protocol relative URL
-        if (0 === strpos($uri, '//')) {
+        if ('' !== trim($uri, '/') && str_starts_with($uri, '//')) {
             return parse_url($currentUri, \PHP_URL_SCHEME).':'.$uri;
         }
 

src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php

@@ -180,6 +180,30 @@ public function testMultiPartRequestWithAdditionalParametersOfTheSameName()
         ]);
     }
 
+    /**
+     * @dataProvider forwardSlashesRequestPathProvider
+     */
+    public function testMultipleForwardSlashesRequestPath(string $requestPath)
+    {
+        $client = $this->createMock(HttpClientInterface::class);
+        $client
+            ->expects($this->once())
+            ->method('request')
+            ->with('GET', 'http://localhost'.$requestPath)
+            ->willReturn($this->createMock(ResponseInterface::class));
+        $browser = new HttpBrowser($client);
+        $browser->request('GET', $requestPath);
+    }
+
+    public function forwardSlashesRequestPathProvider()
+    {
+        return [
+            'one slash' => ['/'],
+            'two slashes' => ['//'],
+            'multiple slashes' => ['////'],
+        ];
+    }
+
     private function uploadFile(string $data): string
     {
         $path = tempnam(sys_get_temp_dir(), 'http');

src/Symfony/Component/HttpFoundation/BinaryFileResponse.php

@@ -34,6 +34,7 @@ class BinaryFileResponse extends Response
     protected $offset = 0;
     protected $maxlen = -1;
     protected $deleteFileAfterSend = false;
+    protected $chunkSize = 8 * 1024;
 
     /**
      * @param \SplFileInfo|string $file               The file to stream
@@ -101,6 +102,22 @@ public function getFile(): File
         return $this->file;
     }
 
+    /**
+     * Sets the response stream chunk size.
+     *
+     * @return $this
+     */
+    public function setChunkSize(int $chunkSize): self
+    {
+        if ($chunkSize < 1 || $chunkSize > \PHP_INT_MAX) {
+            throw new \LogicException('The chunk size of a BinaryFileResponse cannot be less than 1 or greater than PHP_INT_MAX.');
+        }
+
+        $this->chunkSize = $chunkSize;
+
+        return $this;
+    }
+
     /**
      * Automatically sets the Last-Modified header according the file modification date.
      *
@@ -282,7 +299,23 @@ public function sendContent(): static
         $out = fopen('php://output', 'w');
         $file = fopen($this->file->getPathname(), 'r');
 
-        stream_copy_to_stream($file, $out, $this->maxlen, $this->offset);
+        ignore_user_abort(true);
+
+        if (0 !== $this->offset) {
+            fseek($file, $this->offset);
+        }
+
+        $length = $this->maxlen;
+        while ($length && !feof($file)) {
+            $read = ($length > $this->chunkSize) ? $this->chunkSize : $length;
+            $length -= $read;
+
+            stream_copy_to_stream($file, $out, $read);
+
+            if (connection_aborted()) {
+                break;
+            }
+        }
 
         fclose($out);
         fclose($file);

src/Symfony/Component/HttpFoundation/Response.php

@@ -1221,6 +1221,7 @@ public static function closeOutputBuffers(int $targetLevel, bool $flush): void
         while ($level-- > $targetLevel && ($s = $status[$level]) && (!isset($s['del']) ? !isset($s['flags']) || ($s['flags'] & $flags) === $flags : $s['del'])) {
             if ($flush) {
                 ob_end_flush();
+                flush();
             } else {
                 ob_end_clean();
             }

src/Symfony/Component/Messenger/Exception/ExceptionInterface.php

@@ -12,7 +12,7 @@
 namespace Symfony\Component\Messenger\Exception;
 
 /**
- * Base Message component's exception.
+ * Base Messenger component's exception.
  *
  * @author Samuel Roze <[email protected]>
  */

src/Symfony/Component/Serializer/Mapping/Loader/AnnotationLoader.php

@@ -134,6 +134,10 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata): bool
 
                     $attributeMetadata->setSerializedName($annotation->getSerializedName());
                 } elseif ($annotation instanceof Ignore) {
+                    if (!$accessorOrMutator) {
+                        throw new MappingException(sprintf('Ignore on "%s::%s()" cannot be added. Ignore can only be added on methods beginning with "get", "is", "has" or "set".', $className, $method->name));
+                    }
+
                     $attributeMetadata->setIgnore(true);
                 } elseif ($annotation instanceof Context) {
                     if (!$accessorOrMutator) {

src/Symfony/Component/Serializer/Tests/Fixtures/Annotations/Entity45016.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\Serializer\Tests\Fixtures\Annotations;
+
+use Symfony\Component\Serializer\Annotation\Ignore;
+
+class Entity45016
+{
+    /**
+     * @var int
+     */
+    private $id = 1234;
+
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @Ignore()
+     */
+    public function badIgnore(): bool
+    {
+        return true;
+    }
+}

src/Symfony/Component/Serializer/Tests/Fixtures/Attributes/Entity45016.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\Serializer\Tests\Fixtures\Attributes;
+
+use Symfony\Component\Serializer\Annotation\Ignore;
+
+class Entity45016
+{
+    /**
+     * @var int
+     */
+    private $id = 1234;
+
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    #[Ignore]
+    public function badIgnore(): bool
+    {
+        return true;
+    }
+}

src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderTest.php

@@ -137,6 +137,19 @@ public function testThrowsOnContextOnInvalidMethod()
         $loader->loadClassMetadata($classMetadata);
     }
 
+    public function testCanHandleUnrelatedIgnoredMethods()
+    {
+        $class = $this->getNamespace().'\Entity45016';
+
+        $this->expectException(MappingException::class);
+        $this->expectExceptionMessage(sprintf('Ignore on "%s::badIgnore()" cannot be added', $class));
+
+        $metadata = new ClassMetadata($class);
+        $loader = $this->getLoaderForContextMapping();
+
+        $loader->loadClassMetadata($metadata);
+    }
+
     abstract protected function createLoader(): AnnotationLoader;
 
     abstract protected function getNamespace(): string;

src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php

@@ -91,6 +91,10 @@ public function validate(mixed $value, Constraint $constraint)
         }
 
         foreach (explode("\r\n", $result) as $line) {
+            if (!str_contains($line, ':')) {
+                continue;
+            }
+
             [$hashSuffix, $count] = explode(':', $line);
 
             if ($hashPrefix.$hashSuffix === $hash && $constraint->threshold <= (int) $count) {

src/Symfony/Component/Validator/Constraints/Valid.php

@@ -24,6 +24,13 @@ class Valid extends Constraint
 {
     public $traverse = true;
 
+    public function __construct(array $options = null, array $groups = null, $payload = null, bool $traverse = null)
+    {
+        parent::__construct($options ?? [], $groups, $payload);
+
+        $this->traverse = $traverse ?? $this->traverse;
+    }
+
     public function __get(string $option): mixed
     {
         if ('groups' === $option) {

src/Symfony/Component/Validator/Tests/Constraints/NotCompromisedPasswordValidatorTest.php

@@ -162,6 +162,31 @@ public function testInvalidPasswordCustomEndpoint()
             ->assertRaised();
     }
 
+    public function testEndpointWithInvalidValueInReturn()
+    {
+        $returnValue = implode(
+            "\r\n",
+            [
+                '36039744C253F9B2A4E90CBEDB02EBFB82D:5',
+                'This should not break the validator',
+                '3686792BBC66A72D40D928ED15621124CFE:7',
+                '36EEC709091B810AA240179A44317ED415C:2',
+                '',
+            ]
+        );
+
+        $validator = new NotCompromisedPasswordValidator(
+            $this->createHttpClientStub($returnValue),
+            'UTF-8',
+            true,
+            'https://password-check.internal.example.com/range/%s'
+        );
+
+        $validator->validate(self::PASSWORD_NOT_LEAKED, new NotCompromisedPassword());
+
+        $this->assertNoViolation();
+    }
+
     public function testInvalidConstraint()
     {
         $this->expectException(UnexpectedTypeException::class);
@@ -196,11 +221,11 @@ public function provideErrorSkippingConstraints(): iterable
         yield 'named arguments' => [new NotCompromisedPassword(skipOnError: true)];
     }
 
-    private function createHttpClientStub(): HttpClientInterface
+    private function createHttpClientStub(?string $returnValue = null): HttpClientInterface
     {
         $httpClientStub = $this->createMock(HttpClientInterface::class);
         $httpClientStub->method('request')->willReturnCallback(
-            function (string $method, string $url): ResponseInterface {
+            function (string $method, string $url) use ($returnValue): ResponseInterface {
                 if (self::PASSWORD_TRIGGERING_AN_ERROR_RANGE_URL === $url) {
                     throw new class('Problem contacting the Have I been Pwned API.') extends \Exception implements ServerExceptionInterface {
                         public function getResponse(): ResponseInterface
@@ -213,7 +238,7 @@ public function getResponse(): ResponseInterface
                 $responseStub = $this->createMock(ResponseInterface::class);
                 $responseStub
                     ->method('getContent')
-                    ->willReturn(implode("\r\n", self::RETURN));
+                    ->willReturn($returnValue ?? implode("\r\n", self::RETURN));
 
                 return $responseStub;
             }

src/Symfony/Component/Validator/Tests/Constraints/ValidTest.php

@@ -13,6 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints\Valid;
+use Symfony\Component\Validator\Mapping\ClassMetadata;
+use Symfony\Component\Validator\Mapping\Loader\AnnotationLoader;
 
 /**
  * @author Bernhard Schussek <[email protected]>
@@ -32,4 +34,34 @@ public function testGroupsAreNullByDefault()
 
         $this->assertNull($constraint->groups);
     }
+
+    /**
+     * @requires PHP 8
+     */
+    public function testAttributes()
+    {
+        $metadata = new ClassMetaData(ValidDummy::class);
+        $loader = new AnnotationLoader();
+        self::assertTrue($loader->loadClassMetadata($metadata));
+
+        [$bConstraint] = $metadata->properties['b']->getConstraints();
+        self::assertFalse($bConstraint->traverse);
+        self::assertSame(['traverse_group'], $bConstraint->groups);
+
+        [$cConstraint] = $metadata->properties['c']->getConstraints();
+        self::assertSame(['my_group'], $cConstraint->groups);
+        self::assertSame('some attached data', $cConstraint->payload);
+    }
+}
+
+class ValidDummy
+{
+    #[Valid]
+    private $a;
+
+    #[Valid(groups: ['traverse_group'], traverse: false)] // Needs a group to work at all for this test
+    private $b;
+
+    #[Valid(groups: ['my_group'], payload: 'some attached data')]
+    private $c;
 }