diff --git a/api/src/Contacts/Storage.php b/api/src/Contacts/Storage.php
index 0d6d6bd38c..dee1eee72f 100755
--- a/api/src/Contacts/Storage.php
+++ b/api/src/Contacts/Storage.php
@@ -231,6 +231,10 @@ class Storage
 	 */
 	var $soextra;
 	var $sodistrib_list;
+	/**
+	 * @var Api\Db
+	 */
+	var $db;
 
 	/**
 	 * Constructor
diff --git a/api/src/Db/Backup.php b/api/src/Db/Backup.php
index 326e136135..03ac27d67e 100644
--- a/api/src/Db/Backup.php
+++ b/api/src/Db/Backup.php
@@ -71,6 +71,12 @@ class Backup
 	 * Regular expression to identify a Guacamole table OR view
 	 */
 	const GUACAMOLE_REGEXP = '/^guacamole_/';
+	/**
+	 * Files directory
+	 *
+	 * @var string
+	 */
+	public $files_dir;
 	/**
 	 * Backup directory.
 	 *
@@ -89,6 +95,8 @@ class Backup
 	 * @var boolean
 	 */
 	public $backup_files = false ;
+	public $charset = 'utf-8';
+	public $api_version;
 	/**
 	 * Reference to schema_proc's Api\Db object
 	 *
@@ -935,7 +943,7 @@ class Backup
 
 		fwrite($f,"charset: $this->charset\n\n");
 
-		$this->schema_backup($f);	// add the schema in a human readable form too
+		$this->schema_backup($f);	// add the schema in a human-readable form too
 
 		fwrite($f,"\nschema: ".json_encode($this->schemas)."\n");
 
diff --git a/api/src/Egw.php b/api/src/Egw.php
index 5eb44f7e2d..8703ab117b 100644
--- a/api/src/Egw.php
+++ b/api/src/Egw.php
@@ -17,6 +17,7 @@ namespace EGroupware\Api;
 // explicitly list old, non-namespaced classes
 // they are only used, if phpgwapi is installed
 use accounts as egw_accounts;
+use EGroupware\Api\Egw\Applications;
 use egw_session;
 use common;
 
@@ -57,6 +58,26 @@ class Egw extends Egw\Base
 	 */
 	public $session;
 
+	/**
+	 * @var Acl
+	 */
+	public $acl;
+
+	/**
+	 * @var Preferences
+	 */
+	public $preferences;
+
+	/**
+	 * @var Applications
+	 */
+	public $applications;
+
+	/**
+	 * @var Asyncservice
+	 */
+	public $asyncservice;
+
 	/**
 	 * Constructor: Instantiates the sub-classes
 	 *
diff --git a/api/src/Etemplate/Widget/Select.php b/api/src/Etemplate/Widget/Select.php
index cf84d78f4d..0b7f6edc4e 100644
--- a/api/src/Etemplate/Widget/Select.php
+++ b/api/src/Etemplate/Widget/Select.php
@@ -636,7 +636,7 @@ class Select extends Etemplate\Widget
 		if($widget_type && is_object($widget_type))
 		{
 			$widget = $widget_type;
-			$widget_type = $widget->attrs['type'] ? $widget->attrs['type'] : $widget->type;
+			$widget_type = $widget->attrs['type'] ?? $widget->type;
 			if(substr($widget_type, 0, 4) == 'et2-')
 			{
 				$widget_type = str_replace('et2-', '', $widget_type);
diff --git a/api/src/Mail.php b/api/src/Mail.php
index 651cd5d444..386e80deef 100644
--- a/api/src/Mail.php
+++ b/api/src/Mail.php
@@ -48,6 +48,21 @@ class Mail
 	 */
 	var $profileID = 0;
 
+	/**
+	 * @var int
+	 */
+	var $accountid;
+
+	/**
+	 * @var array
+	 */
+	var $sessionData;
+
+	/**
+	 * @var Horde_Idna
+	 */
+	var $idna2;
+
 	/**
 	 * delimiter - used to separate acc_id from mailbox / folder-tree-structure
 	 *
diff --git a/api/src/Mail/Imap.php b/api/src/Mail/Imap.php
index 323c9d56bb..8835450a7f 100644
--- a/api/src/Mail/Imap.php
+++ b/api/src/Mail/Imap.php
@@ -118,6 +118,11 @@ class Imap extends Horde_Imap_Client_Socket implements Imap\PushIface
 	 */
 	protected $enableSieve = false;
 
+	/**
+	 * @var string|null
+	 */
+	protected $loginType;
+
 	/**
 	 * Connection is an admin connection
 	 *
@@ -339,7 +344,7 @@ class Imap extends Horde_Imap_Client_Socket implements Imap\PushIface
 					return $this->getParam($name);
 				}
 				// calling Horde_Imap_Client's __get() method available since 2.24.1
-				return is_callable('parent::__get') ? parent::__get($name) : null;
+				return parent::__get($name);
 		}
 	}
 
diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index 200859d22c..5b2ff81be1 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -2557,10 +2557,10 @@ class mail_compose
 			case 'html':
 				$body = $_formData['body'];
 
+				static $ruler = '<hr class="ruler"';
 				if (!empty($attachment_links))
 				{
 					// if we have a ruler, replace it with the attachment block
-					static $ruler = '<hr class="ruler"';
 					if (strpos($body, $ruler) !== false)
 					{
 						$body = preg_replace('#'.$ruler.'[^>]*>#', $attachment_links, $body);
diff --git a/setup/inc/class.setup_process.inc.php b/setup/inc/class.setup_process.inc.php
index c18d80abb8..64411fc637 100755
--- a/setup/inc/class.setup_process.inc.php
+++ b/setup/inc/class.setup_process.inc.php
@@ -629,7 +629,6 @@ class setup_process
 		{
 			$this->init_process();
 		}
-		$this->oProc->m_odb->HaltOnError = 'yes';
 
 		foreach($setup_info as $appname => &$appdata)
 		{