Default account config fallback added

Author: Webklex

CHANGELOG.md

@@ -14,6 +14,16 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 ### Affected Classes
 - NaN
 
+## [2.1.1] - 2020-09-23
+### Fixed
+- Missing default config parameter added
+
+### Added
+- Default account config fallback added
+
+### Affected Classes
+- [Client::class](src/Client.php)
+
 ## [2.1.0] - 2020-09-22
 ### Fixed
 - Quota handling fixed

src/Client.php

@@ -33,7 +33,6 @@
 class Client {
     use HasEvents;
 
-
     /**
      * @var boolean|Protocol
      */
@@ -103,14 +102,6 @@ class Client {
      */
     protected $active_folder = false;
 
-    /**
-     * All valid and available account config parameters
-     *
-     * @var array $validConfigKeys
-     */
-    protected $valid_config_keys = ['host', 'port', 'encryption', 'validate_cert', 'username', 'password', 'protocol',
-                                    'authentication'];
-
     /**
      * @var string $default_message_mask
      */
@@ -121,6 +112,20 @@ class Client {
      */
     protected $default_attachment_mask = AttachmentMask::class;
 
+    /**
+     * @var array $default_account_config
+     */
+    protected $default_account_config = [
+        'host' => 'localhost',
+        'port' => 993,
+        'protocol'  => 'imap',
+        'encryption' => 'ssl',
+        'validate_cert' => true,
+        'username' => '',
+        'password' => '',
+        'authentication' => null,
+    ];
+
     /**
      * Client constructor.
      * @param array $config
@@ -151,13 +156,28 @@ public function setConfig(array $config) {
         $default_account = ClientManager::get('default');
         $default_config  = ClientManager::get("accounts.$default_account");
 
-        foreach ($this->valid_config_keys as $key) {
-            $this->$key = isset($config[$key]) ? $config[$key] : $default_config[$key];
+        foreach ($this->default_account_config as $key => $value) {
+            $this->setAccountConfig($key, $config, $default_config);
         }
 
         return $this;
     }
 
+    /**
+     * @param string $key
+     * @param array $config
+     * @param array $default_config
+     */
+    private function setAccountConfig($key, $config, $default_config){
+        $value = $this->default_account_config[$key];
+        if(isset($config[$key])) {
+            $value = $config[$key];
+        }elseif(isset($default_config[$key])) {
+            $value = $default_config[$key];
+        }
+        $this->$key = $value;
+    }
+
     /**
      * Look for a possible events in any available config
      * @param $config