From a12b8935920cb96209394e1d25c2a7acf7cd84d0 Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Thu, 16 Nov 2023 21:59:55 +0000
Subject: [PATCH 1/7] Improve type inference for element attributes

Marks all attribute arrays and iterables as `<string, scalar|null>`

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 src/Element.php                          | 35 +++++++-----------------
 src/Element/Button.php                   |  6 +---
 src/Element/Checkbox.php                 |  6 +---
 src/Element/Color.php                    |  6 +---
 src/Element/Csrf.php                     |  8 ++----
 src/Element/Date.php                     |  6 +---
 src/Element/DateTime.php                 |  6 +---
 src/Element/DateTimeLocal.php            |  6 +---
 src/Element/Email.php                    |  6 +---
 src/Element/File.php                     |  6 +---
 src/Element/Hidden.php                   |  6 +---
 src/Element/Image.php                    |  6 +---
 src/Element/Month.php                    |  6 +---
 src/Element/MultiCheckbox.php            | 13 ++-------
 src/Element/Number.php                   |  6 +---
 src/Element/Password.php                 |  6 +---
 src/Element/Radio.php                    |  6 +---
 src/Element/Range.php                    |  6 +---
 src/Element/Search.php                   |  6 +---
 src/Element/Select.php                   | 13 ++-------
 src/Element/Submit.php                   |  6 +---
 src/Element/Tel.php                      |  6 +---
 src/Element/Text.php                     |  6 +---
 src/Element/Textarea.php                 |  6 +---
 src/Element/Time.php                     |  6 +---
 src/Element/Url.php                      |  6 +---
 src/Element/Week.php                     |  6 +---
 src/ElementAttributeRemovalInterface.php |  1 +
 src/ElementInterface.php                 |  6 +++-
 src/Form.php                             |  6 +---
 src/LabelAwareInterface.php              |  2 +-
 31 files changed, 48 insertions(+), 174 deletions(-)

diff --git a/src/Element.php b/src/Element.php
index e24d66d59..1a8214b4c 100644
--- a/src/Element.php
+++ b/src/Element.php
@@ -17,19 +17,19 @@ class Element implements
     InitializableInterface,
     LabelAwareInterface
 {
-    /** @var array  */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [];
 
     /** @var null|string */
     protected $label;
 
-    /** @var array */
+    /** @var array<string, scalar|null> */
     protected $labelAttributes = [];
 
     /**
      * Label specific options
      *
-     * @var array
+     * @var array<string, mixed>
      */
     protected $labelOptions = [];
 
@@ -158,12 +158,7 @@ public function setOption(string $key, $value)
         return $this;
     }
 
-    /**
-     * Set a single element attribute
-     *
-     * @param  mixed  $value
-     * @return $this
-     */
+    /** @inheritDoc */
     public function setAttribute(string $key, $value)
     {
         // Do not include the value in the list of attributes
@@ -175,11 +170,7 @@ public function setAttribute(string $key, $value)
         return $this;
     }
 
-    /**
-     * Retrieve a single element attribute
-     *
-     * @return mixed|null
-     */
+    /** @inheritDoc */
     public function getAttribute(string $key)
     {
         if (! isset($this->attributes[$key])) {
@@ -209,11 +200,7 @@ public function hasAttribute(string $key): bool
     }
 
     /**
-     * Set many attributes at once
-     *
-     * Implementation will decide if this will overwrite or merge.
-     *
-     * @return $this
+     * @inheritDoc
      * @throws Exception\InvalidArgumentException
      */
     public function setAttributes(iterable $arrayOrTraversable)
@@ -224,9 +211,7 @@ public function setAttributes(iterable $arrayOrTraversable)
         return $this;
     }
 
-    /**
-     * Retrieve all attributes at once
-     */
+    /** @inheritDoc */
     public function getAttributes(): array
     {
         return $this->attributes;
@@ -235,7 +220,7 @@ public function getAttributes(): array
     /**
      * Remove many attributes at once
      *
-     * @param array $keys
+     * @param list<string> $keys
      * @return $this
      */
     public function removeAttributes(array $keys)
@@ -307,7 +292,7 @@ public function getLabel(): ?string
     /**
      * Set the attributes to use with the label
      *
-     * @param array $labelAttributes
+     * @param array<string, mixed> $labelAttributes
      * @return $this
      */
     public function setLabelAttributes(array $labelAttributes)
@@ -319,7 +304,7 @@ public function setLabelAttributes(array $labelAttributes)
     /**
      * Get the attributes to use with the label
      *
-     * @return array
+     * @return array<string, mixed>
      */
     public function getLabelAttributes(): array
     {
diff --git a/src/Element/Button.php b/src/Element/Button.php
index 54c187c58..5a9ba82f7 100644
--- a/src/Element/Button.php
+++ b/src/Element/Button.php
@@ -8,11 +8,7 @@
 
 class Button extends Element
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'button',
     ];
diff --git a/src/Element/Checkbox.php b/src/Element/Checkbox.php
index e2c5b13c2..e9d585837 100644
--- a/src/Element/Checkbox.php
+++ b/src/Element/Checkbox.php
@@ -11,11 +11,7 @@
 
 class Checkbox extends Element implements InputProviderInterface
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'checkbox',
     ];
diff --git a/src/Element/Color.php b/src/Element/Color.php
index c91f37764..867ad0599 100644
--- a/src/Element/Color.php
+++ b/src/Element/Color.php
@@ -13,11 +13,7 @@
 
 class Color extends Element implements InputProviderInterface
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'color',
     ];
diff --git a/src/Element/Csrf.php b/src/Element/Csrf.php
index f50667b89..b01fbd314 100644
--- a/src/Element/Csrf.php
+++ b/src/Element/Csrf.php
@@ -16,11 +16,7 @@
 
 class Csrf extends Element implements InputProviderInterface, ElementPrepareAwareInterface
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'hidden',
     ];
@@ -103,6 +99,8 @@ public function getValue(): string
      * Override: get attributes
      *
      * Seeds 'value' attribute with validator hash
+     *
+     * @inheritDoc
      */
     public function getAttributes(): array
     {
diff --git a/src/Element/Date.php b/src/Element/Date.php
index 337ddbf03..2a5614a20 100644
--- a/src/Element/Date.php
+++ b/src/Element/Date.php
@@ -14,11 +14,7 @@
 
 class Date extends DateTimeElement
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'date',
     ];
diff --git a/src/Element/DateTime.php b/src/Element/DateTime.php
index 66bea7a4d..56a09aa0a 100644
--- a/src/Element/DateTime.php
+++ b/src/Element/DateTime.php
@@ -11,11 +11,7 @@
  */
 class DateTime extends AbstractDateTime
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'datetime',
     ];
diff --git a/src/Element/DateTimeLocal.php b/src/Element/DateTimeLocal.php
index 93d63bb29..2dad44ee5 100644
--- a/src/Element/DateTimeLocal.php
+++ b/src/Element/DateTimeLocal.php
@@ -10,11 +10,7 @@
 
 class DateTimeLocal extends AbstractDateTime
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'datetime-local',
     ];
diff --git a/src/Element/Email.php b/src/Element/Email.php
index 8ad8f83b3..bd5783199 100644
--- a/src/Element/Email.php
+++ b/src/Element/Email.php
@@ -13,11 +13,7 @@
 
 class Email extends Element implements InputProviderInterface
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'email',
     ];
diff --git a/src/Element/File.php b/src/Element/File.php
index 6f4b794ec..65d96c051 100644
--- a/src/Element/File.php
+++ b/src/Element/File.php
@@ -12,11 +12,7 @@
 
 class File extends Element implements InputProviderInterface, ElementPrepareAwareInterface
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'file',
     ];
diff --git a/src/Element/Hidden.php b/src/Element/Hidden.php
index 10160fdb8..c9ec1e08b 100644
--- a/src/Element/Hidden.php
+++ b/src/Element/Hidden.php
@@ -8,11 +8,7 @@
 
 class Hidden extends Element
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'hidden',
     ];
diff --git a/src/Element/Image.php b/src/Element/Image.php
index 79792828c..b754962bc 100644
--- a/src/Element/Image.php
+++ b/src/Element/Image.php
@@ -8,11 +8,7 @@
 
 class Image extends Element
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'image',
     ];
diff --git a/src/Element/Month.php b/src/Element/Month.php
index a38d03f39..463e2fa47 100644
--- a/src/Element/Month.php
+++ b/src/Element/Month.php
@@ -18,11 +18,7 @@ class Month extends AbstractDateTime
      */
     protected $format = '!Y-m';
 
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'month',
     ];
diff --git a/src/Element/MultiCheckbox.php b/src/Element/MultiCheckbox.php
index bec7acc12..4d34d1d37 100644
--- a/src/Element/MultiCheckbox.php
+++ b/src/Element/MultiCheckbox.php
@@ -14,11 +14,7 @@
 
 class MultiCheckbox extends Checkbox
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'multi_checkbox',
     ];
@@ -99,12 +95,7 @@ public function setOptions(iterable $options)
         return $this;
     }
 
-    /**
-     * Set a single element attribute
-     *
-     * @param  mixed  $value
-     * @return $this
-     */
+    /** @inheritDoc */
     public function setAttribute(string $key, $value)
     {
         // Do not include the options in the list of attributes
diff --git a/src/Element/Number.php b/src/Element/Number.php
index 464628e15..c63722c81 100644
--- a/src/Element/Number.php
+++ b/src/Element/Number.php
@@ -15,11 +15,7 @@
 
 class Number extends Element implements InputProviderInterface
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'number',
     ];
diff --git a/src/Element/Password.php b/src/Element/Password.php
index f37adbb8e..94759f5b1 100644
--- a/src/Element/Password.php
+++ b/src/Element/Password.php
@@ -10,11 +10,7 @@
 
 class Password extends Element implements ElementPrepareAwareInterface
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'password',
     ];
diff --git a/src/Element/Radio.php b/src/Element/Radio.php
index 3efd82647..dbea92d46 100644
--- a/src/Element/Radio.php
+++ b/src/Element/Radio.php
@@ -9,11 +9,7 @@
 
 class Radio extends MultiCheckbox
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'radio',
     ];
diff --git a/src/Element/Range.php b/src/Element/Range.php
index 983819b00..9c53a468e 100644
--- a/src/Element/Range.php
+++ b/src/Element/Range.php
@@ -13,11 +13,7 @@
 
 class Range extends NumberElement
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'range',
     ];
diff --git a/src/Element/Search.php b/src/Element/Search.php
index ad3878b9a..566a7abde 100644
--- a/src/Element/Search.php
+++ b/src/Element/Search.php
@@ -8,11 +8,7 @@
 
 class Search extends Element
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'search',
     ];
diff --git a/src/Element/Select.php b/src/Element/Select.php
index 899c8ea93..f429ba335 100644
--- a/src/Element/Select.php
+++ b/src/Element/Select.php
@@ -16,11 +16,7 @@
 
 class Select extends Element implements InputProviderInterface
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'select',
     ];
@@ -134,12 +130,7 @@ public function setOptions(iterable $options)
         return $this;
     }
 
-    /**
-     * Set a single element attribute
-     *
-     * @param  mixed  $value
-     * @return $this
-     */
+    /** @inheritDoc */
     public function setAttribute(string $key, $value)
     {
         // Do not include the options in the list of attributes
diff --git a/src/Element/Submit.php b/src/Element/Submit.php
index 00688b622..40d6fa778 100644
--- a/src/Element/Submit.php
+++ b/src/Element/Submit.php
@@ -8,11 +8,7 @@
 
 class Submit extends Element
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'submit',
     ];
diff --git a/src/Element/Tel.php b/src/Element/Tel.php
index 6ddf27d3e..856dcc5e0 100644
--- a/src/Element/Tel.php
+++ b/src/Element/Tel.php
@@ -13,11 +13,7 @@
 
 class Tel extends Element implements InputProviderInterface
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'tel',
     ];
diff --git a/src/Element/Text.php b/src/Element/Text.php
index 43b4df8fd..90b9fbc1b 100644
--- a/src/Element/Text.php
+++ b/src/Element/Text.php
@@ -8,11 +8,7 @@
 
 class Text extends Element
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'text',
     ];
diff --git a/src/Element/Textarea.php b/src/Element/Textarea.php
index 463c9890a..c5d8bf37f 100644
--- a/src/Element/Textarea.php
+++ b/src/Element/Textarea.php
@@ -8,11 +8,7 @@
 
 class Textarea extends Element
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'textarea',
     ];
diff --git a/src/Element/Time.php b/src/Element/Time.php
index 68cb02e7f..621e1dd50 100644
--- a/src/Element/Time.php
+++ b/src/Element/Time.php
@@ -12,11 +12,7 @@
 
 class Time extends AbstractDateTime
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'time',
     ];
diff --git a/src/Element/Url.php b/src/Element/Url.php
index f5572ac8e..02ad77818 100644
--- a/src/Element/Url.php
+++ b/src/Element/Url.php
@@ -12,11 +12,7 @@
 
 class Url extends Element implements InputProviderInterface
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'url',
     ];
diff --git a/src/Element/Week.php b/src/Element/Week.php
index 51fd02f7b..a0869c568 100644
--- a/src/Element/Week.php
+++ b/src/Element/Week.php
@@ -13,11 +13,7 @@
 
 class Week extends AbstractDateTime
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'type' => 'week',
     ];
diff --git a/src/ElementAttributeRemovalInterface.php b/src/ElementAttributeRemovalInterface.php
index 1ab68abc3..7eb577f17 100644
--- a/src/ElementAttributeRemovalInterface.php
+++ b/src/ElementAttributeRemovalInterface.php
@@ -16,6 +16,7 @@ public function removeAttribute(string $key);
     /**
      * Remove many attributes at once
      *
+     * @param list<string> $keys
      * @return $this
      */
     public function removeAttributes(array $keys);
diff --git a/src/ElementInterface.php b/src/ElementInterface.php
index c74359fdf..de3c4351c 100644
--- a/src/ElementInterface.php
+++ b/src/ElementInterface.php
@@ -52,6 +52,7 @@ public function getOption(string $option);
     /**
      * Set a single element attribute
      *
+     * @param scalar|null $value
      * @return $this
      */
     public function setAttribute(string $key, mixed $value);
@@ -59,7 +60,7 @@ public function setAttribute(string $key, mixed $value);
     /**
      * Retrieve a single element attribute
      *
-     * @return mixed
+     * @return scalar|null
      */
     public function getAttribute(string $key);
 
@@ -73,12 +74,15 @@ public function hasAttribute(string $key): bool;
      *
      * Implementation will decide if this will overwrite or merge.
      *
+     * @param iterable<string, scalar|null> $arrayOrTraversable
      * @return $this
      */
     public function setAttributes(iterable $arrayOrTraversable);
 
     /**
      * Retrieve all attributes at once
+     *
+     * @return array<string, scalar|null>
      */
     public function getAttributes(): array;
 
diff --git a/src/Form.php b/src/Form.php
index 5ac66374e..9fbfc1f5c 100644
--- a/src/Form.php
+++ b/src/Form.php
@@ -26,11 +26,7 @@
 
 class Form extends Fieldset implements FormInterface
 {
-    /**
-     * Seed attributes
-     *
-     * @var array
-     */
+    /** @var array<string, scalar|null>  */
     protected $attributes = [
         'method' => 'POST',
     ];
diff --git a/src/LabelAwareInterface.php b/src/LabelAwareInterface.php
index 8f15047d2..f59b9b54c 100644
--- a/src/LabelAwareInterface.php
+++ b/src/LabelAwareInterface.php
@@ -21,7 +21,7 @@ public function getLabel(): ?string;
     /**
      * Set the attributes to use with the label
      *
-     * @param  array $labelAttributes
+     * @param  array<string, mixed> $labelAttributes
      * @return $this
      */
     public function setLabelAttributes(array $labelAttributes);

From e80c32064180d81320450e4730e82a87b66d4a5b Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Fri, 17 Nov 2023 09:19:15 +0000
Subject: [PATCH 2/7] qa: Assert that the name attribute is either string or
 null

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 src/Element.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Element.php b/src/Element.php
index 1a8214b4c..9c698cdc5 100644
--- a/src/Element.php
+++ b/src/Element.php
@@ -9,6 +9,7 @@
 use Traversable;
 
 use function array_key_exists;
+use function assert;
 use function is_string;
 
 class Element implements
@@ -87,7 +88,10 @@ public function setName(string $name)
      */
     public function getName(): ?string
     {
-        return $this->getAttribute('name');
+        $name = $this->getAttribute('name');
+        assert(is_string($name) || $name === null);
+
+        return $name;
     }
 
     /**

From 3aec8412fec91c5adb5f0803acfdbacccdd03e0e Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Fri, 17 Nov 2023 10:23:00 +0000
Subject: [PATCH 3/7] qa: Fix psalm issues due to improved types for attributes
 and deprecate setting value options via attributes

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 psalm-baseline.xml                         | 130 +++------------------
 src/Element/AbstractDateTime.php           |  12 +-
 src/Element/DateSelect.php                 |   5 +-
 src/Element/DateTimeSelect.php             |  10 +-
 src/Element/MonthSelect.php                |   8 +-
 src/Element/MultiCheckbox.php              |  14 ++-
 src/Element/Select.php                     |  14 ++-
 src/View/Helper/AbstractHelper.php         |   2 +-
 src/View/Helper/FormButton.php             |   3 +-
 src/View/Helper/FormElement.php            |   9 +-
 src/View/Helper/FormInput.php              |   3 +-
 test/Element/EmailTest.php                 |   6 +-
 test/Element/MultiCheckboxTest.php         |  50 ++++++--
 test/Element/RadioTest.php                 |  10 +-
 test/Element/SelectTest.php                |  20 ++++
 test/View/Helper/FormButtonTest.php        |   4 +-
 test/View/Helper/FormColorTest.php         |   4 +-
 test/View/Helper/FormDateTest.php          |   4 +-
 test/View/Helper/FormDateTimeLocalTest.php |   4 +-
 test/View/Helper/FormDateTimeTest.php      |   4 +-
 test/View/Helper/FormElementTest.php       |  67 ++++++-----
 test/View/Helper/FormEmailTest.php         |   4 +-
 test/View/Helper/FormFileTest.php          |   4 +-
 test/View/Helper/FormHiddenTest.php        |   4 +-
 test/View/Helper/FormImageTest.php         |   4 +-
 test/View/Helper/FormInputTest.php         |   4 +-
 test/View/Helper/FormMonthTest.php         |   4 +-
 test/View/Helper/FormMultiCheckboxTest.php |   6 +-
 test/View/Helper/FormNumberTest.php        |   4 +-
 test/View/Helper/FormPasswordTest.php      |   2 +-
 test/View/Helper/FormRadioTest.php         |   2 +-
 test/View/Helper/FormRangeTest.php         |   4 +-
 test/View/Helper/FormResetTest.php         |   4 +-
 test/View/Helper/FormRowTest.php           |   2 +-
 test/View/Helper/FormSearchTest.php        |   4 +-
 test/View/Helper/FormSelectTest.php        |   8 +-
 test/View/Helper/FormSubmitTest.php        |   4 +-
 test/View/Helper/FormTelTest.php           |   4 +-
 test/View/Helper/FormTextTest.php          |   4 +-
 test/View/Helper/FormTextareaTest.php      |   2 +-
 test/View/Helper/FormTimeTest.php          |   4 +-
 test/View/Helper/FormUrlTest.php           |   4 +-
 test/View/Helper/FormWeekTest.php          |   4 +-
 43 files changed, 226 insertions(+), 243 deletions(-)

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 42eeaee16..0f0cf4388 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.13.0@a0a9c27630bcf8301ee78cb06741d2907d8c9fef">
+<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
   <file src="src/Annotation/AbstractBuilder.php">
     <InvalidArrayOffset>
       <code><![CDATA[$params['elementSpec']['spec']['type']]]></code>
@@ -552,9 +552,6 @@
       <code><![CDATA[$inputSpec['validators']]]></code>
       <code><![CDATA[$inputSpec['validators']]]></code>
     </PossiblyUndefinedArrayOffset>
-    <UndefinedInterfaceMethod>
-      <code>getValidator</code>
-    </UndefinedInterfaceMethod>
   </file>
   <file src="test/Element/MonthSelectTest.php">
     <PossiblyInvalidArrayAccess>
@@ -601,6 +598,14 @@
     </UndefinedMethod>
   </file>
   <file src="test/Element/MultiCheckboxTest.php">
+    <InvalidArgument>
+      <code><![CDATA[[
+            'options' => [
+                'a' => 'A',
+                'b' => 'B',
+            ],
+        ]]]></code>
+    </InvalidArgument>
     <PossiblyInvalidArrayAccess>
       <code><![CDATA[$inputSpec['validators'][0]]]></code>
       <code><![CDATA[$inputSpec['validators'][0]]]></code>
@@ -689,6 +694,12 @@
     </UndefinedInterfaceMethod>
   </file>
   <file src="test/Element/SelectTest.php">
+    <InvalidArgument>
+      <code><![CDATA[[
+            'multiple' => true,
+            'options'  => $valueOptions,
+        ]]]></code>
+    </InvalidArgument>
     <PossiblyInvalidArrayAccess>
       <code><![CDATA[$inputSpec['validators'][0]]]></code>
       <code><![CDATA[$inputSpec['validators'][0]]]></code>
@@ -1101,9 +1112,6 @@
     <InvalidArgument>
       <code>$element</code>
     </InvalidArgument>
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
   </file>
   <file src="test/View/Helper/FormCaptchaTest.php">
     <PossiblyFalseArgument>
@@ -1120,28 +1128,10 @@
       <code>setView</code>
     </DeprecatedMethod>
   </file>
-  <file src="test/View/Helper/FormColorTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
-  <file src="test/View/Helper/FormDateTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
-  <file src="test/View/Helper/FormDateTimeLocalTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
   <file src="test/View/Helper/FormDateTimeTest.php">
     <DeprecatedClass>
       <code>new FormDateTimeHelper()</code>
     </DeprecatedClass>
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
   </file>
   <file src="test/View/Helper/FormElementTest.php">
     <PossiblyInvalidMethodCall>
@@ -1154,104 +1144,14 @@
       <code>getHash</code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="test/View/Helper/FormEmailTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
-  <file src="test/View/Helper/FormFileTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
-  <file src="test/View/Helper/FormHiddenTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
-  <file src="test/View/Helper/FormImageTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
-  <file src="test/View/Helper/FormInputTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
   <file src="test/View/Helper/FormLabelTest.php">
     <InvalidArgument>
       <code>$element</code>
     </InvalidArgument>
   </file>
-  <file src="test/View/Helper/FormMonthTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
-  <file src="test/View/Helper/FormNumberTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
-  <file src="test/View/Helper/FormPasswordTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
-  <file src="test/View/Helper/FormRangeTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
-  <file src="test/View/Helper/FormResetTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
   <file src="test/View/Helper/FormRowTest.php">
     <PossiblyInvalidFunctionCall>
       <code>$escapeHelper($label)</code>
     </PossiblyInvalidFunctionCall>
   </file>
-  <file src="test/View/Helper/FormSearchTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
-  <file src="test/View/Helper/FormSubmitTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
-  <file src="test/View/Helper/FormTelTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
-  <file src="test/View/Helper/FormTextTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
-  <file src="test/View/Helper/FormTextareaTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
-  <file src="test/View/Helper/FormTimeTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
-  <file src="test/View/Helper/FormUrlTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
-  <file src="test/View/Helper/FormWeekTest.php">
-    <PossiblyNullArgument>
-      <code><![CDATA[$element->getAttribute($attribute)]]></code>
-    </PossiblyNullArgument>
-  </file>
 </files>
diff --git a/src/Element/AbstractDateTime.php b/src/Element/AbstractDateTime.php
index b83394801..ea959e00e 100644
--- a/src/Element/AbstractDateTime.php
+++ b/src/Element/AbstractDateTime.php
@@ -106,7 +106,7 @@ protected function getValidators(): array
 
         if (
             isset($this->attributes['min'])
-            && $this->valueIsValidDateTimeFormat($this->attributes['min'])
+            && $this->valueIsValidDateTimeFormat((string) $this->attributes['min'])
         ) {
             $validators[] = new GreaterThanValidator([
                 'min'       => $this->attributes['min'],
@@ -114,19 +114,19 @@ protected function getValidators(): array
             ]);
         } elseif (
             isset($this->attributes['min'])
-            && ! $this->valueIsValidDateTimeFormat($this->attributes['min'])
+            && ! $this->valueIsValidDateTimeFormat((string) $this->attributes['min'])
         ) {
             throw new InvalidArgumentException(sprintf(
                 '%1$s expects "min" to conform to %2$s; received "%3$s"',
                 __METHOD__,
                 $this->format,
-                $this->attributes['min']
+                (string) $this->attributes['min']
             ));
         }
 
         if (
             isset($this->attributes['max'])
-            && $this->valueIsValidDateTimeFormat($this->attributes['max'])
+            && $this->valueIsValidDateTimeFormat((string) $this->attributes['max'])
         ) {
             $validators[] = new LessThanValidator([
                 'max'       => $this->attributes['max'],
@@ -134,13 +134,13 @@ protected function getValidators(): array
             ]);
         } elseif (
             isset($this->attributes['max'])
-            && ! $this->valueIsValidDateTimeFormat($this->attributes['max'])
+            && ! $this->valueIsValidDateTimeFormat((string) $this->attributes['max'])
         ) {
             throw new InvalidArgumentException(sprintf(
                 '%1$s expects "max" to conform to %2$s; received "%3$s"',
                 __METHOD__,
                 $this->format,
-                $this->attributes['max']
+                (string) $this->attributes['max']
             ));
         }
         if (
diff --git a/src/Element/DateSelect.php b/src/Element/DateSelect.php
index 5712b2e93..8d3d3ca6b 100644
--- a/src/Element/DateSelect.php
+++ b/src/Element/DateSelect.php
@@ -64,7 +64,7 @@ public function getDayElement(): Select
     /**
      * Get both the year and month elements
      *
-     * @return array
+     * @return list<Select>
      */
     public function getElements(): array
     {
@@ -74,6 +74,7 @@ public function getElements(): array
     /**
      * Set the day attributes
      *
+     * @param array<string, scalar|null> $dayAttributes
      * @return $this
      */
     public function setDayAttributes(array $dayAttributes)
@@ -85,7 +86,7 @@ public function setDayAttributes(array $dayAttributes)
     /**
      * Get the day attributes
      *
-     * @return array
+     * @return array<string, scalar|null>
      */
     public function getDayAttributes(): array
     {
diff --git a/src/Element/DateTimeSelect.php b/src/Element/DateTimeSelect.php
index 82b2dd123..6d082a659 100644
--- a/src/Element/DateTimeSelect.php
+++ b/src/Element/DateTimeSelect.php
@@ -112,6 +112,7 @@ public function getSecondElement(): Select
         return $this->secondElement;
     }
 
+    /** @return list<Select> */
     public function getElements(): array
     {
         return array_merge(parent::getElements(), [
@@ -124,6 +125,7 @@ public function getElements(): array
     /**
      * Set the hour attributes
      *
+     * @param array<string, scalar|null> $hourAttributes
      * @return $this
      */
     public function setHourAttributes(array $hourAttributes)
@@ -135,7 +137,7 @@ public function setHourAttributes(array $hourAttributes)
     /**
      * Get the hour attributes
      *
-     * @return array
+     * @return array<string, scalar|null>
      */
     public function getHourAttributes(): array
     {
@@ -145,6 +147,7 @@ public function getHourAttributes(): array
     /**
      * Set the minute attributes
      *
+     * @param array<string, scalar|null> $minuteAttributes
      * @return $this
      */
     public function setMinuteAttributes(array $minuteAttributes)
@@ -156,7 +159,7 @@ public function setMinuteAttributes(array $minuteAttributes)
     /**
      * Get the minute attributes
      *
-     * @return array
+     * @return array<string, scalar|null>
      */
     public function getMinuteAttributes(): array
     {
@@ -166,6 +169,7 @@ public function getMinuteAttributes(): array
     /**
      * Set the second attributes
      *
+     * @param array<string, scalar|null> $secondAttributes
      * @return $this
      */
     public function setSecondAttributes(array $secondAttributes)
@@ -177,7 +181,7 @@ public function setSecondAttributes(array $secondAttributes)
     /**
      * Get the second attributes
      *
-     * @return array
+     * @return array<string, scalar|null>
      */
     public function getSecondAttributes(): array
     {
diff --git a/src/Element/MonthSelect.php b/src/Element/MonthSelect.php
index 46027f94d..4e66cb45a 100644
--- a/src/Element/MonthSelect.php
+++ b/src/Element/MonthSelect.php
@@ -142,7 +142,7 @@ public function getYearElement(): Select
     /**
      * Get both the year and month elements
      *
-     * @return array
+     * @return list<Select>
      */
     public function getElements(): array
     {
@@ -152,6 +152,7 @@ public function getElements(): array
     /**
      * Set the month attributes
      *
+     * @param array<string, scalar|null> $monthAttributes
      * @return $this
      */
     public function setMonthAttributes(array $monthAttributes)
@@ -163,7 +164,7 @@ public function setMonthAttributes(array $monthAttributes)
     /**
      * Get the month attributes
      *
-     * @return array
+     * @return array<string, scalar|null>
      */
     public function getMonthAttributes(): array
     {
@@ -173,6 +174,7 @@ public function getMonthAttributes(): array
     /**
      * Set the year attributes
      *
+     * @param array<string, scalar|null> $yearAttributes
      * @return $this
      */
     public function setYearAttributes(array $yearAttributes)
@@ -184,7 +186,7 @@ public function setYearAttributes(array $yearAttributes)
     /**
      * Get the year attributes
      *
-     * @return array
+     * @return array<string, scalar|null>
      */
     public function getYearAttributes(): array
     {
diff --git a/src/Element/MultiCheckbox.php b/src/Element/MultiCheckbox.php
index 4d34d1d37..ecd7d1147 100644
--- a/src/Element/MultiCheckbox.php
+++ b/src/Element/MultiCheckbox.php
@@ -11,6 +11,10 @@
 
 use function assert;
 use function is_array;
+use function is_iterable;
+use function trigger_error;
+
+use const E_USER_DEPRECATED;
 
 class MultiCheckbox extends Checkbox
 {
@@ -98,9 +102,13 @@ public function setOptions(iterable $options)
     /** @inheritDoc */
     public function setAttribute(string $key, $value)
     {
-        // Do not include the options in the list of attributes
-        // TODO: Deprecate this
-        if ($key === 'options') {
+        /** @psalm-suppress DocblockTypeContradiction */
+        if ($key === 'options' && is_iterable($value)) {
+            trigger_error(
+                'Providing multi-checkbox value options via attributes is deprecated and will be removed in '
+                . 'version 4.0 of this library',
+                E_USER_DEPRECATED,
+            );
             $this->setValueOptions($value);
             return $this;
         }
diff --git a/src/Element/Select.php b/src/Element/Select.php
index f429ba335..15ba41076 100644
--- a/src/Element/Select.php
+++ b/src/Element/Select.php
@@ -13,6 +13,10 @@
 
 use function array_key_exists;
 use function is_array;
+use function is_iterable;
+use function trigger_error;
+
+use const E_USER_DEPRECATED;
 
 class Select extends Element implements InputProviderInterface
 {
@@ -133,9 +137,13 @@ public function setOptions(iterable $options)
     /** @inheritDoc */
     public function setAttribute(string $key, $value)
     {
-        // Do not include the options in the list of attributes
-        // TODO: Deprecate this
-        if ($key === 'options') {
+        /** @psalm-suppress DocblockTypeContradiction */
+        if ($key === 'options' && is_iterable($value)) {
+            trigger_error(
+                'Providing multi-select value options via attributes is deprecated and will be removed in '
+                . 'version 4.0 of this library',
+                E_USER_DEPRECATED,
+            );
             $this->setValueOptions($value);
             return $this;
         }
diff --git a/src/View/Helper/AbstractHelper.php b/src/View/Helper/AbstractHelper.php
index 9b242bfaf..fd076478d 100644
--- a/src/View/Helper/AbstractHelper.php
+++ b/src/View/Helper/AbstractHelper.php
@@ -293,7 +293,7 @@ public function getId(ElementInterface $element): ?string
     {
         $id = $element->getAttribute('id');
         if (null !== $id) {
-            return $id;
+            return (string) $id;
         }
 
         return $element->getName();
diff --git a/src/View/Helper/FormButton.php b/src/View/Helper/FormButton.php
index e2997200c..c5585fe7d 100644
--- a/src/View/Helper/FormButton.php
+++ b/src/View/Helper/FormButton.php
@@ -11,6 +11,7 @@
 use function gettype;
 use function is_array;
 use function is_object;
+use function is_string;
 use function sprintf;
 use function strtolower;
 
@@ -163,7 +164,7 @@ public function closeTag(): string
     protected function getType(ElementInterface $element): string
     {
         $type = $element->getAttribute('type');
-        if (empty($type)) {
+        if (! is_string($type) || $type === '') {
             return 'submit';
         }
 
diff --git a/src/View/Helper/FormElement.php b/src/View/Helper/FormElement.php
index 9c3412f69..bbcb8e1a6 100644
--- a/src/View/Helper/FormElement.php
+++ b/src/View/Helper/FormElement.php
@@ -20,7 +20,7 @@ class FormElement extends BaseAbstractHelper
     /**
      * Instance map to view helper
      *
-     * @var array
+     * @var array<class-string, string>
      */
     protected $classMap = [
         Element\Button::class         => 'formbutton',
@@ -35,7 +35,7 @@ class FormElement extends BaseAbstractHelper
     /**
      * Type map to view helper
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $typeMap = [
         'checkbox'       => 'formcheckbox',
@@ -147,6 +147,7 @@ public function addType(string $type, string $plugin)
     /**
      * Add instance class to plugin map
      *
+     * @param class-string $class
      * @return $this
      */
     public function addClass(string $class, string $plugin)
@@ -189,8 +190,8 @@ protected function renderType(ElementInterface $element): ?string
     {
         $type = $element->getAttribute('type');
 
-        if (isset($this->typeMap[$type])) {
-            return $this->renderHelper($this->typeMap[$type], $element);
+        if (isset($this->typeMap[(string) $type])) {
+            return $this->renderHelper($this->typeMap[(string) $type], $element);
         }
 
         return null;
diff --git a/src/View/Helper/FormInput.php b/src/View/Helper/FormInput.php
index 22fc68167..5e93888f9 100644
--- a/src/View/Helper/FormInput.php
+++ b/src/View/Helper/FormInput.php
@@ -7,6 +7,7 @@
 use Laminas\Form\ElementInterface;
 use Laminas\Form\Exception;
 
+use function is_string;
 use function sprintf;
 use function strtolower;
 
@@ -138,7 +139,7 @@ public function render(ElementInterface $element): string
     protected function getType(ElementInterface $element): string
     {
         $type = $element->getAttribute('type');
-        if (empty($type)) {
+        if (! is_string($type) || $type === '') {
             return 'text';
         }
 
diff --git a/test/Element/EmailTest.php b/test/Element/EmailTest.php
index 836cf01de..a3b1d41ce 100644
--- a/test/Element/EmailTest.php
+++ b/test/Element/EmailTest.php
@@ -7,6 +7,7 @@
 use Laminas\Form\Element\Email as EmailElement;
 use Laminas\Validator\Explode;
 use Laminas\Validator\Regex;
+use Laminas\Validator\ValidatorInterface;
 use PHPUnit\Framework\TestCase;
 
 final class EmailTest extends TestCase
@@ -28,6 +29,7 @@ public function testProvidesInputSpecificationThatIncludesDefaultValidators(): v
         }
     }
 
+    /** @return list<array{0: array<string, scalar>, 1: list<class-string<ValidatorInterface>>}> */
     public static function emailAttributesDataProvider(): array
     {
         return [
@@ -39,6 +41,8 @@ public static function emailAttributesDataProvider(): array
 
     /**
      * @dataProvider emailAttributesDataProvider
+     * @param array<string, scalar> $attributes
+     * @param list<class-string<ValidatorInterface>> $expectedValidators
      */
     public function testProvidesInputSpecificationBasedOnAttributes(array $attributes, array $expectedValidators): void
     {
@@ -47,7 +51,7 @@ public function testProvidesInputSpecificationBasedOnAttributes(array $attribute
 
         $inputSpec = $element->getInputSpecification();
         self::assertArrayHasKey('validators', $inputSpec);
-        self::assertIsArray($inputSpec['validators']);
+        self::assertIsArray($inputSpec['validators'] ?? null);
 
         foreach ($inputSpec['validators'] as $i => $validator) {
             $class = $validator::class;
diff --git a/test/Element/MultiCheckboxTest.php b/test/Element/MultiCheckboxTest.php
index 1843d8293..275be0141 100644
--- a/test/Element/MultiCheckboxTest.php
+++ b/test/Element/MultiCheckboxTest.php
@@ -10,6 +10,10 @@
 use PHPUnit\Framework\TestCase;
 
 use function count;
+use function restore_error_handler;
+use function set_error_handler;
+
+use const E_USER_DEPRECATED;
 
 final class MultiCheckboxTest extends TestCase
 {
@@ -24,13 +28,10 @@ public static function useHiddenAttributeDataProvider(): array
     public function testProvidesInputSpecificationThatIncludesValidatorsBasedOnAttributes(bool $useHiddenElement): void
     {
         $element = new MultiCheckboxElement();
-        $options = [
+        $element->setValueOptions([
             '1' => 'Option 1',
             '2' => 'Option 2',
             '3' => 'Option 3',
-        ];
-        $element->setAttributes([
-            'options' => $options,
         ]);
         $element->setUseHiddenElement($useHiddenElement);
 
@@ -81,9 +82,7 @@ public static function multiCheckboxOptionsDataProvider(): array
     public function testInArrayValidationOfOptions(array $valueTests, array $options): void
     {
         $element = new MultiCheckboxElement('my-checkbox');
-        $element->setAttributes([
-            'options' => $options,
-        ]);
+        $element->setValueOptions($options);
         $inputSpec = $element->getInputSpecification();
         self::assertArrayHasKey('validators', $inputSpec);
         $explodeValidator = $inputSpec['validators'][0];
@@ -97,15 +96,13 @@ public function testInArrayValidationOfOptions(array $valueTests, array $options
      *
      * @dataProvider multiCheckboxOptionsDataProvider
      */
-    public function testInArrayValidatorHaystakIsUpdated(array $valueTests, array $options): void
+    public function testInArrayValidatorHaystackIsUpdated(array $valueTests, array $options): void
     {
         $element          = new MultiCheckboxElement('my-checkbox');
         $inputSpec        = $element->getInputSpecification();
         $inArrayValidator = $inputSpec['validators'][0]->getValidator();
 
-        $element->setAttributes([
-            'options' => $options,
-        ]);
+        $element->setValueOptions($options);
         $haystack = $inArrayValidator->getHaystack();
         self::assertCount(count($options), $haystack);
     }
@@ -186,4 +183,35 @@ public function testOptionValueinSelectedOptions(): void
         $element->setValue($selectedOptions);
         self::assertContains($optionValue, $element->getValue());
     }
+
+    /** @deprecated */
+    public function testDeprecatedValueOptionsAsAttribute(): void
+    {
+        $trigger = false;
+        set_error_handler(function (int $code, string $message) use (&$trigger): bool {
+            self::assertStringContainsString(
+                'Providing multi-checkbox value options via attributes is deprecated',
+                $message
+            );
+
+            $trigger = true;
+            return true;
+        }, E_USER_DEPRECATED);
+
+        $element = new MultiCheckboxElement();
+        $element->setAttributes([
+            'options' => [
+                'a' => 'A',
+                'b' => 'B',
+            ],
+        ]);
+
+        restore_error_handler();
+
+        self::assertSame([
+            'a' => 'A',
+            'b' => 'B',
+        ], $element->getValueOptions());
+        self::assertTrue($trigger);
+    }
 }
diff --git a/test/Element/RadioTest.php b/test/Element/RadioTest.php
index c1b4808c3..8e2ae9a46 100644
--- a/test/Element/RadioTest.php
+++ b/test/Element/RadioTest.php
@@ -21,13 +21,10 @@ public static function useHiddenAttributeDataProvider(): array
     public function testProvidesInputSpecificationThatIncludesValidatorsBasedOnAttributes(bool $useHiddenElement): void
     {
         $element = new RadioElement();
-        $options = [
+        $element->setValueOptions([
             '1' => 'Option 1',
             '2' => 'Option 2',
             '3' => 'Option 3',
-        ];
-        $element->setAttributes([
-            'options' => $options,
         ]);
         $element->setUseHiddenElement($useHiddenElement);
 
@@ -44,6 +41,7 @@ public function testProvidesInputSpecificationThatIncludesValidatorsBasedOnAttri
         }
     }
 
+    /** @return list<array{0: list<mixed>, 1: array<array-key, mixed>}> */
     public static function radioOptionsDataProvider(): array
     {
         return [
@@ -70,9 +68,7 @@ public static function radioOptionsDataProvider(): array
     public function testInArrayValidationOfOptions(array $valueTests, array $options): void
     {
         $element = new RadioElement('my-radio');
-        $element->setAttributes([
-            'options' => $options,
-        ]);
+        $element->setValueOptions($options);
         $inputSpec = $element->getInputSpecification();
         self::assertArrayHasKey('validators', $inputSpec);
         $inArrayValidator = $inputSpec['validators'][0];
diff --git a/test/Element/SelectTest.php b/test/Element/SelectTest.php
index 55d2e65f3..fbe11464a 100644
--- a/test/Element/SelectTest.php
+++ b/test/Element/SelectTest.php
@@ -11,6 +11,10 @@
 use PHPUnit\Framework\TestCase;
 
 use function count;
+use function restore_error_handler;
+use function set_error_handler;
+
+use const E_USER_DEPRECATED;
 
 final class SelectTest extends TestCase
 {
@@ -173,8 +177,20 @@ public function testOptionsHasArrayOnConstruct(): void
         self::assertIsArray($element->getValueOptions());
     }
 
+    /** @deprecated */
     public function testDeprecateOptionsInAttributes(): void
     {
+        $trigger = false;
+        set_error_handler(function (int $code, string $message) use (&$trigger): bool {
+            self::assertStringContainsString(
+                'Providing multi-select value options via attributes is deprecated',
+                $message
+            );
+
+            $trigger = true;
+            return true;
+        }, E_USER_DEPRECATED);
+
         $element      = new SelectElement();
         $valueOptions = [
             'Option 1' => 'option1',
@@ -185,7 +201,11 @@ public function testDeprecateOptionsInAttributes(): void
             'multiple' => true,
             'options'  => $valueOptions,
         ]);
+
+        restore_error_handler();
+
         self::assertEquals($valueOptions, $element->getValueOptions());
+        self::assertTrue($trigger);
     }
 
     public function testSetOptionsArray(): void
diff --git a/test/View/Helper/FormButtonTest.php b/test/View/Helper/FormButtonTest.php
index a0aba46d3..1e97a9dd3 100644
--- a/test/View/Helper/FormButtonTest.php
+++ b/test/View/Helper/FormButtonTest.php
@@ -200,8 +200,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
         $element->setLabel('{button_content}');
         $markup = $this->helper->render($element);
         $expect = match ($attribute) {
-            'value' => sprintf('%s="%s"', $attribute, $element->getValue()),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf('%s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormColorTest.php b/test/View/Helper/FormColorTest.php
index 428df8c3e..4f847aa19 100644
--- a/test/View/Helper/FormColorTest.php
+++ b/test/View/Helper/FormColorTest.php
@@ -129,8 +129,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
-            'value' => sprintf('%s="%s"', $attribute, $element->getValue()),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf('%s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormDateTest.php b/test/View/Helper/FormDateTest.php
index dc6bc9e10..bb7f82661 100644
--- a/test/View/Helper/FormDateTest.php
+++ b/test/View/Helper/FormDateTest.php
@@ -131,8 +131,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(stri
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
-            'value' => sprintf('%s="%s"', $attribute, $element->getValue()),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf('%s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormDateTimeLocalTest.php b/test/View/Helper/FormDateTimeLocalTest.php
index f34647412..df7147611 100644
--- a/test/View/Helper/FormDateTimeLocalTest.php
+++ b/test/View/Helper/FormDateTimeLocalTest.php
@@ -129,8 +129,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
-            'value' => sprintf('%s="%s"', $attribute, $element->getValue()),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf('%s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormDateTimeTest.php b/test/View/Helper/FormDateTimeTest.php
index c04263c5c..bd7ee3070 100644
--- a/test/View/Helper/FormDateTimeTest.php
+++ b/test/View/Helper/FormDateTimeTest.php
@@ -129,8 +129,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
-            'value' => sprintf('%s="%s"', $attribute, $element->getValue()),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf('%s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormElementTest.php b/test/View/Helper/FormElementTest.php
index bb2be49e4..3e958c048 100644
--- a/test/View/Helper/FormElementTest.php
+++ b/test/View/Helper/FormElementTest.php
@@ -39,32 +39,33 @@ protected function setUp(): void
         $this->helper->setView($this->renderer);
     }
 
+    /** @return array<string, array{0: string}> */
     public static function getInputElements(): array
     {
         return [
-            ['text'],
-            ['password'],
-            ['checkbox'],
-            ['radio'],
-            ['submit'],
-            ['reset'],
-            ['file'],
-            ['hidden'],
-            ['image'],
-            ['button'],
-            ['number'],
-            ['range'],
-            ['date'],
-            ['color'],
-            ['search'],
-            ['tel'],
-            ['email'],
-            ['url'],
-            ['datetime'],
-            ['datetime-local'],
-            ['month'],
-            ['week'],
-            ['time'],
+            'text'           => ['text'],
+            'password'       => ['password'],
+            'checkbox'       => ['checkbox'],
+            'radio'          => ['radio'],
+            'submit'         => ['submit'],
+            'reset'          => ['reset'],
+            'file'           => ['file'],
+            'hidden'         => ['hidden'],
+            'image'          => ['image'],
+            'button'         => ['button'],
+            'number'         => ['number'],
+            'range'          => ['range'],
+            'date'           => ['date'],
+            'color'          => ['color'],
+            'search'         => ['search'],
+            'tel'            => ['tel'],
+            'email'          => ['email'],
+            'url'            => ['url'],
+            'datetime'       => ['datetime'],
+            'datetime-local' => ['datetime-local'],
+            'month'          => ['month'],
+            'week'           => ['week'],
+            'time'           => ['time'],
         ];
     }
 
@@ -73,19 +74,27 @@ public static function getInputElements(): array
      */
     public function testRendersExpectedInputElement(string $type): void
     {
+        $element = new Element('foo');
+
         if ($type === 'radio') {
             $element = new Element\Radio('foo');
-        } elseif ($type === 'checkbox') {
+            $element->setValueOptions(['option' => 'value']);
+        }
+
+        if ($type === 'checkbox') {
             $element = new Element\Checkbox('foo');
-        } elseif ($type === 'select') {
+        }
+
+        if ($type === 'select') {
             $element = new Element\Select('foo');
-        } else {
-            $element = new Element('foo');
+            $element->setValueOptions(['option' => 'value']);
+        }
+
+        if ($type === 'image') {
+            $element->setAttribute('src', '/some-image.png');
         }
 
         $element->setAttribute('type', $type);
-        $element->setAttribute('options', ['option' => 'value']);
-        $element->setAttribute('src', 'http://zend.com/img.png');
         $markup = $this->helper->render($element);
 
         self::assertStringContainsString('<input', $markup);
diff --git a/test/View/Helper/FormEmailTest.php b/test/View/Helper/FormEmailTest.php
index d624595ad..e65fff209 100644
--- a/test/View/Helper/FormEmailTest.php
+++ b/test/View/Helper/FormEmailTest.php
@@ -131,8 +131,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
-            'value' => sprintf('%s="%s"', $attribute, $element->getValue()),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf('%s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormFileTest.php b/test/View/Helper/FormFileTest.php
index d473ca7bb..a909723eb 100644
--- a/test/View/Helper/FormFileTest.php
+++ b/test/View/Helper/FormFileTest.php
@@ -162,8 +162,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
-            'value' => sprintf('%s="%s"', $attribute, $element->getValue()),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf('%s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormHiddenTest.php b/test/View/Helper/FormHiddenTest.php
index 41325e622..6775c70e8 100644
--- a/test/View/Helper/FormHiddenTest.php
+++ b/test/View/Helper/FormHiddenTest.php
@@ -129,8 +129,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
-            'value' => sprintf('%s="%s"', $attribute, $element->getValue()),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf('%s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormImageTest.php b/test/View/Helper/FormImageTest.php
index 7d9a43e4c..e86d9ee58 100644
--- a/test/View/Helper/FormImageTest.php
+++ b/test/View/Helper/FormImageTest.php
@@ -142,8 +142,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
-            'value' => sprintf('%s="%s"', $attribute, $element->getValue()),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf('%s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormInputTest.php b/test/View/Helper/FormInputTest.php
index 0725afe9b..896dea5e4 100644
--- a/test/View/Helper/FormInputTest.php
+++ b/test/View/Helper/FormInputTest.php
@@ -320,8 +320,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(stri
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
-            'value' => sprintf(' %s="%s"', $attribute, $element->getValue()),
-            default => sprintf(' %s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf(' %s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf(' %s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormMonthTest.php b/test/View/Helper/FormMonthTest.php
index fe9d86183..2a1da3da9 100644
--- a/test/View/Helper/FormMonthTest.php
+++ b/test/View/Helper/FormMonthTest.php
@@ -129,8 +129,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
-            'value' => sprintf('%s="%s"', $attribute, $element->getValue()),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf('%s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormMultiCheckboxTest.php b/test/View/Helper/FormMultiCheckboxTest.php
index 88ba7420c..4aefbc170 100644
--- a/test/View/Helper/FormMultiCheckboxTest.php
+++ b/test/View/Helper/FormMultiCheckboxTest.php
@@ -128,7 +128,7 @@ public function testGenerateCheckBoxesAndHiddenElement(): void
     public function testUsesElementValueToDetermineCheckboxStatus(): void
     {
         $element = $this->getElement();
-        $element->setAttribute('value', ['value1', 'value3']);
+        $element->setValue(['value1', 'value3']);
         $markup = $this->helper->render($element);
 
         self::assertMatchesRegularExpression('#value="value1"\s+checked="checked"#', $markup);
@@ -216,14 +216,14 @@ public function testEnsureUseHiddenElementMethodExists(): void
         $element->setName('codeType');
         $element->setOptions(['label' => 'Code Type']);
         $element->setAttributes([
-            'type'  => 'radio',
-            'value' => ['markdown'],
+            'type' => 'radio',
         ]);
         $element->setValueOptions([
             'Markdown' => 'markdown',
             'HTML'     => 'html',
             'Wiki'     => 'wiki',
         ]);
+        $element->setValue(['markdown']);
 
         $markup = $this->helper->render($element);
         self::assertStringNotContainsString('type="hidden"', $markup);
diff --git a/test/View/Helper/FormNumberTest.php b/test/View/Helper/FormNumberTest.php
index 5798b6f73..b51e71561 100644
--- a/test/View/Helper/FormNumberTest.php
+++ b/test/View/Helper/FormNumberTest.php
@@ -129,8 +129,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
-            'value' => sprintf('%s="%s"', $attribute, $element->getValue()),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf('%s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormPasswordTest.php b/test/View/Helper/FormPasswordTest.php
index 6fdfd3c80..4e3bf0578 100644
--- a/test/View/Helper/FormPasswordTest.php
+++ b/test/View/Helper/FormPasswordTest.php
@@ -132,7 +132,7 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
             'value' => sprintf('%s=""', $attribute),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormRadioTest.php b/test/View/Helper/FormRadioTest.php
index 416ea9660..1713b51b5 100644
--- a/test/View/Helper/FormRadioTest.php
+++ b/test/View/Helper/FormRadioTest.php
@@ -125,7 +125,7 @@ public function testGenerateRadioOptionsAndHiddenElement(): void
     public function testUsesElementValueToDetermineRadioStatus(): void
     {
         $element = $this->getElement();
-        $element->setAttribute('value', ['value1', 'value3']);
+        $element->setValue(['value1', 'value3']);
         $markup = $this->helper->render($element);
 
         self::assertMatchesRegularExpression('#value="value1"\s+checked="checked"#', $markup);
diff --git a/test/View/Helper/FormRangeTest.php b/test/View/Helper/FormRangeTest.php
index 840d90b88..6465278e1 100644
--- a/test/View/Helper/FormRangeTest.php
+++ b/test/View/Helper/FormRangeTest.php
@@ -129,8 +129,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
-            'value' => sprintf('%s="%s"', $attribute, $element->getValue()),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf('%s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormResetTest.php b/test/View/Helper/FormResetTest.php
index 02d393d1b..605a932eb 100644
--- a/test/View/Helper/FormResetTest.php
+++ b/test/View/Helper/FormResetTest.php
@@ -131,8 +131,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
-            'value' => sprintf('%s="%s"', $attribute, $element->getValue()),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf('%s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormRowTest.php b/test/View/Helper/FormRowTest.php
index d4b0260dc..98b3dabd2 100644
--- a/test/View/Helper/FormRowTest.php
+++ b/test/View/Helper/FormRowTest.php
@@ -121,7 +121,7 @@ public function testCanHandleMultiCheckboxesCorrectly(): void
 
         $element = new Element\MultiCheckbox('foo');
         $element->setAttribute('type', 'multi_checkbox');
-        $element->setAttribute('options', $options);
+        $element->setValueOptions($options);
         $element->setLabel('This is a multi-checkbox');
         $markup = $this->helper->render($element);
         self::assertStringContainsString('<fieldset>', $markup);
diff --git a/test/View/Helper/FormSearchTest.php b/test/View/Helper/FormSearchTest.php
index 37ab20f59..f496ab720 100644
--- a/test/View/Helper/FormSearchTest.php
+++ b/test/View/Helper/FormSearchTest.php
@@ -131,8 +131,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
-            'value' => sprintf('%s="%s"', $attribute, $element->getValue()),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf('%s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormSelectTest.php b/test/View/Helper/FormSelectTest.php
index a5b2b796b..97f548ecb 100644
--- a/test/View/Helper/FormSelectTest.php
+++ b/test/View/Helper/FormSelectTest.php
@@ -85,18 +85,18 @@ public function testCanMarkSingleOptionAsSelected(): void
     public function testCanOnlyMarkSingleOptionAsSelectedIfMultipleAttributeIsDisabled(): void
     {
         $element = $this->getElement();
-        $element->setAttribute('value', ['value1', 'value2']);
+        $element->setValue(['value1', 'value2']);
 
         $this->expectException(DomainException::class);
         $this->expectExceptionMessage('multiple');
-        $markup = $this->helper->render($element);
+        $this->helper->render($element);
     }
 
     public function testCanMarkManyOptionsAsSelectedIfMultipleAttributeIsEnabled(): void
     {
         $element = $this->getElement();
         $element->setAttribute('multiple', true);
-        $element->setAttribute('value', ['value1', 'value2']);
+        $element->setValue(['value1', 'value2']);
         $markup = $this->helper->render($element);
 
         self::assertMatchesRegularExpression('#select .*?multiple="multiple"#', $markup);
@@ -192,7 +192,7 @@ public function testNameShouldHaveArrayNotationWhenMultipleIsSpecified(): void
     {
         $element = $this->getElement();
         $element->setAttribute('multiple', true);
-        $element->setAttribute('value', ['value1', 'value2']);
+        $element->setValue(['value1', 'value2']);
         $markup = $this->helper->render($element);
         self::assertMatchesRegularExpression('#<select[^>]*?(name="foo\&\#x5B\;\&\#x5D\;")#', $markup);
     }
diff --git a/test/View/Helper/FormSubmitTest.php b/test/View/Helper/FormSubmitTest.php
index 8962aee90..75857f38d 100644
--- a/test/View/Helper/FormSubmitTest.php
+++ b/test/View/Helper/FormSubmitTest.php
@@ -130,8 +130,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
-            'value' => sprintf('%s="%s"', $attribute, $element->getValue()),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf('%s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormTelTest.php b/test/View/Helper/FormTelTest.php
index 38c9f3a39..5ea2f871f 100644
--- a/test/View/Helper/FormTelTest.php
+++ b/test/View/Helper/FormTelTest.php
@@ -131,8 +131,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
-            'value' => sprintf('%s="%s"', $attribute, $element->getValue()),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf('%s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormTextTest.php b/test/View/Helper/FormTextTest.php
index 9d25aec79..5636ed199 100644
--- a/test/View/Helper/FormTextTest.php
+++ b/test/View/Helper/FormTextTest.php
@@ -133,8 +133,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
-            'value' => sprintf('%s="%s"', $attribute, $element->getValue()),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf('%s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormTextareaTest.php b/test/View/Helper/FormTextareaTest.php
index dca2e231d..dae9b7865 100644
--- a/test/View/Helper/FormTextareaTest.php
+++ b/test/View/Helper/FormTextareaTest.php
@@ -247,7 +247,7 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
     ): void {
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
-        $expect  = sprintf('%s="%s"', $attribute, $element->getAttribute($attribute));
+        $expect  = sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute));
         $this->$assertion($expect, $markup);
     }
 
diff --git a/test/View/Helper/FormTimeTest.php b/test/View/Helper/FormTimeTest.php
index a6b47031a..c8c9843b9 100644
--- a/test/View/Helper/FormTimeTest.php
+++ b/test/View/Helper/FormTimeTest.php
@@ -129,8 +129,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
-            'value' => sprintf('%s="%s"', $attribute, $element->getValue()),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf('%s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormUrlTest.php b/test/View/Helper/FormUrlTest.php
index 583d6d5c5..cc123202f 100644
--- a/test/View/Helper/FormUrlTest.php
+++ b/test/View/Helper/FormUrlTest.php
@@ -131,8 +131,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
-            'value' => sprintf('%s="%s"', $attribute, $element->getValue()),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf('%s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }
diff --git a/test/View/Helper/FormWeekTest.php b/test/View/Helper/FormWeekTest.php
index 97b26c51f..323f596e5 100644
--- a/test/View/Helper/FormWeekTest.php
+++ b/test/View/Helper/FormWeekTest.php
@@ -129,8 +129,8 @@ public function testAllValidFormMarkupAttributesPresentInElementAreRendered(
         $element = $this->getCompleteElement();
         $markup  = $this->helper->render($element);
         $expect  = match ($attribute) {
-            'value' => sprintf('%s="%s"', $attribute, $element->getValue()),
-            default => sprintf('%s="%s"', $attribute, $element->getAttribute($attribute)),
+            'value' => sprintf('%s="%s"', $attribute, (string) $element->getValue()),
+            default => sprintf('%s="%s"', $attribute, (string) $element->getAttribute($attribute)),
         };
         $this->$assertion($expect, $markup);
     }

From da4a9f0f8e17adaf20bfbd14d53c590f54768ab8 Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Fri, 17 Nov 2023 10:42:55 +0000
Subject: [PATCH 4/7] qa: Adjust factory test to correctly set value options

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 test/FactoryTest.php | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/test/FactoryTest.php b/test/FactoryTest.php
index e6f074b01..f3db58322 100644
--- a/test/FactoryTest.php
+++ b/test/FactoryTest.php
@@ -96,9 +96,9 @@ public function testCanCreateFieldsetsWithElements(): void
                         'name' => 'baz',
                     ],
                     'spec'  => [
-                        'attributes' => [
-                            'type'    => 'radio',
-                            'options' => [
+                        'type'    => Form\Element\Radio::class,
+                        'options' => [
+                            'value_options' => [
                                 'foo' => 'Foo Bar',
                                 'bar' => 'Bar Baz',
                             ],
@@ -130,11 +130,12 @@ public function testCanCreateFieldsetsWithElements(): void
         self::assertEquals('text', $element->getAttribute('type'));
 
         $element = $fieldset->get('baz');
+        self::assertInstanceOf(Form\Element\Radio::class, $element);
         self::assertEquals('radio', $element->getAttribute('type'));
         self::assertEquals([
             'foo' => 'Foo Bar',
             'bar' => 'Bar Baz',
-        ], $element->getAttribute('options'));
+        ], $element->getValueOptions());
 
         $element = $fieldset->get('bat');
         self::assertEquals('textarea', $element->getAttribute('type'));
@@ -173,9 +174,9 @@ public function testCanCreateNestedFieldsets(): void
                                     'name' => 'baz',
                                 ],
                                 'spec'  => [
-                                    'attributes' => [
-                                        'type'    => 'radio',
-                                        'options' => [
+                                    'type'    => Form\Element\Radio::class,
+                                    'options' => [
+                                        'value_options' => [
                                             'foo' => 'Foo Bar',
                                             'bar' => 'Bar Baz',
                                         ],
@@ -211,11 +212,12 @@ public function testCanCreateNestedFieldsets(): void
         self::assertEquals('text', $element->getAttribute('type'));
 
         $element = $fieldset->get('baz');
+        self::assertInstanceOf(Form\Element\Radio::class, $element);
         self::assertEquals('radio', $element->getAttribute('type'));
         self::assertEquals([
             'foo' => 'Foo Bar',
             'bar' => 'Bar Baz',
-        ], $element->getAttribute('options'));
+        ], $element->getValueOptions());
 
         $element = $fieldset->get('bat');
         self::assertEquals('textarea', $element->getAttribute('type'));
@@ -551,9 +553,9 @@ public function testCanCreateFormWithHydratorAndInputFilterAndElementsAndFieldse
                         'name' => 'baz',
                     ],
                     'spec'  => [
-                        'attributes' => [
-                            'type'    => 'radio',
-                            'options' => [
+                        'type'    => Form\Element\Radio::class,
+                        'options' => [
+                            'value_options' => [
                                 'foo' => 'Foo Bar',
                                 'bar' => 'Bar Baz',
                             ],
@@ -593,9 +595,9 @@ public function testCanCreateFormWithHydratorAndInputFilterAndElementsAndFieldse
                                     'name' => 'baz',
                                 ],
                                 'spec'  => [
-                                    'attributes' => [
-                                        'type'    => 'radio',
-                                        'options' => [
+                                    'type'    => Form\Element\Radio::class,
+                                    'options' => [
+                                        'value_options' => [
                                             'foo' => 'Foo Bar',
                                             'bar' => 'Bar Baz',
                                         ],
@@ -633,11 +635,12 @@ public function testCanCreateFormWithHydratorAndInputFilterAndElementsAndFieldse
         self::assertEquals('text', $element->getAttribute('type'));
 
         $element = $form->get('baz');
+        self::assertInstanceOf(Form\Element\Radio::class, $element);
         self::assertEquals('radio', $element->getAttribute('type'));
         self::assertEquals([
             'foo' => 'Foo Bar',
             'bar' => 'Bar Baz',
-        ], $element->getAttribute('options'));
+        ], $element->getValueOptions());
 
         $element = $form->get('bat');
         self::assertEquals('textarea', $element->getAttribute('type'));
@@ -663,11 +666,12 @@ public function testCanCreateFormWithHydratorAndInputFilterAndElementsAndFieldse
         self::assertEquals('text', $element->getAttribute('type'));
 
         $element = $fieldset->get('baz');
+        self::assertInstanceOf(Form\Element\Radio::class, $element);
         self::assertEquals('radio', $element->getAttribute('type'));
         self::assertEquals([
             'foo' => 'Foo Bar',
             'bar' => 'Bar Baz',
-        ], $element->getAttribute('options'));
+        ], $element->getValueOptions());
 
         $element = $fieldset->get('bat');
         self::assertEquals('textarea', $element->getAttribute('type'));

From f423936ab904f46788deba52e6af247199ec93ae Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Fri, 17 Nov 2023 10:49:24 +0000
Subject: [PATCH 5/7] qa: refine class-map types

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 src/View/Helper/FormElement.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/View/Helper/FormElement.php b/src/View/Helper/FormElement.php
index bbcb8e1a6..60ef1b13a 100644
--- a/src/View/Helper/FormElement.php
+++ b/src/View/Helper/FormElement.php
@@ -20,7 +20,7 @@ class FormElement extends BaseAbstractHelper
     /**
      * Instance map to view helper
      *
-     * @var array<class-string, string>
+     * @var array<class-string<ElementInterface>, string>
      */
     protected $classMap = [
         Element\Button::class         => 'formbutton',
@@ -147,7 +147,7 @@ public function addType(string $type, string $plugin)
     /**
      * Add instance class to plugin map
      *
-     * @param class-string $class
+     * @param class-string<ElementInterface> $class
      * @return $this
      */
     public function addClass(string $class, string $plugin)

From 452be6273cd8ce0c090d4a845c76d837a68b2b67 Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Fri, 17 Nov 2023 10:50:04 +0000
Subject: [PATCH 6/7] qa: Label attributes should be `array<string,
 scalar|null>`

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 src/Element.php             | 13 ++-----------
 src/LabelAwareInterface.php |  4 ++--
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/Element.php b/src/Element.php
index 9c698cdc5..9c3fc585a 100644
--- a/src/Element.php
+++ b/src/Element.php
@@ -293,23 +293,14 @@ public function getLabel(): ?string
         return $this->label;
     }
 
-    /**
-     * Set the attributes to use with the label
-     *
-     * @param array<string, mixed> $labelAttributes
-     * @return $this
-     */
+    /** @inheritDoc */
     public function setLabelAttributes(array $labelAttributes)
     {
         $this->labelAttributes = $labelAttributes;
         return $this;
     }
 
-    /**
-     * Get the attributes to use with the label
-     *
-     * @return array<string, mixed>
-     */
+    /** @inheritDoc */
     public function getLabelAttributes(): array
     {
         return $this->labelAttributes;
diff --git a/src/LabelAwareInterface.php b/src/LabelAwareInterface.php
index f59b9b54c..2ed41f442 100644
--- a/src/LabelAwareInterface.php
+++ b/src/LabelAwareInterface.php
@@ -21,7 +21,7 @@ public function getLabel(): ?string;
     /**
      * Set the attributes to use with the label
      *
-     * @param  array<string, mixed> $labelAttributes
+     * @param  array<string, scalar|null> $labelAttributes
      * @return $this
      */
     public function setLabelAttributes(array $labelAttributes);
@@ -29,7 +29,7 @@ public function setLabelAttributes(array $labelAttributes);
     /**
      * Get the attributes to use with the label
      *
-     * @return array
+     * @return array<string, scalar|null>
      */
     public function getLabelAttributes(): array;
 

From 835a72bd42a38f47b8c000595f14cccf907a18e9 Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Fri, 17 Nov 2023 10:50:34 +0000
Subject: [PATCH 7/7] qa: Prefer string check rather than cast

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 src/View/Helper/AbstractHelper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/View/Helper/AbstractHelper.php b/src/View/Helper/AbstractHelper.php
index fd076478d..736e467e2 100644
--- a/src/View/Helper/AbstractHelper.php
+++ b/src/View/Helper/AbstractHelper.php
@@ -292,8 +292,8 @@ public function createAttributesString(array $attributes): string
     public function getId(ElementInterface $element): ?string
     {
         $id = $element->getAttribute('id');
-        if (null !== $id) {
-            return (string) $id;
+        if (is_string($id) && $id !== '') {
+            return $id;
         }
 
         return $element->getName();