clone method looses account configuration Webklex#521

Author: Webklex

CHANGELOG.md

@@ -16,6 +16,7 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 - RFC4315 MOVE fallback added #123 (thanks @freescout-help-desk)
 - Content fetching RFC standard support added #510 (thanks @ybizeul)
 - Support unescaped dates inside the search conditions #542
+- `Client::clone()` looses account configuration #521 (thanks @netpok)
 
 ### Breaking changes
 - NaN

src/Client.php

@@ -224,7 +224,7 @@ public function clone(): Client {
         $client->default_account_config = $this->default_account_config;
         $config = $this->getAccountConfig();
         foreach($config as $key => $value) {
-            $client->setAccountConfig($key, $this->default_account_config);
+            $client->setAccountConfig($key, $config);
         }
         $client->default_message_mask = $this->default_message_mask;
         $client->default_attachment_mask = $this->default_message_mask;

tests/ClientTest.php

@@ -83,6 +83,40 @@ public function testClient(): void {
         self::assertArrayHasKey("new", $this->client->getDefaultEvents("message"));
     }
 
+    /**
+     * @throws MaskNotFoundException
+     */
+    public function testClientClone(): void {
+        $config = Config::make([
+                                   "accounts" => [
+                                       "default" => [
+                                           'host'  => 'example.com',
+                                           'port'  => 993,
+                                           'protocol'  => 'imap', //might also use imap, [pop3 or nntp (untested)]
+                                           'encryption'    => 'ssl', // Supported: false, 'ssl', 'tls'
+                                           'validate_cert' => true,
+                                           'username' => '[email protected]',
+                                           'password' => 'foo',
+                                           'authentication' => null,
+                                           'rfc' => 'RFC822', // If you are using iCloud, you might want to set this to 'BODY'
+                                           'proxy' => [
+                                               'socket' => null,
+                                               'request_fulluri' => false,
+                                               'username' => null,
+                                               'password' => null,
+                                           ],
+                                           "timeout" => 30,
+                                           "extensions" => []
+                                       ]]
+                               ]);
+        $client = new Client($config);
+        $clone = $client->clone();
+        self::assertInstanceOf(Client::class, $clone);
+        self::assertSame($client->getConfig(), $clone->getConfig());
+        self::assertSame($client->getAccountConfig(), $clone->getAccountConfig());
+        self::assertSame($client->host, $clone->host);
+    }
+
     public function testClientLogout(): void {
         $this->createNewProtocolMockup();