Commit 593bdfb

authored

Merge pull request #2388 from Haehnchen/feature/fix-multiple-attributes

fix indexing routing php attributes, when different attribtes in same method

2 parents 63c305c + c351ef2 commit 593bdfbCopy full SHA for 593bdfb

File tree

+11

-7

lines changed

+11

-7

lines changed

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,17 +57,15 @@ public void visitFile(@NotNull PhpClass phpClass) {`
`57`	`57`	`PhpDocUtil.processTagElementsByPredicate(docComment, this::visitPhpDocTag, phpDocTag -> true);`
`58`	`58`	`}`
`59`	`59`
`60`		`- PhpAttributesList childOfType = PsiTreeUtil.getChildOfType(method, PhpAttributesList.class);`
`61`		`- if (childOfType != null) {`
`62`		`- visitPhpAttributesList(childOfType, method, phpClass, false);`
	`60`	`+ for (PhpAttributesList phpAttributesList : PsiTreeUtil.getChildrenOfTypeAsList(method, PhpAttributesList.class)) {`
	`61`	`+ visitPhpAttributesList(phpAttributesList, method, phpClass, false);`
`63`	`62`	`}`
`64`	`63`	`}`
`65`	`64`
`66`	`65`	`Method invoke = phpClass.findOwnMethodByName("__invoke");`
`67`	`66`	`if (invoke != null) {`
`68`		`- PhpAttributesList childOfType = PsiTreeUtil.getChildOfType(phpClass, PhpAttributesList.class);`
`69`		`- if (childOfType != null) {`
`70`		`- visitPhpAttributesList(childOfType, invoke, phpClass, true);`
	`67`	`+ for (PhpAttributesList phpAttributesList : PsiTreeUtil.getChildrenOfTypeAsList(phpClass, PhpAttributesList.class)) {`
	`68`	`+ visitPhpAttributesList(phpAttributesList, invoke, phpClass, true);`
`71`	`69`	`}`
`72`	`70`	`}`
`73`	`71`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public void testRouteIdIndex() {`
`32`	`32`	`assertIndexContains(RoutesStubIndex.KEY,`
`33`	`33`	`"foo_yaml_pattern", "foo_yaml_path", "foo_yaml_path_only",`
`34`	`34`	`"foo_xml_pattern", "foo_xml_path", "foo_xml_id_only", "attributes_action", "app_my_default_attributeswithoutname",`
`35`		`- "my_post_emptyannotation", "myattributesprefix_prefixdefaultparameter_emptyattribute"`
	`35`	`+ "my_post_emptyannotation", "myattributesprefix_prefixdefaultparameter_emptyattribute", "multiple_attributes"`
`36`	`36`	`);`
`37`	`37`
`38`	`38`	`assertIndexNotContains(RoutesStubIndex.KEY,`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,12 @@ public function attributesAction()`
`187`	`187`	`{`
`188`	`188`	`}`
`189`	`189`
	`190`	`+ #[IsFoobar()]`
	`191`	`+ #[Route('/multiple_attributes', name: 'multiple_attributes')]`
	`192`	`+ public function multipleAttributes()`
	`193`	`+ {`
	`194`	`+ }`
	`195`	`+`
`190`	`196`	`#[Route('/attributesWithoutName', methods: ['GET', 'POST'])]`
`191`	`197`	`public function attributesWithoutName()`
`192`	`198`	`{`

Comments

(0)