Merge branch '4.4' into 5.0

fabpot · fabpot · commit 66c70289b020 · 2020-02-04T10:41:09.000+01:00
* 4.4:
  Fix CS
  Fix CS
diff --git a/Constraint.php b/Constraint.php
@@ -70,7 +70,7 @@ abstract class Constraint
     public static function getErrorName($errorCode)
     {
         if (!isset(static::$errorNames[$errorCode])) {
-            throw new InvalidArgumentException(sprintf('The error code "%s" does not exist for constraint of type "%s".', $errorCode, \get_called_class()));
+            throw new InvalidArgumentException(sprintf('The error code "%s" does not exist for constraint of type "%s".', $errorCode, static::class));
         }
 
         return static::$errorNames[$errorCode];
@@ -115,7 +115,7 @@ public function __construct($options = null)
 
         if (\is_array($options) && isset($options['value']) && !property_exists($this, 'value')) {
             if (null === $defaultOption) {
-                throw new ConstraintDefinitionException(sprintf('No default option is configured for constraint "%s".', \get_class($this)));
+                throw new ConstraintDefinitionException(sprintf('No default option is configured for constraint "%s".', static::class));
             }
 
             $options[$defaultOption] = $options['value'];
@@ -136,7 +136,7 @@ public function __construct($options = null)
             }
         } elseif (null !== $options && !(\is_array($options) && 0 === \count($options))) {
             if (null === $defaultOption) {
-                throw new ConstraintDefinitionException(sprintf('No default option is configured for constraint "%s".', \get_class($this)));
+                throw new ConstraintDefinitionException(sprintf('No default option is configured for constraint "%s".', static::class));
             }
 
             if (\array_key_exists($defaultOption, $knownOptions)) {
@@ -148,11 +148,11 @@ public function __construct($options = null)
         }
 
         if (\count($invalidOptions) > 0) {
-            throw new InvalidOptionsException(sprintf('The options "%s" do not exist in constraint "%s".', implode('", "', $invalidOptions), \get_class($this)), $invalidOptions);
+            throw new InvalidOptionsException(sprintf('The options "%s" do not exist in constraint "%s".', implode('", "', $invalidOptions), static::class), $invalidOptions);
         }
 
         if (\count($missingOptions) > 0) {
-            throw new MissingOptionsException(sprintf('The options "%s" must be set for constraint "%s".', implode('", "', array_keys($missingOptions)), \get_class($this)), array_keys($missingOptions));
+            throw new MissingOptionsException(sprintf('The options "%s" must be set for constraint "%s".', implode('", "', array_keys($missingOptions)), static::class), array_keys($missingOptions));
         }
     }
 
@@ -175,7 +175,7 @@ public function __set(string $option, $value)
             return;
         }
 
-        throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint "%s".', $option, \get_class($this)), [$option]);
+        throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint "%s".', $option, static::class), [$option]);
     }
 
     /**
@@ -201,7 +201,7 @@ public function __get(string $option)
             return $this->groups;
         }
 
-        throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint "%s".', $option, \get_class($this)), [$option]);
+        throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint "%s".', $option, static::class), [$option]);
     }
 
     /**
@@ -265,7 +265,7 @@ public function getRequiredOptions()
      */
     public function validatedBy()
     {
-        return \get_class($this).'Validator';
+        return static::class.'Validator';
     }
 
     /**
diff --git a/Constraints/AbstractComparison.php b/Constraints/AbstractComparison.php
@@ -39,15 +39,15 @@ public function __construct($options = null)
 
         if (\is_array($options)) {
             if (!isset($options['value']) && !isset($options['propertyPath'])) {
-                throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires either the "value" or "propertyPath" option to be set.', \get_class($this)));
+                throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires either the "value" or "propertyPath" option to be set.', static::class));
             }
 
             if (isset($options['value']) && isset($options['propertyPath'])) {
-                throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires only one of the "value" or "propertyPath" options to be set, not both.', \get_class($this)));
+                throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires only one of the "value" or "propertyPath" options to be set, not both.', static::class));
             }
 
             if (isset($options['propertyPath']) && !class_exists(PropertyAccess::class)) {
-                throw new LogicException(sprintf('The "%s" constraint requires the Symfony PropertyAccess component to use the "propertyPath" option.', \get_class($this)));
+                throw new LogicException(sprintf('The "%s" constraint requires the Symfony PropertyAccess component to use the "propertyPath" option.', static::class));
             }
         }
 
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, \get_class($this)));
+                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.', \get_class($this)));
+                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), \get_class($this)));
+                    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/NumberConstraintTrait.php b/Constraints/NumberConstraintTrait.php
@@ -27,11 +27,11 @@ private function configureNumberConstraintOptions($options): array
         }
 
         if (isset($options['propertyPath'])) {
-            throw new ConstraintDefinitionException(sprintf('The "propertyPath" option of the "%s" constraint cannot be set.', \get_class($this)));
+            throw new ConstraintDefinitionException(sprintf('The "propertyPath" option of the "%s" constraint cannot be set.', static::class));
         }
 
         if (isset($options['value'])) {
-            throw new ConstraintDefinitionException(sprintf('The "value" option of the "%s" constraint cannot be set.', \get_class($this)));
+            throw new ConstraintDefinitionException(sprintf('The "value" option of the "%s" constraint cannot be set.', static::class));
         }
 
         $options['value'] = 0;
diff --git a/Constraints/Range.php b/Constraints/Range.php
@@ -50,15 +50,15 @@ public function __construct($options = null)
     {
         if (\is_array($options)) {
             if (isset($options['min']) && isset($options['minPropertyPath'])) {
-                throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires only one of the "min" or "minPropertyPath" options to be set, not both.', \get_class($this)));
+                throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires only one of the "min" or "minPropertyPath" options to be set, not both.', static::class));
             }
 
             if (isset($options['max']) && isset($options['maxPropertyPath'])) {
-                throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires only one of the "max" or "maxPropertyPath" options to be set, not both.', \get_class($this)));
+                throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires only one of the "max" or "maxPropertyPath" options to be set, not both.', static::class));
             }
 
             if ((isset($options['minPropertyPath']) || isset($options['maxPropertyPath'])) && !class_exists(PropertyAccess::class)) {
-                throw new LogicException(sprintf('The "%s" constraint requires the Symfony PropertyAccess component to use the "minPropertyPath" or "maxPropertyPath" option.', \get_class($this)));
+                throw new LogicException(sprintf('The "%s" constraint requires the Symfony PropertyAccess component to use the "minPropertyPath" or "maxPropertyPath" option.', static::class));
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ abstract class Constraint`
`70`	`70`	`public static function getErrorName($errorCode)`
`71`	`71`	`{`
`72`	`72`	`if (!isset(static::$errorNames[$errorCode])) {`
`73`		`- throw new InvalidArgumentException(sprintf('The error code "%s" does not exist for constraint of type "%s".', $errorCode, \get_called_class()));`
	`73`	`+ throw new InvalidArgumentException(sprintf('The error code "%s" does not exist for constraint of type "%s".', $errorCode, static::class));`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`return static::$errorNames[$errorCode];`
`@@ -115,7 +115,7 @@ public function __construct($options = null)`
`115`	`115`
`116`	`116`	`if (\is_array($options) && isset($options['value']) && !property_exists($this, 'value')) {`
`117`	`117`	`if (null === $defaultOption) {`
`118`		`- throw new ConstraintDefinitionException(sprintf('No default option is configured for constraint "%s".', \get_class($this)));`
	`118`	`+ throw new ConstraintDefinitionException(sprintf('No default option is configured for constraint "%s".', static::class));`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`$options[$defaultOption] = $options['value'];`
`@@ -136,7 +136,7 @@ public function __construct($options = null)`
`136`	`136`	`}`
`137`	`137`	`} elseif (null !== $options && !(\is_array($options) && 0 === \count($options))) {`
`138`	`138`	`if (null === $defaultOption) {`
`139`		`- throw new ConstraintDefinitionException(sprintf('No default option is configured for constraint "%s".', \get_class($this)));`
	`139`	`+ throw new ConstraintDefinitionException(sprintf('No default option is configured for constraint "%s".', static::class));`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`if (\array_key_exists($defaultOption, $knownOptions)) {`
`@@ -148,11 +148,11 @@ public function __construct($options = null)`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`if (\count($invalidOptions) > 0) {`
`151`		`- throw new InvalidOptionsException(sprintf('The options "%s" do not exist in constraint "%s".', implode('", "', $invalidOptions), \get_class($this)), $invalidOptions);`
	`151`	`+ throw new InvalidOptionsException(sprintf('The options "%s" do not exist in constraint "%s".', implode('", "', $invalidOptions), static::class), $invalidOptions);`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`if (\count($missingOptions) > 0) {`
`155`		`- throw new MissingOptionsException(sprintf('The options "%s" must be set for constraint "%s".', implode('", "', array_keys($missingOptions)), \get_class($this)), array_keys($missingOptions));`
	`155`	`+ throw new MissingOptionsException(sprintf('The options "%s" must be set for constraint "%s".', implode('", "', array_keys($missingOptions)), static::class), array_keys($missingOptions));`
`156`	`156`	`}`
`157`	`157`	`}`
`158`	`158`
`@@ -175,7 +175,7 @@ public function __set(string $option, $value)`
`175`	`175`	`return;`
`176`	`176`	`}`
`177`	`177`
`178`		`- throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint "%s".', $option, \get_class($this)), [$option]);`
	`178`	`+ throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint "%s".', $option, static::class), [$option]);`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`/**`
`@@ -201,7 +201,7 @@ public function __get(string $option)`
`201`	`201`	`return $this->groups;`
`202`	`202`	`}`
`203`	`203`
`204`		`- throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint "%s".', $option, \get_class($this)), [$option]);`
	`204`	`+ throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint "%s".', $option, static::class), [$option]);`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`/**`
`@@ -265,7 +265,7 @@ public function getRequiredOptions()`
`265`	`265`	`*/`
`266`	`266`	`public function validatedBy()`
`267`	`267`	`{`
`268`		`- return \get_class($this).'Validator';`
	`268`	`+ return static::class.'Validator';`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -39,15 +39,15 @@ public function __construct($options = null)`
`39`	`39`
`40`	`40`	`if (\is_array($options)) {`
`41`	`41`	`if (!isset($options['value']) && !isset($options['propertyPath'])) {`
`42`		`- throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires either the "value" or "propertyPath" option to be set.', \get_class($this)));`
	`42`	`+ throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires either the "value" or "propertyPath" option to be set.', static::class));`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`if (isset($options['value']) && isset($options['propertyPath'])) {`
`46`		`- throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires only one of the "value" or "propertyPath" options to be set, not both.', \get_class($this)));`
	`46`	`+ throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires only one of the "value" or "propertyPath" options to be set, not both.', static::class));`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`if (isset($options['propertyPath']) && !class_exists(PropertyAccess::class)) {`
`50`		`- throw new LogicException(sprintf('The "%s" constraint requires the Symfony PropertyAccess component to use the "propertyPath" option.', \get_class($this)));`
	`50`	`+ throw new LogicException(sprintf('The "%s" constraint requires the Symfony PropertyAccess component to use the "propertyPath" option.', static::class));`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
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, \get_class($this)));`
	`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.', \get_class($this)));`
	`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), \get_class($this)));`
	`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
`@@ -27,11 +27,11 @@ private function configureNumberConstraintOptions($options): array`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`if (isset($options['propertyPath'])) {`
`30`		`- throw new ConstraintDefinitionException(sprintf('The "propertyPath" option of the "%s" constraint cannot be set.', \get_class($this)));`
	`30`	`+ throw new ConstraintDefinitionException(sprintf('The "propertyPath" option of the "%s" constraint cannot be set.', static::class));`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`if (isset($options['value'])) {`
`34`		`- throw new ConstraintDefinitionException(sprintf('The "value" option of the "%s" constraint cannot be set.', \get_class($this)));`
	`34`	`+ throw new ConstraintDefinitionException(sprintf('The "value" option of the "%s" constraint cannot be set.', static::class));`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`$options['value'] = 0;`
Original file line number	Diff line number	Diff line change
`@@ -50,15 +50,15 @@ public function __construct($options = null)`
`50`	`50`	`{`
`51`	`51`	`if (\is_array($options)) {`
`52`	`52`	`if (isset($options['min']) && isset($options['minPropertyPath'])) {`
`53`		`- throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires only one of the "min" or "minPropertyPath" options to be set, not both.', \get_class($this)));`
	`53`	`+ throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires only one of the "min" or "minPropertyPath" options to be set, not both.', static::class));`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`if (isset($options['max']) && isset($options['maxPropertyPath'])) {`
`57`		`- throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires only one of the "max" or "maxPropertyPath" options to be set, not both.', \get_class($this)));`
	`57`	`+ throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires only one of the "max" or "maxPropertyPath" options to be set, not both.', static::class));`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`if ((isset($options['minPropertyPath']) \|\| isset($options['maxPropertyPath'])) && !class_exists(PropertyAccess::class)) {`
`61`		`- throw new LogicException(sprintf('The "%s" constraint requires the Symfony PropertyAccess component to use the "minPropertyPath" or "maxPropertyPath" option.', \get_class($this)));`
	`61`	`+ throw new LogicException(sprintf('The "%s" constraint requires the Symfony PropertyAccess component to use the "minPropertyPath" or "maxPropertyPath" option.', static::class));`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`