Code cleaning.

peter17 · peter17 · commit 005cd26bef37 · 2021-07-29T18:39:16.000+02:00
diff --git a/src/Symfony/Component/PasswordHasher/Hasher/PasswordHasherFactory.php b/src/Symfony/Component/PasswordHasher/Hasher/PasswordHasherFactory.php
@@ -104,7 +104,7 @@ private function createHasher(array $config, bool $isExtra = false): PasswordHas
         return new MigratingPasswordHasher($hasher, ...$extrapasswordHashers);
     }
 
-    private function createHasherUsingAdapter($hasherKey)
+    private function createHasherUsingAdapter(string $hasherKey): PasswordHasherInterface
     {
         if (!$this->passwordHashers[$hasherKey] instanceof PasswordHasherInterface) {
             $this->passwordHashers[$hasherKey] = $this->passwordHashers[$hasherKey] instanceof PasswordEncoderInterface
@@ -147,10 +147,8 @@ private function getHasherConfigFromAlgorithm(array $config): array
             $hasherChain = [$this->createHasher($config, true)];
 
             foreach ($frompasswordHashers as $name) {
-                if ($hasher = $this->passwordHashers[$name] ?? false) {
+                if (isset($this->passwordHashers[$name])) {
                     $hasher = $this->createHasherUsingAdapter($name);
-
-                    $hasher = $hasher instanceof PasswordHasherInterface ? $hasher : $this->createHasher($hasher, true);
                 } else {
                     $hasher = $this->createHasher(['algorithm' => $name], true);
                 }

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ private function createHasher(array $config, bool $isExtra = false): PasswordHas`
`104`	`104`	`return new MigratingPasswordHasher($hasher, ...$extrapasswordHashers);`
`105`	`105`	`}`
`106`	`106`
`107`		`- private function createHasherUsingAdapter($hasherKey)`
	`107`	`+ private function createHasherUsingAdapter(string $hasherKey): PasswordHasherInterface`
`108`	`108`	`{`
`109`	`109`	`if (!$this->passwordHashers[$hasherKey] instanceof PasswordHasherInterface) {`
`110`	`110`	`$this->passwordHashers[$hasherKey] = $this->passwordHashers[$hasherKey] instanceof PasswordEncoderInterface`
`@@ -147,10 +147,8 @@ private function getHasherConfigFromAlgorithm(array $config): array`
`147`	`147`	`$hasherChain = [$this->createHasher($config, true)];`
`148`	`148`
`149`	`149`	`foreach ($frompasswordHashers as $name) {`
`150`		`- if ($hasher = $this->passwordHashers[$name] ?? false) {`
	`150`	`+ if (isset($this->passwordHashers[$name])) {`
`151`	`151`	`$hasher = $this->createHasherUsingAdapter($name);`
`152`		`-`
`153`		`- $hasher = $hasher instanceof PasswordHasherInterface ? $hasher : $this->createHasher($hasher, true);`
`154`	`152`	`} else {`
`155`	`153`	`$hasher = $this->createHasher(['algorithm' => $name], true);`
`156`	`154`	`}`