Skip to content

Commit 2271ff4

Browse files
committed
Merge branch '7.4' into 8.0
* 7.4: [FrameworkBundle] Auto-generate `config/reference.php` to assist in writing and discovering app's configuration Conflicts: src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_dump_load.xml src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
2 parents e45498f + b9f4c0d commit 2271ff4

25 files changed

+588
-669
lines changed

CHANGELOG.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@ CHANGELOG
2323
* Add argument `$target` to `ContainerBuilder::registerAliasForArgument()`
2424
* Deprecate registering a service without a class when its id is a non-existing FQCN
2525
* Allow multiple `#[AsDecorator]` attributes
26-
* Handle returning arrays and config-builders from config files
2726
* Handle declaring services using PHP arrays that follow the same shape as corresponding yaml files
28-
* Add `ServicesConfig` to help writing PHP configs using yaml-like array-shapes
27+
* Add `AppReference` to help writing PHP configs using yaml-like array-shapes
2928
* Deprecate using `$this` or its internal scope from PHP config files; use the `$loader` variable instead
3029
* Deprecate XML configuration format, use YAML or PHP instead
3130
* Deprecate `ExtensionInterface::getXsdValidationBasePath()` and `getNamespace()`
32-
* Deprecate the fluent PHP format for semantic configuration, instantiate builders inline with the config array as argument and return them instead
31+
* Deprecate the fluent PHP format for semantic configuration, use `$container->extension()` or return an array instead
3332

3433
7.3
3534
---

Loader/Config/ImportsConfig.php

Lines changed: 0 additions & 30 deletions
This file was deleted.

Loader/Config/ParametersConfig.php

Lines changed: 0 additions & 26 deletions
This file was deleted.

Loader/Config/ServicesConfig.php

Lines changed: 0 additions & 122 deletions
This file was deleted.

Loader/Config/functions.php

Lines changed: 0 additions & 129 deletions
This file was deleted.

0 commit comments

Comments
 (0)