Merge branch 'main' of https://github.com/javanile/php-imap2 into main

Author: francescobianco

bootstrap.php

@@ -836,6 +836,10 @@ function imap_body($imap, $messageNum, $flags = 0)
 if (!function_exists('imap2_body')) {
     function imap2_body($imap, $messageNum, $flags = 0)
     {
+        if (IMAP2_RETROFIT_MODE && is_resource($imap) && get_resource_type($imap) == 'imap') {
+            return imap_body($imap, $messageNum, $flags);
+        }
+
         return Message::body($imap, $messageNum, $flags);
     }
 }

src/Message.php

@@ -105,22 +105,20 @@ public static function headers($imap, $messageNum, $fromLength = 0, $subjectLeng
         return imap_headerinfo($imap, $messageNum, $fromLength = 0, $subjectLength = 0);
     }
 
-    public static function body($imap, $messageNum, $section, $flags = 0)
+    public static function body($imap, $messageNum, $flags = 0)
     {
-        if (is_a($imap, Connection::class)) {
-            $client = $imap->getClient();
-            #$client->setDebug(true);
+        if (!is_a($imap, Connection::class)) {
+            return Errors::invalidImapConnection(debug_backtrace(), 1, false);
+        }
 
-            $messages = $client->fetch($imap->getMailboxName(), $messageNum, false, ['BODY['.$section.']']);
+        $client = $imap->getClient();
+        #$client->setDebug(true);
 
-            if ($section) {
-                return $messages[$messageNum]->bodypart[$section];
-            }
+        $isUid = boolval($flags & FT_UID);
 
-            return $messages[$messageNum]->body;
-        }
+        $messages = $client->fetch($imap->getMailboxName(), $messageNum, $isUid, ['BODY[TEXT]']);
 
-        return imap_fetchbody($imap, $messageNum, $section, $flags);
+        return $messages[$messageNum]->bodypart['TEXT'];
     }
 
     public static function fetchBody($imap, $messageNum, $section, $flags = 0)

tests/.env.examples

@@ -0,0 +1,4 @@
+IMAP_MAILBOX={imap.gmail.com:993/ssl/novalidate-cert}
+[email protected]
+IMAP_PASSWORD=...
+IMAP_ACCESS_TOKEN=...

tests/CompatibilityTest.php

@@ -597,6 +597,11 @@ public function testNumMsg()
 
         $this->assertEquals($numMsg1, $numMsg2);
 
+        $lastMessageBody1 = imap_body($imap1, $numMsg1);
+        $lastMessageBody2 = imap2_body($imap2, $numMsg2);
+
+        $this->assertEquals($lastMessageBody1, $lastMessageBody2);
+
         imap_close($imap1);
         imap2_close($imap2);
     }
@@ -675,4 +680,6 @@ public function testPing()
         imap_close($imap1);
         imap2_close($imap2);
     }
+
+
 }