From f6387a0efdead5570bc49cfa3b76a5a6e7fd989b Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Sat, 27 Jan 2024 07:04:34 +0100 Subject: [PATCH] Change the getItem return type to stdClass abd make the CMSObject inherit it --- .../components/com_guidedtours/src/Model/StepModel.php | 3 +-- .../components/com_guidedtours/src/Model/TourModel.php | 2 +- .../components/com_installer/src/Model/UpdatesiteModel.php | 2 +- .../components/com_mails/src/Model/TemplateModel.php | 4 ++-- libraries/src/MVC/Model/AdminModel.php | 2 +- libraries/src/Object/CMSObject.php | 3 +-- libraries/src/Workflow/WorkflowPluginTrait.php | 3 +-- 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/administrator/components/com_guidedtours/src/Model/StepModel.php b/administrator/components/com_guidedtours/src/Model/StepModel.php index 6129b2fbbd3eb..3f784fc389117 100644 --- a/administrator/components/com_guidedtours/src/Model/StepModel.php +++ b/administrator/components/com_guidedtours/src/Model/StepModel.php @@ -13,7 +13,6 @@ use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Model\AdminModel; -use Joomla\CMS\Object\CMSObject; use Joomla\CMS\Table\Table; use Joomla\Component\Guidedtours\Administrator\Helper\GuidedtoursHelper; @@ -232,7 +231,7 @@ protected function loadFormData() * * @param integer $pk The id of the primary key. * - * @return CMSObject|boolean Object on success, false on failure. + * @return \stdClass|boolean Object on success, false on failure. * * @since 4.3.0 */ diff --git a/administrator/components/com_guidedtours/src/Model/TourModel.php b/administrator/components/com_guidedtours/src/Model/TourModel.php index 12ff03e0f585a..53ed7c01a4654 100644 --- a/administrator/components/com_guidedtours/src/Model/TourModel.php +++ b/administrator/components/com_guidedtours/src/Model/TourModel.php @@ -191,7 +191,7 @@ protected function loadFormData() * * @param integer|string $pk The id or uid of the tour. * - * @return CMSObject|boolean Object on success, false on failure. + * @return \stdClass|boolean Object on success, false on failure. * * @since 4.3.0 */ diff --git a/administrator/components/com_installer/src/Model/UpdatesiteModel.php b/administrator/components/com_installer/src/Model/UpdatesiteModel.php index 4972c47f7558b..cdb5f0528eaaa 100644 --- a/administrator/components/com_installer/src/Model/UpdatesiteModel.php +++ b/administrator/components/com_installer/src/Model/UpdatesiteModel.php @@ -78,7 +78,7 @@ protected function loadFormData() * * @param integer $pk The id of the primary key. * - * @return CMSObject|boolean Object on success, false on failure. + * @return \stdClass|boolean Object on success, false on failure. * * @since 4.0.0 */ diff --git a/administrator/components/com_mails/src/Model/TemplateModel.php b/administrator/components/com_mails/src/Model/TemplateModel.php index 3c79464970a7e..3009be1f6c000 100644 --- a/administrator/components/com_mails/src/Model/TemplateModel.php +++ b/administrator/components/com_mails/src/Model/TemplateModel.php @@ -148,7 +148,7 @@ public function getForm($data = [], $loadData = true) * * @param integer $pk The id of the primary key. * - * @return CMSObject|boolean Object on success, false on failure. + * @return \stdClass|boolean Object on success, false on failure. * * @since 4.0.0 */ @@ -195,7 +195,7 @@ public function getItem($pk = null) * * @param integer $pk The id of the primary key. * - * @return CMSObject|boolean Object on success, false on failure. + * @return \stdClass|boolean Object on success, false on failure. * * @since 4.0.0 */ diff --git a/libraries/src/MVC/Model/AdminModel.php b/libraries/src/MVC/Model/AdminModel.php index 14fa8d3ead8f2..f7f4aee7388f3 100644 --- a/libraries/src/MVC/Model/AdminModel.php +++ b/libraries/src/MVC/Model/AdminModel.php @@ -977,7 +977,7 @@ protected function generateNewTitle($categoryId, $alias, $title) * * @param integer $pk The id of the primary key. * - * @return CMSObject|boolean Object on success, false on failure. + * @return \stdClass|boolean Object on success, false on failure. * * @since 1.6 */ diff --git a/libraries/src/Object/CMSObject.php b/libraries/src/Object/CMSObject.php index 942a2997b3a62..b94224ab4a009 100644 --- a/libraries/src/Object/CMSObject.php +++ b/libraries/src/Object/CMSObject.php @@ -25,8 +25,7 @@ * Use \stdClass or \Joomla\Registry\Registry instead. * Example: new \Joomla\Registry\Registry(); */ -#[\AllowDynamicProperties] -class CMSObject +class CMSObject extends \stdClass { use LegacyErrorHandlingTrait; use LegacyPropertyManagementTrait; diff --git a/libraries/src/Workflow/WorkflowPluginTrait.php b/libraries/src/Workflow/WorkflowPluginTrait.php index 0e9e74fc753c5..8171660d91755 100644 --- a/libraries/src/Workflow/WorkflowPluginTrait.php +++ b/libraries/src/Workflow/WorkflowPluginTrait.php @@ -10,7 +10,6 @@ namespace Joomla\CMS\Workflow; use Joomla\CMS\Form\Form; -use Joomla\CMS\Object\CMSObject; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; @@ -62,7 +61,7 @@ protected function enhanceWorkflowTransitionForm(Form $form, $data) * * @param int|null $workflowId ID of the workflow * - * @return CMSObject|boolean Object on success, false on failure. + * @return \stdClass|boolean Object on success, false on failure. * * @since 4.0.0 */