Merge branch '6.0' into 6.1

* 6.0:
  [Messenger] Remove redundant interface in DoctrineReceiver
  Fix choice filter error when loading mix of grouped and non-grouped choices
  [Mime] Allow url as a path in the DataPart::fromPath
  Fix getting class constraints on debug command

Author: nicolas-grekas

src/Symfony/Component/Form/ChoiceList/Loader/FilterChoiceLoaderDecorator.php

@@ -36,10 +36,17 @@ protected function loadChoices(): iterable
         }
 
         foreach ($structuredValues as $group => $values) {
-            if ($values && $filtered = array_filter($list->getChoicesForValues($values), $this->filter)) {
-                $choices[$group] = $filtered;
+            if (is_array($values)) {
+                if ($values && $filtered = array_filter($list->getChoicesForValues($values), $this->filter)) {
+                    $choices[$group] = $filtered;
+                }
+                continue;
+                // filter empty groups
+            }
+
+            if ($filtered = array_filter($list->getChoicesForValues([$values]), $this->filter)) {
+                $choices[$group] = $filtered[0];
             }
-            // filter empty groups
         }
 
         return $choices ?? [];

src/Symfony/Component/Form/Tests/ChoiceList/Loader/FilterChoiceLoaderDecoratorTest.php

@@ -47,6 +47,29 @@ public function testLoadChoiceListWithGroupedChoices()
         ]), $loader->loadChoiceList());
     }
 
+    public function testLoadChoiceListMixedWithGroupedAndNonGroupedChoices()
+    {
+        $filter = function ($choice) {
+            return 0 === $choice % 2;
+        };
+
+        $choices = array_merge(range(1, 9), ['grouped' => range(10, 40, 5)]);
+        $loader = new FilterChoiceLoaderDecorator(new ArrayChoiceLoader($choices), $filter);
+
+        $this->assertEquals(new ArrayChoiceList([
+            1 => 2,
+            3 => 4,
+            5 => 6,
+            7 => 8,
+            'grouped' => [
+                0 => 10,
+                2 => 20,
+                4 => 30,
+                6 => 40,
+            ],
+        ]), $loader->loadChoiceList());
+    }
+
     public function testLoadValuesForChoices()
     {
         $evenValues = [1 => '2', 3 => '4'];

src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineReceiver.php

@@ -20,14 +20,13 @@
 use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
 use Symfony\Component\Messenger\Transport\Receiver\ListableReceiverInterface;
 use Symfony\Component\Messenger\Transport\Receiver\MessageCountAwareInterface;
-use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
 use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 
 /**
  * @author Vincent Touzet <[email protected]>
  */
-class DoctrineReceiver implements ReceiverInterface, MessageCountAwareInterface, ListableReceiverInterface
+class DoctrineReceiver implements ListableReceiverInterface, MessageCountAwareInterface
 {
     private const MAX_RETRIES = 3;
     private int $retryingSafetyCounter = 0;

src/Symfony/Component/Mime/Part/DataPart.php

@@ -61,13 +61,20 @@ public static function fromPath(string $path, string $name = null, string $conte
             $contentType = self::$mimeTypes->getMimeTypes($ext)[0] ?? 'application/octet-stream';
         }
 
-        if (!is_file($path) || !is_readable($path)) {
+        if ((is_file($path) && !is_readable($path)) || is_dir($path)) {
             throw new InvalidArgumentException(sprintf('Path "%s" is not readable.', $path));
         }
 
         if (false === $handle = @fopen($path, 'r', false)) {
             throw new InvalidArgumentException(sprintf('Unable to open path "%s".', $path));
         }
+
+        if (!is_file($path)) {
+            $cache = fopen('php://temp', 'r+');
+            stream_copy_to_stream($handle, $cache);
+            $handle = $cache;
+        }
+
         $p = new self($handle, $name ?: basename($path), $contentType);
         $p->handle = $handle;
 

src/Symfony/Component/Mime/Tests/Part/DataPartTest.php

@@ -134,6 +134,30 @@ public function testFromPathWithNotAFile()
         DataPart::fromPath(__DIR__.'/../Fixtures/mimetypes/');
     }
 
+    /**
+     * @group network
+     */
+    public function testFromPathWithUrl()
+    {
+        if (!\in_array('https', stream_get_wrappers())) {
+            $this->markTestSkipped('"https" stream wrapper is not enabled.');
+        }
+
+        $p = DataPart::fromPath($file = 'https://symfony.com/images/common/logo/logo_symfony_header.png');
+        $content = file_get_contents($file);
+        $this->assertEquals($content, $p->getBody());
+        $maxLineLength = 76;
+        $this->assertEquals(substr(base64_encode($content), 0, $maxLineLength), substr($p->bodyToString(), 0, $maxLineLength));
+        $this->assertEquals(substr(base64_encode($content), 0, $maxLineLength), substr(implode('', iterator_to_array($p->bodyToIterable())), 0, $maxLineLength));
+        $this->assertEquals('image', $p->getMediaType());
+        $this->assertEquals('png', $p->getMediaSubType());
+        $this->assertEquals(new Headers(
+            new ParameterizedHeader('Content-Type', 'image/png', ['name' => 'logo_symfony_header.png']),
+            new UnstructuredHeader('Content-Transfer-Encoding', 'base64'),
+            new ParameterizedHeader('Content-Disposition', 'attachment', ['name' => 'logo_symfony_header.png', 'filename' => 'logo_symfony_header.png'])
+        ), $p->getPreparedHeaders());
+    }
+
     public function testHasContentId()
     {
         $p = new DataPart('content');

src/Symfony/Component/Validator/Command/DebugCommand.php

@@ -88,7 +88,19 @@ private function dumpValidatorsForClass(InputInterface $input, OutputInterface $
         $rows = [];
         $dump = new Dumper($output);
 
-        foreach ($this->getConstrainedPropertiesData($class) as $propertyName => $constraintsData) {
+        /** @var ClassMetadataInterface $classMetadata */
+        $classMetadata = $this->validator->getMetadataFor($class);
+
+        foreach ($this->getClassConstraintsData($classMetadata) as $data) {
+            $rows[] = [
+                '-',
+                $data['class'],
+                implode(', ', $data['groups']),
+                $dump($data['options']),
+            ];
+        }
+
+        foreach ($this->getConstrainedPropertiesData($classMetadata) as $propertyName => $constraintsData) {
             foreach ($constraintsData as $data) {
                 $rows[] = [
                     $propertyName,
@@ -119,12 +131,20 @@ private function dumpValidatorsForClass(InputInterface $input, OutputInterface $
         $table->render();
     }
 
-    private function getConstrainedPropertiesData(string $class): array
+    private function getClassConstraintsData(ClassMetadataInterface $classMetadata): iterable
     {
-        $data = [];
+        foreach ($classMetadata->getConstraints() as $constraint) {
+            yield [
+                'class' => \get_class($constraint),
+                'groups' => $constraint->groups,
+                'options' => $this->getConstraintOptions($constraint),
+            ];
+        }
+    }
 
-        /** @var ClassMetadataInterface $classMetadata */
-        $classMetadata = $this->validator->getMetadataFor($class);
+    private function getConstrainedPropertiesData(ClassMetadataInterface $classMetadata): array
+    {
+        $data = [];
 
         foreach ($classMetadata->getConstrainedProperties() as $constrainedProperty) {
             $data[$constrainedProperty] = $this->getPropertyData($classMetadata, $constrainedProperty);