Commit 29fddd9

authored

Merge pull request #1993 from Haehnchen/feature/1991-asdecorates-attribute

#1991 support "decorates" inside "AsDecorator" attribute

2 parents 6b8f850 + 64dc329 commit 29fddd9Copy full SHA for 29fddd9

File tree

+47

-1

lines changed

+47

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ public class ServiceContainerUtil {`
`73`	`73`	`public static final String AUTOWIRE_ATTRIBUTE_CLASS = "\\Symfony\\Component\\DependencyInjection\\Attribute\\Autowire";`
`74`	`74`	`public static final String TAGGED_ITERATOR_ATTRIBUTE_CLASS = "\\Symfony\\Component\\DependencyInjection\\Attribute\\TaggedIterator";`
`75`	`75`	`public static final String TAGGED_LOCATOR_ATTRIBUTE_CLASS = "\\Symfony\\Component\\DependencyInjection\\Attribute\\TaggedLocator";`
	`76`	`+ public static final String DECORATOR_ATTRIBUTE_CLASS = "\\Symfony\\Component\\DependencyInjection\\Attribute\\AsDecorator";`
`76`	`77`
`77`	`78`	`@NotNull`
`78`	`79`	`public static Collection<ServiceSerializable> getServicesInFile(@NotNull PsiFile psiFile) {`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -113,8 +113,13 @@ public void register(@NotNull GotoCompletionRegistrarParameter registrar) {`
`113`	`113`	`);`
`114`	`114`
`115`	`115`	`// #[Autowire(service: 'some_service')]`
	`116`	`+ // #[AsDecorator(decorates: 'some_service')]`
`116`	`117`	`registrar.register(`
`117`		`- PhpElementsUtil.getAttributeNamedArgumentStringPattern(ServiceContainerUtil.AUTOWIRE_ATTRIBUTE_CLASS, "service"),`
	`118`	`+ PlatformPatterns.or(`
	`119`	`+ PhpElementsUtil.getAttributeNamedArgumentStringPattern(ServiceContainerUtil.AUTOWIRE_ATTRIBUTE_CLASS, "service"),`
	`120`	`+ PhpElementsUtil.getAttributeNamedArgumentStringPattern(ServiceContainerUtil.DECORATOR_ATTRIBUTE_CLASS, "decorates"),`
	`121`	`+ PhpElementsUtil.getFirstAttributeStringPattern(ServiceContainerUtil.DECORATOR_ATTRIBUTE_CLASS)`
	`122`	`+ ),`
`118`	`123`	`psiElement -> {`
`119`	`124`	`PsiElement context = psiElement.getContext();`
`120`	`125`	`if (!(context instanceof StringLiteralExpression)) {`

Lines changed: 30 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -228,4 +228,34 @@ public void testServiceContributorForNamedAttribute() {`
`228`	`228`	`PlatformPatterns.psiElement()`
`229`	`229`	`);`
`230`	`230`	`}`
	`231`	`+`
	`232`	`+ public void testServiceContributorDecoratesAttribute() {`
	`233`	`+ assertCompletionContains(PhpFileType.INSTANCE, "<?php\n" +`
	`234`	`+ "use Symfony\\Component\\DependencyInjection\\Attribute\\AsDecorator;\n" +`
	`235`	`+ "#[AsDecorator('<caret>')]\n" +`
	`236`	`+ "class HandlerCollection {}",`
	`237`	`+ "foo_bar_service"`
	`238`	`+ );`
	`239`	`+`
	`240`	`+ assertNavigationMatch(PhpFileType.INSTANCE, "<?php\n" +`
	`241`	`+ "use Symfony\\Component\\DependencyInjection\\Attribute\\AsDecorator;\n" +`
	`242`	`+ "#[AsDecorator(decorates: 'foo_bar<caret>_service')]\n" +`
	`243`	`+ "class HandlerCollection {}",`
	`244`	`+ PlatformPatterns.psiElement()`
	`245`	`+ );`
	`246`	`+`
	`247`	`+ assertCompletionContains(PhpFileType.INSTANCE, "<?php\n" +`
	`248`	`+ "use Symfony\\Component\\DependencyInjection\\Attribute\\AsDecorator;\n" +`
	`249`	`+ "#[AsDecorator(decorates: '<caret>')]\n" +`
	`250`	`+ "class HandlerCollection {}",`
	`251`	`+ "foo_bar_service"`
	`252`	`+ );`
	`253`	`+`
	`254`	`+ assertNavigationMatch(PhpFileType.INSTANCE, "<?php\n" +`
	`255`	`+ "use Symfony\\Component\\DependencyInjection\\Attribute\\AsDecorator;\n" +`
	`256`	`+ "#[AsDecorator(decorates: 'foo_bar<caret>_service')]\n" +`
	`257`	`+ "class HandlerCollection {}",`
	`258`	`+ PlatformPatterns.psiElement()`
	`259`	`+ );`
	`260`	`+ }`
`231`	`261`	`}`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,16 @@ public function __construct(`
`47`	`47`	`) {`
`48`	`48`	`}`
`49`	`49`	`}`
	`50`	`+`
	`51`	`+ class AsDecorator`
	`52`	`+ {`
	`53`	`+ public function __construct(`
	`54`	`+ public string $decorates,`
	`55`	`+ public int $priority = 0,`
	`56`	`+ public int $onInvalid = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE,`
	`57`	`+ ) {`
	`58`	`+ }`
	`59`	`+ }`
`50`	`60`	`}`
`51`	`61`
`52`	`62`	`namespace`

Comments

(0)