Merge pull request #1700 from tomudding/fix/text-field-not-required-s…

…ign-ups

Add validator to `Text` type sign-up list field

module/Activity/src/Form/Element/ValidatedText.php

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Activity\Form\Element;
+
+use Laminas\Filter\StringTrim;
+use Laminas\Form\Element\Text;
+use Laminas\InputFilter\InputProviderInterface;
+use Laminas\Validator\NotEmpty;
+use Laminas\Validator\ValidatorInterface;
+
+class ValidatedText extends Text implements InputProviderInterface
+{
+    protected ?ValidatorInterface $validator = null;
+
+    /**
+     * Get primary validator.
+     */
+    protected function getValidator(): ValidatorInterface
+    {
+        if (null === $this->validator) {
+            $this->validator = new NotEmpty(NotEmpty::STRING);
+        }
+
+        return $this->validator;
+    }
+
+    /**
+     * Provide default input rules for this element
+     *
+     * Attaches a not empty validator and a string trim filter.
+     *
+     * @inheritDoc
+     */
+    public function getInputSpecification(): array
+    {
+        $spec = [
+            'required'   => true,
+            'filters'    => [
+                ['name' => StringTrim::class],
+            ],
+            'validators' => [
+                $this->getValidator(),
+            ],
+        ];
+
+        $name = $this->getName();
+        if (null !== $name) {
+            $spec['name'] = $name;
+        }
+
+        return $spec;
+    }
+}

module/Activity/src/Form/Signup.php

@@ -4,6 +4,7 @@
 
 namespace Activity\Form;
 
+use Activity\Form\Element\ValidatedText;
 use Activity\Model\SignupField as SignupFieldModel;
 use Activity\Model\SignupList as SignupListModel;
 use Laminas\Captcha\Image as ImageCaptcha;
@@ -135,7 +136,7 @@ protected function createSignupFieldElementArray(SignupFieldModel $field): array
 
         switch ($field->getType()) {
             case 0: //'Text'
-                $result['type'] = 'Text';
+                $result['type'] = ValidatedText::class;
                 break;
             case 1: //'Yes/No'
                 $result['type'] = Radio::class;

module/Activity/view/partial/signupForm.phtml

@@ -60,7 +60,7 @@ function formElementRender(
     }
 
     $result = '<div class="form-group' . (count($element->getMessages()) > 0 ? ' has-error' : '') . '">';
-    $result .= '<label for="' . $element->getAttribute('id') . '" class="control-label">' . $label . '</label>';
+    $result .= '<label for="' . $element->getAttribute('id') . '" class="control-label label-required">' . $label . '</label>';
 
     if (in_array($elementType, ['Radio'])) {
         $context->formRadio()->setSeparator('</div><div class="radio">');
@@ -78,6 +78,7 @@ function formElementRender(
 
 <?php
 $form->setAttribute('action', $submitUrl);
+$form->setAttribute('class', 'form-signup');
 $form->prepare();
 echo $this->form()->openTag($form);
 ?>

public/scss/modules/_activity-form.scss

@@ -20,6 +20,10 @@
     @import 'form';
 }
 
+.form-signup {
+    @import 'form';
+}
+
 .container > section {
     padding: 0;
 }