[6.0] The admin model does return a stdClass instead of CMSObject (joomla#42961)

laoneo · web-flow · commit e154d76acfc2 · 2024-12-07T16:14:04.000Z
Thanks @laoneo
diff --git a/administrator/components/com_banners/src/Model/BannerModel.php b/administrator/components/com_banners/src/Model/BannerModel.php
@@ -264,7 +264,7 @@ protected function loadFormData()
                 $filters     = (array) $app->getUserState('com_banners.banners.filter');
                 $filterCatId = $filters['category_id'] ?? null;
 
-                $data->set('catid', $app->getInput()->getInt('catid', $filterCatId));
+                $data->catid = $app->getInput()->getInt('catid', $filterCatId);
             }
         }
 
diff --git a/administrator/components/com_categories/src/Model/CategoryModel.php b/administrator/components/com_categories/src/Model/CategoryModel.php
@@ -337,18 +337,12 @@ protected function loadFormData()
                 $extension = substr($app->getUserState('com_categories.categories.filter.extension', ''), 4);
                 $filters   = (array) $app->getUserState('com_categories.categories.' . $extension . '.filter');
 
-                $data->set(
+                $data->published = $app->getInput()->getInt(
                     'published',
-                    $app->getInput()->getInt(
-                        'published',
-                        ((isset($filters['published']) && $filters['published'] !== '') ? $filters['published'] : null)
-                    )
-                );
-                $data->set('language', $app->getInput()->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
-                $data->set(
-                    'access',
-                    $app->getInput()->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')))
+                    ((isset($filters['published']) && $filters['published'] !== '') ? $filters['published'] : null)
                 );
+                $data->language = $app->getInput()->getString('language', (!empty($filters['language']) ? $filters['language'] : null));
+                $data->access   = $app->getInput()->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')));
             }
         }
 
diff --git a/administrator/components/com_contact/src/Model/ContactModel.php b/administrator/components/com_contact/src/Model/ContactModel.php
@@ -258,7 +258,7 @@ protected function loadFormData()
 
             // Prime some default values.
             if ($this->getState('contact.id') == 0) {
-                $data->set('catid', $app->getInput()->get('catid', $app->getUserState('com_contact.contacts.filter.category_id'), 'int'));
+                $data->catid = $app->getInput()->get('catid', $app->getUserState('com_contact.contacts.filter.category_id'), 'int');
             }
         }
 
diff --git a/administrator/components/com_content/src/Model/ArticleModel.php b/administrator/components/com_content/src/Model/ArticleModel.php
@@ -579,24 +579,18 @@ protected function loadFormData()
 
             // Pre-select some filters (Status, Category, Language, Access) in edit form if those have been selected in Article Manager: Articles
             if ($this->getState('article.id') == 0) {
-                $filters = (array) $app->getUserState('com_content.articles.filter');
-                $data->set(
+                $filters     = (array) $app->getUserState('com_content.articles.filter');
+                $data->state = $app->getInput()->getInt(
                     'state',
-                    $app->getInput()->getInt(
-                        'state',
-                        ((isset($filters['published']) && $filters['published'] !== '') ? $filters['published'] : null)
-                    )
+                    ((isset($filters['published']) && $filters['published'] !== '') ? $filters['published'] : null)
                 );
-                $data->set('catid', $app->getInput()->getInt('catid', (!empty($filters['category_id']) ? $filters['category_id'] : null)));
+                $data->catid = $app->getInput()->getInt('catid', (!empty($filters['category_id']) ? $filters['category_id'] : null));
 
                 if ($app->isClient('administrator')) {
-                    $data->set('language', $app->getInput()->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
+                    $data->language = $app->getInput()->getString('language', (!empty($filters['language']) ? $filters['language'] : null));
                 }
 
-                $data->set(
-                    'access',
-                    $app->getInput()->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')))
-                );
+                $data->access = $app->getInput()->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')));
             }
         }
 
diff --git a/administrator/components/com_fields/src/Model/FieldModel.php b/administrator/components/com_fields/src/Model/FieldModel.php
@@ -938,24 +938,18 @@ protected function loadFormData()
                 // get selected fields
                 $filters = (array) $app->getUserState('com_fields.fields.filter');
 
-                $data->set('state', $input->getInt('state', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null)));
-                $data->set('language', $input->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
-                $data->set('group_id', $input->getString('group_id', (!empty($filters['group_id']) ? $filters['group_id'] : null)));
-                $data->set(
+                $data->state            = $input->getInt('state', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null));
+                $data->language         = $input->getString('language', (!empty($filters['language']) ? $filters['language'] : null));
+                $data->group_id         = $input->getString('group_id', (!empty($filters['group_id']) ? $filters['group_id'] : null));
+                $data->assigned_cat_ids = $input->get(
                     'assigned_cat_ids',
-                    $input->get(
-                        'assigned_cat_ids',
-                        (!empty($filters['assigned_cat_ids']) ? (array)$filters['assigned_cat_ids'] : [0]),
-                        'array'
-                    )
-                );
-                $data->set(
-                    'access',
-                    $input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')))
+                    (!empty($filters['assigned_cat_ids']) ? (array)$filters['assigned_cat_ids'] : [0]),
+                    'array'
                 );
+                $data->access = $input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')));
 
                 // Set the type if available from the request
-                $data->set('type', $input->getWord('type', $this->state->get('field.type', $data->get('type'))));
+                $data->type = $input->getWord('type', $this->state->get('field.type', $data->type));
             }
 
             if ($data->label && !isset($data->params['label'])) {
diff --git a/administrator/components/com_fields/src/Model/GroupModel.php b/administrator/components/com_fields/src/Model/GroupModel.php
@@ -315,18 +315,9 @@ protected function loadFormData()
                 $context = substr($app->getUserState('com_fields.groups.filter.context', ''), 4);
                 $filters = (array) $app->getUserState('com_fields.groups.' . $context . '.filter');
 
-                $data->set(
-                    'state',
-                    $input->getInt('state', (!empty($filters['state']) ? $filters['state'] : null))
-                );
-                $data->set(
-                    'language',
-                    $input->getString('language', (!empty($filters['language']) ? $filters['language'] : null))
-                );
-                $data->set(
-                    'access',
-                    $input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')))
-                );
+                $data->state    = $input->getInt('state', (!empty($filters['state']) ? $filters['state'] : null));
+                $data->language = $input->getString('language', (!empty($filters['language']) ? $filters['language'] : null));
+                $data->access   = $input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')));
             }
         }
 
diff --git a/administrator/components/com_modules/src/Model/ModuleModel.php b/administrator/components/com_modules/src/Model/ModuleModel.php
@@ -597,12 +597,12 @@ protected function loadFormData()
 
             // Pre-select some filters (Status, Module Position, Language, Access Level) in edit form if those have been selected in Module Manager
             if (!$data->id) {
-                $clientId = $input->getInt('client_id', 0);
-                $filters  = (array) $app->getUserState('com_modules.modules.' . $clientId . '.filter');
-                $data->set('published', $input->getInt('published', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null)));
-                $data->set('position', $input->getInt('position', (!empty($filters['position']) ? $filters['position'] : null)));
-                $data->set('language', $input->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
-                $data->set('access', $input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access'))));
+                $clientId        = $input->getInt('client_id', 0);
+                $filters         = (array) $app->getUserState('com_modules.modules.' . $clientId . '.filter');
+                $data->published = $input->getInt('published', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null));
+                $data->position  = $input->getInt('position', (!empty($filters['position']) ? $filters['position'] : null));
+                $data->language  = $input->getString('language', (!empty($filters['language']) ? $filters['language'] : null));
+                $data->access    = $input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')));
             }
 
             // Avoid to delete params of a second module opened in a new browser tab while new one is not saved yet.
@@ -611,7 +611,7 @@ protected function loadFormData()
                 $params = $app->getUserState('com_modules.add.module.params');
 
                 if (\is_array($params)) {
-                    $data->set('params', $params);
+                    $data->params = $params;
                 }
             }
         }
diff --git a/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php b/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php
@@ -156,8 +156,8 @@ protected function loadFormData()
 
             // Prime some default values.
             if ($this->getState('newsfeed.id') == 0) {
-                $app = Factory::getApplication();
-                $data->set('catid', $app->getInput()->get('catid', $app->getUserState('com_newsfeeds.newsfeeds.filter.category_id'), 'int'));
+                $app         = Factory::getApplication();
+                $data->catid = $app->getInput()->get('catid', $app->getUserState('com_newsfeeds.newsfeeds.filter.category_id'), 'int');
             }
         }
 
diff --git a/administrator/components/com_scheduler/src/Model/TaskModel.php b/administrator/components/com_scheduler/src/Model/TaskModel.php
@@ -322,14 +322,14 @@ public function getItem($pk = null)
         }
 
         // Parent call leaves `execution_rules` and `cron_rules` JSON encoded
-        $item->set('execution_rules', json_decode($item->get('execution_rules', '')));
-        $item->set('cron_rules', json_decode($item->get('cron_rules', '')));
+        $item->execution_rules = json_decode($item->execution_rules ?? '');
+        $item->cron_rules      = json_decode($item->cron_rules ?? '');
 
         $taskOption = SchedulerHelper::getTaskOptions()->findOption(
             ($item->id ?? 0) ? ($item->type ?? 0) : $this->getState('task.type')
         );
 
-        $item->set('taskOption', $taskOption);
+        $item->taskOption = $taskOption;
 
         return $item;
     }
diff --git a/administrator/components/com_users/src/Model/NoteModel.php b/administrator/components/com_users/src/Model/NoteModel.php
@@ -105,7 +105,7 @@ protected function loadFormData()
 
             // Prime some default values.
             if ($this->getState('note.id') == 0) {
-                $data->set('catid', $app->getInput()->get('catid', $app->getUserState('com_users.notes.filter.category_id'), 'int'));
+                $data->catid = $app->getInput()->get('catid', $app->getUserState('com_users.notes.filter.category_id'), 'int');
             }
 
             $userId = $app->getInput()->get('u_id', 0, 'int');
diff --git a/libraries/src/MVC/Model/AdminModel.php b/libraries/src/MVC/Model/AdminModel.php
@@ -18,7 +18,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Table\Table;
@@ -1029,9 +1028,9 @@ public function getItem($pk = null)
             }
         }
 
-        // Convert to the CMSObject before adding other data.
-        $properties = $table->getProperties(1);
-        $item       = ArrayHelper::toObject($properties, CMSObject::class);
+        // Convert to \stdClass before adding other data
+        $properties = get_object_vars($table);
+        $item       = ArrayHelper::toObject($properties);
 
         if (property_exists($item, 'params')) {
             $registry     = new Registry($item->params);

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ protected function loadFormData()`
`264`	`264`	`$filters = (array) $app->getUserState('com_banners.banners.filter');`
`265`	`265`	`$filterCatId = $filters['category_id'] ?? null;`
`266`	`266`
`267`		`- $data->set('catid', $app->getInput()->getInt('catid', $filterCatId));`
	`267`	`+ $data->catid = $app->getInput()->getInt('catid', $filterCatId);`
`268`	`268`	`}`
`269`	`269`	`}`
`270`	`270`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ protected function loadFormData()`
`258`	`258`
`259`	`259`	`// Prime some default values.`
`260`	`260`	`if ($this->getState('contact.id') == 0) {`
`261`		`- $data->set('catid', $app->getInput()->get('catid', $app->getUserState('com_contact.contacts.filter.category_id'), 'int'));`
	`261`	`+ $data->catid = $app->getInput()->get('catid', $app->getUserState('com_contact.contacts.filter.category_id'), 'int');`
`262`	`262`	`}`
`263`	`263`	`}`
`264`	`264`
Original file line number	Diff line number	Diff line change
`@@ -597,12 +597,12 @@ protected function loadFormData()`
`597`	`597`
`598`	`598`	`// Pre-select some filters (Status, Module Position, Language, Access Level) in edit form if those have been selected in Module Manager`
`599`	`599`	`if (!$data->id) {`
`600`		`- $clientId = $input->getInt('client_id', 0);`
`601`		`- $filters = (array) $app->getUserState('com_modules.modules.' . $clientId . '.filter');`
`602`		`- $data->set('published', $input->getInt('published', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null)));`
`603`		`- $data->set('position', $input->getInt('position', (!empty($filters['position']) ? $filters['position'] : null)));`
`604`		`- $data->set('language', $input->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));`
`605`		`- $data->set('access', $input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access'))));`
	`600`	`+ $clientId = $input->getInt('client_id', 0);`
	`601`	`+ $filters = (array) $app->getUserState('com_modules.modules.' . $clientId . '.filter');`
	`602`	`+ $data->published = $input->getInt('published', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null));`
	`603`	`+ $data->position = $input->getInt('position', (!empty($filters['position']) ? $filters['position'] : null));`
	`604`	`+ $data->language = $input->getString('language', (!empty($filters['language']) ? $filters['language'] : null));`
	`605`	`+ $data->access = $input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')));`
`606`	`606`	`}`
`607`	`607`
`608`	`608`	`// Avoid to delete params of a second module opened in a new browser tab while new one is not saved yet.`
`@@ -611,7 +611,7 @@ protected function loadFormData()`
`611`	`611`	`$params = $app->getUserState('com_modules.add.module.params');`
`612`	`612`
`613`	`613`	`if (\is_array($params)) {`
`614`		`- $data->set('params', $params);`
	`614`	`+ $data->params = $params;`
`615`	`615`	`}`
`616`	`616`	`}`
`617`	`617`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,8 +156,8 @@ protected function loadFormData()`
`156`	`156`
`157`	`157`	`// Prime some default values.`
`158`	`158`	`if ($this->getState('newsfeed.id') == 0) {`
`159`		`- $app = Factory::getApplication();`
`160`		`- $data->set('catid', $app->getInput()->get('catid', $app->getUserState('com_newsfeeds.newsfeeds.filter.category_id'), 'int'));`
	`159`	`+ $app = Factory::getApplication();`
	`160`	`+ $data->catid = $app->getInput()->get('catid', $app->getUserState('com_newsfeeds.newsfeeds.filter.category_id'), 'int');`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`
Original file line number	Diff line number	Diff line change
`@@ -322,14 +322,14 @@ public function getItem($pk = null)`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	// Parent call leaves `execution_rules` and `cron_rules` JSON encoded
`325`		`- $item->set('execution_rules', json_decode($item->get('execution_rules', '')));`
`326`		`- $item->set('cron_rules', json_decode($item->get('cron_rules', '')));`
	`325`	`+ $item->execution_rules = json_decode($item->execution_rules ?? '');`
	`326`	`+ $item->cron_rules = json_decode($item->cron_rules ?? '');`
`327`	`327`
`328`	`328`	`$taskOption = SchedulerHelper::getTaskOptions()->findOption(`
`329`	`329`	`($item->id ?? 0) ? ($item->type ?? 0) : $this->getState('task.type')`
`330`	`330`	`);`
`331`	`331`
`332`		`- $item->set('taskOption', $taskOption);`
	`332`	`+ $item->taskOption = $taskOption;`
`333`	`333`
`334`	`334`	`return $item;`
`335`	`335`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ protected function loadFormData()`
`105`	`105`
`106`	`106`	`// Prime some default values.`
`107`	`107`	`if ($this->getState('note.id') == 0) {`
`108`		`- $data->set('catid', $app->getInput()->get('catid', $app->getUserState('com_users.notes.filter.category_id'), 'int'));`
	`108`	`+ $data->catid = $app->getInput()->get('catid', $app->getUserState('com_users.notes.filter.category_id'), 'int');`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`$userId = $app->getInput()->get('u_id', 0, 'int');`