Problem/Motivation
Same as #2269385: DependencyInjection YamlFileLoader is out of date but for Symfony the upgrade from 2.4 to 2.6.
Command used to produce the changes to the Symfony YamlFileLeader (in the symfony repo):
git diff v2.4.0..v2.6.0 src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php > /tmp/symfony-yaml-file-loader-2.4-2.6-do-not-test.diff
Proposed resolution
Some of them can be applied with patch -p6 < /tmp/symfony-yaml-file-loader-2.4-2.6-do-not-test.diff (cd core/lib/Drupal/Core/DependencyInjection before). Manual editing still required though.
Remaining tasks
Review.
User interface changes
None.
API changes
None.
| Comment | File | Size | Author |
|---|---|---|---|
| #11 | update-2375339-11.patch | 6.59 KB | hussainweb |
| #11 | interdiff-9-11.txt | 849 bytes | hussainweb |
| #9 | symfony-yaml-loader-do-not-test.diff | 8.54 KB | hussainweb |
| #5 | drupal-yaml-file-loader-2.4-2.6.diff | 7.14 KB | znerol |
| #5 | symfony-yaml-file-loader-2.4-2.6-do-not-test.diff | 8.54 KB | znerol |
Comments
Comment #1
znerol commentedComment #2
znerol commentedComment #3
dawehnerLet's mark it as duplicate, @znerol was okay with that #2366043: Upgrade to Symfony 2.6.0-beta1
Comment #4
znerol commentedReopening because #2366043: Upgrade to Symfony 2.6.0-beta1 did not take care of
core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.phpwhich is a modified copy of the symfonyYamlFileLoader.Setting to needs work, because the patch in #1 contains unrelated hunks.
Comment #5
znerol commentedReworked for the upgrade from 2.4 to 2.6.
Comment #6
lussolucaThe patch looks good, only one thing doesn't work. In Symfony 2.5 you could define a service which decorates another one (http://symfonytest.readthedocs.org/en/latest/components/dependency_injec...). On our implementation this doesn't work, do you know if we have done other alterations to the service container?
Comment #7
znerol commentedI cannot reproduce #6.
Consider the
barservice decoratingfooinsites/default/services.yml:Produces the following code in the compiled container when the patch is applied:
In contrast without the patch, service decoration does not work (which is expected behavior):
Comment #8
lussolucaOk it was a mine misconfiguration :-/
It works as expected
For me is RTBC
Comment #9
hussainwebI generated a new diff after #2377281: Upgrade to Symfony 2.6 stable and also updated the diff command in issue summary. Files attached...
Comment #10
znerol commentedThere is no
$resourcehere, use$fileinstead.Comment #11
hussainwebThanks for catching that. :)
Comment #14
hussainwebThis might needmore work when #2414235: Upgrade to Symfony 2.6.4 goes in.
Comment #16
dawehnerIs this really still applying?
Comment #20
dawehnerThis is now resolved as part of #2470693: Upgrade to Symfony 2.7.0