Merge branch '1.0' into 1.1

* 1.0: Fix exception controller config
ezecosystem · Apr 25, 2018 · 50c149e · 50c149e
2 parents 3a0864f + f2cb788
commit 50c149e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -51,7 +51,7 @@ swiftmailer:
     password: "%mailer_password%"
 
 fos_rest:
-    exception: ~
+    exception: true
     view:
         formats:
             json: true

diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml
@@ -9,5 +9,9 @@ _profiler:
     resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
     prefix:   /_profiler
 
+_errors:
+    resource: '@TwigBundle/Resources/config/routing/errors.xml'
+    prefix: /_error
+
 _main:
     resource: routing.yml
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/CoreBundle/Resources/config/app/config.yml
@@ -90,7 +90,6 @@ stof_doctrine_extensions:
 twig:
     debug: "%kernel.debug%"
     strict_variables: "%kernel.debug%"
-    exception_controller: "FOS\\RestBundle\\Controller\\ExceptionController::showAction"
     globals:
         sylius: "@sylius.context.shopper"
         sylius_base_locale: "%locale%"