diff --git a/administrator/components/com_guidedtours/src/Table/StepTable.php b/administrator/components/com_guidedtours/src/Table/StepTable.php index add061a10d538..e5290aa9171df 100644 --- a/administrator/components/com_guidedtours/src/Table/StepTable.php +++ b/administrator/components/com_guidedtours/src/Table/StepTable.php @@ -31,7 +31,6 @@ class StepTable extends Table * @var boolean * @since 4.3.0 */ - // phpcs:disable PSR2.Classes.PropertyDeclaration.Underscore protected $_supportNullValue = true; /** diff --git a/administrator/components/com_guidedtours/src/Table/TourTable.php b/administrator/components/com_guidedtours/src/Table/TourTable.php index ecbebf91916a3..e8249749a4f97 100644 --- a/administrator/components/com_guidedtours/src/Table/TourTable.php +++ b/administrator/components/com_guidedtours/src/Table/TourTable.php @@ -31,7 +31,6 @@ class TourTable extends Table * @var boolean * @since 4.3.0 */ - // phpcs:disable PSR2.Classes.PropertyDeclaration.Underscore protected $_supportNullValue = true; /** @@ -40,7 +39,6 @@ class TourTable extends Table * @var array * @since 4.3.0 */ - // phpcs:disable PSR2.Classes.PropertyDeclaration.Underscore protected $_jsonEncode = ['extensions']; /** @@ -107,7 +105,6 @@ public function store($updateNulls = true) * * @since 4.3.0 */ - // phpcs:ignore protected function _getAssetName(): string { $k = $this->_tbl_key; @@ -122,9 +119,35 @@ protected function _getAssetName(): string * * @since 4.3.0 */ - // phpcs:ignore protected function _getAssetTitle() { return $this->title; } + + /** + * Method to get the parent asset under which to register this one. + * + * By default, all assets are registered to the ROOT node with ID, which will default to 1 if none exists. + * The extended class can define a table and id to lookup. If the asset does not exist it will be created. + * + * @param Table $table A Table object for the asset parent. + * @param integer $id Id to look up + * + * @return integer + * + * @since 4.3.0 + */ + protected function _getAssetParentId(Table $table = null, $id = null) + { + // We retrieve the parent asset from the Asset table + $assetParent = Table::getInstance('Asset'); + + $assetParent->loadByName('com_guidedtours'); + + if ($assetParent->id) { + return $assetParent->id; + } + + return parent::_getAssetParentId($table, $id); + } } diff --git a/ruleset.xml b/ruleset.xml index 63d3e00a30b5f..e3cdfb25a37ac 100644 --- a/ruleset.xml +++ b/ruleset.xml @@ -38,6 +38,8 @@ administrator/components/com_fields/src/Table/GroupTable\.php administrator/components/com_finder/src/Table/FilterTable\.php administrator/components/com_finder/src/Table/LinkTable\.php + administrator/components/com_guidedtours/src/Table/StepTable\.php + administrator/components/com_guidedtours/src/Table/TourTable\.php administrator/components/com_installer/src/Model/DatabaseModel\.php administrator/components/com_installer/src/Model/InstallModel\.php administrator/components/com_installer/src/Table/UpdatesiteTable\.php @@ -156,6 +158,7 @@ administrator/components/com_fields/src/Table/FieldTable\.php administrator/components/com_fields/src/Table/GroupTable\.php administrator/components/com_finder/src/Model/MapsModel\.php + administrator/components/com_guidedtours/src/Table/TourTable\.php administrator/components/com_installer/src/Model/InstallerModel\.php administrator/components/com_installer/src/Model/InstallModel\.php administrator/components/com_installer/src/Model/LanguagesModel\.php