fix

Author: francescobianco

Makefile

@@ -101,5 +101,8 @@ test-polyfill:
 test-parse-headers:
 	@docker-compose run --rm phpunit tests --filter PolyfillTest::testRfc822ParseHeaders
 
+test-parse-adrlist:
+	@docker-compose run --rm phpunit tests --filter PolyfillTest::testRfc822ParseAdrList
+
 test-special:
 	@docker-compose run --rm phpunit tests --filter HeaderInfoTest::testSanitizeAddress

src/Functions.php

@@ -155,17 +155,22 @@ public static function isValidImap2Connection($imap)
         return Connection::isValid($imap);
     }
 
-    public static function getAddressObjectList($addressList)
+    public static function getAddressObjectList($addressList, $defaultHostname = 'UNKNOWN')
     {
         $addressObjectList = [];
         foreach ($addressList as $toAddress) {
             $email = explode('@', $toAddress->getEmail());
 
             $addressObject = (object) [
                 'mailbox' => $email[0],
-                'host' => $email[1],
+                'host' => $email[1] ?? $defaultHostname,
             ];
 
+            $personal = $toAddress->getName();
+            if ($personal) {
+                $addressObject->personal = $personal;
+            }
+
             $addressObjectList[] = $addressObject;
         }
 

src/Polyfill.php

@@ -36,9 +36,14 @@ public static function qPrint($string)
         return $string;
     }
 
-    public static function rfc822ParseAdrList($string)
+    public static function rfc822ParseAdrList($string, $defaultHostname)
     {
-        return $string;
+        $message = Message::from('To: '.$string, false);
+
+        return Functions::getAddressObjectList(
+            $message->getHeader(HeaderConsts::TO)->getAddresses(),
+            $defaultHostname
+        );
     }
 
     /**

tests/PolyfillTest.php

@@ -42,4 +42,25 @@ public function testRfc822ParseHeaders()
             $this->assertEquals($headers1, $headers2);
         }
     }
+
+    public function testRfc822ParseAdrList()
+    {
+        $fixtures = [
+            'Sender <[email protected]>, [email protected], root',
+        ];
+
+        $defaultHostname = 'default.host';
+        foreach ($fixtures as $addresses) {
+            $addressObjectList1 = imap_rfc822_parse_adrlist($addresses, $defaultHostname);
+            $addressObjectList2 = Polyfill::rfc822ParseAdrList($addresses, $defaultHostname);
+
+            #file_put_contents('a1.json', json_encode($addressObjectList1, JSON_PRETTY_PRINT));
+            #file_put_contents('a2.json', json_encode($addressObjectList2, JSON_PRETTY_PRINT));
+
+            #var_dump($addressObjectList1);
+            #var_dump($addressObjectList2);
+
+            $this->assertEquals($addressObjectList1, $addressObjectList2);
+        }
+    }
 }