Skip to content

Commit a51c84a

Browse files
author
Robin Chalas
committed
Merge branch '4.4' into 5.0
* 4.4: (38 commits) reset the kernel cache after each test [HttpKernel] Ability to define multiple kernel.reset tags [Routing] Continue supporting single colon in object route loaders [FWBundle] Remove unused parameter [Intl] [Workflow] fixes English grammar typos [Filesystem] [Serializer] fixes English grammar typo mailer: mailchimp bridge is throwing undefined index _id when setting message id in mandrill http transport has_roles should be is_granted in upgrade files [HttpClient] Fix early cleanup of pushed HTTP/2 responses skip test on incompatible PHP versions [HttpKernel] Don't cache "not-fresh" state [FrameworkBundle][Cache] Don't deep-merge cache pools configuration [Messenger] Adding exception to amqp transport in case amqp ext is not installed [SecurityBundle] Don't require a user provider for the anonymous listener [Monolog Bridge] Fixed accessing static property as non static. Improve Symfony description [Mailer] Add UPGRADE entries about Envelope and MessageEvent [FrameworkBundle] fix leftover mentioning "secret:" processor Add DateTimeZoneNormalizer into Dependency Injection [Messenger] Error when specified default bus is not among the configured ...
2 parents 4c32fba + fcb8377 commit a51c84a

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

Constraint.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ public function getTargets()
287287
*
288288
* @internal
289289
*/
290-
public function __sleep(): array
290+
public function __sleep()
291291
{
292292
// Initialize "groups" option if it is not set
293293
$this->groups;

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
@@ -177,7 +177,8 @@ protected function expectValidateAt($i, $propertyPath, $value, $group)
177177
->willReturn($validator);
178178
$validator->expects($this->at(2 * $i + 1))
179179
->method('validate')
180-
->with($value, $this->logicalOr(null, [], $this->isInstanceOf('\Symfony\Component\Validator\Constraints\Valid')), $group);
180+
->with($value, $this->logicalOr(null, [], $this->isInstanceOf('\Symfony\Component\Validator\Constraints\Valid')), $group)
181+
->willReturn($validator);
181182
}
182183

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

195197
protected function assertNoViolation()

0 commit comments

Comments
 (0)