From 8680e593d038fc25a8d401b22f5fb6be9a050c74 Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Mon, 26 Feb 2018 17:24:59 +0100
Subject: [PATCH 1/3] Added role="presentation" on tables.

This will prevent screen readers to read "row 1, column 1".
---
 .../Twig/Resources/views/Form/bootstrap_4_layout.html.twig      | 2 +-
 .../Twig/Resources/views/Form/bootstrap_base_layout.html.twig   | 2 +-
 .../Bridge/Twig/Resources/views/Form/form_div_layout.html.twig  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
index a1e986a39a765..fa8d43325738a 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
@@ -59,7 +59,7 @@
         {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) -%}
         <div {{ block('widget_container_attributes') }}>
             <div class="table-responsive">
-                <table class="table {{ table_class|default('table-bordered table-condensed table-striped') }}">
+                <table class="table {{ table_class|default('table-bordered table-condensed table-striped') }}" role="presentation">
                     <thead>
                     <tr>
                         {%- if with_years %}<th>{{ form_label(form.years) }}</th>{% endif -%}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig
index 71aedf99ad1fa..1a75f2e4456bb 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig
@@ -88,7 +88,7 @@
         <div {{ block('widget_container_attributes') }}>
             {{- form_errors(form) -}}
             <div class="table-responsive">
-                <table class="table {{ table_class|default('table-bordered table-condensed table-striped') }}">
+                <table class="table {{ table_class|default('table-bordered table-condensed table-striped') }}" role="presentation">
                     <thead>
                     <tr>
                         {%- if with_years %}<th>{{ form_label(form.years) }}</th>{% endif -%}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
index 0a661a0215825..21ebd44a26e83 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
@@ -136,7 +136,7 @@
     {%- else -%}
         <div {{ block('widget_container_attributes') }}>
             {{- form_errors(form) -}}
-            <table class="{{ table_class|default('') }}">
+            <table class="{{ table_class|default('') }}" role="presentation">
                 <thead>
                     <tr>
                         {%- if with_years %}<th>{{ form_label(form.years) }}</th>{% endif -%}

From 446edcf36eae5f0f4cd63e1dcf5d789cce89c315 Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Wed, 28 Feb 2018 18:27:15 +0100
Subject: [PATCH 2/3] Do not use a table for bootstrap 4

---
 .../views/Form/bootstrap_4_layout.html.twig   | 66 ++++++++++++-------
 1 file changed, 41 insertions(+), 25 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
index fa8d43325738a..0caa07f473a37 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
@@ -58,32 +58,48 @@
     {%- else -%}
         {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) -%}
         <div {{ block('widget_container_attributes') }}>
-            <div class="table-responsive">
-                <table class="table {{ table_class|default('table-bordered table-condensed table-striped') }}" role="presentation">
-                    <thead>
-                    <tr>
-                        {%- if with_years %}<th>{{ form_label(form.years) }}</th>{% endif -%}
-                        {%- if with_months %}<th>{{ form_label(form.months) }}</th>{% endif -%}
-                        {%- if with_weeks %}<th>{{ form_label(form.weeks) }}</th>{% endif -%}
-                        {%- if with_days %}<th>{{ form_label(form.days) }}</th>{% endif -%}
-                        {%- if with_hours %}<th>{{ form_label(form.hours) }}</th>{% endif -%}
-                        {%- if with_minutes %}<th>{{ form_label(form.minutes) }}</th>{% endif -%}
-                        {%- if with_seconds %}<th>{{ form_label(form.seconds) }}</th>{% endif -%}
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <tr>
-                        {%- if with_years %}<td>{{ form_widget(form.years) }}</td>{% endif -%}
-                        {%- if with_months %}<td>{{ form_widget(form.months) }}</td>{% endif -%}
-                        {%- if with_weeks %}<td>{{ form_widget(form.weeks) }}</td>{% endif -%}
-                        {%- if with_days %}<td>{{ form_widget(form.days) }}</td>{% endif -%}
-                        {%- if with_hours %}<td>{{ form_widget(form.hours) }}</td>{% endif -%}
-                        {%- if with_minutes %}<td>{{ form_widget(form.minutes) }}</td>{% endif -%}
-                        {%- if with_seconds %}<td>{{ form_widget(form.seconds) }}</td>{% endif -%}
-                    </tr>
-                    </tbody>
-                </table>
+            {%- if with_years %}
+            <div class="col-auto">
+                {{ form_label(form.years) }}
+                {{ form_widget(form.years) }}
             </div>
+            {% endif -%}
+            {%- if with_months %}
+            <div class="col-auto">
+                {{ form_label(form.months) }}
+                {{ form_widget(form.months) }}
+            </div>
+            {% endif -%}
+            {%- if with_weeks %}
+            <div class="col-auto">
+                {{ form_label(form.weeks) }}
+                {{ form_widget(form.weeks) }}
+            </div>
+            {% endif -%}
+            {%- if with_days %}
+            <div class="col-auto">
+                {{ form_label(form.days) }}
+                {{ form_widget(form.days) }}
+            </div>
+            {% endif -%}
+            {%- if with_hours %}
+            <div class="col-auto">
+                {{ form_label(form.hours) }}
+                {{ form_widget(form.hours) }}
+            </div>
+            {% endif -%}
+            {%- if with_minutes %}
+            <div class="col-auto">
+                {{ form_label(form.minutes) }}
+                {{ form_widget(form.minutes) }}
+            </div>
+            {% endif -%}
+            {%- if with_seconds %}
+            <div class="col-auto">
+                {{ form_label(form.seconds) }}
+                {{ form_widget(form.seconds) }}
+            </div>
+            {% endif -%}
             {%- if with_invert %}{{ form_widget(form.invert) }}{% endif -%}
         </div>
     {%- endif -%}

From bde4a7be779dc564031d02ba74f8ea9157146c55 Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Wed, 28 Feb 2018 18:52:09 +0100
Subject: [PATCH 3/3] whitespace control

---
 .../views/Form/bootstrap_4_layout.html.twig   | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
index 0caa07f473a37..f6db9e085498d 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
@@ -58,48 +58,48 @@
     {%- else -%}
         {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) -%}
         <div {{ block('widget_container_attributes') }}>
-            {%- if with_years %}
+            {%- if with_years -%}
             <div class="col-auto">
                 {{ form_label(form.years) }}
                 {{ form_widget(form.years) }}
             </div>
-            {% endif -%}
-            {%- if with_months %}
+            {%- endif -%}
+            {%- if with_months -%}
             <div class="col-auto">
                 {{ form_label(form.months) }}
                 {{ form_widget(form.months) }}
             </div>
-            {% endif -%}
-            {%- if with_weeks %}
+            {%- endif -%}
+            {%- if with_weeks -%}
             <div class="col-auto">
                 {{ form_label(form.weeks) }}
                 {{ form_widget(form.weeks) }}
             </div>
-            {% endif -%}
-            {%- if with_days %}
+            {%- endif -%}
+            {%- if with_days -%}
             <div class="col-auto">
                 {{ form_label(form.days) }}
                 {{ form_widget(form.days) }}
             </div>
-            {% endif -%}
-            {%- if with_hours %}
+            {%- endif -%}
+            {%- if with_hours -%}
             <div class="col-auto">
                 {{ form_label(form.hours) }}
                 {{ form_widget(form.hours) }}
             </div>
-            {% endif -%}
-            {%- if with_minutes %}
+            {%- endif -%}
+            {%- if with_minutes -%}
             <div class="col-auto">
                 {{ form_label(form.minutes) }}
                 {{ form_widget(form.minutes) }}
             </div>
-            {% endif -%}
-            {%- if with_seconds %}
+            {%- endif -%}
+            {%- if with_seconds -%}
             <div class="col-auto">
                 {{ form_label(form.seconds) }}
                 {{ form_widget(form.seconds) }}
             </div>
-            {% endif -%}
+            {%- endif -%}
             {%- if with_invert %}{{ form_widget(form.invert) }}{% endif -%}
         </div>
     {%- endif -%}