minor #27338 [Form] fix tests on old phpunit versions (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 614ffde9e52f · 2018-05-22T14:58:23.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [Form] fix tests on old phpunit versions | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Should make appveyor green. Commits ------- 208d1d1 [Form] fix tests on old phpunit versions
diff --git a/src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php b/src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php
@@ -31,7 +31,7 @@ protected function getValidatorExtension()
         }
 
         $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()));
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorExtensionTest.php
@@ -22,6 +22,7 @@ public function test2Dot5ValidationApi()
             ->disableOriginalConstructor()
             ->getMock();
         $metadata = $this->getMockBuilder('Symfony\Component\Validator\Mapping\ClassMetadata')
+            ->setMethods(array('addConstraint', 'addPropertyConstraint'))
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/src/Symfony/Component/Serializer/Mapping/AttributeMetadataInterface.php b/src/Symfony/Component/Serializer/Mapping/AttributeMetadataInterface.php
@@ -60,5 +60,5 @@ public function getMaxDepth();
     /**
      * Merges an {@see AttributeMetadataInterface} with in the current one.
      */
-    public function merge(self $attributeMetadata);
+    public function merge(AttributeMetadataInterface $attributeMetadata);
 }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ protected function getValidatorExtension()`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`$this->validator = $this->getMockBuilder(ValidatorInterface::class)->getMock();`
`34`		`- $metadata = $this->getMockBuilder(ClassMetadata::class)->disableOriginalConstructor()->getMock();`
	`34`	`+ $metadata = $this->getMockBuilder(ClassMetadata::class)->disableOriginalConstructor()->setMethods(array('addPropertyConstraint'))->getMock();`
`35`	`35`	`$this->validator->expects($this->any())->method('getMetadataFor')->will($this->returnValue($metadata));`
`36`	`36`	`$this->validator->expects($this->any())->method('validate')->will($this->returnValue(array()));`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -60,5 +60,5 @@ public function getMaxDepth();`
`60`	`60`	`/**`
`61`	`61`	`* Merges an {@see AttributeMetadataInterface} with in the current one.`
`62`	`62`	`*/`
`63`		`- public function merge(self $attributeMetadata);`
	`63`	`+ public function merge(AttributeMetadataInterface $attributeMetadata);`
`64`	`64`	`}`