Psalm fixes

Author: acrobat

Domain/SecurityIdentityRetrievalStrategy.php

@@ -39,6 +39,8 @@ public function __construct(RoleHierarchyInterface $roleHierarchy, Authenticatio
 
     /**
      * {@inheritdoc}
+     *
+     * @return RoleSecurityIdentity[]
      */
     public function getSecurityIdentities(?TokenInterface $token)
     {

Tests/Domain/SecurityIdentityRetrievalStrategyTest.php

@@ -47,27 +47,24 @@ public function testGetSecurityIdentities($user, array $roles, string $authentic
                 ->method('getRoleNames')
                 ->willReturn(['foo'])
             ;
-        }
-
-        $strategy = $this->getStrategy($roles, $authenticationStatus);
 
-        if ('anonymous' !== $authenticationStatus) {
             $token
                 ->expects($this->once())
                 ->method('getUser')
                 ->willReturn($user)
             ;
         }
 
+        $strategy = $this->getStrategy($roles, $authenticationStatus);
         $extractedSids = $strategy->getSecurityIdentities($token);
 
         foreach ($extractedSids as $index => $extractedSid) {
             if (!isset($sids[$index])) {
-                $this->fail(sprintf('Expected SID at index %d, but there was none.', true));
+                $this->fail(sprintf('Expected SID at index %d, but there was none.', $index));
             }
 
             if (false === $sids[$index]->equals($extractedSid)) {
-                $this->fail(sprintf('Index: %d, expected SID "%s", but got "%s".', $index, $sids[$index], $extractedSid));
+                $this->fail(sprintf('Index: %d, expected SID "%s", but got "%s".', $index, $sids[$index], (string) $extractedSid));
             }
         }
     }
@@ -122,11 +119,11 @@ public function testDeprecatedGetSecurityIdentities($user, array $roles, string
 
         foreach ($extractedSids as $index => $extractedSid) {
             if (!isset($sids[$index])) {
-                $this->fail(sprintf('Expected SID at index %d, but there was none.', true));
+                $this->fail(sprintf('Expected SID at index %d, but there was none.', $index));
             }
 
             if (false === $sids[$index]->equals($extractedSid)) {
-                $this->fail(sprintf('Index: %d, expected SID "%s", but got "%s".', $index, $sids[$index], $extractedSid));
+                $this->fail(sprintf('Index: %d, expected SID "%s", but got "%s".', $index, $sids[$index], (string) $extractedSid));
             }
         }
     }