Merge branch '7.3' into 7.4

fabpot · fabpot · commit e9f91a63c704 · 2025-05-29T09:19:58.000+02:00
* 7.3:
  [Translation] Add intl-icu fallback for MessageCatalogue metadata
  [Validator] update Dutch translation
  [ErrorHandler] Do not transform file to link if it does not exist
  disable the Lock integration to not register the deduplicate middleware
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_multiple_buses_without_deduplicate_middleware.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_multiple_buses_without_deduplicate_middleware.php
@@ -5,6 +5,7 @@
     'http_method_override' => false,
     'handle_all_throwables' => true,
     'php_errors' => ['log' => true],
+    'lock' => false,
     'messenger' => [
         'default_bus' => 'messenger.bus.commands',
         'buses' => [
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_multiple_buses_without_deduplicate_middleware.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_multiple_buses_without_deduplicate_middleware.xml
@@ -8,6 +8,7 @@
     <framework:config http-method-override="false" handle-all-throwables="true">
         <framework:annotations enabled="false" />
         <framework:php-errors log="true" />
+        <framework:lock enabled="false" />
         <framework:messenger default-bus="messenger.bus.commands">
             <framework:bus name="messenger.bus.commands" />
             <framework:bus name="messenger.bus.events">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_multiple_buses_without_deduplicate_middleware.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_multiple_buses_without_deduplicate_middleware.yml
@@ -4,6 +4,7 @@ framework:
     handle_all_throwables: true
     php_errors:
         log: true
+    lock: false
     messenger:
         default_bus: messenger.bus.commands
         buses:
diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php b/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php
@@ -233,6 +233,10 @@ private function formatFile(string $file, int $line, ?string $text = null): stri
             $text .= ' at line '.$line;
         }
 
+        if (!file_exists($file)) {
+            return $text;
+        }
+
         $link = $this->fileLinkFormat->format($file, $line);
 
         return \sprintf('<a href="%s" title="Click to open this file" class="file_link">%s</a>', $this->escape($link), $text);
diff --git a/src/Symfony/Component/Translation/MessageCatalogue.php b/src/Symfony/Component/Translation/MessageCatalogue.php
@@ -217,6 +217,16 @@ public function getMetadata(string $key = '', string $domain = 'messages'): mixe
             return $this->metadata;
         }
 
+        if (isset($this->metadata[$domain.self::INTL_DOMAIN_SUFFIX])) {
+            if ('' === $key) {
+                return $this->metadata[$domain.self::INTL_DOMAIN_SUFFIX];
+            }
+
+            if (isset($this->metadata[$domain.self::INTL_DOMAIN_SUFFIX][$key])) {
+                return $this->metadata[$domain.self::INTL_DOMAIN_SUFFIX][$key];
+            }
+        }
+
         if (isset($this->metadata[$domain])) {
             if ('' == $key) {
                 return $this->metadata[$domain];
diff --git a/src/Symfony/Component/Translation/Tests/Catalogue/MessageCatalogueTest.php b/src/Symfony/Component/Translation/Tests/Catalogue/MessageCatalogueTest.php
@@ -0,0 +1,27 @@
+<?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\Component\Translation\Tests\Catalogue;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Translation\MessageCatalogue;
+
+class MessageCatalogueTest extends TestCase
+{
+    public function testIcuMetadataKept()
+    {
+        $mc = new MessageCatalogue('en', ['messages' => ['a' => 'new_a']]);
+        $metadata = ['metadata' => 'value'];
+        $mc->setMetadata('a', $metadata, 'messages+intl-icu');
+        $this->assertEquals($metadata, $mc->getMetadata('a', 'messages'));
+        $this->assertEquals($metadata, $mc->getMetadata('a', 'messages+intl-icu'));
+    }
+}
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf
@@ -468,7 +468,7 @@
             </trans-unit>
             <trans-unit id="121">
                 <source>This value is not a valid Twig template.</source>
-                <target state="needs-review-translation">Deze waarde is geen geldige Twig-template.</target>
+                <target>Deze waarde is geen geldige Twig-template.</target>
             </trans-unit>
         </body>
     </file>

Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,10 @@ private function formatFile(string $file, int $line, ?string $text = null): stri`
`233`	`233`	`$text .= ' at line '.$line;`
`234`	`234`	`}`
`235`	`235`
	`236`	`+ if (!file_exists($file)) {`
	`237`	`+ return $text;`
	`238`	`+ }`
	`239`	`+`
`236`	`240`	`$link = $this->fileLinkFormat->format($file, $line);`
`237`	`241`
`238`	`242`	`return \sprintf('<a href="%s" title="Click to open this file" class="file_link">%s</a>', $this->escape($link), $text);`