Merge branch '5.0'

* 5.0:
  Fix code
  Tweak the code to avoid fabbot false positives

Author: fabpot

Constraints/BicValidator.php

@@ -130,7 +130,7 @@ public function validate($value, Constraint $constraint)
             try {
                 $iban = $this->getPropertyAccessor()->getValue($object, $path);
             } catch (NoSuchPropertyException $e) {
-                throw new ConstraintDefinitionException(sprintf('Invalid property path "%s" provided to "%s" constraint: %s.', $path, get_debug_type($constraint), $e->getMessage()), 0, $e);
+                throw new ConstraintDefinitionException(sprintf('Invalid property path "%s" provided to "%s" constraint: '.$e->getMessage(), $path, get_debug_type($constraint)), 0, $e);
             }
         }
         if (!$iban) {

Constraints/RangeValidator.php

@@ -157,7 +157,7 @@ private function getLimit($propertyPath, $default, Constraint $constraint)
         try {
             return $this->getPropertyAccessor()->getValue($object, $propertyPath);
         } catch (NoSuchPropertyException $e) {
-            throw new ConstraintDefinitionException(sprintf('Invalid property path "%s" provided to "%s" constraint: %s.', $propertyPath, get_debug_type($constraint), $e->getMessage()), 0, $e);
+            throw new ConstraintDefinitionException(sprintf('Invalid property path "%s" provided to "%s" constraint: '.$e->getMessage(), $propertyPath, get_debug_type($constraint)), 0, $e);
         }
     }