Improve readability

symfony · Mar 28, 2019 · caf40a7 · caf40a7
1 parent 4622893
commit caf40a7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/src/Symfony/Component/Validator/Constraints/Count.php b/src/Symfony/Component/Validator/Constraints/Count.php
@@ -38,16 +38,14 @@ class Count extends Constraint
 
     public function __construct($options = null)
     {
-        if (null !== $options) {
-            if (!\is_array($options)) {
-                $options = [
-                    'min' => $options,
-                    'max' => $options,
-                ];
-            } elseif (isset($options['value']) && !isset($options['min']) && !isset($options['max'])) {
-                $options['min'] = $options['max'] = $options['value'];
-                unset($options['value']);
-            }
+        if (null !== $options && !\is_array($options)) {
+            $options = [
+                'min' => $options,
+                'max' => $options,
+            ];
+        } elseif (\is_array($options) && isset($options['value']) && !isset($options['min']) && !isset($options['max'])) {
+            $options['min'] = $options['max'] = $options['value'];
+            unset($options['value']);
         }
 
         parent::__construct($options);

diff --git a/src/Symfony/Component/Validator/Constraints/Length.php b/src/Symfony/Component/Validator/Constraints/Length.php
@@ -42,16 +42,14 @@ class Length extends Constraint
 
     public function __construct($options = null)
     {
-        if (null !== $options) {
-            if (!\is_array($options)) {
-                $options = [
-                    'min' => $options,
-                    'max' => $options,
-                ];
-            } elseif (isset($options['value']) && !isset($options['min']) && !isset($options['max'])) {
-                $options['min'] = $options['max'] = $options['value'];
-                unset($options['value']);
-            }
+        if (null !== $options && !\is_array($options)) {
+            $options = [
+                'min' => $options,
+                'max' => $options,
+            ];
+        } elseif (\is_array($options) && isset($options['value']) && !isset($options['min']) && !isset($options['max'])) {
+            $options['min'] = $options['max'] = $options['value'];
+            unset($options['value']);
         }
 
         parent::__construct($options);