refactor: Update for Symfony >= 5.4.

ecphp · Jul 19, 2022 · fa5b2dc · fa5b2dc
1 parent 2eb1f48
commit fa5b2dc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 25 deletions.
diff --git a/psalm.xml b/psalm.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="7"
-    totallyTyped="true"
+    errorLevel="4"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"

diff --git a/spec/EcPhp/EuLoginBundle/Security/Core/User/EuLoginUserProviderSpec.php b/spec/EcPhp/EuLoginBundle/Security/Core/User/EuLoginUserProviderSpec.php
@@ -20,7 +20,7 @@
 use Nyholm\Psr7\Response;
 use PhpSpec\ObjectBehavior;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
-use Symfony\Component\Security\Core\User\User;
+use Symfony\Component\Security\Core\User\InMemoryUser;
 
 class EuLoginUserProviderSpec extends ObjectBehavior
 {
@@ -31,7 +31,7 @@ public function it_can_check_if_the_user_class_is_supported()
             ->shouldReturn(true);
 
         $this
-            ->supportsClass(User::class)
+            ->supportsClass(InMemoryUser::class)
             ->shouldReturn(false);
     }
 
@@ -235,7 +235,7 @@ public function it_can_refresh_a_user(EuLoginUserInterface $user)
     {
         $this
             ->shouldThrow(UnsupportedUserException::class)
-            ->during('refreshUser', [new User('foo', 'bar')]);
+            ->during('refreshUser', [new InMemoryUser('foo', 'bar')]);
 
         $this
             ->refreshUser($user)

diff --git a/spec/EcPhp/EuLoginBundle/Security/Core/User/EuLoginUserSpec.php b/spec/EcPhp/EuLoginBundle/Security/Core/User/EuLoginUserSpec.php
@@ -189,7 +189,7 @@ public function it_is_initializable()
             ->shouldBeNull();
 
         $this
-            ->getUser()
+            ->getUserIdentifier()
             ->shouldReturn('username');
 
         $this
@@ -299,10 +299,7 @@ public function let()
         $response = new Response(200, ['Content-Type' => 'application/xml'], $body);
         $data = (new Introspector())->parse($response)['serviceResponse']['authenticationSuccess'];
 
-        $user = new CasUser($data);
-
-        $this
-            ->beConstructedWith($user);
+        $this->beConstructedWith(new CasUser($data));
     }
 
     private function getAttributesData(): array

diff --git a/src/Security/Core/User/EuLoginUser.php b/src/Security/Core/User/EuLoginUser.php
@@ -256,21 +256,6 @@ public function getUid(): ?string
         return $this->user->getAttribute('uid');
     }
 
-    /**
-     * @deprecated use getUserIdentifier() instead
-     */
-    public function getUser(): string
-    {
-        trigger_deprecation(
-            'ecphp/eu-login-bundle',
-            '2.2.3',
-            'The method "%s::getUser()" is deprecated, use %s::getUserIdentifier() instead.',
-            EuLoginUser::class
-        );
-
-        return $this->user->getUsername();
-    }
-
     public function getUserIdentifier()
     {
         return $this->user->getUserIdentifier();