Skip to content

Commit 085358c

Browse files
committed
bug #1027 Fixing wrong messaging in make:auth about checking password in final steps (weaverryan)
This PR was merged into the 1.0-dev branch. Discussion ---------- Fixing wrong messaging in make:auth about checking password in final steps Fixes #1020 Commits ------- 3b1f4b3 Fixing wrong messaging in make:auth about checking password in final steps
2 parents ec324cd + 3b1f4b3 commit 085358c

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/Maker/MakeAuthenticator.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,8 @@ private function generateNextMessage(bool $securityYamlUpdated, string $authenti
368368
$nextTexts[] = sprintf('- Review <info>%s::getUser()</info> to make sure it matches your needs.', $authenticatorClass);
369369
}
370370

371-
if (!$this->userClassHasEncoder($securityData, $userClass)) {
371+
// this only applies to Guard authentication AND if the user does not have a hasher configured
372+
if (!$this->useSecurity52 && !$this->userClassHasEncoder($securityData, $userClass)) {
372373
$nextTexts[] = sprintf('- Check the user\'s password in <info>%s::checkCredentials()</info>.', $authenticatorClass);
373374
}
374375

@@ -381,11 +382,11 @@ private function generateNextMessage(bool $securityYamlUpdated, string $authenti
381382
private function userClassHasEncoder(array $securityData, string $userClass): bool
382383
{
383384
$userNeedsEncoder = false;
384-
if (isset($securityData['security']['encoders']) && $securityData['security']['encoders']) {
385-
foreach ($securityData['security']['encoders'] as $userClassWithEncoder => $encoder) {
386-
if ($userClass === $userClassWithEncoder || is_subclass_of($userClass, $userClassWithEncoder)) {
387-
$userNeedsEncoder = true;
388-
}
385+
$hashersData = $securityData['security']['encoders'] ?? $securityData['security']['encoders'] ?? [];
386+
387+
foreach ($hashersData as $userClassWithEncoder => $encoder) {
388+
if ($userClass === $userClassWithEncoder || is_subclass_of($userClass, $userClassWithEncoder) || class_implements($userClass, $userClassWithEncoder)) {
389+
$userNeedsEncoder = true;
389390
}
390391
}
391392

0 commit comments

Comments
 (0)