From 166e1b595225211ac40267d2b2e8b82f292ce08e Mon Sep 17 00:00:00 2001 From: HeahDude Date: Sun, 7 Dec 2014 20:06:23 +0100 Subject: [PATCH 1/5] Update form.html.twig {% if data.type is defined and data.type is not empty %} Without check if defined web profiler crash to report form data on line 423. check the topic https://github.com/symfony/symfony/issues/10054 --- .../WebProfilerBundle/Resources/views/Collector/form.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig index 619469e415323..0f47edcec86a6 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig @@ -420,7 +420,7 @@ {% else %}
{% endif %} - {{ name|default('(no name)') }} {% if data.type is not empty %}[{{ data.type }}]{% endif %} + {{ name|default('(no name)') }} {% if data.type is defined and data.type is not empty %}[{{ data.type }}]{% endif %} {% if data.errors is defined and data.errors|length > 0 %}
{{ data.errors|length }}
{% endif %} From f8393bf671b1aacf48b2015bbeb70a654eb49e81 Mon Sep 17 00:00:00 2001 From: Jules Pietri Date: Thu, 11 Dec 2014 10:25:44 +0100 Subject: [PATCH 2/5] [2.6][Form][WebProfiler] Fixed issue#10054 | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #10054 | License | MIT | Doc PR | @WebProfilerBundle:Collector:form.html.twig, without checking if data.type is defined on line 423, web profiler crash to report form data when "allow_add" is true. --- .../WebProfilerBundle/Resources/views/Collector/form.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig index 0f47edcec86a6..619469e415323 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig @@ -420,7 +420,7 @@ {% else %}
{% endif %} - {{ name|default('(no name)') }} {% if data.type is defined and data.type is not empty %}[{{ data.type }}]{% endif %} + {{ name|default('(no name)') }} {% if data.type is not empty %}[{{ data.type }}]{% endif %} {% if data.errors is defined and data.errors|length > 0 %}
{{ data.errors|length }}
{% endif %} From 8a51223a4fa52fe60043296d094fab14ed1a5770 Mon Sep 17 00:00:00 2001 From: Jules Pietri Date: Thu, 11 Dec 2014 10:30:12 +0100 Subject: [PATCH 3/5] [2.6][Form][WebProfiler] Fixed issue#10054" This reverts commit f8393bf671b1aacf48b2015bbeb70a654eb49e81. --- .../WebProfilerBundle/Resources/views/Collector/form.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig index 619469e415323..0f47edcec86a6 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig @@ -420,7 +420,7 @@ {% else %}
{% endif %} - {{ name|default('(no name)') }} {% if data.type is not empty %}[{{ data.type }}]{% endif %} + {{ name|default('(no name)') }} {% if data.type is defined and data.type is not empty %}[{{ data.type }}]{% endif %} {% if data.errors is defined and data.errors|length > 0 %}
{{ data.errors|length }}
{% endif %} From 4faf9ec64e176e5faf3fafe9fccc93059722223c Mon Sep 17 00:00:00 2001 From: Jules Pietri Date: Fri, 12 Dec 2014 12:54:00 +0100 Subject: [PATCH 4/5] [Form][WebProfiler] Fixed bug for #12949 | Q | A | ------------- | --- | Fixed tickets | #12949 | License | MIT --- .../Resources/views/Collector/form.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig index 0f47edcec86a6..36789e8ba10aa 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig @@ -414,7 +414,7 @@ {% macro form_tree_entry(name, data, expanded) %}
  • -
    +
    {% if data.children is not empty %} {% else %} @@ -548,7 +548,7 @@ -
    + {% if data.submitted_data.norm is defined %} From 46b17f0469903365a220b3f353d75ee99b6dc1d7 Mon Sep 17 00:00:00 2001 From: Jules Pietri Date: Fri, 12 Dec 2014 17:16:36 +0100 Subject: [PATCH 5/5] [Form][WebProfiler] Prevent bug with data.id --- .../WebProfilerBundle/Resources/views/Collector/form.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig index 36789e8ba10aa..0932ba02a9a9d 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig @@ -542,7 +542,7 @@ {% if data.submitted_data is defined %}

    - + Submitted Data