mysociety / theyworkforyou

classes/SectionView/SectionView.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -512,7 +512,7 @@
             if ($row['totalcomments'] > 1) {
                 $morecount = $row['totalcomments'] - 1;
                 $plural = $morecount == 1 ? 'annotation' : 'annotations';
-                $linktext = "Read $morecount more $plural";
+                $linktext = "read $morecount more $plural";
             }
 
         } else {

Spacing +6 added lines, -6 removed lines

@@ -141,7 +141,7 @@ 
             $DATA->set_page_metadata($this_page, 'title', $year);
         }
 
-        $args =  [ 'year' => $year ];
+        $args = ['year' => $year];
         $data = $this->list->display('calendar', $args, 'none');
         return $data;
     }
@@ -149,7 +149,7 @@ 
     protected function display_column($date, $column) {
         global $this_page;
         $this_page = $this->page_base;
-        $args = [ 'date' => $date, 'column' => $column ];
+        $args = ['date' => $date, 'column' => $column];
         $content = $this->list->display('column', $args, 'none');
 
         $data = [];
@@ -169,10 +169,10 @@ 
     protected function display_day($date) {
         global $this_page;
         $this_page = $this->page_base . 'day';
-        $args =  [ 'date' => get_http_var('d') ];
+        $args = ['date' => get_http_var('d')];
         $data = $this->list->display('date', $args, 'none');
         [$year, $month, $day] = explode('-', $date);
-        $args = [ 'year' => $year, 'month' => $month, 'day' => $day];
+        $args = ['year' => $year, 'month' => $month, 'day' => $day];
         $calendar = $this->list->display('calendar', $args, 'none');
         if (isset($calendar['years'])) {
             $data['calendar'] = $calendar['years'];
@@ -184,7 +184,7 @@ 
         global $DATA, $this_page, $THEUSER;
 
         # += as we *don't* want to override any already supplied argument
-        $args +=  [
+        $args += [
             'gid' => get_http_var('id'),
             's' => get_http_var('s'), // Search terms to be highlighted.
             'member_id' => get_http_var('m'), // Member's speeches to be highlighted.
@@ -333,7 +333,7 @@ 
             $body = $row['body'];
             $body = preg_replace('#<phrase class="honfriend" id="uk.org.publicwhip/member/(\d+)" name="([^"]*?)">(.*?\s*\((.*?)\))</phrase>#', '<a href="/mp/?m=$1" title="Our page on $2 - \'$3\'">$4</a>', $body);
             $body = preg_replace('#<phrase class="honfriend" name="([^"]*?)" person_id="uk.org.publicwhip/person/(\d+)">(.*?\s*\((.*?)\))</phrase>#', '<a href="/mp/?p=$2" title="Our page on $1 - \'$3\'">$4</a>', $body);
-            $body = preg_replace_callback('#<phrase class="offrep" id="(.*?)/(\d+)-(\d+)-(\d+)\.(.*?)">(.*?)</phrase>#', function ($matches) {
+            $body = preg_replace_callback('#<phrase class="offrep" id="(.*?)/(\d+)-(\d+)-(\d+)\.(.*?)">(.*?)</phrase>#', function($matches) {
                 return '<a href="/search/?pop=1&s=date:' . $matches[2] . $matches[3] . $matches[4] . '+column:' . $matches[5] . '+section:' . $matches[1] . '">' . str_replace("Official Report", "Hansard", $matches[6]) . '</a>';
             }, $body);
             #$body = preg_replace('#<phrase class="offrep" id="((.*?)/(\d+)-(\d+)-(\d+)\.(.*?))">(.*?)</phrase>#e', "\"<a href='/search/?pop=1&amp;s=date:$3$4$5+column:$6+section:$2&amp;match=$1'>\" . str_replace('Official Report', 'Hansard', '$7') . '</a>'", $body);

www/includes/easyparliament/templates/html/user/form.php

Indentation +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
                   <span class="label">Security status:</span>
                   <span class="formw"><select name="status">
                   <?php
-                  foreach ($statuses as $n => $status_name) { ?>
+                    foreach ($statuses as $n => $status_name) { ?>
                     <option value="<?= $status_name ?>"<?= $status_name == $status ? ' selected' : '' ?>>
                       <?= $status_name ?>
                     </option>

www/includes/easyparliament/searchlog.php

Braces +2 added lines, -1 removed lines

@@ -36,7 +36,8 @@
     public function add($searchlogdata) {
 
         $ip = getenv('REMOTE_ADDR');
-        if (preg_match('#66\.249\.(6[4-9]|[78]\d|9[0-5])\.#', $ip)) { # Googlebot
+        if (preg_match('#66\.249\.(6[4-9]|[78]\d|9[0-5])\.#', $ip)) {
+# Googlebot
             return;
         }
         if (isset($_SERVER['HTTP_USER_AGENT']) && preg_match('#simplepie|bot#i', $_SERVER['HTTP_USER_AGENT'])) {

Spacing +1 added lines, -1 removed lines

@@ -179,7 +179,7 @@
 
     public function admin_popular_searches($count) {
 
-        $q =  $this->db->query("SELECT query_string, count(*) AS c FROM search_query_log
+        $q = $this->db->query("SELECT query_string, count(*) AS c FROM search_query_log
                 WHERE count_hits != 0 AND query_string NOT LIKE '%speaker:%'
                 AND query_time > date_sub(NOW(), INTERVAL 30 DAY)
                 GROUP BY query_string ORDER BY c desc LIMIT $count;");

www/docs/admin/wikipedia.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 remove_form();
 list_ignored();
 $PAGE->stripe_end([
-    [ 'type' => 'html', 'content' => $PAGE->admin_menu() ],
+    ['type' => 'html', 'content' => $PAGE->admin_menu()],
 ]);
 $PAGE->page_end();
 

www/docs/api/key.php

Braces +2 added lines, -1 removed lines

@@ -155,7 +155,8 @@
     # The subscription has been created, but it is possible that the
     # payment failed (card error), or we need to do 3DS or similar
     $pi = $invoice->payment_intent;
-    if (!$pi) { # Free plan
+    if (!$pi) {
+# Free plan
         return;
     }
     if ($pi->status == 'requires_payment_method' || $pi->status == 'requires_source') {

Spacing +2 added lines, -2 removed lines

@@ -40,9 +40,9 @@
 
             try {
                 $invoice = $sub->latest_invoice;
-                $invoice->pay([ 'expand' => [ 'payment_intent' ] ]);
+                $invoice->pay(['expand' => ['payment_intent']]);
             } catch (\Stripe\Exception\CardException $e) {
-                $invoice = $subscription->api->client->invoices->retrieve($sub->latest_invoice, ['expand' => [ 'payment_intent'] ]);
+                $invoice = $subscription->api->client->invoices->retrieve($sub->latest_invoice, ['expand' => ['payment_intent']]);
             }
         } else {
             $invoice = $sub->latest_invoice;

classes/Subscription.php

Spacing +2 added lines, -2 removed lines

@@ -133,7 +133,7 @@ 
     }
 
     public function update_email($email) {
-        $this->update_customer([ 'email' => $email ]);
+        $this->update_customer(['email' => $email]);
     }
 
     public function update_payment_method($payment_method) {
@@ -163,7 +163,7 @@ 
             $error = 'Sorry, we could not process your payment, please try again. ';
             $error .= 'Our payment processor returned: ' . $err['message'];
             unset($_POST['stripeToken']); # So card form is shown again
-            return [ $error ];
+            return [$error];
         }
 
         $customer = $obj->id;

classes/FacebookLogin.php

Spacing +3 added lines, -3 removed lines

@@ -43,10 +43,10 @@ 
 
         try {
             $accessToken = $helper->getAccessToken();
-        } catch(\Facebook\Exceptions\FacebookResponseException $e) {
+        } catch (\Facebook\Exceptions\FacebookResponseException $e) {
             $data['error'] = 'Graph returned an error: ' . $e->getMessage();
             return $data;
-        } catch(\Facebook\Exceptions\FacebookSDKException $e) {
+        } catch (\Facebook\Exceptions\FacebookSDKException $e) {
             $data['error'] = 'Facebook SDK returned an error: ' . $e->getMessage();
             return $data;
         }
@@ -67,7 +67,7 @@ 
             return false;
         }
 
-        if (! $accessToken->isLongLived()) {
+        if (!$accessToken->isLongLived()) {
             $oAuth2Client = $this->getFacebookObject()->getOAuth2Client();
             try {
                 $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);

www/docs/section.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 }
 
 $type = ucfirst(get_http_var('type'));
-$class_name = "MySociety\TheyWorkForYou\SectionView\\${type}View";
+$class_name = "MySociety\TheyWorkForYou\SectionView\\${type}view";
 if (!$type || !class_exists($class_name)) {
     $PAGE->error_message("No type specified", true);
     exit;

classes/Model/AnnouncementManagement.php

Spacing +3 added lines, -3 removed lines

@@ -176,7 +176,7 @@ 
         }
 
         # discard any invalid banners
-        $banners = array_filter($banners, function ($banner) {
+        $banners = array_filter($banners, function($banner) {
             return is_valid_item($banner);
         });
 
@@ -198,12 +198,12 @@ 
         }
 
         # discard any invalid announcements
-        $items = array_filter($items, function ($item) {
+        $items = array_filter($items, function($item) {
             return is_valid_item($item);
         });
 
         # limit to announcements with the correct location
-        $items = array_filter($items, function ($item) use ($location) {
+        $items = array_filter($items, function($item) use ($location) {
             return in_array($location, $item->location);
         });