Refactor affected parser methods to not require pslam suppression statements

Author: cooperaj

src/Claims/AggregateParser.php

@@ -12,26 +12,22 @@ final class AggregateParser extends AbstractClaims implements AggregatedParserIn
 {
     public function unpack(ClientInterface $client, array $claims): array
     {
-        $claimSources = $claims['_claim_sources'] ?? null;
-        $claimNames = $claims['_claim_names'] ?? null;
-
-        if (! is_array($claimSources)) {
+        if (! array_key_exists('_claim_sources', $claims)) {
             return $claims;
         }
 
-        if (! is_array($claimNames)) {
+        if (! array_key_exists('_claim_names', $claims)) {
             return $claims;
         }
 
-        $aggregatedSources = array_filter($claimSources, fn ($value): bool => $this->isAggregateSource($value));
+        $aggregatedSources = array_filter($claims['_claim_sources'], fn ($value): bool => $this->isAggregateSource($value));
 
         $claimPayloads = [];
         foreach ($aggregatedSources as $sourceName => $source) {
             $claimPayloads[$sourceName] = $this->claimJWT($client, $source['JWT']);
-            /** @psalm-suppress PossiblyNullArrayAccess */
             unset($claims['_claim_sources'][$sourceName]);
         }
 
-        return $this->cleanClaims($this->assignClaims($claims, $claimNames, $claimPayloads));
+        return $this->cleanClaims($this->assignClaims($claims, $claims['_claim_names'], $claimPayloads));
     }
 }

src/Claims/DistributedParser.php

@@ -44,18 +44,15 @@ public function __construct(
 
     public function fetch(OpenIDClient $client, array $claims, array $accessTokens = []): array
     {
-        $claimSources = $claims['_claim_sources'] ?? null;
-        $claimNames = $claims['_claim_names'] ?? null;
-
-        if (! is_array($claimSources)) {
+        if (! array_key_exists('_claim_sources', $claims)) {
             return $claims;
         }
 
-        if (! is_array($claimNames)) {
+        if (! array_key_exists('_claim_names', $claims)) {
             return $claims;
         }
 
-        $distributedSources = array_filter($claimSources, fn ($value): bool => $this->isDistributedSource($value));
+        $distributedSources = array_filter($claims['_claim_sources'], fn ($value): bool => $this->isDistributedSource($value));
 
         /** @var array<string, ResponseInterface> $responses */
         $responses = [];
@@ -80,13 +77,12 @@ public function fetch(OpenIDClient $client, array $claims, array $accessTokens =
             try {
                 check_server_response($response);
                 $claimPayloads[$sourceName] = $this->claimJWT($client, (string) $response->getBody());
-                /** @psalm-suppress PossiblyNullArrayAccess */
                 unset($claims['_claim_sources'][$sourceName]);
             } catch (Throwable $e) {
                 throw new RuntimeException("Unable to fetch distributed claim for \"{$sourceName}\"", 0, $e);
             }
         }
 
-        return $this->cleanClaims($this->assignClaims($claims, $claimNames, $claimPayloads));
+        return $this->cleanClaims($this->assignClaims($claims, $claims['_claim_names'], $claimPayloads));
     }
 }