Skip to content

Commit 093dd1c

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: cs fix [Security][Validator] Add missing translations for Indonesian (id) [Notifier] fix typo firebase Add trailing Line return if last line is non empty Report mismatches between trans-unit id and source text via status script Do not add namespace argument to NullAdapter in CachePoolPass [FrameworkBundle] Update cache:clear help Fix ExecutionContextInterface::setParameter phpdoc example Don't pass null to preg_replace() Don't pass null to strpos() Remove preloading of unused class [Messenger] Separate unit tests from integration tests Fix ServiceLocator indexing when service is decorated always close open stopwatch section after handling kernel.request events
2 parents cb9ecee + 8312cb3 commit 093dd1c

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

Context/ExecutionContextInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ public function addViolation(string $message, array $params = []);
7676
* add the violation when you're done with the configuration:
7777
*
7878
* $context->buildViolation('Please enter a number between %min% and %max%.')
79-
* ->setParameter('%min%', 3)
80-
* ->setParameter('%max%', 10)
79+
* ->setParameter('%min%', '3')
80+
* ->setParameter('%max%', '10')
8181
* ->setTranslationDomain('number_validation')
8282
* ->addViolation();
8383
*

Resources/translations/validators.id.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,10 @@
386386
<source>This value is not a valid International Securities Identification Number (ISIN).</source>
387387
<target>Nilai ini bukan merupakan International Securities Identification Number (ISIN) yang sah.</target>
388388
</trans-unit>
389+
<trans-unit id="100">
390+
<source>This value should be a valid expression.</source>
391+
<target>Nilai ini harus berupa ekspresi yang valid.</target>
392+
</trans-unit>
389393
</body>
390394
</file>
391395
</xliff>

Tests/Fixtures/CustomArrayObject.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public function offsetExists($offset): bool
3131

3232
/**
3333
* @param mixed $offset
34+
*
3435
* @return mixed
3536
*/
3637
#[\ReturnTypeWillChange]

0 commit comments

Comments
 (0)