minor #45768 Make use of the new getAttributesOfType method (Seldaek)

fabpot · fabpot · commit a037ecac64f2 · 2022-03-17T14:15:17.000+01:00
This PR was squashed before being merged into the 6.1 branch. Discussion ---------- Make use of the new getAttributesOfType method Refs #45094 | Q | A | ------------- | --- | Branch? | 6.1 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | Fix #...  | License | MIT | Doc PR | symfony/symfony-docs#...   Use the new method from #45094 Commits ------- b1fb345 Make use of the new getAttributesOfType method
diff --git a/src/Symfony/Component/Security/Http/Controller/UserValueResolver.php b/src/Symfony/Component/Security/Http/Controller/UserValueResolver.php
@@ -37,7 +37,7 @@ public function supports(Request $request, ArgumentMetadata $argument): bool
     {
         // with the attribute, the type can be any UserInterface implementation
         // otherwise, the type must be UserInterface
-        if (UserInterface::class !== $argument->getType() && !$argument->getAttributes(CurrentUser::class, ArgumentMetadata::IS_INSTANCEOF)) {
+        if (UserInterface::class !== $argument->getType() && !$argument->getAttributesOfType(CurrentUser::class, ArgumentMetadata::IS_INSTANCEOF)) {
             return false;
         }
 
diff --git a/src/Symfony/Component/Security/Http/composer.json b/src/Symfony/Component/Security/Http/composer.json
@@ -19,7 +19,7 @@
         "php": ">=8.1",
         "symfony/security-core": "^5.4|^6.0",
         "symfony/http-foundation": "^5.4|^6.0",
-        "symfony/http-kernel": "^5.4|^6.0",
+        "symfony/http-kernel": "^6.1",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/property-access": "^5.4|^6.0"
     },

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function supports(Request $request, ArgumentMetadata $argument): bool`
`37`	`37`	`{`
`38`	`38`	`// with the attribute, the type can be any UserInterface implementation`
`39`	`39`	`// otherwise, the type must be UserInterface`
`40`		`- if (UserInterface::class !== $argument->getType() && !$argument->getAttributes(CurrentUser::class, ArgumentMetadata::IS_INSTANCEOF)) {`
	`40`	`+ if (UserInterface::class !== $argument->getType() && !$argument->getAttributesOfType(CurrentUser::class, ArgumentMetadata::IS_INSTANCEOF)) {`
`41`	`41`	`return false;`
`42`	`42`	`}`
`43`	`43`