Skip to content

Commit 073bde5

Browse files
committed
remove the deprecated access denied listener
1 parent 9f3444c commit 073bde5

File tree

15 files changed

+7
-539
lines changed

15 files changed

+7
-539
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ CHANGELOG
3131
* dropped support for Symfony components < 4.4
3232
* removed the following options:
3333

34+
* `fos_rest.access_denied_listener`
3435
* `fos_rest.exception.exception_controller`
3536
* `fos_rest.exception.exception_listener`
3637
* `fos_rest.exception.service`
@@ -51,6 +52,7 @@ CHANGELOG
5152
* `FOS\RestBundle\Controller\ExceptionController`
5253
* `FOS\RestBundle\Controller\TemplatingExceptionController`
5354
* `FOS\RestBundle\Controller\TwigExceptionController`
55+
* `FOS\RestBundle\EventListener\AccessDeniedListener`
5456
* `FOS\RestBundle\EventListener\ExceptionListener`
5557
* `FOS\RestBundle\Inflector\DoctrineInflector`
5658
* `FOS\RestBundle\Inflector\InflectorInterface`
@@ -68,6 +70,7 @@ CHANGELOG
6870

6971
* removed the following services and aliases:
7072

73+
* `fos_rest.access_denied_listener`
7174
* `fos_rest.exception_listener`
7275
* `fos_rest.exception.controller`
7376
* `fos_rest.exception.twig_controller`

DependencyInjection/Configuration.php

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -47,28 +47,6 @@ public function getConfigTreeBuilder(): TreeBuilder
4747
$rootNode
4848
->children()
4949
->scalarNode('disable_csrf_role')->defaultNull()->end()
50-
->arrayNode('access_denied_listener')
51-
->canBeEnabled()
52-
->setDeprecated('The "%path%.%node%" option is deprecated since FOSRestBundle 2.8.')
53-
->beforeNormalization()
54-
->ifArray()->then(function ($v) {
55-
if (!empty($v) && empty($v['formats'])) {
56-
unset($v['enabled']);
57-
$v = ['enabled' => true, 'formats' => $v];
58-
}
59-
60-
return $v;
61-
})
62-
->end()
63-
->fixXmlConfig('format', 'formats')
64-
->children()
65-
->scalarNode('service')->defaultNull()->end()
66-
->arrayNode('formats')
67-
->useAttributeAsKey('name')
68-
->prototype('boolean')->end()
69-
->end()
70-
->end()
71-
->end()
7250
->scalarNode('unauthorized_challenge')->defaultNull()->end()
7351
->arrayNode('param_fetcher_listener')
7452
->beforeNormalization()

DependencyInjection/FOSRestExtension.php

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ public function load(array $configs, ContainerBuilder $container): void
7575
$this->loadVersioning($config, $loader, $container);
7676
$this->loadParamFetcherListener($config, $loader, $container);
7777
$this->loadAllowedMethodsListener($config, $loader, $container);
78-
$this->loadAccessDeniedListener($config, $loader, $container);
7978
$this->loadZoneMatcherListener($config, $loader, $container);
8079

8180
// Needs RequestBodyParamConverter and View Handler loaded.
@@ -93,22 +92,6 @@ private function loadForm(array $config, XmlFileLoader $loader, ContainerBuilder
9392
}
9493
}
9594

96-
private function loadAccessDeniedListener(array $config, XmlFileLoader $loader, ContainerBuilder $container): void
97-
{
98-
if ($config['access_denied_listener']['enabled'] && !empty($config['access_denied_listener']['formats'])) {
99-
$loader->load('access_denied_listener.xml');
100-
101-
$service = $container->getDefinition('fos_rest.access_denied_listener');
102-
103-
if (!empty($config['access_denied_listener']['service'])) {
104-
$service->clearTag('kernel.event_subscriber');
105-
}
106-
107-
$service->replaceArgument(0, $config['access_denied_listener']['formats']);
108-
$service->replaceArgument(1, $config['unauthorized_challenge']);
109-
}
110-
}
111-
11295
private function loadAllowedMethodsListener(array $config, XmlFileLoader $loader, ContainerBuilder $container): void
11396
{
11497
if ($config['allowed_methods_listener']['enabled']) {

EventListener/AccessDeniedListener.php

Lines changed: 0 additions & 92 deletions
This file was deleted.

Resources/config/access_denied_listener.xml

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)