Merge pull request #56790 from nextcloud/refactor/password-confirm-attribute-getstrict

AndyScherzinger · web-flow · commit 3cdfe6dbfad3 · 2025-12-04T19:04:27.000+01:00
refactor: improve reflection attribute typing
diff --git a/lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php b/lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php
@@ -24,6 +24,7 @@
 use OCP\Session\Exceptions\SessionNotAvailableException;
 use OCP\User\Backend\IPasswordConfirmationBackend;
 use Psr\Log\LoggerInterface;
+use ReflectionAttribute;
 use ReflectionMethod;
 
 class PasswordConfirmationMiddleware extends Middleware {
@@ -115,6 +116,7 @@ private function needsPasswordConfirmation(ReflectionMethod $reflectionMethod):
 	}
 
 	private function isPasswordConfirmationStrict(ReflectionMethod $reflectionMethod): bool {
+		/** @var ReflectionAttribute<PasswordConfirmationRequired>[] $attributes */
 		$attributes = $reflectionMethod->getAttributes(PasswordConfirmationRequired::class);
 		return !empty($attributes) && ($attributes[0]->newInstance()->getStrict());
 	}

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`use OCP\Session\Exceptions\SessionNotAvailableException;`
`25`	`25`	`use OCP\User\Backend\IPasswordConfirmationBackend;`
`26`	`26`	`use Psr\Log\LoggerInterface;`
	`27`	`+use ReflectionAttribute;`
`27`	`28`	`use ReflectionMethod;`
`28`	`29`
`29`	`30`	`class PasswordConfirmationMiddleware extends Middleware {`
`@@ -115,6 +116,7 @@ private function needsPasswordConfirmation(ReflectionMethod $reflectionMethod):`
`115`	`116`	`}`
`116`	`117`
`117`	`118`	`private function isPasswordConfirmationStrict(ReflectionMethod $reflectionMethod): bool {`
	`119`	`+ /** @var ReflectionAttribute<PasswordConfirmationRequired>[] $attributes */`
`118`	`120`	`$attributes = $reflectionMethod->getAttributes(PasswordConfirmationRequired::class);`
`119`	`121`	`return !empty($attributes) && ($attributes[0]->newInstance()->getStrict());`
`120`	`122`	`}`