Merge branch '4.4' into 5.0

* 4.4: Tweak the code to avoid fabbot false positives
symfony · Apr 12, 2020 · b313fe5 · b313fe5
2 parents d01fd93 + e24eb5f
commit b313fe5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Constraints/AbstractComparisonValidator.php b/Constraints/AbstractComparisonValidator.php
@@ -55,7 +55,7 @@ public function validate($value, Constraint $constraint)
             try {
                 $comparedValue = $this->getPropertyAccessor()->getValue($object, $path);
             } catch (NoSuchPropertyException $e) {
-                throw new ConstraintDefinitionException(sprintf('Invalid property path "%s" provided to "%s" constraint: %s.', $path, \get_class($constraint), $e->getMessage()), 0, $e);
+                throw new ConstraintDefinitionException(sprintf('Invalid property path "%s" provided to "%s" constraint: '.$e->getMessage(), $path, \get_class($constraint)), 0, $e);
             }
         } else {
             $comparedValue = $constraint->value;

diff --git a/Constraints/CallbackValidator.php b/Constraints/CallbackValidator.php
@@ -40,7 +40,7 @@ public function validate($object, Constraint $constraint)
                 if (isset($method[0]) && \is_object($method[0])) {
                     $method[0] = \get_class($method[0]);
                 }
-                throw new ConstraintDefinitionException(sprintf('%s targeted by Callback constraint is not a valid callable.', json_encode($method)));
+                throw new ConstraintDefinitionException(json_encode($method).' targeted by Callback constraint is not a valid callable.');
             }
 
             $method($object, $this->context, $constraint->payload);