Skip to content

Commit d374e37

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: respect the umask argument in dumpFile() dumpFile(), preserve existing file permissions Add validate method to mockec validator in form TypeTestCase bumped Symfony version to 2.7.26 updated VERSION for 2.7.25 update CONTRIBUTORS for 2.7.25 updated CHANGELOG for 2.7.25 [HttpKernel] fixed Kernel name when stored in a directory starting with a number context listener: hardening user provider handling
2 parents 8365cd6 + 0b509ff commit d374e37

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

Tests/Extension/Validator/Type/TypeTestCase.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ protected function setUp()
2323
$this->validator = $this->getMockBuilder('Symfony\Component\Validator\Validator\ValidatorInterface')->getMock();
2424
$metadata = $this->getMockBuilder('Symfony\Component\Validator\Mapping\ClassMetadata')->disableOriginalConstructor()->getMock();
2525
$this->validator->expects($this->once())->method('getMetadataFor')->will($this->returnValue($metadata));
26+
$this->validator->expects($this->any())->method('validate')->will($this->returnValue(array()));
2627

2728
parent::setUp();
2829
}

0 commit comments

Comments
 (0)