Extract the timezone regex for readability

Also added a test with the different characters in case we ever change
the regex.

Author: vmcj

webapp/src/Validator/Constraints/TimeStringValidator.php

@@ -10,6 +10,7 @@ class TimeStringValidator extends ConstraintValidator
 {
     public function validate(mixed $value, Constraint $constraint): void
     {
+        $timezoneRegex = "[A-Za-z][A-Za-z0-9_\/+-]{1,35}"; # See: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
         $relativeRegex = "\d+:\d\d(:\d\d(\.\d{1,6})?)?";
         if (!$constraint instanceof TimeString) {
             throw new UnexpectedTypeException($constraint, TimeString::class);
@@ -25,8 +26,8 @@ public function validate(mixed $value, Constraint $constraint): void
 
         if ($constraint->allowRelative) {
             $regex   = $constraint->relativeIsPositive ?
-                "/^(\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d(\.\d{2,6})? [A-Za-z][A-Za-z0-9_\/+-]{1,35}|\+?" . $relativeRegex . ")$/" :
-                "/^(\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d(\.\d{1,6})? [A-Za-z][A-Za-z0-9_\/+-]{1,35}|-"   . $relativeRegex . ")$/";
+                "/^(\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d(\.\d{2,6})? " . $timeZoneRegex . "|\+?" . $relativeRegex . ")$/" :
+                "/^(\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d(\.\d{1,6})? " . $timeZoneRegex . "|-"   . $relativeRegex . ")$/";
             $message = $constraint->absoluteRelativeMessage;
         } else {
             $regex   = "/^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d(\.\d{1,6})? [A-Za-z][A-Za-z0-9_\/+-]{1,35}$/";

webapp/tests/Unit/Controller/Jury/ContestControllerTest.php

@@ -57,6 +57,14 @@ class ContestControllerTest extends JuryControllerTestCase
                                                            'endtimeString'        => '2021-07-17 16:11:00 CET',
                                                            'unfreezetimeString'   => '2021-07-17 16:12:00 CET',
                                                            'deactivatetimeString' => '2021-07-17 16:13:00 CET'],
+                                                          ['shortname'            => 'otzNZ-CHAT',
+                                                           'name'                 => 'Other timezone (NZ-CHAT)',
+                                                           'activatetimeString'   => '2021-07-17 16:08:00 NZ-CHAT',
+                                                           'starttimeString'      => '2021-07-17 16:09:00 NZ-CHAT',
+                                                           'freezetimeString'     => '2021-07-17 16:10:00 NZ-CHAT',
+                                                           'endtimeString'        => '2021-07-17 16:11:00 NZ-CHAT',
+                                                           'unfreezetimeString'   => '2021-07-17 16:12:00 NZ-CHAT',
+                                                           'deactivatetimeString' => '2021-07-17 16:13:00 NZ-CHAT'],
                                                           ['shortname'            => 'otzunder',
                                                            'name'                 => 'Other timezone (Underscore)',
                                                            'activatetimeString'   => '2021-07-17 16:08:00 America/Porto_Velho',
@@ -73,6 +81,14 @@ class ContestControllerTest extends JuryControllerTestCase
                                                            'endtimeString'        => '2021-07-17 16:11:00 Etc/GMT-3',
                                                            'unfreezetimeString'   => '',
                                                            'deactivatetimeString' => ''],
+                                                          ['shortname'            => 'otzGMT2',
+                                                           'name'                 => 'Other timezone (GMT)',
+                                                           'activatetimeString'   => '2021-07-17 16:08:00 Etc/GMT+3',
+                                                           'starttimeString'      => '2021-07-17 16:09:00 Etc/GMT+3',
+                                                           'freezetimeString'     => '2021-07-17 16:10:00 Etc/GMT+3',
+                                                           'endtimeString'        => '2021-07-17 16:11:00 Etc/GMT+3',
+                                                           'unfreezetimeString'   => '',
+                                                           'deactivatetimeString' => ''],
                                                           ['shortname'            => 'otzrel',
                                                            'name'                 => 'Other timezone (Relative)',
                                                            'activatetimeString'   => '-10:00',
@@ -93,7 +109,7 @@ class ContestControllerTest extends JuryControllerTestCase
                                                            'endtimeString'        => '2021-07-17 16:11:00 Europe/Amsterdam',
                                                            'unfreezetimeString'   => '',
                                                            'deactivatetimeString' => ''],
-                                                          ['shortname'           => 'dirfreeze',
+                                                          ['shortname'            => 'dirfreeze',
                                                            'name'                 => 'Direct freeze minimal',
                                                            'activatetimeString'   => '2021-07-17 16:07:59 Europe/Amsterdam',
                                                            'starttimeString'      => '2021-07-17 16:08:00 Europe/Amsterdam',