Skip to content

Commit 57b0631

Browse files
author
Toni Van de Voorde
committed
Fix incorrect dependency injection configuration
1 parent 2ad32e9 commit 57b0631

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

Controller/ExceptionController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ExceptionController extends ContainerAware
4040
protected function createExceptionWrapper(array $parameters)
4141
{
4242
/** @var ExceptionWrapperHandlerInterface $exceptionWrapperHandler */
43-
$exceptionWrapperHandler = $this->container->get('fos_rest.view_handler.exception_wrapper_handler');
43+
$exceptionWrapperHandler = $this->container->get('fos_rest.view.exception_wrapper_handler');
4444
return $exceptionWrapperHandler->wrap($parameters);
4545
}
4646

DependencyInjection/FOSRestExtension.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,10 @@ public function load(array $configs, ContainerBuilder $container)
133133
$container->setParameter($this->getAlias().'.fallback_format', 'html');
134134
}
135135

136+
if (!empty($config['view']['exception_wrapper_handler'])) {
137+
$container->setParameter($this->getAlias().'.view.exception_wrapper_handler', $config['view']['exception_wrapper_handler']);
138+
}
139+
136140
if (!empty($config['view']['jsonp_handler'])) {
137141
$handler = new DefinitionDecorator($config['service']['view_handler']);
138142
$handler->setPublic(true);

Resources/config/view.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parameter key="fos_rest.serializer.exclusion_strategy.groups"/>
1010
<parameter key="fos_rest.view_handler.jsonp.callback_param"/>
1111
<parameter key="fos_rest.view_handler.jsonp.callback_filter"/>
12-
<parameter key="fos_rest.view_handler.exception_wrapper_handler" />
12+
<parameter key="fos_rest.view.exception_wrapper_handler" />
1313
</parameters>
1414

1515
<services>
@@ -31,7 +31,7 @@
3131
<argument>%fos_rest.view_handler.jsonp.callback_filter%</argument>
3232
</service>
3333

34-
<service id="fos_rest.view_handler.exception_wrapper_handler" class="%fos_rest.view_handler.exception_wrapper_handler%" public="false" />
34+
<service id="fos_rest.view.exception_wrapper_handler" class="%fos_rest.view.exception_wrapper_handler%" />
3535

3636
</services>
3737
</container>

View/ViewHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ private function getViewDataForResponse(View $view)
449449
}
450450

451451
/** @var ExceptionWrapperHandlerInterface $exceptionWrapperHandler */
452-
$exceptionWrapperHandler = $this->container->get('fos_rest.view_handler.exception_wrapper_handler');
452+
$exceptionWrapperHandler = $this->container->get('fos_rest.view.exception_wrapper_handler');
453453

454454
return $exceptionWrapperHandler->wrap(
455455
array(

0 commit comments

Comments
 (0)