mysociety / theyworkforyou

www/includes/easyparliament/member.php

Indentation +1 added lines, -1 removed lines

@@ -364,7 +364,7 @@
         $this->extra_info = array();
 
         $q = $this->db->query('SELECT * FROM moffice WHERE person=:person_id ORDER BY from_date DESC, moffice_id',
-                              array(':person_id' => $this->person_id));
+                                array(':person_id' => $this->person_id));
         $this->extra_info['office'] = $q->fetchAll();
 
         // Info specific to member id (e.g. attendance during that period of office)

Spacing +20 added lines, -20 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once INCLUDESPATH."easyparliament/glossary.php";
+include_once INCLUDESPATH . "easyparliament/glossary.php";
 
 class MEMBER {
 
@@ -81,7 +81,7 @@ 
 
         # All the following only happen if the house to display isn't yet set.
         # TODO: This relies on interpreting the default value of 0 as a false, which may be error-prone.
-        if (! (bool) $this->house_disp) {
+        if (!(bool) $this->house_disp) {
             if ($house == HOUSE_TYPE_LONDON_ASSEMBLY # London Assembly
                 || $house == HOUSE_TYPE_SCOTLAND     # MSPs and
                 || $house == HOUSE_TYPE_NI           # MLAs have lowest priority
@@ -241,13 +241,13 @@ 
         }
     }
 
-    public function postcode_to_person_id($postcode, $house=null) {
-        twfy_debug ('MP', "postcode_to_person_id converting postcode to person");
+    public function postcode_to_person_id($postcode, $house = null) {
+        twfy_debug('MP', "postcode_to_person_id converting postcode to person");
         $constituency = strtolower(MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituency($postcode));
         return $this->constituency_to_person_id($constituency, $house);
     }
 
-    public function constituency_to_person_id($constituency, $house=null) {
+    public function constituency_to_person_id($constituency, $house = null) {
         if ($constituency == '') {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, no constituency was found.');
         }
@@ -288,7 +288,7 @@ 
         }
     }
 
-    public function name_to_person_id($name, $const='') {
+    public function name_to_person_id($name, $const = '') {
         global $this_page;
         if ($name == '') {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, no name was found.');
@@ -331,7 +331,7 @@ 
                 OR (title=:given_name AND given_name=:middle_name AND family_name=:family_name)
             )";
         } elseif ($this_page == 'royal') {
-            twfy_debug ('MP', $name);
+            twfy_debug('MP', $name);
             if (stripos($name, 'elizabeth') !== false) {
                 $q .= "AND person_id=13935";
             } elseif (stripos($name, 'charles') !== false) {
@@ -399,7 +399,7 @@ 
         global $THEUSER;
         if (is_object($THEUSER) && $THEUSER->postcode_is_set() && $this->current_member(1)) {
             $pc = $THEUSER->postcode();
-            twfy_debug ('MP', "set_users_mp converting postcode to person");
+            twfy_debug('MP', "set_users_mp converting postcode to person");
             $constituency = strtolower(MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituency($pc));
             if ($constituency == strtolower($this->constituency())) {
                 $this->the_users_mp = true;
@@ -478,7 +478,7 @@ 
         }
 
         if ($display && array_key_exists('register_member_interests_html', $this->extra_info) && ($this->extra_info['register_member_interests_html'] != '')) {
-            $args = array (
+            $args = array(
                 "sort" => "regexp_replace"
             );
             $GLOSSARY = new GLOSSARY($args);
@@ -486,7 +486,7 @@ 
         $GLOSSARY->glossarise($this->extra_info['register_member_interests_html']);
         }
 
-        $q = $this->db->query('select count(*) as c from alerts where criteria like "%speaker:'.$this->person_id.'%" and confirmed and not deleted')->first();
+        $q = $this->db->query('select count(*) as c from alerts where criteria like "%speaker:' . $this->person_id . '%" and confirmed and not deleted')->first();
         $this->extra_info['number_of_alerts'] = $q['c'];
 
         # Public Bill Committees
@@ -508,7 +508,7 @@ 
             $chairman = $row['c'];
             $this->extra_info['pbc'][$bill_id] = array(
                 'title' => $title, 'session' => $row['session'],
-                'attending'=>$attending, 'chairman'=>($chairman>0), 'outof' => $c
+                'attending'=>$attending, 'chairman'=>($chairman > 0), 'outof' => $c
             );
         }
 
@@ -523,7 +523,7 @@ 
     public function family_name() { return $this->family_name; }
     public function full_name($no_mp_title = false) {
         $title = $this->title;
-        if ($no_mp_title && ($this->house_disp==HOUSE_TYPE_COMMONS || $this->house_disp==HOUSE_TYPE_NI || $this->house_disp==HOUSE_TYPE_SCOTLAND)) {
+        if ($no_mp_title && ($this->house_disp == HOUSE_TYPE_COMMONS || $this->house_disp == HOUSE_TYPE_NI || $this->house_disp == HOUSE_TYPE_SCOTLAND)) {
             $title = '';
         }
         return member_full_name($this->house_disp, $title, $this->given_name, $this->family_name, $this->lordofname);
@@ -552,8 +552,8 @@ 
     }
 
     public function entered_house($house = null) {
-        if ( isset($house) ) {
-            if ( array_key_exists($house, $this->entered_house) ) {
+        if (isset($house)) {
+            if (array_key_exists($house, $this->entered_house)) {
                 return $this->entered_house[$house];
             } else {
                 return null;
@@ -567,9 +567,9 @@ 
             return '';
         }
         list($year, $month, $day) = explode('-', $entered_house);
-        if ($month==1 && $day==1 && $this->house(HOUSE_TYPE_LORDS)) {
+        if ($month == 1 && $day == 1 && $this->house(HOUSE_TYPE_LORDS)) {
             return $year;
-        } elseif ($month==0 && $day==0) {
+        } elseif ($month == 0 && $day == 0) {
             return $year;
         } elseif (checkdate($month, $day, $year) && $year != '9999') {
             return format_date($entered_house, LONGDATEFORMAT);
@@ -579,8 +579,8 @@ 
     }
 
     public function left_house($house = null) {
-        if ( isset($house) ) {
-            if ( array_key_exists($house, $this->left_house) ) {
+        if (isset($house)) {
+            if (array_key_exists($house, $this->left_house)) {
                 return $this->left_house[$house];
             } else {
                 return null;
@@ -596,7 +596,7 @@ 
         list($year, $month, $day) = explode('-', $left_house);
         if (checkdate($month, $day, $year) && $year != '9999') {
             return format_date($left_house, LONGDATEFORMAT);
-        } elseif ($month==0 && $day==0) {
+        } elseif ($month == 0 && $day == 0) {
             # Left house date is stored as 1942-00-00 to mean "at some point in 1941"
             return $year - 1;
         } else {
@@ -718,7 +718,7 @@ 
             $name = $row['given_name'] . ' ' . $row['family_name'];
             if ($last_pid != $pid) {
                 $mships[] = array(
-                    'href' => WEBPATH . 'mp/?pid='.$pid,
+                    'href' => WEBPATH . 'mp/?pid=' . $pid,
                     'text' => $name
                 );
                 $last_pid = $pid;

www/docs/topic/topic.php

Spacing +3 added lines, -3 removed lines

@@ -54,12 +54,12 @@ 
                 $pc = get_http_var('pc');
                 $pc = preg_replace('#[^a-z0-9]#i', '', $pc);
                 if (validate_postcode($pc)) {
-                    twfy_debug ('MP', "MP lookup by postcode");
+                    twfy_debug('MP', "MP lookup by postcode");
                     $constituency = strtolower(Utility\Postcode::postcodeToConstituency($pc));
                     if ($constituency == "connection_timed_out") {
                         throw new \Exception('Sorry, we couldn’t check your postcode right now, as our postcode lookup server is under quite a lot of load.');
                     } elseif ($constituency == "") {
-                        twfy_debug ('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
+                        twfy_debug('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
                         throw new \Exception('Sorry, ' . _htmlentities($pc) . ' isn’t a known postcode');
                     } else {
                         // Generate the Member object
@@ -70,7 +70,7 @@ 
                         }
                     }
                 } else {
-                    twfy_debug ('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
+                    twfy_debug('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
                     throw new \Exception('Sorry, ' . _htmlentities($pc) . ' isn’t a valid postcode');
                 }
             } catch (\Exception $e) {

www/includes/easyparliament/templates/html/mp/votes_svg.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
     $stances = array();
 
     foreach ($segment['votes']->positions as $key_vote) {
-        if ( $key_vote['has_strong'] || $key_vote['position'] == 'has never voted on' ) {
+        if ($key_vote['has_strong'] || $key_vote['position'] == 'has never voted on') {
             $stance = strip_tags($key_vote['desc'], '<b>');
             $stance = ucfirst($stance);
             $stance = preg_replace('#</?b[^>]*>#i', '*', $stance);

Indentation +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 
     echo '<?xml version="1.0" encoding="utf-8"?>';
 
- ?>
+    ?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg width="1000" height="500" viewBox="0 0 1000 500" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" font-family="Source Sans Pro">
 

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

@@ -44,7 +44,7 @@
     <text font-size="24" font-weight="normal" fill="#000000">
         <?php foreach ($lines as $j=>$line) { ?>
             <tspan x="40" y="<?= $stance_y + $stance_padding_top + $stance_baseline_offset + ($stance_lineheight * $j) ?>"><?php
-                if (strpos($line, '*') !== False) {
+                if (strpos($line, '*') !== false) {
                     echo preg_replace(
                         '#(?:^|[*])([^\r\n *][^*\n]*[^\r\n *])(?:$|[*])#i',
                         '$1',

www/includes/easyparliament/templates/html/london/index.php

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
                 <div class="row nested-row">
                     <div class="homepage-in-the-news homepage-content-section">
                         <?php if ( $featured ) {
-                             include dirname(__FILE__) . "/../homepage/featured.php";
+                                include dirname(__FILE__) . "/../homepage/featured.php";
                         } ?>
                     </div>
                     <div class="homepage-create-alert homepage-content-section">

Spacing +4 added lines, -4 removed lines

@@ -4,10 +4,10 @@ 
             <div class="hero__mp-search__wrap">
                 <h1>Do your Assembly Members represent you?</h1>
                 <div class="row collapse">
-                    <?php if ( count($data['regional']) > 0 ) { ?>
+                    <?php if (count($data['regional']) > 0) { ?>
                         <ul class="homepage-rep-list">
                             <li>Your Assembly Memberss: </li>
-                        <?php foreach ( $data['regional'] as $member ) { ?>
+                        <?php foreach ($data['regional'] as $member) { ?>
                             <li class="homepage-rep-list__rep"><a href="/london-assembly-member/?p=<?= $member['person_id'] ?>"><?= $member['name'] ?></a></li>
                         <?php } ?>
                         </ul>
@@ -40,7 +40,7 @@ 
             <div class="panel panel--flushtop clearfix">
                 <div class="row nested-row">
                     <div class="homepage-in-the-news homepage-content-section">
-                        <?php if ( $featured ) {
+                        <?php if ($featured) {
                              include dirname(__FILE__) . "/../homepage/featured.php";
                         } ?>
                     </div>
@@ -85,7 +85,7 @@ 
                     <div class="homepage-recently homepage-content-section">
                         <h2>Recently answered questions to the Mayor of London</h2>
                         <ul class="recently__list"><?php
-                            foreach ( $debates['recent'] as $recent ) {
+                            foreach ($debates['recent'] as $recent) {
                                 include dirname(__FILE__) . '/../homepage/recent-debates.php';
                             }
                         ?></ul>

classes/Utility/House.php

Spacing +5 added lines, -5 removed lines

@@ -50,35 +50,35 @@
 
     public static function getCountryDetails($house) {
         $details = array(
-            HOUSE_TYPE_COMMONS => array (
+            HOUSE_TYPE_COMMONS => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => '– in the House of Commons',
                 'cons_type' => 'WMC',
                 'assembly_name' => 'House of Commons',
             ),
-            HOUSE_TYPE_NI => array (
+            HOUSE_TYPE_NI => array(
                 'country' => 'NORTHERN IRELAND',
                 'assembly' => 'ni',
                 'location' => '– in the Northern Ireland Assembly',
                 'cons_type' => 'NIE',
                 'assembly_name' => 'Northern Ireland Assembly',
             ),
-            HOUSE_TYPE_SCOTLAND => array (
+            HOUSE_TYPE_SCOTLAND => array(
                 'country' => 'SCOTLAND',
                 'assembly' => 'scotland',
                 'location' => '– in the Scottish Parliament',
                 'cons_type' => 'SPC',
                 'assembly_name' => 'Scottish Parliament',
             ),
-            HOUSE_TYPE_LORDS => array (
+            HOUSE_TYPE_LORDS => array(
                 'country' => 'UK',
                 'assembly' => 'uk-lords',
                 'location' => '– in the House of Lords',
                 'cons_type' => '',
                 'assembly_name' => 'House of Lords',
             ),
-            HOUSE_TYPE_LONDON_ASSEMBLY => array (
+            HOUSE_TYPE_LONDON_ASSEMBLY => array(
                 'country' => 'UK',
                 'assembly' => 'london-assembly',
                 'location' => '– in the London Assembly',

www/includes/easyparliament/templates/html/mp/_vote_footer.php

Spacing +2 added lines, -2 removed lines

@@ -5,9 +5,9 @@
     <p>For an explanation of the vote descriptions please see our page about
       <a href="/voting-information">voting information on TheyWorkForYou</a>.</p>
 
-  <?php if(isset($data['photo_attribution_text'])) { ?>
+  <?php if (isset($data['photo_attribution_text'])) { ?>
     <p>
-      <?php if(isset($data['photo_attribution_link'])) { ?>
+      <?php if (isset($data['photo_attribution_link'])) { ?>
         Profile photo:
         <a href="<?= $data['photo_attribution_link'] ?>"><?= $data['photo_attribution_text'] ?></a>
       <?php } else { ?>

classes/SectionView/LondonView.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'lmqs', 'title' => 'Mayoral Questions' )
+            array('section' => 'lmqs', 'title' => 'Mayoral Questions')
         );
     }
 }

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\Error\Card $e) {
-                $invoice = \Stripe\Invoice::retrieve($sub->latest_invoice, ['expand' => [ 'payment_intent'] ]);
+                $invoice = \Stripe\Invoice::retrieve($sub->latest_invoice, ['expand' => ['payment_intent']]);
             }
         } else {
             $invoice = $sub->latest_invoice;

www/docs/api/hook.php

Spacing +2 added lines, -2 removed lines

@@ -53,10 +53,10 @@
         # Update the invoice's PaymentIntent and Charge to say it came from TWFY (for CSV export)
         # Both are shown in the Stripe admin, annoyingly
         if ($obj->payment_intent) {
-            \Stripe\PaymentIntent::update($obj->payment_intent, [ 'description' => 'TheyWorkForYou' ]);
+            \Stripe\PaymentIntent::update($obj->payment_intent, ['description' => 'TheyWorkForYou']);
         }
         if ($obj->charge) {
-            \Stripe\Charge::update($obj->charge, [ 'description' => 'TheyWorkForYou' ]);
+            \Stripe\Charge::update($obj->charge, ['description' => 'TheyWorkForYou']);
         }
     } catch (\Stripe\Error\Base $e) {
     }