Merge branch '3.4' into 4.4

fabpot · fabpot · commit d9a71a9d974d · 2020-08-17T14:26:54.000+02:00
* 3.4:
  [Validator] fix tests
  ensure that the validator is a mock object for backwards-compatibility
diff --git a/Test/ConstraintValidatorTestCase.php b/Test/ConstraintValidatorTestCase.php
@@ -117,7 +117,7 @@ protected function createContext()
         $validator->expects($this->any())
             ->method('inContext')
             ->with($context)
-            ->willReturn(new AssertingContextualValidator());
+            ->willReturn($this->getMockBuilder(AssertingContextualValidator::class)->setMethods(null)->getMock());
 
         return $context;
     }

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ protected function createContext()`
`117`	`117`	`$validator->expects($this->any())`
`118`	`118`	`->method('inContext')`
`119`	`119`	`->with($context)`
`120`		`- ->willReturn(new AssertingContextualValidator());`
	`120`	`+ ->willReturn($this->getMockBuilder(AssertingContextualValidator::class)->setMethods(null)->getMock());`
`121`	`121`
`122`	`122`	`return $context;`
`123`	`123`	`}`