Commit 2271ff4
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.phpFile tree
25 files changed
+588
-669
lines changed- Loader
- Configurator
- Config
- Tests
- Fixtures/config
- Loader
- Configurator
25 files changed
+588
-669
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
27 | 26 | | |
28 | | - | |
| 27 | + | |
29 | 28 | | |
30 | 29 | | |
31 | 30 | | |
32 | | - | |
| 31 | + | |
33 | 32 | | |
34 | 33 | | |
35 | 34 | | |
| |||
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
0 commit comments