mysociety / theyworkforyou

www/includes/easyparliament/templates/html/divisions/_votes.php

Indentation +8 added lines, -8 removed lines

@@ -38,20 +38,20 @@
 
 $vote_sets = array(
     'yes_votes' => array(
-      'title' => 'Aye',
-      'anchor' => 'for',
+        'title' => 'Aye',
+        'anchor' => 'for',
     ),
     'no_votes' => array(
-      'title' => 'No',
-      'anchor' => 'against',
+        'title' => 'No',
+        'anchor' => 'against',
     ),
     'absent_votes' => array(
-      'title' => 'Absent',
-      'anchor' => 'absent',
+        'title' => 'Absent',
+        'anchor' => 'absent',
     ),
     'both_votes' => array(
-      'title' => 'Abstained',
-      'anchor' => 'both',
+        'title' => 'Abstained',
+        'anchor' => 'both',
     ),
 );
 

Spacing +2 added lines, -2 removed lines

@@ -24,9 +24,9 @@
 });
 $sections_with_votes = array_values($sections_with_votes);
 
-for ($i=0; $i<count($sections_with_votes); $i+=2) {
+for ($i = 0; $i < count($sections_with_votes); $i += 2) {
     $l = $sections_with_votes[$i];
-    $r = $i+1 < count($sections_with_votes) ? $sections_with_votes[$i+1] : null;
+    $r = $i + 1 < count($sections_with_votes) ? $sections_with_votes[$i + 1] : null;
 
     $vote_title = $vote_sets[$l]['title'];
     $anchor = $vote_sets[$l]['anchor'];

www/includes/easyparliament/templates/html/divisions/_your_mp.php

Braces +2 added lines, -1 removed lines

@@ -1,5 +1,6 @@
 <div class="debate-speech__division__your-mp">
-  <?php if ( !isset($main_vote_mp) || ! $main_vote_mp) { /* $main_vote_mp is true if an MP has been requested via the URL */ ?>
+  <?php if ( !isset($main_vote_mp) || ! $main_vote_mp) {
+/* $main_vote_mp is true if an MP has been requested via the URL */ ?>
     <div class="your-mp__header">
       <h3>How your <?= $division['members']['singular'] ?> voted</h3>
       <p>

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <div class="debate-speech__division__your-mp">
-  <?php if ( !isset($main_vote_mp) || ! $main_vote_mp) { /* $main_vote_mp is true if an MP has been requested via the URL */ ?>
+  <?php if (!isset($main_vote_mp) || !$main_vote_mp) { /* $main_vote_mp is true if an MP has been requested via the URL */ ?>
     <div class="your-mp__header">
       <h3>How your <?= $division['members']['singular'] ?> voted</h3>
       <p>
@@ -9,7 +9,7 @@ 
     </div>
   <?php } ?>
     <a href="<?= $data['mp_data']['mp_url'] ?>" class="your-mp__content">
-      <?php if ( isset($mp_vote) ) { ?>
+      <?php if (isset($mp_vote)) { ?>
         <span class="your-mp__vote your-mp__vote--<?= $mp_vote['vote'] ?>"><?php
           switch ($mp_vote['vote']) {
               case 'aye':
@@ -33,7 +33,7 @@ 
                   echo 'N/A';
           }
         ?></span>
-      <?php } else if ( isset($before_mp) || isset($after_mp) ) { ?>
+      <?php } else if (isset($before_mp) || isset($after_mp)) { ?>
         <span class="your-mp__vote">N/A</span>
       <?php } ?>
         <img class="your-mp__image" src="<?= $data['mp_data']['image'] ?>">
@@ -41,7 +41,7 @@ 
             <h2 class="people-list__person__name"><?= $data['mp_data']['name'] ?></h2>
             <p class="people-list__person__memberships">
                 <span class="people-list__person__constituency"><?= $data['mp_data']['constituency'] ?></span>
-                <span class="people-list__person__party <?= slugify( $data['mp_data']['party'] ) ?>"><?= $data['mp_data']['party'] ?></span>
+                <span class="people-list__person__party <?= slugify($data['mp_data']['party']) ?>"><?= $data['mp_data']['party'] ?></span>
             </p>
         </div>
     </a>

Indentation +15 added lines, -15 removed lines

@@ -11,28 +11,28 @@
     <a href="<?= $data['mp_data']['mp_url'] ?>" class="your-mp__content">
       <?php if ( isset($mp_vote) ) { ?>
         <span class="your-mp__vote your-mp__vote--<?= $mp_vote['vote'] ?>"><?php
-          switch ($mp_vote['vote']) {
-              case 'aye':
+            switch ($mp_vote['vote']) {
+                case 'aye':
                   echo 'Aye';
-                  break;
-              case 'no':
+                    break;
+                case 'no':
                   echo 'No';
-                  break;
-              case 'absent':
+                    break;
+                case 'absent':
                   echo 'Absent';
-                  break;
-              case 'both':
+                    break;
+                case 'both':
                   echo 'Abstain';
-                  break;
-              case 'tellaye':
+                    break;
+                case 'tellaye':
                   echo 'Aye (Teller)';
-                  break;
-              case 'tellno':
+                    break;
+                case 'tellno':
                   echo 'No (Teller)';
-                  break;
-              default:
+                    break;
+                default:
                   echo 'N/A';
-          }
+            }
         ?></span>
       <?php } else if ( isset($before_mp) || isset($after_mp) ) { ?>
         <span class="your-mp__vote">N/A</span>

www/includes/easyparliament/templates/html/alert/_list.php

Spacing +3 added lines, -3 removed lines

@@ -1,14 +1,14 @@
 <h3>Your current email alerts</h3>
 
 <ul class="alerts-manage__list">
-  <?php foreach ( $alerts as $alert ) { ?>
+  <?php foreach ($alerts as $alert) { ?>
     <li>
         When <?= _htmlspecialchars($alert['criteria']) ?>.
         <form action="<?= $actionurl ?>" method="POST">
             <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
-          <?php if ( $alert['status'] == 'unconfirmed' ) { ?>
+          <?php if ($alert['status'] == 'unconfirmed') { ?>
             <input type="submit" class="button small" name="action" value="Confirm">
-          <?php } elseif ( $alert['status'] == 'suspended' ) { ?>
+          <?php } elseif ($alert['status'] == 'suspended') { ?>
             <input type="submit" class="button small" name="action" value="Resume">
           <?php } else { ?>
             <input type="submit" class="button button--secondary small" name="action" value="Suspend">

classes/Utility/Alert.php

Spacing +8 added lines, -8 removed lines

@@ -19,7 +19,7 @@ 
         }
 
         if (!empty($details['pid'])) {
-            $criteria[] = 'speaker:'.$details['pid'];
+            $criteria[] = 'speaker:' . $details['pid'];
         }
 
         $criteria = join(' ', $criteria);
@@ -41,9 +41,9 @@ 
             $token = $row['alert_id'] . '-' . $row['registrationtoken'];
 
             $status = 'confirmed';
-            if ( !$row['confirmed'] ) {
+            if (!$row['confirmed']) {
                 $status = 'unconfirmed';
-            } elseif ( $row['deleted'] == 2 ) {
+            } elseif ($row['deleted'] == 2) {
                 $status = 'suspended';
             }
 
@@ -60,21 +60,21 @@ 
 
     public static function prettifyCriteria($alert_criteria) {
         $text = '';
-        if ( $alert_criteria ) {
+        if ($alert_criteria) {
             $criteria = explode(' ', $alert_criteria);
             $words = array();
             $spokenby = array_values(\MySociety\TheyWorkForYou\Utility\Search::speakerNamesForIDs($alert_criteria));
 
             foreach ($criteria as $c) {
-                if (!preg_match('#^speaker:(\d+)#',$c,$m)) {
+                if (!preg_match('#^speaker:(\d+)#', $c, $m)) {
                     $words[] = $c;
                 }
             }
-            if ( $spokenby && count($words) ) {
+            if ($spokenby && count($words)) {
                 $text = implode(' or ', $spokenby) . ' mentions [' . implode(' ', $words) . ']';
-            } else if ( count( $words ) ) {
+            } else if (count($words)) {
                 $text = '[' . implode(' ', $words) . ']' . ' is mentioned';
-            } else if ( $spokenby ) {
+            } else if ($spokenby) {
                 $text = implode(' or ', $spokenby) . " speaks";
             }
         }

www/docs/section.php

Spacing +2 added lines, -2 removed lines

@@ -21,14 +21,14 @@
     if (isset($THEUSER) && $THEUSER->postcode_is_set()) {
         try {
             $MEMBER = new MySociety\TheyWorkForYou\Member(array('postcode' => $THEUSER->postcode(), 'house' => \MySociety\TheyWorkForYou\Utility\House::majorToHouse($view->major)[0]));
-        } catch ( MySociety\TheyWorkForYou\MemberException $e ) {
+        } catch (MySociety\TheyWorkForYou\MemberException $e) {
             $MEMBER = null;
         }
     }
 
     $data = $view->display();
     if ($data) {
-        if ( !empty($data['template']) ) {
+        if (!empty($data['template'])) {
             $template = $data['template'];
         } else {
             $template = 'section/section';

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

@@ -13,7 +13,7 @@
 }
 
 if ($type = ucfirst(get_http_var('type'))) {
-    $class_name = "MySociety\TheyWorkForYou\SectionView\\${type}View";
+    $class_name = "MySociety\TheyWorkForYou\SectionView\\${type}view";
     $view = new $class_name();
 
     // use this for generating member vote data

www/includes/easyparliament/templates/html/divisions/vote.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
                   <?php if (isset($data['mp_data'])) {
                     include('_your_mp.php');
-                  } ?>
+                    } ?>
 
                     <div class="debate-speech__division__details">
                       <p>

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
                           </span><br>
                       <?php } else { ?>
                           <?php if ($mp_vote['with_majority']) { ?>
-                              <?php $vote_prefix = 'A majority of ' . $division['members']['plural']  . ' <b>agreed</b> and'; include('_vote_description.php'); ?>
+                              <?php $vote_prefix = 'A majority of ' . $division['members']['plural'] . ' <b>agreed</b> and'; include('_vote_description.php'); ?>
                           <?php } else { ?>
                               <?php $vote_prefix = 'A majority of ' . $division['members']['plural'] . ' <b>disagreed</b> and'; include('_vote_description.php'); ?>
                           <?php } ?>

www/docs/divisions/index.php

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 $data = $divisions->getRecentDivisions(30);
 
 if (isset($MEMBER)) {
-  $data['mp_name'] = ucfirst($MEMBER->full_name());
+    $data['mp_name'] = ucfirst($MEMBER->full_name());
 }
 
 $data['last_updated'] = MySociety\TheyWorkForYou\Divisions::getMostRecentDivisionDate()['latest'];

tests/DivisionsTest.php

Spacing +5 added lines, -5 removed lines

@@ -17,17 +17,17 @@ 
     }
 
     private function fetch_division_page() {
-        return $this->fetch_page( array( 'pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions' ) );
+        return $this->fetch_page(array('pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions'));
     }
 
     private function fetch_mp_recent_page()
     {
-        $vars = array( 'pagetype' => 'recent', 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/recent' );
+        $vars = array('pagetype' => 'recent', 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/recent');
         return $this->base_fetch_page($vars, 'mp', 'index.php', '/mp/recent.php');
     }
 
     private function fetch_recent_page() {
-        return $this->base_fetch_page( array('url' => '/divisions' ), 'divisions', 'index.php', '/divisions/index.php' );
+        return $this->base_fetch_page(array('url' => '/divisions'), 'divisions', 'index.php', '/divisions/index.php');
     }
 
 
@@ -113,7 +113,7 @@ 
     }
 
     public function testNotEnoughInfoStatement() {
-        return $this->fetch_page( array( 'pagetype' => 'divisions', 'pid' => 2, 'policy' => 810, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions' ) );
+        return $this->fetch_page(array('pagetype' => 'divisions', 'pid' => 2, 'policy' => 810, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions'));
         $this->assertContains('we don’t have enough information to calculate Test Current-MP’s position', $page);
     }
 
@@ -124,7 +124,7 @@ 
     }
 
     public function testSingleDivision() {
-        $page = $this->base_fetch_page( array('url' => '/divisions/division.php', 'vote' => 'pw-3012-01-01-1-commons' ), 'divisions', 'division.php', '/divisions/division.php' );
+        $page = $this->base_fetch_page(array('url' => '/divisions/division.php', 'vote' => 'pw-3012-01-01-1-commons'), 'divisions', 'division.php', '/divisions/division.php');
         $this->assertContains('A majority of MPs  <b>voted in favour</b> of a thing', $page);
         $this->assertContains('Aye: 200', $page);
         $this->assertNotContains('No:', $page); # Summary 100, but no actual votes. In reality, summary can only be <= actual.

classes/Utility/Search.php

Braces +15 added lines, -7 removed lines

@@ -28,8 +28,9 @@ 
 
             return $data;
         }
-        if (count($gids) == 5000)
-            $data['limit_reached'] = true;
+        if (count($gids) == 5000) {
+                    $data['limit_reached'] = true;
+        }
 
         # Fetch all the speakers of the results, count them up and get min/max date usage
         $speaker_count = array();
@@ -45,8 +46,12 @@ 
                 $mindate[$person_id] = '9999-12-31';
             }
             $speaker_count[$person_id]++;
-            if ($hdate < $mindate[$person_id]) $mindate[$person_id] = $hdate;
-            if ($hdate > $maxdate[$person_id]) $maxdate[$person_id] = $hdate;
+            if ($hdate < $mindate[$person_id]) {
+                $mindate[$person_id] = $hdate;
+            }
+            if ($hdate > $maxdate[$person_id]) {
+                $maxdate[$person_id] = $hdate;
+            }
         }
 
         # Fetch details of all the speakers
@@ -80,8 +85,9 @@ 
                 $dept = $row['dept'];
                 $posn = $row['position'];
                 $moffice_id = $row['moffice_id'];
-                if ($dept && $row['to_date'] == '9999-12-31')
-                    $speakers[$pid]['office'][$moffice_id] = prettify_office($posn, $dept);
+                if ($dept && $row['to_date'] == '9999-12-31') {
+                                    $speakers[$pid]['office'][$moffice_id] = prettify_office($posn, $dept);
+                }
                 if (!isset($speakers[$pid]['name'])) {
                     $speakers[$pid]['name'] = $full_name . ($house==1?' MP':'');
                 }
@@ -139,7 +145,9 @@ 
      */
 
     public static function searchMemberDbLookup($searchstring, $current_only=false) {
-        if (!$searchstring) return false;
+        if (!$searchstring) {
+            return false;
+        }
         $searchwords = explode(' ', $searchstring, 3);
         $params = array();
         if (count($searchwords) == 1) {

Spacing +13 added lines, -13 removed lines

@@ -83,9 +83,9 @@ 
                 if ($dept && $row['to_date'] == '9999-12-31')
                     $speakers[$pid]['office'][$moffice_id] = prettify_office($posn, $dept);
                 if (!isset($speakers[$pid]['name'])) {
-                    $speakers[$pid]['name'] = $full_name . ($house==1?' MP':'');
+                    $speakers[$pid]['name'] = $full_name . ($house == 1 ? ' MP' : '');
                 }
-                if ( !isset($speakers[$pid]['party']) && $party ) {
+                if (!isset($speakers[$pid]['party']) && $party) {
                     $speakers[$pid]['party'] = $party;
                 }
             }
@@ -138,7 +138,7 @@ 
      * Return query result from looking for MPs
      */
 
-    public static function searchMemberDbLookup($searchstring, $current_only=false) {
+    public static function searchMemberDbLookup($searchstring, $current_only = false) {
         if (!$searchstring) return false;
         $searchwords = explode(' ', $searchstring, 3);
         $params = array();
@@ -150,8 +150,8 @@ 
             // And here we're assuming the user's put the names in the right order.
             $params[':like_0'] = '%' . $searchwords[0] . '%';
             $params[':like_1'] = '%' . $searchwords[1] . '%';
-            $params[':like_0_and_1'] = '%' . $searchwords[0] . ' '. $searchwords[1] . '%';
-            $params[':like_0_and_1_hyphen'] = '%' . $searchwords[0] . '-'. $searchwords[1] . '%';
+            $params[':like_0_and_1'] = '%' . $searchwords[0] . ' ' . $searchwords[1] . '%';
+            $params[':like_0_and_1_hyphen'] = '%' . $searchwords[0] . '-' . $searchwords[1] . '%';
             $where = "(given_name LIKE :like_0 AND family_name LIKE :like_1)";
             $where .= " OR (given_name LIKE :like_1 AND family_name LIKE :like_0)";
             $where .= " OR (title LIKE :like_0 AND family_name LIKE :like_1)";
@@ -166,9 +166,9 @@ 
             $params[':like_0'] = '%' . $searchwords[0] . '%';
             $params[':like_1'] = '%' . $searchwords[1] . '%';
             $params[':like_2'] = '%' . $searchwords[2] . '%';
-            $params[':like_0_and_1'] = '%' . $searchwords[0] . ' '. $searchwords[1] . '%';
-            $params[':like_1_and_2'] = '%' . $searchwords[1] . ' '. $searchwords[2] . '%';
-            $params[':like_1_and_2_hyphen'] = '%' . $searchwords[1] . '-'. $searchwords[2] . '%';
+            $params[':like_0_and_1'] = '%' . $searchwords[0] . ' ' . $searchwords[1] . '%';
+            $params[':like_1_and_2'] = '%' . $searchwords[1] . ' ' . $searchwords[2] . '%';
+            $params[':like_1_and_2_hyphen'] = '%' . $searchwords[1] . '-' . $searchwords[2] . '%';
             $where = "(given_name LIKE :like_0_and_1 AND family_name LIKE :like_2)";
             $where .= " OR (given_name LIKE :like_0 AND family_name LIKE :like_1_and_2)";
             $where .= " OR (given_name LIKE :like_0 AND family_name LIKE :like_1_and_2_hyphen)";
@@ -183,7 +183,7 @@ 
         return $q;
     }
 
-    public static function searchMemberDbLookupWithNames($searchstring, $current_only=false) {
+    public static function searchMemberDbLookupWithNames($searchstring, $current_only = false) {
         $q = self::searchMemberDbLookup($searchstring, $current_only);
 
         if (!$q->rows()) {
@@ -238,7 +238,7 @@ 
             // Looks like a postcode - can we find the constituency?
             $constituency = Postcode::postcodeToConstituency($searchterm);
             if ($constituency) {
-                return array( array($constituency), true );
+                return array(array($constituency), true);
             }
         }
 
@@ -256,7 +256,7 @@ 
             $constituencies[] = $row['name'];
         }
 
-        return array( $constituencies, false );
+        return array($constituencies, false);
     }
 
     /**
@@ -272,7 +272,7 @@ 
         $speakers = [];
 
         foreach ($criteria as $c) {
-            if (preg_match('#^speaker:(\d+)#',$c,$m)) {
+            if (preg_match('#^speaker:(\d+)#', $c, $m)) {
                 $MEMBER = new \MEMBER(array('person_id'=>$m[1]));
                 $speakers[$m[1]] = $MEMBER->full_name();
             }
@@ -291,7 +291,7 @@ 
     public static function speakerIDsToNames($searchstring) {
         $speakers = self::speakerNamesForIDs($searchstring);
 
-        foreach ( $speakers as $id => $name ) {
+        foreach ($speakers as $id => $name) {
             $searchstring = str_replace('speaker:' . $id, "speaker:$name", $searchstring);
         }