Psalm level 1 passing -- all required suppression due to dependency i…

…ssues outside our control
marcguyer · Sep 16, 2021 · 5640b45 · 5640b45
1 parent ec26464
commit 5640b45
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 14 deletions.
diff --git a/psalm.xml b/psalm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-        errorLevel="2"
+        errorLevel="1"
         cacheDirectory="data/cache/.psalm_cache"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="https://getpsalm.org/schema/config"

diff --git a/src/Data/Entity/OAuthAccessToken.php b/src/Data/Entity/OAuthAccessToken.php
@@ -124,7 +124,8 @@ public function getIdentifier(): string
         return $this->getToken();
     }
 
-    public function setIdentifier(mixed $identifier): self
+    /** @psalm-suppress MixedArgument */
+    public function setIdentifier($identifier): self
     {
         return $this->setToken($identifier);
     }
@@ -163,14 +164,20 @@ public function removeScope(OAuthScope $scope): self
         return $this;
     }
 
-    public function getScopes(?Criteria $criteria = null): Collection
+    /** @psalm-suppress MixedInferredReturnType */
+    public function getScopes(?Criteria $criteria = null): array
     {
         if ($criteria === null) {
-            return $this->scopes;
+            /** @psalm-suppress MixedReturnTypeCoercion */
+            return $this->scopes->toArray();
         }
 
-        /** @psalm-suppress UndefinedInterfaceMethod */
-        return $this->scopes->matching($criteria);
+        /**
+         * @psalm-suppress UndefinedInterfaceMethod
+         * @psalm-suppress MixedReturnStatement
+         * @psalm-suppress MixedMethodCall
+         */
+        return $this->scopes->matching($criteria)->toArray();
     }
 
     public function setExpiresDatetime(\DateTimeImmutable $expiresDatetime): self

diff --git a/src/Data/Entity/OAuthAuthCode.php b/src/Data/Entity/OAuthAuthCode.php
@@ -76,6 +76,7 @@ public function getIdentifier(): ?int
 
     public function setIdentifier(mixed $identifier): self
     {
+        /** @psalm-suppress MixedArgument */
         $this->setId($identifier);
 
         return $this;
@@ -132,14 +133,23 @@ public function removeScope(OAuthScope $scope): self
         return $this;
     }
 
-    public function getScopes(?Criteria $criteria = null): Collection
+    /**
+     * @psalm-suppress MixedInferredReturnType
+     * @psalm-suppress MixedReturnTypeCoercion
+     */
+    public function getScopes(?Criteria $criteria = null): array
     {
         if ($criteria === null) {
-            return $this->scopes;
+            /** @psalm-suppress MixedReturnStatement */
+            return $this->scopes->toArray();
         }
 
-        /** @psalm-suppress UndefinedInterfaceMethod */
-        return $this->scopes->matching($criteria);
+        /**
+         * @psalm-suppress UndefinedInterfaceMethod
+         * @psalm-suppress MixedReturnStatement
+         * @psalm-suppress MixedMethodCall
+         */
+        return $this->scopes->matching($criteria)->toArray();
     }
 
     public function setExpiresDatetime(DateTimeImmutable $expiresDatetime): self

diff --git a/src/Data/Entity/OAuthClient.php b/src/Data/Entity/OAuthClient.php
@@ -92,6 +92,7 @@ public function setDetails(array $details): self
         return $this;
     }
 
+    /** @psalm-suppress MixedReturnTypeCoercion */
     public function getDetails(): array
     {
         return $this->details;

diff --git a/src/Data/Entity/OAuthScope.php b/src/Data/Entity/OAuthScope.php
@@ -84,13 +84,17 @@ public function removeAccessToken(OAuthAccessToken $accessToken): self
         return $this;
     }
 
+    /** @psalm-suppress MixedInferredReturnType */
     public function getAccessTokens(?Criteria $criteria = null): Collection
     {
         if ($criteria === null) {
             return $this->accessTokens;
         }
 
-        /** @psalm-suppress UndefinedInterfaceMethod */
+        /**
+         * @psalm-suppress UndefinedInterfaceMethod
+         * @psalm-suppress MixedReturnStatement
+         */
         return $this->accessTokens->matching($criteria);
     }
 
@@ -109,16 +113,22 @@ public function removeAuthCode(OAuthAuthCode $authCode): self
     {
         $this->authCodes->removeElement($authCode);
 
+        /** @psalm-suppress MixedInferredReturnType */
         return $this;
     }
 
+    /** @psalm-suppress MixedInferredReturnType */
     public function getAuthCodes(?Criteria $criteria = null): Collection
     {
         if ($criteria === null) {
+            /** @psalm-suppress MixedInferredReturnType */
             return $this->authCodes;
         }
 
-        /** @psalm-suppress UndefinedInterfaceMethod */
+        /**
+         * @psalm-suppress UndefinedInterfaceMethod
+         * @psalm-suppress MixedReturnStatement
+         */
         return $this->authCodes->matching($criteria);
     }
-}
+}
diff --git a/src/Data/Entity/User.php b/src/Data/Entity/User.php
@@ -116,8 +116,10 @@ public function setDetails(array $details): self
         return $this;
     }
 
+    /** @psalm-suppress MixedReturnTypeCoercion */
     public function getDetails(): array
     {
+        /** @psalm-suppress MixedReturnTypeCoercion */
         return $this->details;
     }
-}
+}