[6.0] Updater: Remove Adapter classes from inheritance (joomla#43793)

* Updater: Remove Adapter classes from inheritance
* Codestyle
* Update Updater.php
* Fixing database access
* Fixing database access - part 2
* Removing LegacyErrorHandlingTrait again from Updater and UpdateAdapter
* Removing unnecessary imports
* Removing duplicate getAdapter() call

Author: Hackwar

libraries/src/Updater/Adapter/ExtensionAdapter.php

@@ -134,7 +134,7 @@ protected function _endElement($parser, $name)
 
                     // Check if DB & version is supported via <supported_databases> tag, assume supported if tag isn't present
                     if (isset($this->currentUpdate->supported_databases)) {
-                        $db           = Factory::getDbo();
+                        $db           = $this->db;
                         $dbType       = strtolower($db->getServerType());
                         $dbVersion    = $db->getVersion();
                         $supportedDbs = $this->currentUpdate->supported_databases;

libraries/src/Updater/UpdateAdapter.php

@@ -9,14 +9,15 @@
 
 namespace Joomla\CMS\Updater;
 
-use Joomla\CMS\Adapter\AdapterInstance;
 use Joomla\CMS\Event\Installer\BeforeUpdateSiteDownloadEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Http\HttpFactory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Version;
+use Joomla\Database\DatabaseDriver;
 use Joomla\Database\ParameterType;
 use Joomla\Registry\Registry;
 
@@ -29,8 +30,18 @@
  *
  * @since  1.7.0
  */
-abstract class UpdateAdapter extends AdapterInstance
+abstract class UpdateAdapter
 {
+    use LegacyPropertyManagementTrait;
+
+    /**
+     * Parent
+     *
+     * @var    Updater
+     * @since  1.6
+     */
+    protected $parent = null;
+
     /**
      * Resource handle for the XML Parser
      *
@@ -99,6 +110,37 @@ abstract class UpdateAdapter extends AdapterInstance
      */
     protected $minimum_stability = Updater::STABILITY_STABLE;
 
+    /**
+     * Database
+     *
+     * @var    DatabaseDriver
+     * @since  1.6
+     */
+    protected $db = null;
+
+    /**
+     * Constructor
+     *
+     * @param   Updater         $parent   Parent object
+     * @param   DatabaseDriver  $db       Database object
+     * @param   array           $options  Configuration Options
+     *
+     * @since   1.6
+     */
+    public function __construct(Updater $parent, DatabaseDriver $db, array $options = [])
+    {
+        $this->parent = $parent;
+
+        foreach ($options as $key => $value) {
+            if (property_exists($this, $key)) {
+                $this->$key = $value;
+            }
+        }
+
+        // Pull in the global dbo in case something happened to it.
+        $this->db = $db ?: Factory::getDbo();
+    }
+
     /**
      * Gets the reference to the current direct parent
      *
@@ -153,7 +195,7 @@ protected function toggleUpdateSite($updateSiteId, $enabled = true)
             return;
         }
 
-        $db    = $this->parent->getDbo();
+        $db    = $this->db;
         $query = $db->getQuery(true)
             ->update($db->quoteName('#__update_sites'))
             ->set($db->quoteName('enabled') . ' = :enabled')
@@ -184,7 +226,7 @@ protected function getUpdateSiteName($updateSiteId)
             return '';
         }
 
-        $db    = $this->parent->getDbo();
+        $db    = $this->db;
         $query = $db->getQuery(true)
             ->select($db->quoteName('name'))
             ->from($db->quoteName('#__update_sites'))