Merge branch '6.4' into 7.0

* 6.4:
  [Validator] Missing translations for Estonian (et)
  [HttpFoundation] Prevent duplicated headers when using Early Hints
  [VarDumper] Fix configuring CliDumper with SYMFONY_IDE env var
  [Cache] improve BC with 5.4 pools
  [PhpUnitBridge][VarDumper] fix color detection
  [CI] Make sure we preserve file->header when we run sync-translations.php
  [Cache] Fix BC layer with pre-6.1 cache items
  Review validators.sl.xlf
  [Mailer][Postmark][Webhook] Don't require tag and metadata
  [Scheduler] Fix messenger receiver with no alias

Author: xabbuh

.github/sync-translations.php

@@ -12,7 +12,7 @@
 
 require __DIR__.'/../vendor/autoload.php';
 
-function dumpXliff1(string $defaultLocale, MessageCatalogue $messages, string $domain)
+function dumpXliff1(string $defaultLocale, MessageCatalogue $messages, string $domain, ?\DOMElement $header = null)
 {
     $dom = new \DOMDocument('1.0', 'utf-8');
     $dom->formatOutput = true;
@@ -27,6 +27,10 @@ function dumpXliff1(string $defaultLocale, MessageCatalogue $messages, string $d
     $xliffFile->setAttribute('datatype', 'plaintext');
     $xliffFile->setAttribute('original', 'file.ext');
 
+    if (null !== $header) {
+        mergeDom($dom, $xliffFile, $header);
+    }
+
     $xliffBody = $xliffFile->appendChild($dom->createElement('body'));
     foreach ($messages->all($domain) as $source => $target) {
         $translation = $dom->createElement('trans-unit');
@@ -62,6 +66,24 @@ function dumpXliff1(string $defaultLocale, MessageCatalogue $messages, string $d
     return preg_replace('/^ +/m', '$0$0', $dom->saveXML());
 }
 
+function mergeDom(\DOMDocument $dom, \DOMNode $tree, \DOMNode $input)
+{
+    $new = $dom->createElement($input->tagName);
+    foreach ($input->attributes as $key => $value) {
+        $new->setAttribute($key, $value);
+    }
+    $tree->appendChild($new);
+    foreach ($input->childNodes as $child) {
+        if ($child instanceof \DOMText) {
+            $new->appendChild($dom->createTextNode(str_replace('  ', ' ', $child->textContent)));
+        } elseif ($child instanceof \DOMNode) {
+            mergeDom($dom, $new, $child);
+        } else {
+            // We just need to update our script to handle this node types
+            throw new \LogicException('Unsupported node type: '.get_class($child));
+        }
+    }
+}
 
 foreach (['Security/Core' => 'security', 'Form' => 'validators', 'Validator' => 'validators'] as $component => $domain) {
     $dir = __DIR__.'/../src/Symfony/Component/'.$component.'/Resources/translations';
@@ -95,6 +117,13 @@ function dumpXliff1(string $defaultLocale, MessageCatalogue $messages, string $d
             $localeCatalogue->setMetadata($source, $metadata, $domain);
         }
 
-        file_put_contents($file, dumpXliff1('en', $localeCatalogue, $domain));
+        $inputDom = new \DOMDocument();
+        $inputDom->loadXML(file_get_contents($file->getRealPath()));
+        $header = null;
+        if (1 === $inputDom->getElementsByTagName('header')->count()) {
+            $header = $inputDom->getElementsByTagName('header')->item(0);
+        }
+
+        file_put_contents($file, dumpXliff1('en', $localeCatalogue, $domain, $header));
     }
 }

.github/workflows/integration-tests.yml

@@ -110,6 +110,16 @@ jobs:
           KAFKA_ADVERTISED_HOST_NAME: 127.0.0.1
           KAFKA_ZOOKEEPER_CONNECT: 'zookeeper:2181'
           KAFKA_ADVERTISED_PORT: 9092
+      frankenphp:
+        image: dunglas/frankenphp:1.1.0
+        ports:
+          - 80:80
+        volumes:
+          - ${{ github.workspace }}:/symfony
+        env:
+          SERVER_NAME: 'http://localhost'
+          CADDY_SERVER_EXTRA_DIRECTIVES: |
+            root * /symfony/src/Symfony/Component/HttpFoundation/Tests/Fixtures/response-functional/
 
     steps:
       - name: Checkout

src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php

@@ -403,7 +403,7 @@ private static function hasColorSupport(): bool
         // Detect msysgit/mingw and assume this is a tty because detection
         // does not work correctly, see https://github.com/composer/composer/issues/9690
         if (!@stream_isatty(\STDOUT) && !\in_array(strtoupper((string) getenv('MSYSTEM')), ['MINGW32', 'MINGW64'], true)) {
-            return true;
+            return false;
         }
 
         if ('\\' === \DIRECTORY_SEPARATOR && @sapi_windows_vt100_support(\STDOUT)) {

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummyTaskWithCustomReceiver.php

@@ -0,0 +1,22 @@
+<?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\Bundle\FrameworkBundle\Tests\Fixtures\Messenger;
+
+use Symfony\Component\Scheduler\Attribute\AsPeriodicTask;
+
+#[AsPeriodicTask(frequency: 5, schedule: 'custom_receiver')]
+class DummyTaskWithCustomReceiver
+{
+    public function __invoke()
+    {
+    }
+}

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SchedulerTest.php

@@ -88,6 +88,15 @@ public function testAutoconfiguredScheduler()
         $this->assertSame([['5', 6], ['7', 8]], $calls['attributesOnMethod']);
     }
 
+    public function testSchedulerWithCustomTransport()
+    {
+        $container = self::getContainer();
+        $container->set('clock', new MockClock('2023-10-26T08:59:59Z'));
+
+        $this->assertTrue($container->get('receivers')->has('scheduler_custom_receiver'));
+        $this->assertSame($container->get('scheduler_custom_receiver'), $container->get('receivers')->get('scheduler_custom_receiver'));
+    }
+
     protected static function createKernel(array $options = []): KernelInterface
     {
         return parent::createKernel(['test_case' => 'Scheduler'] + $options);

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Scheduler/config.yml

@@ -13,9 +13,24 @@ services:
     Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyTask:
         autoconfigure: true
 
+    Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyTaskWithCustomReceiver:
+        autoconfigure: true
+
     clock:
         synthetic: true
 
     receivers:
         public: true
         alias: 'messenger.receiver_locator'
+
+    scheduler_custom_receiver:
+        public: true
+        class: Symfony\Component\Messenger\Transport\TransportInterface
+        factory: [ '@messenger.transport_factory', 'createTransport' ]
+        arguments:
+            - 'schedule://custom_receiver'
+            - { transport_name: 'scheduler_custom_receiver' }
+            - !service
+                class: Symfony\Component\Messenger\Transport\Serialization\Serializer
+        tags:
+            - { name: 'messenger.receiver' }

src/Symfony/Bundle/FrameworkBundle/composer.json

@@ -56,7 +56,7 @@
         "symfony/notifier": "^6.4|^7.0",
         "symfony/process": "^6.4|^7.0",
         "symfony/rate-limiter": "^6.4|^7.0",
-        "symfony/scheduler": "^6.4.3|^7.0.3",
+        "symfony/scheduler": "^6.4.4|^7.0.4",
         "symfony/security-bundle": "^6.4|^7.0",
         "symfony/semaphore": "^6.4|^7.0",
         "symfony/serializer": "^6.4|^7.0",
@@ -91,7 +91,7 @@
         "symfony/mime": "<6.4",
         "symfony/property-info": "<6.4",
         "symfony/property-access": "<6.4",
-        "symfony/scheduler": "<6.4.3|>=7.0.0,<7.0.3",
+        "symfony/scheduler": "<6.4.4|>=7.0.0,<7.0.4",
         "symfony/serializer": "<6.4",
         "symfony/security-csrf": "<6.4",
         "symfony/security-core": "<6.4",

src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php

@@ -146,8 +146,6 @@ public function getItems(array $keys = []): iterable
         foreach ($keys as $key) {
             if ('' !== $key && \is_string($key)) {
                 $commit = $commit || isset($this->deferred[$key]);
-                $key = static::TAGS_PREFIX.$key;
-                $tagKeys[$key] = $key; // BC with pools populated before v6.1
             }
         }
 
@@ -156,7 +154,7 @@ public function getItems(array $keys = []): iterable
         }
 
         try {
-            $items = $this->pool->getItems($tagKeys + $keys);
+            $items = $this->pool->getItems($keys);
         } catch (InvalidArgumentException $e) {
             $this->pool->getItems($keys); // Should throw an exception
 
@@ -166,18 +164,24 @@ public function getItems(array $keys = []): iterable
         $bufferedItems = $itemTags = [];
 
         foreach ($items as $key => $item) {
-            if (isset($tagKeys[$key])) { // BC with pools populated before v6.1
-                if ($item->isHit()) {
-                    $itemTags[substr($key, \strlen(static::TAGS_PREFIX))] = $item->get() ?: [];
-                }
-                continue;
-            }
-
             if (null !== $tags = $item->getMetadata()[CacheItem::METADATA_TAGS] ?? null) {
                 $itemTags[$key] = $tags;
             }
 
             $bufferedItems[$key] = $item;
+
+            if (null === $tags) {
+                $key = "\0tags\0".$key;
+                $tagKeys[$key] = $key; // BC with pools populated before v6.1
+            }
+        }
+
+        if ($tagKeys) {
+            foreach ($this->pool->getItems($tagKeys) as $key => $item) {
+                if ($item->isHit()) {
+                    $itemTags[substr($key, \strlen("\0tags\0"))] = $item->get() ?: [];
+                }
+            }
         }
 
         $tagVersions = $this->getTagVersions($itemTags, false);
@@ -222,7 +226,7 @@ public function deleteItems(array $keys): bool
     {
         foreach ($keys as $key) {
             if ('' !== $key && \is_string($key)) {
-                $keys[] = static::TAGS_PREFIX.$key; // BC with pools populated before v6.1
+                $keys[] = "\0tags\0".$key; // BC with pools populated before v6.1
             }
         }
 

src/Symfony/Component/ErrorHandler/ErrorRenderer/FileLinkFormatter.php

@@ -30,7 +30,7 @@ class FileLinkFormatter
     private \Closure|string|null $urlFormat;
 
     /**
-     * @param string|\Closure $urlFormat the URL format, or a closure that returns it on-demand
+     * @param string|\Closure $urlFormat The URL format, or a closure that returns it on-demand
      */
     public function __construct(string|array|null $fileLinkFormat = null, ?RequestStack $requestStack = null, ?string $baseDir = null, string|\Closure|null $urlFormat = null)
     {

src/Symfony/Component/HttpFoundation/Response.php

@@ -330,23 +330,21 @@ public function sendHeaders(?int $statusCode = null): static
             $replace = false;
 
             // As recommended by RFC 8297, PHP automatically copies headers from previous 103 responses, we need to deal with that if headers changed
-            if (103 === $statusCode) {
-                $previousValues = $this->sentHeaders[$name] ?? null;
-                if ($previousValues === $values) {
-                    // Header already sent in a previous response, it will be automatically copied in this response by PHP
-                    continue;
-                }
+            $previousValues = $this->sentHeaders[$name] ?? null;
+            if ($previousValues === $values) {
+                // Header already sent in a previous response, it will be automatically copied in this response by PHP
+                continue;
+            }
 
-                $replace = 0 === strcasecmp($name, 'Content-Type');
+            $replace = 0 === strcasecmp($name, 'Content-Type');
 
-                if (null !== $previousValues && array_diff($previousValues, $values)) {
-                    header_remove($name);
-                    $previousValues = null;
-                }
-
-                $newValues = null === $previousValues ? $values : array_diff($values, $previousValues);
+            if (null !== $previousValues && array_diff($previousValues, $values)) {
+                header_remove($name);
+                $previousValues = null;
             }
 
+            $newValues = null === $previousValues ? $values : array_diff($values, $previousValues);
+
             foreach ($newValues as $value) {
                 header($name.': '.$value, $replace, $this->statusCode);
             }