Skip to content

Commit 2250cd6

Browse files
committed
Merge branch '3.4' into 4.3
* 3.4: [Filesystem] [Serializer] fixes English grammar typo [Monolog Bridge] Fixed accessing static property as non static. Improve Symfony description [Validator] Add Japanese translation Remove some unused methods parameters Avoid empty \"If-Modified-Since\" header in validation request [Validator] ConstraintValidatorTestCase: add missing return value to mocked validate method calls
2 parents 8062841 + 9a7777a commit 2250cd6

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

Resources/translations/validators.ja.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,10 @@
362362
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
363363
<target>このパスワードは漏洩している為使用できません。</target>
364364
</trans-unit>
365+
<trans-unit id="94">
366+
<source>This value should be between {{ min }} and {{ max }}.</source>
367+
<target>{{ min }}以上{{ max }}以下でなければなりません。</target>
368+
</trans-unit>
365369
</body>
366370
</file>
367371
</xliff>

Test/ConstraintValidatorTestCase.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,8 @@ protected function expectValidateAt($i, $propertyPath, $value, $group)
178178
->willReturn($validator);
179179
$validator->expects($this->at(2 * $i + 1))
180180
->method('validate')
181-
->with($value, $this->logicalOr(null, [], $this->isInstanceOf('\Symfony\Component\Validator\Constraints\Valid')), $group);
181+
->with($value, $this->logicalOr(null, [], $this->isInstanceOf('\Symfony\Component\Validator\Constraints\Valid')), $group)
182+
->willReturn($validator);
182183
}
183184

184185
protected function expectValidateValueAt($i, $propertyPath, $value, $constraints, $group = null)
@@ -190,7 +191,8 @@ protected function expectValidateValueAt($i, $propertyPath, $value, $constraints
190191
->willReturn($contextualValidator);
191192
$contextualValidator->expects($this->at(2 * $i + 1))
192193
->method('validate')
193-
->with($value, $constraints, $group);
194+
->with($value, $constraints, $group)
195+
->willReturn($contextualValidator);
194196
}
195197

196198
protected function assertNoViolation()

0 commit comments

Comments
 (0)