fix merge

Author: chalasr

Tests/EventListener/PasswordMigratingListenerTest.php

@@ -16,9 +16,9 @@
 use Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactoryInterface;
 use Symfony\Component\PasswordHasher\PasswordHasherInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\User\InMemoryUser;
 use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 use Symfony\Component\Security\Core\User\PasswordUpgraderInterface;
-use Symfony\Component\Security\Core\User\User;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 use Symfony\Component\Security\Http\Authenticator\AuthenticatorInterface;
@@ -112,7 +112,7 @@ public function testUpgradeWithoutUpgrader()
 
     public function testUserWithoutPassword()
     {
-        $this->user = new User('test', null);
+        $this->user = new InMemoryUser('test', null);
 
         $this->hasherFactory->expects($this->never())->method('getPasswordHasher');