diff --git a/composer.lock b/composer.lock
index d1e3cdcc..a769db4e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -647,16 +647,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "1.25.3",
+            "version": "1.25.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1"
+                "reference": "3022efff205e2448b560c833c6fbbf91c3139168"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fa82921994db851a8becaf3787a9e73c5976b6f1",
-                "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/3022efff205e2448b560c833c6fbbf91c3139168",
+                "reference": "3022efff205e2448b560c833c6fbbf91c3139168",
                 "shasum": ""
             },
             "require": {
@@ -670,11 +670,10 @@
                 "aws/aws-sdk-php": "^2.4.9 || ^3.0",
                 "doctrine/couchdb": "~1.0@dev",
                 "graylog2/gelf-php": "~1.0",
-                "jakub-onderka/php-parallel-lint": "0.9",
                 "php-amqplib/php-amqplib": "~2.4",
                 "php-console/php-console": "^3.1.3",
+                "php-parallel-lint/php-parallel-lint": "^1.0",
                 "phpunit/phpunit": "~4.5",
-                "phpunit/phpunit-mock-objects": "2.3.0",
                 "ruflin/elastica": ">=0.90 <3.0",
                 "sentry/sentry": "^0.13",
                 "swiftmailer/swiftmailer": "^5.3|^6.0"
@@ -721,7 +720,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2019-12-20T14:15:16+00:00"
+            "time": "2020-05-22T07:31:27+00:00"
         },
         {
             "name": "nikic/fast-route",
@@ -1440,12 +1439,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/propelorm/Propel2.git",
-                "reference": "297473a6ddf0dcbbd6f88cb852c2c549814f908e"
+                "reference": "5eb354ef50b65f1f9c58c2f9f1c2523a4378edd7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/propelorm/Propel2/zipball/297473a6ddf0dcbbd6f88cb852c2c549814f908e",
-                "reference": "297473a6ddf0dcbbd6f88cb852c2c549814f908e",
+                "url": "https://api.github.com/repos/propelorm/Propel2/zipball/5eb354ef50b65f1f9c58c2f9f1c2523a4378edd7",
+                "reference": "5eb354ef50b65f1f9c58c2f9f1c2523a4378edd7",
                 "shasum": ""
             },
             "require": {
@@ -1496,7 +1495,7 @@
                 "orm",
                 "persistence"
             ],
-            "time": "2019-11-08T13:12:55+00:00"
+            "time": "2020-05-11T07:36:16+00:00"
         },
         {
             "name": "psr/container",
@@ -1700,16 +1699,16 @@
         },
         {
             "name": "psr/log",
-            "version": "1.1.2",
+            "version": "1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
+                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
-                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
                 "shasum": ""
             },
             "require": {
@@ -1743,7 +1742,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2019-11-01T11:05:21+00:00"
+            "time": "2020-03-23T09:12:05+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
diff --git a/generated-classes/TechWilk/Rota/User.php b/generated-classes/TechWilk/Rota/User.php
index 8ec997a8..b7974835 100644
--- a/generated-classes/TechWilk/Rota/User.php
+++ b/generated-classes/TechWilk/Rota/User.php
@@ -70,8 +70,8 @@ public function setPassword($v)
 
         if (!password_verify($v, $this->password)) {
             $bcrypt_options = [
-        'cost' => 12,
-      ];
+                'cost' => 12,
+            ];
             $this->password = password_hash($v, PASSWORD_BCRYPT, $bcrypt_options);
 
             $this->modifiedColumns[UserTableMap::COL_PASSWORD] = true;
diff --git a/generated-conf/config.php b/generated-conf/config.php
index 1195e3a7..dd115f76 100644
--- a/generated-conf/config.php
+++ b/generated-conf/config.php
@@ -7,18 +7,18 @@
 $serviceContainer->setAdapterClass('default', 'mysql');
 $manager = new \Propel\Runtime\Connection\ConnectionManagerSingle();
 $manager->setConfiguration([
-  'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
-  'dsn'        => 'mysql:host='.$config['db']['host'].';dbname='.$config['db']['dbname'],
-  'user'       => $config['db']['user'],
-  'password'   => $config['db']['pass'],
-  'attributes' => [
-    'ATTR_EMULATE_PREPARES' => false,
-    'ATTR_TIMEOUT'          => 30,
-  ],
-  'model_paths' => [
-    0 => 'src',
-    1 => 'vendor',
-  ],
+    'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
+    'dsn'        => 'mysql:host='.$config['db']['host'].';dbname='.$config['db']['dbname'],
+    'user'       => $config['db']['user'],
+    'password'   => $config['db']['pass'],
+    'attributes' => [
+        'ATTR_EMULATE_PREPARES' => false,
+        'ATTR_TIMEOUT'          => 30,
+    ],
+    'model_paths' => [
+        0 => 'src',
+        1 => 'vendor',
+    ],
 ]);
 $manager->setName('default');
 $serviceContainer->setConnectionManager('default', $manager);
@@ -26,16 +26,16 @@
 $serviceContainer->setAdapterClass('test', 'sqlite');
 $manager = new \Propel\Runtime\Connection\ConnectionManagerSingle();
 $manager->setConfiguration([
-  'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
-  'dsn'        => 'sqlite:/var/tmp/test.db',
-  'attributes' => [
-    'ATTR_EMULATE_PREPARES' => false,
-    'ATTR_TIMEOUT'          => 30,
-  ],
-  'model_paths' => [
-    0 => 'src',
-    1 => 'vendor',
-  ],
+    'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
+    'dsn'        => 'sqlite:/var/tmp/test.db',
+    'attributes' => [
+        'ATTR_EMULATE_PREPARES' => false,
+        'ATTR_TIMEOUT'          => 30,
+    ],
+    'model_paths' => [
+        0 => 'src',
+        1 => 'vendor',
+    ],
 ]);
 $manager->setName('test');
 $serviceContainer->setConnectionManager('test', $manager);
diff --git a/generated-migrations/PropelMigration_1494860053.php b/generated-migrations/PropelMigration_1494860053.php
index 468dd151..9bfeb5cc 100644
--- a/generated-migrations/PropelMigration_1494860053.php
+++ b/generated-migrations/PropelMigration_1494860053.php
@@ -40,7 +40,7 @@ public function postDown(MigrationManager $manager)
     public function getUpSQL()
     {
         return [
-  'default' => '
+            'default' => '
 # This is a fix for InnoDB in MySQL >= 4.1.x
 # It "suspends judgement" for fkey relationships until are tables are set.
 SET FOREIGN_KEY_CHECKS = 0;
@@ -160,7 +160,7 @@ public function getUpSQL()
 # This restores the fkey checks, after having unset them earlier
 SET FOREIGN_KEY_CHECKS = 1;
 ',
-];
+        ];
     }
 
     /**
@@ -172,7 +172,7 @@ public function getUpSQL()
     public function getDownSQL()
     {
         return [
-  'default' => '
+            'default' => '
 # This is a fix for InnoDB in MySQL >= 4.1.x
 # It "suspends judgement" for fkey relationships until are tables are set.
 SET FOREIGN_KEY_CHECKS = 0;
@@ -270,6 +270,6 @@ public function getDownSQL()
 # This restores the fkey checks, after having unset them earlier
 SET FOREIGN_KEY_CHECKS = 1;
 ',
-];
+        ];
     }
 }
diff --git a/public/api/v1/index.php b/public/api/v1/index.php
index 5fe8861e..72fdeeee 100644
--- a/public/api/v1/index.php
+++ b/public/api/v1/index.php
@@ -17,68 +17,66 @@ function isAdmin()
     }
 }
 
-if (isAdmin()):
+if (isAdmin()) {
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Start of API
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Start of API
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-require_once __DIR__.'/../../../vendor/autoload.php';
+    require_once __DIR__.'/../../../vendor/autoload.php';
 
-require_once __DIR__.'/../../../generated-conf/config.php';
+    require_once __DIR__.'/../../../generated-conf/config.php';
 
-// Create and configure Slim app
-$app = new \Slim\App(['settings' => $config]);
+    // Create and configure Slim app
+    $app = new \Slim\App(['settings' => $config]);
 
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Containers for DI
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Containers for DI
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-$container = $app->getContainer();
+    $container = $app->getContainer();
 
-$container['db'] = function ($c) {
-    $db_config = $c['settings']['db'];
-    $db = new Database($db_config);
+    $container['db'] = function ($c) {
+        $db_config = $c['settings']['db'];
+        $db = new Database($db_config);
 
-    return $db;
-};
+        return $db;
+    };
 
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Define app routes
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Define app routes
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-// ~~~~~~~~~~~~~~~ Series ~~~~~~~~~~~~~~~
+    // ~~~~~~~~~~~~~~~ Series ~~~~~~~~~~~~~~~
 
-$app->post('/series', function ($request, $response, $args) {
-    $postData = $request->getParsedBody();
+    $app->post('/series', function ($request, $response, $args) {
+        $postData = $request->getParsedBody();
 
-    $name = filter_var($postData['name'], FILTER_SANITIZE_STRING);
-    $description = filter_var($postData['description'], FILTER_SANITIZE_STRING);
+        $name = filter_var($postData['name'], FILTER_SANITIZE_STRING);
+        $description = filter_var($postData['description'], FILTER_SANITIZE_STRING);
 
-    $series = new EventGroup();
-    $series->setName($name);
-    $series->setDescription($description);
-    $series->save();
+        $series = new EventGroup();
+        $series->setName($name);
+        $series->setDescription($description);
+        $series->save();
 
-    $data = [
-        'data' => [
-            'id'          => $series->getId(),
-            'name'        => $series->getName(),
-            'description' => $series->getDescription(),
-        ],
-    ];
+        $data = [
+            'data' => [
+                'id'          => $series->getId(),
+                'name'        => $series->getName(),
+                'description' => $series->getDescription(),
+            ],
+        ];
 
-    return $response->withJson($data);
-});
+        return $response->withJson($data);
+    });
 
-// Run app
-$app->run();
+    // Run app
+    $app->run();
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // End of very very very basic auth
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-else:
-http_response_code(401);
-
-endif;
+} else {
+    http_response_code(401);
+}
diff --git a/public/old/createEvent.php b/public/old/createEvent.php
index 0ed4b2d9..a833be08 100755
--- a/public/old/createEvent.php
+++ b/public/old/createEvent.php
@@ -543,38 +543,38 @@
                             }
                             $groups = GroupQuery::create()->joinWith('Group.Role')->joinWith('Role.UserRole')->find();
 
-                            foreach ($groups as $group): ?>
+                            foreach ($groups as $group) { ?>
 							<legend><?php echo $group->getName() ?></legend>
-							<?php foreach ($group->getRoles() as $role): ?>
+							<?php foreach ($group->getRoles() as $role) { ?>
 								<div class="form-group col-md-6">
 									<label><?php echo $role->getName() ?></label>
 									<select name="userRole[]" multiple="multiple" class="form-control multi" style="width:100%;" data-placeholder="Select people for <?php echo $role->getName() ?>">
 										<optgroup label="Regular">
 										<?php $countReserve = 0 ?>
-										<?php foreach ($role->getUserRoles() as $userRole): ?>
-											<?php if (!$userRole->getReserve()): ?>
+										<?php foreach ($role->getUserRoles() as $userRole) { ?>
+											<?php if (!$userRole->getReserve()) { ?>
 											<?php $isInEvent = in_array($userRole->getId(), $usersInEvent) ?>
 											<option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName().' '.$userRole->getUser()->getLastName() ?></option>
-											<?php else: ?>
+											<?php } else { ?>
 											<?php $countReserve += 1 ?>
-											<?php endif //!userRole->getReserve?>
-										<?php endforeach //users?>
+											<?php } //!userRole->getReserve?>
+										<?php } //users?>
 										</optgroup>
-										<?php if ($countReserve > 0): ?>
+										<?php if ($countReserve > 0) { ?>
 										<optgroup label="Reserve">
-										<?php foreach ($role->getUserRoles() as $userRole): ?>
-											<?php if ($userRole->getReserve()): ?>
+										<?php foreach ($role->getUserRoles() as $userRole) { ?>
+											<?php if ($userRole->getReserve()) { ?>
 											<?php $isInEvent = in_array($userRole->getId(), $usersInEvent) ?>
 											<option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName().' '.$userRole->getUser()->getLastName() ?></option>
-											<?php endif ?>
-										<?php endforeach //users?>
+											<?php } ?>
+										<?php } //users?>
 										</optgroup>
-										<?php endif //countReserve > 0?>
+										<?php } //countReserve > 0?>
 									</select>
 									</div>
-								<?php endforeach // roles?>
+								<?php } // roles?>
 
-							<?php endforeach // groups?>
+							<?php } // groups?>
 
 							<?php /*
 
diff --git a/public/old/editRole.php b/public/old/editRole.php
index 8576dc8d..0f2de861 100755
--- a/public/old/editRole.php
+++ b/public/old/editRole.php
@@ -146,7 +146,7 @@
 
 				<div class="box-body">
 
-					<?php foreach ($users as $user): ?>
+					<?php foreach ($users as $user) { ?>
 					<div class='checkbox'>
 						<label for='user[<?php echo $user['id']; ?>]'>
 							<input
@@ -159,7 +159,7 @@
 							<?php echo $user['name']; ?>
 						</label>
 					</div>
-					<?php endforeach ?>
+					<?php } ?>
 
 				</div>
 				<div class="box-footer">
diff --git a/public/old/editeventtype.php b/public/old/editeventtype.php
index c86f3b97..8fad0169 100755
--- a/public/old/editeventtype.php
+++ b/public/old/editeventtype.php
@@ -74,7 +74,7 @@
 // ~~~~~~~~~~ PRESENTATION ~~~~~~~~~~
 
 include 'includes/header.php';
-?>
+?>
 
 <!-- Content Wrapper. Contains page content -->
 <div class="content-wrapper">
@@ -95,7 +95,7 @@
 
 <div class="row">
 	<div class="col-sm-6">
-		<?php foreach ($eventTypes as $eventType): ?>
+		<?php foreach ($eventTypes as $eventType) { ?>
 		<div class="box box-primary">
 				<div class="box-header">
 					<h2 class="box-title"><?php echo $eventType->getName() ?></h2>
@@ -117,7 +117,7 @@
 				</a>
 			</div>
 		</div><!-- /.box -->
-		<?php endforeach ?>
+		<?php } ?>
 	</div><!-- /.col -->
 
 	<div class="col-sm-6">
@@ -153,9 +153,9 @@
 						<select name="defaultLocation" id="defaultLocation" class="form-control">
 							<option value="">No default location</option>
 							<?php $locations = LocationQuery::create()->find();
-                            foreach ($locations as $location): ?>
+                            foreach ($locations as $location) { ?>
 									<option value="<?php echo $location->getId() ?>"><?php echo $location->getName() ?></option>
-							<?php endforeach ?>
+							<?php } ?>
 						</select>
 					</div>
 				</div><!-- /.box-body -->
@@ -170,10 +170,10 @@
 </div><!-- /.row -->
 <?php
 if (isAdmin()) {
-                                ?>
+                                ?>
 <div id="right">
 		<div class="item"><a href="settings.php">Back to settings</a></div>
 </div>
 <?php
-                            } ?>
-<?php include 'includes/footer.php'; ?>
+                            } ?>
+<?php include 'includes/footer.php'; ?>
diff --git a/public/old/emailEvent.php b/public/old/emailEvent.php
index e24cce95..52c25c47 100644
--- a/public/old/emailEvent.php
+++ b/public/old/emailEvent.php
@@ -121,13 +121,13 @@
           <h2 class="box-title">Send to everyone involved in the event who is in the groups</h2>
         </div>
         <div class="box-body">
-          <?php if (count($groups) > 0): ?>
-            <?php foreach ($groups as $group): ?>
+          <?php if (count($groups) > 0) { ?>
+            <?php foreach ($groups as $group) { ?>
               <div>
                 <label><input type="checkbox" name="group[]" value="<?php echo $group->id ?>"> <?php echo $group->name ?> (<?php echo $group->users ?>)</label>
               </div>
-            <?php endforeach; ?>
-          <?php endif; ?>
+            <?php } ?>
+          <?php } ?>
         </div>
       </div>
       <div class="box box-primary">
diff --git a/public/old/emailGroup.php b/public/old/emailGroup.php
index 58eee33b..bb5199d1 100644
--- a/public/old/emailGroup.php
+++ b/public/old/emailGroup.php
@@ -110,13 +110,13 @@
           <h2 class="box-title">Send to</h2>
         </div>
         <div class="box-body">
-          <?php if (count($groups) > 0): ?>
-            <?php foreach ($groups as $group): ?>
+          <?php if (count($groups) > 0) { ?>
+            <?php foreach ($groups as $group) { ?>
               <div>              
                 <label><input type="checkbox" name="group[]" value="<?php echo $group->id ?>"> <?php echo $group->name ?> (<?php echo $group->users ?>)</label>
               </div>
-            <?php endforeach; ?>
-          <?php endif; ?>
+            <?php } ?>
+          <?php } ?>
         </div>
       </div>
       <div class="box box-primary">
diff --git a/public/old/includes/footer.php b/public/old/includes/footer.php
index 621c8d96..9fa5ab27 100755
--- a/public/old/includes/footer.php
+++ b/public/old/includes/footer.php
@@ -21,7 +21,7 @@
     along with Church Rota.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-?>
+?>
 
 </section><!-- /.content -->
 </div><!-- /.content-wrapper -->
@@ -118,9 +118,11 @@
 
 <script src="js/general.js"></script>
 
-<?php if (!empty($jsToInclude)): foreach ($jsToInclude as $jsInclude): ?>
+<?php if (!empty($jsToInclude)) {
+    foreach ($jsToInclude as $jsInclude) { ?>
 <script src="js/<?php echo $jsInclude; ?>.js"></script>
-<?php endforeach; endif; ?>
+<?php }
+} ?>
 
 <!-- Optionally, you can add Slimscroll and FastClick plugins.
 	 Both of these plugins are recommended to enhance the
diff --git a/public/old/includes/functions.database.php b/public/old/includes/functions.database.php
index 3569471d..0da7d288 100755
--- a/public/old/includes/functions.database.php
+++ b/public/old/includes/functions.database.php
@@ -153,7 +153,8 @@ function updateDatabase()
             insertStatistics('system', __FILE__, 'db-update', '2.3.3', $version);
         case '2.3.3':
             if (substr($mysqli_version, 0, 1) == 5) {
-                executeDbSql("
+                executeDbSql(
+                    "
 					CREATE FUNCTION getBrowserInfo (user_agent VARCHAR(255)) RETURNS VARCHAR(100) DETERMINISTIC
 					 BEGIN
 					  DECLARE v_browser,v_os VARCHAR(20);
@@ -194,7 +195,7 @@ function updateDatabase()
 					
 					  RETURN CONCAT(v_browser ,' / ',v_os);
 					END;"
-                    );
+                );
             }
             executeDbSql("update settings set version = '2.3.4'");
             notifyInfo(__FILE__, 'db-update='.$version.'->2.3.4', $_SESSION['userid']);
@@ -228,7 +229,8 @@ function updateDatabase()
         case '2.4.4':
             if (substr($mysqli_version, 0, 1) == 5) {
                 executeDbSql('DROP FUNCTION getBrowserInfo');
-                executeDbSql("
+                executeDbSql(
+                    "
 					CREATE FUNCTION getBrowserInfo (user_agent VARCHAR(255)) RETURNS VARCHAR(100) DETERMINISTIC
 					 BEGIN
 					  DECLARE v_browser,v_os VARCHAR(20);
diff --git a/public/old/includes/functions.discussion.php b/public/old/includes/functions.discussion.php
index 4a39c7c9..af0aafa5 100755
--- a/public/old/includes/functions.discussion.php
+++ b/public/old/includes/functions.discussion.php
@@ -45,8 +45,8 @@ function youtubeReplace($string)
     return preg_replace(
         '#(http://(www.)?youtube.com)?/(v/|watch\?v\=)([-|~_0-9A-Za-z]+)&?.*?#i',
         '<iframe title="YouTube Video" width="560" height="340" src="http://www.youtube.com/embed/$4" frameborder="0" allowfullscreen></iframe>',
-    $string
-  );
+        $string
+    );
 
     return $string;
 }
diff --git a/public/old/includes/functions.facebook.php b/public/old/includes/functions.facebook.php
index 353a9e92..bc9eab13 100644
--- a/public/old/includes/functions.facebook.php
+++ b/public/old/includes/functions.facebook.php
@@ -16,10 +16,10 @@ function facebookIsEnabled()
 function facebook()
 {
     $fb = new Facebook\Facebook([
-      'app_id'                => siteConfig()['auth']['facebook']['appId'],
-      'app_secret'            => siteConfig()['auth']['facebook']['appSecret'],
-      'default_graph_version' => 'v2.2',
-      ]);
+        'app_id'                => siteConfig()['auth']['facebook']['appId'],
+        'app_secret'            => siteConfig()['auth']['facebook']['appSecret'],
+        'default_graph_version' => 'v2.2',
+    ]);
 
     return $fb;
 }
diff --git a/public/old/includes/functions.mail.php b/public/old/includes/functions.mail.php
index bdf0002c..00be7df3 100755
--- a/public/old/includes/functions.mail.php
+++ b/public/old/includes/functions.mail.php
@@ -162,9 +162,9 @@ function sendViaMailgun($to, $subject, $message, $from, $bcc = '')
     $domain = siteConfig()['email']['mailgun']['domain'];
 
     $status = $mg->sendMessage($domain, ['from'                               => $from,
-                                                                    'to'      => $to,
-                                                                    'subject' => $subject,
-                                                                    'text'    => $message, ]);
+        'to'                                                                  => $to,
+        'subject'                                                             => $subject,
+        'text'                                                                => $message, ]);
 
     if ($status->http_response_code = 200) {
         return true;
@@ -263,12 +263,13 @@ function emailTemplate($message, $name, $date, $location, $rehearsal, $rotaoutpu
     $message = str_replace('[date]', $date, $message);
     $message = str_replace('[location]', $location, $message);
     $message = str_replace('[rehearsal]', $rehearsal, $message);
-    if (is_array($rotaoutput)):
-        foreach ($rotaoutput as $key => $skill):
+    if (is_array($rotaoutput)) {
+        foreach ($rotaoutput as $key => $skill) {
             $skillfinal = $skillfinal.$skill.' ';
-    endforeach; else:
+        }
+    } else {
         $skillfinal = $rotaoutput;
-    endif;
+    }
     $message = str_replace('[rotaoutput]', $skillfinal, $message);
     $message = str_replace('[siteurl]', $siteurl, $message);
     $message = str_replace('[username]', $username, $message);
@@ -440,10 +441,11 @@ function notifyEveryoneForEvent($eventId)
             $roleResult = mysqli_query(db(), $roleSql) or die(mysqli_error(db()));
             $roles = [];
             while ($roleRow = mysqli_fetch_array($roleResult, MYSQLI_ASSOC)) {
-                if (($roleRow['name'] == '') || ($roleRow['name'] == $roleRow['description'])):
-                    $roles[] = $roleRow['description']; else:
+                if (($roleRow['name'] == '') || ($roleRow['name'] == $roleRow['description'])) {
+                    $roles[] = $roleRow['description'];
+                } else {
                     $roles[] = $roleRow['description'].' - '.$roleRow['name'];
-                endif;
+                }
             }
 
             $updateID = $ob->userId;
diff --git a/public/old/includes/functions.notifications.php b/public/old/includes/functions.notifications.php
index 4af84860..d68886ca 100644
--- a/public/old/includes/functions.notifications.php
+++ b/public/old/includes/functions.notifications.php
@@ -5,17 +5,17 @@
 function swapTypesArray()
 {
     return [
-    0 => 'general',
-    1 => 'admin',
-    2 => 'feature',
-    3 => 'event',
-    4 => 'reminder',
-    5 => 'account',
-    6 => 'swap',
-    7 => 'swap-pending',
-    8 => 'swap-approved',
-    9 => 'email',
-  ];
+        0 => 'general',
+        1 => 'admin',
+        2 => 'feature',
+        3 => 'event',
+        4 => 'reminder',
+        5 => 'account',
+        6 => 'swap',
+        7 => 'swap-pending',
+        8 => 'swap-approved',
+        9 => 'email',
+    ];
 }
 
 function createNotificationForUser($userId, $summary, $body, $typeName, $link = null)
diff --git a/public/old/includes/header.php b/public/old/includes/header.php
index 09458bc9..eef42b06 100755
--- a/public/old/includes/header.php
+++ b/public/old/includes/header.php
@@ -277,7 +277,7 @@
 
 						<!-- Notifications Menu -->
 						<?php
-                        if (isset($_SESSION['userid'])):
+                        if (isset($_SESSION['userid'])) {
                             $userId = $_SESSION['userid'];
                             $sql = "SELECT id, timestamp, summary, body, link, seen FROM notifications WHERE userId = '$userId' AND dismissed = FALSE AND archived = FALSE ORDER BY id DESC";
 
@@ -290,8 +290,7 @@
                                 if ($ob->seen == false) {
                                     $unseen += 1;
                                 }
-                            }
-                        ?>
+                            } ?>
 						<li class="dropdown notifications-menu">
 							<!-- Menu toggle button -->
 							<a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -303,21 +302,21 @@
 								<li>
 									<!-- Inner Menu: contains the notifications -->
 									<ul class="menu">
-									<?php foreach ($notifications as $n): ?>
+									<?php foreach ($notifications as $n) { ?>
 										<li><!-- start notification -->
 											<a href="notification.php?click=notifications-panel&id=<?php echo $n->id ?>">
 												<i class="fa fa-users text-aqua"></i> <?php echo $n->seen ? $n->summary : '<strong>'.$n->summary.'</strong>' ?>
 												<small><?php echo timeAgoInWords($n->timestamp) ?></small>
 											</a>
 										</li><!-- end notification -->
-									<?php endforeach; ?>
+									<?php } ?>
 									</ul>
 								</li>
 								<li class="footer"><a href="#">View all (comming soon...)</a></li>
 							</ul>
 						</li>
 						<?php
-                        endif;
+                        }
 
                         /*
                         <!-- Tasks Menu -->
@@ -357,7 +356,7 @@
                         </li>
                         */
 
-                        if (isset($_SESSION['userid'])): ?>
+                        if (isset($_SESSION['userid'])) { ?>
 						<!-- User Account Menu -->
 						<li class="dropdown user user-menu">
 							<?php
@@ -405,7 +404,7 @@
 								</li>
 							</ul>
 						</li>
-						<?php endif; ?>
+						<?php } ?>
 
 						<!-- Control Sidebar Toggle Button -->
 						<li>
@@ -486,11 +485,11 @@
 								<li <?php echo empty($filter) && isset($view) && $view == 'all' ? 'class="active"' : '' ?>>
 									<a href="../events">View All</a>
 								</li>
-								<?php if (isAdmin()) : ?>
+								<?php if (isAdmin()) { ?>
 								<li <?php echo basename($_SERVER['SCRIPT_FILENAME']) == 'createEvent.php' && is_null(getQueryStringForKey('id')) ? 'class="active"' : '' ?>>
 									<a href="createEvent.php">Add Event</a>
 								</li>
-								<?php endif ?>
+								<?php } ?>
 						</ul>
 					</li>
 					<?php
@@ -503,9 +502,9 @@
                         echo basename($_SERVER['SCRIPT_FILENAME']) == 'locations.php' ? 'class="active"' : ''; ?>><a href="settings.php"><i class="fa fa-gears"></i> <span>Settings</span></a></li>
 					<?php
                     }  ?>
-					<?php if (!isLoggedIn()) : ?>
+					<?php if (!isLoggedIn()) { ?>
           <li <?php echo basename($_SERVER['SCRIPT_FILENAME']) == 'login.php' ? 'class="active"' : ''; ?>><a href="login.php">Login</a></li>
-          <?php endif; ?>
+          <?php } ?>
 				</ul>
       </section>
 		</aside>
diff --git a/public/old/license.php b/public/old/license.php
index b0245221..389e3103 100755
--- a/public/old/license.php
+++ b/public/old/license.php
@@ -22,7 +22,7 @@
     You should have received a copy of the GNU General Public License
     along with Church Rota.  If not, see <http://www.gnu.org/licenses/>.
 */
-include 'includes/header.php'; ?>
+include 'includes/header.php'; ?>
 <div class="elementBackground">
 <h2>License</h2>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;GNU GENERAL PUBLIC LICENSE<br>
diff --git a/public/old/linkSocialAuth.php b/public/old/linkSocialAuth.php
index c97c2dca..ac5face1 100644
--- a/public/old/linkSocialAuth.php
+++ b/public/old/linkSocialAuth.php
@@ -88,37 +88,37 @@
 	<!-- Main content -->
 	<section class="content">
 
-<?php if (empty($possibleAccounts)): ?>
+<?php if (empty($possibleAccounts)) { ?>
   <div class="alert alert-warning">
     <h4><i class="icon fa fa-info"></i>Social login has not been enabled.</h4>
     <p>Speak with your site administrator if you think this feature should be enabled.</p>
   </div>
-<?php endif; ?>
+<?php } ?>
 
-<?php foreach ($possibleAccounts as $platform): ?>
+<?php foreach ($possibleAccounts as $platform) { ?>
 <div class="box box-primary">
   <div class="box-header">
     <h3 class="box-title"><?php echo $platform ?></h3>
   </div>
   <div class="box-body">
-    <?php if (userIsLinkedToPlatform($id, $platform)): ?>
+    <?php if (userIsLinkedToPlatform($id, $platform)) { ?>
     <form action="#" method="post">
       <input type="hidden" name="id" value="<?php echo $id ?>" />
       <input type="hidden" name="platform" value="<?php echo $platform ?>" />
       <input type="hidden" name="action" value="unlink" />
       <button class="btn btn-danger">Unlink</button>
     </form>
-    <?php else: ?>
+    <?php } else { ?>
     <form action="#" method="post">
       <input type="hidden" name="id" value="<?php echo $id ?>" />
       <input type="hidden" name="platform" value="<?php echo $platform ?>" />
       <input type="hidden" name="action" value="link" />
       <button class="btn btn-primary">Link</button>
     </form>
-    <?php endif; ?>
+    <?php } ?>
   </div>
 </div>
-<?php endforeach; ?>
+<?php } ?>
     
 
 <?php include 'includes/footer.php';
diff --git a/public/old/overview.php b/public/old/overview.php
index 1d907592..94d64dea 100755
--- a/public/old/overview.php
+++ b/public/old/overview.php
@@ -89,7 +89,7 @@
 			<div class="box-header with-border">
 				<h2 class="box-title"><?php echo $title; ?></h2>
 			</div>
-		  <?php if ($sentSuccess == ''): ?>
+		  <?php if ($sentSuccess == '') { ?>
 			<form action="#" method="post" id="settings">
 				<fieldset>
 					<div class="box-body">
@@ -116,9 +116,9 @@
 			</form>
 
 		  <?php
-            else:
+            } else {
                 echo '<div class="box-body">'.$sentSuccess.'</div>';
-            endif;
+            }
             ?>
 				</div>
 			</div>
diff --git a/public/old/pendingAccounts.php b/public/old/pendingAccounts.php
index c5f45243..e866c0fe 100644
--- a/public/old/pendingAccounts.php
+++ b/public/old/pendingAccounts.php
@@ -102,7 +102,7 @@
     <p><strong>Source:</strong> <?php echo $user->source ?></p>
 
   </div>
-  <?php if ($buttonsVisible == true): ?>
+  <?php if ($buttonsVisible == true) { ?>
   <div class="box-footer">
     <form action="#" method="post">
       <input type="hidden" name="id" value="<?php echo $id ?>" />
@@ -115,10 +115,10 @@
       <button class="btn btn-danger">Delete request</button>
     </form>
   </div>
-  <?php endif; ?>
+  <?php } ?>
 </div>
 
-<?php if ($buttonsVisible == true): ?>
+<?php if ($buttonsVisible == true) { ?>
   <div class="box box-primary">
     <div class="box-header">
       <h2 class="box-title">Merge with existing user</h2>
@@ -132,9 +132,9 @@
           <select class="form-control" name="existingUser">
             <?php
             $users = allUsersNames();
-            foreach ($users as $existingUser): ?>
+            foreach ($users as $existingUser) { ?>
             <option value="<?php echo $existingUser->id?>" <?php echo($existingUser->firstName == $user->firstName) && ($existingUser->lastName == $user->lastName) ? "selected='selected'" : '' ?>><?php echo $existingUser->firstName.' '.$existingUser->lastName ?></option>
-            <?php endforeach; ?>
+            <?php } ?>
           </select>
         </div>
     </div>
@@ -143,6 +143,6 @@
       </form>
     </div>
   </div>
-<?php endif; ?>
+<?php } ?>
 
 <?php include 'includes/footer.php'; ?>
diff --git a/public/old/plugins/ckeditor/samples/old/assets/posteddata.php b/public/old/plugins/ckeditor/samples/old/assets/posteddata.php
index 2d7e01f9..dfb57dec 100755
--- a/public/old/plugins/ckeditor/samples/old/assets/posteddata.php
+++ b/public/old/plugins/ckeditor/samples/old/assets/posteddata.php
@@ -4,7 +4,7 @@
 Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-?>
+?>
 <html>
 <head>
 	<meta charset="utf-8">
@@ -35,7 +35,7 @@
             $value = htmlspecialchars(stripslashes((string) $value));
         } else {
             $value = htmlspecialchars((string) $value);
-        } ?>
+        } ?>
 		<tr>
 			<th style="vertical-align: top"><?php echo htmlspecialchars((string) $key); ?></th>
 			<td><pre class="samples"><?php echo $value; ?></pre></td>
@@ -43,7 +43,7 @@
 	<?php
     }
 }
-?>
+?>
 	</table>
 	<div id="footer">
 		<hr>
diff --git a/public/old/recordingUpload.php b/public/old/recordingUpload.php
index 66245e28..9393f57c 100644
--- a/public/old/recordingUpload.php
+++ b/public/old/recordingUpload.php
@@ -34,11 +34,11 @@
 
 // get token
 $response = $client->request(
-  'POST',
-  'v3/tokens.json',
-  ['form_params' => ['api_key' => siteConfig()['recording']['locomotivecms']['apiKey'],
-                       'email' => siteConfig()['recording']['locomotivecms']['email'], ]]
-  );
+    'POST',
+    'v3/tokens.json',
+    ['form_params' => ['api_key' => siteConfig()['recording']['locomotivecms']['apiKey'],
+        'email'                  => siteConfig()['recording']['locomotivecms']['email'], ]]
+);
 if ($response->getStatusCode() == 201) {
     $token = json_decode($response->getBody())->token;
 }
@@ -46,9 +46,10 @@
 // test token
 if (isset($token)) {
     $response = $client->request(
-  'GET',
-  'v3/my_account.json',
-  ['query' => ['auth_token' => $token]]);
+        'GET',
+        'v3/my_account.json',
+        ['query' => ['auth_token' => $token]]
+    );
     var_dump($response);
 } else {
     echo '<p>Unable to connect to main site</p>';
diff --git a/public/old/series.php b/public/old/series.php
index 400ca6d7..43e371ec 100644
--- a/public/old/series.php
+++ b/public/old/series.php
@@ -106,13 +106,13 @@
     } ?>
  </div><!-- /.box-body -->
 </div><!-- /.box -->
-<?php if (!empty($message)):?>
+<?php if (!empty($message)) { ?>
 	<div class="alert alert-danger alert-dismissable">
 		<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
 		<h4><i class="icon fa fa-exclamation-triangle"></i> Error</h4>
 		<?php echo $message; ?>
 	</div>
-<?php endif; ?>
+<?php } ?>
 <div class="box box-primary">
  <div class="box-header">
 	 <h2 class="box-title">Add Series:</h2>
diff --git a/public/old/settings.php b/public/old/settings.php
index feaf241a..ce0fbcfe 100755
--- a/public/old/settings.php
+++ b/public/old/settings.php
@@ -342,21 +342,21 @@
 					<label for="skin">Application skin:</label>
 					<select name="skin" id="skin" class="form-control">
 						<?php $skinOptions = ['skin-blue-light'                                           => 'Blue &amp; Light',
-                                                                    'skin-blue'         => 'Blue &amp; Dark',
-                                                                    'skin-yellow-light' => 'Yellow &amp; Light',
-                                                                    'skin-yellow'       => 'Yellow &amp; Dark',
-                                                                    'skin-green-light'  => 'Green &amp; Light',
-                                                                    'skin-green'        => 'Green &amp; Dark',
-                                                                    'skin-purple-light' => 'Purple &amp; Light',
-                                                                    'skin-purple'       => 'Purple &amp; Dark',
-                                                                    'skin-red-light'    => 'Red &amp; Light',
-                                                                    'skin-red'          => 'Red &amp; Dark',
-                                                                    'skin-black-light'  => 'Black &amp; Light',
-                                                                    'skin-black'        => 'Black &amp; Dark', ];
-
-    foreach ($skinOptions as $skinName => $skinDescription): ?>
+						    'skin-blue'                                                                   => 'Blue &amp; Dark',
+						    'skin-yellow-light'                                                           => 'Yellow &amp; Light',
+						    'skin-yellow'                                                                 => 'Yellow &amp; Dark',
+						    'skin-green-light'                                                            => 'Green &amp; Light',
+						    'skin-green'                                                                  => 'Green &amp; Dark',
+						    'skin-purple-light'                                                           => 'Purple &amp; Light',
+						    'skin-purple'                                                                 => 'Purple &amp; Dark',
+						    'skin-red-light'                                                              => 'Red &amp; Light',
+						    'skin-red'                                                                    => 'Red &amp; Dark',
+						    'skin-black-light'                                                            => 'Black &amp; Light',
+						    'skin-black'                                                                  => 'Black &amp; Dark', ];
+
+    foreach ($skinOptions as $skinName => $skinDescription) { ?>
 						<option value="<?php echo $skinName ?>" <?php echo ($skinName == $row['skin']) ? 'selected' : '' ?>><?php echo $skinDescription ?></option>
-						<?php endforeach ?>
+						<?php } ?>
 					</select>
 				</div>
 
diff --git a/public/old/swap.php b/public/old/swap.php
index dfd5338b..18923b49 100644
--- a/public/old/swap.php
+++ b/public/old/swap.php
@@ -165,15 +165,15 @@
 		<section class="content">
       
       <?php
-      if (isset($message)): ?>
+      if (isset($message)) { ?>
       
         <p><?php echo $message ?></p>
 
-      <?php elseif (isset($err)): ?>
+      <?php } elseif (isset($err)) { ?>
       
         <p><strong>Error: </strong><?php echo $err ?></p>
       
-      <?php elseif (!empty($swap)): ?>
+      <?php } elseif (!empty($swap)) { ?>
         <?php
         $canAcceptSwap = canAcceptSwap($swap->getId());
         $canDeclineSwap = canDeclineSwap($swap->getId());
@@ -198,21 +198,21 @@
             </p>
             <?php echo $statusText == 'Requested' ? '<p>This swap is awaiting approval</p>' : '' ?>
           </div>
-          <?php if ($canAcceptSwap || $canDeclineSwap): ?>
+          <?php if ($canAcceptSwap || $canDeclineSwap) { ?>
           <div class="box-footer">
-            <?php if ($canAcceptSwap): ?>
+            <?php if ($canAcceptSwap) { ?>
             <a class="btn btn-primary" href="swap.php?action=accept&swap=<?php echo $swap->getId() ?>">Accept</a>
-            <?php endif; ?>
-            <?php if ($canDeclineSwap): ?>
+            <?php } ?>
+            <?php if ($canDeclineSwap) { ?>
             <a class="btn" href="swap.php?action=decline&swap=<?php echo $swap->getId() ?>">Decline</a>
-            <?php endif; ?>
+            <?php } ?>
           </div>
-          <?php endif; ?>
+          <?php } ?>
         </div>
         
-      <?php elseif ($numberOfRoles > 0): ?>
+      <?php } elseif ($numberOfRoles > 0) { ?>
             
-        <?php foreach ($roles as $role): ?>
+        <?php foreach ($roles as $role) { ?>
         
         <form action="swap.php?action=swap" method="post" role="form">
           <div class="box box-primary">
@@ -248,11 +248,11 @@
           </div>
         </form> 
         
-        <?php endforeach; ?>
+        <?php } ?>
 
-      <?php elseif (count($roles) > 0): ?>
+      <?php } elseif (count($roles) > 0) { ?>
 
-        <?php foreach ($roles as $role): ?>
+        <?php foreach ($roles as $role) { ?>
 
         <form action="swap.php?action=swap" method="post" role="form">
           <div class="box box-primary">
@@ -271,16 +271,16 @@
           </div>
         </form> 
 
-        <?php endforeach; ?>
+        <?php } ?>
       
-      <?php else: ?>
+      <?php } else { ?>
       <?php // event has no roles the user can cover?>
       
       <div class="alert alert-warning">
         <h4><i class="icon fa fa-info"></i>There are no roles in the event you are skilled to cover.</h4>
         <p>If you need adding to the rota, speak to an admin.</p>
       </div>
-      <?php endif; ?>
+      <?php } ?>
 
 
 <?php include 'includes/footer.php'; ?>
diff --git a/public/old/swaps.php b/public/old/swaps.php
index 9426c8d8..aca9d191 100644
--- a/public/old/swaps.php
+++ b/public/old/swaps.php
@@ -79,7 +79,7 @@
 
       <div class="row">
         <div class="col-sm-6">
-          <?php foreach ($swaps as $swap):?>
+          <?php foreach ($swaps as $swap) { ?>
           <?php $event = $swap->getEventPerson()->getEvent() ?>
           <div class="box box-primary">
             <div class="box-header with-border">
@@ -105,20 +105,20 @@
             $canAcceptSwap = canAcceptSwap($swap->getId());
             $canDeclineSwap = canDeclineSwap($swap->getId());
             ?>
-            <?php if ($canAcceptSwap || $canDeclineSwap): ?>
+            <?php if ($canAcceptSwap || $canDeclineSwap) { ?>
             <div class="box-footer">
-              <?php if ($canAcceptSwap): ?>
+              <?php if ($canAcceptSwap) { ?>
               <a class="btn btn-primary" href="swap.php?action=accept&swap=<?php echo $swap->getId() ?>">Accept</a>
-              <?php endif; ?>
-              <?php if ($canDeclineSwap): ?>
+              <?php } ?>
+              <?php if ($canDeclineSwap) { ?>
               <a class="btn" href="swap.php?action=decline&swap=<?php echo $swap->getId() ?>">Decline</a>
-              <?php endif; ?>
+              <?php } ?>
             </div>
-            <?php endif; ?>
+            <?php } ?>
 
 
           </div>
-          <?php endforeach; ?>
+          <?php } ?>
         </div>
       </div>
 
diff --git a/public/plugins/ckeditor/samples/old/assets/posteddata.php b/public/plugins/ckeditor/samples/old/assets/posteddata.php
index 2d7e01f9..dfb57dec 100755
--- a/public/plugins/ckeditor/samples/old/assets/posteddata.php
+++ b/public/plugins/ckeditor/samples/old/assets/posteddata.php
@@ -4,7 +4,7 @@
 Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-?>
+?>
 <html>
 <head>
 	<meta charset="utf-8">
@@ -35,7 +35,7 @@
             $value = htmlspecialchars(stripslashes((string) $value));
         } else {
             $value = htmlspecialchars((string) $value);
-        } ?>
+        } ?>
 		<tr>
 			<th style="vertical-align: top"><?php echo htmlspecialchars((string) $key); ?></th>
 			<td><pre class="samples"><?php echo $value; ?></pre></td>
@@ -43,7 +43,7 @@
 	<?php
     }
 }
-?>
+?>
 	</table>
 	<div id="footer">
 		<hr>
diff --git a/src/classes/Controller/InstallController.php b/src/classes/Controller/InstallController.php
index d4671d0d..92c186da 100644
--- a/src/classes/Controller/InstallController.php
+++ b/src/classes/Controller/InstallController.php
@@ -184,7 +184,8 @@ protected function populateDefaultSettings()
         $settings->setDateOnlyFormat('%A');
         $settings->setDayOnlyFormat('%A, %B %e');
 
-        $settings->setNotificationEmail(<<<'EMAIL'
+        $settings->setNotificationEmail(
+            <<<'EMAIL'
 Dear [name]
 
 This is an automatic reminder.
@@ -197,7 +198,7 @@ protected function populateDefaultSettings()
 
 Many thanks for your continued service!
 EMAIL
-);
+        );
 
         $settings->setToken(Crypt::generateToken(100));
         $settings->setSkin('skin-blue');
diff --git a/tests/Integration/BaseTestCase.php b/tests/Integration/BaseTestCase.php
index 5e80c49d..4312b20d 100644
--- a/tests/Integration/BaseTestCase.php
+++ b/tests/Integration/BaseTestCase.php
@@ -125,16 +125,16 @@ protected function loadDatabase()
         $serviceContainer->setAdapterClass('default', 'sqlite');
         $manager = new ConnectionManagerSingle();
         $manager->setConfiguration([
-        'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
-        'dsn'        => 'sqlite:/var/tmp/test.db',
-        'attributes' => [
-            'ATTR_EMULATE_PREPARES' => false,
-            'ATTR_TIMEOUT'          => 30,
-        ],
-        'model_paths' => [
-            0 => 'src',
-            1 => 'vendor',
-        ],
+            'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
+            'dsn'        => 'sqlite:/var/tmp/test.db',
+            'attributes' => [
+                'ATTR_EMULATE_PREPARES' => false,
+                'ATTR_TIMEOUT'          => 30,
+            ],
+            'model_paths' => [
+                0 => 'src',
+                1 => 'vendor',
+            ],
         ]);
         $manager->setName('default');
         $serviceContainer->setConnectionManager('default', $manager);
@@ -151,9 +151,9 @@ protected function installDatabase()
         $sqlManager = new SqlManager();
         $sqlManager->setConnections(
             ['default' => [
-                    'dsn'     => 'sqlite:/var/tmp/test.db',
-                    'adapter' => 'sqlite',
-                ],
+                'dsn'     => 'sqlite:/var/tmp/test.db',
+                'adapter' => 'sqlite',
+            ],
             ]
         );
         $sqlManager->setWorkingDirectory(__DIR__.'/../../generated-sql');
diff --git a/tests/Unit/BaseTestCase.php b/tests/Unit/BaseTestCase.php
index 73afcf5d..555799e2 100644
--- a/tests/Unit/BaseTestCase.php
+++ b/tests/Unit/BaseTestCase.php
@@ -18,16 +18,16 @@
 $serviceContainer->setAdapterClass('default', 'sqlite');
 $manager = new \Propel\Runtime\Connection\ConnectionManagerSingle();
 $manager->setConfiguration([
-  'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
-  'dsn'        => 'sqlite:/var/tmp/test.db',
-  'attributes' => [
-    'ATTR_EMULATE_PREPARES' => false,
-    'ATTR_TIMEOUT'          => 30,
-  ],
-  'model_paths' => [
-    0 => 'src',
-    1 => 'vendor',
-  ],
+    'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
+    'dsn'        => 'sqlite:/var/tmp/test.db',
+    'attributes' => [
+        'ATTR_EMULATE_PREPARES' => false,
+        'ATTR_TIMEOUT'          => 30,
+    ],
+    'model_paths' => [
+        0 => 'src',
+        1 => 'vendor',
+    ],
 ]);
 $manager->setName('default');
 $serviceContainer->setConnectionManager('default', $manager);
@@ -36,9 +36,9 @@
 $sqlManager = new \Propel\Generator\Manager\SqlManager();
 $sqlManager->setConnections(
     ['default' => [
-            'dsn'     => 'sqlite:/var/tmp/test.db',
-            'adapter' => 'sqlite',
-        ],
+        'dsn'     => 'sqlite:/var/tmp/test.db',
+        'adapter' => 'sqlite',
+    ],
     ]
 );
 $sqlManager->setWorkingDirectory(__DIR__.'/../../generated-sql');
diff --git a/tests/Unit/CryptTest.php b/tests/Unit/CryptTest.php
index 129060aa..77945638 100644
--- a/tests/Unit/CryptTest.php
+++ b/tests/Unit/CryptTest.php
@@ -9,16 +9,16 @@ class CryptTest extends BaseTestCase
     public function providerTestGenerateToken()
     {
         return [
-      [1],
-      [2],
-      [5],
-      [7],
-      [9],
-      [22],
-      [60],
-      [120],
-      [246],
-    ];
+            [1],
+            [2],
+            [5],
+            [7],
+            [9],
+            [22],
+            [60],
+            [120],
+            [246],
+        ];
     }
 
     /**
@@ -38,13 +38,13 @@ public function testGenerateToken($length)
     public function providerTestGenerateIntBetween()
     {
         return [
-      [1, 2],
-      [1, 100],
-      [2, 43],
-      [5, 555],
-      [7, 9233],
-      [5500, 6703],
-    ];
+            [1, 2],
+            [1, 100],
+            [2, 43],
+            [5, 555],
+            [7, 9233],
+            [5500, 6703],
+        ];
     }
 
     /**
@@ -66,9 +66,9 @@ public function testGenerateIntBetween($min, $max)
     public function providerTestGenerateIntInvalidConstraints()
     {
         return [
-      [100, 1],
-      [2, 2],
-    ];
+            [100, 1],
+            [2, 2],
+        ];
     }
 
     /**
diff --git a/tests/Unit/EmailAddressTest.php b/tests/Unit/EmailAddressTest.php
index 521d8b9c..015e7387 100644
--- a/tests/Unit/EmailAddressTest.php
+++ b/tests/Unit/EmailAddressTest.php
@@ -9,9 +9,9 @@ class EmailAddressTest extends BaseTestCase
     public function providerTestValidEmails()
     {
         return [
-      ['test@example.com'],
-      ['no-password@email.com'],
-    ];
+            ['test@example.com'],
+            ['no-password@email.com'],
+        ];
     }
 
     /**
@@ -29,10 +29,10 @@ public function testValidEmails($email)
     public function providerTestInvalidEmails()
     {
         return [
-      ['not-an-email'],
-      ['another-not-an-email'],
-      [''],
-    ];
+            ['not-an-email'],
+            ['another-not-an-email'],
+            [''],
+        ];
     }
 
     /**