Skip to content

Commit fcb8377

Browse files
author
Robin Chalas
committed
Merge branch '4.3' into 4.4
* 4.3: [FWBundle] Remove unused parameter [Intl] [Workflow] fixes English grammar typos [Filesystem] [Serializer] fixes English grammar typo [Messenger] Adding exception to amqp transport in case amqp ext is not installed [Monolog Bridge] Fixed accessing static property as non static. Improve Symfony description Add DateTimeZoneNormalizer into Dependency Injection [Messenger] Error when specified default bus is not among the configured [Validator] Add Japanese translation [Workflow] Apply the same logic of precedence between the apply() and the buildTransitionBlockerList() method Remove some unused methods parameters Avoid empty \"If-Modified-Since\" header in validation request [Security] Fix SwitchUser is broken when the User Provider always returns a valid user Fix error message according to the new regex compatibility with DoctrineBundle 2 [Validator] ConstraintValidatorTestCase: add missing return value to mocked validate method calls
2 parents 0aca4fb + 2250cd6 commit fcb8377

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
@@ -179,7 +179,8 @@ protected function expectValidateAt($i, $propertyPath, $value, $group)
179179
->willReturn($validator);
180180
$validator->expects($this->at(2 * $i + 1))
181181
->method('validate')
182-
->with($value, $this->logicalOr(null, [], $this->isInstanceOf('\Symfony\Component\Validator\Constraints\Valid')), $group);
182+
->with($value, $this->logicalOr(null, [], $this->isInstanceOf('\Symfony\Component\Validator\Constraints\Valid')), $group)
183+
->willReturn($validator);
183184
}
184185

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

197199
protected function assertNoViolation()

0 commit comments

Comments
 (0)