Completed
Pull Request — master (#220)
by Anton
02:28
created
src/Session/SessionScope.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -123,9 +123,12 @@
 block discarded – undo
123 123
      */
124 124
     public function getActiveSession(): SessionInterface
125 125
     {
126
-        try {
126
+        try
127
+        {
127 128
             return $this->container->get(SessionInterface::class);
128
-        } catch (NotFoundExceptionInterface $e) {
129
+        }
130
+        catch (NotFoundExceptionInterface $e)
131
+        {
129 132
             throw new ScopeException('Unable to receive active session, invalid request scope', $e->getCode(), $e);
130 133
         }
131 134
     }
Please login to merge, or discard this patch.
src/Cookies/CookieManager.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -169,9 +169,12 @@  discard block
 block discarded – undo
169 169
      */
170 170
     private function getRequest(): ServerRequestInterface
171 171
     {
172
-        try {
172
+        try
173
+        {
173 174
             return $this->container->get(ServerRequestInterface::class);
174
-        } catch (NotFoundExceptionInterface $e) {
175
+        }
176
+        catch (NotFoundExceptionInterface $e)
177
+        {
175 178
             throw new ScopeException('Unable to receive active request', $e->getCode(), $e);
176 179
         }
177 180
     }
@@ -183,9 +186,12 @@  discard block
 block discarded – undo
183 186
      */
184 187
     private function getCookieQueue(): CookieQueue
185 188
     {
186
-        try {
189
+        try
190
+        {
187 191
             return $this->container->get(CookieQueue::class);
188
-        } catch (NotFoundExceptionInterface $e) {
192
+        }
193
+        catch (NotFoundExceptionInterface $e)
194
+        {
189 195
             throw new ScopeException('Unable to receive cookie queue, invalid request scope', $e->getCode(), $e);
190 196
         }
191 197
     }
Please login to merge, or discard this patch.
src/Auth/AuthScope.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -94,9 +94,12 @@
 block discarded – undo
94 94
      */
95 95
     private function getAuthContext(): AuthContextInterface
96 96
     {
97
-        try {
97
+        try
98
+        {
98 99
             return $this->container->get(AuthContextInterface::class);
99
-        } catch (NotFoundExceptionInterface $e) {
100
+        }
101
+        catch (NotFoundExceptionInterface $e)
102
+        {
100 103
             throw new ScopeException('Unable to resolve auth context, invalid scope', $e->getCode(), $e);
101 104
         }
102 105
     }
Please login to merge, or discard this patch.
src/Security/GuardScope.php 1 patch
Braces   +11 added lines, -5 removed lines patch added patch discarded remove patch
@@ -55,8 +55,10 @@  discard block
 block discarded – undo
55 55
     public function allows(string $permission, array $context = []): bool
56 56
     {
57 57
         $allows = false;
58
-        foreach ($this->getRoles() as $role) {
59
-            if (!$this->permissions->hasRole($role)) {
58
+        foreach ($this->getRoles() as $role)
59
+        {
60
+            if (!$this->permissions->hasRole($role))
61
+            {
60 62
                 continue;
61 63
             }
62 64
 
@@ -103,13 +105,17 @@  discard block
 block discarded – undo
103 105
      */
104 106
     public function getActor(): ActorInterface
105 107
     {
106
-        if (!is_null($this->actor)) {
108
+        if (!is_null($this->actor))
109
+        {
107 110
             return $this->actor;
108 111
         }
109 112
 
110
-        try {
113
+        try
114
+        {
111 115
             return $this->container->get(ActorInterface::class);
112
-        } catch (NotFoundExceptionInterface $e) {
116
+        }
117
+        catch (NotFoundExceptionInterface $e)
118
+        {
113 119
             throw new ScopeException('Unable to resolve Actor from the scope', $e->getCode(), $e);
114 120
         }
115 121
     }
Please login to merge, or discard this patch.
src/Bootloader/Auth/AuthBootloader.php 1 patch
Braces   +12 added lines, -6 removed lines patch added patch discarded remove patch
@@ -51,8 +51,10 @@  discard block
 block discarded – undo
51 51
      */
52 52
     public function getActor(TokenInterface $token): ?object
53 53
     {
54
-        foreach ($this->getProviders() as $provider) {
55
-            if (!$provider instanceof ActorProviderInterface) {
54
+        foreach ($this->getProviders() as $provider)
55
+        {
56
+            if (!$provider instanceof ActorProviderInterface)
57
+            {
56 58
                 throw new AuthException(sprintf(
57 59
                     'Expected `ActorProviderInterface`, got `%s`',
58 60
                     get_class($provider)
@@ -60,7 +62,8 @@  discard block
 block discarded – undo
60 62
             }
61 63
 
62 64
             $actor = $provider->getActor($token);
63
-            if ($actor !== null) {
65
+            if ($actor !== null)
66
+            {
64 67
                 return $actor;
65 68
             }
66 69
         }
@@ -83,13 +86,16 @@  discard block
 block discarded – undo
83 86
      */
84 87
     private function getProviders(): \Generator
85 88
     {
86
-        foreach ($this->actorProvider as $provider) {
87
-            if ($provider instanceof Autowire) {
89
+        foreach ($this->actorProvider as $provider)
90
+        {
91
+            if ($provider instanceof Autowire)
92
+            {
88 93
                 yield $provider->resolve($this->factory);
89 94
                 continue;
90 95
             }
91 96
 
92
-            if (is_object($provider)) {
97
+            if (is_object($provider))
98
+            {
93 99
                 yield $provider;
94 100
                 continue;
95 101
             }
Please login to merge, or discard this patch.
src/Bootloader/Auth/HttpAuthBootloader.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -87,8 +87,10 @@
 block discarded – undo
87 87
         $registry = new TransportRegistry();
88 88
         $registry->setDefaultTransport($config->getDefaultTransport());
89 89
 
90
-        foreach ($config->getTransports() as $name => $transport) {
91
-            if ($transport instanceof Autowire) {
90
+        foreach ($config->getTransports() as $name => $transport)
91
+        {
92
+            if ($transport instanceof Autowire)
93
+            {
92 94
                 $transport = $transport->resolve($factory);
93 95
             }
94 96
 
Please login to merge, or discard this patch.
src/Bootloader/Auth/SecurityActorBootloader.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,8 @@
 block discarded – undo
38 38
     private function actor(AuthContextInterface $context): ActorInterface
39 39
     {
40 40
         $actor = $context->getActor();
41
-        if ($actor instanceof ActorInterface) {
41
+        if ($actor instanceof ActorInterface)
42
+        {
42 43
             return $actor;
43 44
         }
44 45
 
Please login to merge, or discard this patch.
src/Auth/Config/AuthConfig.php 1 patch
Braces   +10 added lines, -5 removed lines patch added patch discarded remove patch
@@ -41,8 +41,10 @@  discard block
 block discarded – undo
41 41
     public function getTransports(): array
42 42
     {
43 43
         $transports = [];
44
-        foreach ($this->config['transports'] as $name => $transport) {
45
-            if (is_object($transport) && !$transport instanceof Autowire) {
44
+        foreach ($this->config['transports'] as $name => $transport)
45
+        {
46
+            if (is_object($transport) && !$transport instanceof Autowire)
47
+            {
46 48
                 $transports[$name] = $transport;
47 49
                 continue;
48 50
             }
@@ -61,15 +63,18 @@  discard block
 block discarded – undo
61 63
      */
62 64
     private function wire($item): Autowire
63 65
     {
64
-        if ($item instanceof Autowire) {
66
+        if ($item instanceof Autowire)
67
+        {
65 68
             return $item;
66 69
         }
67 70
 
68
-        if (is_string($item)) {
71
+        if (is_string($item))
72
+        {
69 73
             return new Autowire($item);
70 74
         }
71 75
 
72
-        if (is_array($item) && isset($item['class'])) {
76
+        if (is_array($item) && isset($item['class']))
77
+        {
73 78
             return new Autowire($item['class'], $item['options'] ?? []);
74 79
         }
75 80
 
Please login to merge, or discard this patch.
src/Auth/Cycle/TokenStorage.php 1 patch
Braces   +18 added lines, -8 removed lines patch added patch discarded remove patch
@@ -38,25 +38,29 @@  discard block
 block discarded – undo
38 38
      */
39 39
     public function load(string $id): ?TokenInterface
40 40
     {
41
-        if (strpos($id, ':') === false) {
41
+        if (strpos($id, ':') === false)
42
+        {
42 43
             return null;
43 44
         }
44 45
 
45 46
         list($pk, $hash) = explode(':', $id, 2);
46 47
 
47
-        if (!is_numeric($pk)) {
48
+        if (!is_numeric($pk))
49
+        {
48 50
             return null;
49 51
         }
50 52
 
51 53
         /** @var TokenInterface $token */
52 54
         $token = $this->orm->getRepository(Token::class)->findByPK((int)$pk);
53 55
 
54
-        if ($token === null || $token->getID() !== $id) {
56
+        if ($token === null || $token->getID() !== $id)
57
+        {
55 58
             // hijacked or deleted
56 59
             return null;
57 60
         }
58 61
 
59
-        if ($token->getExpiresAt() !== null && $token->getExpiresAt() < new \DateTime()) {
62
+        if ($token->getExpiresAt() !== null && $token->getExpiresAt() < new \DateTime())
63
+        {
60 64
             $this->delete($token);
61 65
             return null;
62 66
         }
@@ -69,13 +73,16 @@  discard block
 block discarded – undo
69 73
      */
70 74
     public function create(array $payload, \DateTimeInterface $expiresAt = null): TokenInterface
71 75
     {
72
-        try {
76
+        try
77
+        {
73 78
             $token = new Token($this->randomHash(128), $payload, new \DateTimeImmutable(), $expiresAt);
74 79
 
75 80
             (new Transaction($this->orm))->persist($token)->run();
76 81
 
77 82
             return $token;
78
-        } catch (\Throwable $e) {
83
+        }
84
+        catch (\Throwable $e)
85
+        {
79 86
             throw new TokenStorageException('Unable to create token', $e->getCode(), $e);
80 87
         }
81 88
     }
@@ -85,9 +92,12 @@  discard block
 block discarded – undo
85 92
      */
86 93
     public function delete(TokenInterface $token): void
87 94
     {
88
-        try {
95
+        try
96
+        {
89 97
             (new Transaction($this->orm))->delete($token)->run();
90
-        } catch (\Throwable $e) {
98
+        }
99
+        catch (\Throwable $e)
100
+        {
91 101
             throw new TokenStorageException('Unable to delete token', $e->getCode(), $e);
92 102
         }
93 103
     }
Please login to merge, or discard this patch.