Skip to content

Commit a4bd75c

Browse files
Merge branch '4.4' into 5.1
* 4.4: CS fix [travis] use PHP 8.0 to patch return types and run deps=low Update sl_SI translations Don't trigger deprecation for deprecated aliases pointing to deprecated definitions [HttpFoundation] use atomic writes in MockFileSessionStorage [DI] fix param annotation [Config] Add \Symfony\Component\Config\Loader::load() return type Simplify PHP CS Fixer config Rename normalize param
2 parents 34ef29d + bb858fc commit a4bd75c

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

Resources/translations/security.sl.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,14 @@
6262
<source>Account is locked.</source>
6363
<target>Račun je zaklenjen.</target>
6464
</trans-unit>
65+
<trans-unit id="17">
66+
<source>Too many failed login attempts, please try again later.</source>
67+
<target>Preveč neuspelih poskusov prijave, poskusite znova pozneje.</target>
68+
</trans-unit>
69+
<trans-unit id="18">
70+
<source>Invalid or expired login link.</source>
71+
<target>Neveljavna ali potekla povezava prijave.</target>
72+
</trans-unit>
6573
</body>
6674
</file>
6775
</xliff>

Tests/Authorization/TraceableAccessDecisionManagerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public function provideObjectsAndLogs(): \Generator
127127
yield [
128128
[[
129129
'attributes' => [new \stdClass()],
130-
'object' => $x = fopen(__FILE__, 'rb'),
130+
'object' => $x = fopen(__FILE__, 'r'),
131131
'result' => true,
132132
'voterDetails' => [],
133133
]],

0 commit comments

Comments
 (0)