Merge pull request #34 from 4c0n/breaking-out-of-loop-when-start-is-gte-count

Breaking out of loop when start is greater than or equal to total

Author: rpkamp

src/MailhogClient.php

@@ -63,15 +63,15 @@ public function findAllMessages(int $limit = 50)
 
             $allMessageData = json_decode($response->getBody()->getContents(), true);
 
-            if (0 === $allMessageData['count']) {
-                return; // all done!
-            }
-
             foreach ($allMessageData['items'] as $messageData) {
                 yield MessageFactory::fromMailhogResponse($messageData);
             }
 
             $start += $limit;
+
+            if ($start >= $allMessageData['total']) {
+                return;
+            }
         }
     }
 

src/Message/Contact.php

@@ -27,6 +27,7 @@ public function __construct(string $emailAddress, ?string $name = null)
 
     public static function fromString(string $contact): Contact
     {
+        $matches = [];
         if (preg_match('~^(?P<name>.*?)\s+<(?P<email>\S*?)>$~i', $contact, $matches)) {
             return new self($matches['email'], stripslashes(trim($matches['name'])));
         }

src/Message/Mime/MimePart.php

@@ -60,6 +60,7 @@ public static function fromMailhogResponse(array $mimePart): MimePart
         if (isset($mimePart['Headers']['Content-Disposition'][0]) &&
             stripos($mimePart['Headers']['Content-Disposition'][0], 'attachment') === 0
         ) {
+            $matches = [];
             preg_match('~filename=(?P<filename>.*?)(;|$)~i', $mimePart['Headers']['Content-Disposition'][0], $matches);
             $filename = $matches['filename'];
         }