TechWilk / rota

src/classes/Controller/NotificationController.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 {
     public function getNotificationClick(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch settings GET '/notification/".$args['id']."'");
+        $this->logger->info("Fetch settings GET '/notification/" . $args['id'] . "'");
 
         $n = NotificationQuery::create()->findPk($args['id']);
         $click = new NotificationClick();
@@ -31,7 +31,7 @@ 
 
                 return $response->withStatus(302)->withHeader('Location', $this->router->pathFor($link['route'], $link['attributes']));
             } else {
-                return $response->withStatus(302)->withHeader('Location', $this->router->pathFor('home').$n->getLink());
+                return $response->withStatus(302)->withHeader('Location', $this->router->pathFor('home') . $n->getLink());
             }
         }
 

src/classes/Controller/AvailabilityController.php

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
 {
     public function getAvailabilityForm(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch user availability GET '/user/".$args['id']."/availability'");
+        $this->logger->info("Fetch user availability GET '/user/" . $args['id'] . "/availability'");
 
         $u = UserQuery::create()->findPk($args['id']);
 
@@ -33,7 +33,7 @@ 
 
     public function postAvailability(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Update user availability POST '/user/".$args['id']."/availability'");
+        $this->logger->info("Update user availability POST '/user/" . $args['id'] . "/availability'");
 
         $u = UserQuery::create()
             ->findPk($args['id']);
@@ -62,8 +62,8 @@ 
                 $a->setAvailable(false);
             }
 
-            if (strlen($data['event'.$eventId.'comment']) > 0) {
-                $a->setComment($data['event'.$eventId.'comment']);
+            if (strlen($data['event' . $eventId . 'comment']) > 0) {
+                $a->setComment($data['event' . $eventId . 'comment']);
             } else {
                 $a->setComment(null);
             }

src/classes/Controller/RoleController.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 {
     public function getAssignRolesForm(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch user GET '/user/".$args['id']."/roles'");
+        $this->logger->info("Fetch user GET '/user/" . $args['id'] . "/roles'");
         $r = RoleQuery::create()->find();
         $u = UserQuery::create()->findPK($args['id']);
 
@@ -26,7 +26,7 @@ 
 
     public function postUserAssignRoles(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Create user people POST '/user/".$args['id']."/roles'");
+        $this->logger->info("Create user people POST '/user/" . $args['id'] . "/roles'");
 
         $userId = filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
         $existingRoles = RoleQuery::create()->useUserRoleQuery()->filterByUserId($userId)->endUse()->find();

src/classes/Controller/CalendarController.php

Spacing +3 added lines, -3 removed lines

@@ -76,7 +76,7 @@ 
 
     public function getRevokeCalendar(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch settings GET '/user/me/calendar/".$args['id']."/revoke'");
+        $this->logger->info("Fetch settings GET '/user/me/calendar/" . $args['id'] . "/revoke'");
 
         $auth = $this->auth;
         $u = $auth->currentUser();
@@ -101,7 +101,7 @@ 
 
     public function getRenderedCalendar(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch calendar GET '/calendar/".$args['token'].'.'.$args['format']."'");
+        $this->logger->info("Fetch calendar GET '/calendar/" . $args['token'] . '.' . $args['format'] . "'");
 
         $c = CalendarTokenQuery::create()
             ->filterByToken($args['token'])
@@ -118,7 +118,7 @@ 
     {
         $getParameters = $request->getQueryParams();
 
-        $this->logger->info("Fetch -LEGACY- calendar GET '/calendar.php?user=".$getParameters['user'].'&token='.$getParameters['token'].'&format='.$getParameters['format']."'");
+        $this->logger->info("Fetch -LEGACY- calendar GET '/calendar.php?user=" . $getParameters['user'] . '&token=' . $getParameters['token'] . '&format=' . $getParameters['format'] . "'");
 
         $userId = filter_var($getParameters['user'], FILTER_VALIDATE_INT);
         $token = $getParameters['token'];

src/classes/Controller/ResourceController.php

Spacing +7 added lines, -7 removed lines

@@ -61,7 +61,7 @@ 
 
     public function getResourceEditForm(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch resource GET '/resource/".$args['id']."/edit'");
+        $this->logger->info("Fetch resource GET '/resource/" . $args['id'] . "/edit'");
         $d = DocumentQuery::create()->findPK($args['id']);
 
         if (!is_null($d)) {
@@ -73,14 +73,14 @@ 
 
     public function getResourceFile(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch resource GET '/resource/".$args['id']."'");
+        $this->logger->info("Fetch resource GET '/resource/" . $args['id'] . "'");
         $resource = DocumentQuery::create()->findPk($args['id']);
 
         if (!is_null($resource)) {
-            if (file_exists(__DIR__.'/../documents/'.$resource->getUrl())) {
-                $file = __DIR__.'/../documents/'.$resource->getUrl();
-            } elseif (file_exists(__DIR__.'/../documents/'.$resource->getId())) {
-                $file = __DIR__.'/../documents/'.$resource->getId();
+            if (file_exists(__DIR__ . '/../documents/' . $resource->getUrl())) {
+                $file = __DIR__ . '/../documents/' . $resource->getUrl();
+            } elseif (file_exists(__DIR__ . '/../documents/' . $resource->getId())) {
+                $file = __DIR__ . '/../documents/' . $resource->getId();
             } else {
                 return $this->view->render($response, 'error.twig');
             }
@@ -94,7 +94,7 @@ 
                             ->withHeader('Content-Type', 'application/download')
                             ->withHeader('Content-Description', 'File Transfer')
                             ->withHeader('Content-Transfer-Encoding', 'binary')
-                            ->withHeader('Content-Disposition', 'attachment; filename="'.$resource->getUrl().'"')
+                            ->withHeader('Content-Disposition', 'attachment; filename="' . $resource->getUrl() . '"')
                             ->withHeader('Expires', '0')
                             ->withHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
                             ->withHeader('Pragma', 'public')

src/classes/EmailAddress.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
         if (filter_var(trim($email), FILTER_VALIDATE_EMAIL)) {
             $this->email = filter_var(trim($email), FILTER_SANITIZE_EMAIL);
         } else {
-            throw new InvalidArgumentException('Invalid email address: '.$email);
+            throw new InvalidArgumentException('Invalid email address: ' . $email);
         }
     }
 

src/middleware.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 // e.g: $app->add(new \Slim\Csrf\Guard);
 
 // 3) add route information to twig
-$app->add(function (Request $request, Response $response, callable $next) {
+$app->add(function(Request $request, Response $response, callable $next) {
     $route = $request->getAttribute('route');
 
     // return NotFound for non existent route

api-classes/Database.php

Doc Comments +11 added lines

@@ -148,6 +148,12 @@ 
         return $statement->fetchAll(PDO::FETCH_CLASS, $returnClass);
     }
 
+    /**
+     * @param string $returnClass
+     * @param string $table
+     * @param string[] $columns
+     * @param string[] $where
+     */
     public function selectSingle($returnClass, $table, $columns, $where = null)
     {
         $statement = $this->selectStatement($table, $columns, $where);
@@ -215,6 +221,8 @@ 
 
     /**
      * Use with caution: it is often better to archive items to prevent creating null references.
+     * @param string $table
+     * @param string[] $where
      */
     public function delete($table, $where)
     {
@@ -253,6 +261,9 @@ 
         return $table;
     }
 
+    /**
+     * @param string $table
+     */
     private function tableExists($table)
     {
         // todo: implement table check

Indentation +2 added lines, -2 removed lines

@@ -272,8 +272,8 @@
     public function count($table, $column, $where = null)
     {
         $columns = [
-      'COUNT('.$column.') AS count',
-     ];
+        'COUNT('.$column.') AS count',
+        ];
         $statement = $this->selectStatement($table, $columns, $where);
 
         return $statement->fetchObject()->count;

Spacing +7 added lines, -7 removed lines

@@ -180,10 +180,10 @@ 
             if ($first) {
                 $first = false;
                 $fields .= $item['field'];
-                $valuesPlaceholder .= ':'.$item['field'];
+                $valuesPlaceholder .= ':' . $item['field'];
             } else {
-                $fields .= ', '.$item['field'];
-                $valuesPlaceholder .= ', :'.$item['field'];
+                $fields .= ', ' . $item['field'];
+                $valuesPlaceholder .= ', :' . $item['field'];
             }
 
             if ($item['type'] == 's' || $item['type'] == 'string') {
@@ -201,9 +201,9 @@ 
             }
         }
 
-        $statement = $this->db_connection->prepare('INSERT INTO '.$table.' ('.$fields.') VALUES ('.$valuesPlaceholder.')');
+        $statement = $this->db_connection->prepare('INSERT INTO ' . $table . ' (' . $fields . ') VALUES (' . $valuesPlaceholder . ')');
         foreach ($data as $item) {
-            $statement->bindParam(':'.$item['field'], $item['value']);
+            $statement->bindParam(':' . $item['field'], $item['value']);
         }
 
         if ($statement->execute()) {
@@ -248,7 +248,7 @@ 
 
     private function addPrefix($table)
     {
-        $table = $this->db_prefix.$table;
+        $table = $this->db_prefix . $table;
 
         return $table;
     }
@@ -272,7 +272,7 @@ 
     public function count($table, $column, $where = null)
     {
         $columns = [
-      'COUNT('.$column.') AS count',
+      'COUNT(' . $column . ') AS count',
      ];
         $statement = $this->selectStatement($table, $columns, $where);
 

public/old/calendar.php

Indentation +4 added lines, -4 removed lines

@@ -51,7 +51,7 @@ 
 // fetch events
 
 switch ($_GET['format']) {
-  case 'ical':
+    case 'ical':
     icalOutput($events);
     break;
 }
@@ -125,9 +125,9 @@ 
     $value = trim($value);
     $value = strip_tags($value);
     $value = preg_replace('/\n+/', ' ', $value); // remove newlines
-  $value = preg_replace('/\s{2,}/', ' ', $value); // remove whitespace
-  $value = str_replace(',', '\,', $value); // escape commas
-  $preamble_len = strlen($preamble);
+    $value = preg_replace('/\s{2,}/', ' ', $value); // remove whitespace
+    $value = str_replace(',', '\,', $value); // escape commas
+    $preamble_len = strlen($preamble);
     $lines = [];
     while (strlen($value) > (75 - $preamble_len)) {
         $space = (75 - $preamble_len);

Spacing +11 added lines, -11 removed lines

@@ -68,7 +68,7 @@ 
 METHOD:PUBLISH
 VERSION:2.0
 PRODID:-//Church Rota//Church Rota//EN
-X-WR-CALNAME:'.siteSettings()->getOwner()." Rota
+X-WR-CALNAME:'.siteSettings()->getOwner() . " Rota
 CALSCALE:GREGORIAN
 BEGIN:VTIMEZONE
 TZID:Europe/London
@@ -94,16 +94,16 @@ 
     foreach ($events as $event):
     $output .=
 'BEGIN:VEVENT
-SUMMARY:'.$event->role.($event->name ? ' | '.$event->name.' ('.$event->type.')' : ' ('.$event->type.')').'
-DESCRIPTION:'.ical_split('DESCRIPTION:', $event->series.':\n'.$event->sermonTitle.' ('.$event->bibleVerse.')\n\nIf you are unable to do '.$event->role.' at this event, please request a swap:\n'.siteSettings()->getSiteUrl().'/swap.php?event='.$event->id.'\n\nOnce the swap is accepted, this event will be removed from your calendar.\nPlease be aware that changes may take up to 24 hours or longer to be reflected. This is due to your calendar, not on the rota system.').'
-UID:ROTA'.$event->id.'
-ORGANIZER;CN="'.siteSettings()->getOwner().'":MAILTO:'.siteSettings()->getAdminEmailAddress().'
-STATUS:'.'CONFIRMED'.'
-DTSTART;TZID="Europe/London":'.date(DATE_ICAL, strtotime($event->date)).'
-DTEND;TZID="Europe/London":'.date(DATE_ICAL, strtotime($event->date) + HOUR).'
-LAST-MODIFIED:'.date(DATE_ICAL, strtotime($event->updated)).'Z
-LOCATION:'.ical_split('LOCATION:', $event->locationName.', '.$event->locationAddress).'
-URL:'.siteSettings()->getSiteUrl().'/event.php?id='.$event->id."
+SUMMARY:'.$event->role . ($event->name ? ' | ' . $event->name . ' (' . $event->type . ')' : ' (' . $event->type . ')') . '
+DESCRIPTION:'.ical_split('DESCRIPTION:', $event->series . ':\n' . $event->sermonTitle . ' (' . $event->bibleVerse . ')\n\nIf you are unable to do ' . $event->role . ' at this event, please request a swap:\n' . siteSettings()->getSiteUrl() . '/swap.php?event=' . $event->id . '\n\nOnce the swap is accepted, this event will be removed from your calendar.\nPlease be aware that changes may take up to 24 hours or longer to be reflected. This is due to your calendar, not on the rota system.') . '
+UID:ROTA'.$event->id . '
+ORGANIZER;CN="'.siteSettings()->getOwner() . '":MAILTO:' . siteSettings()->getAdminEmailAddress() . '
+STATUS:'.'CONFIRMED' . '
+DTSTART;TZID="Europe/London":'.date(DATE_ICAL, strtotime($event->date)) . '
+DTEND;TZID="Europe/London":'.date(DATE_ICAL, strtotime($event->date) + HOUR) . '
+LAST-MODIFIED:'.date(DATE_ICAL, strtotime($event->updated)) . 'Z
+LOCATION:'.ical_split('LOCATION:', $event->locationName . ', ' . $event->locationAddress) . '
+URL:'.siteSettings()->getSiteUrl() . '/event.php?id=' . $event->id . "
 BEGIN:VALARM
 ACTION:DISPLAY
 DESCRIPTION:Reminder for Rota