Completed
Push — master ( 0c1faf...c6b404 )
by Raffael
02:34
created
src/Http/Router.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -68,12 +68,12 @@  discard block
 block discarded – undo
68 68
      * @param   array $request
69 69
      * @return  void
70 70
      */
71
-    public function __construct(LoggerInterface $logger, ?ContainerInterface $container=null, ?array $request=null)
71
+    public function __construct(LoggerInterface $logger, ?ContainerInterface $container = null, ? array $request = null)
72 72
     {
73 73
         $this->logger = $logger;
74 74
         $this->container = $container;
75 75
 
76
-        if($request === null) {
76
+        if ($request === null) {
77 77
             $request = $_SERVER;
78 78
         }
79 79
 
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
             'code'    => $exception->getCode()
287 287
         ];
288 288
 
289
-        if(defined("$class::HTTP_CODE")) {
289
+        if (defined("$class::HTTP_CODE")) {
290 290
             $http_code = $class::HTTP_CODE;
291 291
         } else {
292 292
             $http_code = 500;
Please login to merge, or discard this patch.
src/Http/Router/Route.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -118,12 +118,12 @@
 block discarded – undo
118 118
      * @param  ContainerInterface $container
119 119
      * @return array
120 120
      */
121
-    public function getCallable(?ContainerInterface $container=null): array
121
+    public function getCallable(?ContainerInterface $container = null) : array
122 122
     {
123 123
         if (is_object($this->class)) {
124 124
             $instance = $this->class;
125 125
         } else {
126
-            if($container === null) {
126
+            if ($container === null) {
127 127
                 $instance = new $this->class();
128 128
             } else {
129 129
                 $instance = $container->get($this->class);
Please login to merge, or discard this patch.
src/Auth/Adapter/Basic/AbstractBasic.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
      * @param   Iterable $config
34 34
      * @return  void
35 35
      */
36
-    public function __construct(LoggerInterface $logger, ?Iterable $config=null)
36
+    public function __construct(LoggerInterface $logger, ?Iterable $config = null)
37 37
     {
38 38
         $this->logger = $logger;
39 39
         $this->setOptions($config);
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
      * @param  string $username
125 125
      * @return array
126 126
      */
127
-    protected abstract function findIdentity(string $username): ?array;
127
+    protected abstract function findIdentity(string $username): ? array;
128 128
 
129 129
 
130 130
     /**
Please login to merge, or discard this patch.
src/Auth/Adapter/Oidc.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
     {
204 204
         if($this->token_validation_url) {
205 205
             $this->logger->debug('validate oauth2 token via rfc7662 token validation endpoint ['.$this->token_validation_url.']', [
206
-               'category' => get_class($this),
206
+                'category' => get_class($this),
207 207
             ]);
208 208
 
209 209
             $url = str_replace('{token}', $token, $this->token_validation_url);
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
             }
215 215
 
216 216
             $this->logger->debug('validate token via openid-connect userinfo_endpoint ['.$discovery['userinfo_endpoint'].']', [
217
-               'category' => get_class($this),
217
+                'category' => get_class($this),
218 218
             ]);
219 219
 
220 220
             $url = $discovery['userinfo_endpoint'].'?access_token='.$token;
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
         if($code === 200) {
232 232
             $attributes = json_decode($result, true);
233 233
             $this->logger->debug('successfully verified oauth2 access token via authorization server', [
234
-               'category' => get_class($this),
234
+                'category' => get_class($this),
235 235
             ]);
236 236
 
237 237
             if(!isset($attributes[$this->identity_attribute])) {
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
             return true;
250 250
         } else {
251 251
             $this->logger->error('failed verify oauth2 access token via authorization server, received status ['.$code.']', [
252
-               'category' => get_class($this),
252
+                'category' => get_class($this),
253 253
             ]);
254 254
 
255 255
             throw new Exception('failed verify oauth2 access token via authorization server');
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
         }
275 275
 
276 276
         $this->logger->debug('fetch user attributes from userinfo_endpoint ['.$discovery['userinfo_endpoint'].']', [
277
-           'category' => get_class($this),
277
+            'category' => get_class($this),
278 278
         ]);
279 279
 
280 280
         $url = $discovery['userinfo_endpoint'].'?access_token='.$this->access_token;
@@ -289,13 +289,13 @@  discard block
 block discarded – undo
289 289
         if($code === 200) {
290 290
             $attributes = json_decode($result, true);
291 291
             $this->logger->debug('successfully requested user attributes from userinfo_endpoint', [
292
-               'category' => get_class($this),
292
+                'category' => get_class($this),
293 293
             ]);
294 294
 
295 295
             return $this->attributes = $attributes;
296 296
         } else {
297 297
             $this->logger->error('failed requesting user attributes from userinfo_endpoint, status code ['.$code.']', [
298
-               'category' => get_class($this),
298
+                'category' => get_class($this),
299 299
             ]);
300 300
 
301 301
             throw new Exception('failed requesting user attribute from userinfo_endpoint');
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
      * @param   Iterable $config
70 70
      * @return  void
71 71
      */
72
-    public function __construct(LoggerInterface $logger, ?Iterable $config=null)
72
+    public function __construct(LoggerInterface $logger, ?Iterable $config = null)
73 73
     {
74 74
         $this->logger = $logger;
75 75
         $this->setOptions($config);
@@ -88,8 +88,8 @@  discard block
 block discarded – undo
88 88
             return $this;
89 89
         }
90 90
 
91
-        foreach($config as $option => $value) {
92
-            switch($option) {
91
+        foreach ($config as $option => $value) {
92
+            switch ($option) {
93 93
                 case 'provider_url':
94 94
                 case 'token_validation_url':
95 95
                 case 'identity_attribute':
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
             $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
171 171
             curl_close($ch);
172 172
 
173
-            if($code === 200) {
173
+            if ($code === 200) {
174 174
                 $discovery = json_decode($result, true);
175 175
                 $this->logger->debug('received openid-connect discovery document from ['.$url.']', [
176 176
                     'category' => get_class($this),
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
      */
202 202
     protected function verifyToken(string $token): bool
203 203
     {
204
-        if($this->token_validation_url) {
204
+        if ($this->token_validation_url) {
205 205
             $this->logger->debug('validate oauth2 token via rfc7662 token validation endpoint ['.$this->token_validation_url.']', [
206 206
                'category' => get_class($this),
207 207
             ]);
@@ -228,19 +228,19 @@  discard block
 block discarded – undo
228 228
         curl_close($ch);
229 229
         $response = json_decode($result, true);
230 230
 
231
-        if($code === 200) {
231
+        if ($code === 200) {
232 232
             $attributes = json_decode($result, true);
233 233
             $this->logger->debug('successfully verified oauth2 access token via authorization server', [
234 234
                'category' => get_class($this),
235 235
             ]);
236 236
 
237
-            if(!isset($attributes[$this->identity_attribute])) {
237
+            if (!isset($attributes[$this->identity_attribute])) {
238 238
                 throw new Exception('identity attribute '.$this->identity_attribute.' not found in oauth2 response');
239 239
             }
240 240
 
241 241
             $this->identifier = $attributes['preferred_username'];
242 242
 
243
-            if($this->token_validation_url) {
243
+            if ($this->token_validation_url) {
244 244
                 $this->attributes = $attributes;
245 245
             } else {
246 246
                 $this->access_token = $token;
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
      */
265 265
     public function getAttributes(): array
266 266
     {
267
-        if(count($this->attributes) !== 0) {
267
+        if (count($this->attributes) !== 0) {
268 268
             return $this->attributes;
269 269
         }
270 270
 
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
         curl_close($ch);
287 287
         $response = json_decode($result, true);
288 288
 
289
-        if($code === 200) {
289
+        if ($code === 200) {
290 290
             $attributes = json_decode($result, true);
291 291
             $this->logger->debug('successfully requested user attributes from userinfo_endpoint', [
292 292
                'category' => get_class($this),
Please login to merge, or discard this patch.
src/Container.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
         foreach($config as $name => $service) {
72 72
             if(isset($service['name']) && $parent === null) {
73 73
                 $id = $service['name'];
74
-           } else {
74
+            } else {
75 75
                 if($parent === null) {
76 76
                     $id = $name;
77 77
                 } else {
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
                 } else {
230 230
                     $type_class = $type->getName();
231 231
                     $args[$param_name] = $this->findParentService($name, $type_class);
232
-               }
232
+                }
233 233
             }
234 234
 
235 235
             return $this->createInstance($name, $reflection, $args);
Please login to merge, or discard this patch.
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
      *
49 49
      * @param array $config
50 50
      */
51
-    public function __construct(array $config=[])
51
+    public function __construct(array $config = [])
52 52
     {
53 53
         $this->flattenConfig($config);
54 54
         $container = $this;
@@ -65,14 +65,14 @@  discard block
 block discarded – undo
65 65
      * @param  string $parent
66 66
      * @return array
67 67
      */
68
-    protected function flattenConfig(Iterable $config, ?string $parent=null): array
68
+    protected function flattenConfig(Iterable $config, ?string $parent = null) : array
69 69
     {
70 70
         $flat = [];
71
-        foreach($config as $name => $service) {
72
-            if(isset($service['name']) && $parent === null) {
71
+        foreach ($config as $name => $service) {
72
+            if (isset($service['name']) && $parent === null) {
73 73
                 $id = $service['name'];
74 74
            } else {
75
-                if($parent === null) {
75
+                if ($parent === null) {
76 76
                     $id = $name;
77 77
                 } else {
78 78
                     $id = $parent.'.'.$name;
@@ -83,8 +83,8 @@  discard block
 block discarded – undo
83 83
                 'name' => $name
84 84
             ];
85 85
 
86
-            foreach($service as $option => $value) {
87
-                switch($option) {
86
+            foreach ($service as $option => $value) {
87
+                switch ($option) {
88 88
 
89 89
                     case 'name' :
90 90
                     case 'use' :
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
                         $parent = $parent.'.'.$name;
101 101
                         $services = $this->flattenConfig($service['service'], $parent);
102 102
                         $flat[$id]['service'] = [];
103
-                        foreach($services as $key => $sub) {
103
+                        foreach ($services as $key => $sub) {
104 104
                             $flat[$id]['service'][$sub['name']] = $key;
105 105
                         }
106 106
                     break;
@@ -139,10 +139,10 @@  discard block
 block discarded – undo
139 139
      */
140 140
     public function get($name)
141 141
     {
142
-        if($this->has($name)) {
142
+        if ($this->has($name)) {
143 143
             return $this->service[$name];
144 144
         } else {
145
-            if(isset($this->registry[$name])) {
145
+            if (isset($this->registry[$name])) {
146 146
                 $this->service[$name] = $this->registry[$name]->call($this);
147 147
                 unset($this->registry[$name]);
148 148
                 return $this->service[$name];
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
      */
163 163
     public function add(string $name, Closure $service): Container
164 164
     {
165
-        if($this->has($name)) {
165
+        if ($this->has($name)) {
166 166
             throw new Exception('service '.$name.' is already registered');
167 167
         }
168 168
 
@@ -190,9 +190,9 @@  discard block
 block discarded – undo
190 190
      */
191 191
     protected function autoWire(string $name)
192 192
     {
193
-        if(isset($this->config[$name]['use'])) {
193
+        if (isset($this->config[$name]['use'])) {
194 194
             $class = $this->config[$name]['use'];
195
-        } elseif(isset($this->config[$name]['name'])) {
195
+        } elseif (isset($this->config[$name]['name'])) {
196 196
             $class = $this->config[$name]['name'];
197 197
         } else {
198 198
             $class = $name;
@@ -200,27 +200,27 @@  discard block
 block discarded – undo
200 200
 
201 201
         try {
202 202
             $reflection = new ReflectionClass($class);
203
-        } catch(\Exception $e) {
203
+        } catch (\Exception $e) {
204 204
             throw new Exception($class.' can not be resolved to an existing class');
205 205
         }
206 206
 
207 207
         $constructor = $reflection->getConstructor();
208 208
 
209
-        if($constructor === null) {
209
+        if ($constructor === null) {
210 210
             return new $class();
211 211
         } else {
212 212
             $params = $constructor->getParameters();
213 213
             $args = [];
214 214
 
215
-            foreach($params as $param) {
215
+            foreach ($params as $param) {
216 216
                 $type = $param->getClass();
217 217
                 $param_name = $param->getName();
218 218
 
219
-                if($type === null) {
219
+                if ($type === null) {
220 220
                     try {
221 221
                         $args[$param_name] = $this->getParam($name, $param_name);
222
-                    } catch(Exception $e) {
223
-                        if($param->isDefaultValueAvailable()) {
222
+                    } catch (Exception $e) {
223
+                        if ($param->isDefaultValueAvailable()) {
224 224
                             $args[$param_name] = $param->getDefaultValue();
225 225
                         } else {
226 226
                             throw $e;
@@ -246,9 +246,9 @@  discard block
 block discarded – undo
246 246
      */
247 247
     protected function findParentService(string $name, string $class)
248 248
     {
249
-        if(isset($this->config[$name]['service'][$class])) {
249
+        if (isset($this->config[$name]['service'][$class])) {
250 250
             return $this->get($this->config[$name]['service'][$class]);
251
-        } elseif(isset($this->config[$name]['parent'])) {
251
+        } elseif (isset($this->config[$name]['parent'])) {
252 252
             return $this->findParentService($this->config[$name]['parent'], $class);
253 253
         } else {
254 254
             return $this->get($class);
@@ -267,14 +267,14 @@  discard block
 block discarded – undo
267 267
     protected function createInstance(string $name, ReflectionClass $class, array $args)
268 268
     {
269 269
         $instance = $class->newInstanceArgs($args);
270
-        if($instance instanceof AdapterAwareInterface) {
271
-            if(isset($this->config[$name]['adapter'])) {
272
-                foreach($this->config[$name]['adapter'] as $adapter => $config) {
273
-                    if(!isset($config['name'])) {
270
+        if ($instance instanceof AdapterAwareInterface) {
271
+            if (isset($this->config[$name]['adapter'])) {
272
+                foreach ($this->config[$name]['adapter'] as $adapter => $config) {
273
+                    if (!isset($config['name'])) {
274 274
                         throw new Exception('adapter requires name configuration');
275 275
                     }
276 276
 
277
-                    if(isset($config['enabled']) && $config['enabled'] === '0') {
277
+                    if (isset($config['enabled']) && $config['enabled'] === '0') {
278 278
                         continue;
279 279
                     }
280 280
 
@@ -297,11 +297,11 @@  discard block
 block discarded – undo
297 297
      */
298 298
     public function getParam(string $name, string $param)
299 299
     {
300
-        if(!isset($this->config[$name]) && !isset($this->config[$name]['options'])) {
300
+        if (!isset($this->config[$name]) && !isset($this->config[$name]['options'])) {
301 301
             throw new Exception('no configuration available for service '.$name);
302 302
         }
303 303
 
304
-        if(!isset($this->config[$name]['options'][$param])) {
304
+        if (!isset($this->config[$name]['options'][$param])) {
305 305
             throw new Exception('no configuration available for service parameter '.$param);
306 306
         }
307 307
 
Please login to merge, or discard this patch.