Factorize code a bit

Author: Pixelshaped

src/ZipCodeValidator/Constraints/ZipCode.php

@@ -33,24 +33,13 @@ public function __construct(
     )
     {
         if (is_string($options)) {
-            $options = [
-                'iso' => $options,
-            ];
+            $options = ['iso' => $options];
         } elseif (null === $options) {
             $options = [];
         } elseif (!is_array($options)) {
             throw new InvalidOptionsException(sprintf('The options "%s" do not exist in constraint "%s".', 'options', __CLASS__), ['options']);
         }
 
-        $availableOptions = ['iso', 'getter', 'strict', 'caseSensitiveCheck', 'message', 'groups', 'payload'];
-        $invalidOptions = array_values(array_filter(array_keys($options), fn ($option) => !in_array($option, $availableOptions, true)));
-        if ([] !== $invalidOptions) {
-            throw new InvalidOptionsException(
-                sprintf('The options "%s" do not exist in constraint "%s".', implode('", "', $invalidOptions), __CLASS__),
-                $invalidOptions
-            );
-        }
-
         $resolvedOptions = [
             'iso' => $iso,
             'getter' => $getter,
@@ -61,6 +50,14 @@ public function __construct(
             'payload' => $payload,
         ];
 
+        $invalidOptions = array_values(array_filter(array_keys($options), fn ($option) => !in_array($option, array_keys($resolvedOptions), true)));
+        if ([] !== $invalidOptions) {
+            throw new InvalidOptionsException(
+                sprintf('The options "%s" do not exist in constraint "%s".', implode('", "', $invalidOptions), __CLASS__),
+                $invalidOptions
+            );
+        }
+
         foreach ($resolvedOptions as $option => $resolvedValue) {
             if (null !== $resolvedValue || !array_key_exists($option, $options)) {
                 continue;
@@ -69,37 +66,20 @@ public function __construct(
             $resolvedOptions[$option] = 'groups' === $option ? (array) $options[$option] : $options[$option];
         }
 
-        $iso = $resolvedOptions['iso'];
-        $getter = $resolvedOptions['getter'];
-        $strict = $resolvedOptions['strict'];
-        $caseSensitiveCheck = $resolvedOptions['caseSensitiveCheck'];
-        $message = $resolvedOptions['message'];
-
         parent::__construct(null, $resolvedOptions['groups'], $resolvedOptions['payload']);
 
-        if (null !== $iso) {
-            $this->iso = $iso;
-        }
-
-        if (null !== $getter) {
-            $this->getter = $getter;
-        }
-
-        if (null !== $strict) {
-            $this->strict = $strict;
-        }
+        unset($resolvedOptions['groups'], $resolvedOptions['payload']);
 
-        if (null !== $caseSensitiveCheck) {
-            $this->caseSensitiveCheck = $caseSensitiveCheck;
-        }
-
-        if (null !== $message) {
-            $this->message = $message;
+        foreach ($resolvedOptions as $option => $resolvedValue) {
+            if (null === $resolvedValue) {
+                continue;
+            }
+            
+            $this->{$option} = $resolvedValue;
         }
 
         if (null === $this->iso && null === $this->getter) {
             throw new MissingOptionsException(sprintf('Either the option "iso" or "getter" must be given for constraint %s', __CLASS__), ['iso', 'getter']);
         }
     }
-
 }