Fix quotes in exception messages

fabpot · fabpot · commit 0a91b41da351 · 2020-03-16T09:31:04.000+01:00
diff --git a/Constraints/CallbackValidator.php b/Constraints/CallbackValidator.php
@@ -46,7 +46,7 @@ public function validate($object, Constraint $constraint)
             \call_user_func($method, $object, $this->context, $constraint->payload);
         } elseif (null !== $object) {
             if (!method_exists($object, $method)) {
-                throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Callback constraint does not exist in class %s.', $method, \get_class($object)));
+                throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Callback constraint does not exist in class "%s".', $method, \get_class($object)));
             }
 
             $reflMethod = new \ReflectionMethod($object, $method);
diff --git a/Constraints/Collection.php b/Constraints/Collection.php
@@ -57,7 +57,7 @@ protected function initializeNestedConstraints()
         parent::initializeNestedConstraints();
 
         if (!\is_array($this->fields)) {
-            throw new ConstraintDefinitionException(sprintf('The option "fields" is expected to be an array in constraint %s.', __CLASS__));
+            throw new ConstraintDefinitionException(sprintf('The option "fields" is expected to be an array in constraint "%s".', __CLASS__));
         }
 
         foreach ($this->fields as $fieldName => $field) {
diff --git a/Constraints/Composite.php b/Constraints/Composite.php
@@ -71,11 +71,11 @@ public function __construct($options = null)
                     $constraint = \get_class($constraint);
                 }
 
-                throw new ConstraintDefinitionException(sprintf('The value %s is not an instance of Constraint in constraint %s.', $constraint, static::class));
+                throw new ConstraintDefinitionException(sprintf('The value "%s" is not an instance of Constraint in constraint "%s".', $constraint, static::class));
             }
 
             if ($constraint instanceof Valid) {
-                throw new ConstraintDefinitionException(sprintf('The constraint Valid cannot be nested inside constraint %s. You can only declare the Valid constraint directly on a field or method.', static::class));
+                throw new ConstraintDefinitionException(sprintf('The constraint Valid cannot be nested inside constraint "%s". You can only declare the Valid constraint directly on a field or method.', static::class));
             }
         }
 
@@ -99,7 +99,7 @@ public function __construct($options = null)
                 $excessGroups = array_diff($constraint->groups, $this->groups);
 
                 if (\count($excessGroups) > 0) {
-                    throw new ConstraintDefinitionException(sprintf('The group(s) "%s" passed to the constraint %s should also be passed to its containing constraint %s.', implode('", "', $excessGroups), \get_class($constraint), static::class));
+                    throw new ConstraintDefinitionException(sprintf('The group(s) "%s" passed to the constraint "%s" should also be passed to its containing constraint "%s".', implode('", "', $excessGroups), \get_class($constraint), static::class));
                 }
             } else {
                 $constraint->groups = $this->groups;
diff --git a/Constraints/Count.php b/Constraints/Count.php
@@ -51,7 +51,7 @@ public function __construct($options = null)
         parent::__construct($options);
 
         if (null === $this->min && null === $this->max) {
-            throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s.', __CLASS__), ['min', 'max']);
+            throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint "%s".', __CLASS__), ['min', 'max']);
         }
     }
 }
diff --git a/Constraints/Length.php b/Constraints/Length.php
@@ -55,7 +55,7 @@ public function __construct($options = null)
         parent::__construct($options);
 
         if (null === $this->min && null === $this->max) {
-            throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s.', __CLASS__), ['min', 'max']);
+            throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint "%s".', __CLASS__), ['min', 'max']);
         }
     }
 }
diff --git a/Constraints/Range.php b/Constraints/Range.php
@@ -43,7 +43,7 @@ public function __construct($options = null)
         parent::__construct($options);
 
         if (null === $this->min && null === $this->max) {
-            throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s.', __CLASS__), ['min', 'max']);
+            throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint "%s".', __CLASS__), ['min', 'max']);
         }
     }
 }
diff --git a/Constraints/Traverse.php b/Constraints/Traverse.php
@@ -26,7 +26,7 @@ class Traverse extends Constraint
     public function __construct($options = null)
     {
         if (\is_array($options) && \array_key_exists('groups', $options)) {
-            throw new ConstraintDefinitionException(sprintf('The option "groups" is not supported by the constraint %s.', __CLASS__));
+            throw new ConstraintDefinitionException(sprintf('The option "groups" is not supported by the constraint "%s".', __CLASS__));
         }
 
         parent::__construct($options);
diff --git a/Constraints/UrlValidator.php b/Constraints/UrlValidator.php
@@ -93,7 +93,7 @@ public function validate($value, Constraint $constraint)
                 Url::CHECK_DNS_TYPE_SRV,
                 Url::CHECK_DNS_TYPE_TXT,
             ], true)) {
-                throw new InvalidOptionsException(sprintf('Invalid value for option "checkDNS" in constraint %s.', \get_class($constraint)), ['checkDNS']);
+                throw new InvalidOptionsException(sprintf('Invalid value for option "checkDNS" in constraint "%s".', \get_class($constraint)), ['checkDNS']);
             }
 
             $host = parse_url($value, PHP_URL_HOST);
diff --git a/Mapping/Factory/LazyLoadingMetadataFactory.php b/Mapping/Factory/LazyLoadingMetadataFactory.php
@@ -79,7 +79,7 @@ public function __construct(LoaderInterface $loader = null, CacheInterface $cach
     public function getMetadataFor($value)
     {
         if (!\is_object($value) && !\is_string($value)) {
-            throw new NoSuchMetadataException(sprintf('Cannot create metadata for non-objects. Got: %s.', \gettype($value)));
+            throw new NoSuchMetadataException(sprintf('Cannot create metadata for non-objects. Got: "%s".', \gettype($value)));
         }
 
         $class = ltrim(\is_object($value) ? \get_class($value) : $value, '\\');
diff --git a/Mapping/GetterMetadata.php b/Mapping/GetterMetadata.php
@@ -53,10 +53,10 @@ public function __construct($class, $property, $method = null)
             } elseif (method_exists($class, $hasMethod)) {
                 $method = $hasMethod;
             } else {
-                throw new ValidatorException(sprintf('Neither of these methods exist in class %s: %s, %s, %s.', $class, $getMethod, $isMethod, $hasMethod));
+                throw new ValidatorException(sprintf('Neither of these methods exist in class "%s": "%s", "%s", "%s".', $class, $getMethod, $isMethod, $hasMethod));
             }
         } elseif (!method_exists($class, $method)) {
-            throw new ValidatorException(sprintf('The %s() method does not exist in class %s.', $method, $class));
+            throw new ValidatorException(sprintf('The "%s()" method does not exist in class "%s".', $method, $class));
         }
 
         parent::__construct($class, $method, $property);
diff --git a/Mapping/Loader/LoaderChain.php b/Mapping/Loader/LoaderChain.php
@@ -36,7 +36,7 @@ public function __construct(array $loaders)
     {
         foreach ($loaders as $loader) {
             if (!$loader instanceof LoaderInterface) {
-                throw new MappingException(sprintf('Class %s is expected to implement LoaderInterface.', \get_class($loader)));
+                throw new MappingException(sprintf('Class "%s" is expected to implement LoaderInterface.', \get_class($loader)));
             }
         }
 
diff --git a/Mapping/Loader/StaticMethodLoader.php b/Mapping/Loader/StaticMethodLoader.php
@@ -49,7 +49,7 @@ public function loadClassMetadata(ClassMetadata $metadata)
             }
 
             if (!$reflMethod->isStatic()) {
-                throw new MappingException(sprintf('The method %s::%s should be static.', $reflClass->name, $this->methodName));
+                throw new MappingException(sprintf('The method "%s::%s()" should be static.', $reflClass->name, $this->methodName));
             }
 
             if ($reflMethod->getDeclaringClass()->name != $reflClass->name) {
diff --git a/Mapping/MemberMetadata.php b/Mapping/MemberMetadata.php
@@ -72,7 +72,7 @@ public function __construct($class, $name, $property)
     public function addConstraint(Constraint $constraint)
     {
         if (!\in_array(Constraint::PROPERTY_CONSTRAINT, (array) $constraint->getTargets())) {
-            throw new ConstraintDefinitionException(sprintf('The constraint %s cannot be put on properties or getters.', \get_class($constraint)));
+            throw new ConstraintDefinitionException(sprintf('The constraint "%s" cannot be put on properties or getters.', \get_class($constraint)));
         }
 
         parent::addConstraint($constraint);
diff --git a/Tests/Fixtures/FakeMetadataFactory.php b/Tests/Fixtures/FakeMetadataFactory.php
@@ -29,7 +29,7 @@ public function getMetadataFor($class)
         }
 
         if (!\is_string($class)) {
-            throw new NoSuchMetadataException(sprintf('No metadata for type %s', \gettype($class)));
+            throw new NoSuchMetadataException(sprintf('No metadata for type "%s".', \gettype($class)));
         }
 
         if (!isset($this->metadatas[$class])) {
diff --git a/Tests/Mapping/GetterMetadataTest.php b/Tests/Mapping/GetterMetadataTest.php
@@ -64,7 +64,7 @@ public function testGetPropertyValueFromHasser()
     public function testUndefinedMethodNameThrowsException()
     {
         $this->expectException('Symfony\Component\Validator\Exception\ValidatorException');
-        $this->expectExceptionMessage('The hasLastName() method does not exist in class Symfony\Component\Validator\Tests\Fixtures\Entity.');
+        $this->expectExceptionMessage('The "hasLastName()" method does not exist in class "Symfony\Component\Validator\Tests\Fixtures\Entity".');
         new GetterMetadata(self::CLASSNAME, 'lastName', 'hasLastName');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function validate($object, Constraint $constraint)`
`46`	`46`	`\call_user_func($method, $object, $this->context, $constraint->payload);`
`47`	`47`	`} elseif (null !== $object) {`
`48`	`48`	`if (!method_exists($object, $method)) {`
`49`		`- throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Callback constraint does not exist in class %s.', $method, \get_class($object)));`
	`49`	`+ throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Callback constraint does not exist in class "%s".', $method, \get_class($object)));`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`$reflMethod = new \ReflectionMethod($object, $method);`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ protected function initializeNestedConstraints()`
`57`	`57`	`parent::initializeNestedConstraints();`
`58`	`58`
`59`	`59`	`if (!\is_array($this->fields)) {`
`60`		`- throw new ConstraintDefinitionException(sprintf('The option "fields" is expected to be an array in constraint %s.', __CLASS__));`
	`60`	`+ throw new ConstraintDefinitionException(sprintf('The option "fields" is expected to be an array in constraint "%s".', __CLASS__));`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`foreach ($this->fields as $fieldName => $field) {`
Original file line number	Diff line number	Diff line change
`@@ -71,11 +71,11 @@ public function __construct($options = null)`
`71`	`71`	`$constraint = \get_class($constraint);`
`72`	`72`	`}`
`73`	`73`
`74`		`- throw new ConstraintDefinitionException(sprintf('The value %s is not an instance of Constraint in constraint %s.', $constraint, static::class));`
	`74`	`+ throw new ConstraintDefinitionException(sprintf('The value "%s" is not an instance of Constraint in constraint "%s".', $constraint, static::class));`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`if ($constraint instanceof Valid) {`
`78`		`- throw new ConstraintDefinitionException(sprintf('The constraint Valid cannot be nested inside constraint %s. You can only declare the Valid constraint directly on a field or method.', static::class));`
	`78`	`+ throw new ConstraintDefinitionException(sprintf('The constraint Valid cannot be nested inside constraint "%s". You can only declare the Valid constraint directly on a field or method.', static::class));`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`@@ -99,7 +99,7 @@ public function __construct($options = null)`
`99`	`99`	`$excessGroups = array_diff($constraint->groups, $this->groups);`
`100`	`100`
`101`	`101`	`if (\count($excessGroups) > 0) {`
`102`		`- throw new ConstraintDefinitionException(sprintf('The group(s) "%s" passed to the constraint %s should also be passed to its containing constraint %s.', implode('", "', $excessGroups), \get_class($constraint), static::class));`
	`102`	`+ throw new ConstraintDefinitionException(sprintf('The group(s) "%s" passed to the constraint "%s" should also be passed to its containing constraint "%s".', implode('", "', $excessGroups), \get_class($constraint), static::class));`
`103`	`103`	`}`
`104`	`104`	`} else {`
`105`	`105`	`$constraint->groups = $this->groups;`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function __construct($options = null)`
`51`	`51`	`parent::__construct($options);`
`52`	`52`
`53`	`53`	`if (null === $this->min && null === $this->max) {`
`54`		`- throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s.', __CLASS__), ['min', 'max']);`
	`54`	`+ throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint "%s".', __CLASS__), ['min', 'max']);`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function __construct($options = null)`
`55`	`55`	`parent::__construct($options);`
`56`	`56`
`57`	`57`	`if (null === $this->min && null === $this->max) {`
`58`		`- throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s.', __CLASS__), ['min', 'max']);`
	`58`	`+ throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint "%s".', __CLASS__), ['min', 'max']);`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function __construct($options = null)`
`43`	`43`	`parent::__construct($options);`
`44`	`44`
`45`	`45`	`if (null === $this->min && null === $this->max) {`
`46`		`- throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s.', __CLASS__), ['min', 'max']);`
	`46`	`+ throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint "%s".', __CLASS__), ['min', 'max']);`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class Traverse extends Constraint`
`26`	`26`	`public function __construct($options = null)`
`27`	`27`	`{`
`28`	`28`	`if (\is_array($options) && \array_key_exists('groups', $options)) {`
`29`		`- throw new ConstraintDefinitionException(sprintf('The option "groups" is not supported by the constraint %s.', __CLASS__));`
	`29`	`+ throw new ConstraintDefinitionException(sprintf('The option "groups" is not supported by the constraint "%s".', __CLASS__));`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`parent::__construct($options);`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function validate($value, Constraint $constraint)`
`93`	`93`	`Url::CHECK_DNS_TYPE_SRV,`
`94`	`94`	`Url::CHECK_DNS_TYPE_TXT,`
`95`	`95`	`], true)) {`
`96`		`- throw new InvalidOptionsException(sprintf('Invalid value for option "checkDNS" in constraint %s.', \get_class($constraint)), ['checkDNS']);`
	`96`	`+ throw new InvalidOptionsException(sprintf('Invalid value for option "checkDNS" in constraint "%s".', \get_class($constraint)), ['checkDNS']);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`$host = parse_url($value, PHP_URL_HOST);`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public function __construct(LoaderInterface $loader = null, CacheInterface $cach`
`79`	`79`	`public function getMetadataFor($value)`
`80`	`80`	`{`
`81`	`81`	`if (!\is_object($value) && !\is_string($value)) {`
`82`		`- throw new NoSuchMetadataException(sprintf('Cannot create metadata for non-objects. Got: %s.', \gettype($value)));`
	`82`	`+ throw new NoSuchMetadataException(sprintf('Cannot create metadata for non-objects. Got: "%s".', \gettype($value)));`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`$class = ltrim(\is_object($value) ? \get_class($value) : $value, '\\');`
Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,10 @@ public function __construct($class, $property, $method = null)`
`53`	`53`	`} elseif (method_exists($class, $hasMethod)) {`
`54`	`54`	`$method = $hasMethod;`
`55`	`55`	`} else {`
`56`		`- throw new ValidatorException(sprintf('Neither of these methods exist in class %s: %s, %s, %s.', $class, $getMethod, $isMethod, $hasMethod));`
	`56`	`+ throw new ValidatorException(sprintf('Neither of these methods exist in class "%s": "%s", "%s", "%s".', $class, $getMethod, $isMethod, $hasMethod));`
`57`	`57`	`}`
`58`	`58`	`} elseif (!method_exists($class, $method)) {`
`59`		`- throw new ValidatorException(sprintf('The %s() method does not exist in class %s.', $method, $class));`
	`59`	`+ throw new ValidatorException(sprintf('The "%s()" method does not exist in class "%s".', $method, $class));`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`parent::__construct($class, $method, $property);`