Skip to content

Commit 51c4ca7

Browse files
committed
Merge branch '5.4' into 6.4
* 5.4: [Validator] added Polish translation for units 116-119 Revert stateless check [Console] Fix side-effects from running bash completions skip transient Redis integration tests on AppVeyor
2 parents c7f46c5 + 14b1b4d commit 51c4ca7

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

src/Symfony/Component/Console/Resources/completion.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ _sf_{{ COMMAND_NAME }}() {
1717
done
1818

1919
# Use newline as only separator to allow space in completion values
20-
IFS=$'\n'
20+
local IFS=$'\n'
2121
local sf_cmd="${COMP_WORDS[0]}"
2222

2323
# for an alias, get the real script behind it

src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,9 @@ public function testGetNonBlocking()
363363
}
364364
}
365365

366+
/**
367+
* @group transient-on-windows
368+
*/
366369
public function testGetAfterReject()
367370
{
368371
$redis = $this->createRedisClient();

src/Symfony/Component/Security/Http/Firewall/ContextListener.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ public function authenticate(RequestEvent $event): void
8787
}
8888

8989
$request = $event->getRequest();
90-
$session = !$request->attributes->getBoolean('_stateless') && $request->hasPreviousSession() ? $request->getSession() : null;
90+
$session = $request->hasPreviousSession() ? $request->getSession() : null;
91+
9192

9293
$request->attributes->set('_security_firewall_run', $this->sessionKey);
9394

src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -452,19 +452,19 @@
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>Podana wartość nie jest poprawnym oznaczeniem tygodnia w formacie 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>Podana wartość nie jest poprawnym oznaczeniem tygodnia.</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>Podana wartość nie powinna być przed tygodniem "{{ 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>Podana wartość nie powinna być po tygodniu "{{ max }}".</target>
468468
</trans-unit>
469469
</body>
470470
</file>

0 commit comments

Comments
 (0)