[Validator] fix option handling

jschaedl · jschaedl · commit 8f7388a9aac3 · 2018-11-30T09:08:28.000+01:00
diff --git a/src/Symfony/Component/Validator/Constraints/Negative.php b/src/Symfony/Component/Validator/Constraints/Negative.php
@@ -27,23 +27,25 @@ public function __construct($options = null)
     {
         if (null === $options) {
             $options = array();
+        } elseif (!is_array($options)) {
+            $options = array($this->getDefaultOption() => $options);
         }
 
-        if (\is_array($options)) {
-            if (isset($options['propertyPath'])) {
-                throw new ConstraintDefinitionException(sprintf('The "propertyPath" option of the "%s" constraint cannot be set.', \get_class($this)));
-            }
+        if (isset($options['propertyPath'])) {
+            throw new ConstraintDefinitionException(sprintf('The "propertyPath" option of the "%s" constraint cannot be set.', \get_class($this)));
+        }
 
-            if (isset($options['value'])) {
-                throw new ConstraintDefinitionException(sprintf('The "value" option of the "%s" constraint cannot be set.', \get_class($this)));
-            }
+        if (isset($options['value'])) {
+            throw new ConstraintDefinitionException(sprintf('The "value" option of the "%s" constraint cannot be set.', \get_class($this)));
         }
 
-        parent::__construct($options = array_merge((array) $options, array('value' => 0)));
+        $options['value'] = 0;
+
+        parent::__construct($options);
     }
 
-    public function validatedBy()
+    public function validatedBy(): string
     {
-        return 'LessThanValidator';
+        return LessThanValidator::class;
     }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/NegativeOrZero.php b/src/Symfony/Component/Validator/Constraints/NegativeOrZero.php
@@ -27,23 +27,25 @@ public function __construct($options = null)
     {
         if (null === $options) {
             $options = array();
+        } elseif (!is_array($options)) {
+            $options = array($this->getDefaultOption() => $options);
         }
 
-        if (\is_array($options)) {
-            if (isset($options['propertyPath'])) {
-                throw new ConstraintDefinitionException(sprintf('The "propertyPath" option of the "%s" constraint cannot be set.', \get_class($this)));
-            }
+        if (isset($options['propertyPath'])) {
+            throw new ConstraintDefinitionException(sprintf('The "propertyPath" option of the "%s" constraint cannot be set.', \get_class($this)));
+        }
 
-            if (isset($options['value'])) {
-                throw new ConstraintDefinitionException(sprintf('The "value" option of the "%s" constraint cannot be set.', \get_class($this)));
-            }
+        if (isset($options['value'])) {
+            throw new ConstraintDefinitionException(sprintf('The "value" option of the "%s" constraint cannot be set.', \get_class($this)));
         }
 
-        parent::__construct($options = array_merge((array) $options, array('value' => 0)));
+        $options['value'] = 0;
+
+        parent::__construct($options);
     }
 
-    public function validatedBy()
+    public function validatedBy(): string
     {
-        return 'LessThanOrEqualValidator';
+        return LessThanOrEqualValidator::class;
     }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/Positive.php b/src/Symfony/Component/Validator/Constraints/Positive.php
@@ -27,23 +27,25 @@ public function __construct($options = null)
     {
         if (null === $options) {
             $options = array();
+        } elseif (!is_array($options)) {
+            $options = array($this->getDefaultOption() => $options);
         }
 
-        if (\is_array($options)) {
-            if (isset($options['propertyPath'])) {
-                throw new ConstraintDefinitionException(sprintf('The "propertyPath" option of the "%s" constraint cannot be set.', \get_class($this)));
-            }
+        if (isset($options['propertyPath'])) {
+            throw new ConstraintDefinitionException(sprintf('The "propertyPath" option of the "%s" constraint cannot be set.', \get_class($this)));
+        }
 
-            if (isset($options['value'])) {
-                throw new ConstraintDefinitionException(sprintf('The "value" option of the "%s" constraint cannot be set.', \get_class($this)));
-            }
+        if (isset($options['value'])) {
+            throw new ConstraintDefinitionException(sprintf('The "value" option of the "%s" constraint cannot be set.', \get_class($this)));
         }
 
-        parent::__construct($options = array_merge((array) $options, array('value' => 0)));
+        $options['value'] = 0;
+
+        parent::__construct($options);
     }
 
-    public function validatedBy()
+    public function validatedBy(): string
     {
-        return 'GreaterThanValidator';
+        return GreaterThanValidator::class;
     }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/PositiveOrZero.php b/src/Symfony/Component/Validator/Constraints/PositiveOrZero.php
@@ -27,23 +27,25 @@ public function __construct($options = null)
     {
         if (null === $options) {
             $options = array();
+        } elseif (!is_array($options)) {
+            $options = array($this->getDefaultOption() => $options);
         }
 
-        if (\is_array($options)) {
-            if (isset($options['propertyPath'])) {
-                throw new ConstraintDefinitionException(sprintf('The "propertyPath" option of the "%s" constraint cannot be set.', \get_class($this)));
-            }
+        if (isset($options['propertyPath'])) {
+            throw new ConstraintDefinitionException(sprintf('The "propertyPath" option of the "%s" constraint cannot be set.', \get_class($this)));
+        }
 
-            if (isset($options['value'])) {
-                throw new ConstraintDefinitionException(sprintf('The "value" option of the "%s" constraint cannot be set.', \get_class($this)));
-            }
+        if (isset($options['value'])) {
+            throw new ConstraintDefinitionException(sprintf('The "value" option of the "%s" constraint cannot be set.', \get_class($this)));
         }
 
-        parent::__construct($options = array_merge((array) $options, array('value' => 0)));
+        $options['value'] = 0;
+
+        parent::__construct($options);
     }
 
-    public function validatedBy()
+    public function validatedBy(): string
     {
-        return 'GreaterThanOrEqualValidator';
+        return GreaterThanOrEqualValidator::class;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -27,23 +27,25 @@ public function __construct($options = null)`
`27`	`27`	`{`
`28`	`28`	`if (null === $options) {`
`29`	`29`	`$options = array();`
	`30`	`+ } elseif (!is_array($options)) {`
	`31`	`+ $options = array($this->getDefaultOption() => $options);`
`30`	`32`	`}`
`31`	`33`
`32`		`- if (\is_array($options)) {`
`33`		`- if (isset($options['propertyPath'])) {`
`34`		`- throw new ConstraintDefinitionException(sprintf('The "propertyPath" option of the "%s" constraint cannot be set.', \get_class($this)));`
`35`		`- }`
	`34`	`+ if (isset($options['propertyPath'])) {`
	`35`	`+ throw new ConstraintDefinitionException(sprintf('The "propertyPath" option of the "%s" constraint cannot be set.', \get_class($this)));`
	`36`	`+ }`
`36`	`37`
`37`		`- if (isset($options['value'])) {`
`38`		`- throw new ConstraintDefinitionException(sprintf('The "value" option of the "%s" constraint cannot be set.', \get_class($this)));`
`39`		`- }`
	`38`	`+ if (isset($options['value'])) {`
	`39`	`+ throw new ConstraintDefinitionException(sprintf('The "value" option of the "%s" constraint cannot be set.', \get_class($this)));`
`40`	`40`	`}`
`41`	`41`
`42`		`- parent::__construct($options = array_merge((array) $options, array('value' => 0)));`
	`42`	`+ $options['value'] = 0;`
	`43`	`+`
	`44`	`+ parent::__construct($options);`
`43`	`45`	`}`
`44`	`46`
`45`		`- public function validatedBy()`
	`47`	`+ public function validatedBy(): string`
`46`	`48`	`{`
`47`		`- return 'LessThanValidator';`
	`49`	`+ return LessThanValidator::class;`
`48`	`50`	`}`
`49`	`51`	`}`