Skip to content

Commit d7bb940

Browse files
committed
Merge branch '4.3' into 4.4
2 parents 67d2e4b + f4c4d29 commit d7bb940

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ CHANGELOG
1515
4.3.0
1616
-----
1717

18-
* Deprecated the `framework.templating` option, use Twig instead.
18+
* Deprecated the `framework.templating` option, configure the Twig bundle instead.
1919
* Added `WebTestAssertionsTrait` (included by default in `WebTestCase`)
2020
* Renamed `Client` to `KernelBrowser`
2121
* Not passing the project directory to the constructor of the `AssetsInstallCommand` is deprecated. This argument will

DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ private function addTemplatingSection(ArrayNodeDefinition $rootNode)
605605
->arrayNode('templating')
606606
->info('templating configuration')
607607
->canBeEnabled()
608-
->setDeprecated('The "%path%.%node%" configuration is deprecated since Symfony 4.3. Use the "twig" service directly instead.')
608+
->setDeprecated('The "%path%.%node%" configuration is deprecated since Symfony 4.3. Configure the "twig" section provided by the Twig Bundle instead.')
609609
->beforeNormalization()
610610
->ifTrue(function ($v) { return false === $v || \is_array($v) && false === $v['enabled']; })
611611
->then(function () { return ['enabled' => false, 'engines' => false]; })

0 commit comments

Comments
 (0)