Merge branch '5.1-dev' into 5.0-dev-com_tpl_menu

joomla · Feb 27, 2024 · 263dd70 · 263dd70
2 parents 333aed9 + 91a6c4c
commit 263dd70
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
      */