deprecate the framework.templating option

xabbuh · xabbuh · commit 14f8b34ac6f5 · 2019-06-28T18:38:31.000+02:00
diff --git a/UPGRADE-4.4.md b/UPGRADE-4.4.md
@@ -49,6 +49,7 @@ Form
 FrameworkBundle
 ---------------
 
+ * Deprecated the `framework.templating` option, use Twig instead.
  * Deprecated support for `templating` engine in `TemplateController`, use Twig instead
  * The `$parser` argument of `ControllerResolver::__construct()` and `DelegatingLoader::__construct()`
    has been deprecated.
diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
@@ -207,8 +207,8 @@ Form
 FrameworkBundle
 ---------------
 
+ * Remved the `framework.templating` option, use Twig instead.
  * The project dir argument of the constructor of `AssetsInstallCommand` is required.
-
  * Removed support for `bundle:controller:action` syntax to reference controllers. Use `serviceOrFqcn::method`
    instead where `serviceOrFqcn` is either the service ID when using controllers as services or the FQCN of the controller.
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 4.4.0
 -----
 
+ * Deprecated the `framework.templating` option, use Twig instead.
  * Deprecated support for `templating` engine in `TemplateController`, use Twig instead
  * Deprecated the `$parser` argument of `ControllerResolver::__construct()` and `DelegatingLoader::__construct()`
  * Deprecated the `controller_name_converter` and `resolve_controller_name_subscriber` services
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -605,6 +605,7 @@ private function addTemplatingSection(ArrayNodeDefinition $rootNode)
                 ->arrayNode('templating')
                     ->info('templating configuration')
                     ->canBeEnabled()
+                    ->setDeprecated('The "%path%.%node%" configuration is deprecated since Symfony 4.4. Use the "twig" service directly instead.')
                     ->beforeNormalization()
                         ->ifTrue(function ($v) { return false === $v || \is_array($v) && false === $v['enabled']; })
                         ->then(function () { return ['enabled' => false, 'engines' => false]; })
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -602,6 +602,9 @@ public function testTemplating()
         $this->assertEquals('global_hinclude_template', $container->getParameter('fragment.renderer.hinclude.global_template'), '->registerTemplatingConfiguration() registers the global hinclude.js template');
     }
 
+    /**
+     * @group legacy
+     */
     public function testTemplatingCanBeDisabled()
     {
         $container = $this->createContainerFromFile('templating_disabled');
@@ -872,6 +875,7 @@ public function testTranslatorMultipleFallbacks()
     }
 
     /**
+     * @group legacy
      * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
      */
     public function testTemplatingRequiresAtLeastOneEngine()

Original file line number	Diff line number	Diff line change
`@@ -602,6 +602,9 @@ public function testTemplating()`
`602`	`602`	`$this->assertEquals('global_hinclude_template', $container->getParameter('fragment.renderer.hinclude.global_template'), '->registerTemplatingConfiguration() registers the global hinclude.js template');`
`603`	`603`	`}`
`604`	`604`
	`605`	`+ /**`
	`606`	`+ * @group legacy`
	`607`	`+ */`
`605`	`608`	`public function testTemplatingCanBeDisabled()`
`606`	`609`	`{`
`607`	`610`	`$container = $this->createContainerFromFile('templating_disabled');`
`@@ -872,6 +875,7 @@ public function testTranslatorMultipleFallbacks()`
`872`	`875`	`}`
`873`	`876`
`874`	`877`	`/**`
	`878`	`+ * @group legacy`
`875`	`879`	`* @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException`
`876`	`880`	`*/`
`877`	`881`	`public function testTemplatingRequiresAtLeastOneEngine()`