From 1de01f511cb5f72edb180a657f1211f4655d5a05 Mon Sep 17 00:00:00 2001
From: Gareth Trinkwon <gareth@studio24.net>
Date: Fri, 9 Jan 2026 16:05:07 +0000
Subject: [PATCH 1/7] Fixed incorrect help and error IDs to match
 aria-describedby values.

---
 src/Resources/views/Form/accessible-forms.html.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Resources/views/Form/accessible-forms.html.twig b/src/Resources/views/Form/accessible-forms.html.twig
index 350039a..2e78aa5 100644
--- a/src/Resources/views/Form/accessible-forms.html.twig
+++ b/src/Resources/views/Form/accessible-forms.html.twig
@@ -25,7 +25,7 @@
 {%- block form_errors -%}
     {%- if errors|length > 0 -%}
         {% for error in errors %}
-            <span id="id_{{ id }}_error{{ loop.index }}" class="tbxforms-error-message">Error: {{ error.message }}</span>
+            <span id="{{ id }}_error{{ loop.index }}" class="tbxforms-error-message">Error: {{ error.message }}</span>
         {% endfor %}
     {%- endif -%}
 {%- endblock form_errors -%}
@@ -96,7 +96,7 @@
 {# Custom markup for field hints #}
 {% block form_help -%}
     {%- if help -%}
-        <div id="id_{{ id }}_hint" class="rnib-form-hint">
+        <div id="{{ id }}_help" class="rnib-form-hint">
             {{- block('form_help_content') -}}
         </div>
     {%- endif -%}

From 553731e2504ef856fa2b13f03dd6989c66383c24 Mon Sep 17 00:00:00 2001
From: Gareth Trinkwon <gareth@studio24.net>
Date: Fri, 9 Jan 2026 16:49:16 +0000
Subject: [PATCH 2/7] fix: Fixed incorrect help and error IDs to match
 aria-describedby values.


From cad83d3fdede0453ae54f69e653f6ab3fb1967e7 Mon Sep 17 00:00:00 2001
From: Gareth Trinkwon <gareth@studio24.net>
Date: Fri, 9 Jan 2026 17:18:04 +0000
Subject: [PATCH 3/7] Updated required label to be an asterisk.

Added prefix block to render before form start.
---
 src/Resources/views/Form/accessible-forms.html.twig | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Resources/views/Form/accessible-forms.html.twig b/src/Resources/views/Form/accessible-forms.html.twig
index 2e78aa5..2e9a01a 100644
--- a/src/Resources/views/Form/accessible-forms.html.twig
+++ b/src/Resources/views/Form/accessible-forms.html.twig
@@ -1,6 +1,11 @@
 {# Extends vendor/symfony/twig-bridge/Resources/views/Form/form_div_layout.html.twig #}
 {% use 'form_div_layout.html.twig' %}
 
+{# Custom block that gets included prior to form_start #}
+{% block form_prefix %}
+	<p>Fields marked * are required.</p>
+{% endblock %}
+
 {# Custom block to list errors #}
 {%- block form_error_summary -%}
     {% if form is not valid %}
@@ -33,6 +38,7 @@
 {#  Add class to form start #}
 {%- block form_start -%}
     {% set attr = attr|merge({'class': 'tbxforms'}) %}
+    {{- block('form_prefix') -}}
     {{- parent() -}}
 {%- endblock form_start -%}
 
@@ -50,7 +56,7 @@
 {%- block form_label -%}
     {% if label is not same as(false) -%}
         {%- if compound -%}
-            <legend class="tbxforms-fieldset legend"><h2 class="rnib-form-label rnib-form-label__wrapper">{{- block('form_label_content') -}}{% if required %} (required){% endif %}</h2></legend>
+            <legend class="tbxforms-fieldset legend"><h2 class="rnib-form-label rnib-form-label__wrapper">{{- block('form_label_content') -}}{% if required %} *{% endif %}</h2></legend>
         {%- else -%}
             {% if not compound -%}
                 {% set label_attr = label_attr|merge({for: id}) %}
@@ -58,7 +64,7 @@
             {% set label_attr = label_attr|merge({'class': 'rnib-form-label'}) %}
             <h2 class="rnib-form-label__wrapper">
                 <label{% if label_attr %}{% with {attr: label_attr} %}{{ block('attributes') }}{% endwith %}{% endif %}>
-                    {{- block('form_label_content') -}}{% if required %} (required){% endif %}
+                    {{- block('form_label_content') -}}{% if required %} *{% endif %}
                 </label>
             </h2>
         {%- endif -%}

From f5333cb1b35bbdc392e7c54fc7232a6df46566f2 Mon Sep 17 00:00:00 2001
From: Gareth Trinkwon <gareth@studio24.net>
Date: Wed, 14 Jan 2026 11:25:29 +0000
Subject: [PATCH 4/7] Restored required text to label, but removed required
 from widget attribute to prevent frontend validation.

---
 src/Resources/views/Form/accessible-forms.html.twig | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Resources/views/Form/accessible-forms.html.twig b/src/Resources/views/Form/accessible-forms.html.twig
index 2e9a01a..7e77e15 100644
--- a/src/Resources/views/Form/accessible-forms.html.twig
+++ b/src/Resources/views/Form/accessible-forms.html.twig
@@ -56,7 +56,7 @@
 {%- block form_label -%}
     {% if label is not same as(false) -%}
         {%- if compound -%}
-            <legend class="tbxforms-fieldset legend"><h2 class="rnib-form-label rnib-form-label__wrapper">{{- block('form_label_content') -}}{% if required %} *{% endif %}</h2></legend>
+            <legend class="tbxforms-fieldset legend"><h2 class="rnib-form-label rnib-form-label__wrapper">{{- block('form_label_content') -}}{% if required %} (required){% endif %}</h2></legend>
         {%- else -%}
             {% if not compound -%}
                 {% set label_attr = label_attr|merge({for: id}) %}
@@ -64,7 +64,7 @@
             {% set label_attr = label_attr|merge({'class': 'rnib-form-label'}) %}
             <h2 class="rnib-form-label__wrapper">
                 <label{% if label_attr %}{% with {attr: label_attr} %}{{ block('attributes') }}{% endwith %}{% endif %}>
-                    {{- block('form_label_content') -}}{% if required %} *{% endif %}
+                    {{- block('form_label_content') -}}{% if required %} (required){% endif %}
                 </label>
             </h2>
         {%- endif -%}
@@ -212,3 +212,10 @@
 
     {% endif %}
 {% endblock birthday_widget %}
+
+{%- block widget_attributes -%}
+    id="{{ id }}" name="{{ full_name }}"
+    {%- if disabled %} disabled="disabled"{% endif -%}
+    {%- if required %} required="required"{% endif -%}
+    {{ block('attributes') }}
+{%- endblock widget_attributes -%}

From 1b94269fa1b59d4b18a1932469bbe47bd04b409c Mon Sep 17 00:00:00 2001
From: Gareth Trinkwon <gareth@studio24.net>
Date: Wed, 14 Jan 2026 13:54:49 +0000
Subject: [PATCH 5/7] Fixed missing change from widget_attributes override.

---
 .../views/Form/accessible-forms.html.twig     | 68 ++++++++++---------
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/Resources/views/Form/accessible-forms.html.twig b/src/Resources/views/Form/accessible-forms.html.twig
index 7e77e15..d950e48 100644
--- a/src/Resources/views/Form/accessible-forms.html.twig
+++ b/src/Resources/views/Form/accessible-forms.html.twig
@@ -3,26 +3,26 @@
 
 {# Custom block that gets included prior to form_start #}
 {% block form_prefix %}
-	<p>Fields marked * are required.</p>
+    <p>Fields marked * are required.</p>
 {% endblock %}
 
 {# Custom block to list errors #}
 {%- block form_error_summary -%}
     {% if form is not valid %}
-    <div id="site-aria-alert" role="alert">
-        <div class="govuk-error-summary rnib-error-summary" data-module="govuk-error-summary">
-            <h2 class="govuk-error-summary__title rnib-error-summary__title">
-                There are {{ form_all_errors(form) | length }} problems with this request
-            </h2>
-            <div class="govuk-error-summary__body rnib-error-summary__body">
-                <ul class="govuk-error-summary__list rnib-error-summary__list">
-                    {% for error in form_all_errors(form) %}
-                    <li><a href='#{{ error.id }}'>{{ error.message }}</a></li>
-                    {% endfor %}
-                </ul>
+        <div id="site-aria-alert" role="alert">
+            <div class="govuk-error-summary rnib-error-summary" data-module="govuk-error-summary">
+                <h2 class="govuk-error-summary__title rnib-error-summary__title">
+                    There are {{ form_all_errors(form) | length }} problems with this request
+                </h2>
+                <div class="govuk-error-summary__body rnib-error-summary__body">
+                    <ul class="govuk-error-summary__list rnib-error-summary__list">
+                        {% for error in form_all_errors(form) %}
+                            <li><a href='#{{ error.id }}'>{{ error.message }}</a></li>
+                        {% endfor %}
+                    </ul>
+                </div>
             </div>
         </div>
-    </div>
     {% endif %}
 {%- endblock form_error_summary -%}
 
@@ -56,7 +56,7 @@
 {%- block form_label -%}
     {% if label is not same as(false) -%}
         {%- if compound -%}
-            <legend class="tbxforms-fieldset legend"><h2 class="rnib-form-label rnib-form-label__wrapper">{{- block('form_label_content') -}}{% if required %} (required){% endif %}</h2></legend>
+            <legend class="tbxforms-fieldset legend"><h2 class="rnib-form-label rnib-form-label__wrapper">{{- block('form_label_content') -}}{% if required %} *{% endif %}</h2></legend>
         {%- else -%}
             {% if not compound -%}
                 {% set label_attr = label_attr|merge({for: id}) %}
@@ -64,7 +64,7 @@
             {% set label_attr = label_attr|merge({'class': 'rnib-form-label'}) %}
             <h2 class="rnib-form-label__wrapper">
                 <label{% if label_attr %}{% with {attr: label_attr} %}{{ block('attributes') }}{% endwith %}{% endif %}>
-                    {{- block('form_label_content') -}}{% if required %} (required){% endif %}
+                    {{- block('form_label_content') -}}{% if required %} *{% endif %}
                 </label>
             </h2>
         {%- endif -%}
@@ -80,7 +80,7 @@
         {% set label_attr = label_attr|merge({'class': 'tbxforms-label tbxforms-checkboxes__label'}) %}
 
         <label{% if label_attr %}{% with {attr: label_attr} %}{{ block('attributes') }}{% endwith %}{% endif %}>
-        {{- block('form_label_content') -}}
+            {{- block('form_label_content') -}}
         </label>
     {%- endif -%}
 {% endblock %}
@@ -94,7 +94,7 @@
         {% set label_attr = label_attr|merge({'class': 'rnib-form-label rnib-form-label--option govuk-radios__label'}) %}
 
         <label{% if label_attr %}{% with {attr: label_attr} %}{{ block('attributes') }}{% endwith %}{% endif %}>
-        {{- block('form_label_content') -}}
+            {{- block('form_label_content') -}}
         </label>
     {%- endif -%}
 {% endblock %}
@@ -112,28 +112,28 @@
 {%- block form_row_render -%}
     <div{% with {attr: row_attr} %}{{ block('attributes') }}{% endwith %}>
         {% if compound %}
-            <fieldset class="tbxforms-fieldset">
-        {% endif %}
-        {{- form_label(form) -}}
-        {{- form_help(form) -}}
-        {{- form_errors(form) -}}
-        {{- form_widget(form, widget_attr) -}}
-        {% if compound %}
-            </fieldset>
+        <fieldset class="tbxforms-fieldset">
+            {% endif %}
+            {{- form_label(form) -}}
+            {{- form_help(form) -}}
+            {{- form_errors(form) -}}
+            {{- form_widget(form, widget_attr) -}}
+            {% if compound %}
+        </fieldset>
         {% endif %}
     </div>
 {%- endblock form_row_render -%}
 
 {# This is for single non-choice checkboxes (eg. Agree to Terms) #}
 {% block checkbox_row %}
-<div class="tbxforms-form-group">
-    <div class="tbxforms-checkboxes">
-        <div class="tbxforms-checkboxes__item">
-            {{- form_widget(form, row_attr) -}}
-            {{- form_label(form) -}}
+    <div class="tbxforms-form-group">
+        <div class="tbxforms-checkboxes">
+            <div class="tbxforms-checkboxes__item">
+                {{- form_widget(form, row_attr) -}}
+                {{- form_label(form) -}}
+            </div>
         </div>
     </div>
-</div>
 {% endblock checkbox_row %}
 
 {# Add custom markup to checkbox / radio buttons in choice context #}
@@ -189,11 +189,13 @@
     </button>
 {%- endblock button_widget -%}
 
+{# Add class to textareas #}
 {%- block textarea_widget -%}
     {% set attr = attr|merge({'class': 'tbxforms-input tbxforms-textarea'}) %}
     {{- parent() -}}
 {%- endblock textarea_widget -%}
 
+{#  Customise markup and classes for birthday field #}
 {% block birthday_widget %}
     {% if widget == 'single_text' %}
         {{- block('form_widget_simple') -}}
@@ -213,9 +215,11 @@
     {% endif %}
 {% endblock birthday_widget %}
 
+{# Remove the required attribute from the element (disable frontend validation) #}
 {%- block widget_attributes -%}
     id="{{ id }}" name="{{ full_name }}"
     {%- if disabled %} disabled="disabled"{% endif -%}
-    {%- if required %} required="required"{% endif -%}
+    {% set attr = attr|merge({'required': false}) %}
     {{ block('attributes') }}
 {%- endblock widget_attributes -%}
+

From 1b94c32e18557fe8d3ff94f7a85fdcb85aa4248b Mon Sep 17 00:00:00 2001
From: Gareth Trinkwon <gareth@studio24.net>
Date: Wed, 14 Jan 2026 15:29:37 +0000
Subject: [PATCH 6/7] Replaced asterisk with the word required.

---
 src/Resources/views/Form/accessible-forms.html.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Resources/views/Form/accessible-forms.html.twig b/src/Resources/views/Form/accessible-forms.html.twig
index d950e48..4c6bf34 100644
--- a/src/Resources/views/Form/accessible-forms.html.twig
+++ b/src/Resources/views/Form/accessible-forms.html.twig
@@ -56,7 +56,7 @@
 {%- block form_label -%}
     {% if label is not same as(false) -%}
         {%- if compound -%}
-            <legend class="tbxforms-fieldset legend"><h2 class="rnib-form-label rnib-form-label__wrapper">{{- block('form_label_content') -}}{% if required %} *{% endif %}</h2></legend>
+            <legend class="tbxforms-fieldset legend"><h2 class="rnib-form-label rnib-form-label__wrapper">{{- block('form_label_content') -}}{% if required %} (required){% endif %}</h2></legend>
         {%- else -%}
             {% if not compound -%}
                 {% set label_attr = label_attr|merge({for: id}) %}
@@ -64,7 +64,7 @@
             {% set label_attr = label_attr|merge({'class': 'rnib-form-label'}) %}
             <h2 class="rnib-form-label__wrapper">
                 <label{% if label_attr %}{% with {attr: label_attr} %}{{ block('attributes') }}{% endwith %}{% endif %}>
-                    {{- block('form_label_content') -}}{% if required %} *{% endif %}
+                    {{- block('form_label_content') -}}{% if required %} (required){% endif %}
                 </label>
             </h2>
         {%- endif -%}

From 28ffc602a753637d1854180c316243773c7372e2 Mon Sep 17 00:00:00 2001
From: Simon R Jones <simon@studio24.net>
Date: Wed, 14 Jan 2026 15:39:50 +0000
Subject: [PATCH 7/7] Remove form_prefix block

---
 src/Resources/views/Form/accessible-forms.html.twig | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Resources/views/Form/accessible-forms.html.twig b/src/Resources/views/Form/accessible-forms.html.twig
index 4c6bf34..340836e 100644
--- a/src/Resources/views/Form/accessible-forms.html.twig
+++ b/src/Resources/views/Form/accessible-forms.html.twig
@@ -1,11 +1,6 @@
 {# Extends vendor/symfony/twig-bridge/Resources/views/Form/form_div_layout.html.twig #}
 {% use 'form_div_layout.html.twig' %}
 
-{# Custom block that gets included prior to form_start #}
-{% block form_prefix %}
-    <p>Fields marked * are required.</p>
-{% endblock %}
-
 {# Custom block to list errors #}
 {%- block form_error_summary -%}
     {% if form is not valid %}
@@ -38,7 +33,6 @@
 {#  Add class to form start #}
 {%- block form_start -%}
     {% set attr = attr|merge({'class': 'tbxforms'}) %}
-    {{- block('form_prefix') -}}
     {{- parent() -}}
 {%- endblock form_start -%}