mysociety / theyworkforyou

www/includes/easyparliament/templates/html/alert/_alert_form.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>
 

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(),
         ];
 

tests/AlertsPageTest.php

Spacing +15 added lines, -15 removed lines

@@ -25,66 +25,66 @@ 
     }
 
     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);
     }
 
     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);
     }
 
     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);
     }
 
@@ -93,12 +93,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);
     }
 
@@ -125,7 +125,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);
     }
 }