fix merge

xabbuh · xabbuh · commit 961fd83d7b6a · 2020-09-11T14:17:27.000+02:00
diff --git a/Test/ConstraintValidatorTestCase.php b/Test/ConstraintValidatorTestCase.php
@@ -499,11 +499,11 @@ public function doValidatePropertyValue($objectOrClass, $propertyName, $value, $
 
     public function getViolations()
     {
-        return $this->context->getViolations();
     }
 
     public function doGetViolations()
     {
+        return $this->context->getViolations();
     }
 
     public function expectNoValidate()

Original file line number	Diff line number	Diff line change
`@@ -499,11 +499,11 @@ public function doValidatePropertyValue($objectOrClass, $propertyName, $value, $`
`499`	`499`
`500`	`500`	`public function getViolations()`
`501`	`501`	`{`
`502`		`- return $this->context->getViolations();`
`503`	`502`	`}`
`504`	`503`
`505`	`504`	`public function doGetViolations()`
`506`	`505`	`{`
	`506`	`+ return $this->context->getViolations();`
`507`	`507`	`}`
`508`	`508`
`509`	`509`	`public function expectNoValidate()`