[Tests] Streamline

Author: OskarStark

Tests/Command/UserPasswordHashCommandTest.php

@@ -277,10 +277,11 @@ public function testNonInteractiveEncodePasswordUsesFirstUserClass()
 
     public function testThrowsExceptionOnNoConfiguredHashers()
     {
+        $tester = new CommandTester(new UserPasswordHashCommand($this->getMockBuilder(PasswordHasherFactoryInterface::class)->getMock(), []));
+
         $this->expectException(\RuntimeException::class);
         $this->expectExceptionMessage('There are no configured password hashers for the "security" extension.');
 
-        $tester = new CommandTester(new UserPasswordHashCommand($this->getMockBuilder(PasswordHasherFactoryInterface::class)->getMock(), []));
         $tester->execute([
             'password' => 'password',
         ], ['interactive' => false]);

Tests/Hasher/MessageDigestPasswordHasherTest.php

@@ -38,16 +38,19 @@ public function testHash()
 
     public function testHashAlgorithmDoesNotExist()
     {
-        $this->expectException(\LogicException::class);
         $hasher = new MessageDigestPasswordHasher('foobar');
+
+        $this->expectException(\LogicException::class);
+
         $hasher->hash('password', '');
     }
 
     public function testHashLength()
     {
-        $this->expectException(InvalidPasswordException::class);
         $hasher = new MessageDigestPasswordHasher();
 
+        $this->expectException(InvalidPasswordException::class);
+
         $hasher->hash(str_repeat('a', 5000), 'salt');
     }
 

Tests/Hasher/PasswordHasherFactoryTest.php

@@ -130,14 +130,16 @@ public function testGetNullNamedHasherForHasherAware()
 
     public function testGetInvalidNamedHasherForHasherAware()
     {
-        $this->expectException(\RuntimeException::class);
         $factory = new PasswordHasherFactory([
             HasherAwareUser::class => new MessageDigestPasswordHasher('sha1'),
             'hasher_name' => new MessageDigestPasswordHasher('sha256'),
         ]);
 
         $user = new HasherAwareUser();
         $user->hasherName = 'invalid_hasher_name';
+
+        $this->expectException(\RuntimeException::class);
+
         $factory->getPasswordHasher($user);
     }
 

Tests/Hasher/Pbkdf2PasswordHasherTest.php

@@ -38,16 +38,19 @@ public function testHash()
 
     public function testHashAlgorithmDoesNotExist()
     {
-        $this->expectException(\LogicException::class);
         $hasher = new Pbkdf2PasswordHasher('foobar');
+
+        $this->expectException(\LogicException::class);
+
         $hasher->hash('password', '');
     }
 
     public function testHashLength()
     {
-        $this->expectException(InvalidPasswordException::class);
         $hasher = new Pbkdf2PasswordHasher('foobar');
 
+        $this->expectException(InvalidPasswordException::class);
+
         $hasher->hash(str_repeat('a', 5000), 'salt');
     }
 

Tests/Hasher/SodiumPasswordHasherTest.php

@@ -52,8 +52,8 @@ public function testNonArgonValidation()
     public function testHashLength()
     {
         $this->expectException(InvalidPasswordException::class);
-        $hasher = new SodiumPasswordHasher();
-        $hasher->hash(str_repeat('a', 4097));
+
+        (new SodiumPasswordHasher())->hash(str_repeat('a', 4097));
     }
 
     public function testCheckPasswordLength()