Skip to content

Commit 4845457

Browse files
author
Nihar Ranjan
committed
Code formatting
1 parent 1c50d72 commit 4845457

File tree

2 files changed

+33
-6
lines changed

2 files changed

+33
-6
lines changed

dev/tests/integration/testsuite/Magento/LoginAsCustomer/_files/admin.php

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
use Magento\User\Model\User;
1313
use Magento\Authorization\Model\RulesFactory;
1414
use Magento\Authorization\Model\Rules;
15+
use Magento\Authorization\Model\ResourceModel\Role as RoleResource;
16+
use Magento\Authorization\Model\ResourceModel\Rules as RulesResource;
17+
use Magento\User\Model\ResourceModel\User as UserResource;
1518

1619
//Creating a new admin user with a custom role to safely change role settings without affecting the main user's role.
1720
/** @var Role $role */
@@ -20,13 +23,20 @@
2023
$role->setData('role_name', $role->getName());
2124
$role->setRoleType(\Magento\Authorization\Model\Acl\Role\Group::ROLE_TYPE);
2225
$role->setUserType((string)\Magento\Authorization\Model\UserContextInterface::USER_TYPE_ADMIN);
23-
$role->save();
26+
27+
/** @var RoleResource $roleResource */
28+
$roleResource = Bootstrap::getObjectManager()->get(RoleResource::class);
29+
$roleResource->save($role);
30+
2431
/** @var Rules $rules */
2532
$rules = Bootstrap::getObjectManager()->get(RulesFactory::class)->create();
2633
$rules->setRoleId($role->getId());
2734
//Granted all permissions.
2835
$rules->setResources([Bootstrap::getObjectManager()->get(\Magento\Framework\Acl\RootResource::class)->getId()]);
29-
$rules->saveRel();
36+
37+
/** @var RulesResource $rulesResource */
38+
$rulesResource = Bootstrap::getObjectManager()->get(RulesResource::class);
39+
$rulesResource->saveRel($rules);
3040

3141
/** @var User $user */
3242
$user = Bootstrap::getObjectManager()->create(User::class);
@@ -37,4 +47,7 @@
3747
->setEmail('[email protected]')
3848
->setIsActive(1)
3949
->setRoleId($role->getId());
40-
$user->save();
50+
51+
/** @var UserResource $userResource */
52+
$userResource = Bootstrap::getObjectManager()->get(UserResource::class);
53+
$userResource->save($user);

dev/tests/integration/testsuite/Magento/LoginAsCustomer/_files/admin_rollback.php

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,31 @@
1212
use Magento\User\Model\User;
1313
use Magento\Authorization\Model\RulesFactory;
1414
use Magento\Authorization\Model\Rules;
15+
use Magento\Authorization\Model\ResourceModel\Role as RoleResource;
16+
use Magento\Authorization\Model\ResourceModel\Rules as RulesResource;
17+
use Magento\User\Model\ResourceModel\User as UserResource;
1518

1619
//Deleting the user and the role.
1720
/** @var User $user */
1821
$user = Bootstrap::getObjectManager()->create(User::class);
1922
$user->load('TestAdmin1', 'username');
20-
$user->delete();
23+
24+
/** @var UserResource $userResource */
25+
$userResource = Bootstrap::getObjectManager()->get(UserResource::class);
26+
$userResource->delete($user);
27+
2128
/** @var Role $role */
2229
$role = Bootstrap::getObjectManager()->get(RoleFactory::class)->create();
2330
$role->load('test_custom_role', 'role_name');
31+
2432
/** @var Rules $rules */
2533
$rules = Bootstrap::getObjectManager()->get(RulesFactory::class)->create();
2634
$rules->load($role->getId(), 'role_id');
27-
$rules->delete();
28-
$role->delete();
35+
36+
/** @var RulesResource $rulesResource */
37+
$rulesResource = Bootstrap::getObjectManager()->get(RulesResource::class);
38+
$rulesResource->delete($rules);
39+
40+
/** @var RoleResource $roleResource */
41+
$roleResource = Bootstrap::getObjectManager()->get(RoleResource::class);
42+
$roleResource->delete($role);

0 commit comments

Comments
 (0)