feature #11078 [WIP] [TwigBundle] [Exception] Make return value similar to error.json.twig (clemens-tolboom)

fabpot · fabpot · commit 9752a7600a28 · 2014-09-22T18:01:06.000+02:00
This PR was squashed before being merged into the 2.6-dev branch (closes #11078). Discussion ---------- [WIP] [TwigBundle] [Exception] Make return value similar to error.json.twig | Q | A | ------------- | --- | Bug fix? | I guess this is a bug | New feature? | The exception structure changes for the default | BC breaks? | The exception structure changes for the default | Deprecations? | [yes|no] | Tests pass? | [yes|no] | Fixed tickets | | License | MIT | Doc PR | The result for `error.json.twig` and `exception.json.twig` differ making the client forced to check for it's result. We think the structure should be the same to make the ie a javascript client try to respond similar for --env=dev|prod Commits ------- 4a59f98 [WIP] [TwigBundle] [Exception] Make return value similar to error.json.twig
diff --git a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+2.6.0
+-----
+
+ * [BC BREAK] changed exception.json.twig to match same structure as error.json.twig making clients independent of runtime environment.
+
 2.3.0
 -----
 
diff --git 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 }}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{{ exception.toarray\|json_encode\|raw }}`
	`1`	`+{{ { 'error': { 'code': status_code, 'message': status_text, 'exception': exception.toarray } }\|json_encode\|raw }}`