Implement PHPStan up to level 4

Author: CReimer

phpstan.neon

@@ -1,5 +1,5 @@
 parameters:
-	level: 3
+	level: 4
 	ignoreErrors:
 	    -
 	        identifier: new.static

src/Connection/ImapConnection.php

@@ -122,6 +122,7 @@ public function connect(string $host, ?int $port = null, array $options = []): v
 
     /**
      * Get the default socket options for the given transport.
+     * @param 'ssl'|'tls'|'starttls'|'tcp' $transport
      */
     protected function getDefaultSocketOptions(string $transport, array $proxy = [], bool $validateCert = true): array
     {
@@ -571,9 +572,7 @@ public function idle(int $timeout): Generator
             fn (ContinuationResponse $response) => ImapCommandException::make(new ImapCommand('', 'IDLE'), $response),
         );
 
-        while ($response = $this->nextReply()) {
-            yield $response;
-        }
+        yield $this->nextReply();
     }
 
     /**
@@ -595,6 +594,7 @@ public function done(): void
 
     /**
      * Send an IMAP command.
+     * @param-out string $tag
      */
     public function send(string $name, array $tokens = [], ?string &$tag = null): void
     {
@@ -727,15 +727,12 @@ protected function assertTaggedResponse(string $tag, ?callable $exception = null
      */
     protected function assertNextResponse(callable $filter, callable $assertion, callable $exception): Response
     {
-        while ($response = $this->nextResponse($filter)) {
-            if ($assertion($response)) {
-                return $response;
-            }
-
-            throw $exception($response);
+        $response = $this->nextResponse($filter);
+        if ($assertion($response)) {
+            return $response;
         }
 
-        throw new ImapResponseException('No matching response found');
+        throw $exception($response);
     }
 
     /**
@@ -752,16 +749,15 @@ protected function nextResponse(callable $filter): Response
             throw new LogicException('No parser instance set');
         }
 
-        while ($response = $this->nextReply()) {
-            if (! $response instanceof Response) {
-                continue;
-            }
+        $response = $this->nextReply();
+        if (! $response instanceof Response) {
+            throw new ImapResponseException('Unknown response type: '. $response::class);
+        }
 
-            $this->result?->addResponse($response);
+        $this->result?->addResponse($response);
 
-            if ($filter($response)) {
-                return $response;
-            }
+        if ($filter($response)) {
+            return $response;
         }
 
         throw new ImapResponseException('No matching response found');
@@ -770,7 +766,7 @@ protected function nextResponse(callable $filter): Response
     /**
      * Read the next reply from the stream.
      */
-    protected function nextReply(): Data|Token|Response|null
+    protected function nextReply(): Data|Token|Response
     {
         if (! $reply = $this->parser->next()) {
             $meta = $this->stream->meta();

src/Connection/ImapQueryBuilder.php

@@ -373,6 +373,7 @@ protected function parseDate(mixed $date): CarbonInterface
 
     /**
      * Build a single expression node from a basic or nested where.
+     * @param array{type: 'basic'|'nested', boolean: 'AND'|'OR', query: ImapQueryBuilder} $where
      */
     protected function makeExpressionNode(array $where): array
     {
@@ -391,6 +392,7 @@ protected function makeExpressionNode(array $where): array
 
     /**
      * Merge the existing expression with the next expression, respecting the boolean operator.
+     * @param 'AND'|'OR' $boolean
      */
     protected function mergeExpressions(string $existing, string $next, string $boolean): string
     {

src/FlaggableInterface.php

@@ -120,6 +120,7 @@ public function hasFlag(BackedEnum|string $flag): bool;
 
     /**
      * Add or remove a flag from the message.
+     * @param '+'|'-' $operation
      */
     public function flag(BackedEnum|string $flag, string $operation, bool $expunge = false): void;
 }

src/MessageQuery.php

@@ -302,8 +302,8 @@ protected function fetch(Collection $messages): array
             return [
                 $uid => [
                     'flags' => $data->lookup('FLAGS')?->values() ?? [],
-                    'headers' => $data->lookup('[HEADER]')?->value ?? '',
-                    'contents' => $data->lookup('[TEXT]')?->value ?? '',
+                    'headers' => $data->lookup('[HEADER]')->value ?? '',
+                    'contents' => $data->lookup('[TEXT]')->value ?? '',
                 ],
             ];
         })->all();

src/QueriesMessages.php

@@ -42,6 +42,7 @@ trait QueriesMessages
 
     /**
      * The fetch order.
+     * @var 'asc'|'desc' $fetchOrder
      */
     protected string $fetchOrder = 'desc';
 

src/Support/Str.php

@@ -148,6 +148,7 @@ public static function fromImapUtf7(string $string): string
 
         // Direct implementation of IMAP's modified UTF-7 decoding.
         return preg_replace_callback('/&([^-]*)-?/', function ($matches) {
+            /** @var array{0: string, 1: string, 2?: string} $matches */
             // If it's just an ampersand.
             if ($matches[1] === '') {
                 return '&';