mysociety / theyworkforyou

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);
     }
 }

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

Indentation +7 added lines, -7 removed lines

@@ -20,8 +20,8 @@ 
   <h3><?= sprintf(gettext('Sign up for alerts when people matching <i>%s</i> speaks'), _htmlspecialchars($search_term)) ?></h3>
   <ul>
     <?php
-      foreach ($members as $row) {
-          ?>
+        foreach ($members as $row) {
+            ?>
       <li>
           <form action="<?= $actionurl ?>" method="post">
               <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
@@ -30,11 +30,11 @@ 
               <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']);
-          if ($row['constituency']) {
-              $name .= ' (' . gettext($row['constituency']) . ')';
-          }
-          printf(gettext('When %s speaks.'), $name);
-          ?>
+            if ($row['constituency']) {
+                $name .= ' (' . gettext($row['constituency']) . ')';
+            }
+            printf(gettext('When %s speaks.'), $name);
+            ?>
               <input type="submit" class="button small" value="<?= gettext('Subscribe') ?>"></form>
           </form>
       </li>

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

Indentation +2 added lines, -2 removed lines

@@ -137,10 +137,10 @@
                   <h3><?= gettext('Current keywords in this alert:') ?></h3>
                     <ul class="keyword-list">
                       <?php foreach ($keywords as $word) {
-                          if (!in_array($word, $skip_keyword_terms)) { ?>
+                            if (!in_array($word, $skip_keyword_terms)) { ?>
                           <li class="keyword-list__tag keyword-list__tag--included"><?= _htmlspecialchars($word) ?>
                       <?php }
-                          } ?>
+                            } ?>
                     </ul>
                   </div>
 

tests/SearchTest.php

Spacing +12 added lines, -12 removed lines

@@ -21,11 +21,11 @@ 
 
     public function testConstituencySearch() {
         $this->assertEquals(
-            [ [ 'Alyn and Deeside' ], false ],
+            [['Alyn and Deeside'], false],
             \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery('Alyn')
         );
         $this->assertEquals(
-            [ [ 'Alyn and Deeside' ], false ],
+            [['Alyn and Deeside'], false],
             \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery('Alyn and Deeside')
         );
     }
@@ -109,7 +109,7 @@ 
      * @group xapian
      */
     public function testSearchPage() {
-        $page = $this->fetch_page([ ]);
+        $page = $this->fetch_page([]);
         $this->assertStringContainsString('Search', $page);
     }
 
@@ -119,7 +119,7 @@ 
      * @group xapian
      */
     public function testSearchPageMP() {
-        $page = $this->fetch_page([ 'q' => 'Mary Smith' ]);
+        $page = $this->fetch_page(['q' => 'Mary Smith']);
         $this->assertStringContainsString('Mary Smith', $page);
         $this->assertMatchesRegularExpression('/MP +for Amber Valley/', $page);
     }
@@ -130,7 +130,7 @@ 
      * @group xapian
      */
     public function testSearchPageMultipleMP() {
-        $page = $this->fetch_page([ 'q' => 'Jones' ]);
+        $page = $this->fetch_page(['q' => 'Jones']);
         $this->assertStringContainsString('People matching <em class="current-search-term">Jones</em>', $page);
         $this->assertStringContainsString('Andrew Jones', $page);
         $this->assertStringContainsString('Simon Jones', $page);
@@ -142,7 +142,7 @@ 
      * @group xapian
      */
     public function testSearchPageCons() {
-        $page = $this->fetch_page([ 'q' => 'Amber' ]);
+        $page = $this->fetch_page(['q' => 'Amber']);
         $this->assertStringContainsString('MP for <em class="current-search-term">Amber</em>', $page);
         $this->assertStringContainsString('Mary Smith', $page);
     }
@@ -154,7 +154,7 @@ 
      * @group xapian
      */
     public function testSearchPageConsWithNoMp() {
-        $page = $this->fetch_page([ 'q' => 'Alyn' ]);
+        $page = $this->fetch_page(['q' => 'Alyn']);
         $this->assertStringNotContainsString('MP for <em class="current-search-term">Alyn</em>', $page);
         $this->assertStringNotContainsString('MPs in constituencies matching', $page);
     }
@@ -166,7 +166,7 @@ 
      * @group xapian
      */
     public function testSearchPageMultipleCons() {
-        $page = $this->fetch_page([ 'q' => 'Liverpool' ]);
+        $page = $this->fetch_page(['q' => 'Liverpool']);
         $this->assertStringContainsString('MPs in constituencies matching <em class="current-search-term">Liverpool</em>', $page);
         $this->assertStringContainsString('Susan Brown', $page);
         $this->assertMatchesRegularExpression('/MP +for Liverpool, Riverside/', $page);
@@ -180,7 +180,7 @@ 
      * @group xapian
      */
     public function testSearchPageGlossary() {
-        $page = $this->fetch_page([ 'q' => 'other place' ]);
+        $page = $this->fetch_page(['q' => 'other place']);
         $this->assertStringContainsString('Glossary items matching', $page);
         $this->assertStringContainsString('<a href="/glossary/?gl=1">&ldquo;other place', $page);
     }
@@ -191,7 +191,7 @@ 
      * @group xapian
      */
     public function testSearchPageSpellCorrect() {
-        $page = $this->fetch_page([ 'q' => 'plice' ]);
+        $page = $this->fetch_page(['q' => 'plice']);
         $this->assertStringContainsString('Did you mean <a href="/search/?q=place">place', $page);
     }
 
@@ -201,7 +201,7 @@ 
      * @group xapian
      */
     public function testSearchBySpeakerNoResults() {
-        $page = $this->fetch_page([ 'q' => 'splice', 'o' => 'p' ]);
+        $page = $this->fetch_page(['q' => 'splice', 'o' => 'p']);
         $this->assertStringContainsString('Who says splice the most', $page);
         $this->assertStringContainsString('No results', $page);
     }
@@ -228,7 +228,7 @@ 
      * @group xapian
      */
     public function testSearchPageRSS() {
-        $page = $this->fetch_page([ 'q' => 'test' ]);
+        $page = $this->fetch_page(['q' => 'test']);
         $this->assertStringContainsString('<a href="/search/rss/?s=test">get an RSS feed', $page);
     }
 

classes/AlertView/Standard.php

Spacing +6 added lines, -6 removed lines

@@ -455,7 +455,7 @@ 
             return;
         }
 
-        $cons_sort = function ($a, $b) {
+        $cons_sort = function($a, $b) {
             if ($a['rep_name'] == $b['rep_name']) {
                 if ($a['constituency'] == $b['constituency']) {
                     if ($a['member']->family_name == $b['member']->family_name) {
@@ -532,7 +532,7 @@ 
             foreach ($this->data['member_constituencies'] as $pid) {
                 try {
                     $MEMBER = new \MySociety\TheyWorkForYou\Member(['person_id' => $pid]);
-                    $cons[] = [ 'member' => $MEMBER, 'constituency' => $MEMBER->constituency, 'rep_name' => $MEMBER->getMostRecentMembership()['rep_name'] ];
+                    $cons[] = ['member' => $MEMBER, 'constituency' => $MEMBER->constituency, 'rep_name' => $MEMBER->getMostRecentMembership()['rep_name']];
                 } catch (\MySociety\TheyWorkForYou\MemberException $e) {
                     // do nothing
                 }
@@ -550,12 +550,12 @@ 
                         $q = $db->query("SELECT person_id FROM member WHERE constituency = :constituency AND house = :house and left_reason = 'still_in_office'", [':constituency' => $constituency, ':house' => $house]);
                         foreach ($q as $row) {
                             $MEMBER = new \MySociety\TheyWorkForYou\Member(['person_id' => $row['person_id'], 'house' => $house]);
-                            $cons[] = [ 'member' => $MEMBER, 'constituency' => $constituency, 'rep_name' => $MEMBER->getMostRecentMembership()['rep_name'] ];
+                            $cons[] = ['member' => $MEMBER, 'constituency' => $constituency, 'rep_name' => $MEMBER->getMostRecentMembership()['rep_name']];
                         }
 
                     } else {
                         $MEMBER = new \MySociety\TheyWorkForYou\Member(['constituency' => $constituency, 'house' => $house]);
-                        $cons[] = [ 'member' => $MEMBER, 'constituency' => $constituency ];
+                        $cons[] = ['member' => $MEMBER, 'constituency' => $constituency];
                     }
                 } catch (\MySociety\TheyWorkForYou\MemberException $e) {
                     // do nothing
@@ -721,7 +721,7 @@ 
                 if ($this->data['pid']) {
                     $criteria .= " speaker:" . $this->data['pid'];
                 }
-                $this->data['search_results']  = $this->getRecentResults($criteria);
+                $this->data['search_results'] = $this->getRecentResults($criteria);
             }
 
             $this->data['criteria'] = $criteria;
@@ -801,7 +801,7 @@ 
                 }
                 if ($add) {
                     $this->data['all_keywords'][] = $term;
-                    $alert['search_results']  = $this->getRecentResults($alert["criteria"]);
+                    $alert['search_results'] = $this->getRecentResults($alert["criteria"]);
                     $this->data['keyword_alerts'][] = $alert;
                 }
             }

classes/Utility/Search.php

Spacing +4 added lines, -4 removed lines

@@ -113,7 +113,7 @@ 
             }
         }
 
-        uasort($speakers, function ($a, $b) {
+        uasort($speakers, function($a, $b) {
 
             if ($a['count'] > $b['count']) {
                 return -1;
@@ -256,12 +256,12 @@ 
             if ($mp_only) {
                 $constituency = Postcode::postcodeToConstituency($searchterm);
                 if ($constituency) {
-                    return [ [$constituency], true ];
+                    return [[$constituency], true];
                 }
             } else {
                 $constituencies = Postcode::postcodeToConstituencies($searchterm);
                 if ($constituencies) {
-                    return [ $constituencies, true ];
+                    return [$constituencies, true];
                 }
             }
         }
@@ -280,7 +280,7 @@ 
             $constituencies[] = $row['name'];
         }
 
-        return [ $constituencies, false ];
+        return [$constituencies, false];
     }
 
     public static function searchMembersByConstituency($searchterm) {