Fix PHPStan reports after upgrade to PHPStan 2.2

jeromegamez · jeromegamez · commit 06db3049df0f · 2026-06-17T23:25:56.000+02:00
diff --git a/src/Auth/UserMetaData.php b/src/Auth/UserMetaData.php
@@ -10,12 +10,14 @@
 use function array_key_exists;
 
 /**
+ * @phpstan-import-type UserRecordResponseShape from UserRecord
+ *
  * @phpstan-type UserMetadataResponseShape array{
  *     createdAt: non-empty-string,
  *     lastLoginAt?: non-empty-string,
  *     passwordUpdatedAt?: non-empty-string,
  *     lastRefreshAt?: non-empty-string
- * }
+ * }|UserRecordResponseShape
  */
 final readonly class UserMetaData
 {
diff --git a/src/Auth/UserRecord.php b/src/Auth/UserRecord.php
@@ -117,35 +117,38 @@ private static function userMetaDataFromResponseData(array $data): UserMetaData
     }
 
     /**
-     * @param array{
-     *     mfaInfo?: list<MfaInfoResponseShape>
-     * } $data
+     * @param UserRecordResponseShape $data
      */
     private static function mfaInfoFromResponseData(array $data): ?MfaInfo
     {
-        if (!array_key_exists('mfaInfo', $data)) {
+        $mfaInfo = $data['mfaInfo'] ?? null;
+
+        if ($mfaInfo === null) {
             return null;
         }
 
-        $mfaInfo = array_shift($data['mfaInfo']);
+        $firstItem = array_shift($mfaInfo);
 
-        if ($mfaInfo === null) {
+        if ($firstItem === null) {
             return null;
         }
 
-        return MfaInfo::fromResponseData($mfaInfo);
+        return MfaInfo::fromResponseData($firstItem);
     }
 
     /**
-     * @param array{providerUserInfo: list<ProviderUserInfoResponseShape>} $data
+     * @param UserRecordResponseShape $data
      *
      * @return list<UserInfo>
      */
     private static function userInfoFromResponseData(array $data): array
     {
-        return array_map(
-            UserInfo::fromResponseData(...),
-            $data['providerUserInfo'],
-        );
+        $userInfo = $data['providerUserInfo'] ?? null;
+
+        if (is_array($userInfo)) {
+            return array_map(UserInfo::fromResponseData(...), $userInfo);
+        }
+
+        return [];
     }
 }
diff --git a/src/Messaging/ApnsConfig.php b/src/Messaging/ApnsConfig.php
@@ -220,7 +220,7 @@ public function toArray(): array
     }
 
     /**
-     * @return ApnsConfigShape
+     * @return array<non-empty-string, mixed>
      */
     public function jsonSerialize(): array
     {
diff --git a/src/Messaging/AppInstance.php b/src/Messaging/AppInstance.php
@@ -30,7 +30,7 @@ private function __construct(
      *         topics?: array<non-empty-string, array{
      *             addDate?: non-empty-string
      *         }>
-     *     }
+     *     }, ...
      * } $rawData
      */
     public static function fromRawData(RegistrationToken $registrationToken, array $rawData): self
diff --git a/src/Messaging/CloudMessage.php b/src/Messaging/CloudMessage.php
@@ -32,7 +32,8 @@
  *     android?: AndroidConfigShape,
  *     apns?: ApnsConfig|ApnsConfigShape,
  *     webpush?: WebPushConfig|WebPushConfigShape,
- *     fcm_options?: FcmOptions|FcmOptionsShape
+ *     fcm_options?: FcmOptions|FcmOptionsShape,
+ *     ...
  * }
  *
  * @phpstan-type MessageOutputShape array{
@@ -44,7 +45,8 @@
  *     android?: AndroidConfigShape,
  *     apns?: ApnsConfigShape,
  *     webpush?: WebPushConfigShape,
- *     fcm_options?: FcmOptionsShape
+ *     fcm_options?: FcmOptionsShape,
+ *     ...
  * }
  */
 final class CloudMessage implements Message
diff --git a/src/Messaging/Notification.php b/src/Messaging/Notification.php
@@ -12,7 +12,7 @@
  * @phpstan-type NotificationShape array{
  *     title?: string,
  *     body?: string,
- *     imageUrl?: string
+ *     image?: string
  * }
  */
 final class Notification implements JsonSerializable
@@ -30,11 +30,7 @@ public static function create(?string $title = null, ?string $body = null, ?stri
     }
 
     /**
-     * @param array{
-     *     title?: string,
-     *     body?: string,
-     *     image?: string
-     * } $data
+     * @param NotificationShape $data
      */
     public static function fromArray(array $data): self
     {
@@ -84,6 +80,9 @@ public function imageUrl(): ?string
         return $this->imageUrl;
     }
 
+    /**
+     * @return NotificationShape
+     */
     public function jsonSerialize(): array
     {
         return array_filter([
diff --git a/src/Messaging/Processor/SetApnsContentAvailableIfNeeded.php b/src/Messaging/Processor/SetApnsContentAvailableIfNeeded.php
@@ -51,7 +51,10 @@ public function __invoke(Message $message): Message
     }
 
     /**
-     * @param array<string, mixed> $payload
+     * @param array{
+     *     notification?: null|NotificationShape,
+     *     ...
+     * } $payload
      */
     public function getNotification(array $payload): ?Notification
     {
@@ -65,11 +68,14 @@ public function getNotification(array $payload): ?Notification
     }
 
     /**
-     * @param array<string, mixed> $payload
+     * @param array{
+     *     apns?: null|ApnsConfigShape,
+     *     ...
+     * } $payload
      */
     public function getApnsConfig(array $payload): ApnsConfig
     {
-        $apnsConfig = $payload['apns'] ?? [];
+        $apnsConfig = $payload['apns'] ?? null;
 
         if (is_array($apnsConfig)) {
             return ApnsConfig::fromArray($apnsConfig);
diff --git a/src/Messaging/Processor/SetApnsPushTypeIfNeeded.php b/src/Messaging/Processor/SetApnsPushTypeIfNeeded.php
@@ -56,7 +56,10 @@ public function __invoke(Message $message): Message
     }
 
     /**
-     * @param array<string, mixed> $payload
+     * @param array{
+     *     notification?: null|NotificationShape,
+     *     ...
+     * } $payload
      */
     public function getNotification(array $payload): ?Notification
     {
@@ -70,11 +73,14 @@ public function getNotification(array $payload): ?Notification
     }
 
     /**
-     * @param array<string, mixed> $payload
+     * @param array{
+     *     apns?: null|ApnsConfigShape,
+     *     ...
+     * } $payload
      */
     public function getApnsConfig(array $payload): ApnsConfig
     {
-        $apnsConfig = $payload['apns'] ?? [];
+        $apnsConfig = $payload['apns'] ?? null;
 
         if (is_array($apnsConfig)) {
             return ApnsConfig::fromArray($apnsConfig);
diff --git a/src/RemoteConfig.php b/src/RemoteConfig.php
@@ -139,6 +139,7 @@ private function buildTemplateFromResponse(ResponseInterface $response): Templat
             $etag = '*';
         }
 
+        /** @var RemoteConfigTemplateShape $data */
         $data = Json::decode((string) $response->getBody(), true);
 
         return Template::fromArray($data, $etag);
diff --git a/src/Request/UpdateUser.php b/src/Request/UpdateUser.php
@@ -258,6 +258,7 @@ public function withCustomAttributes(array $customAttributes): self
      *     customAttributes?: string,
      *     deleteAttribute?: list<non-empty-string>,
      *     deleteProvider?: list<non-empty-string>,
+     *     ...<string, mixed>
      * }
      */
     public function jsonSerialize(): array

Original file line number	Diff line number	Diff line change
`@@ -117,35 +117,38 @@ private static function userMetaDataFromResponseData(array $data): UserMetaData`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`/**`
`120`		`- * @param array{`
`121`		`- * mfaInfo?: list<MfaInfoResponseShape>`
`122`		`- * } $data`
	`120`	`+ * @param UserRecordResponseShape $data`
`123`	`121`	`*/`
`124`	`122`	`private static function mfaInfoFromResponseData(array $data): ?MfaInfo`
`125`	`123`	`{`
`126`		`- if (!array_key_exists('mfaInfo', $data)) {`
	`124`	`+ $mfaInfo = $data['mfaInfo'] ?? null;`
	`125`	`+`
	`126`	`+ if ($mfaInfo === null) {`
`127`	`127`	`return null;`
`128`	`128`	`}`
`129`	`129`
`130`		`- $mfaInfo = array_shift($data['mfaInfo']);`
	`130`	`+ $firstItem = array_shift($mfaInfo);`
`131`	`131`
`132`		`- if ($mfaInfo === null) {`
	`132`	`+ if ($firstItem === null) {`
`133`	`133`	`return null;`
`134`	`134`	`}`
`135`	`135`
`136`		`- return MfaInfo::fromResponseData($mfaInfo);`
	`136`	`+ return MfaInfo::fromResponseData($firstItem);`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`/**`
`140`		`- * @param array{providerUserInfo: list<ProviderUserInfoResponseShape>} $data`
	`140`	`+ * @param UserRecordResponseShape $data`
`141`	`141`	`*`
`142`	`142`	`* @return list<UserInfo>`
`143`	`143`	`*/`
`144`	`144`	`private static function userInfoFromResponseData(array $data): array`
`145`	`145`	`{`
`146`		`- return array_map(`
`147`		`- UserInfo::fromResponseData(...),`
`148`		`- $data['providerUserInfo'],`
`149`		`- );`
	`146`	`+ $userInfo = $data['providerUserInfo'] ?? null;`
	`147`	`+`
	`148`	`+ if (is_array($userInfo)) {`
	`149`	`+ return array_map(UserInfo::fromResponseData(...), $userInfo);`
	`150`	`+ }`
	`151`	`+`
	`152`	`+ return [];`
`150`	`153`	`}`
`151`	`154`	`}`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ public function toArray(): array`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`/**`
`223`		`- * @return ApnsConfigShape`
	`223`	`+ * @return array<non-empty-string, mixed>`
`224`	`224`	`*/`
`225`	`225`	`public function jsonSerialize(): array`
`226`	`226`	`{`
Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,7 @@ private function buildTemplateFromResponse(ResponseInterface $response): Templat`
`139`	`139`	`$etag = '*';`
`140`	`140`	`}`
`141`	`141`
	`142`	`+ /** @var RemoteConfigTemplateShape $data */`
`142`	`143`	`$data = Json::decode((string) $response->getBody(), true);`
`143`	`144`
`144`	`145`	`return Template::fromArray($data, $etag);`