[5.0] Improve constructors of JTable objects

administrator/components/com_banners/src/Table/BannerTable.php

@@ -18,6 +18,7 @@
 use Joomla\CMS\Versioning\VersionableTableInterface;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Database\ParameterType;
+use Joomla\Event\DispatcherInterface;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 
@@ -43,15 +44,16 @@ class BannerTable extends Table implements VersionableTableInterface
     /**
      * Constructor
      *
-     * @param   DatabaseDriver  $db  Database connector object
+     * @param   DatabaseDriver        $db          Database connector object
+     * @param   ?DispatcherInterface  $dispatcher  Event dispatcher for this table
      *
      * @since   1.5
      */
-    public function __construct(DatabaseDriver $db)
+    public function __construct(DatabaseDriver $db, DispatcherInterface $dispatcher = null)
     {
         $this->typeAlias = 'com_banners.banner';
 
-        parent::__construct('#__banners', 'id', $db);
+        parent::__construct('#__banners', 'id', $db, $dispatcher);
 
         $this->created = Factory::getDate()->toSql();
         $this->setColumnAlias('published', 'state');
@@ -252,16 +254,14 @@ public function store($updateNulls = true)
             parent::store($updateNulls);
         } else {
             // Get the old row
-            /** @var BannerTable $oldrow */
-            $oldrow = Table::getInstance('BannerTable', __NAMESPACE__ . '\\', ['dbo' => $db]);
+            $oldrow = new self($db, $this->getDispatcher());
 
             if (!$oldrow->load($this->id) && $oldrow->getError()) {
                 $this->setError($oldrow->getError());
             }
 
             // Verify that the alias is unique
-            /** @var BannerTable $table */
-            $table = Table::getInstance('BannerTable', __NAMESPACE__ . '\\', ['dbo' => $db]);
+            $table = new self($db, $this->getDispatcher());
 
             if ($table->load(['alias' => $this->alias, 'catid' => $this->catid]) && ($table->id != $this->id || $this->id == 0)) {
                 $this->setError(Text::_('COM_BANNERS_ERROR_UNIQUE_ALIAS'));
@@ -317,8 +317,7 @@ public function stick($pks = null, $state = 1, $userId = 0)
         }
 
         // Get an instance of the table
-        /** @var BannerTable $table */
-        $table = Table::getInstance('BannerTable', __NAMESPACE__ . '\\', ['dbo' => $this->_db]);
+        $table = new self($this->getDbo(), $this->getDispatcher());
 
         // For all keys
         foreach ($pks as $pk) {

administrator/components/com_banners/src/Table/ClientTable.php

@@ -14,6 +14,7 @@
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\Versioning\VersionableTableInterface;
 use Joomla\Database\DatabaseDriver;
+use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -37,17 +38,18 @@ class ClientTable extends Table implements VersionableTableInterface
     /**
      * Constructor
      *
-     * @param   DatabaseDriver  $db  Database connector object
+     * @param   DatabaseDriver        $db          Database connector object
+     * @param   ?DispatcherInterface  $dispatcher  Event dispatcher for this table
      *
      * @since   1.5
      */
-    public function __construct(DatabaseDriver $db)
+    public function __construct(DatabaseDriver $db, DispatcherInterface $dispatcher = null)
     {
         $this->typeAlias = 'com_banners.client';
 
         $this->setColumnAlias('published', 'state');
 
-        parent::__construct('#__banner_clients', 'id', $db);
+        parent::__construct('#__banner_clients', 'id', $db, $dispatcher);
     }
 
     /**

administrator/components/com_contact/src/Table/ContactTable.php

@@ -22,6 +22,7 @@
 use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\CMS\Versioning\VersionableTableInterface;
 use Joomla\Database\DatabaseDriver;
+use Joomla\Event\DispatcherInterface;
 use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -57,15 +58,16 @@ class ContactTable extends Table implements VersionableTableInterface, TaggableT
     /**
      * Constructor
      *
-     * @param   DatabaseDriver  $db  Database connector object
+     * @param   DatabaseDriver        $db          Database connector object
+     * @param   ?DispatcherInterface  $dispatcher  Event dispatcher for this table
      *
      * @since   1.0
      */
-    public function __construct(DatabaseDriver $db)
+    public function __construct(DatabaseDriver $db, DispatcherInterface $dispatcher = null)
     {
         $this->typeAlias = 'com_contact.contact';
 
-        parent::__construct('#__contact_details', 'id', $db);
+        parent::__construct('#__contact_details', 'id', $db, $dispatcher);
 
         $this->setColumnAlias('title', 'name');
     }
@@ -119,7 +121,7 @@ public function store($updateNulls = true)
         }
 
         // Verify that the alias is unique
-        $table = Table::getInstance('ContactTable', __NAMESPACE__ . '\\', ['dbo' => $this->getDbo()]);
+        $table = new self($this->getDbo(), $this->getDispatcher());
 
         if ($table->load(['alias' => $this->alias, 'catid' => $this->catid]) && ($table->id != $this->id || $this->id == 0)) {
             // Is the existing contact trashed?
@@ -255,7 +257,7 @@ public function generateAlias()
 
 
     /**
-     * Get the type alias for the history table
+     * Get the type alias for the history and tags mapping table
      *
      * @return  string  The alias as described above
      *

administrator/components/com_content/src/Table/FeaturedTable.php

@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Table\Table;
 use Joomla\Database\DatabaseDriver;
+use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -27,12 +28,13 @@ class FeaturedTable extends Table
     /**
      * Constructor
      *
-     * @param   DatabaseDriver  $db  Database connector object
+     * @param   DatabaseDriver        $db          Database connector object
+     * @param   ?DispatcherInterface  $dispatcher  Event dispatcher for this table
      *
      * @since   1.6
      */
-    public function __construct(DatabaseDriver $db)
+    public function __construct(DatabaseDriver $db, DispatcherInterface $dispatcher = null)
     {
-        parent::__construct('#__content_frontpage', 'content_id', $db);
+        parent::__construct('#__content_frontpage', 'content_id', $db, $dispatcher);
     }
 }

administrator/components/com_fields/src/Table/FieldTable.php

@@ -18,6 +18,7 @@
 use Joomla\CMS\User\CurrentUserInterface;
 use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Database\DatabaseDriver;
+use Joomla\Event\DispatcherInterface;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 
@@ -45,13 +46,14 @@ class FieldTable extends Table implements CurrentUserInterface
     /**
      * Class constructor.
      *
-     * @param   DatabaseDriver  $db  DatabaseDriver object.
+     * @param   DatabaseDriver        $db          Database connector object
+     * @param   ?DispatcherInterface  $dispatcher  Event dispatcher for this table
      *
      * @since   3.7.0
      */
-    public function __construct($db = null)
+    public function __construct(DatabaseDriver $db, DispatcherInterface $dispatcher = null)
     {
-        parent::__construct('#__fields', 'id', $db);
+        parent::__construct('#__fields', 'id', $db, $dispatcher);
 
         $this->setColumnAlias('published', 'state');
     }
@@ -150,7 +152,7 @@ public function check()
         $this->name = str_replace(',', '-', $this->name);
 
         // Verify that the name is unique
-        $table = new static($this->_db);
+        $table = new self($this->_db, $this->getDispatcher());
 
         if ($table->load(['name' => $this->name]) && ($table->id != $this->id || $this->id == 0)) {
             $this->setError(Text::_('COM_FIELDS_ERROR_UNIQUE_NAME'));

administrator/components/com_fields/src/Table/GroupTable.php

@@ -17,6 +17,7 @@
 use Joomla\CMS\User\CurrentUserInterface;
 use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Database\DatabaseDriver;
+use Joomla\Event\DispatcherInterface;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -43,13 +44,14 @@ class GroupTable extends Table implements CurrentUserInterface
     /**
      * Class constructor.
      *
-     * @param   DatabaseDriver  $db  DatabaseDriver object.
+     * @param   DatabaseDriver        $db          Database connector object
+     * @param   ?DispatcherInterface  $dispatcher  Event dispatcher for this table
      *
      * @since   3.7.0
      */
-    public function __construct($db = null)
+    public function __construct(DatabaseDriver $db, DispatcherInterface $dispatcher = null)
     {
-        parent::__construct('#__fields_groups', 'id', $db);
+        parent::__construct('#__fields_groups', 'id', $db, $dispatcher);
 
         $this->setColumnAlias('published', 'state');
     }

administrator/components/com_finder/src/Table/FilterTable.php

@@ -17,6 +17,7 @@
 use Joomla\CMS\User\CurrentUserInterface;
 use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Database\DatabaseDriver;
+use Joomla\Event\DispatcherInterface;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -51,13 +52,14 @@ class FilterTable extends Table implements CurrentUserInterface
     /**
      * Constructor
      *
-     * @param   DatabaseDriver  $db  Database Driver connector object.
+     * @param   DatabaseDriver        $db          Database connector object
+     * @param   ?DispatcherInterface  $dispatcher  Event dispatcher for this table
      *
      * @since   2.5
      */
-    public function __construct(DatabaseDriver $db)
+    public function __construct(DatabaseDriver $db, DispatcherInterface $dispatcher = null)
     {
-        parent::__construct('#__finder_filters', 'filter_id', $db);
+        parent::__construct('#__finder_filters', 'filter_id', $db, $dispatcher);
 
         $this->setColumnAlias('published', 'state');
     }
@@ -158,7 +160,7 @@ public function store($updateNulls = true)
         }
 
         // Verify that the alias is unique
-        $table = new static($this->getDbo());
+        $table = new self($this->getDbo(), $this->getDispatcher());
 
         if ($table->load(['alias' => $this->alias]) && ($table->filter_id != $this->filter_id || $this->filter_id == 0)) {
             $this->setError(Text::_('COM_FINDER_FILTER_ERROR_UNIQUE_ALIAS'));

administrator/components/com_finder/src/Table/LinkTable.php

@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Table\Table;
 use Joomla\Database\DatabaseDriver;
+use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -35,13 +36,14 @@ class LinkTable extends Table
     /**
      * Constructor
      *
-     * @param   DatabaseDriver  $db  Database Driver connector object.
+     * @param   DatabaseDriver        $db          Database connector object
+     * @param   ?DispatcherInterface  $dispatcher  Event dispatcher for this table
      *
      * @since   2.5
      */
-    public function __construct(DatabaseDriver $db)
+    public function __construct(DatabaseDriver $db, DispatcherInterface $dispatcher = null)
     {
-        parent::__construct('#__finder_links', 'link_id', $db);
+        parent::__construct('#__finder_links', 'link_id', $db, $dispatcher);
     }
 
     /**

administrator/components/com_finder/src/Table/MapTable.php

@@ -15,6 +15,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Table\Nested;
 use Joomla\Database\DatabaseDriver;
+use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -30,13 +31,14 @@ class MapTable extends Nested
     /**
      * Constructor
      *
-     * @param   DatabaseDriver  $db  Database Driver connector object.
+     * @param   DatabaseDriver        $db          Database connector object
+     * @param   ?DispatcherInterface  $dispatcher  Event dispatcher for this table
      *
      * @since   2.5
      */
-    public function __construct(DatabaseDriver $db)
+    public function __construct(DatabaseDriver $db, DispatcherInterface $dispatcher = null)
     {
-        parent::__construct('#__finder_taxonomy', 'id', $db);
+        parent::__construct('#__finder_taxonomy', 'id', $db, $dispatcher);
 
         $this->setColumnAlias('published', 'state');
         $this->access = (int) Factory::getApplication()->get('access');

administrator/components/com_guidedtours/src/Table/StepTable.php

@@ -15,6 +15,7 @@
 use Joomla\CMS\User\CurrentUserInterface;
 use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Database\DatabaseDriver;
+use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -40,13 +41,14 @@ class StepTable extends Table implements CurrentUserInterface
     /**
      * Constructor
      *
-     * @param   DatabaseDriver $db Database connector object
+     * @param   DatabaseDriver        $db          Database connector object
+     * @param   ?DispatcherInterface  $dispatcher  Event dispatcher for this table
      *
      * @since  4.3.0
      */
-    public function __construct(DatabaseDriver $db)
+    public function __construct(DatabaseDriver $db, DispatcherInterface $dispatcher = null)
     {
-        parent::__construct('#__guidedtour_steps', 'id', $db);
+        parent::__construct('#__guidedtour_steps', 'id', $db, $dispatcher);
     }
 
     /**

administrator/components/com_guidedtours/src/Table/TourTable.php

@@ -17,6 +17,7 @@
 use Joomla\CMS\User\CurrentUserInterface;
 use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Database\DatabaseDriver;
+use Joomla\Event\DispatcherInterface;
 use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -51,13 +52,14 @@ class TourTable extends Table implements CurrentUserInterface
     /**
      * Constructor
      *
-     * @param   DatabaseDriver $db Database connector object
+     * @param   DatabaseDriver        $db          Database connector object
+     * @param   ?DispatcherInterface  $dispatcher  Event dispatcher for this table
      *
      * @since   4.3.0
      */
-    public function __construct(DatabaseDriver $db)
+    public function __construct(DatabaseDriver $db, DispatcherInterface $dispatcher = null)
     {
-        parent::__construct('#__guidedtours', 'id', $db);
+        parent::__construct('#__guidedtours', 'id', $db, $dispatcher);
     }
 
     /**

administrator/components/com_installer/src/Table/UpdatesiteTable.php

@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Table\Table;
 use Joomla\Database\DatabaseDriver;
+use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -36,14 +37,15 @@ class UpdatesiteTable extends Table
     /**
      * Constructor
      *
-     * @param   DatabaseDriver  $db  Database connector object
+     * @param   DatabaseDriver        $db          Database connector object
+     * @param   ?DispatcherInterface  $dispatcher  Event dispatcher for this table
      *
      * @since   4.0.0
      */
-    public function __construct(DatabaseDriver $db)
+    public function __construct(DatabaseDriver $db, DispatcherInterface $dispatcher = null)
     {
         $this->typeAlias = 'com_installer.downloadkey';
 
-        parent::__construct('#__update_sites', 'update_site_id', $db);
+        parent::__construct('#__update_sites', 'update_site_id', $db, $dispatcher);
     }
 }