Commit599c55d

committed

[DependencyInjection] Option to accept excluded tags in findTaggedServiceIds

1 parent04551ad commit599c55dCopy full SHA for 599c55d

File tree

+22

-2

lines changed

+22

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ CHANGELOG`
`6`	`6`
`7`	`7`	* Make`#[AsTaggedItem]` repeatable
`8`	`8`	* Support`@>` as a shorthand for`!service_closure` in yaml files
	`9`	+* Add`ContainerBuilder::findTaggedServiceIds()` 3rd argument to return excluded services
`9`	`10`
`10`	`11`	`7.2`
`11`	`12`	`---`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1333,14 +1333,21 @@ private function doResolveServices(mixed $value, array &$inlineServices = [], bo`
`1333`	`1333`	`* }`
`1334`	`1334`	`* }`
`1335`	`1335`	`*`
	`1336`	`+ * @param bool $notExcluded Whether to include or exclude services with the "container.excluded" tag`
	`1337`	`+ *`
`1336`	`1338`	`* @return array<string, array> An array of tags with the tagged service as key, holding a list of attribute arrays`
`1337`	`1339`	`*/`
`1338`		`-publicfunctionfindTaggedServiceIds(string$name,bool$throwOnAbstract =false):array`
	`1340`	`+publicfunctionfindTaggedServiceIds(string$name,bool$throwOnAbstract =false,/* bool $notExcluded = true */):array`
`1339`	`1341`	`{`
	`1342`	`+$notExcluded =func_num_args() >2 ?func_get_arg(2) :true;`
	`1343`	`+if (!is_bool($notExcluded)) {`
	`1344`	`+thrownew \TypeError(sprintf('Argument 3 passed to %s() must be of the type bool, %s given.',__METHOD__,get_debug_type($notExcluded)));`
	`1345`	`+ }`
	`1346`	`+`
`1340`	`1347`	`$this->usedTags[] =$name;`
`1341`	`1348`	`$tags = [];`
`1342`	`1349`	`foreach ($this->getDefinitions()as$id =>$definition) {`
`1343`		`-if ($definition->hasTag($name) &&!$definition->hasTag('container.excluded')) {`
	`1350`	`+if ($definition->hasTag($name) &&(!$notExcluded \|\| !$definition->hasTag('container.excluded'))) {`
`1344`	`1351`	`if ($throwOnAbstract &&$definition->isAbstract()) {`
`1345`	`1352`	`thrownewInvalidArgumentException(\sprintf('The service "%s" tagged "%s" must not be abstract.',$id,$name));`
`1346`	`1353`	`}`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1067,6 +1067,7 @@ public function testfindTaggedServiceIds()`
`1067`	`1067`	`$builder =newContainerBuilder();`
`1068`	`1068`	`$builder`
`1069`	`1069`	`->register('foo','Bar\FooClass')`
	`1070`	`+ ->setAbstract(true)`
`1070`	`1071`	`->addTag('foo', ['foo' =>'foo'])`
`1071`	`1072`	`->addTag('bar', ['bar' =>'bar'])`
`1072`	`1073`	`->addTag('foo', ['foofoo' =>'foofoo'])`
`@@ -1083,6 +1084,17 @@ public function testfindTaggedServiceIds()`
`1083`	`1084`	`],`
`1084`	`1085`	`],$builder->findTaggedServiceIds('foo'),'->findTaggedServiceIds() returns an array of service ids and its tag attributes');`
`1085`	`1086`	`$this->assertEquals([],$builder->findTaggedServiceIds('foobar'),'->findTaggedServiceIds() returns an empty array if there is annotated services');`
	`1087`	`+$this->assertEquals([`
	`1088`	`+'foo' => [`
	`1089`	`+ ['foo' =>'foo'],`
	`1090`	`+ ['foofoo' =>'foofoo'],`
	`1091`	`+ ],`
	`1092`	`+'bar' => [[]]`
	`1093`	`+ ],$builder->findTaggedServiceIds('foo',false,false),'->findTaggedServiceIds() car include excluded services');`
	`1094`	`+`
	`1095`	`+$this->expectException(InvalidArgumentException::class);`
	`1096`	`+$this->expectExceptionMessage('The service "foo" tagged "foo" must not be abstract.');`
	`1097`	`+$builder->findTaggedServiceIds('foo',true);`
`1086`	`1098`	`}`
`1087`	`1099`
`1088`	`1100`	`publicfunctiontestFindUnusedTags()`

Comments

(0)