From caf40a7f1efa0b7c4da9a10cc94f981c82c56317 Mon Sep 17 00:00:00 2001 From: Valentin Udaltsov Date: Thu, 28 Mar 2019 10:34:05 +0300 Subject: [PATCH] Improve readability --- .../Component/Validator/Constraints/Count.php | 18 ++++++++---------- .../Component/Validator/Constraints/Length.php | 18 ++++++++---------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/Symfony/Component/Validator/Constraints/Count.php b/src/Symfony/Component/Validator/Constraints/Count.php index 5937bacad5735..b11f994f58b65 100644 --- 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 index 18cb51316097a..996a1e479f452 100644 --- 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);