Skip to content

Commit d1f7f0d

Browse files
committed
Fix static test
1 parent 7a8026d commit d1f7f0d

File tree

1 file changed

+2
-3
lines changed
  • app/code/Magento/User/Model/ResourceModel

1 file changed

+2
-3
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,6 @@ public function delete(\Magento\Framework\Model\AbstractModel $user)
265265
['user_id = ?' => $uid, 'user_type = ?' => UserContextInterface::USER_TYPE_ADMIN]
266266
);
267267
} catch (\Magento\Framework\Exception\LocalizedException $e) {
268-
throw $e;
269-
} catch (\Exception $e) {
270268
$connection->rollBack();
271269
return false;
272270
}
@@ -474,7 +472,7 @@ public function updateRoleUsersAcl(\Magento\Authorization\Model\Role $role)
474472
$users = $role->getRoleUsers();
475473
$rowsCount = 0;
476474

477-
if (sizeof($users) > 0) {
475+
if (count($users) > 0) {
478476
$bind = ['reload_acl_flag' => 1];
479477
$where = ['user_id IN(?)' => $users];
480478
$rowsCount = $connection->update($this->getTable('admin_user'), $bind, $where);
@@ -616,6 +614,7 @@ public function trackPassword($user, $passwordHash, $lifetime = 0)
616614

617615
/**
618616
* Get latest password for specified user id
617+
*
619618
* Possible false positive when password was changed several times with different lifetime configuration
620619
*
621620
* @param int $userId

0 commit comments

Comments
 (0)