Merge branch '3.4' into 4.0
* 3.4: [Form] fix tests on old phpunit versions [FrameworkBundle] fix typo in CacheClearCommand bumped Symfony version to 3.4.11 updated VERSION for 3.4.10 updated CHANGELOG for 3.4.10 fixed test
This commit is contained in:
commit
388737232b
@ -122,7 +122,7 @@ EOF
|
||||
if ('/' === \DIRECTORY_SEPARATOR && $mounts = @file('/proc/mounts')) {
|
||||
foreach ($mounts as $mount) {
|
||||
$mount = array_slice(explode(' ', $mount), 1, -3);
|
||||
if (!\in_array(array_pop($mount), array('vboxfs', 'nfs'))) {
|
||||
if (!\in_array(array_pop($mount), array('vboxsf', 'nfs'))) {
|
||||
continue;
|
||||
}
|
||||
$mount = implode(' ', $mount).'/';
|
||||
|
@ -31,7 +31,7 @@ trait ValidatorExtensionTrait
|
||||
}
|
||||
|
||||
$this->validator = $this->getMockBuilder(ValidatorInterface::class)->getMock();
|
||||
$metadata = $this->getMockBuilder(ClassMetadata::class)->disableOriginalConstructor()->getMock();
|
||||
$metadata = $this->getMockBuilder(ClassMetadata::class)->disableOriginalConstructor()->setMethods(array('addPropertyConstraint'))->getMock();
|
||||
$this->validator->expects($this->any())->method('getMetadataFor')->will($this->returnValue($metadata));
|
||||
$this->validator->expects($this->any())->method('validate')->will($this->returnValue(array()));
|
||||
|
||||
|
@ -22,6 +22,7 @@ class ValidatorExtensionTest extends TestCase
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
$metadata = $this->getMockBuilder('Symfony\Component\Validator\Mapping\ClassMetadata')
|
||||
->setMethods(array('addConstraint', 'addPropertyConstraint'))
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
|
||||
|
Reference in New Issue
Block a user