diff --git a/Tests/DependencyInjection/FOSRestExtensionTest.php b/Tests/DependencyInjection/FOSRestExtensionTest.php index e4c1100ac..cc08c00a6 100644 --- a/Tests/DependencyInjection/FOSRestExtensionTest.php +++ b/Tests/DependencyInjection/FOSRestExtensionTest.php @@ -435,14 +435,6 @@ public function testResponseStatusCodeListenerEnabled() 'exception' => [ 'map_exception_codes' => true, ], - 'routing_loader' => false, - 'service' => [ - 'templating' => null, - ], - 'view' => [ - 'default_engine' => null, - 'force_redirects' => [], - ], ], ], $this->container); @@ -452,17 +444,7 @@ public function testResponseStatusCodeListenerEnabled() public function testExceptionListenerDisabled() { $extension = new FOSRestExtension(); - $extension->load([ - [ - 'service' => [ - 'templating' => null, - ], - 'view' => [ - 'default_engine' => null, - 'force_redirects' => [], - ], - ], - ], $this->container); + $extension->load([], $this->container); $this->assertFalse($this->container->hasDefinition('fos_rest.fos_rest.error_listener')); } @@ -595,20 +577,7 @@ public function testMimeTypesArePassedArrays() public function testSerializerErrorRendererNotRegisteredByDefault() { $config = array( - 'fos_rest' => array( - 'exception' => [ - 'exception_listener' => false, - 'serialize_exceptions' => false, - ], - 'routing_loader' => false, - 'service' => [ - 'templating' => null, - ], - 'view' => [ - 'default_engine' => null, - 'force_redirects' => [], - ], - ), + 'fos_rest' => array(), ); $this->extension->load($config, $this->container); @@ -625,18 +594,8 @@ public function testRegisterSerializerErrorRenderer() $config = array( 'fos_rest' => array( 'exception' => [ - 'exception_listener' => false, - 'serialize_exceptions' => false, 'serializer_error_renderer' => true, ], - 'routing_loader' => false, - 'service' => [ - 'templating' => null, - ], - 'view' => [ - 'default_engine' => null, - 'force_redirects' => [], - ], ), ); $this->extension->load($config, $this->container); diff --git a/Tests/Functional/app/AccessDeniedListener/config.yml b/Tests/Functional/app/AccessDeniedListener/config.yml index 549538d0b..3c945afd4 100644 --- a/Tests/Functional/app/AccessDeniedListener/config.yml +++ b/Tests/Functional/app/AccessDeniedListener/config.yml @@ -10,14 +10,5 @@ framework: fos_rest: access_denied_listener: json: true - exception: - exception_listener: false - serialize_exceptions: false - routing_loader: false - service: - templating: null - view: - default_engine: null - force_redirects: [] zone: - { path: ^/api/* } diff --git a/Tests/Functional/app/FlattenExceptionHandlerLegacyFormat/config.yml b/Tests/Functional/app/FlattenExceptionHandlerLegacyFormat/config.yml index cd449a4ed..68baf89c0 100644 --- a/Tests/Functional/app/FlattenExceptionHandlerLegacyFormat/config.yml +++ b/Tests/Functional/app/FlattenExceptionHandlerLegacyFormat/config.yml @@ -6,9 +6,3 @@ fos_rest: exception: flatten_exception_format: 'legacy' serializer_error_renderer: true - routing_loader: false - service: - templating: ~ - view: - default_engine: ~ - force_redirects: [] diff --git a/Tests/Functional/app/FlattenExceptionHandlerRfc7807Format/config.yml b/Tests/Functional/app/FlattenExceptionHandlerRfc7807Format/config.yml index 92fa59879..2d345583b 100644 --- a/Tests/Functional/app/FlattenExceptionHandlerRfc7807Format/config.yml +++ b/Tests/Functional/app/FlattenExceptionHandlerRfc7807Format/config.yml @@ -6,9 +6,3 @@ fos_rest: exception: flatten_exception_format: 'rfc7807' serializer_error_renderer: true - routing_loader: false - service: - templating: ~ - view: - default_engine: ~ - force_redirects: [] diff --git a/Tests/Functional/app/FlattenExceptionNormalizerLegacyFormat/config.yml b/Tests/Functional/app/FlattenExceptionNormalizerLegacyFormat/config.yml index cb0281ec5..f7ede6090 100644 --- a/Tests/Functional/app/FlattenExceptionNormalizerLegacyFormat/config.yml +++ b/Tests/Functional/app/FlattenExceptionNormalizerLegacyFormat/config.yml @@ -9,9 +9,3 @@ framework: fos_rest: exception: flatten_exception_format: 'legacy' - routing_loader: false - service: - templating: ~ - view: - default_engine: ~ - force_redirects: [] diff --git a/Tests/Functional/app/FlattenExceptionNormalizerLegacyFormatDebug/config.yml b/Tests/Functional/app/FlattenExceptionNormalizerLegacyFormatDebug/config.yml index 31fcbc7c5..3af76cf80 100644 --- a/Tests/Functional/app/FlattenExceptionNormalizerLegacyFormatDebug/config.yml +++ b/Tests/Functional/app/FlattenExceptionNormalizerLegacyFormatDebug/config.yml @@ -10,9 +10,3 @@ fos_rest: exception: debug: true flatten_exception_format: 'legacy' - routing_loader: false - service: - templating: ~ - view: - default_engine: ~ - force_redirects: [] diff --git a/Tests/Functional/app/FlattenExceptionNormalizerRfc7807Format/config.yml b/Tests/Functional/app/FlattenExceptionNormalizerRfc7807Format/config.yml index e1af6df62..e53e22bb3 100644 --- a/Tests/Functional/app/FlattenExceptionNormalizerRfc7807Format/config.yml +++ b/Tests/Functional/app/FlattenExceptionNormalizerRfc7807Format/config.yml @@ -9,9 +9,3 @@ framework: fos_rest: exception: flatten_exception_format: 'rfc7807' - routing_loader: false - service: - templating: ~ - view: - default_engine: ~ - force_redirects: [] diff --git a/Tests/Functional/app/FormErrorHandler/config.yml b/Tests/Functional/app/FormErrorHandler/config.yml index 37fdd7fc6..a38049a01 100644 --- a/Tests/Functional/app/FormErrorHandler/config.yml +++ b/Tests/Functional/app/FormErrorHandler/config.yml @@ -3,10 +3,5 @@ imports: - { resource: ../config/exception_listener.yml } fos_rest: - routing_loader: false - service: - templating: ~ view: - default_engine: ~ - force_redirects: [] view_response_listener: 'force' diff --git a/Tests/Functional/app/FormErrorNormalizer/config.yml b/Tests/Functional/app/FormErrorNormalizer/config.yml index a419b6dac..3d40bf23f 100644 --- a/Tests/Functional/app/FormErrorNormalizer/config.yml +++ b/Tests/Functional/app/FormErrorNormalizer/config.yml @@ -7,10 +7,5 @@ framework: enabled: true fos_rest: - routing_loader: false - service: - templating: ~ view: - default_engine: ~ - force_redirects: [] view_response_listener: 'force'