Merge branch '2.x'

* 2.x:
  mark legacy aliases as deprecated
  deprecate the force_redirects option
  deprecate the default_engine option
  deprecate the templating service option
  remove duplicated changelog entry
  deprecate the "fos_rest.service.inflector" option

Author: xabbuh

CHANGELOG.md

@@ -165,17 +165,18 @@ CHANGELOG
   `isPopulateDefaultVars()` methods of the `Controller\Annotations\View` class
 * deprecated the `setEngine()`, `setTemplate()`, `setTemplateData()`, `setTemplateVar()`, `getEngine()`,
   `getTemplate()`, `getTemplateData()`, and `getTemplateVar()` methods of the `View\View` class
-* deprecated the `fos_rest.templating` alias and the `fos_rest.exception.twig_controller` service
-* deprecated not setting the `fos_rest.service.templating` and `fos_rest.view.default_engine` options
-* deprecated not setting the `fos_rest.view.force_redirects` option to the empty array
 * deprecated not enabling the `fos_rest.body_listener` option explicitly, it will be disabled by default
   in 3.0
 * deprecated the following options:
 
   * `fos_rest.exception.exception_controller`
   * `fos_rest.exception.exception_listener`
   * `fos_rest.exception.service`
+  * `fos_rest.service.inflector`
   * `fos_rest.service.router`
+  * `fos_rest.service.templating`
+  * `fos_rest.view.default_engine`
+  * `fos_rest.view.force_redirects`
   * `fos_rest.view.templating_formats`
 
 * the following classes and interfaces are marked as `deprecated`, they will be removed in  3.0:

DependencyInjection/Configuration.php

@@ -124,6 +124,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                                 ->ifString()
                                 ->thenInvalid('only null is supported')
                             ->end()
+                            ->setDeprecated('The "%path%.%node%" option is deprecated since FOSRestBundle 2.8.')
                         ->end()
                         ->scalarNode('serializer')->defaultNull()->end()
                         ->scalarNode('view_handler')->defaultValue('fos_rest.view_handler.default')->end()
@@ -133,6 +134,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                                 ->ifString()
                                 ->thenInvalid('only null is supported')
                             ->end()
+                            ->setDeprecated('The "%path%.%node%" option is deprecated since FOSRestBundle 2.8.')
                         ->end()
                         ->scalarNode('validator')->defaultValue('validator')->end()
                     ->end()
@@ -200,8 +202,10 @@ private function addViewSection(ArrayNodeDefinition $rootNode): void
                                 ->ifString()
                                 ->thenInvalid('only null is supported')
                             ->end()
+                            ->setDeprecated('The "%path%.%node%" option has been deprecated in FOSRestBundle 2.8.')
                         ->end()
                         ->arrayNode('force_redirects')
+                            ->setDeprecated('The "%path%.%node%" option has been deprecated in FOSRestBundle 2.8.')
                             ->useAttributeAsKey('name')
                             ->defaultValue([])
                             ->validate()

Tests/DependencyInjection/FOSRestExtensionTest.php

@@ -581,4 +581,17 @@ public function testRegisterSerializerErrorRenderer()
         $this->assertTrue($this->container->hasAlias('error_renderer'));
         $this->assertSame('fos_rest.error_renderer.serializer', (string) $this->container->getAlias('error_renderer'));
     }
+
+    public function testLegacyAliasesAreDeprecated()
+    {
+        if (!method_exists(Alias::class, 'isDeprecated')) {
+            $this->markTestSkipped();
+        }
+
+        $this->extension->load([], $this->container);
+
+        $this->assertTrue($this->container->getAlias('fos_rest.inflector')->isDeprecated());
+        $this->assertTrue($this->container->getAlias('fos_rest.router')->isDeprecated());
+        $this->assertTrue($this->container->getAlias('fos_rest.templating')->isDeprecated());
+    }
 }

UPGRADING-3.0.md

@@ -33,12 +33,6 @@ Upgrading From 2.x To 3.0
    `getTemplate()`, `getTemplateData()`, and `getTemplateVar()` methods of the `View\View` class
    have been removed.
 
- * The default values of the `fos_rest.service.templating` and `fos_rest.view.default_engine` options
-   have been changed to `null`. Setting it to another value leads to an exception.
-
- * The default value of the `fos_rest.view.force_redirects` option has been changed to the empty
-   array. Setting it to another value leads to an exception.
-
  * The default value of the `fos_rest.body_listener` option has been changed from enabled to disabled.
 
  * The `setMaxDepth()` method has been removed from the `Context` class. Use the
@@ -52,7 +46,11 @@ Upgrading From 2.x To 3.0
    * `fos_rest.exception.exception_controller`
    * `fos_rest.exception.exception_listener`
    * `fos_rest.exception.service`
+   * `fos_rest.service.inflector`
    * `fos_rest.service.router`
+   * `fos_rest.service.templating`
+   * `fos_rest.view.default_engine`
+   * `fos_rest.view.force_redirects`
    * `fos_rest.view.templating_formats`
 
  * The following classes and interfaces have been removed: