tests fixes

Author: a-menshchikov

Tests/Security/Authentication/Provider/SamlProviderTest.php

@@ -8,11 +8,11 @@
 use Hslavich\OneloginSamlBundle\Security\Authentication\Token\SamlTokenFactory;
 use Hslavich\OneloginSamlBundle\Security\User\SamlUserFactoryInterface;
 use Hslavich\OneloginSamlBundle\Security\User\SamlUserInterface;
+use Hslavich\OneloginSamlBundle\Security\User\SamlUserProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 use Symfony\Component\Security\Core\User\UserInterface;
-use Symfony\Component\Security\Core\User\UserProviderInterface;
 
 class SamlProviderTest extends TestCase
 {
@@ -140,7 +140,7 @@ protected function getSamlToken(): SamlToken
 
     protected function getProvider($user = null, $userFactory = null, $entityManager = null, $persist = false): SamlProvider
     {
-        $userProvider = $this->createMock(UserProviderInterface::class);
+        $userProvider = $this->createMock(SamlUserProvider::class);
         if ($user) {
             $userProvider
                 ->method('loadUserByUsername')

Tests/Security/Http/Authenticator/SamlAuthenticatorTest.php

@@ -7,6 +7,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Hslavich\OneloginSamlBundle\Security\Http\Authenticator\SamlAuthenticator;
 use Hslavich\OneloginSamlBundle\Security\User\SamlUserFactoryInterface;
+use Hslavich\OneloginSamlBundle\Security\User\SamlUserProvider;
 use Hslavich\OneloginSamlBundle\Tests\TestUser;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\MockObject\Rule\InvokedCount;
@@ -16,12 +17,10 @@
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\Exception\SessionUnavailableException;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
-use Symfony\Component\Security\Core\User\UserProviderInterface;
 use Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface;
 use Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface;
 use Symfony\Component\Security\Http\Authenticator\Passport\UserPassportInterface;
 use Symfony\Component\Security\Http\HttpUtils;
-use const false;
 
 class SamlAuthenticatorTest extends TestCase
 {
@@ -40,7 +39,7 @@ public function testNoSessionException(Request $request, string $message): void
     {
         $authenticator = new SamlAuthenticator(
             $httpUtils = $this->createMock(HttpUtils::class),
-            $this->createMock(UserProviderInterface::class),
+            $this->createMock(SamlUserProvider::class),
             $this->createMock(\OneLogin\Saml2\Auth::class),
             $this->createMock(AuthenticationSuccessHandlerInterface::class),
             $this->createMock(AuthenticationFailureHandlerInterface::class),
@@ -73,7 +72,7 @@ public function testAuthenticationException(): void
 
         $authenticator = new SamlAuthenticator(
             $httpUtils = $this->createMock(HttpUtils::class),
-            $this->createMock(UserProviderInterface::class),
+            $this->createMock(SamlUserProvider::class),
             $auth,
             $this->createMock(AuthenticationSuccessHandlerInterface::class),
             $this->createMock(AuthenticationFailureHandlerInterface::class),
@@ -88,7 +87,7 @@ public function testAuthenticationException(): void
 
     public function testUsernameNotFound(): void
     {
-        $userProvider = $this->createMock(UserProviderInterface::class);
+        $userProvider = $this->createMock(SamlUserProvider::class);
         $userProvider
             ->expects(self::once())
             ->method('loadUserByUsername')
@@ -111,7 +110,7 @@ public function testUsernameNotFound(): void
 
     public function testUserFactoryException(): void
     {
-        $userProvider = $this->createMock(UserProviderInterface::class);
+        $userProvider = $this->createMock(SamlUserProvider::class);
         $userProvider
             ->expects(self::once())
             ->method('loadUserByUsername')
@@ -137,7 +136,7 @@ public function testAuthenticationWithLoad(): void
     {
         $user = new TestUser('test', ['ROLE_USER']);
 
-        $userProvider = $this->createMock(UserProviderInterface::class);
+        $userProvider = $this->createMock(SamlUserProvider::class);
         $userProvider
             ->expects(self::once())
             ->method('loadUserByUsername')
@@ -163,7 +162,7 @@ public function testAuthenticationWithGenerate(): void
     {
         $user = new TestUser('test', ['ROLE_USER']);
 
-        $userProvider = $this->createMock(UserProviderInterface::class);
+        $userProvider = $this->createMock(SamlUserProvider::class);
         $userProvider
             ->expects(self::once())
             ->method('loadUserByUsername')
@@ -223,7 +222,7 @@ private function createSamlAuthenticatorForSupports(InvokedCount $checkRequestEx
 
         return new SamlAuthenticator(
             $httpUtils,
-            $this->createMock(UserProviderInterface::class),
+            $this->createMock(SamlUserProvider::class),
             $this->createMock(\OneLogin\Saml2\Auth::class),
             $this->createMock(AuthenticationSuccessHandlerInterface::class),
             $this->createMock(AuthenticationFailureHandlerInterface::class),