merged 2.0
This commit is contained in:
commit
d2fd9ce7b9
@ -211,6 +211,12 @@ class YamlFileLoader extends FileLoader
|
|||||||
$name = $tag['name'];
|
$name = $tag['name'];
|
||||||
unset($tag['name']);
|
unset($tag['name']);
|
||||||
|
|
||||||
|
foreach ($tag as $attribute => $value) {
|
||||||
|
if (!is_scalar($value)) {
|
||||||
|
throw new InvalidArgumentException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s" in %s.', $id, $name, $file));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$definition->addTag($name, $tag);
|
$definition->addTag($name, $tag);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,6 @@
|
|||||||
|
services:
|
||||||
|
foo_service:
|
||||||
|
class: FooClass
|
||||||
|
tags:
|
||||||
|
# tag-attribute is not a scalar
|
||||||
|
- { name: foo, foo: { foo: foo, bar: bar } }
|
@ -196,4 +196,16 @@ class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->assertStringStartsWith('A "tags" entry is missing a "name" key for service ', $e->getMessage(), '->load() throws an InvalidArgumentException if a tag is missing the name key');
|
$this->assertStringStartsWith('A "tags" entry is missing a "name" key for service ', $e->getMessage(), '->load() throws an InvalidArgumentException if a tag is missing the name key');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testTagWithAttributeArrayThrowsException()
|
||||||
|
{
|
||||||
|
$loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
|
||||||
|
try {
|
||||||
|
$loader->load('badtag3.yml');
|
||||||
|
$this->fail('->load() should throw an exception when a tag-attribute is not a scalar');
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if a tag-attribute is not a scalar');
|
||||||
|
$this->assertStringStartsWith('A "tags" attribute must be of a scalar-type for service ', $e->getMessage(), '->load() throws an InvalidArgumentException if a tag-attribute is not a scalar');
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user