@@ -16,10 +16,10 @@ discard block |
||
16 | 16 | * {@inheritdoc} |
17 | 17 | */ |
18 | 18 | public function deleteItem($key) { |
19 | - if(isset($this->items[$key])) { |
|
19 | + if (isset($this->items[$key])) { |
|
20 | 20 | unset($this->items[$key]); |
21 | 21 | } |
22 | - if(isset($this->deferredItems[$key])) { |
|
22 | + if (isset($this->deferredItems[$key])) { |
|
23 | 23 | unset($this->deferredItems[$key]); |
24 | 24 | } |
25 | 25 | return true; |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | * {@inheritdoc} |
30 | 30 | */ |
31 | 31 | public function deleteItems(array $keys) { |
32 | - foreach($keys as $key) { |
|
33 | - if(!$this->deleteItem($key)) { |
|
32 | + foreach ($keys as $key) { |
|
33 | + if (!$this->deleteItem($key)) { |
|
34 | 34 | return false; |
35 | 35 | } |
36 | 36 | } |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | * {@inheritdoc} |
60 | 60 | */ |
61 | 61 | public function commit() { |
62 | - foreach($this->deferredItems as $key => $item) { |
|
62 | + foreach ($this->deferredItems as $key => $item) { |
|
63 | 63 | $this->items[$key] = $item; |
64 | 64 | unset($this->deferredItems[$key]); |
65 | 65 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | * {@inheritdoc} |
78 | 78 | */ |
79 | 79 | public function getItem($key) { |
80 | - if(!$this->hasItem($key)) { |
|
80 | + if (!$this->hasItem($key)) { |
|
81 | 81 | return new MemoryCacheItem($key); |
82 | 82 | } |
83 | 83 | return $this->items[$key]; |
@@ -88,8 +88,8 @@ discard block |
||
88 | 88 | */ |
89 | 89 | public function getItems(array $keys = array()) { |
90 | 90 | $items = []; |
91 | - foreach($keys as $key) { |
|
92 | - if($this->hasItem($key)) { |
|
91 | + foreach ($keys as $key) { |
|
92 | + if ($this->hasItem($key)) { |
|
93 | 93 | $items[$key] = $this->getItem($key); |
94 | 94 | } |
95 | 95 | } |
@@ -53,7 +53,7 @@ |
||
53 | 53 | * {@inheritdoc} |
54 | 54 | */ |
55 | 55 | public function get() { |
56 | - if(!$this->isHit()) { |
|
56 | + if (!$this->isHit()) { |
|
57 | 57 | throw new ExpiredCacheException('Cache item is expired'); |
58 | 58 | } |
59 | 59 | return $this->value; |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | $item = $pool->getItem($key); |
31 | 31 | |
32 | 32 | // In this case, the pool returned a new CacheItem |
33 | - if($item->get() === null) { |
|
33 | + if ($item->get() === null) { |
|
34 | 34 | $item->expiresAfter($ttl); |
35 | 35 | } |
36 | 36 | return $item; |
@@ -42,8 +42,8 @@ discard block |
||
42 | 42 | * @return Psr\Cache\CacheItemPoolInterface |
43 | 43 | */ |
44 | 44 | public function getItemPool($driver) { |
45 | - if(!isset($this->pools[$driver])) { |
|
46 | - $poolClass = 'PhpAbac\\Cache\\Pool\\' . ucfirst($driver) . 'CacheItemPool'; |
|
45 | + if (!isset($this->pools[$driver])) { |
|
46 | + $poolClass = 'PhpAbac\\Cache\\Pool\\'.ucfirst($driver).'CacheItemPool'; |
|
47 | 47 | $this->pools[$driver] = new $poolClass(); |
48 | 48 | } |
49 | 49 | return $this->pools[$driver]; |
@@ -69,7 +69,6 @@ discard block |
||
69 | 69 | |
70 | 70 | /** |
71 | 71 | * @param AbstractAttribute $attribute |
72 | - * @param string $attributeType |
|
73 | 72 | * @param object $user |
74 | 73 | * @param object $object |
75 | 74 | * @return mixed |
@@ -108,7 +107,7 @@ discard block |
||
108 | 107 | /** |
109 | 108 | * |
110 | 109 | * @param \PhpAbac\Model\EnvironmentAttribute $attribute |
111 | - * @return mixed |
|
110 | + * @return string |
|
112 | 111 | */ |
113 | 112 | private function retrieveEnvironmentAttribute(EnvironmentAttribute $attribute) { |
114 | 113 | return getenv($attribute->getVariableName()); |
@@ -28,12 +28,12 @@ discard block |
||
28 | 28 | { |
29 | 29 | $this->attributes = $attributes; |
30 | 30 | |
31 | - $options = array_intersect_key( $options, array_flip( [ |
|
31 | + $options = array_intersect_key($options, array_flip([ |
|
32 | 32 | 'getter_prefix', |
33 | 33 | 'getter_name_transformation_function', |
34 | - ] ) ); |
|
34 | + ])); |
|
35 | 35 | |
36 | - foreach($options as $name => $value) { |
|
36 | + foreach ($options as $name => $value) { |
|
37 | 37 | $this->$name = $value; |
38 | 38 | } |
39 | 39 | } |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | */ |
96 | 96 | public function retrieveAttribute(AbstractAttribute $attribute, $user = null, $object = null, $getter_params = []) |
97 | 97 | { |
98 | - switch($attribute->getType()) { |
|
98 | + switch ($attribute->getType()) { |
|
99 | 99 | case 'user': |
100 | 100 | return $this->retrieveClassicAttribute($attribute, $user, $getter_params); |
101 | 101 | case 'resource': |
@@ -114,18 +114,18 @@ discard block |
||
114 | 114 | { |
115 | 115 | $propertyPath = explode('.', $attribute->getProperty()); |
116 | 116 | $propertyValue = $object; |
117 | - foreach($propertyPath as $property) { |
|
117 | + foreach ($propertyPath as $property) { |
|
118 | 118 | |
119 | 119 | |
120 | - $getter = $this->getter_prefix.call_user_func($this->getter_name_transformation_function,$property); |
|
120 | + $getter = $this->getter_prefix.call_user_func($this->getter_name_transformation_function, $property); |
|
121 | 121 | // Use is_callable, instead of method_exists, to deal with __call magic method |
122 | - if(!is_callable([$propertyValue,$getter])) { |
|
122 | + if (!is_callable([$propertyValue, $getter])) { |
|
123 | 123 | throw new \InvalidArgumentException('There is no getter for the "'.$attribute->getProperty().'" attribute for object "'.get_class($propertyValue).'" with getter "'.$getter.'"'); |
124 | 124 | } |
125 | - if ( ( $propertyValue = call_user_func_array( [ |
|
125 | + if (($propertyValue = call_user_func_array([ |
|
126 | 126 | $propertyValue, |
127 | 127 | $getter, |
128 | - ], isset( $getter_params[ $property ] ) ? $getter_params[ $property ] : [] ) ) === null |
|
128 | + ], isset($getter_params[$property]) ? $getter_params[$property] : [])) === null |
|
129 | 129 | ) { |
130 | 130 | return null; |
131 | 131 | } |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | $user1Vehicle = $abac->enforce('vehicle-homologation', $users[0], $vehicles[0], [ |
35 | 35 | 'dynamic_attributes' => ['proprietaire' => 1] |
36 | 36 | ]); |
37 | - if($user1Vehicle === true) { |
|
37 | + if ($user1Vehicle === true) { |
|
38 | 38 | echo("GRANTED : The vehicle 1 is able to be approved for the user 1\n"); |
39 | 39 | } else { |
40 | 40 | echo("FAIL : The system didn't grant access\n"); |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | $user3Vehicle = $abac->enforce('vehicle-homologation', $users[2], $vehicles[1], [ |
43 | 43 | 'dynamic_attributes' => ['proprietaire' => 3] |
44 | 44 | ]); |
45 | - if(!$user3Vehicle !== true) { |
|
45 | + if (!$user3Vehicle !== true) { |
|
46 | 46 | echo("DENIED : The vehicle 2 is not approved for the user 3 because its last technical review is too old\n"); |
47 | 47 | } else { |
48 | 48 | echo("FAIL : The system didn't deny access\n"); |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | $user4Vehicle = $abac->enforce('vehicle-homologation', $users[3], $vehicles[3], [ |
51 | 51 | 'dynamic_attributes' => ['proprietaire' => 4] |
52 | 52 | ]); |
53 | - if($user4Vehicle !== true) { |
|
53 | + if ($user4Vehicle !== true) { |
|
54 | 54 | echo("DENIED : The vehicle 4 is not able to be approved for the user 4 because he has no driving license\n"); |
55 | 55 | } else { |
56 | 56 | echo("FAIL : The system didn't deny access\n"); |
@@ -58,19 +58,19 @@ discard block |
||
58 | 58 | $user5Vehicle = $abac->enforce('vehicle-homologation', $users[3], $vehicles[3], [ |
59 | 59 | 'dynamic_attributes' => ['proprietaire' => 1] |
60 | 60 | ]); |
61 | - if($user5Vehicle !== true) { |
|
61 | + if ($user5Vehicle !== true) { |
|
62 | 62 | echo("DENIED : The vehicle 4 is not able to be approved for the user 2 because he doesn't own the vehicle\n"); |
63 | 63 | } else { |
64 | 64 | echo("FAIL : The system didn't deny access\n"); |
65 | 65 | } |
66 | 66 | $userTravel1 = $abac->enforce('travel-to-usa', $users[0]); |
67 | - if($userTravel1 !== true) { |
|
67 | + if ($userTravel1 !== true) { |
|
68 | 68 | echo("DENIED: The user 1 is not allowed to travel to the USA because he doesn't have an US visa\n"); |
69 | 69 | } else { |
70 | 70 | echo('FAIL: The system didn\'t deny access'); |
71 | 71 | } |
72 | 72 | $userTravel2 = $abac->enforce('travel-to-usa', $users[1]); |
73 | - if($userTravel2 === true) { |
|
73 | + if ($userTravel2 === true) { |
|
74 | 74 | echo("GRANTED: The user 2 is allowed to travel to the USA\n"); |
75 | 75 | } else { |
76 | 76 | echo('FAIL: The system didn\'t deny access'); |
@@ -121,7 +121,7 @@ |
||
121 | 121 | * @return \PhpAbac\Model\PolicyRuleAttribute |
122 | 122 | */ |
123 | 123 | public function removeExtraData($key) { |
124 | - if(isset($this->extraData[$key])) { |
|
124 | + if (isset($this->extraData[$key])) { |
|
125 | 125 | unset($this->extraData[$key]); |
126 | 126 | } |
127 | 127 | return $this; |
@@ -60,22 +60,22 @@ discard block |
||
60 | 60 | : $pra->getValue() |
61 | 61 | ; |
62 | 62 | // Checking that the configured comparison type is available |
63 | - if(!isset($this->comparisons[$pra->getComparisonType()])) { |
|
63 | + if (!isset($this->comparisons[$pra->getComparisonType()])) { |
|
64 | 64 | throw new \InvalidArgumentException('The requested comparison class does not exist'); |
65 | 65 | } |
66 | 66 | // The comparison class will perform the attribute check with the configured method |
67 | 67 | // For more complex comparisons, the comparison manager is injected |
68 | 68 | $comparison = new $this->comparisons[$pra->getComparisonType()]($this); |
69 | - if(!method_exists($comparison, $pra->getComparison())) { |
|
69 | + if (!method_exists($comparison, $pra->getComparison())) { |
|
70 | 70 | throw new \InvalidArgumentException('The requested comparison method does not exist'); |
71 | 71 | } |
72 | 72 | // Then the comparison is performed with needed |
73 | 73 | $result = $comparison->{$pra->getComparison()}($praValue, $attribute->getValue(), $pra->getExtraData()); |
74 | 74 | // If the checked attribute is not valid, the attribute slug is marked as rejected |
75 | 75 | // The rejected attributes will be returned instead of the expected true boolean |
76 | - if($result !== true) { |
|
76 | + if ($result !== true) { |
|
77 | 77 | // In case of sub comparing, the error reporting is disabled |
78 | - if(!in_array($attribute->getSlug(), $this->rejectedAttributes) && $subComparing === false) { |
|
78 | + if (!in_array($attribute->getSlug(), $this->rejectedAttributes) && $subComparing === false) { |
|
79 | 79 | $this->rejectedAttributes[] = $attribute->getSlug(); |
80 | 80 | } |
81 | 81 | return false; |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | * @throws \InvalidArgumentException |
103 | 103 | */ |
104 | 104 | public function getDynamicAttribute($attributeSlug) { |
105 | - if(!isset($this->dynamicAttributes[$attributeSlug])) { |
|
105 | + if (!isset($this->dynamicAttributes[$attributeSlug])) { |
|
106 | 106 | throw new \InvalidArgumentException("The dynamic value for attribute $attributeSlug was not given"); |
107 | 107 | } |
108 | 108 | return $this->dynamicAttributes[$attributeSlug]; |
@@ -55,23 +55,23 @@ |
||
55 | 55 | * @return boolean |
56 | 56 | */ |
57 | 57 | public function contains($policyRuleAttributes, $attributes, $extraData = []) { |
58 | - foreach($extraData['attribute']->getValue() as $attribute) { |
|
58 | + foreach ($extraData['attribute']->getValue() as $attribute) { |
|
59 | 59 | $result = true; |
60 | 60 | // For each attribute, we check the whole rules set |
61 | - foreach($policyRuleAttributes as $pra) { |
|
61 | + foreach ($policyRuleAttributes as $pra) { |
|
62 | 62 | $attributeData = $pra->getAttribute(); |
63 | 63 | $attributeData->setValue( |
64 | 64 | $this->comparisonManager->getAttributeManager()->retrieveAttribute($attributeData, $extraData['user'], $attribute) |
65 | 65 | ); |
66 | 66 | // If one field is not matched, the whole attribute is rejected |
67 | - if(!$this->comparisonManager->compare($pra, true)) { |
|
67 | + if (!$this->comparisonManager->compare($pra, true)) { |
|
68 | 68 | //var_dump($attributeData->getName(), $attributeData->getValue(), $pra->getValue()); |
69 | 69 | $result = false; |
70 | 70 | break; |
71 | 71 | } |
72 | 72 | } |
73 | 73 | // If the result is still true at the end of the attribute check, the rule is enforced |
74 | - if($result === true) { |
|
74 | + if ($result === true) { |
|
75 | 75 | return true; |
76 | 76 | } |
77 | 77 | } |
@@ -53,7 +53,7 @@ |
||
53 | 53 | * {@inheritdoc} |
54 | 54 | */ |
55 | 55 | public function get() { |
56 | - if(!$this->isHit()) { |
|
56 | + if (!$this->isHit()) { |
|
57 | 57 | throw new ExpiredCacheException('Cache item is expired'); |
58 | 58 | } |
59 | 59 | return $this->value; |