Skip to content

Commit 67756de

Browse files
committed
minor #2185 clean up legacy config options (xabbuh)
This PR was merged into the 3.0-dev branch. Discussion ---------- clean up legacy config options Commits ------- 9cd3fd0 clean up legacy config options
2 parents dbe76a0 + 9cd3fd0 commit 67756de

File tree

9 files changed

+2
-92
lines changed

9 files changed

+2
-92
lines changed

Tests/DependencyInjection/FOSRestExtensionTest.php

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -435,14 +435,6 @@ public function testResponseStatusCodeListenerEnabled()
435435
'exception' => [
436436
'map_exception_codes' => true,
437437
],
438-
'routing_loader' => false,
439-
'service' => [
440-
'templating' => null,
441-
],
442-
'view' => [
443-
'default_engine' => null,
444-
'force_redirects' => [],
445-
],
446438
],
447439
], $this->container);
448440

@@ -452,17 +444,7 @@ public function testResponseStatusCodeListenerEnabled()
452444
public function testExceptionListenerDisabled()
453445
{
454446
$extension = new FOSRestExtension();
455-
$extension->load([
456-
[
457-
'service' => [
458-
'templating' => null,
459-
],
460-
'view' => [
461-
'default_engine' => null,
462-
'force_redirects' => [],
463-
],
464-
],
465-
], $this->container);
447+
$extension->load([], $this->container);
466448

467449
$this->assertFalse($this->container->hasDefinition('fos_rest.fos_rest.error_listener'));
468450
}
@@ -595,20 +577,7 @@ public function testMimeTypesArePassedArrays()
595577
public function testSerializerErrorRendererNotRegisteredByDefault()
596578
{
597579
$config = array(
598-
'fos_rest' => array(
599-
'exception' => [
600-
'exception_listener' => false,
601-
'serialize_exceptions' => false,
602-
],
603-
'routing_loader' => false,
604-
'service' => [
605-
'templating' => null,
606-
],
607-
'view' => [
608-
'default_engine' => null,
609-
'force_redirects' => [],
610-
],
611-
),
580+
'fos_rest' => array(),
612581
);
613582
$this->extension->load($config, $this->container);
614583

@@ -625,18 +594,8 @@ public function testRegisterSerializerErrorRenderer()
625594
$config = array(
626595
'fos_rest' => array(
627596
'exception' => [
628-
'exception_listener' => false,
629-
'serialize_exceptions' => false,
630597
'serializer_error_renderer' => true,
631598
],
632-
'routing_loader' => false,
633-
'service' => [
634-
'templating' => null,
635-
],
636-
'view' => [
637-
'default_engine' => null,
638-
'force_redirects' => [],
639-
],
640599
),
641600
);
642601
$this->extension->load($config, $this->container);

Tests/Functional/app/AccessDeniedListener/config.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,5 @@ framework:
1010
fos_rest:
1111
access_denied_listener:
1212
json: true
13-
exception:
14-
exception_listener: false
15-
serialize_exceptions: false
16-
routing_loader: false
17-
service:
18-
templating: null
19-
view:
20-
default_engine: null
21-
force_redirects: []
2213
zone:
2314
- { path: ^/api/* }

Tests/Functional/app/FlattenExceptionHandlerLegacyFormat/config.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,3 @@ fos_rest:
66
exception:
77
flatten_exception_format: 'legacy'
88
serializer_error_renderer: true
9-
routing_loader: false
10-
service:
11-
templating: ~
12-
view:
13-
default_engine: ~
14-
force_redirects: []

Tests/Functional/app/FlattenExceptionHandlerRfc7807Format/config.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,3 @@ fos_rest:
66
exception:
77
flatten_exception_format: 'rfc7807'
88
serializer_error_renderer: true
9-
routing_loader: false
10-
service:
11-
templating: ~
12-
view:
13-
default_engine: ~
14-
force_redirects: []

Tests/Functional/app/FlattenExceptionNormalizerLegacyFormat/config.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,3 @@ framework:
99
fos_rest:
1010
exception:
1111
flatten_exception_format: 'legacy'
12-
routing_loader: false
13-
service:
14-
templating: ~
15-
view:
16-
default_engine: ~
17-
force_redirects: []

Tests/Functional/app/FlattenExceptionNormalizerLegacyFormatDebug/config.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,3 @@ fos_rest:
1010
exception:
1111
debug: true
1212
flatten_exception_format: 'legacy'
13-
routing_loader: false
14-
service:
15-
templating: ~
16-
view:
17-
default_engine: ~
18-
force_redirects: []

Tests/Functional/app/FlattenExceptionNormalizerRfc7807Format/config.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,3 @@ framework:
99
fos_rest:
1010
exception:
1111
flatten_exception_format: 'rfc7807'
12-
routing_loader: false
13-
service:
14-
templating: ~
15-
view:
16-
default_engine: ~
17-
force_redirects: []

Tests/Functional/app/FormErrorHandler/config.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,5 @@ imports:
33
- { resource: ../config/exception_listener.yml }
44

55
fos_rest:
6-
routing_loader: false
7-
service:
8-
templating: ~
96
view:
10-
default_engine: ~
11-
force_redirects: []
127
view_response_listener: 'force'

Tests/Functional/app/FormErrorNormalizer/config.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,5 @@ framework:
77
enabled: true
88

99
fos_rest:
10-
routing_loader: false
11-
service:
12-
templating: ~
1310
view:
14-
default_engine: ~
15-
force_redirects: []
1611
view_response_listener: 'force'

0 commit comments

Comments
 (0)