@@ -32,22 +32,22 @@ |
||
32 | 32 | |
33 | 33 | public function __construct( |
34 | 34 | private readonly RulesInterface $repository |
35 | - ) { |
|
35 | + ){ |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | public function allows(ActorInterface $actor, string $permission, array $context): bool |
39 | 39 | { |
40 | 40 | $allowed = 0; |
41 | - foreach (static::RULES as $rule) { |
|
41 | + foreach (static::RULES as $rule){ |
|
42 | 42 | $rule = $this->repository->get($rule); |
43 | 43 | |
44 | - if ($rule->allows($actor, $permission, $context)) { |
|
45 | - if (static::BEHAVIOUR === self::AT_LEAST_ONE) { |
|
44 | + if ($rule->allows($actor, $permission, $context)){ |
|
45 | + if (static::BEHAVIOUR === self::AT_LEAST_ONE){ |
|
46 | 46 | return true; |
47 | 47 | } |
48 | 48 | |
49 | 49 | $allowed++; |
50 | - } elseif (static::BEHAVIOUR === self::ALL) { |
|
50 | + } elseif (static::BEHAVIOUR === self::ALL){ |
|
51 | 51 | return false; |
52 | 52 | } |
53 | 53 | } |
@@ -38,16 +38,21 @@ |
||
38 | 38 | public function allows(ActorInterface $actor, string $permission, array $context): bool |
39 | 39 | { |
40 | 40 | $allowed = 0; |
41 | - foreach (static::RULES as $rule) { |
|
41 | + foreach (static::RULES as $rule) |
|
42 | + { |
|
42 | 43 | $rule = $this->repository->get($rule); |
43 | 44 | |
44 | - if ($rule->allows($actor, $permission, $context)) { |
|
45 | - if (static::BEHAVIOUR === self::AT_LEAST_ONE) { |
|
45 | + if ($rule->allows($actor, $permission, $context)) |
|
46 | + { |
|
47 | + if (static::BEHAVIOUR === self::AT_LEAST_ONE) |
|
48 | + { |
|
46 | 49 | return true; |
47 | 50 | } |
48 | 51 | |
49 | 52 | $allowed++; |
50 | - } elseif (static::BEHAVIOUR === self::ALL) { |
|
53 | + } |
|
54 | + elseif (static::BEHAVIOUR === self::ALL) |
|
55 | + { |
|
51 | 56 | return false; |
52 | 57 | } |
53 | 58 | } |
@@ -21,6 +21,6 @@ |
||
21 | 21 | |
22 | 22 | public function allows(ActorInterface $actor, string $permission, array $context): bool |
23 | 23 | { |
24 | - return (bool) ($this->callable)($actor, $permission, $context); |
|
24 | + return (bool)($this->callable)($actor, $permission, $context); |
|
25 | 25 | } |
26 | 26 | } |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | public function __construct( |
33 | 33 | private readonly RulesInterface $rules, |
34 | 34 | private readonly string $defaultRule = ForbidRule::class |
35 | - ) { |
|
35 | + ){ |
|
36 | 36 | $this->matcher = new Matcher(); |
37 | 37 | } |
38 | 38 | |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | |
44 | 44 | public function addRole(string $role): PermissionManager |
45 | 45 | { |
46 | - if ($this->hasRole($role)) { |
|
46 | + if ($this->hasRole($role)){ |
|
47 | 47 | throw new RoleException(\sprintf("Role '%s' already exists", $role)); |
48 | 48 | } |
49 | 49 | |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | |
57 | 57 | public function removeRole(string $role): PermissionManager |
58 | 58 | { |
59 | - if (!$this->hasRole($role)) { |
|
59 | + if (!$this->hasRole($role)){ |
|
60 | 60 | throw new RoleException(\sprintf("Undefined role '%s'", $role)); |
61 | 61 | } |
62 | 62 | |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | |
73 | 73 | public function getPermissions(string $role): array |
74 | 74 | { |
75 | - if (!$this->hasRole($role)) { |
|
75 | + if (!$this->hasRole($role)){ |
|
76 | 76 | throw new RoleException(\sprintf("Undefined role '%s'", $role)); |
77 | 77 | } |
78 | 78 | |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | |
82 | 82 | public function getRule(string $role, string $permission): RuleInterface |
83 | 83 | { |
84 | - if (!$this->hasRole($role)) { |
|
84 | + if (!$this->hasRole($role)){ |
|
85 | 85 | throw new RoleException(\sprintf("Undefined role '%s'", $role)); |
86 | 86 | } |
87 | 87 | |
@@ -91,11 +91,11 @@ discard block |
||
91 | 91 | |
92 | 92 | public function associate(string $role, string $permission, string $rule = AllowRule::class): PermissionManager |
93 | 93 | { |
94 | - if (!$this->hasRole($role)) { |
|
94 | + if (!$this->hasRole($role)){ |
|
95 | 95 | throw new RoleException(\sprintf("Undefined role '%s'", $role)); |
96 | 96 | } |
97 | 97 | |
98 | - if (!$this->rules->has($rule)) { |
|
98 | + if (!$this->rules->has($rule)){ |
|
99 | 99 | throw new PermissionException(\sprintf("Undefined rule '%s'", $rule)); |
100 | 100 | } |
101 | 101 | |
@@ -121,14 +121,14 @@ discard block |
||
121 | 121 | */ |
122 | 122 | private function findRule(string $role, string $permission): string |
123 | 123 | { |
124 | - if (isset($this->permissions[$role][$permission])) { |
|
124 | + if (isset($this->permissions[$role][$permission])){ |
|
125 | 125 | //O(1) check |
126 | 126 | return $this->permissions[$role][$permission]; |
127 | 127 | } |
128 | 128 | |
129 | 129 | //Matching using star syntax |
130 | - foreach ($this->permissions[$role] as $pattern => $rule) { |
|
131 | - if ($this->matcher->matches($permission, $pattern)) { |
|
130 | + foreach ($this->permissions[$role] as $pattern => $rule){ |
|
131 | + if ($this->matcher->matches($permission, $pattern)){ |
|
132 | 132 | return $rule; |
133 | 133 | } |
134 | 134 | } |
@@ -43,7 +43,8 @@ discard block |
||
43 | 43 | |
44 | 44 | public function addRole(string $role): PermissionManager |
45 | 45 | { |
46 | - if ($this->hasRole($role)) { |
|
46 | + if ($this->hasRole($role)) |
|
47 | + { |
|
47 | 48 | throw new RoleException(\sprintf("Role '%s' already exists", $role)); |
48 | 49 | } |
49 | 50 | |
@@ -56,7 +57,8 @@ discard block |
||
56 | 57 | |
57 | 58 | public function removeRole(string $role): PermissionManager |
58 | 59 | { |
59 | - if (!$this->hasRole($role)) { |
|
60 | + if (!$this->hasRole($role)) |
|
61 | + { |
|
60 | 62 | throw new RoleException(\sprintf("Undefined role '%s'", $role)); |
61 | 63 | } |
62 | 64 | |
@@ -72,7 +74,8 @@ discard block |
||
72 | 74 | |
73 | 75 | public function getPermissions(string $role): array |
74 | 76 | { |
75 | - if (!$this->hasRole($role)) { |
|
77 | + if (!$this->hasRole($role)) |
|
78 | + { |
|
76 | 79 | throw new RoleException(\sprintf("Undefined role '%s'", $role)); |
77 | 80 | } |
78 | 81 | |
@@ -81,7 +84,8 @@ discard block |
||
81 | 84 | |
82 | 85 | public function getRule(string $role, string $permission): RuleInterface |
83 | 86 | { |
84 | - if (!$this->hasRole($role)) { |
|
87 | + if (!$this->hasRole($role)) |
|
88 | + { |
|
85 | 89 | throw new RoleException(\sprintf("Undefined role '%s'", $role)); |
86 | 90 | } |
87 | 91 | |
@@ -91,11 +95,13 @@ discard block |
||
91 | 95 | |
92 | 96 | public function associate(string $role, string $permission, string $rule = AllowRule::class): PermissionManager |
93 | 97 | { |
94 | - if (!$this->hasRole($role)) { |
|
98 | + if (!$this->hasRole($role)) |
|
99 | + { |
|
95 | 100 | throw new RoleException(\sprintf("Undefined role '%s'", $role)); |
96 | 101 | } |
97 | 102 | |
98 | - if (!$this->rules->has($rule)) { |
|
103 | + if (!$this->rules->has($rule)) |
|
104 | + { |
|
99 | 105 | throw new PermissionException(\sprintf("Undefined rule '%s'", $rule)); |
100 | 106 | } |
101 | 107 | |
@@ -121,14 +127,17 @@ discard block |
||
121 | 127 | */ |
122 | 128 | private function findRule(string $role, string $permission): string |
123 | 129 | { |
124 | - if (isset($this->permissions[$role][$permission])) { |
|
130 | + if (isset($this->permissions[$role][$permission])) |
|
131 | + { |
|
125 | 132 | //O(1) check |
126 | 133 | return $this->permissions[$role][$permission]; |
127 | 134 | } |
128 | 135 | |
129 | 136 | //Matching using star syntax |
130 | - foreach ($this->permissions[$role] as $pattern => $rule) { |
|
131 | - if ($this->matcher->matches($permission, $pattern)) { |
|
137 | + foreach ($this->permissions[$role] as $pattern => $rule) |
|
138 | + { |
|
139 | + if ($this->matcher->matches($permission, $pattern)) |
|
140 | + { |
|
132 | 141 | return $rule; |
133 | 142 | } |
134 | 143 | } |
@@ -13,7 +13,7 @@ |
||
13 | 13 | { |
14 | 14 | public function __construct( |
15 | 15 | private readonly array $roles |
16 | - ) { |
|
16 | + ){ |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | public function getRoles(): array |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | public function getGuard(): GuardInterface |
21 | 21 | { |
22 | 22 | $container = ContainerScope::getContainer(); |
23 | - if (empty($container) || !$container->has(GuardInterface::class)) { |
|
23 | + if (empty($container) || !$container->has(GuardInterface::class)){ |
|
24 | 24 | throw new ScopeException( |
25 | 25 | 'Unable to get `GuardInterface`, binding is missing or container scope is not set' |
26 | 26 | ); |
@@ -44,9 +44,9 @@ discard block |
||
44 | 44 | */ |
45 | 45 | protected function resolvePermission(string $permission): string |
46 | 46 | { |
47 | - if (\defined('static::GUARD_NAMESPACE')) { |
|
47 | + if (\defined('static::GUARD_NAMESPACE')){ |
|
48 | 48 | // Yay! Isolation |
49 | - $permission = \constant(static::class . '::' . 'GUARD_NAMESPACE') . '.' . $permission; |
|
49 | + $permission = \constant(static::class.'::'.'GUARD_NAMESPACE').'.'.$permission; |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | return $permission; |
@@ -20,7 +20,8 @@ discard block |
||
20 | 20 | public function getGuard(): GuardInterface |
21 | 21 | { |
22 | 22 | $container = ContainerScope::getContainer(); |
23 | - if (empty($container) || !$container->has(GuardInterface::class)) { |
|
23 | + if (empty($container) || !$container->has(GuardInterface::class)) |
|
24 | + { |
|
24 | 25 | throw new ScopeException( |
25 | 26 | 'Unable to get `GuardInterface`, binding is missing or container scope is not set' |
26 | 27 | ); |
@@ -44,7 +45,8 @@ discard block |
||
44 | 45 | */ |
45 | 46 | protected function resolvePermission(string $permission): string |
46 | 47 | { |
47 | - if (\defined('static::GUARD_NAMESPACE')) { |
|
48 | + if (\defined('static::GUARD_NAMESPACE')) |
|
49 | + { |
|
48 | 50 | // Yay! Isolation |
49 | 51 | $permission = \constant(static::class . '::' . 'GUARD_NAMESPACE') . '.' . $permission; |
50 | 52 | } |
@@ -28,16 +28,16 @@ discard block |
||
28 | 28 | { |
29 | 29 | $role = $this->argument('role'); |
30 | 30 | |
31 | - if ($role !== null && !$rbac->hasRole($role)) { |
|
31 | + if ($role !== null && !$rbac->hasRole($role)){ |
|
32 | 32 | throw new CommandException('Unknown role provided'); |
33 | 33 | } |
34 | 34 | |
35 | - if ($role !== null) { |
|
35 | + if ($role !== null){ |
|
36 | 36 | $rows = $this->getRolePermissions($role, $rbac); |
37 | - } else { |
|
37 | + }else{ |
|
38 | 38 | $rows = []; |
39 | 39 | |
40 | - foreach ($rbac->getRoles() as $role) { |
|
40 | + foreach ($rbac->getRoles() as $role){ |
|
41 | 41 | /** @noinspection SlowArrayOperationsInLoopInspection */ |
42 | 42 | $rows = \array_merge( |
43 | 43 | $this->getRolePermissions($role, $rbac), |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | { |
64 | 64 | $permissions = []; |
65 | 65 | |
66 | - foreach ($rbac->getPermissions($role) as $permission => $rule) { |
|
66 | + foreach ($rbac->getPermissions($role) as $permission => $rule){ |
|
67 | 67 | $permissions[] = [ |
68 | 68 | 'role' => $role, |
69 | 69 | 'permission' => $permission, |
@@ -28,16 +28,21 @@ discard block |
||
28 | 28 | { |
29 | 29 | $role = $this->argument('role'); |
30 | 30 | |
31 | - if ($role !== null && !$rbac->hasRole($role)) { |
|
31 | + if ($role !== null && !$rbac->hasRole($role)) |
|
32 | + { |
|
32 | 33 | throw new CommandException('Unknown role provided'); |
33 | 34 | } |
34 | 35 | |
35 | - if ($role !== null) { |
|
36 | + if ($role !== null) |
|
37 | + { |
|
36 | 38 | $rows = $this->getRolePermissions($role, $rbac); |
37 | - } else { |
|
39 | + } |
|
40 | + else |
|
41 | + { |
|
38 | 42 | $rows = []; |
39 | 43 | |
40 | - foreach ($rbac->getRoles() as $role) { |
|
44 | + foreach ($rbac->getRoles() as $role) |
|
45 | + { |
|
41 | 46 | /** @noinspection SlowArrayOperationsInLoopInspection */ |
42 | 47 | $rows = \array_merge( |
43 | 48 | $this->getRolePermissions($role, $rbac), |
@@ -63,7 +68,8 @@ discard block |
||
63 | 68 | { |
64 | 69 | $permissions = []; |
65 | 70 | |
66 | - foreach ($rbac->getPermissions($role) as $permission => $rule) { |
|
71 | + foreach ($rbac->getPermissions($role) as $permission => $rule) |
|
72 | + { |
|
67 | 73 | $permissions[] = [ |
68 | 74 | 'role' => $role, |
69 | 75 | 'permission' => $permission, |
@@ -18,16 +18,16 @@ discard block |
||
18 | 18 | |
19 | 19 | public function __construct( |
20 | 20 | private readonly ContainerInterface $container |
21 | - ) { |
|
21 | + ){ |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | public function set(string $name, mixed $rule = null): RuleManager |
25 | 25 | { |
26 | - if (empty($rule)) { |
|
26 | + if (empty($rule)){ |
|
27 | 27 | $rule = $name; |
28 | 28 | } |
29 | 29 | |
30 | - if (!$this->validateRule($rule)) { |
|
30 | + if (!$this->validateRule($rule)){ |
|
31 | 31 | throw new RuleException("Unable to set rule '{$name}', invalid rule body"); |
32 | 32 | } |
33 | 33 | |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | |
39 | 39 | public function remove(string $name): RuleManager |
40 | 40 | { |
41 | - if (!$this->has($name)) { |
|
41 | + if (!$this->has($name)){ |
|
42 | 42 | throw new RuleException("Undefined rule '{$name}'"); |
43 | 43 | } |
44 | 44 | |
@@ -60,26 +60,26 @@ discard block |
||
60 | 60 | |
61 | 61 | public function get(string $name): RuleInterface |
62 | 62 | { |
63 | - if (!$this->has($name)) { |
|
63 | + if (!$this->has($name)){ |
|
64 | 64 | throw new RuleException(\sprintf("Undefined rule '%s'", $name)); |
65 | 65 | } |
66 | 66 | |
67 | - if (!isset($this->rules[$name])) { |
|
67 | + if (!isset($this->rules[$name])){ |
|
68 | 68 | //Rule represented as class name |
69 | 69 | $rule = $name; |
70 | - } else { |
|
70 | + }else{ |
|
71 | 71 | $rule = $this->rules[$name]; |
72 | 72 | } |
73 | 73 | |
74 | - if ($rule instanceof RuleInterface) { |
|
74 | + if ($rule instanceof RuleInterface){ |
|
75 | 75 | return $rule; |
76 | 76 | } |
77 | 77 | |
78 | - if (\is_string($rule)) { |
|
78 | + if (\is_string($rule)){ |
|
79 | 79 | //We are expecting that rule points to |
80 | 80 | $rule = $this->container->get($rule); |
81 | 81 | |
82 | - if (!$rule instanceof RuleInterface) { |
|
82 | + if (!$rule instanceof RuleInterface){ |
|
83 | 83 | throw new RuleException(\sprintf( |
84 | 84 | "Rule '%s' must point to RuleInterface, '%s' given", |
85 | 85 | $name, |
@@ -99,18 +99,18 @@ discard block |
||
99 | 99 | */ |
100 | 100 | private function validateRule(mixed $rule): bool |
101 | 101 | { |
102 | - if ($rule instanceof \Closure || $rule instanceof RuleInterface) { |
|
102 | + if ($rule instanceof \Closure || $rule instanceof RuleInterface){ |
|
103 | 103 | return true; |
104 | 104 | } |
105 | 105 | |
106 | - if (\is_array($rule)) { |
|
106 | + if (\is_array($rule)){ |
|
107 | 107 | return \is_callable($rule, true); |
108 | 108 | } |
109 | 109 | |
110 | - if (\is_string($rule) && \class_exists($rule)) { |
|
111 | - try { |
|
110 | + if (\is_string($rule) && \class_exists($rule)){ |
|
111 | + try{ |
|
112 | 112 | $reflection = new \ReflectionClass($rule); |
113 | - } catch (\ReflectionException) { |
|
113 | + }catch (\ReflectionException){ |
|
114 | 114 | return false; |
115 | 115 | } |
116 | 116 |
@@ -23,11 +23,13 @@ discard block |
||
23 | 23 | |
24 | 24 | public function set(string $name, mixed $rule = null): RuleManager |
25 | 25 | { |
26 | - if (empty($rule)) { |
|
26 | + if (empty($rule)) |
|
27 | + { |
|
27 | 28 | $rule = $name; |
28 | 29 | } |
29 | 30 | |
30 | - if (!$this->validateRule($rule)) { |
|
31 | + if (!$this->validateRule($rule)) |
|
32 | + { |
|
31 | 33 | throw new RuleException("Unable to set rule '{$name}', invalid rule body"); |
32 | 34 | } |
33 | 35 | |
@@ -38,7 +40,8 @@ discard block |
||
38 | 40 | |
39 | 41 | public function remove(string $name): RuleManager |
40 | 42 | { |
41 | - if (!$this->has($name)) { |
|
43 | + if (!$this->has($name)) |
|
44 | + { |
|
42 | 45 | throw new RuleException("Undefined rule '{$name}'"); |
43 | 46 | } |
44 | 47 | |
@@ -60,26 +63,33 @@ discard block |
||
60 | 63 | |
61 | 64 | public function get(string $name): RuleInterface |
62 | 65 | { |
63 | - if (!$this->has($name)) { |
|
66 | + if (!$this->has($name)) |
|
67 | + { |
|
64 | 68 | throw new RuleException(\sprintf("Undefined rule '%s'", $name)); |
65 | 69 | } |
66 | 70 | |
67 | - if (!isset($this->rules[$name])) { |
|
71 | + if (!isset($this->rules[$name])) |
|
72 | + { |
|
68 | 73 | //Rule represented as class name |
69 | 74 | $rule = $name; |
70 | - } else { |
|
75 | + } |
|
76 | + else |
|
77 | + { |
|
71 | 78 | $rule = $this->rules[$name]; |
72 | 79 | } |
73 | 80 | |
74 | - if ($rule instanceof RuleInterface) { |
|
81 | + if ($rule instanceof RuleInterface) |
|
82 | + { |
|
75 | 83 | return $rule; |
76 | 84 | } |
77 | 85 | |
78 | - if (\is_string($rule)) { |
|
86 | + if (\is_string($rule)) |
|
87 | + { |
|
79 | 88 | //We are expecting that rule points to |
80 | 89 | $rule = $this->container->get($rule); |
81 | 90 | |
82 | - if (!$rule instanceof RuleInterface) { |
|
91 | + if (!$rule instanceof RuleInterface) |
|
92 | + { |
|
83 | 93 | throw new RuleException(\sprintf( |
84 | 94 | "Rule '%s' must point to RuleInterface, '%s' given", |
85 | 95 | $name, |
@@ -99,18 +109,24 @@ discard block |
||
99 | 109 | */ |
100 | 110 | private function validateRule(mixed $rule): bool |
101 | 111 | { |
102 | - if ($rule instanceof \Closure || $rule instanceof RuleInterface) { |
|
112 | + if ($rule instanceof \Closure || $rule instanceof RuleInterface) |
|
113 | + { |
|
103 | 114 | return true; |
104 | 115 | } |
105 | 116 | |
106 | - if (\is_array($rule)) { |
|
117 | + if (\is_array($rule)) |
|
118 | + { |
|
107 | 119 | return \is_callable($rule, true); |
108 | 120 | } |
109 | 121 | |
110 | - if (\is_string($rule) && \class_exists($rule)) { |
|
111 | - try { |
|
122 | + if (\is_string($rule) && \class_exists($rule)) |
|
123 | + { |
|
124 | + try |
|
125 | + { |
|
112 | 126 | $reflection = new \ReflectionClass($rule); |
113 | - } catch (\ReflectionException) { |
|
127 | + } |
|
128 | + catch (\ReflectionException) |
|
129 | + { |
|
114 | 130 | return false; |
115 | 131 | } |
116 | 132 |
@@ -281,7 +281,7 @@ |
||
281 | 281 | yield [['defaultSerializer' => null], null]; |
282 | 282 | yield [['defaultSerializer' => 'json'], 'json']; |
283 | 283 | yield [['defaultSerializer' => JsonSerializer::class], JsonSerializer::class]; |
284 | - yield [['defaultSerializer' => new JsonSerializer ()], new JsonSerializer()]; |
|
284 | + yield [['defaultSerializer' => new JsonSerializer()], new JsonSerializer()]; |
|
285 | 285 | yield [['defaultSerializer' => new Autowire(JsonSerializer::class)], new Autowire(JsonSerializer::class)]; |
286 | 286 | } |
287 | 287 | } |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | */ |
65 | 65 | public function getDefaultDriver(): string |
66 | 66 | { |
67 | - if (!\is_string($this->config['default'])) { |
|
67 | + if (!\is_string($this->config['default'])){ |
|
68 | 68 | throw new InvalidArgumentException('Default queue connection config value must be a string'); |
69 | 69 | } |
70 | 70 | |
@@ -86,14 +86,14 @@ discard block |
||
86 | 86 | { |
87 | 87 | $connections = $this->config['connections'] ?? []; |
88 | 88 | |
89 | - if ($driver === null) { |
|
89 | + if ($driver === null){ |
|
90 | 90 | return $connections; |
91 | 91 | } |
92 | 92 | |
93 | 93 | $driverAliases = $this->getDriverAliases(); |
94 | 94 | |
95 | - if (isset($driverAliases[$driver])) { |
|
96 | - if (!\is_string($this->config['driverAliases'][$driver])) { |
|
95 | + if (isset($driverAliases[$driver])){ |
|
96 | + if (!\is_string($this->config['driverAliases'][$driver])){ |
|
97 | 97 | throw new InvalidArgumentException( |
98 | 98 | \sprintf('Driver alias for `%s` value must be a string', $driver) |
99 | 99 | ); |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | } |
104 | 104 | |
105 | 105 | return \array_filter($connections, static function (array $connection) use ($driverAliases, $driver): bool { |
106 | - if (empty($connection['driver'])) { |
|
106 | + if (empty($connection['driver'])){ |
|
107 | 107 | return false; |
108 | 108 | } |
109 | 109 | |
@@ -121,28 +121,28 @@ discard block |
||
121 | 121 | { |
122 | 122 | $connections = $this->getConnections(); |
123 | 123 | |
124 | - if (!isset($connections[$name])) { |
|
124 | + if (!isset($connections[$name])){ |
|
125 | 125 | throw new InvalidArgumentException(sprintf('Queue connection with given name `%s` is not defined.', $name)); |
126 | 126 | } |
127 | 127 | |
128 | - if (!isset($connections[$name]['driver'])) { |
|
128 | + if (!isset($connections[$name]['driver'])){ |
|
129 | 129 | throw new InvalidArgumentException(\sprintf('Driver for queue connection `%s` is not defined.', $name)); |
130 | 130 | } |
131 | 131 | |
132 | 132 | $connection = $connections[$name]; |
133 | 133 | $driver = $connection['driver']; |
134 | 134 | |
135 | - if (!\is_string($driver)) { |
|
135 | + if (!\is_string($driver)){ |
|
136 | 136 | throw new InvalidArgumentException( |
137 | 137 | \sprintf('Driver for queue connection `%s` value must be a string', $name) |
138 | 138 | ); |
139 | 139 | } |
140 | 140 | |
141 | - if (isset($this->config['driverAliases'][$driver])) { |
|
141 | + if (isset($this->config['driverAliases'][$driver])){ |
|
142 | 142 | $connection['driver'] = $this->config['driverAliases'][$driver]; |
143 | 143 | } |
144 | 144 | |
145 | - if (!\is_string($connection['driver'])) { |
|
145 | + if (!\is_string($connection['driver'])){ |
|
146 | 146 | throw new InvalidArgumentException( |
147 | 147 | \sprintf('Driver alias for queue connection `%s` value must be a string', $name) |
148 | 148 | ); |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | /** |
168 | 168 | * @psalm-return SerializerInterface|class-string|Autowire|null |
169 | 169 | */ |
170 | - public function getDefaultSerializer(): SerializerInterface|string|Autowire|null |
|
170 | + public function getDefaultSerializer(): SerializerInterface | string | Autowire | null |
|
171 | 171 | { |
172 | 172 | return $this->config['defaultSerializer'] ?? null; |
173 | 173 | } |
@@ -64,7 +64,8 @@ discard block |
||
64 | 64 | */ |
65 | 65 | public function getDefaultDriver(): string |
66 | 66 | { |
67 | - if (!\is_string($this->config['default'])) { |
|
67 | + if (!\is_string($this->config['default'])) |
|
68 | + { |
|
68 | 69 | throw new InvalidArgumentException('Default queue connection config value must be a string'); |
69 | 70 | } |
70 | 71 | |
@@ -86,14 +87,17 @@ discard block |
||
86 | 87 | { |
87 | 88 | $connections = $this->config['connections'] ?? []; |
88 | 89 | |
89 | - if ($driver === null) { |
|
90 | + if ($driver === null) |
|
91 | + { |
|
90 | 92 | return $connections; |
91 | 93 | } |
92 | 94 | |
93 | 95 | $driverAliases = $this->getDriverAliases(); |
94 | 96 | |
95 | - if (isset($driverAliases[$driver])) { |
|
96 | - if (!\is_string($this->config['driverAliases'][$driver])) { |
|
97 | + if (isset($driverAliases[$driver])) |
|
98 | + { |
|
99 | + if (!\is_string($this->config['driverAliases'][$driver])) |
|
100 | + { |
|
97 | 101 | throw new InvalidArgumentException( |
98 | 102 | \sprintf('Driver alias for `%s` value must be a string', $driver) |
99 | 103 | ); |
@@ -103,7 +107,8 @@ discard block |
||
103 | 107 | } |
104 | 108 | |
105 | 109 | return \array_filter($connections, static function (array $connection) use ($driverAliases, $driver): bool { |
106 | - if (empty($connection['driver'])) { |
|
110 | + if (empty($connection['driver'])) |
|
111 | + { |
|
107 | 112 | return false; |
108 | 113 | } |
109 | 114 | |
@@ -121,28 +126,33 @@ discard block |
||
121 | 126 | { |
122 | 127 | $connections = $this->getConnections(); |
123 | 128 | |
124 | - if (!isset($connections[$name])) { |
|
129 | + if (!isset($connections[$name])) |
|
130 | + { |
|
125 | 131 | throw new InvalidArgumentException(sprintf('Queue connection with given name `%s` is not defined.', $name)); |
126 | 132 | } |
127 | 133 | |
128 | - if (!isset($connections[$name]['driver'])) { |
|
134 | + if (!isset($connections[$name]['driver'])) |
|
135 | + { |
|
129 | 136 | throw new InvalidArgumentException(\sprintf('Driver for queue connection `%s` is not defined.', $name)); |
130 | 137 | } |
131 | 138 | |
132 | 139 | $connection = $connections[$name]; |
133 | 140 | $driver = $connection['driver']; |
134 | 141 | |
135 | - if (!\is_string($driver)) { |
|
142 | + if (!\is_string($driver)) |
|
143 | + { |
|
136 | 144 | throw new InvalidArgumentException( |
137 | 145 | \sprintf('Driver for queue connection `%s` value must be a string', $name) |
138 | 146 | ); |
139 | 147 | } |
140 | 148 | |
141 | - if (isset($this->config['driverAliases'][$driver])) { |
|
149 | + if (isset($this->config['driverAliases'][$driver])) |
|
150 | + { |
|
142 | 151 | $connection['driver'] = $this->config['driverAliases'][$driver]; |
143 | 152 | } |
144 | 153 | |
145 | - if (!\is_string($connection['driver'])) { |
|
154 | + if (!\is_string($connection['driver'])) |
|
155 | + { |
|
146 | 156 | throw new InvalidArgumentException( |
147 | 157 | \sprintf('Driver alias for queue connection `%s` value must be a string', $name) |
148 | 158 | ); |