Skip to content

Commit 368da52

Browse files
committed
ACP2E-277: address CR comments
1 parent a7b2ed2 commit 368da52

File tree

1 file changed

+13
-12
lines changed
  • app/code/Magento/Authorization/Model/Acl/Loader

1 file changed

+13
-12
lines changed

app/code/Magento/Authorization/Model/Acl/Loader/Rule.php

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
namespace Magento\Authorization\Model\Acl\Loader;
99

10+
use Magento\Framework\Acl;
1011
use Magento\Framework\Acl\Data\CacheInterface;
1112
use Magento\Framework\Acl\LoaderInterface;
1213
use Magento\Framework\Acl\RootResource;
@@ -31,27 +32,27 @@ class Rule implements LoaderInterface
3132
/**
3233
* @var ResourceConnection
3334
*/
34-
private ResourceConnection $_resource;
35+
protected $_resource;
3536

3637
/**
3738
* @var RootResource
3839
*/
39-
private RootResource $_rootResource;
40+
private $_rootResource;
4041

4142
/**
4243
* @var CacheInterface
4344
*/
44-
private CacheInterface $aclDataCache;
45+
private $aclDataCache;
4546

4647
/**
4748
* @var Json
4849
*/
49-
private Json $serializer;
50+
private $serializer;
5051

5152
/**
5253
* @var string
5354
*/
54-
private string $cacheKey;
55+
private $cacheKey;
5556

5657
/**
5758
* @param RootResource $rootResource
@@ -80,10 +81,10 @@ public function __construct(
8081
/**
8182
* Populate ACL with rules from external storage
8283
*
83-
* @param \Magento\Framework\Acl $acl
84+
* @param Acl $acl
8485
* @return void
8586
*/
86-
public function populateAcl(\Magento\Framework\Acl $acl)
87+
public function populateAcl(Acl $acl)
8788
{
8889
$result = $this->applyPermissionsAccordingToRules($acl);
8990
$this->applyDenyPermissionsForMissingRules($acl, ...$result);
@@ -92,10 +93,10 @@ public function populateAcl(\Magento\Framework\Acl $acl)
9293
/**
9394
* Apply ACL with rules
9495
*
95-
* @param \Magento\Framework\Acl $acl
96+
* @param Acl $acl
9697
* @return array[]
9798
*/
98-
private function applyPermissionsAccordingToRules(\Magento\Framework\Acl $acl): array
99+
private function applyPermissionsAccordingToRules(Acl $acl): array
99100
{
100101
$foundResources = $foundDeniedRoles = [];
101102
foreach ($this->getRulesArray() as $rule) {
@@ -124,19 +125,19 @@ private function applyPermissionsAccordingToRules(\Magento\Framework\Acl $acl):
124125
* when adding a new module and without re-saving all roles,
125126
* consider not present rules with deny permissions
126127
*
127-
* @param \Magento\Framework\Acl $acl
128+
* @param Acl $acl
128129
* @param array $resources
129130
* @param array $deniedRoles
130131
* @return void
131132
*/
132133
private function applyDenyPermissionsForMissingRules(
133-
\Magento\Framework\Acl $acl,
134+
Acl $acl,
134135
array $resources,
135136
array $deniedRoles
136137
) {
137138
if (count($resources) && count($deniedRoles)
138139
//ignore denying missing permission if all are allowed
139-
&& !(count($resources) == 1 && isset($resources[static::ALLOW_EVERYTHING]))
140+
&& !(count($resources) === 1 && isset($resources[static::ALLOW_EVERYTHING]))
140141
) {
141142
foreach ($acl->getResources() as $resource) {
142143
if (!isset($resources[$resource])) {

0 commit comments

Comments
 (0)