Skip to content

Commit 1084655

Browse files
alexandre-dauboisalexandre-daubois
committed
Merge branch '6.4' into 7.2
* 6.4: [Validator] Review Croatian translation [Validator] Review "twig template" translation Provide missing translations thanks to Gemini [DependencyInjection] Make `DefinitionErrorExceptionPass` consider `IGNORE_ON_UNINITIALIZED_REFERENCE` and `RUNTIME_EXCEPTION_ON_INVALID_REFERENCE` the same [WebLink] Hint that prerender is deprecated
2 parents 1876b49 + ced0a47 commit 1084655

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+72
-56
lines changed

‎src/Symfony/Bridge/Twig/Extension/WebLinkExtension.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function getFunctions(): array
4444
/**
4545
* Adds a "Link" HTTP header.
4646
*
47-
* @param string $rel The relation type (e.g. "preload", "prefetch", "prerender" or "dns-prefetch")
47+
* @param string $rel The relation type (e.g. "preload", "prefetch", or "dns-prefetch")
4848
* @param array $attributes The attributes of this link (e.g. "['as' => true]", "['pr' => 0.5]")
4949
*
5050
* @return string The relation URI
@@ -115,7 +115,11 @@ public function prefetch(string $uri, array $attributes = []): string
115115
}
116116

117117
/**
118-
* Indicates to the client that it should prerender this resource .
118+
* Indicates to the client that it should prerender this resource.
119+
*
120+
* This feature is deprecated and superseded by the Speculation Rules API.
121+
*
122+
* @see https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Attributes/rel/prerender
119123
*
120124
* @param array $attributes The attributes of this link (e.g. "['as' => true]", "['pr' => 0.5]")
121125
*

‎src/Symfony/Component/DependencyInjection/Compiler/DefinitionErrorExceptionPass.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,10 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
6262
}
6363

6464
if ($value instanceof Reference && $this->currentId !== $targetId = (string) $value) {
65-
if (ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE === $value->getInvalidBehavior()) {
65+
if (
66+
ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE === $value->getInvalidBehavior()
67+
|| ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE === $value->getInvalidBehavior()
68+
) {
6669
$this->sourceReferences[$targetId][$this->currentId] ??= true;
6770
} else {
6871
$this->sourceReferences[$targetId][$this->currentId] = false;

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/DefinitionErrorExceptionPassTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ public function testSkipNestedErrors()
6464
$container->register('foo', 'stdClass')
6565
->addArgument(new Reference('bar', ContainerBuilder::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE));
6666

67+
$container->register('baz', 'stdClass')
68+
->addArgument(new Reference('bar', ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE));
69+
6770
$pass = new DefinitionErrorExceptionPass();
6871
$pass->process($container);
6972

‎src/Symfony/Component/Validator/Resources/translations/validators.af.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@
472472
</trans-unit>
473473
<trans-unit id="121">
474474
<source>This value is not a valid Twig template.</source>
475-
<target state="needs-translation">This value is not a valid Twig template.</target>
475+
<target state="needs-review-translation">Hierdie waarde is nie 'n geldige Twig-sjabloon nie.</target>
476476
</trans-unit>
477477
</body>
478478
</file>

‎src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@
472472
</trans-unit>
473473
<trans-unit id="121">
474474
<source>This value is not a valid Twig template.</source>
475-
<target state="needs-translation">This value is not a valid Twig template.</target>
475+
<target state="needs-review-translation">هذه القيمة ليست نموذج Twig صالح.</target>
476476
</trans-unit>
477477
</body>
478478
</file>

‎src/Symfony/Component/Validator/Resources/translations/validators.az.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@
472472
</trans-unit>
473473
<trans-unit id="121">
474474
<source>This value is not a valid Twig template.</source>
475-
<target state="needs-translation">This value is not a valid Twig template.</target>
475+
<target state="needs-review-translation">Bu dəyər etibarlı Twig şablonu deyil.</target>
476476
</trans-unit>
477477
</body>
478478
</file>

‎src/Symfony/Component/Validator/Resources/translations/validators.be.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@
472472
</trans-unit>
473473
<trans-unit id="121">
474474
<source>This value is not a valid Twig template.</source>
475-
<target state="needs-translation">This value is not a valid Twig template.</target>
475+
<target state="needs-review-translation">Гэта значэнне не з'яўляецца сапраўдным шаблонам Twig.</target>
476476
</trans-unit>
477477
</body>
478478
</file>

‎src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@
472472
</trans-unit>
473473
<trans-unit id="121">
474474
<source>This value is not a valid Twig template.</source>
475-
<target state="needs-translation">This value is not a valid Twig template.</target>
475+
<target state="needs-review-translation">Тази стойност не е валиден Twig шаблон.</target>
476476
</trans-unit>
477477
</body>
478478
</file>

‎src/Symfony/Component/Validator/Resources/translations/validators.bs.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@
472472
</trans-unit>
473473
<trans-unit id="121">
474474
<source>This value is not a valid Twig template.</source>
475-
<target state="needs-translation">This value is not a valid Twig template.</target>
475+
<target state="needs-review-translation">Ova vrijednost nije važeći Twig šablon.</target>
476476
</trans-unit>
477477
</body>
478478
</file>

‎src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@
472472
</trans-unit>
473473
<trans-unit id="121">
474474
<source>This value is not a valid Twig template.</source>
475-
<target state="needs-translation">This value is not a valid Twig template.</target>
475+
<target state="needs-review-translation">Aquest valor no és una plantilla Twig vàlida.</target>
476476
</trans-unit>
477477
</body>
478478
</file>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy