ENGCOM-5664: Resolve undefine variable in _createUserRole function #24182

Author: sidolov

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

@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\User\Model\ResourceModel;
 
 use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;
@@ -208,27 +210,23 @@ protected function _createUserRole($parentId, ModelUser $user)
         if ($parentId > 0) {
             /** @var \Magento\Authorization\Model\Role $parentRole */
             $parentRole = $this->_roleFactory->create()->load($parentId);
-        } else {
-            $role = new \Magento\Framework\DataObject();
-            $role->setTreeLevel(0);
-        }
-
-        if ($parentRole->getId()) {
-            $data = new \Magento\Framework\DataObject(
-                [
-                    'parent_id' => $parentRole->getId(),
-                    'tree_level' => $parentRole->getTreeLevel() + 1,
-                    'sort_order' => 0,
-                    'role_type' => RoleUser::ROLE_TYPE,
-                    'user_id' => $user->getId(),
-                    'user_type' => UserContextInterface::USER_TYPE_ADMIN,
-                    'role_name' => $user->getFirstName(),
-                ]
-            );
-
-            $insertData = $this->_prepareDataForTable($data, $this->getTable('authorization_role'));
-            $this->getConnection()->insert($this->getTable('authorization_role'), $insertData);
-            $this->aclDataCache->clean();
+            if ($parentRole->getId()) {
+                $data = new \Magento\Framework\DataObject(
+                    [
+                        'parent_id' => $parentRole->getId(),
+                        'tree_level' => $parentRole->getTreeLevel() + 1,
+                        'sort_order' => 0,
+                        'role_type' => RoleUser::ROLE_TYPE,
+                        'user_id' => $user->getId(),
+                        'user_type' => UserContextInterface::USER_TYPE_ADMIN,
+                        'role_name' => $user->getFirstName(),
+                    ]
+                );
+
+                $insertData = $this->_prepareDataForTable($data, $this->getTable('authorization_role'));
+                $this->getConnection()->insert($this->getTable('authorization_role'), $insertData);
+                $this->aclDataCache->clean();
+            }
         }
     }
 
@@ -267,8 +265,6 @@ public function delete(\Magento\Framework\Model\AbstractModel $user)
                 ['user_id = ?' => $uid, 'user_type = ?' => UserContextInterface::USER_TYPE_ADMIN]
             );
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            throw $e;
-        } catch (\Exception $e) {
             $connection->rollBack();
             return false;
         }
@@ -476,7 +472,7 @@ public function updateRoleUsersAcl(\Magento\Authorization\Model\Role $role)
         $users = $role->getRoleUsers();
         $rowsCount = 0;
 
-        if (sizeof($users) > 0) {
+        if (count($users) > 0) {
             $bind = ['reload_acl_flag' => 1];
             $where = ['user_id IN(?)' => $users];
             $rowsCount = $connection->update($this->getTable('admin_user'), $bind, $where);
@@ -618,6 +614,7 @@ public function trackPassword($user, $passwordHash, $lifetime = 0)
 
     /**
      * Get latest password for specified user id
+     *
      * Possible false positive when password was changed several times with different lifetime configuration
      *
      * @param int $userId