Completed
Push — dev ( ff0a8e...21175d )
by Pavel
08:20
created
app/middleware.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 /*
12 12
  * Auth && ACL Middleware
13 13
  */
14
-$app->add(function (Request $request, Response $response, $next) {
14
+$app->add(function(Request $request, Response $response, $next) {
15 15
     // If path is "/api/token" or "/api/user/request-password-reset" or "/api/user/reset-password" no need authorization process
16 16
     $path = $request->getUri()->getPath();
17 17
     if (in_array($path, ['/api/token', '/api/user/request-password-reset', '/api/user/reset-password'])) {
@@ -36,14 +36,14 @@  discard block
 block discarded – undo
36 36
                 $route     = $request->getAttribute('route');
37 37
 
38 38
                 if ($route) {
39
-                    if ($this->acl->hasResource('route' . $route->getPattern())) {
40
-                        $isAllowed = $isAllowed || $this->acl->isAllowed($user->role->name, 'route' . $route->getPattern(), strtolower($request->getMethod()));
39
+                    if ($this->acl->hasResource('route'.$route->getPattern())) {
40
+                        $isAllowed = $isAllowed || $this->acl->isAllowed($user->role->name, 'route'.$route->getPattern(), strtolower($request->getMethod()));
41 41
                     }
42
-                    if ($this->acl->hasResource('callable/' . $route->getCallable())) {
43
-                        $isAllowed = $isAllowed || $this->acl->isAllowed($user->role->name, 'callable/' . $route->getCallable());
42
+                    if ($this->acl->hasResource('callable/'.$route->getCallable())) {
43
+                        $isAllowed = $isAllowed || $this->acl->isAllowed($user->role->name, 'callable/'.$route->getCallable());
44 44
                     }
45 45
                     if (!$isAllowed) {
46
-                        throw new JsonException(null, 403, 'Not allowed', $user->role->name . ' is not allowed access to this location.');
46
+                        throw new JsonException(null, 403, 'Not allowed', $user->role->name.' is not allowed access to this location.');
47 47
                     }
48 48
                 }
49 49
 
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 /*
59 59
  * Logger
60 60
  */
61
-$app->add(function (Request $request, Response $response, $next) {
61
+$app->add(function(Request $request, Response $response, $next) {
62 62
     $logger     = $this->logger;
63 63
     $response   = $next($request, $response);
64 64
     $uri        = $request->getUri()->getPath();
@@ -99,10 +99,10 @@  discard block
 block discarded – undo
99 99
 /**
100 100
  * Custom exception
101 101
  */
102
-$app->add(function (Request $request, Response $response, $next) {
102
+$app->add(function(Request $request, Response $response, $next) {
103 103
     try {
104 104
         return $next($request, $response);
105
-    } catch (JsonException $e){
105
+    } catch (JsonException $e) {
106 106
         return $this->renderer->jsonApiRender($response, $e->statusCode, $e->encodeError());
107 107
     }
108 108
 });
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@
 block discarded – undo
102 102
 $app->add(function (Request $request, Response $response, $next) {
103 103
     try {
104 104
         return $next($request, $response);
105
-    } catch (JsonException $e){
105
+    } catch (JsonException $e) {
106 106
         return $this->renderer->jsonApiRender($response, $e->statusCode, $e->encodeError());
107 107
     }
108 108
 });
Please login to merge, or discard this patch.
public/index.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -13,20 +13,20 @@
 block discarded – undo
13 13
     };
14 14
 }
15 15
 
16
-require __DIR__ . '/../vendor/autoload.php';
16
+require __DIR__.'/../vendor/autoload.php';
17 17
 
18
-$settings = require __DIR__ . '/../app/settings.php';
18
+$settings = require __DIR__.'/../app/settings.php';
19 19
 
20 20
 $app = new \Slim\App($settings);
21 21
 
22 22
 // Set up dependencies
23
-require __DIR__ . '/../app/dependencies.php';
23
+require __DIR__.'/../app/dependencies.php';
24 24
 
25 25
 // Register middleware
26
-require __DIR__ . '/../app/middleware.php';
26
+require __DIR__.'/../app/middleware.php';
27 27
 
28 28
 // Register routes
29
-require __DIR__ . '/../app/routes.php';
29
+require __DIR__.'/../app/routes.php';
30 30
 
31 31
 // Run!
32 32
 $app->run();
Please login to merge, or discard this patch.