Completed
Pull Request — master (#6)
by Christopher
09:11
created
api-classes/SubType.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -20,8 +20,8 @@  discard block
 block discarded – undo
20 20
         }
21 21
 
22 22
         $data = [
23
-      ['field' => 'name', 'type' => 'string', 'value' => $this->name],
24
-      ['field' => 'description', 'type' => 'string', 'value' => $this->description],
23
+        ['field' => 'name', 'type' => 'string', 'value' => $this->name],
24
+        ['field' => 'description', 'type' => 'string', 'value' => $this->description],
25 25
     ];
26 26
 
27 27
         $db->insert($this->db_table, $data);
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 
43 43
         $whereCondition = 'id = '.$id;
44 44
         $where = [
45
-      $whereCondition,
45
+        $whereCondition,
46 46
     ];
47 47
 
48 48
         if ($db->delete($this->db_table, $where)) {
@@ -62,14 +62,14 @@  discard block
 block discarded – undo
62 62
         }
63 63
 
64 64
         $columns = [
65
-      'id',
66
-      'name',
67
-      'description',
65
+        'id',
66
+        'name',
67
+        'description',
68 68
     ];
69 69
 
70 70
         $whereCondition = 'id = '.$id;
71 71
         $where = [
72
-      $whereCondition,
72
+        $whereCondition,
73 73
     ];
74 74
 
75 75
         $result = $db->selectSingle('SubType', $this->db_table, $columns, $where);
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
     public function createInDb(Database $db)
17 17
     {
18 18
         if (empty($this->name) || empty($this->description)) {
19
-            throw new Exception('Series name ('.$this->name.') or description ('.$this->description.') cannot be empty.');
19
+            throw new Exception('Series name (' . $this->name . ') or description (' . $this->description . ') cannot be empty.');
20 20
         }
21 21
 
22 22
         $data = [
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
             throw new Exception('Sub Type id cannot be null');
41 41
         }
42 42
 
43
-        $whereCondition = 'id = '.$id;
43
+        $whereCondition = 'id = ' . $id;
44 44
         $where = [
45 45
       $whereCondition,
46 46
     ];
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
       'description',
68 68
     ];
69 69
 
70
-        $whereCondition = 'id = '.$id;
70
+        $whereCondition = 'id = ' . $id;
71 71
         $where = [
72 72
       $whereCondition,
73 73
     ];
Please login to merge, or discard this patch.
api-classes/Location.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -20,8 +20,8 @@  discard block
 block discarded – undo
20 20
         }
21 21
 
22 22
         $data = [
23
-      ['field' => 'name', 'type' => 'string', 'value' => $this->name],
24
-      ['field' => 'address', 'type' => 'string', 'value' => $this->address],
23
+        ['field' => 'name', 'type' => 'string', 'value' => $this->name],
24
+        ['field' => 'address', 'type' => 'string', 'value' => $this->address],
25 25
     ];
26 26
 
27 27
         $db->insert($this->db_table, $data);
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 
40 40
         $whereCondition = 'id = '.$id;
41 41
         $where = [
42
-      $whereCondition,
42
+        $whereCondition,
43 43
     ];
44 44
 
45 45
         if ($db->delete($this->db_table, $where)) {
@@ -59,14 +59,14 @@  discard block
 block discarded – undo
59 59
         }
60 60
 
61 61
         $columns = [
62
-      'id',
63
-      'name',
64
-      'address',
62
+        'id',
63
+        'name',
64
+        'address',
65 65
     ];
66 66
 
67 67
         $whereCondition = 'id = '.$id;
68 68
         $where = [
69
-      $whereCondition,
69
+        $whereCondition,
70 70
     ];
71 71
 
72 72
         $result = $db->selectSingle('Location', $this->db_table, $columns, $where);
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
     public function createInDb(Database $db)
17 17
     {
18 18
         if (empty($this->name)) {
19
-            throw new Exception('Series name ('.$this->name.') cannot be empty.');
19
+            throw new Exception('Series name (' . $this->name . ') cannot be empty.');
20 20
         }
21 21
 
22 22
         $data = [
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
             $id = $this->id;
38 38
         }
39 39
 
40
-        $whereCondition = 'id = '.$id;
40
+        $whereCondition = 'id = ' . $id;
41 41
         $where = [
42 42
       $whereCondition,
43 43
     ];
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
       'address',
65 65
     ];
66 66
 
67
-        $whereCondition = 'id = '.$id;
67
+        $whereCondition = 'id = ' . $id;
68 68
         $where = [
69 69
       $whereCondition,
70 70
     ];
Please login to merge, or discard this patch.
api-classes/Series.php 2 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -36,8 +36,8 @@  discard block
 block discarded – undo
36 36
         }
37 37
 
38 38
         $data = [
39
-      ['field' => 'name', 'type' => 'string', 'value' => $this->name],
40
-      ['field' => 'description', 'type' => 'string', 'value' => $this->description],
39
+        ['field' => 'name', 'type' => 'string', 'value' => $this->name],
40
+        ['field' => 'description', 'type' => 'string', 'value' => $this->description],
41 41
     ];
42 42
 
43 43
         $db->insert($this->db_table, $data);
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
         $whereCondition = 'id = '.$id;
57 57
         $where = [
58
-      $whereCondition,
58
+        $whereCondition,
59 59
     ];
60 60
 
61 61
         if ($db->delete($this->db_table, $where)) {
@@ -75,14 +75,14 @@  discard block
 block discarded – undo
75 75
         }
76 76
 
77 77
         $columns = [
78
-      'id',
79
-      'name',
80
-      'description',
78
+        'id',
79
+        'name',
80
+        'description',
81 81
     ];
82 82
 
83 83
         $whereCondition = 'id = '.$id;
84 84
         $where = [
85
-      $whereCondition,
85
+        $whereCondition,
86 86
     ];
87 87
 
88 88
         $result = $db->selectSingle('Series', $this->db_table, $columns, $where);
@@ -105,14 +105,14 @@  discard block
 block discarded – undo
105 105
         }
106 106
 
107 107
         $columns = [
108
-      'id',
109
-      'name',
110
-      'description',
108
+        'id',
109
+        'name',
110
+        'description',
111 111
     ];
112 112
 
113 113
         $whereCondition = 'name = '.$db->addQuotes($name);
114 114
         $where = [
115
-      $whereCondition,
115
+        $whereCondition,
116 116
     ];
117 117
 
118 118
         $result = $db->selectSingle('Series', $this->db_table, $columns, $where);
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
     public function createInDb(Database $db)
33 33
     {
34 34
         if (empty($this->name) || empty($this->description)) {
35
-            throw new Exception('Series name ('.$this->name.') or description ('.$this->description.') cannot be empty.');
35
+            throw new Exception('Series name (' . $this->name . ') or description (' . $this->description . ') cannot be empty.');
36 36
         }
37 37
 
38 38
         $data = [
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
             $id = $this->id;
54 54
         }
55 55
 
56
-        $whereCondition = 'id = '.$id;
56
+        $whereCondition = 'id = ' . $id;
57 57
         $where = [
58 58
       $whereCondition,
59 59
     ];
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
       'description',
81 81
     ];
82 82
 
83
-        $whereCondition = 'id = '.$id;
83
+        $whereCondition = 'id = ' . $id;
84 84
         $where = [
85 85
       $whereCondition,
86 86
     ];
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
       'description',
111 111
     ];
112 112
 
113
-        $whereCondition = 'name = '.$db->addQuotes($name);
113
+        $whereCondition = 'name = ' . $db->addQuotes($name);
114 114
         $where = [
115 115
       $whereCondition,
116 116
     ];
Please login to merge, or discard this patch.
src/config.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-require __DIR__.'/../config/database.php';
4
-require __DIR__.'/../config/auth.php';
5
-require __DIR__.'/../config/email.php';
6
-require __DIR__.'/../config/recording.php';
3
+require __DIR__ . '/../config/database.php';
4
+require __DIR__ . '/../config/auth.php';
5
+require __DIR__ . '/../config/email.php';
6
+require __DIR__ . '/../config/recording.php';
7 7
 
8 8
 function getConfig()
9 9
 {
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
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 $container = $app->getContainer();
19 19
 
20 20
 // TWIG view renderer
21
-$container['view'] = function ($c) {
21
+$container['view'] = function($c) {
22 22
     $settings = $c->get('settings')['renderer'];
23 23
     $view = new Twig($settings['template_path'], [
24 24
         'cache' => false, // or 'path/to/cache'
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
     $env = $view->getEnvironment();
41 41
     $env->addGlobal('site', new Site());
42 42
     $env->addGlobal('currenturl', $c->get('request')->getUri());
43
-    $env->addGlobal('currentpath', $c->get('request')->getUri()->getBasePath().'/'.$c->get('request')->getUri()->getPath());
43
+    $env->addGlobal('currentpath', $c->get('request')->getUri()->getBasePath() . '/' . $c->get('request')->getUri()->getPath());
44 44
 
45 45
     if (isset($_SESSION['userId'])) {
46 46
         $u = UserQuery::create()->findPk($_SESSION['userId']);
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 };
54 54
 
55 55
 // monolog
56
-$container['logger'] = function ($c) {
56
+$container['logger'] = function($c) {
57 57
     $settings = $c->get('settings')['logger'];
58 58
     $logger = new Monolog\Logger($settings['name']);
59 59
     $logger->pushProcessor(new Monolog\Processor\UidProcessor());
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
     return $logger;
63 63
 };
64 64
 
65
-$container['auth'] = function ($c) {
65
+$container['auth'] = function($c) {
66 66
     $authConfig = getConfig()['auth'];
67 67
 
68 68
     switch ($authConfig['scheme']) {
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
             break;
72 72
 
73 73
         case 'onebody':
74
-            $url = $authConfig['onebody']['url'].'/';
74
+            $url = $authConfig['onebody']['url'] . '/';
75 75
             $email = new EmailAddress($authConfig['onebody']['email']);
76 76
             $apiKey = $authConfig['onebody']['apiKey'];
77 77
 
Please login to merge, or discard this patch.
src/routes.php 1 patch
Spacing   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -18,35 +18,35 @@  discard block
 block discarded – undo
18 18
 // USER
19 19
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
20 20
 
21
-$app->group('/user', function () {
22
-    $this->get('s', UserController::class.':getAllUsers')->setName('users');
21
+$app->group('/user', function() {
22
+    $this->get('s', UserController::class . ':getAllUsers')->setName('users');
23 23
 
24
-    $this->get('/{id}/widget-only', UserController::class.':getUserWidgetOnly')->setName('user-widget-only');
24
+    $this->get('/{id}/widget-only', UserController::class . ':getUserWidgetOnly')->setName('user-widget-only');
25 25
 
26
-    $this->get('/new', UserController::class.':getNewUserForm')->setName('user-new');
27
-    $this->get('/{id}/edit', UserController::class.':getUserEditForm')->setName('user-edit');
28
-    $this->get('/{id}/password', UserController::class.':getUserPasswordForm')->setName('user-password');
26
+    $this->get('/new', UserController::class . ':getNewUserForm')->setName('user-new');
27
+    $this->get('/{id}/edit', UserController::class . ':getUserEditForm')->setName('user-edit');
28
+    $this->get('/{id}/password', UserController::class . ':getUserPasswordForm')->setName('user-password');
29 29
 
30
-    $this->get('/me', UserController::class.':getCurrentUser')->setName('user-me');
31
-    $this->get('/{id}', UserController::class.':getUser')->setName('user');
30
+    $this->get('/me', UserController::class . ':getCurrentUser')->setName('user-me');
31
+    $this->get('/{id}', UserController::class . ':getUser')->setName('user');
32 32
 
33
-    $this->post('[/{id}]', UserController::class.':postUser')->setName('user-post');
34
-    $this->post('/{id}/password', UserController::class.':postUserPasswordChange')->setName('user-password-post');
33
+    $this->post('[/{id}]', UserController::class . ':postUser')->setName('user-post');
34
+    $this->post('/{id}/password', UserController::class . ':postUserPasswordChange')->setName('user-password-post');
35 35
 
36 36
     // roles
37
-    $this->get('/{id}/roles', RoleController::class.':getAssignRolesForm')->setName('user-roles');
38
-    $this->post('/{id}/roles', RoleController::class.':postUserAssignRoles')->setName('user-assign-post');
37
+    $this->get('/{id}/roles', RoleController::class . ':getAssignRolesForm')->setName('user-roles');
38
+    $this->post('/{id}/roles', RoleController::class . ':postUserAssignRoles')->setName('user-assign-post');
39 39
 
40 40
     // availability
41
-    $this->get('/{id}/availability', AvailabilityController::class.':getAvailabilityForm')->setName('user-availability');
42
-    $this->post('/{id}/availability', AvailabilityController::class.':postAvailability')->setName('user-availability-post');
41
+    $this->get('/{id}/availability', AvailabilityController::class . ':getAvailabilityForm')->setName('user-availability');
42
+    $this->post('/{id}/availability', AvailabilityController::class . ':postAvailability')->setName('user-availability-post');
43 43
 
44 44
     // calendar
45
-    $this->group('/me/calendar', function () {
46
-        $this->get('s', CalendarController::class.':getCalendarTokens')->setName('user-calendars');
47
-        $this->get('/new', CalendarController::class.':getNewCalendarForm')->setName('user-calendars');
48
-        $this->get('/{id}/revoke', CalendarController::class.':getRevokeCalendar')->setName('user-calendar-revoke');
49
-        $this->post('/new', CalendarController::class.':postNewCalendar')->setName('user-calendar-new-post');
45
+    $this->group('/me/calendar', function() {
46
+        $this->get('s', CalendarController::class . ':getCalendarTokens')->setName('user-calendars');
47
+        $this->get('/new', CalendarController::class . ':getNewCalendarForm')->setName('user-calendars');
48
+        $this->get('/{id}/revoke', CalendarController::class . ':getRevokeCalendar')->setName('user-calendar-revoke');
49
+        $this->post('/new', CalendarController::class . ':postNewCalendar')->setName('user-calendar-new-post');
50 50
     });
51 51
 });
52 52
 
@@ -54,79 +54,79 @@  discard block
 block discarded – undo
54 54
 // EVENT
55 55
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
56 56
 
57
-$app->group('/event', function () {
58
-    $this->get('s', EventController::class.':getAllEvents')->setName('events');
59
-    $this->get('s/type/{id}', EventController::class.':getAllEventsWithType')->setName('events-eventtype');
60
-    $this->get('s/subtype/{id}', EventController::class.':getAllEventsWithSubType')->setName('events-eventsubtype');
57
+$app->group('/event', function() {
58
+    $this->get('s', EventController::class . ':getAllEvents')->setName('events');
59
+    $this->get('s/type/{id}', EventController::class . ':getAllEventsWithType')->setName('events-eventtype');
60
+    $this->get('s/subtype/{id}', EventController::class . ':getAllEventsWithSubType')->setName('events-eventsubtype');
61 61
 
62
-    $this->get('s/print/preachers', EventController::class.':getAllEventsToPrint')->setName('events-print');
62
+    $this->get('s/print/preachers', EventController::class . ':getAllEventsToPrint')->setName('events-print');
63 63
 
64
-    $this->get('/new', EventController::class.':getNewEventForm')->setName('event-new');
65
-    $this->get('/{id}/edit', EventController::class.':getEventEditForm')->setName('event-edit');
66
-    $this->get('/{id}/copy', EventController::class.':getEventCopyForm')->setName('event-copy');
67
-    $this->get('/{id}/assign', EventController::class.':getEventAssignForm')->setName('event-assign');
64
+    $this->get('/new', EventController::class . ':getNewEventForm')->setName('event-new');
65
+    $this->get('/{id}/edit', EventController::class . ':getEventEditForm')->setName('event-edit');
66
+    $this->get('/{id}/copy', EventController::class . ':getEventCopyForm')->setName('event-copy');
67
+    $this->get('/{id}/assign', EventController::class . ':getEventAssignForm')->setName('event-assign');
68 68
 
69
-    $this->get('/{id}', EventController::class.':getEvent')->setName('event');
69
+    $this->get('/{id}', EventController::class . ':getEvent')->setName('event');
70 70
 
71
-    $this->post('[/{id}]', EventController::class.':postEvent')->setName('event-post');
72
-    $this->post('/{id}/assign', EventController::class.':postEventAssign')->setName('event-assign-post');
71
+    $this->post('[/{id}]', EventController::class . ':postEvent')->setName('event-post');
72
+    $this->post('/{id}/assign', EventController::class . ':postEventAssign')->setName('event-assign-post');
73 73
 });
74 74
 
75 75
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
76 76
 // RESOURCE
77 77
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
78 78
 
79
-$app->group('/resource', function () {
80
-    $this->get('s', ResourceController::class.':getAllResources')->setName('resources');
79
+$app->group('/resource', function() {
80
+    $this->get('s', ResourceController::class . ':getAllResources')->setName('resources');
81 81
 
82
-    $this->get('[/new]', ResourceController::class.':getNewResourceForm')->setName('resource-new');
83
-    $this->get('/{id}/edit', ResourceController::class.':getResourceEditForm')->setName('resource-edit');
82
+    $this->get('[/new]', ResourceController::class . ':getNewResourceForm')->setName('resource-new');
83
+    $this->get('/{id}/edit', ResourceController::class . ':getResourceEditForm')->setName('resource-edit');
84 84
 
85
-    $this->get('/{id}', ResourceController::class.':getResourceFile')->setName('resource');
85
+    $this->get('/{id}', ResourceController::class . ':getResourceFile')->setName('resource');
86 86
 
87
-    $this->post('[/{id}]', ResourceController::class.':postResource')->setName('resource-post');
87
+    $this->post('[/{id}]', ResourceController::class . ':postResource')->setName('resource-post');
88 88
 });
89 89
 
90 90
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
91 91
 // AUTH
92 92
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
93 93
 
94
-$app->get('/login', AuthController::class.':getLoginForm')->setName('login');
95
-$app->get('/logout', AuthController::class.':getLogout')->setName('logout');
94
+$app->get('/login', AuthController::class . ':getLoginForm')->setName('login');
95
+$app->get('/logout', AuthController::class . ':getLogout')->setName('logout');
96 96
 
97
-$app->post('/login', AuthController::class.':postLogin')->setName('login-post');
97
+$app->post('/login', AuthController::class . ':postLogin')->setName('login-post');
98 98
 
99 99
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
100 100
 // NOTIFICATIONS
101 101
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
102 102
 
103
-$app->get('/notification/{id}[/{referrer}]', NotificationController::class.':getNotificationClick')->setName('notification');
103
+$app->get('/notification/{id}[/{referrer}]', NotificationController::class . ':getNotificationClick')->setName('notification');
104 104
 
105 105
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
106 106
 // CALENDAR
107 107
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
108 108
 
109
-$app->get('/calendar/{token}.{format}', CalendarController::class.':getRenderedCalendar')->setName('user-calendar');
109
+$app->get('/calendar/{token}.{format}', CalendarController::class . ':getRenderedCalendar')->setName('user-calendar');
110 110
 
111 111
 // legacy
112
-$app->get('/calendar.php', CalendarController::class.':getLegacyRenderedCalendar')->setName('user-calendar');
112
+$app->get('/calendar.php', CalendarController::class . ':getLegacyRenderedCalendar')->setName('user-calendar');
113 113
 
114 114
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
115 115
 // OTHER
116 116
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
117 117
 
118
-$app->get('/settings', function ($request, $response, $args) {
118
+$app->get('/settings', function($request, $response, $args) {
119 119
     // Sample log message
120 120
     $this->logger->info("Fetch settings GET '/settings'");
121 121
 
122 122
     return $this->view->render($response, 'settings.twig', []);
123 123
 })->setName('settings');
124 124
 
125
-$app->get('/token', function ($request, $response, $args) {
125
+$app->get('/token', function($request, $response, $args) {
126 126
     return $response->getBody()->write(Crypt::generateToken(30));
127 127
 })->setName('token');
128 128
 
129
-$app->get('/', function ($request, $response, $args) {
129
+$app->get('/', function($request, $response, $args) {
130 130
     // Sample log message
131 131
     $this->logger->info("Fetch home GET '/'");
132 132
 
Please login to merge, or discard this patch.
src/settings.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-require_once __DIR__.'/config.php';
3
+require_once __DIR__ . '/config.php';
4 4
 
5 5
 $config = getConfig();
6 6
 
@@ -12,13 +12,13 @@  discard block
 block discarded – undo
12 12
 
13 13
         // Renderer settings
14 14
         'renderer' => [
15
-            'template_path' => __DIR__.'/../templates/',
15
+            'template_path' => __DIR__ . '/../templates/',
16 16
         ],
17 17
 
18 18
         // Monolog settings
19 19
         'logger' => [
20 20
             'name'  => 'rota',
21
-            'path'  => __DIR__.'/../logs/app.log',
21
+            'path'  => __DIR__ . '/../logs/app.log',
22 22
             'level' => \Monolog\Logger::DEBUG,
23 23
         ],
24 24
 
Please login to merge, or discard this patch.
src/classes/Site.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,8 @@
 block discarded – undo
23 23
         if (!isset($this->menu)) {
24 24
             $this->menu['events']['type'] = EventTypeQuery::create()
25 25
                                         ->useEventQuery()
26
-                                          ->filterByRemoved(false)
27
-                                          ->filterByDate(['min' => new DateTime()])
26
+                                            ->filterByRemoved(false)
27
+                                            ->filterByDate(['min' => new DateTime()])
28 28
                                         ->endUse()
29 29
                                         ->distinct()
30 30
                                         ->find();
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
         $hostname = $_SERVER['HTTP_HOST'];
40 40
 
41 41
         return [
42
-            'base'     => $http.'://'.$hostname,
42
+            'base'     => $http . '://' . $hostname,
43 43
             'protocol' => $http,
44 44
             'host'     => $hostname,
45 45
         ];
Please login to merge, or discard this patch.
src/classes/AuthProvider/UsernamePassword/OneBodyAuth.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
         $base_uri = $this->guzzle->getConfig()['base_uri'];
72 72
 
73 73
         if (strlen($base_uri) > 0) {
74
-            $url = $base_uri.'/account/new?forgot=true';
74
+            $url = $base_uri . '/account/new?forgot=true';
75 75
         }
76 76
 
77 77
         return $url;
Please login to merge, or discard this patch.