Required options also affect select fields

Author: mamazu

src/Form/Product/ShopCustomerOptionType.php

@@ -144,27 +144,28 @@ private function getFormConfiguration(
                 },
                 'choice_value' => 'code',
             ];
-        } else {
-            $constraint = ConstraintCreator::createFromConfiguration(
-                $customerOptionType,
-                $customerOption->getConfiguration()
-            );
+        }
 
-            if ($constraint !== null) {
-                $constraint->groups = ['sylius'];
-                $configuration      = ['constraints' => [$constraint]];
-            }
+        $constraint = ConstraintCreator::createFromConfiguration(
+            $customerOptionType,
+            $customerOption->getConfiguration()
+        );
 
-            if ($customerOption->isRequired()) {
-                /** @var NotBlank $requiredConstraint */
-                $requiredConstraint          = ConstraintCreator::createRequiredConstraint();
-                $requiredConstraint->message = 'brille24.form.customer_options.required';
+        if ($constraint !== null) {
+            $constraint->groups = ['sylius'];
+            $configuration      = ['constraints' => [$constraint]];
+        }
 
-                $requiredConstraint->groups     = ['sylius'];
-                $configuration['constraints'][] = $requiredConstraint;
-            }
+        if ($customerOption->isRequired()) {
+            /** @var NotBlank $requiredConstraint */
+            $requiredConstraint          = ConstraintCreator::createRequiredConstraint();
+            $requiredConstraint->message = 'brille24.form.customer_options.required';
+
+            $requiredConstraint->groups     = ['sylius'];
+            $configuration['constraints'][] = $requiredConstraint;
         }
 
+
         if ($customerOptionType === CustomerOptionTypeEnum::FILE) {
             /*
              * Here we give the Customer Option File Type a special block name to override it in a form theme.

src/Services/ConstraintCreator.php

@@ -7,6 +7,7 @@
 use Brille24\SyliusCustomerOptionsPlugin\Enumerations\CustomerOptionTypeEnum;
 use Brille24\SyliusCustomerOptionsPlugin\Validator\Constraints\ConditionalConstraint;
 use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\Constraints\Count;
 use Symfony\Component\Validator\Constraints\File;
 use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\NotBlank;