Merge pull request #1950 from XWB/testfix

XWB · XWB · commit 3b63b2e89087 · 2015-09-15T14:19:39.000+02:00
Fixed form tests for Symfony 2.3
diff --git a/Tests/Form/Type/ValidatorExtensionTypeTestCase.php b/Tests/Form/Type/ValidatorExtensionTypeTestCase.php
@@ -15,7 +15,12 @@ class ValidatorExtensionTypeTestCase extends TypeTestCase
 {
     protected function getTypeExtensions()
     {
-        $validator = $this->getMock('Symfony\Component\Validator\Validator\ValidatorInterface');
+        if (interface_exists('Symfony\Component\Validator\Validator\ValidatorInterface')) {
+            $validator = $this->getMock('Symfony\Component\Validator\Validator\ValidatorInterface');
+        } else {
+            $validator = $this->getMock('Symfony\Component\Validator\ValidatorInterface');
+        }
+
         $validator->method('validate')->will($this->returnValue(new ConstraintViolationList()));
 
         return array(

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,12 @@ class ValidatorExtensionTypeTestCase extends TypeTestCase`
`15`	`15`	`{`
`16`	`16`	`protected function getTypeExtensions()`
`17`	`17`	`{`
`18`		`- $validator = $this->getMock('Symfony\Component\Validator\Validator\ValidatorInterface');`
	`18`	`+ if (interface_exists('Symfony\Component\Validator\Validator\ValidatorInterface')) {`
	`19`	`+ $validator = $this->getMock('Symfony\Component\Validator\Validator\ValidatorInterface');`
	`20`	`+ } else {`
	`21`	`+ $validator = $this->getMock('Symfony\Component\Validator\ValidatorInterface');`
	`22`	`+ }`
	`23`	`+`
`19`	`24`	`$validator->method('validate')->will($this->returnValue(new ConstraintViolationList()));`
`20`	`25`
`21`	`26`	`return array(`