Skip to content

Commit 91df9ce

Browse files
committed
Resolve undefine variable in _createUserRole function
1 parent 2bc471e commit 91df9ce

File tree

1 file changed

+19
-18
lines changed
  • app/code/Magento/User/Model/ResourceModel

1 file changed

+19
-18
lines changed

app/code/Magento/User/Model/ResourceModel/User.php

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
* See COPYING.txt for license details.
55
*/
66

7+
declare(strict_types=1);
8+
79
namespace Magento\User\Model\ResourceModel;
810

911
use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;
@@ -208,28 +210,27 @@ protected function _createUserRole($parentId, ModelUser $user)
208210
if ($parentId > 0) {
209211
/** @var \Magento\Authorization\Model\Role $parentRole */
210212
$parentRole = $this->_roleFactory->create()->load($parentId);
213+
if ($parentRole->getId()) {
214+
$data = new \Magento\Framework\DataObject(
215+
[
216+
'parent_id' => $parentRole->getId(),
217+
'tree_level' => $parentRole->getTreeLevel() + 1,
218+
'sort_order' => 0,
219+
'role_type' => RoleUser::ROLE_TYPE,
220+
'user_id' => $user->getId(),
221+
'user_type' => UserContextInterface::USER_TYPE_ADMIN,
222+
'role_name' => $user->getFirstName(),
223+
]
224+
);
225+
226+
$insertData = $this->_prepareDataForTable($data, $this->getTable('authorization_role'));
227+
$this->getConnection()->insert($this->getTable('authorization_role'), $insertData);
228+
$this->aclDataCache->clean();
229+
}
211230
} else {
212231
$role = new \Magento\Framework\DataObject();
213232
$role->setTreeLevel(0);
214233
}
215-
216-
if ($parentRole->getId()) {
217-
$data = new \Magento\Framework\DataObject(
218-
[
219-
'parent_id' => $parentRole->getId(),
220-
'tree_level' => $parentRole->getTreeLevel() + 1,
221-
'sort_order' => 0,
222-
'role_type' => RoleUser::ROLE_TYPE,
223-
'user_id' => $user->getId(),
224-
'user_type' => UserContextInterface::USER_TYPE_ADMIN,
225-
'role_name' => $user->getFirstName(),
226-
]
227-
);
228-
229-
$insertData = $this->_prepareDataForTable($data, $this->getTable('authorization_role'));
230-
$this->getConnection()->insert($this->getTable('authorization_role'), $insertData);
231-
$this->aclDataCache->clean();
232-
}
233234
}
234235

235236
/**

0 commit comments

Comments
 (0)