bug #2181 fix triggering deprecations if routing loader is enabled (xabbuh)

This PR was merged into the 2.x branch.

Discussion
----------

fix triggering deprecations if routing loader is enabled

Commits
-------

eeb47ae fix triggering deprecations if routing loader is enabled

Author: xabbuh

DependencyInjection/Configuration.php

@@ -100,9 +100,8 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->end()
                 ->arrayNode('routing_loader')
                     ->addDefaultsIfNotSet()
-                    ->canBeDisabled()
                     ->beforeNormalization()
-                        ->ifTrue(function ($v) { return false !== $v; })
+                        ->ifTrue(function ($v) { return isset($v['enabled']) && false !== $v['enabled']; })
                         ->then(function ($v) {
                             @trigger_error('Enabling the route generation feature is deprecated since FOSRestBundle 2.8.', E_USER_DEPRECATED);
 
@@ -118,6 +117,13 @@ public function getConfigTreeBuilder(): TreeBuilder
                         })
                     ->end()
                     ->children()
+                        ->booleanNode('enabled')
+                            ->defaultValue(function () {
+                                @trigger_error('Enabling the route generation feature is deprecated since FOSRestBundle 2.8.', E_USER_DEPRECATED);
+
+                                return true;
+                            })
+                        ->end()
                         ->scalarNode('default_format')->defaultNull()->end()
                         ->scalarNode('prefix_methods')->defaultTrue()->end()
                         ->scalarNode('include_format')->defaultTrue()->end()

Tests/DependencyInjection/FOSRestExtensionTest.php

@@ -646,10 +646,26 @@ public function testValidatorAliasWhenDisabled()
 
     /**
      * @group legacy
+     * @expectedDeprecation Enabling the route generation feature is deprecated since FOSRestBundle 2.8.
      */
     public function testConfigLoadWithRoutingLoaderEnabled()
     {
-        $this->extension->load([], $this->container);
+        $config = [
+            'fos_rest' => [
+                'exception' => [
+                    'exception_listener' => false,
+                    'serialize_exceptions' => false,
+                ],
+                'service' => [
+                    'templating' => null,
+                ],
+                'view' => [
+                    'default_engine' => null,
+                    'force_redirects' => [],
+                ],
+            ],
+        ];
+        $this->extension->load($config, $this->container);
 
         $this->assertTrue($this->container->hasDefinition('fos_rest.routing.loader.controller'));
 
@@ -681,6 +697,56 @@ public function testConfigLoadWithRoutingLoaderEnabled()
         );
     }
 
+    public function testRoutingLoaderDisabled()
+    {
+        $config = [
+            'fos_rest' => [
+                'exception' => [
+                    'exception_listener' => false,
+                    'serialize_exceptions' => false,
+                ],
+                'routing_loader' => false,
+                'service' => [
+                    'templating' => null,
+                ],
+                'view' => [
+                    'default_engine' => null,
+                    'force_redirects' => [],
+                ],
+            ],
+        ];
+        $this->extension->load($config, $this->container);
+
+        $this->assertFalse($this->container->hasDefinition('fos_rest.routing.loader.yaml_collection'));
+        $this->assertFalse($this->container->hasDefinition('fos_rest.routing.loader.xml_collection'));
+    }
+
+    public function testRoutingLoaderDisabledUsingEnabledKey()
+    {
+        $config = [
+            'fos_rest' => [
+                'exception' => [
+                    'exception_listener' => false,
+                    'serialize_exceptions' => false,
+                ],
+                'routing_loader' => [
+                    'enabled' => false,
+                ],
+                'service' => [
+                    'templating' => null,
+                ],
+                'view' => [
+                    'default_engine' => null,
+                    'force_redirects' => [],
+                ],
+            ],
+        ];
+        $this->extension->load($config, $this->container);
+
+        $this->assertFalse($this->container->hasDefinition('fos_rest.routing.loader.yaml_collection'));
+        $this->assertFalse($this->container->hasDefinition('fos_rest.routing.loader.xml_collection'));
+    }
+
     /**
      * @group legacy
      */
@@ -995,6 +1061,7 @@ public function testResponseStatusCodeListenerEnabled()
                     'serialize_exceptions' => false,
                     'map_exception_codes' => true,
                 ],
+                'routing_loader' => false,
                 'service' => [
                     'templating' => null,
                 ],
@@ -1017,6 +1084,7 @@ public function testExceptionListenerDisabled()
                     'exception_listener' => false,
                     'serialize_exceptions' => false,
                 ],
+                'routing_loader' => false,
                 'service' => [
                     'templating' => null,
                 ],
@@ -1043,6 +1111,7 @@ public function testExceptionSerializerEnabled()
                     'exception_listener' => false,
                     'serialize_exceptions' => true,
                 ],
+                'routing_loader' => false,
                 'service' => [
                     'templating' => null,
                 ],
@@ -1066,6 +1135,7 @@ public function testExceptionSerializerDisabled()
                     'exception_listener' => false,
                     'serialize_exceptions' => false,
                 ],
+                'routing_loader' => false,
                 'service' => [
                     'templating' => null,
                 ],