[DependencyInjection] Add normalization to tag options #9489
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| <?xml version="1.0" ?> | ||
|
|
||
| <container xmlns="http://symfony.com/schema/dic/services" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> | ||
| <services> | ||
|
There was a problem hiding this comment. please be consistent with indentation |
||
| <service id="foo" class="BarClass"> | ||
| <tag name="foo_tag" | ||
| some-option="cat" | ||
| some_option="ciz" | ||
| other-option="lorem" | ||
| an_other-option="ipsum" | ||
| /> | ||
| </service> | ||
| </services> | ||
| </container> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -231,6 +231,29 @@ public function testLoadServices() | |
| $this->assertFalse($aliases['another_alias_for_foo']->isPublic()); | ||
| } | ||
|
|
||
| public function testParsesTags() | ||
|
There was a problem hiding this comment. testParseTags makes more sense if we try to read the method name, check test method below for consistency |
||
| { | ||
| $container = new ContainerBuilder(); | ||
| $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml')); | ||
| $loader->load('services10.xml'); | ||
|
|
||
| $services = $container->findTaggedServiceIds('foo_tag'); | ||
| $this->assertCount(1, $services); | ||
|
|
||
| foreach ($services as $id => $tagAttributes) { | ||
| foreach ($tagAttributes as $attributes) { | ||
| $this->assertArrayHasKey('other_option', $attributes); | ||
| $this->assertEquals('lorem', $attributes['other_option']); | ||
| $this->assertArrayHasKey('other-option', $attributes, 'unnormalized tag attributes should not be removed'); | ||
|
|
||
| $this->assertEquals('ciz', $attributes['some_option'], 'no overriding should be done when normalizing'); | ||
|
There was a problem hiding this comment. the note should land on the next line |
||
| $this->assertEquals('cat', $attributes['some-option']); | ||
|
|
||
| $this->assertArrayNotHasKey('an_other_option', $attributes, 'normalization should not be done when an underscore is already found'); | ||
|
There was a problem hiding this comment. so it does not normalize other - 's ? this sounds weird There was a problem hiding this comment. this is consistent with the way the configuration processing works: it you are mixing dashes and underscores, it assumes that it is not a case where the dash is here because of the difference between the XML and YAML conventions. There was a problem hiding this comment. yeah 👶 I read it also above for BC purposes thanks @stof |
||
| } | ||
| } | ||
| } | ||
|
|
||
| public function testConvertDomElementToArray() | ||
| { | ||
| $doc = new \DOMDocument("1.0"); | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <?xml version="1.0" ?> | ||
|
|
||
| <container xmlns="http://symfony.com/schema/dic/services" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> | ||
| <services> | ||
|
There was a problem hiding this comment. i think indentation needs to be here 4 spaces |
||
| <service id="foo" class="BarClass" /> | ||
| </services> | ||
| </container> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
line break?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
line break?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i guess that piece of logic goes together with the one below