From 0c88129224e1b72da6894aada82fb4535d67143e Mon Sep 17 00:00:00 2001
From: James <603960+MrJamesEllis@users.noreply.github.com>
Date: Fri, 27 Jun 2025 13:17:12 +1000
Subject: [PATCH 01/13] Initial update of requirements and documentation

---
 README.md     |  5 +++--
 composer.json | 14 +++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 238070a..b8a0d2d 100644
--- a/README.md
+++ b/README.md
@@ -40,8 +40,9 @@ This works somewhat like a `<select>` element, except that browser implementatio
 
 ## Requirements
 
-+ silverstripe/framework ^5 (>= v1)
-+ silverstripe/framework ^4 (< v1)
++ silverstripe/framework ^6 (^2)
++ silverstripe/framework ^5 (^1)
++ silverstripe/framework ^4 (<1)
 
 ## Installation
 
diff --git a/composer.json b/composer.json
index a61c323..fd80598 100644
--- a/composer.json
+++ b/composer.json
@@ -25,17 +25,17 @@
         }
     },
     "require": {
-        "silverstripe/framework" : "^5"
+        "silverstripe/framework" : "^6"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^11.5",
         "friendsofphp/php-cs-fixer": "^3",
         "ext-dom" : "*",
-        "phpstan/phpstan": "^1",
-        "rector/rector": "^1",
-        "nswdpc/ci-files": "dev-v-3",
-        "cambis/silverstan": "^1",
-        "cambis/silverstripe-rector": "^1"
+        "phpstan/phpstan": "^2",
+        "rector/rector": "^2",
+        "nswdpc/ci-files": "dev-v-4",
+        "cambis/silverstan": "^2",
+        "cambis/silverstripe-rector": "^2"
     },
     "config": {
         "allow-plugins": {

From bec18191b56ed381ab61e59f94518fd546bed0f9 Mon Sep 17 00:00:00 2001
From: James <603960+MrJamesEllis@users.noreply.github.com>
Date: Fri, 27 Jun 2025 14:35:52 +1000
Subject: [PATCH 02/13] (php-cs-fixer) fix

---
 src/Traits/Datalist.php | 1 -
 src/Traits/Pattern.php  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/Traits/Datalist.php b/src/Traits/Datalist.php
index e52407d..2f71619 100644
--- a/src/Traits/Datalist.php
+++ b/src/Traits/Datalist.php
@@ -11,7 +11,6 @@
  */
 trait Datalist
 {
-
     protected ?ArrayList $inputDatalist = null;
 
     protected string $inputDatalistId = '';
diff --git a/src/Traits/Pattern.php b/src/Traits/Pattern.php
index 968f655..b19b89c 100644
--- a/src/Traits/Pattern.php
+++ b/src/Traits/Pattern.php
@@ -8,7 +8,6 @@
  */
 trait Pattern
 {
-
     protected string $phpPattern = '';
 
     /**

From 988d0a64a4cefce164b9f166da813e139cd480a5 Mon Sep 17 00:00:00 2001
From: James <603960+MrJamesEllis@users.noreply.github.com>
Date: Fri, 27 Jun 2025 15:24:28 +1000
Subject: [PATCH 03/13] Updates based on rector and phpstan analysis

---
 src/Forms/ColorField.php  | 46 +++++++++++++++++----------------------
 src/Forms/DateField.php   | 23 ++++++++------------
 src/Forms/NumberField.php | 23 ++++++++------------
 src/Forms/RangeField.php  | 44 +++++++++++++++++--------------------
 src/Forms/TelField.php    |  5 +++--
 src/Forms/UrlField.php    | 23 +++++++++-----------
 src/Traits/Datalist.php   | 16 +++++---------
 src/Traits/Pattern.php    |  2 +-
 tests/Base.php            |  7 +++---
 tests/ColourInputTest.php | 10 ++++-----
 tests/UrlFieldTest.php    | 21 +++++++++---------
 11 files changed, 96 insertions(+), 124 deletions(-)

diff --git a/src/Forms/ColorField.php b/src/Forms/ColorField.php
index 69dd88d..daa081c 100644
--- a/src/Forms/ColorField.php
+++ b/src/Forms/ColorField.php
@@ -2,6 +2,7 @@
 
 namespace Codem\Utilities\HTML5;
 
+use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Forms\FormField;
 use SilverStripe\Forms\Validator;
 
@@ -68,11 +69,8 @@ public function dataValue()
         return $this->getValidRGB($this->value);
     }
 
-    /**
-     * @return string
-     */
     #[\Override]
-    public function Value()
+    public function getValue(): mixed
     {
         return $this->dataValue();
     }
@@ -112,7 +110,7 @@ public function getDefaultValue(): string
     /**
      * Base on the value return either the defaultValue colour value or the value
      * @param string $value the value to check
-     * @param Validator $validator optional, see isValidRGB
+     * @param ValidationResult|null $validationResult optional, see isValidRGB
      *
      * The only valid value here is defined by the "valid simple colour" definition at
      * https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#valid-simple-colour
@@ -123,7 +121,7 @@ public function getDefaultValue(): string
      *    representing the red component, the middle two digits representing the green component,
      *  and the last two digits representing the blue component, in hexadecimal.</blockquote>
      */
-    public function getValidRGB(?string $value, Validator $validator = null): string
+    public function getValidRGB(?string $value, ValidationResult &$validationResult = null): string
     {
 
         $simpleColourValue = $this->defaultValue ?? static::WHITE;
@@ -134,7 +132,7 @@ public function getValidRGB(?string $value, Validator $validator = null): string
         }
 
         $value = strtolower($value);
-        if (!$this->isValidRGB($value, $validator)) {
+        if (!$this->isValidRGB($value, $validationResult)) {
             $value = $simpleColourValue;
         }
 
@@ -145,9 +143,9 @@ public function getValidRGB(?string $value, Validator $validator = null): string
     /**
      * Check if the value provided is a valid RGB value
      * @param string $value
-     * @param Validator $validator an optional validator. If provided specific errors will be stored in the validator
+     * @param ValidationResult|null $validationResult an optional validator. If provided specific errors will be stored in the validator
      */
-    public function isValidRGB(?string $value, Validator $validator = null): bool
+    public function isValidRGB(?string $value, ValidationResult &$validationResult = null): bool
     {
 
         // Ensure a string value
@@ -155,14 +153,14 @@ public function isValidRGB(?string $value, Validator $validator = null): bool
 
         // If input is not exactly seven characters long, then return an error.
         if (mb_strlen($value) != 7) {
-            if ($validator instanceof \SilverStripe\Forms\Validator) {
-                $validator->validationError(
+            if(!is_null($validationResult)) {
+                $validationResult->addFieldError(
                     $this->name,
                     _t(
                         'Codem\\Utilities\\HTML5\\ColorField.VALIDATE_NOT_VALID_RGB',
                         'The colour value must be a 6 character RGB colour value in the range #000000 to #ffffff'
                     ),
-                    "validation"
+                    ValidationResult::TYPE_ERROR
                 );
             }
 
@@ -171,14 +169,14 @@ public function isValidRGB(?string $value, Validator $validator = null): bool
 
         // If the first character in input is not a U+0023 NUMBER SIGN character (#), then return an error.
         if (!str_starts_with($value, "#")) {
-            if ($validator instanceof \SilverStripe\Forms\Validator) {
-                $validator->validationError(
+            if(!is_null($validationResult)) {
+                $validationResult->addFieldError(
                     $this->name,
                     _t(
                         'Codem\\Utilities\\HTML5\\ColorField.VALIDATE_MISSING_HASH',
                         'The colour value must start with a # character'
                     ),
-                    "validation"
+                    ValidationResult::TYPE_ERROR
                 );
             }
 
@@ -188,14 +186,14 @@ public function isValidRGB(?string $value, Validator $validator = null): bool
         // If the last six characters of input are not all ASCII hex digits, then return an error.
         $hex = trim($value, "#");
         if (ctype_xdigit($hex) === false) {
-            if ($validator instanceof \SilverStripe\Forms\Validator) {
-                $validator->validationError(
+            if(!is_null($validationResult)) {
+                $validationResult->addFieldError(
                     $this->name,
                     _t(
                         'Codem\\Utilities\\HTML5\\ColorField.VALIDATE_NOT_VALID_RGB',
                         'The colour value must be a valid 6 character RGB colour value in the range #000000 to #ffffff'
                     ),
-                    "validation"
+                    ValidationResult::TYPE_ERROR
                 );
             }
 
@@ -206,16 +204,12 @@ public function isValidRGB(?string $value, Validator $validator = null): bool
         return true;
     }
 
-    /**
-     * Validate this field
-     *
-     * @param Validator $validator
-     * @return bool
-     */
     #[\Override]
-    public function validate($validator)
+    public function validate(): ValidationResult
     {
-        return $this->isValidRGB($this->Value(), $validator);
+        $validationResult = parent::validate();
+        $this->isValidRGB($this->getValue(), $validationResult);
+        return $validationResult;
     }
 
 }
diff --git a/src/Forms/DateField.php b/src/Forms/DateField.php
index 80596b0..e5133cf 100644
--- a/src/Forms/DateField.php
+++ b/src/Forms/DateField.php
@@ -2,6 +2,7 @@
 
 namespace Codem\Utilities\HTML5;
 
+use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Forms\TextField;
 
 /**
@@ -54,21 +55,15 @@ public function setMax(\DateTime $max): static
         return $this->setAttribute('max', $this->formatDate($max));
     }
 
-    /**
-     * Validates for date value in format specified
-     *
-     * @param \SilverStripe\Forms\Validator $validator
-     *
-     * @return bool
-     */
     #[\Override]
-    public function validate($validator)
+    public function validate(): ValidationResult
     {
         try {
-            $value = trim($this->Value() ?? '');
+            $validationResult = parent::validate();
+            $value = trim($this->getValue() ?? '');
             if ($value === '') {
                 // empty values are valid
-                return true;
+                return $validationResult;
             }
 
             $dt = new \Datetime($value);
@@ -77,9 +72,9 @@ public function validate($validator)
                 throw new \Exception("Invalid date value passed");
             }
 
-            return true;
+            return $validationResult;
         } catch (\Exception) {
-            $validator->validationError(
+            $validationResult->addFieldError(
                 $this->name,
                 _t(
                     'Codem\\Utilities\\HTML5\\DateField.VALIDATION',
@@ -89,9 +84,9 @@ public function validate($validator)
                         'example' => $this->example
                     ]
                 ),
-                'validation'
+                ValidationResult::TYPE_ERROR
             );
-            return false;
+            return $validationResult;
         }
     }
 
diff --git a/src/Forms/NumberField.php b/src/Forms/NumberField.php
index c025747..bb45a3e 100644
--- a/src/Forms/NumberField.php
+++ b/src/Forms/NumberField.php
@@ -2,6 +2,7 @@
 
 namespace Codem\Utilities\HTML5;
 
+use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Forms\TextField;
 
 /**
@@ -17,29 +18,23 @@ class NumberField extends TextField
 
     protected $inputType = 'number';
 
-    /**
-     * Validates for numeric value
-     *
-     * @param \SilverStripe\Forms\Validator $validator
-     *
-     * @return bool
-     */
     #[\Override]
-    public function validate($validator)
+    public function validate(): ValidationResult
     {
-        $value = trim($this->Value() ?? '');
+        $validationResult = parent::validate();
+        $value = trim($this->getValue() ?? '');
         if ($value === '') {
             // empty values are valid
-            return true;
+            return $validationResult;
         } elseif (!is_numeric($value)) {
-            $validator->validationError(
+            $validationResult->addFieldError(
                 $this->name,
                 _t('Codem\\Utilities\\HTML5\\NumberField.VALIDATION', 'Please enter a number value'),
-                'validation'
+                ValidationResult::TYPE_ERROR
             );
-            return false;
+            return $validationResult;
         } else {
-            return true;
+            return $validationResult;
         }
     }
 
diff --git a/src/Forms/RangeField.php b/src/Forms/RangeField.php
index 2e5ea8c..c8c68c7 100644
--- a/src/Forms/RangeField.php
+++ b/src/Forms/RangeField.php
@@ -2,6 +2,7 @@
 
 namespace Codem\Utilities\HTML5;
 
+use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Forms\TextField;
 
 /**
@@ -31,30 +32,23 @@ public function __construct($name, $title = null, $value = null)
         $this->setStep(1);
     }
 
-    /**
-     * Validates for value within range ?
-     *
-     * @param \SilverStripe\Forms\Validator $validator
-     *
-     * @return bool
-     */
     #[\Override]
-    public function validate($validator)
+    public function validate(): ValidationResult
     {
-        $value = trim($this->Value() ?? '');
+        $validationResult = parent::validate();
+        $value = trim($this->getValue() ?? '');
         if ($value === '') {
             // empty values are valid
-            return true;
+            return $validationResult;
         }
 
         if (!is_numeric($value)) {
-            $validator->validationError(
+            $validationResult->addFieldError(
                 $this->name,
                 _t('Codem\\Utilities\\HTML5\\RangeField.VALIDATION_NUMERIC', 'Please enter a number value'),
-                'validation'
+                ValidationResult::TYPE_ERROR
             );
-            // value is not valid
-            return false;
+            return $validationResult;
         }
 
         $max = $this->getMax();
@@ -63,7 +57,7 @@ public function validate($validator)
             $valid = $value >= $min  &&  $value <= $max;
             if (!$valid) {
                 // out of range
-                $validator->validationError(
+                $validationResult->addFieldError(
                     $this->name,
                     _t(
                         'Codem\\Utilities\\HTML5\\RangeField.VALIDATION_BOUNDS',
@@ -73,16 +67,16 @@ public function validate($validator)
                             'max' => $max
                         ]
                     ),
-                    'validation'
+                    ValidationResult::TYPE_ERROR
                 );
             }
 
-            return $valid;
+            return $validationResult;
         } elseif (is_numeric($min)) {
             $valid = $value >= $min;
             if (!$valid) {
                 // out of range
-                $validator->validationError(
+                $validationResult->addFieldError(
                     $this->name,
                     _t(
                         'Codem\\Utilities\\HTML5\\RangeField.VALIDATION_BOUNDS',
@@ -91,15 +85,16 @@ public function validate($validator)
                             'min' => $min
                         ]
                     ),
-                    'validation'
+                    ValidationResult::TYPE_ERROR
                 );
             }
-            return $valid;
+
+            return $validationResult;
         } elseif (is_numeric($max)) {
             $valid = $value <= $max;
             if (!$valid) {
                 // out of range
-                $validator->validationError(
+                $validationResult->addFieldError(
                     $this->name,
                     _t(
                         'Codem\\Utilities\\HTML5\\RangeField.VALIDATION_BOUNDS',
@@ -108,13 +103,14 @@ public function validate($validator)
                             'max' => $max
                         ]
                     ),
-                    'validation'
+                    ValidationResult::TYPE_ERROR
                 );
             }
-            return $valid;
+
+            return $validationResult;
         } else {
             // no range restriction, numeric value is valid
-            return true;
+            return $validationResult;
         }
     }
 
diff --git a/src/Forms/TelField.php b/src/Forms/TelField.php
index 1559124..ff5401a 100644
--- a/src/Forms/TelField.php
+++ b/src/Forms/TelField.php
@@ -2,6 +2,7 @@
 
 namespace Codem\Utilities\HTML5;
 
+use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Forms\TextField;
 
 /**
@@ -35,8 +36,8 @@ public function Type()
      * @inheritdoc
      */
     #[\Override]
-    public function validate($validator)
+    public function validate(): ValidationResult
     {
-        return parent::validate($validator);
+        return parent::validate();
     }
 }
diff --git a/src/Forms/UrlField.php b/src/Forms/UrlField.php
index dd1bdaa..6d4b4f6 100644
--- a/src/Forms/UrlField.php
+++ b/src/Forms/UrlField.php
@@ -2,8 +2,8 @@
 
 namespace Codem\Utilities\HTML5;
 
+use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Forms\TextField;
-use SilverStripe\ORM\ValidationResult;
 
 /**
  * Provides a URL input field
@@ -44,24 +44,21 @@ public function Type()
 
     /**
      * TODO: use domain validation to validate the URL
-     *
-     * @param \SilverStripe\Forms\Validator $validator
-     *
-     * @return bool
      */
     #[\Override]
-    public function validate($validator)
+    public function validate(): ValidationResult
     {
-        $value = trim($this->Value() ?? '');
+        $validationResult = parent::validate();
+        $value = trim($this->getValue() ?? '');
         if ($value === '') {
             // Use RequiredFields to validate empty submissions
-            return true;
+            return $validationResult;
         }
 
         $check = $this->validateValueAgainstPattern();
         if ($check != 1) {
             // validation failed
-            $validator->validationError(
+            $validationResult->addFieldError(
                 $this->getName(),
                 _t(
                     'Codem\\Utilities\\HTML5\\UrlField.FAILED_PATTERN_VALIDATION',
@@ -70,12 +67,12 @@ public function validate($validator)
                 ValidationResult::TYPE_ERROR
             );
             // Pattern validation failed
-            return false;
+            return $validationResult;
         }
 
         // Check for valid URL format
         if (!$this->parseURL($value)) {
-            $validator->validationError(
+            $validationResult->addFieldError(
                 $this->getName(),
                 _t(
                     'Codem\\Utilities\\HTML5\\UrlField.FAILED_URL_PARSE',
@@ -83,10 +80,10 @@ public function validate($validator)
                 ),
                 ValidationResult::TYPE_ERROR
             );
-            return false;
+            return $validationResult;
         }
 
-        return true;
+        return $validationResult;
     }
 
     public function setRequiredParts(array $requiredParts): static
diff --git a/src/Traits/Datalist.php b/src/Traits/Datalist.php
index 2f71619..928ed47 100644
--- a/src/Traits/Datalist.php
+++ b/src/Traits/Datalist.php
@@ -2,27 +2,24 @@
 
 namespace Codem\Utilities\HTML5;
 
-use SilverStripe\ORM\ArrayList;
-use SilverStripe\View\ArrayData;
-
 /**
  * Datalist trait used for supporting inputs that can have a <datalist>
  * @author James
  */
 trait Datalist
 {
-    protected ?ArrayList $inputDatalist = null;
+    protected ?\SilverStripe\Model\List\ArrayList $inputDatalist = null;
 
     protected string $inputDatalistId = '';
 
     /**
      * Return values  for a <datalist>
      */
-    protected function createDataList(array $datalist): ArrayList
+    protected function createDataList(array $datalist): \SilverStripe\Model\List\ArrayList
     {
-        $list = ArrayList::create();
+        $list = \SilverStripe\Model\List\ArrayList::create();
         foreach ($datalist as $value => $label) {
-            $list->push(ArrayData::create([
+            $list->push(\SilverStripe\Model\ArrayData::create([
                 'Value' => $value,
                 'Label' => $label
             ]));
@@ -33,7 +30,6 @@ protected function createDataList(array $datalist): ArrayList
 
     /**
      * Set a list of values rendered into a <datalist> tag (HTMLDataListElement)
-     * @param array $datalist
      * @param string $id optional datalist id attribute
      */
     public function setDatalist(array $datalist, $id = null): static
@@ -48,7 +44,7 @@ public function setDatalist(array $datalist, $id = null): static
         return $this;
     }
 
-    public function getDatalist(): ?ArrayList
+    public function getDatalist(): ?\SilverStripe\Model\List\ArrayList
     {
         return $this->inputDatalist;
     }
@@ -56,7 +52,7 @@ public function getDatalist(): ?ArrayList
     /**
      * Return datalist id value
      */
-    public function Datalist(): ?ArrayList
+    public function Datalist(): ?\SilverStripe\Model\List\ArrayList
     {
         return $this->getDatalist();
     }
diff --git a/src/Traits/Pattern.php b/src/Traits/Pattern.php
index b19b89c..1896160 100644
--- a/src/Traits/Pattern.php
+++ b/src/Traits/Pattern.php
@@ -49,7 +49,7 @@ public function validateValueAgainstPattern(): bool
             }
         }
 
-        $value = $this->Value() ?? '';
+        $value = $this->getValue() ?? '';
         $check = preg_match($pattern, (string) $value, $matches);
         return $check === 1;
     }
diff --git a/tests/Base.php b/tests/Base.php
index 24bfb27..7c98f2e 100644
--- a/tests/Base.php
+++ b/tests/Base.php
@@ -7,8 +7,7 @@
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\Form;
 use SilverStripe\Forms\FormField;
-use SilverStripe\Forms\RequiredFields;
-use SilverStripe\ORM\ValidationResult;
+use SilverStripe\Core\Validation\ValidationResult;
 
 /**
  * Abstract class for field tests
@@ -39,7 +38,7 @@ protected function performDataListTest($field, $options)
     public function getRequiredFieldValidationResult(FormField $field): ValidationResult
     {
         $controller = Controller::create();
-        $validator = RequiredFields::create([$field->getName()]);
+        $validator = \SilverStripe\Forms\Validation\RequiredFieldsValidator::create([$field->getName()]);
         $form = Form::create(
             $controller,
             'RequiredFieldTestForm',
@@ -47,7 +46,7 @@ public function getRequiredFieldValidationResult(FormField $field): ValidationRe
             FieldList::create(),
             $validator
         );
-        return $form->validationResult();
+        return $form->validate();
     }
 
 }
diff --git a/tests/ColourInputTest.php b/tests/ColourInputTest.php
index 7257f38..e5ece9c 100644
--- a/tests/ColourInputTest.php
+++ b/tests/ColourInputTest.php
@@ -57,14 +57,14 @@ public function testColourInput(): void
             $name = "field1{$i}";
             $title = "field1{$i}";
             $field1 = ColourField::create($name, $title, $colour);
-            $out = $field1->Value();
+            $out = $field1->getValue();
             $this->assertEquals($expected, $out, "The output {$out} does not match expected");
             // check set/get value
             $name = "field2{$i}";
             $title = "field2{$i}";
             $field2 = ColourField::create($name, $title, $out);
             $field2->setValue($colour);
-            $out = $field2->Value();
+            $out = $field2->getValue();
             $this->assertEquals($expected, $out, "The output {$out} does not match expected (set/get value)");
 
             $i++;
@@ -80,7 +80,7 @@ public function testDefaultValueNoDefaultProvided(): void
         $value = null;
         $field = ColourField::create($name, $title, $value);
         $this->assertEquals(ColourField::WHITE, $field->getDefaultValue());
-        $this->assertEquals(ColourField::WHITE, $field->Value());
+        $this->assertEquals(ColourField::WHITE, $field->getValue());
     }
 
     public function testDefaultValueDefaultProvided(): void
@@ -91,7 +91,7 @@ public function testDefaultValueDefaultProvided(): void
         $defaultValue = "#0099ab";
         $field = ColourField::create($name, $title, $value, $defaultValue);
         $this->assertEquals($defaultValue, $field->getDefaultValue());
-        $this->assertEquals($defaultValue, $field->Value());
+        $this->assertEquals($defaultValue, $field->getValue());
     }
 
     public function testDefaultValueDefaultProvidedValueProvided(): void
@@ -102,7 +102,7 @@ public function testDefaultValueDefaultProvidedValueProvided(): void
         $defaultValue = "#0099ab";
         $field = ColourField::create($name, $title, $value, $defaultValue);
         $this->assertEquals($defaultValue, $field->getDefaultValue());
-        $this->assertEquals($value, $field->Value());
+        $this->assertEquals($value, $field->getValue());
     }
 
     public function testEmptyFieldButRequiredValidation(): void
diff --git a/tests/UrlFieldTest.php b/tests/UrlFieldTest.php
index 5627373..2bcc367 100644
--- a/tests/UrlFieldTest.php
+++ b/tests/UrlFieldTest.php
@@ -3,7 +3,6 @@
 namespace Codem\Utilities\HTML5\Tests;
 
 use Codem\Utilities\HTML5\UrlField;
-use SilverStripe\Forms\RequiredFields;
 
 /**
  * URLField input test
@@ -53,8 +52,8 @@ public function testHttpScheme(): void
         $this->assertEquals($expectedPattern, $pattern);
         $this->assertEquals($expectedPhpPattern, $expectedPhpPattern);
 
-        $validator = RequiredFields::create();
-        $result = $field->validate($validator);
+        \SilverStripe\Forms\Validation\RequiredFieldsValidator::create();
+        $result = $field->validate();
         $this->assertFalse($result, "Field should not validate");
 
     }
@@ -76,8 +75,8 @@ public function testHttpsScheme(): void
         $this->assertEquals($expectedPattern, $pattern);
         $this->assertEquals($expectedPhpPattern, $expectedPhpPattern);
 
-        $validator = RequiredFields::create();
-        $result = $field->validate($validator);
+        \SilverStripe\Forms\Validation\RequiredFieldsValidator::create();
+        $result = $field->validate();
         $this->assertFalse($result, "Field should not validate");
     }
 
@@ -113,8 +112,8 @@ public function testNonStandardSchemes(): void
         $resultSchemes = $field->getSchemes();
         $this->assertEquals($schemes, $resultSchemes);
 
-        $validator = RequiredFields::create();
-        $result = $field->validate($validator);
+        \SilverStripe\Forms\Validation\RequiredFieldsValidator::create();
+        $result = $field->validate();
         $this->assertFalse($result, "Field should not validate");
 
     }
@@ -126,8 +125,8 @@ public function testWithPattern(): void
         $pattern = "^ftp://.+\.com";
         $phpPattern = "|^ftp://.+\.com|";
         $field->setPattern($pattern, $phpPattern);
-        $validator = RequiredFields::create();
-        $result = $field->validate($validator);
+        \SilverStripe\Forms\Validation\RequiredFieldsValidator::create();
+        $result = $field->validate();
         $this->assertTrue($result, "Field should validate for url {$url}");
     }
 
@@ -138,8 +137,8 @@ public function testWithPatternToFail(): void
         $pattern = "^ftp://.+\.example\.com";
         $phpPattern = "|^ftp://.+\.example\.com|";
         $field->setPattern($pattern, $phpPattern);
-        $validator = RequiredFields::create();
-        $result = $field->validate($validator);
+        \SilverStripe\Forms\Validation\RequiredFieldsValidator::create();
+        $result = $field->validate();
         $this->assertFalse($result, "Field should not validate for url {$url}");
     }
 

From fa4802d6feb71ae7577a693a0a6706b5b4186f7f Mon Sep 17 00:00:00 2001
From: James <603960+MrJamesEllis@users.noreply.github.com>
Date: Fri, 27 Jun 2025 15:24:56 +1000
Subject: [PATCH 04/13] (php-cs-fixer) fix

---
 src/Forms/ColorField.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Forms/ColorField.php b/src/Forms/ColorField.php
index daa081c..7194682 100644
--- a/src/Forms/ColorField.php
+++ b/src/Forms/ColorField.php
@@ -153,7 +153,7 @@ public function isValidRGB(?string $value, ValidationResult &$validationResult =
 
         // If input is not exactly seven characters long, then return an error.
         if (mb_strlen($value) != 7) {
-            if(!is_null($validationResult)) {
+            if (!is_null($validationResult)) {
                 $validationResult->addFieldError(
                     $this->name,
                     _t(
@@ -169,7 +169,7 @@ public function isValidRGB(?string $value, ValidationResult &$validationResult =
 
         // If the first character in input is not a U+0023 NUMBER SIGN character (#), then return an error.
         if (!str_starts_with($value, "#")) {
-            if(!is_null($validationResult)) {
+            if (!is_null($validationResult)) {
                 $validationResult->addFieldError(
                     $this->name,
                     _t(
@@ -186,7 +186,7 @@ public function isValidRGB(?string $value, ValidationResult &$validationResult =
         // If the last six characters of input are not all ASCII hex digits, then return an error.
         $hex = trim($value, "#");
         if (ctype_xdigit($hex) === false) {
-            if(!is_null($validationResult)) {
+            if (!is_null($validationResult)) {
                 $validationResult->addFieldError(
                     $this->name,
                     _t(

From 498addc16fac7fbbb94b4924002e52372483cda8 Mon Sep 17 00:00:00 2001
From: James <603960+MrJamesEllis@users.noreply.github.com>
Date: Fri, 27 Jun 2025 16:04:31 +1000
Subject: [PATCH 05/13] Fix breaking tests, update types

---
 src/Forms/RangeField.php  |  6 +++---
 src/Traits/Core.php       |  2 +-
 src/Traits/MinMax.php     |  8 ++++----
 src/Traits/Multiple.php   |  2 +-
 src/Traits/Pattern.php    |  2 +-
 src/Traits/Step.php       |  4 ++--
 tests/NumberFieldTest.php |  2 +-
 tests/RangeFieldTest.php  | 16 ++++++++--------
 tests/UrlFieldTest.php    | 10 +++++-----
 9 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/Forms/RangeField.php b/src/Forms/RangeField.php
index c8c68c7..775dbb7 100644
--- a/src/Forms/RangeField.php
+++ b/src/Forms/RangeField.php
@@ -27,9 +27,9 @@ public function __construct($name, $title = null, $value = null)
     {
         parent::__construct($name, $title, $value);
         // Set sensible defaults per MDN
-        $this->setMin(0);
-        $this->setMax(100);
-        $this->setStep(1);
+        $this->setMin('0');
+        $this->setMax('100');
+        $this->setStep('1');
     }
 
     #[\Override]
diff --git a/src/Traits/Core.php b/src/Traits/Core.php
index e771d18..9b0e664 100644
--- a/src/Traits/Core.php
+++ b/src/Traits/Core.php
@@ -32,7 +32,7 @@ public function setSpellcheck($spellcheck): static
     /**
      *  Get spellcheck attribute value
      */
-    public function getSpellcheck(): string
+    public function getSpellcheck(): ?string
     {
         return $this->getAttribute('spellcheck');
     }
diff --git a/src/Traits/MinMax.php b/src/Traits/MinMax.php
index 9a464ec..6627a91 100644
--- a/src/Traits/MinMax.php
+++ b/src/Traits/MinMax.php
@@ -8,7 +8,7 @@
  */
 trait MinMax
 {
-    public function setMin($min): static
+    public function setMin(string $min): static
     {
         return $this->setAttribute('min', $min);
     }
@@ -16,12 +16,12 @@ public function setMin($min): static
     /**
      * @return mixed
      */
-    public function getMin()
+    public function getMin(): ?string
     {
         return $this->getAttribute('min');
     }
 
-    public function setMax($max): static
+    public function setMax(string $max): static
     {
         return $this->setAttribute('max', $max);
     }
@@ -29,7 +29,7 @@ public function setMax($max): static
     /**
      * @return mixed
      */
-    public function getMax()
+    public function getMax(): ?string
     {
         return $this->getAttribute('max');
     }
diff --git a/src/Traits/Multiple.php b/src/Traits/Multiple.php
index 25e62b1..a1409b8 100644
--- a/src/Traits/Multiple.php
+++ b/src/Traits/Multiple.php
@@ -23,7 +23,7 @@ public function setMultiple(bool $multiple): static
         return $this;
     }
 
-    public function getMultiple()
+    public function getMultiple(): ?string
     {
         return $this->getAttribute('multiple');
     }
diff --git a/src/Traits/Pattern.php b/src/Traits/Pattern.php
index 1896160..c9e18d2 100644
--- a/src/Traits/Pattern.php
+++ b/src/Traits/Pattern.php
@@ -24,7 +24,7 @@ public function setPattern(string $pattern, string $phpPattern = ''): static
     /**
      * @return string|null
      */
-    public function getPattern()
+    public function getPattern(): ?string
     {
         return $this->getAttribute('pattern');
     }
diff --git a/src/Traits/Step.php b/src/Traits/Step.php
index f81b7b7..bc5a096 100644
--- a/src/Traits/Step.php
+++ b/src/Traits/Step.php
@@ -7,7 +7,7 @@ trait Step
     /**
      * set step attribute value
      */
-    public function setStep($step): static
+    public function setStep(string $step): static
     {
         return $this->setAttribute('step', $step);
     }
@@ -15,7 +15,7 @@ public function setStep($step): static
     /**
      * get step attribute value
      */
-    public function getStep()
+    public function getStep(): ?string
     {
         return $this->getAttribute('step');
     }
diff --git a/tests/NumberFieldTest.php b/tests/NumberFieldTest.php
index 1b95ff4..3816035 100644
--- a/tests/NumberFieldTest.php
+++ b/tests/NumberFieldTest.php
@@ -51,7 +51,7 @@ public function testNonEmptyFieldButRequiredValidation(): void
     {
         $fieldName = "TestValidation";
         $fieldTitle = "Test validation";
-        $fieldValue = 3;
+        $fieldValue = '3';// string values are submitted
         $field = NumberField::create($fieldName, $fieldTitle, $fieldValue);
         $result = $this->getRequiredFieldValidationResult($field);
         $this->assertTrue($result->isValid());
diff --git a/tests/RangeFieldTest.php b/tests/RangeFieldTest.php
index cdb4310..75aa1e0 100644
--- a/tests/RangeFieldTest.php
+++ b/tests/RangeFieldTest.php
@@ -15,18 +15,18 @@ class RangeFieldTest extends Base
     public function testDataList(): void
     {
         $options = [
-            1 => 1,
-            2 => 2,
-            3 => 3,
-            5 => 5,
-            8 => 8
+            '1' => '1',
+            '2' => '2',
+            '3' => '3',
+            '5' => '5',
+            '8' => '8'
         ];
         $name = "TestDatalist";
         $title = "Test datalist";
         $value = null;
         $field = RangeField::create($name, $title, $value);
-        $field->setMin(1);
-        $field->setMax(13);
+        $field->setMin('1');
+        $field->setMax('13');
         $this->performDataListTest($field, $options);
     }
 
@@ -53,7 +53,7 @@ public function testNonEmptyFieldButRequiredValidation(): void
     {
         $fieldName = "TestValidation";
         $fieldTitle = "Test validation";
-        $fieldValue = 3;
+        $fieldValue = '3';
         $field = RangeField::create($fieldName, $fieldTitle, $fieldValue);
         $result = $this->getRequiredFieldValidationResult($field);
         $this->assertTrue($result->isValid(), "Validation result is true");
diff --git a/tests/UrlFieldTest.php b/tests/UrlFieldTest.php
index 2bcc367..b76bbbc 100644
--- a/tests/UrlFieldTest.php
+++ b/tests/UrlFieldTest.php
@@ -54,7 +54,7 @@ public function testHttpScheme(): void
 
         \SilverStripe\Forms\Validation\RequiredFieldsValidator::create();
         $result = $field->validate();
-        $this->assertFalse($result, "Field should not validate");
+        $this->assertFalse($result->isValid(), "Field should not validate");
 
     }
 
@@ -77,7 +77,7 @@ public function testHttpsScheme(): void
 
         \SilverStripe\Forms\Validation\RequiredFieldsValidator::create();
         $result = $field->validate();
-        $this->assertFalse($result, "Field should not validate");
+        $this->assertFalse($result->isValid(), "Field should not validate");
     }
 
     public function testRequiredParts(): void
@@ -114,7 +114,7 @@ public function testNonStandardSchemes(): void
 
         \SilverStripe\Forms\Validation\RequiredFieldsValidator::create();
         $result = $field->validate();
-        $this->assertFalse($result, "Field should not validate");
+        $this->assertFalse($result->isValid(), "Field should not validate");
 
     }
 
@@ -127,7 +127,7 @@ public function testWithPattern(): void
         $field->setPattern($pattern, $phpPattern);
         \SilverStripe\Forms\Validation\RequiredFieldsValidator::create();
         $result = $field->validate();
-        $this->assertTrue($result, "Field should validate for url {$url}");
+        $this->assertTrue($result->isValid(), "Field should validate for url {$url}");
     }
 
     public function testWithPatternToFail(): void
@@ -139,7 +139,7 @@ public function testWithPatternToFail(): void
         $field->setPattern($pattern, $phpPattern);
         \SilverStripe\Forms\Validation\RequiredFieldsValidator::create();
         $result = $field->validate();
-        $this->assertFalse($result, "Field should not validate for url {$url}");
+        $this->assertFalse($result->isValid(), "Field should not validate for url {$url}");
     }
 
     public function testEmptyFieldButRequiredValidation(): void

From 6f3f7ac00a48354659daf9f2168f0bd752a85cbb Mon Sep 17 00:00:00 2001
From: James <603960+MrJamesEllis@users.noreply.github.com>
Date: Fri, 27 Jun 2025 16:06:13 +1000
Subject: [PATCH 06/13] (rector) process

---
 src/Traits/MinMax.php  | 6 ------
 src/Traits/Pattern.php | 3 ---
 2 files changed, 9 deletions(-)

diff --git a/src/Traits/MinMax.php b/src/Traits/MinMax.php
index 6627a91..c276501 100644
--- a/src/Traits/MinMax.php
+++ b/src/Traits/MinMax.php
@@ -13,9 +13,6 @@ public function setMin(string $min): static
         return $this->setAttribute('min', $min);
     }
 
-    /**
-     * @return mixed
-     */
     public function getMin(): ?string
     {
         return $this->getAttribute('min');
@@ -26,9 +23,6 @@ public function setMax(string $max): static
         return $this->setAttribute('max', $max);
     }
 
-    /**
-     * @return mixed
-     */
     public function getMax(): ?string
     {
         return $this->getAttribute('max');
diff --git a/src/Traits/Pattern.php b/src/Traits/Pattern.php
index c9e18d2..6762658 100644
--- a/src/Traits/Pattern.php
+++ b/src/Traits/Pattern.php
@@ -21,9 +21,6 @@ public function setPattern(string $pattern, string $phpPattern = ''): static
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getPattern(): ?string
     {
         return $this->getAttribute('pattern');

From 5d6ee0d15aaa080467ab628ee34ad9522079825c Mon Sep 17 00:00:00 2001
From: James <603960+MrJamesEllis@users.noreply.github.com>
Date: Thu, 19 Mar 2026 23:39:00 +1100
Subject: [PATCH 07/13] (composer) add scripts

---
 composer.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/composer.json b/composer.json
index a61c323..0ae294a 100644
--- a/composer.json
+++ b/composer.json
@@ -37,6 +37,12 @@
         "cambis/silverstan": "^1",
         "cambis/silverstripe-rector": "^1"
     },
+    "scripts": {
+      "phpstan-analyse": "./vendor/bin/phpstan analyse --ansi --no-progress --no-interaction --configuration vendor/nswdpc/ci-files/phpstan/.phpstan.silverstripe.neon",
+      "rector-dryrun": "./vendor/bin/rector process --dry-run --ansi --config vendor/nswdpc/ci-files/rector/.rector.silverstripe_53_83.php src tests",
+      "rector-process": "./vendor/bin/rector process --no-diffs --ansi --config vendor/nswdpc/ci-files/rector/.rector.silverstripe_53_83.php src tests",
+      "phpcsfixer-fix": "./vendor/bin/php-cs-fixer fix --ansi --no-interaction --config vendor/nswdpc/ci-files/php-cs-fixer/.php-cs-fixer.php src tests"
+    },
     "config": {
         "allow-plugins": {
             "composer/installers": true,

From 85c6a809a006f60e2fffba381d457927bbffec7a Mon Sep 17 00:00:00 2001
From: James <603960+MrJamesEllis@users.noreply.github.com>
Date: Thu, 19 Mar 2026 23:39:31 +1100
Subject: [PATCH 08/13] (phpunit) migrate config

---
 phpunit.xml.dist | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 7be993f..72e69fa 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,13 +1,14 @@
-<phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
-    <testsuite name="codem/silverstripe-html5-inputs">
-        <directory>tests/</directory>
-    </testsuite>
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src/</directory>
-            <exclude>
-                <directory suffix=".php">tests/</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage includeUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">tests/</directory>
+    </exclude>
+  </coverage>
+  <testsuite name="codem/silverstripe-html5-inputs">
+    <directory>tests/</directory>
+  </testsuite>
 </phpunit>

From a693f6dc343aadef22ce4bedaec589844ae1cf35 Mon Sep 17 00:00:00 2001
From: James <603960+MrJamesEllis@users.noreply.github.com>
Date: Thu, 19 Mar 2026 23:39:41 +1100
Subject: [PATCH 09/13] Update attributes

---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index af37a4f..7a125df 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,7 +3,7 @@
 /.editorconfig              export-ignore
 /.gitattributes             export-ignore
 /.gitignore                 export-ignore
-/.php-cs-fixer.dist.php     export-ignore
+/phpunit.xml.dist           export-ignore
 /code-of-conduct.md         export-ignore
 /CONTRIBUTING.md            export-ignore
 /README.md                  export-ignore

From 51a3b770cbce80f9004ea57668781eee668512f0 Mon Sep 17 00:00:00 2001
From: James <603960+MrJamesEllis@users.noreply.github.com>
Date: Thu, 19 Mar 2026 23:39:50 +1100
Subject: [PATCH 10/13] (rector) process

---
 src/Forms/RangeField.php | 2 ++
 src/Traits/Datalist.php  | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Forms/RangeField.php b/src/Forms/RangeField.php
index 2e5ea8c..fe10eb3 100644
--- a/src/Forms/RangeField.php
+++ b/src/Forms/RangeField.php
@@ -94,6 +94,7 @@ public function validate($validator)
                     'validation'
                 );
             }
+
             return $valid;
         } elseif (is_numeric($max)) {
             $valid = $value <= $max;
@@ -111,6 +112,7 @@ public function validate($validator)
                     'validation'
                 );
             }
+
             return $valid;
         } else {
             // no range restriction, numeric value is valid
diff --git a/src/Traits/Datalist.php b/src/Traits/Datalist.php
index e52407d..326f7b4 100644
--- a/src/Traits/Datalist.php
+++ b/src/Traits/Datalist.php
@@ -34,7 +34,6 @@ protected function createDataList(array $datalist): ArrayList
 
     /**
      * Set a list of values rendered into a <datalist> tag (HTMLDataListElement)
-     * @param array $datalist
      * @param string $id optional datalist id attribute
      */
     public function setDatalist(array $datalist, $id = null): static

From a4f8c346980e3fc683dd3c22bd1785b161e1831b Mon Sep 17 00:00:00 2001
From: James <603960+MrJamesEllis@users.noreply.github.com>
Date: Thu, 19 Mar 2026 23:40:17 +1100
Subject: [PATCH 11/13] (php-cs-fixer) fix

---
 src/Traits/Datalist.php | 1 -
 src/Traits/Pattern.php  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/Traits/Datalist.php b/src/Traits/Datalist.php
index 326f7b4..12fe710 100644
--- a/src/Traits/Datalist.php
+++ b/src/Traits/Datalist.php
@@ -11,7 +11,6 @@
  */
 trait Datalist
 {
-
     protected ?ArrayList $inputDatalist = null;
 
     protected string $inputDatalistId = '';
diff --git a/src/Traits/Pattern.php b/src/Traits/Pattern.php
index 968f655..b19b89c 100644
--- a/src/Traits/Pattern.php
+++ b/src/Traits/Pattern.php
@@ -8,7 +8,6 @@
  */
 trait Pattern
 {
-
     protected string $phpPattern = '';
 
     /**

From e993c8ba96b58d98e5557d5e8424ee3fbf19bdcc Mon Sep 17 00:00:00 2001
From: James <603960+MrJamesEllis@users.noreply.github.com>
Date: Thu, 19 Mar 2026 23:40:35 +1100
Subject: [PATCH 12/13] (php-cs-fixer) fix

---
 tests/ColourInputTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/ColourInputTest.php b/tests/ColourInputTest.php
index 7257f38..51bc0bf 100644
--- a/tests/ColourInputTest.php
+++ b/tests/ColourInputTest.php
@@ -2,7 +2,6 @@
 
 namespace Codem\Utilities\HTML5\Tests;
 
-use Codem\Utilities\HTML5\ColorField;
 use Codem\Utilities\HTML5\ColourField;
 
 /**

From d55f4217ba497bf4aa24b27b712f993be886ca57 Mon Sep 17 00:00:00 2001
From: James <603960+MrJamesEllis@users.noreply.github.com>
Date: Thu, 19 Mar 2026 23:47:09 +1100
Subject: [PATCH 13/13] (rector) process

---
 src/Forms/ColorField.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Forms/ColorField.php b/src/Forms/ColorField.php
index 7194682..d66a181 100644
--- a/src/Forms/ColorField.php
+++ b/src/Forms/ColorField.php
@@ -152,7 +152,7 @@ public function isValidRGB(?string $value, ValidationResult &$validationResult =
         $value ??= '';
 
         // If input is not exactly seven characters long, then return an error.
-        if (mb_strlen($value) != 7) {
+        if (mb_strlen($value) !== 7) {
             if (!is_null($validationResult)) {
                 $validationResult->addFieldError(
                     $this->name,