mysociety / theyworkforyou

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/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) {

www/includes/easyparliament/glossary.php

Spacing +7 added lines, -7 removed lines

@@ -24,12 +24,12 @@ 
 include_once INCLUDESPATH . "easyparliament/searchengine.php";
 
 class GLOSSARY {
-    public $num_terms;			// how many glossary entries do we have
+    public $num_terms; // how many glossary entries do we have
     // (changes depending on how GLOSSARY is called
-    public $hansard_count;		// how many times does the phrase appear in hansard?
-    public $query;				// search term
-    public $glossary_id;		// if this is set then we only have 1 glossary term
-    public $current_term;		// will only be set if we have a valid epobject_id
+    public $hansard_count; // how many times does the phrase appear in hansard?
+    public $query; // search term
+    public $glossary_id; // if this is set then we only have 1 glossary term
+    public $current_term; // will only be set if we have a valid epobject_id
     public $current_letter;
 
     // constructor...
@@ -72,7 +72,7 @@ 
 
         // These stop stupid submissions.
         // everything should be lowercase.
-        $this->stopwords = [ "the", "of", "to", "and", "for", "in", "a", "on", "is", "that", "will", "secretary", "are", "ask", "state", "have", "be", "has", "by", "with", "i", "not", "what", "as", "it", "hon", "he", "which", "from", "if", "been", "this", "s", "we", "at", "government", "was", "my", "an", "department", "there", "make", "or", "made", "their", "all", "but", "they", "how", "debate" ];
+        $this->stopwords = ["the", "of", "to", "and", "for", "in", "a", "on", "is", "that", "will", "secretary", "are", "ask", "state", "have", "be", "has", "by", "with", "i", "not", "what", "as", "it", "hon", "he", "which", "from", "if", "been", "this", "s", "we", "at", "government", "was", "my", "an", "department", "there", "make", "or", "made", "their", "all", "but", "they", "how", "debate"];
 
     }
 
@@ -365,7 +365,7 @@ 
         if ($return_expansions) {
             global $expansions;
             $expansions = [];
-            $body = preg_replace_callback($findwords, function ($matches) {
+            $body = preg_replace_callback($findwords, function($matches) {
                 global $expansions, $replacemap, $titlemap;
                 $lc_match = strtolower($matches[0]);
                 $expansions = $expansions + [$matches[0] => $titlemap[$lc_match]];

classes/AlertView/Standard.php

Spacing +5 added lines, -5 removed lines

@@ -466,7 +466,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) {
@@ -543,7 +543,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
                 }
@@ -561,12 +561,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
@@ -732,7 +732,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;