Merge pull request #441 from tomudding/fix/house-number-regex-too-res…

…trictive fix: house number regex too restrictive
GEWIS · Sep 2, 2024 · bf75a25 · bf75a25
2 parents 8174b3b + e747b1e
commit bf75a25
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/module/Database/src/Form/Address.php b/module/Database/src/Form/Address.php
@@ -120,7 +120,7 @@ public function getInputFilterSpecification(): array
                 'validators' => [
                     [
                         'name' => Regex::class,
-                        'options' => ['pattern' => '/^[0-9]+[a-zA-Z]*/'],
+                        'options' => ['pattern' => '/^[1-9]\d*(?:[ \/\-\#\.]?(?:[a-zA-Z]+|[1-9]\d*))?$/'],
                     ],
                 ],
             ],

diff --git a/module/Database/src/Form/Fieldset/Address.php b/module/Database/src/Form/Fieldset/Address.php
@@ -136,7 +136,7 @@ public function getInputFilterSpecification(): array
                 'validators' => [
                     [
                         'name' => Regex::class,
-                        'options' => ['pattern' => '/^[0-9]+[a-z-A-Z\ \d\#\-\.\/]*$/'],
+                        'options' => ['pattern' => '/^[1-9]\d*(?:[ \/\-\#\.]?(?:[a-zA-Z]+|[1-9]\d*))?$/'],
                     ],
                 ],
             ],