Use typed properties in tests as much as possible

nicolas-grekas · nicolas-grekas · commit deaf21421365 · 2023-07-25T10:53:33.000+02:00
diff --git a/Tests/Command/UserPasswordHashCommandTest.php b/Tests/Command/UserPasswordHashCommandTest.php
@@ -24,9 +24,8 @@
 
 class UserPasswordHashCommandTest extends TestCase
 {
-    /** @var CommandTester */
-    private $passwordHasherCommandTester;
-    private $colSize;
+    private ?CommandTester $passwordHasherCommandTester = null;
+    private string|false $colSize;
 
     public function testEncodePasswordEmptySalt()
     {
diff --git a/Tests/Fixtures/TestLegacyPasswordAuthenticatedUser.php b/Tests/Fixtures/TestLegacyPasswordAuthenticatedUser.php
@@ -7,10 +7,10 @@
 
 final class TestLegacyPasswordAuthenticatedUser implements LegacyPasswordAuthenticatedUserInterface, UserInterface
 {
-    private $username;
-    private $password;
-    private $salt;
-    private $roles;
+    private string $username;
+    private ?string $password;
+    private ?string $salt;
+    private array $roles;
 
     public function __construct(string $username, ?string $password = null, ?string $salt = null, array $roles = [])
     {
diff --git a/Tests/Fixtures/TestPasswordAuthenticatedUser.php b/Tests/Fixtures/TestPasswordAuthenticatedUser.php
@@ -6,7 +6,7 @@
 
 final class TestPasswordAuthenticatedUser implements PasswordAuthenticatedUserInterface
 {
-    private $password;
+    private ?string $password;
 
     public function __construct(?string $password = null)
     {
diff --git a/Tests/Hasher/PasswordHasherFactoryTest.php b/Tests/Hasher/PasswordHasherFactoryTest.php
@@ -218,7 +218,7 @@ class SomeChildUser extends SomeUser
 
 class HasherAwareUser extends SomeUser implements PasswordHasherAwareInterface
 {
-    public $hasherName = 'hasher_name';
+    public ?string $hasherName = 'hasher_name';
 
     public function getPasswordHasherName(): ?string
     {

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,8 @@`
`24`	`24`
`25`	`25`	`class UserPasswordHashCommandTest extends TestCase`
`26`	`26`	`{`
`27`		`- /** @var CommandTester */`
`28`		`- private $passwordHasherCommandTester;`
`29`		`- private $colSize;`
	`27`	`+ private ?CommandTester $passwordHasherCommandTester = null;`
	`28`	`+ private string\|false $colSize;`
`30`	`29`
`31`	`30`	`public function testEncodePasswordEmptySalt()`
`32`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,10 @@`
`7`	`7`
`8`	`8`	`final class TestLegacyPasswordAuthenticatedUser implements LegacyPasswordAuthenticatedUserInterface, UserInterface`
`9`	`9`	`{`
`10`		`- private $username;`
`11`		`- private $password;`
`12`		`- private $salt;`
`13`		`- private $roles;`
	`10`	`+ private string $username;`
	`11`	`+ private ?string $password;`
	`12`	`+ private ?string $salt;`
	`13`	`+ private array $roles;`
`14`	`14`
`15`	`15`	`public function __construct(string $username, ?string $password = null, ?string $salt = null, array $roles = [])`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`final class TestPasswordAuthenticatedUser implements PasswordAuthenticatedUserInterface`
`8`	`8`	`{`
`9`		`- private $password;`
	`9`	`+ private ?string $password;`
`10`	`10`
`11`	`11`	`public function __construct(?string $password = null)`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ class SomeChildUser extends SomeUser`
`218`	`218`
`219`	`219`	`class HasherAwareUser extends SomeUser implements PasswordHasherAwareInterface`
`220`	`220`	`{`
`221`		`- public $hasherName = 'hasher_name';`
	`221`	`+ public ?string $hasherName = 'hasher_name';`
`222`	`222`
`223`	`223`	`public function getPasswordHasherName(): ?string`
`224`	`224`	`{`