Completed
Pull Request — master (#64)
by Christopher
08:34
created
src/classes/AuthProvider/Callback/FacebookAuth.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 
44 44
         $path = $this->router->pathFor('login-callback', ['provider' => $this->getAuthProviderSlug()]);
45 45
 
46
-        $url = $this->baseUrl.$path;
46
+        $url = $this->baseUrl . $path;
47 47
 
48 48
         return $helper->getLoginUrl($url, $this->permissions);
49 49
     }
@@ -56,12 +56,12 @@  discard block
 block discarded – undo
56 56
             $accessToken = $helper->getAccessToken();
57 57
         } catch (FacebookResponseException $e) {
58 58
             // When Graph returns an error
59
-            echo 'Graph returned an error: '.$e->getMessage();
59
+            echo 'Graph returned an error: ' . $e->getMessage();
60 60
 
61 61
             return false;
62 62
         } catch (FacebookSDKException $e) {
63 63
             // When validation fails or other local issues
64
-            echo 'Facebook SDK returned an error: '.$e->getMessage();
64
+            echo 'Facebook SDK returned an error: ' . $e->getMessage();
65 65
 
66 66
             return false;
67 67
         }
@@ -69,10 +69,10 @@  discard block
 block discarded – undo
69 69
         if (!isset($accessToken)) {
70 70
             if ($helper->getError()) {
71 71
                 header('HTTP/1.0 401 Unauthorized');
72
-                echo 'Error: '.$helper->getError()."\n";
73
-                echo 'Error Code: '.$helper->getErrorCode()."\n";
74
-                echo 'Error Reason: '.$helper->getErrorReason()."\n";
75
-                echo 'Error Description: '.$helper->getErrorDescription()."\n";
72
+                echo 'Error: ' . $helper->getError() . "\n";
73
+                echo 'Error Code: ' . $helper->getErrorCode() . "\n";
74
+                echo 'Error Reason: ' . $helper->getErrorReason() . "\n";
75
+                echo 'Error Description: ' . $helper->getErrorDescription() . "\n";
76 76
             } else {
77 77
                 header('HTTP/1.0 400 Bad Request');
78 78
                 echo 'Bad request';
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
             try {
99 99
                 $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
100 100
             } catch (FacebookSDKException $e) {
101
-                echo '<p>Error getting long-lived access token: '.$helper->getMessage()."</p>\n\n";
101
+                echo '<p>Error getting long-lived access token: ' . $helper->getMessage() . "</p>\n\n";
102 102
 
103 103
                 return false;
104 104
             }
@@ -122,10 +122,10 @@  discard block
 block discarded – undo
122 122
             // Returns a `Facebook\FacebookResponse` object
123 123
             $response = $this->facebook->get('/me?fields=id,name,email', $accessToken);
124 124
         } catch (Facebook\Exceptions\FacebookResponseException $e) {
125
-            echo 'Graph returned an error: '.$e->getMessage();
125
+            echo 'Graph returned an error: ' . $e->getMessage();
126 126
             exit;
127 127
         } catch (Facebook\Exceptions\FacebookSDKException $e) {
128
-            echo 'Facebook SDK returned an error: '.$e->getMessage();
128
+            echo 'Facebook SDK returned an error: ' . $e->getMessage();
129 129
             exit;
130 130
         }
131 131
 
Please login to merge, or discard this patch.
src/dependencies.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 $container = $app->getContainer();
20 20
 
21 21
 // TWIG view renderer
22
-$container['view'] = function ($c) {
22
+$container['view'] = function($c) {
23 23
     $settings = $c->get('settings')['renderer'];
24 24
     $view = new Twig($settings['template_path'], [
25 25
         'cache' => false, // or 'path/to/cache'
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
     $env = $view->getEnvironment();
42 42
     $env->addGlobal('site', new Site());
43 43
     $env->addGlobal('currenturl', $c->get('request')->getUri());
44
-    $env->addGlobal('currentpath', $c->get('request')->getUri()->getBasePath().'/'.$c->get('request')->getUri()->getPath());
44
+    $env->addGlobal('currentpath', $c->get('request')->getUri()->getBasePath() . '/' . $c->get('request')->getUri()->getPath());
45 45
 
46 46
     if (isset($_SESSION['userId'])) {
47 47
         $u = UserQuery::create()->findPk($_SESSION['userId']);
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 };
55 55
 
56 56
 // monolog
57
-$container['logger'] = function ($c) {
57
+$container['logger'] = function($c) {
58 58
     $settings = $c->get('settings')['logger'];
59 59
     $logger = new Monolog\Logger($settings['name']);
60 60
     $logger->pushProcessor(new Monolog\Processor\UidProcessor());
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
     return $logger;
64 64
 };
65 65
 
66
-$container['auth'] = function ($c) {
66
+$container['auth'] = function($c) {
67 67
     $authConfig = getConfig()['auth'];
68 68
 
69 69
     // full domain e.g. https://example.com
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
             break;
82 82
 
83 83
         case 'onebody':
84
-            $url = $authConfig['onebody']['url'].'/';
84
+            $url = $authConfig['onebody']['url'] . '/';
85 85
             $email = new EmailAddress($authConfig['onebody']['email']);
86 86
             $apiKey = $authConfig['onebody']['apiKey'];
87 87
 
Please login to merge, or discard this patch.
public/old/event.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 if (!empty($_GET['id'])) {
4
-    header('Location: ../event/'.(int) $_GET['id']);
4
+    header('Location: ../event/' . (int) $_GET['id']);
5 5
 }
Please login to merge, or discard this patch.
public/old/error.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 <br>
47 47
 The following error has occurred
48 48
 <?php
49
-echo " on page '".$page."':<br><br>";
49
+echo " on page '" . $page . "':<br><br>";
50 50
     echo '<strong>';
51 51
 
52 52
     switch ($no) {
Please login to merge, or discard this patch.
public/old/editPassword.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 namespace TechWilk\Rota;
4 4
 
5 5
 if (!empty($_GET['id'])) {
6
-    header('Location: ../user/'.(int) $_GET['id'].'/password');
6
+    header('Location: ../user/' . (int) $_GET['id'] . '/password');
7 7
     exit;
8 8
 }
9 9
 
Please login to merge, or discard this patch.
src/classes/Controller/AuthController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 
79 79
     public function getLoginAuth(ServerRequestInterface $request, ResponseInterface $response, $args)
80 80
     {
81
-        $this->logger->info("Login auth GET '/login/".$args['provider']."'");
81
+        $this->logger->info("Login auth GET '/login/" . $args['provider'] . "'");
82 82
 
83 83
         // login
84 84
         $authUrl = $this->auth->getCallbackUrl();
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 
89 89
     public function getLoginCallback(ServerRequestInterface $request, ResponseInterface $response, $args)
90 90
     {
91
-        $this->logger->info("Login auth GET '/login/".$args['provider']."/callback'");
91
+        $this->logger->info("Login auth GET '/login/" . $args['provider'] . "/callback'");
92 92
 
93 93
         // login
94 94
         try {
Please login to merge, or discard this patch.
src/classes/Controller/ResourceController.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 
62 62
     public function getResourceEditForm(ServerRequestInterface $request, ResponseInterface $response, $args)
63 63
     {
64
-        $this->logger->info("Fetch resource GET '/resource/".$args['id']."/edit'");
64
+        $this->logger->info("Fetch resource GET '/resource/" . $args['id'] . "/edit'");
65 65
         $d = DocumentQuery::create()->findPK($args['id']);
66 66
 
67 67
         if (!is_null($d)) {
@@ -73,15 +73,15 @@  discard block
 block discarded – undo
73 73
 
74 74
     public function getResourceFile(ServerRequestInterface $request, ResponseInterface $response, $args)
75 75
     {
76
-        $this->logger->info("Fetch resource GET '/resource/".$args['id']."'");
76
+        $this->logger->info("Fetch resource GET '/resource/" . $args['id'] . "'");
77 77
         $resource = DocumentQuery::create()->findPk($args['id']);
78
-        $directory = __DIR__.'/../../../documents/';
78
+        $directory = __DIR__ . '/../../../documents/';
79 79
 
80 80
         if (!is_null($resource)) {
81
-            if (file_exists($directory.$resource->getUrl())) {
82
-                $file = $directory.$resource->getUrl();
83
-            } elseif (file_exists($directory.$resource->getId())) {
84
-                $file = $directory.$resource->getId();
81
+            if (file_exists($directory . $resource->getUrl())) {
82
+                $file = $directory . $resource->getUrl();
83
+            } elseif (file_exists($directory . $resource->getId())) {
84
+                $file = $directory . $resource->getId();
85 85
             } else {
86 86
                 return $this->view->render($response, 'error.twig');
87 87
             }
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
                             ->withHeader('Content-Type', 'application/download')
96 96
                             ->withHeader('Content-Description', 'File Transfer')
97 97
                             ->withHeader('Content-Transfer-Encoding', 'binary')
98
-                            ->withHeader('Content-Disposition', 'attachment; filename="'.$resource->getUrl().'"')
98
+                            ->withHeader('Content-Disposition', 'attachment; filename="' . $resource->getUrl() . '"')
99 99
                             ->withHeader('Expires', '0')
100 100
                             ->withHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
101 101
                             ->withHeader('Pragma', 'public')
Please login to merge, or discard this patch.
src/classes/Controller/GroupController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 {
14 14
     public function getGroup(ServerRequestInterface $request, ResponseInterface $response, $args)
15 15
     {
16
-        $this->logger->info("Fetch group GET '/group/".$args['id']."'");
16
+        $this->logger->info("Fetch group GET '/group/" . $args['id'] . "'");
17 17
         $events = EventQuery::create()
18 18
             ->useEventPersonQuery()
19 19
                 ->useUserRoleQuery()
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 
37 37
     public function getGroupRoles(ServerRequestInterface $request, ResponseInterface $response, $args)
38 38
     {
39
-        $this->logger->info("Fetch group roles GET '/group/".$args['id']."/roles'");
39
+        $this->logger->info("Fetch group roles GET '/group/" . $args['id'] . "/roles'");
40 40
         $events = EventQuery::create()
41 41
             ->useEventPersonQuery()
42 42
                 ->useUserRoleQuery()
@@ -58,14 +58,14 @@  discard block
 block discarded – undo
58 58
                 ->findPk($args['id']);
59 59
 
60 60
         // temporary redirect
61
-        return $response->withStatus(302)->withHeader('Location', $this->router->pathFor('home').'old/roles.php');
61
+        return $response->withStatus(302)->withHeader('Location', $this->router->pathFor('home') . 'old/roles.php');
62 62
 
63 63
         return $this->view->render($response, 'group-roles.twig', ['events' => $events, 'group' => $group]);
64 64
     }
65 65
 
66 66
     public function postGroup(ServerRequestInterface $request, ResponseInterface $response, $args)
67 67
     {
68
-        $this->logger->info("Create/edit group POST '/group/".$args['id']."'");
68
+        $this->logger->info("Create/edit group POST '/group/" . $args['id'] . "'");
69 69
 
70 70
         $group = new Group();
71 71
 
Please login to merge, or discard this patch.
src/classes/Controller/EventController.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 
32 32
     public function getAllEventsWithType(ServerRequestInterface $request, ResponseInterface $response, $args)
33 33
     {
34
-        $this->logger->info("Fetch event GET '/events/type/".$args['id']."'");
34
+        $this->logger->info("Fetch event GET '/events/type/" . $args['id'] . "'");
35 35
 
36 36
         $eventType = EventTypeQuery::create()->findPk($args['id']);
37 37
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 
43 43
     public function getAllEventsWithSubType(ServerRequestInterface $request, ResponseInterface $response, $args)
44 44
     {
45
-        $this->logger->info("Fetch event GET '/events/type/".$args['id']."'");
45
+        $this->logger->info("Fetch event GET '/events/type/" . $args['id'] . "'");
46 46
 
47 47
         $eventType = EventSubTypeQuery::create()->findPk($args['id']);
48 48
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
             $e->setCreatedBy($this->auth->currentUser());
86 86
         }
87 87
         $e->setName($data['name']);
88
-        $e->setDate(DateTime::createFromFormat('d/m/Y H:i', $data['date'].' '.$data['time']));
88
+        $e->setDate(DateTime::createFromFormat('d/m/Y H:i', $data['date'] . ' ' . $data['time']));
89 89
         $e->setEventTypeId($data['type']);
90 90
         $e->setEventSubTypeId($data['subtype']);
91 91
         $e->setLocationId($data['location']);
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 
119 119
     public function getEvent(ServerRequestInterface $request, ResponseInterface $response, $args)
120 120
     {
121
-        $this->logger->info("Fetch event GET '/event/".$args['id']."'");
121
+        $this->logger->info("Fetch event GET '/event/" . $args['id'] . "'");
122 122
         $e = EventQuery::create()->findPK($args['id']);
123 123
 
124 124
         if (!$e->authoriser()->readableBy($this->auth->currentUser())) {
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 
135 135
     public function getEventEditForm(ServerRequestInterface $request, ResponseInterface $response, $args)
136 136
     {
137
-        $this->logger->info("Fetch event GET '/event/".$args['id']."/edit'");
137
+        $this->logger->info("Fetch event GET '/event/" . $args['id'] . "/edit'");
138 138
         $e = EventQuery::create()->findPK($args['id']);
139 139
         $l = LocationQuery::create()->orderByName()->find();
140 140
         $et = EventTypeQuery::create()->orderByName()->find();
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 
150 150
     public function getEventCopyForm(ServerRequestInterface $request, ResponseInterface $response, $args)
151 151
     {
152
-        $this->logger->info("Fetch event GET '/event/".$args['id']."/copy'");
152
+        $this->logger->info("Fetch event GET '/event/" . $args['id'] . "/copy'");
153 153
         $e = EventQuery::create()->findPK($args['id']);
154 154
         $l = LocationQuery::create()->orderByName()->find();
155 155
         $et = EventTypeQuery::create()->orderByName()->find();
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 
165 165
     public function getEventAssignForm(ServerRequestInterface $request, ResponseInterface $response, $args)
166 166
     {
167
-        $this->logger->info("Fetch event GET '/event/".$args['id']."/assign'");
167
+        $this->logger->info("Fetch event GET '/event/" . $args['id'] . "/assign'");
168 168
         $e = EventQuery::create()->findPK($args['id']);
169 169
         $ur = UserRoleQuery::create()->find();
170 170
 
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 
178 178
     public function postEventAssign(ServerRequestInterface $request, ResponseInterface $response, $args)
179 179
     {
180
-        $this->logger->info("Create event people POST '/event".$args['id']."/assign'");
180
+        $this->logger->info("Create event people POST '/event" . $args['id'] . "/assign'");
181 181
 
182 182
         $eventId = filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
183 183
         $existingUserRoles = UserRoleQuery::create()->useEventPersonQuery()->filterByEventId($eventId)->endUse()->find();
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
 
224 224
     public function getAllEventsToPrintForGroup(ServerRequestInterface $request, ResponseInterface $response, $args)
225 225
     {
226
-        $this->logger->info("Fetch event printable page GET '/group/".$args['id']."/events'");
226
+        $this->logger->info("Fetch event printable page GET '/group/" . $args['id'] . "/events'");
227 227
 
228 228
         $groupId = (int) $args['id'];
229 229
 
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
 
270 270
     public function postEventComment(ServerRequestInterface $request, ResponseInterface $response, $args)
271 271
     {
272
-        $this->logger->info("Create event people POST '/event".$args['id']."/comment'");
272
+        $this->logger->info("Create event people POST '/event" . $args['id'] . "/comment'");
273 273
 
274 274
         $eventId = filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
275 275
 
Please login to merge, or discard this patch.