Rewrite condition for legacy call

dbrumann · dbrumann · commit 12e0cefaba34 · 2021-06-21T20:27:52.000+02:00
diff --git a/src/Symfony/Component/PasswordHasher/Hasher/UserPasswordHasher.php b/src/Symfony/Component/PasswordHasher/Hasher/UserPasswordHasher.php
@@ -44,9 +44,13 @@ public function hashPassword($user, string $plainPassword): string
         }
 
         $salt = null;
-        if (method_exists($user, 'getSalt')) {
+
+        if ($user instanceof LegacyPasswordAuthenticatedUserInterface) {
+            $salt = $user->getSalt();
+        } elseif ($user instanceof UserInterface) {
             $salt = $user->getSalt();
-            if ($salt && !$user instanceof LegacyPasswordAuthenticatedUserInterface) {
+
+            if (null !== $salt) {
                 trigger_deprecation('symfony/password-hasher', '5.3', 'Returning a string from "getSalt()" without implementing the "%s" interface is deprecated, the "%s" class should implement it.', LegacyPasswordAuthenticatedUserInterface::class, get_debug_type($user));
             }
         }
@@ -69,9 +73,13 @@ public function isPasswordValid($user, string $plainPassword): bool
         }
 
         $salt = null;
-        if (method_exists($user, 'getSalt')) {
+
+        if ($user instanceof LegacyPasswordAuthenticatedUserInterface) {
+            $salt = $user->getSalt();
+        } elseif ($user instanceof UserInterface) {
             $salt = $user->getSalt();
-            if ($salt && !$user instanceof LegacyPasswordAuthenticatedUserInterface) {
+
+            if (null !== $salt) {
                 trigger_deprecation('symfony/password-hasher', '5.3', 'Returning a string from "getSalt()" without implementing the "%s" interface is deprecated, the "%s" class should implement it.', LegacyPasswordAuthenticatedUserInterface::class, get_debug_type($user));
             }
         }
diff --git a/src/Symfony/Component/PasswordHasher/Tests/Fixtures/TestLegacyPasswordAuthenticatedUser.php b/src/Symfony/Component/PasswordHasher/Tests/Fixtures/TestLegacyPasswordAuthenticatedUser.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php
 
 namespace Symfony\Component\PasswordHasher\Tests\Fixtures;
 
diff --git a/src/Symfony/Component/PasswordHasher/Tests/Fixtures/TestPasswordAuthenticatedUser.php b/src/Symfony/Component/PasswordHasher/Tests/Fixtures/TestPasswordAuthenticatedUser.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php
 
 namespace Symfony\Component\PasswordHasher\Tests\Fixtures;
 

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,13 @@ public function hashPassword($user, string $plainPassword): string`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`$salt = null;`
`47`		`- if (method_exists($user, 'getSalt')) {`
	`47`	`+`
	`48`	`+ if ($user instanceof LegacyPasswordAuthenticatedUserInterface) {`
	`49`	`+ $salt = $user->getSalt();`
	`50`	`+ } elseif ($user instanceof UserInterface) {`
`48`	`51`	`$salt = $user->getSalt();`
`49`		`- if ($salt && !$user instanceof LegacyPasswordAuthenticatedUserInterface) {`
	`52`	`+`
	`53`	`+ if (null !== $salt) {`
`50`	`54`	`trigger_deprecation('symfony/password-hasher', '5.3', 'Returning a string from "getSalt()" without implementing the "%s" interface is deprecated, the "%s" class should implement it.', LegacyPasswordAuthenticatedUserInterface::class, get_debug_type($user));`
`51`	`55`	`}`
`52`	`56`	`}`
`@@ -69,9 +73,13 @@ public function isPasswordValid($user, string $plainPassword): bool`
`69`	`73`	`}`
`70`	`74`
`71`	`75`	`$salt = null;`
`72`		`- if (method_exists($user, 'getSalt')) {`
	`76`	`+`
	`77`	`+ if ($user instanceof LegacyPasswordAuthenticatedUserInterface) {`
	`78`	`+ $salt = $user->getSalt();`
	`79`	`+ } elseif ($user instanceof UserInterface) {`
`73`	`80`	`$salt = $user->getSalt();`
`74`		`- if ($salt && !$user instanceof LegacyPasswordAuthenticatedUserInterface) {`
	`81`	`+`
	`82`	`+ if (null !== $salt) {`
`75`	`83`	`trigger_deprecation('symfony/password-hasher', '5.3', 'Returning a string from "getSalt()" without implementing the "%s" interface is deprecated, the "%s" class should implement it.', LegacyPasswordAuthenticatedUserInterface::class, get_debug_type($user));`
`76`	`84`	`}`
`77`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<?php declare(strict_types=1);`
	`1`	`+<?php`
`2`	`2`
`3`	`3`	`namespace Symfony\Component\PasswordHasher\Tests\Fixtures;`
`4`	`4`