8000 Merge branch '6.4' into 7.1 · symfony/symfony@e527c5f · GitHub
[go: up one dir, main page]
Skip to content

Commit e527c5f

Browse files
xabbuhxabbuh
committed
Merge branch '6.4' into 7.1
* 6.4: fix Twig 3.12 compatibility [Translation] Review Serbian translations Fix typos [DependencyInjection] Fix error message typo in YamlFileLoader Fix typo in exception message langage to language
2 parents 49d41a7 + 3864e8f commit e527c5f

File tree

14 files changed

+67
-36
lines changed

14 files changed

+67
-36
lines changed

‎src/Symfony/Bridge/Twig/Node/DumpNode.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Bridge\Twig\Node;
1313

14+
use Twig\Attribute\FirstClassTwigCallableReady;
1415
use Twig\Attribute\YieldReady;
1516
use Twig\Compiler;
1617
use Twig\Node\Node;
@@ -32,7 +33,12 @@ public function __construct(
3233
$nodes['values'] = $values;
3334
}
3435

35-
parent::__construct($nodes, [], $lineno, $tag);
36+
if (class_exists(FirstClassTwigCallableReady::class)) {
37+
parent::__construct($nodes, [], $lineno);
38+
} else {
39+
parent::__construct($nodes, [], $lineno, $tag);
40+
}
41+
3642
$this->varPrefix = $varPrefix;
3743
}
3844

‎src/Symfony/Bridge/Twig/Node/FormThemeNode.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bridge\Twig\Node;
1313

1414
use Symfony\Component\Form\FormRenderer;
15+
use Twig\Attribute\FirstClassTwigCallableReady;
1516
use Twig\Attribute\YieldReady;
1617
use Twig\Compiler;
1718
use Twig\Node\Node;
@@ -24,7 +25,11 @@ final class FormThemeNode extends Node
2425
{
2526
public function __construct(Node $form, Node $resources, int $lineno, ?string $tag = null, bool $only = false)
2627
{
27-
parent::__construct(['form' => $form, 'resources' => $resources], ['only' => $only], $lineno, $tag);
28+
if (class_exists(FirstClassTwigCallableReady::class)) {
29+
parent::__construct(['form' => $form, 'resources' => $resources], ['only' => $only], $lineno);
30+
} else {
31+
parent::__construct(['form' => $form, 'resources' => $resources], ['only' => $only], $lineno, $tag);
32+
}
2833
}
2934

3035
public function compile(Compiler $compiler): void

‎src/Symfony/Bridge/Twig/Node/StopwatchNode.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Bridge\Twig\Node;
1313

14+
use Twig\Attribute\FirstClassTwigCallableReady;
1415
use Twig\Attribute\YieldReady;
1516
use Twig\Compiler;
1617
use Twig\Node\Expression\AssignNameExpression;
@@ -26,7 +27,11 @@ final class StopwatchNode extends Node
2627
{
2728
public function __construct(Node $name, Node $body, AssignNameExpression $var, int $lineno = 0, ?string $tag = null)
2829
{
29-
parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno, $tag);
30+
if (class_exists(FirstClassTwigCallableReady::class)) {
31+
parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno);
32+
} else {
33+
parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno, $tag);
34+
}
3035
}
3136

3237
public function compile(Compiler $compiler): void

‎src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Bridge\Twig\Node;
1313

14+
use Twig\Attribute\FirstClassTwigCallableReady;
1415
use Twig\Attribute\YieldReady;
1516
use Twig\Compiler;
1617
use Twig\Node\Expression\AbstractExpression;
@@ -24,7 +25,11 @@ final class TransDefaultDomainNode extends Node
2425
{
2526
public function __construct(AbstractExpression $expr, int $lineno = 0, ?string $tag = null)
2627
{
27-
parent::__construct(['expr' => $expr], [], $lineno, $tag);
28+
if (class_exists(FirstClassTwigCallableReady::class)) {
29+
parent::__construct(['expr' => $expr], [], $lineno);
30+
} else {
31+
parent::__construct(['expr' => $expr], [], $lineno, $tag);
32+
}
2833
}
2934

3035
public function compile(Compiler $compiler): void

‎src/Symfony/Bridge/Twig/Node/TransNode.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Bridge\Twig\Node;
1313

14+
use Twig\Attribute\FirstClassTwigCallableReady;
1415
use Twig\Attribute\YieldReady;
1516
use Twig\Compiler;
1617
use Twig\Node\Expression\AbstractExpression;
@@ -42,7 +43,11 @@ public function __construct(Node $body, ?Node $domain = null, ?AbstractExpressio
4243
$nodes['locale'] = $locale;
4344
}
4445

45-
parent::__construct($nodes, [], $lineno, $tag);
46+
if (class_exists(FirstClassTwigCallableReady::class)) {
47+
parent::__construct($nodes, [], $lineno);
48+
} else {
49+
parent::__construct($nodes, [], $lineno, $tag);
50+
}
4651
}
4752

4853
public function compile(Compiler $compiler): void

‎src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Bridge\Twig\Node\FormThemeNode;
1616
use Symfony\Bridge\Twig\TokenParser\FormThemeTokenParser;
17+
use Twig\Attribute\FirstClassTwigCallableReady;
1718
use Twig\Environment;
1819
use Twig\Loader\LoaderInterface;
1920
use Twig\Node\Expression\ArrayExpression;
@@ -35,6 +36,10 @@ public function testCompile($source, $expected)
3536
$stream = $env->tokenize($source);
3637
$parser = new Parser($env);
3738

39+
if (class_exists(FirstClassTwigCallableReady::class)) {
40+
$expected->setNodeTag('form_theme');
41+
}
42+
3843
$expected->setSourceContext($source);
3944

4045
$this->assertEquals($expected, $parser->parse($stream)->getNode('body')->getNode(0));

‎src/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function getFunctions(): array
4545

4646
new ExpressionFunction('env', fn ($arg) => sprintf('$container->getEnv(%s)', $arg), function (array $variables, $value) {
4747
if (!$this->getEnv) {
48-
throw new LogicException('You need to pass a getEnv closure to the expression langage provider to use the "env" function.');
48+
throw new LogicException('You need to pass a getEnv closure to the expression language provider to use the "env" function.');
4949
}
5050

5151
return ($this->getEnv)($value);

‎src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ private function parseDefinition(string $id, array|string|null $service, string
562562
}
563563

564564
if (\is_string($k)) {
565-
throw new InvalidArgumentException(sprintf('Invalid method call for service "%s", did you forgot a leading dash before "%s: ..." in "%s"?', $id, $k, $file));
565+
throw new InvalidArgumentException(sprintf('Invalid method call for service "%s", did you forget a leading dash before "%s: ..." in "%s"?', $id, $k, $file));
566566
}
567567

568568
if (isset($call['method']) && \is_string($call['method'])) {

‎src/Symfony/Component/Routing/Loader/AttributeFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ protected function findClass(string $file): string|false
7676
$tokens = token_get_all(file_get_contents($file));
7777

7878
if (1 === \count($tokens) && \T_INLINE_HTML === $tokens[0][0]) {
79-
throw new \InvalidArgumentException(sprintf('The file "%s" does not contain PHP code. Did you forgot to add the "<?php" start tag at the beginning of the file?', $file));
79+
throw new \InvalidArgumentException(sprintf('The file "%s" does not contain PHP code. Did you forget to add the "<?php" start tag at the beginning of the file?', $file));
8080
}
8181

8282
$nsTokens = [\T_NS_SEPARATOR => true, \T_STRING => true];

‎src/Symfony/Component/Routing/Tests/Loader/AttributeFileLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function testLoadTraitWithClassConstant()
5454
public function testLoadFileWithoutStartTag()
5555
{
5656
$this->expectException(\InvalidArgumentException::class);
57-
$this->expectExceptionMessage('Did you forgot to add the "<?php" start tag at the beginning of the file?');
57+
$this->expectExceptionMessage('Did you forget to add the "<?php" start tag at the beginning of the file?');
5858
$this->loader->load(__DIR__.'/../Fixtures/OtherAnnotatedClasses/NoStartTagClass.php');
5959
}
6060

‎src/Symfony/Component/Security/Core/Resources/translations/security.sr_Cyrl.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
</trans-unit>
7777
<trans-unit id="20">
7878
<source>Too many failed login attempts, please try again in %minutes% minutes.</source>
79-
<target state="needs-review-translation">Превише неуспешних покушаја пријављивања, покушајте поново за %minutes% минут.|Превише неуспешних покушаја пријављивања, покушајте поново за %minutes% минута.|Превише неуспешних покушаја пријављивања, покушајте поново за %minutes% минута.</target>
79+
<target>Превише неуспешних покушаја пријављивања, покушајте поново за %minutes% минут.|Превише неуспешних покушаја пријављивања, покушајте поново за %minutes% минута.</target>
8080
</trans-unit>
8181
</body>
8282
</file>

‎src/Symfony/Component/Security/Core/Resources/translations/security.sr_Latn.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
</trans-unit>
7777
<trans-unit id="20">
7878
<source>Too many failed login attempts, please try again in %minutes% minutes.</source>
79-
<target state="needs-review-translation">Previše neuspešnih pokušaja prijavljivanja, pokušajte ponovo za %minutes% minut.|Previše neuspešnih pokušaja prijavljivanja, pokušajte ponovo za %minutes% minuta.|Previše neuspešnih pokušaja prijavljivanja, pokušajte ponovo za %minutes% minuta.</target>
79+
<target>Previše neuspešnih pokušaja prijavljivanja, pokušajte ponovo za %minutes% minut.|Previše neuspešnih pokušaja prijavljivanja, pokušajte ponovo za %minutes% minuta.</target>
8080
</trans-unit>
8181
</body>
8282
</file>

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
</trans-unit>
137137
<trans-unit id="37" resname="This is not a valid IP address.">
138138
<source>This value is not a valid IP address.</source>
139-
<target state="needs-review-translation">Ова вредност није валидна IP адреса.</target>
139+
<target>Ова вредност није валидна IP адреса.</target>
140140
</trans-unit>
141141
<trans-unit id="38">
142142
<source>This value is not a valid language.</source>
@@ -192,7 +192,7 @@
192192
</trans-unit>
193193
<trans-unit id="51" resname="No temporary folder was configured in php.ini.">
194194
<source>No temporary folder was configured in php.ini, or the configured folder does not exist.</source>
195-
<target state="needs-review-translation">Привремени директоријум није конфигурисан у php.ini, или конфигурисани директоријум не постоји.</target>
195+
<target>Привремени директоријум није конфигурисан у php.ini, или конфигурисани директоријум не постоји.</target>
196196
</trans-unit>
197197
<trans-unit id="52">
198198
<source>Cannot write temporary file to disk.</source>
@@ -224,7 +224,7 @@
224224
</trans-unit>
225225
<trans-unit id="59" resname="This is not a valid International Bank Account Number (IBAN).">
226226
<source>This value is not a valid International Bank Account Number (IBAN).</source>
227-
<target state="needs-review-translation">Ова вредност није валидан Међународни број банкарског рачуна (IBAN).</target>
227+
<target>Ова вредност није валидан Међународни број банковног рачуна (IBAN).</target>
228228
</trans-unit>
229229
<trans-unit id="60">
230230
<source>This value is not a valid ISBN-10.</source>
@@ -312,15 +312,15 @@
312312
</trans-unit>
313313
<trans-unit id="81" resname="This is not a valid Business Identifier Code (BIC).">
314314
<source>This value is not a valid Business Identifier Code (BIC).</source>
315-
<target state="needs-review-translation">Ова вредност није валидан Код за идентификацију бизниса (BIC).</target>
315+
<target>Ова вредност није валидна Код за идентификацију бизниса (BIC).</target>
316316
</trans-unit>
317317
<trans-unit id="82">
318318
<source>Error</source>
319319
<target>Грешка</target>
320320
</trans-unit>
321321
<trans-unit id="83" resname="This is not a valid UUID.">
322322
<source>This value is not a valid UUID.</source>
323-
<target state="needs-review-translation">Ова вредност није валидан UUID.</target>
323+
<target>Ова вредност није валидан UUID.</target>
324324
</trans-unit>
325325
<trans-unit id="84">
326326
<source>This value should be a multiple of {{ compared_value }}.</source>
@@ -440,31 +440,31 @@
440440
</trans-unit>
441441
<trans-unit id="113">
442442
<source>This URL is missing a top-level domain.</source>
443-
<target state="needs-review-translation">Овом URL недостаје домен највишег нивоа.</target>
443+
<target>Овом УРЛ-у недостаје домен највишег нивоа.</target>
444444
</trans-unit>
445445
<trans-unit id="114">
446446
<source>This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</source>
447-
<target state="needs-translation">This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</target>
447+
<target>Ова вредност је прекратка. Треба да садржи макар једну реч.|Ова вредност је прекратка. Треба да садржи макар {{ min }} речи.</target>
448448
</trans-unit>
449449
<trans-unit id="115">
450450
<source>This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</source>
451-
<target state="needs-translation">This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</target>
451+
<target>Ова вредност је предугачка. Треба да садржи само једну реч.|Ова вредност је предугачка. Треба да садржи највише {{ max }} речи.</target>
452452
</trans-unit>
453453
<trans-unit id="116">
454454
<source>This value does not represent a valid week in the ISO 8601 format.</source>
455-
<target state="needs-translation">This value does not represent a valid week in the ISO 8601 format.</target>
455+
<target>Ова вредност не представља валидну недељу у ISO 8601 формату.</target>
456456
</trans-unit>
457457
<trans-unit id="117">
458458
<source>This value is not a valid week.</source>
459-
<target state="needs-translation">This value is not a valid week.</target>
459+
<target>Ова вредност није валидна недеља.</target>
460460
</trans-unit>
461461
<trans-unit id="118">
462462
<source>This value should not be before week "{{ min }}".</source>
463-
<target state="needs-translation">This value should not be before week "{{ min }}".</target>
463+
<target>Ова вредност не би требала да буде пре недеље "{{ min }}".</target>
464464
</trans-unit>
465465
<trans-unit id="119">
466466
<source>This value should not be after week "{{ max }}".</source>
467-
<target state="needs-translation">This value should not be after week "{{ max }}".</target>
467+
<target>Ова вредност не би требала да буде после недеље "{{ max }}".</target>
468468
</trans-unit>
469469
</body>
470470
</file>

0 commit comments

Comments
 (0)
0