Merge branch '6.0-dev' into upmerges/2025-03-26

Author: Bodge-IT

administrator/components/com_installer/src/View/Updatesite/HtmlView.php

@@ -70,7 +70,7 @@ public function display($tpl = null): void
 
         // Remove the extra_query field if it's a free download extension
         $dlidSupportingSites = InstallerHelper::getDownloadKeySupportedSites(false);
-        $update_site_id      = $this->item->get('update_site_id');
+        $update_site_id      = $this->item->update_site_id;
 
         if (!\in_array($update_site_id, $dlidSupportingSites)) {
             $this->form->removeField('extra_query');

administrator/components/com_messages/src/Model/MessageModel.php

@@ -163,11 +163,12 @@ public function getItem($pk = null)
                             return false;
                         }
 
-                        $this->item->set('user_id_to', $message->user_id_from);
+                        $this->item->user_id_to = $message->user_id_from;
+
                         $re = Text::_('COM_MESSAGES_RE');
 
                         if (stripos($message->subject, $re) !== 0) {
-                            $this->item->set('subject', $re . ' ' . $message->subject);
+                            $this->item->subject = $re . ' ' . $message->subject;
                         }
                     }
                 } elseif ($this->item->user_id_to != $this->getCurrentUser()->id) {
@@ -188,7 +189,7 @@ public function getItem($pk = null)
 
             // Get the user name for an existing message.
             if ($this->item->user_id_from && $fromUser = new User($this->item->user_id_from)) {
-                $this->item->set('from_user_name', $fromUser->name);
+                $this->item->from_user_name = $fromUser->name;
             }
         }
 

administrator/components/com_messages/tmpl/message/default.php

@@ -33,7 +33,7 @@
     <div class="card-body">
         <dl class="mb-0">
             <dt><?php echo Text::_('COM_MESSAGES_FIELD_USER_ID_FROM_LABEL'); ?></dt>
-            <dd><?php echo $this->item->get('from_user_name'); ?></dd>
+            <dd><?php echo $this->item->from_user_name; ?></dd>
 
             <dt><?php echo Text::_('COM_MESSAGES_FIELD_DATE_TIME_LABEL'); ?></dt>
             <dd><?php echo HTMLHelper::_('date', $this->item->date_time, Text::_('DATE_FORMAT_LC2')); ?></dd>

administrator/components/com_modules/src/Controller/ModuleController.php

@@ -232,7 +232,7 @@ public function save($key = null, $urlVar = null)
             $model      = $this->getModel();
             $data       = $this->input->post->get('jform', [], 'array');
             $item       = $model->getItem($this->input->get('id'));
-            $properties = $item->getProperties();
+            $properties = get_object_vars($item);
 
             if (isset($data['params'])) {
                 unset($properties['params']);

administrator/components/com_templates/src/Controller/StyleController.php

@@ -58,9 +58,9 @@ public function save($key = null, $urlVar = null)
             $item = $model->getItem($this->app->getTemplate(true)->id);
 
             // Setting received params
-            $item->set('params', $data);
+            $item->params = $data;
 
-            $data = $item->getProperties();
+            $data = get_object_vars($item);
             unset($data['xml']);
 
             $key = $table->getKeyName();

administrator/components/com_templates/tmpl/template/default_description.php

@@ -27,5 +27,5 @@
     <h2><?php echo ucfirst($this->template->element); ?></h2>
     <?php $client = ApplicationHelper::getClientInfo($this->template->client_id); ?>
     <p><?php $this->template->xmldata = TemplatesHelper::parseXMLTemplateFile($client->path, $this->template->element); ?></p>
-    <p><?php echo Text::_($this->template->xmldata->get('description')); ?></p>
+    <p><?php echo Text::_($this->template->xmldata->description); ?></p>
 </div>

administrator/components/com_templates/tmpl/templates/default.php

@@ -98,21 +98,21 @@
                                     <?php endif; ?>
                                 </th>
                                 <td class="small d-none d-md-table-cell text-center">
-                                    <?php echo $this->escape($item->xmldata->get('version')); ?>
+                                    <?php echo $this->escape($item->xmldata->version); ?>
                                 </td>
                                 <td class="small d-none d-md-table-cell text-center">
-                                    <?php echo $this->escape($item->xmldata->get('creationDate')); ?>
+                                    <?php echo $this->escape($item->xmldata->creationDate); ?>
                                 </td>
                                 <td class="d-none d-md-table-cell text-center">
-                                    <?php if ($author = $item->xmldata->get('author')) : ?>
+                                    <?php if ($author = $item->xmldata->author) : ?>
                                         <div><?php echo $this->escape($author); ?></div>
                                     <?php else : ?>
                                         &mdash;
                                     <?php endif; ?>
-                                    <?php if ($email = $item->xmldata->get('authorEmail')) : ?>
+                                    <?php if ($email = $item->xmldata->authorEmail) : ?>
                                         <div><?php echo $this->escape($email); ?></div>
                                     <?php endif; ?>
-                                    <?php if ($url = $item->xmldata->get('authorUrl')) : ?>
+                                    <?php if ($url = $item->xmldata->authorUrl) : ?>
                                         <div><a href="<?php echo $this->escape($url); ?>"><?php echo $this->escape($url); ?></a></div>
                                     <?php endif; ?>
                                 </td>

components/com_config/src/View/Modules/HtmlView.php

@@ -63,7 +63,7 @@ public function display($tpl = null)
         // @todo Move and clean up
         $module = (new \Joomla\Component\Modules\Administrator\Model\ModuleModel())->getItem(Factory::getApplication()->getInput()->getInt('id'));
 
-        $moduleData = $module->getProperties();
+        $moduleData = get_object_vars($module);
         unset($moduleData['xml']);
 
         /** @var \Joomla\Component\Config\Site\Model\ModulesModel $model */