Skip to content

Commit 7eff0f7

Browse files
authored
[5.4] Remove calls to LegacyPropertyManagementTrait in User class context (joomla#44905)
Removed calls to LegacyPropertyManagementTrait in User class context
1 parent 620b3e9 commit 7eff0f7

File tree

6 files changed

+15
-13
lines changed

6 files changed

+15
-13
lines changed

administrator/components/com_users/src/Model/UserModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ public function delete(&$pks)
351351
}
352352

353353
// Trigger the after delete event.
354-
Factory::getApplication()->triggerEvent($this->event_after_delete, [$user_to_delete->getProperties(), true, $this->getError()]);
354+
Factory::getApplication()->triggerEvent($this->event_after_delete, [ArrayHelper::fromObject($user_to_delete, false), true, $this->getError()]);
355355
} else {
356356
// Prune items that you can't change.
357357
unset($pks[$i]);

components/com_users/src/Model/RegistrationModel.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
use Joomla\CMS\User\UserFactoryAwareTrait;
3232
use Joomla\CMS\User\UserHelper;
3333
use Joomla\Database\ParameterType;
34+
use Joomla\Utilities\ArrayHelper;
3435

3536
// phpcs:disable PSR1.Files.SideEffects
3637
\defined('_JEXEC') or die;
@@ -138,7 +139,7 @@ public function activate($token)
138139
$linkMode = $app->get('force_ssl', 0) == 2 ? Route::TLS_FORCE : Route::TLS_IGNORE;
139140

140141
// Compile the admin notification mail values.
141-
$data = $user->getProperties();
142+
$data = ArrayHelper::fromObject($user, false);
142143
$data['activation'] = ApplicationHelper::getHash(UserHelper::genRandomPassword());
143144
$user->activation = $data['activation'];
144145
$data['siteurl'] = Uri::base();
@@ -209,7 +210,7 @@ public function activate($token)
209210
$user->block = '0';
210211

211212
// Compile the user activated notification mail values.
212-
$data = $user->getProperties();
213+
$data = ArrayHelper::fromObject($user, false);
213214
$user->setParam('activate', 0);
214215
$data['fromname'] = $app->get('fromname');
215216
$data['mailfrom'] = $app->get('mailfrom');
@@ -466,7 +467,7 @@ public function register($temp)
466467
$query = $db->getQuery(true);
467468

468469
// Compile the notification mail values.
469-
$data = $user->getProperties();
470+
$data = ArrayHelper::fromObject($user, false);
470471
$data['fromname'] = $app->get('fromname');
471472
$data['mailfrom'] = $app->get('mailfrom');
472473
$data['sitename'] = $app->get('sitename');

components/com_users/src/Model/ResetModel.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
use Joomla\CMS\User\UserFactoryAwareInterface;
2525
use Joomla\CMS\User\UserFactoryAwareTrait;
2626
use Joomla\CMS\User\UserHelper;
27+
use Joomla\Utilities\ArrayHelper;
2728

2829
// phpcs:disable PSR1.Files.SideEffects
2930
\defined('_JEXEC') or die;
@@ -469,7 +470,7 @@ public function processResetRequest($data)
469470
$link = 'index.php?option=com_users&view=reset&layout=confirm&token=' . $token;
470471

471472
// Put together the email template data.
472-
$data = $user->getProperties();
473+
$data = ArrayHelper::fromObject($user, false);
473474
$data['sitename'] = $app->get('sitename');
474475
$data['link_text'] = Route::_($link, false, $mode);
475476
$data['link_html'] = Route::_($link, true, $mode);

libraries/src/User/User.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ public function save($updateOnly = false)
705705
// Create the user table object
706706
$table = static::getTable();
707707
$this->params = (string) $this->_params;
708-
$table->bind($this->getProperties());
708+
$table->bind(ArrayHelper::fromObject($this, false));
709709

710710
// Allow an exception to be thrown.
711711
try {
@@ -781,9 +781,9 @@ public function save($updateOnly = false)
781781
PluginHelper::importPlugin('user', null, true, $dispatcher);
782782

783783
$saveEvent = new BeforeSaveEvent('onUserBeforeSave', [
784-
'subject' => $oldUser->getProperties(),
784+
'subject' => ArrayHelper::fromObject($oldUser, false),
785785
'isNew' => $isNew,
786-
'data' => $this->getProperties(),
786+
'data' => ArrayHelper::fromObject($this, false),
787787
]);
788788
$dispatcher->dispatch('onUserBeforeSave', $saveEvent);
789789
$result = $saveEvent['result'] ?? [];
@@ -808,7 +808,7 @@ public function save($updateOnly = false)
808808

809809
// Fire the onUserAfterSave event
810810
$dispatcher->dispatch('onUserAfterSave', new AfterSaveEvent('onUserAfterSave', [
811-
'subject' => $this->getProperties(),
811+
'subject' => ArrayHelper::fromObject($this),
812812
'isNew' => $isNew,
813813
'savingResult' => $result,
814814
'errorMessage' => $this->getError() ?? '',
@@ -836,7 +836,7 @@ public function delete()
836836

837837
// Trigger the onUserBeforeDelete event
838838
$dispatcher->dispatch('onUserBeforeDelete', new BeforeDeleteEvent('onUserBeforeDelete', [
839-
'subject' => $this->getProperties(),
839+
'subject' => ArrayHelper::fromObject($this, false),
840840
]));
841841

842842
// Create the user table object
@@ -848,7 +848,7 @@ public function delete()
848848

849849
// Trigger the onUserAfterDelete event
850850
$dispatcher->dispatch('onUserAfterDelete', new AfterDeleteEvent('onUserAfterDelete', [
851-
'subject' => $this->getProperties(),
851+
'subject' => ArrayHelper::fromObject($this, false),
852852
'deletingResult' => $result,
853853
'errorMessage' => $this->getError() ?? '',
854854
]));

plugins/system/jooa11y/src/Extension/Jooa11y.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ private function isAuthorisedDisplayChecker(): bool
7070
if (!empty($filterGroups)) {
7171
$userGroups = $this->getApplication()
7272
->getIdentity()
73-
->get('groups');
73+
->groups;
7474

7575
if (!array_intersect($filterGroups, $userGroups)) {
7676
$result = false;

plugins/user/joomla/src/Extension/Joomla.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ public function onUserLogout(LogoutEvent $event)
390390
$userid = (int) $user['id'];
391391

392392
// Make sure we're a valid user first
393-
if ($user['id'] === 0 && !$my->get('tmp_user')) {
393+
if ($user['id'] === 0 && !empty($my->tmp_user)) {
394394
return;
395395
}
396396

0 commit comments

Comments
 (0)