mysociety / theyworkforyou

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

Indentation +4 added lines, -4 removed lines

@@ -131,8 +131,8 @@ 
 
                     <ul class="vote-descriptions">
                               <?php foreach ($sig_diff_policy->policy_pairs as $policy_pair) {
-                                  include '_vote_description.php';
-                              } ?>
+                                    include '_vote_description.php';
+                                } ?>
                             </ul>
 
                     <?php } ?>
@@ -165,9 +165,9 @@ 
                             <ul class="vote-descriptions">
                               <?php foreach ($segment->policy_pairs as $policy_pair) {
 
-                                  include '_vote_description.php';
+                                    include '_vote_description.php';
 
-                              } ?>
+                                } ?>
                             </ul>
 
                             <p class="voting-information-provenance">

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
                         <nav class="subpage-content-list js-accordion" aria-label="Comparison periods">
                             <h3 class="js-accordion-button">For period: <?= $comparison_period->description ?></h3>
                             <ul class="js-accordion-content">
-                                <?php foreach($available_periods as $period) { ?>
+                                <?php foreach ($available_periods as $period) { ?>
                                     <li><a href="?comparison_period=<?= $period->lslug() ?>" class="<?= $period->lslug() === $comparison_period->lslug() ? 'active-comparison-period' : '' ?>"><?= $period->description ?></a></li>
                                 <?php } ?>
                             </ul>

www/includes/easyparliament/alert.php

Spacing +7 added lines, -7 removed lines

@@ -40,7 +40,7 @@ 
     public $token_checked = null;
     private $alert_id = "";
     public $email = "";
-    public $criteria = "";		// Sets the terms that are used to produce the search results.
+    public $criteria = ""; // Sets the terms that are used to produce the search results.
     public $ignore_speaker_votes = 0;
 
     private $db;
@@ -72,7 +72,7 @@ 
             $contents = ['criteria' => $row['criteria'], 'count' => $row['cnt']];
             $data[] = $contents;
         }
-        $data =  ['alerts' => $data];
+        $data = ['alerts' => $data];
         return $data;
     }
 
@@ -101,7 +101,7 @@ 
 
         $data = $q->fetchAll();
         $info = "Alert";
-        $data =  ['info' => $info, 'data' => $data];
+        $data = ['info' => $info, 'data' => $data];
 
         return $data;
     }
@@ -300,12 +300,12 @@ 
         }
 
         // Arrays we need to send a templated email.
-        $data =  [
+        $data = [
             'to' 		=> $details['email'],
             'template' 	=> 'alert_confirmation',
         ];
 
-        $merge =  [
+        $merge = [
             'CONFIRMURL'	=> $confirmurl,
             'CRITERIA'	=> $this->criteria_pretty(),
         ];
@@ -319,7 +319,7 @@ 
     }
 
     public function send_already_signedup_email($details) {
-        $data =  [
+        $data = [
             'to' 		=> $details['email'],
             'template' 	=> 'alert_already_signedup',
         ];
@@ -327,7 +327,7 @@ 
         $criteria = \MySociety\TheyWorkForYou\Utility\Alert::detailsToCriteria($details);
         $this->criteria = $criteria;
 
-        $merge =  [
+        $merge = [
             'CRITERIA'	=> $this->criteria_pretty(),
         ];
 

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

Spacing +1 added lines, -1 removed lines

@@ -130,7 +130,7 @@
       <?php } elseif ($step !== '') { ?>
         <?php include '_alert_form.php';
       } elseif ($this_step == '') {
-          if(
+          if (
               !$results && (
                   $members ||
                 (isset($constituencies) && count($constituencies) > 0) ||

Indentation +14 added lines, -14 removed lines

@@ -139,22 +139,22 @@ 
           </div>
       <?php } elseif ($step !== '') { ?>
         <?php include '_alert_form.php';
-      } elseif ($this_step == '') {
-          if(
-              !$results && (
-                  $members ||
+        } elseif ($this_step == '') {
+            if(
+                !$results && (
+                    $members ||
                 (isset($constituencies) && count($constituencies) > 0) ||
                 ($alertsearch)
-              )
-          ) {
-              /* We need to disambiguate the user's instructions */
-              $member_options = false;
-              ?>
+                )
+            ) {
+                /* We need to disambiguate the user's instructions */
+                $member_options = false;
+                ?>
         <div class="alert-section alert-section--disambiguation">
             <div class="alert-section__primary">
 
               <?php if ($members) {
-                  $member_options = true; ?>
+                    $member_options = true; ?>
                 <h3><?= sprintf(gettext('Sign up for alerts when people matching <i>%s</i> speaks'), _htmlspecialchars($search_term)) ?></h3>
                 <ul>
                   <?php
@@ -167,7 +167,7 @@ 
                             <input type="hidden" name="pid" value="<?= $row['person_id'] ?>">
                             <input type="hidden" name="ignore_speaker_votes" value="<?= $ignore_speaker_votes ?>">
                             <?php
-                                  $name = member_full_name($row['house'], $row['title'], $row['given_name'], $row['family_name'], $row['lordofname']);
+                                    $name = member_full_name($row['house'], $row['title'], $row['given_name'], $row['family_name'], $row['lordofname']);
                         if ($row['constituency']) {
                             $name .= ' (' . gettext($row['constituency']) . ')';
                         }
@@ -182,7 +182,7 @@ 
               <?php } ?>
 
               <?php if ($alertsearch) {
-                  if (!$member_options) { ?>
+                    if (!$member_options) { ?>
                 <h3><?= gettext('That doesn’t match a person, postcode or constituency. Search again to refine your email alert.') ?></h3>
                 <ul>
                     <?php if (isset($mistakes['postcode_and'])) { ?>
@@ -193,8 +193,8 @@ 
                             want? You will only get an alert if all of these
                             are mentioned in the same debate.') ?>
                           <?php if (isset($member_alertsearch)) {
-                              printf(gettext('Did you mean to get alerts for when your representative mentions something instead? If so maybe you want to subscribe to…'));
-                          } ?>
+                                printf(gettext('Did you mean to get alerts for when your representative mentions something instead? If so maybe you want to subscribe to…'));
+                            } ?>
                         </em>
                     </li>
                     <?php } ?>

tests/AlertsPageTest.php

Spacing +15 added lines, -15 removed lines

@@ -25,37 +25,37 @@ 
     }
 
     public function testKeywordOnly() {
-        $page = $this->fetch_page([ 'alertsearch' => 'elephant']);
+        $page = $this->fetch_page(['alertsearch' => 'elephant']);
         $this->assertStringContainsString('What word or phrase would you like to receive alerts about', $page);
         $this->assertStringContainsString('<input type="text" id="words0" name="words[]" aria-required="true" value="elephant"', $page);
     }
 
     public function testSpeakerId() {
-        $page = $this->fetch_page([ 'alertsearch' => 'speaker:2']);
+        $page = $this->fetch_page(['alertsearch' => 'speaker:2']);
         $this->assertStringContainsString('Mrs Test Current-MP', $page);
     }
 
     public function testPostCodeOnly() {
-        $page = $this->fetch_page([ 'alertsearch' => 'SE17 3HE']);
+        $page = $this->fetch_page(['alertsearch' => 'SE17 3HE']);
         $this->assertStringContainsString('Mrs Test Current-MP', $page);
     }
 
     public function testPostCodeWithKeyWord() {
-        $page = $this->fetch_page([ 'alertsearch' => 'SE17 3HE elephant']);
+        $page = $this->fetch_page(['alertsearch' => 'SE17 3HE elephant']);
         $this->assertStringContainsString('You have used a postcode and something else', $page);
         $this->assertStringContainsString('Mentions of [elephant] by your MP, Mrs Test Current-MP', $page);
         $this->assertStringNotContainsString('by your MSP', $page);
     }
 
     public function testScottishPostcodeWithKeyword() {
-        $page = $this->fetch_page([ 'alertsearch' => 'PH6 2DB elephant']);
+        $page = $this->fetch_page(['alertsearch' => 'PH6 2DB elephant']);
         $this->assertStringContainsString('You have used a postcode and something else', $page);
         $this->assertStringContainsString('Mentions of [elephant] by your MP, Mr Test2 Current-MP', $page);
         $this->assertStringContainsString('Mentions of [elephant] by your MSP, Mrs Test Current-MSP', $page);
     }
 
     public function testPostcodeAndKeywordWithNoSittingMP() {
-        $page = $this->fetch_page([ 'alertsearch' => 'OX1 4LF elephant']);
+        $page = $this->fetch_page(['alertsearch' => 'OX1 4LF elephant']);
         $this->assertStringContainsString('You have used a postcode and something else', $page);
         $this->assertStringNotContainsString('Did you mean to get alerts for when your MP', $page);
     }
@@ -64,15 +64,15 @@ 
      * @group xapian
      */
     public function testBasicKeyWordAlertsCreation() {
-        $page = $this->fetch_page([ 'step' => 'define']);
+        $page = $this->fetch_page(['step' => 'define']);
         $this->assertStringContainsString('What word or phrase would you like to receive alerts about', $page);
         $this->assertStringContainsString('<input type="text" id="words0" name="words[]" aria-required="true" value=""', $page);
 
-        $page = $this->fetch_page([ 'step' => 'review', 'email' => 'test@example.org', 'words[]' => 'fish']);
+        $page = $this->fetch_page(['step' => 'review', 'email' => 'test@example.org', 'words[]' => 'fish']);
         $this->assertStringContainsString('Review Your Alert', $page);
         $this->assertStringContainsString('<input type="hidden" name="words[]" value="fish"', $page);
 
-        $page = $this->fetch_page([ 'step' => 'confirm', 'email' => 'test@example.org', 'words[]' => 'fish']);
+        $page = $this->fetch_page(['step' => 'confirm', 'email' => 'test@example.org', 'words[]' => 'fish']);
         $this->assertStringContainsString('We’re nearly done', $page);
         $this->assertStringContainsString('You should receive an email shortly', $page);
     }
@@ -81,16 +81,16 @@ 
      * @group xapian
      */
     public function testMultipleKeyWordAlertsCreation() {
-        $page = $this->fetch_page([ 'step' => 'define']);
+        $page = $this->fetch_page(['step' => 'define']);
         $this->assertStringContainsString('What word or phrase would you like to receive alerts about', $page);
         $this->assertStringContainsString('<input type="text" id="words0" name="words[]" aria-required="true" value=""', $page);
 
-        $page = $this->fetch_page([ 'step' => 'review', 'email' => 'test@example.org', 'words[]' => ['fish', 'salmon']]);
+        $page = $this->fetch_page(['step' => 'review', 'email' => 'test@example.org', 'words[]' => ['fish', 'salmon']]);
         $this->assertStringContainsString('Review Your Alert', $page);
         $this->assertStringContainsString('<input type="hidden" name="words[]" value="fish"', $page);
         $this->assertStringContainsString('<input type="hidden" name="words[]" value="salmon"', $page);
 
-        $page = $this->fetch_page([ 'step' => 'confirm', 'email' => 'test@example.org', 'words[]' => ['fish', 'salmon']]);
+        $page = $this->fetch_page(['step' => 'confirm', 'email' => 'test@example.org', 'words[]' => ['fish', 'salmon']]);
         $this->assertStringContainsString('You should receive an email shortly', $page);
     }
 
@@ -102,12 +102,12 @@ 
         $this->assertStringContainsString('What word or phrase would you like to receive alerts about', $page);
         $this->assertStringContainsString('<input type="text" id="words0" name="words[]" aria-required="true" value=""', $page);
 
-        $page = $this->get_page([ 'step' => 'review', 'words[]' => ['fish', 'salmon']]);
+        $page = $this->get_page(['step' => 'review', 'words[]' => ['fish', 'salmon']]);
         $this->assertStringContainsString('Review Your Alert', $page);
         $this->assertStringContainsString('<input type="hidden" name="words[]" value="fish"', $page);
         $this->assertStringContainsString('<input type="hidden" name="words[]" value="salmon"', $page);
 
-        $page = $this->get_page([ 'step' => 'confirm', 'words[]' => ['fish', 'salmon']]);
+        $page = $this->get_page(['step' => 'confirm', 'words[]' => ['fish', 'salmon']]);
         $this->assertStringContainsString('You will now receive email alerts on any day when [fish salmon] is mentioned in parliament', $page);
     }
 
@@ -140,7 +140,7 @@ 
         $this->assertStringContainsString('<input type="hidden" name="words[]" value="fish"', $page);
         $this->assertStringContainsString('<input type="hidden" name="representative" value="Mrs Test Current-MP"', $page);
 
-        $page = $this->get_page([ 'step' => 'confirm', 'words[]' => 'fish', 'representative' => 'Mrs Test Current-MP']);
+        $page = $this->get_page(['step' => 'confirm', 'words[]' => 'fish', 'representative' => 'Mrs Test Current-MP']);
         $this->assertStringContainsString('You will now receive email alerts on any day when Mrs Test Current-MP mentions [fish] in parliament', $page);
     }
 }

tests/DivisionsTest.php

Spacing +3 added lines, -3 removed lines

@@ -13,12 +13,12 @@ 
     }
 
     private function fetch_mp_recent_page() {
-        $vars = [ 'pagetype' => 'recent', 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/recent' ];
+        $vars = ['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(['url' => '/divisions' ], 'divisions', 'index.php', '/divisions/index.php');
+        return $this->base_fetch_page(['url' => '/divisions'], 'divisions', 'index.php', '/divisions/index.php');
     }
 
 
@@ -54,7 +54,7 @@ 
     }
 
     public function testSingleDivision() {
-        $page = $this->base_fetch_page(['url' => '/divisions/division.php', 'vote' => 'pw-3012-01-01-1-commons' ], 'divisions', 'division.php', '/divisions/division.php');
+        $page = $this->base_fetch_page(['url' => '/divisions/division.php', 'vote' => 'pw-3012-01-01-1-commons'], 'divisions', 'division.php', '/divisions/division.php');
         $this->assertStringContainsString('A majority of MPs  <b>voted in favour</b> of a thing', $page);
         $this->assertStringContainsString('Aye: 200', $page);
         $this->assertStringNotContainsString('No:', $page); # Summary 100, but no actual votes. In reality, summary can only be <= actual.

classes/Renderer/Markdown.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
         $og_image_parl = $extra_vars['_social_image_parliament'] ?? 'uk';
         $og_image_url = \MySociety\TheyWorkForYou\Url::generateSocialImageUrl($og_image_title, $og_image_subtitle, $og_image_parl);
 
-        $html = preg_replace_callback('/<h([1-3])>([^<]+)<\/h[1-3]>/i', function ($matches) {
+        $html = preg_replace_callback('/<h([1-3])>([^<]+)<\/h[1-3]>/i', function($matches) {
             $level = $matches[1];
             $htitle = $matches[2];
             $slug = slugify($htitle);

classes/PolicyDistributionCollection.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
             $group_name = $policies->getSetDescriptions()[$set_slug];
             $group_slug = $set_slug;
             $comparison_period_slug = $period_slug;
-            $policy_pairs = array_filter($pairs, function ($pair) use ($policy_ids) {
+            $policy_pairs = array_filter($pairs, function($pair) use ($policy_ids) {
                 $is_policy_valid = in_array($pair->getPolicyID(), $policy_ids);
                 $has_own_distribution = $pair->member_distribution !== null && !$pair->member_distribution->noDataAvailable();
                 return $is_policy_valid && $has_own_distribution;

tests/PartyTest.php

Spacing +3 added lines, -3 removed lines

@@ -108,7 +108,7 @@ 
 
 
     private function getMemberFromPersonId($person_id) {
-        return new MySociety\TheyWorkForYou\Member([ "person_id" => $person_id ]);
+        return new MySociety\TheyWorkForYou\Member(["person_id" => $person_id]);
     }
 
     public function testMPPartyPolicyTextWhenDiffersVotes() {
@@ -137,7 +137,7 @@ 
         // this is a single person party i think - so no party comparison?
         // need to check what votes would actually produce
 
-        $page = $this->fetch_page(['pid' => 4, 'pagetype' => 'votes','url' => '/mp/4/test_mp_d/test_westminster_constituency/votes']);
+        $page = $this->fetch_page(['pid' => 4, 'pagetype' => 'votes', 'url' => '/mp/4/test_mp_d/test_westminster_constituency/votes']);
         $this->assertStringContainsString('Test MP D', $page);
         $this->assertStringContainsString('<li class="vote-description"', $page);
         $this->assertStringNotContainsString('comparable B Party MPs voted', $page);
@@ -148,7 +148,7 @@ 
 
         // this is just a boring, person aligned with party example
 
-        $page = $this->fetch_page(['pagetype' => 'votes', 'pid' => 16,  'url' => '/mp/16/test_mp_g_party_2/test_westminster_constituency/votes']);
+        $page = $this->fetch_page(['pagetype' => 'votes', 'pid' => 16, 'url' => '/mp/16/test_mp_g_party_2/test_westminster_constituency/votes']);
         $this->assertStringContainsString('Test MP G Party 2', $page);
 
         $this->assertStringNotContainsString('sometimes differs from their party colleagues', $page);

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

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
                 </div>
                 <?php endif; ?>
 
-                <?php $vote_count = isset($divisions) ? count($divisions) : 0;?>
+                <?php $vote_count = isset($divisions) ? count($divisions) : 0; ?>
 
                 <div class="panel">
                     <div class="policy-votes-intro">