From 699025de4f55f567afdebdca62669ab91617a571 Mon Sep 17 00:00:00 2001 From: Clemens Tolboom Date: Sat, 7 Jun 2014 21:47:27 +0200 Subject: [PATCH 1/3] Make return value similar to error..json.twig --- .../TwigBundle/Resources/views/Exception/exception.json.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.json.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.json.twig index 042e082b598a4..13a41476f2a7b 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.json.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.json.twig @@ -1 +1 @@ -{{ exception.toarray|json_encode|raw }} +{{ { 'error': { 'code': status_code, 'message': status_text, 'exception': exception.toarray } }|json_encode|raw }} From 8674e5aa0e65a2e2f36c848f9f6a785691e0fa08 Mon Sep 17 00:00:00 2001 From: Clemens Tolboom Date: Wed, 3 Sep 2014 14:54:23 +0200 Subject: [PATCH 2/3] Add CHANGELOG note. --- src/Symfony/Bundle/TwigBundle/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md index de36165b56c12..4185caed833e9 100644 --- a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md +++ b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +2.4.0 +----- + + * fixed error.json.twig and exception.json.twig have same structure making clients independent of runtime environment. + 2.3.0 ----- From 8db692675504e549b8c153f0c53e409f3943d101 Mon Sep 17 00:00:00 2001 From: Clemens Tolboom Date: Wed, 10 Sep 2014 15:34:04 +0200 Subject: [PATCH 3/3] Correct version and add BC BREAK + rephrased --- src/Symfony/Bundle/TwigBundle/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md index 4185caed833e9..afd8f8177fe3b 100644 --- a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md +++ b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md @@ -1,10 +1,10 @@ CHANGELOG ========= -2.4.0 +2.6.0 ----- - * fixed error.json.twig and exception.json.twig have same structure making clients independent of runtime environment. + * [BC BREAK] changed exception.json.twig to match same structure as error.json.twig making clients independent of runtime environment. 2.3.0 -----