mysociety / theyworkforyou

tests/AlertsPageTest.php

Spacing +5 added lines, -5 removed lines

@@ -21,31 +21,31 @@
     }
 
     public function testKeywordOnly() {
-        $page = $this->fetch_page([ 'alertsearch' => 'elephant']);
+        $page = $this->fetch_page(['alertsearch' => 'elephant']);
         $this->assertStringContainsString('Receive alerts when [elephant] is mentioned', $page);
     }
 
     public function testPostCodeOnly() {
-        $page = $this->fetch_page([ 'alertsearch' => 'SE17 3HE']);
+        $page = $this->fetch_page(['alertsearch' => 'SE17 3HE']);
         $this->assertStringContainsString('when 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);
     }

tests/UserPageTest.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
     }
 
     public function testEditUserInfo() {
-        $page = $this->fetch_user_page(['pg' => 'edit' ]);
+        $page = $this->fetch_user_page(['pg' => 'edit']);
         $this->assertStringContainsString('Edit your details', $page);
         $this->assertStringContainsString('name="pg" value="edit"', $page);
         $this->assertStringContainsString('value="Test"', $page);

tests/VotesTest.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     }
 
     private function fetch_votes_page() {
-        return $this->fetch_page([ 'pagetype' => 'votes', 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/votes' ]);
+        return $this->fetch_page(['pagetype' => 'votes', 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/votes']);
     }
 
     public function testVoteSummary() {

tests/DivisionsTest.php

Spacing +7 added lines, -7 removed lines

@@ -13,16 +13,16 @@ 
     }
 
     private function fetch_division_page() {
-        return $this->fetch_page([ 'pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions' ]);
+        return $this->fetch_page(['pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions']);
     }
 
     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');
     }
 
 
@@ -51,13 +51,13 @@ 
 
     public function testMPPageContainsAgreement() {
         // Checks this MP contains a reference to the agreement
-        $page = $this->fetch_page([ 'pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions' ]);
+        $page = $this->fetch_page(['pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions']);
         $this->assertStringContainsString('Example Agreement', $page);
     }
 
     public function testMPPageDoesNotContainsAgreement() {
         // Checks this MP does not contain agreement - should be out of time scope
-        $page = $this->fetch_page([ 'pagetype' => 'divisions', 'pid' => 6, 'policy' => 363, 'url' => '/mp/6/test_current-mp/test_westminster_constituency/divisions' ]);
+        $page = $this->fetch_page(['pagetype' => 'divisions', 'pid' => 6, 'policy' => 363, 'url' => '/mp/6/test_current-mp/test_westminster_constituency/divisions']);
         $this->assertStringNotContainsString('Example Agreement', $page);
         $this->assertStringNotContainsString('This person has not voted on this policy', $page);
 
@@ -121,7 +121,7 @@ 
     }
 
     public function testNotEnoughInfoStatement() {
-        return $this->fetch_page([ 'pagetype' => 'divisions', 'pid' => 2, 'policy' => 810, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions' ]);
+        return $this->fetch_page(['pagetype' => 'divisions', 'pid' => 2, 'policy' => 810, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions']);
         $this->assertStringContainsString('we don’t have enough information to calculate Test Current-MP’s position', $page);
     }
 
@@ -132,7 +132,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.

tests/SectionTest.php

Spacing +8 added lines, -8 removed lines

@@ -16,13 +16,13 @@ 
 
     public function testDebatesFront() {
         foreach ($this->types as $type) {
-            $this->fetch_page([ 'type' => $type ]);
+            $this->fetch_page(['type' => $type]);
         }
     }
 
     public function testDebatesYear() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page([ 'type' => $type, 'y' => '2014' ]);
+            $page = $this->fetch_page(['type' => $type, 'y' => '2014']);
             $this->assertStringContainsString('<div class="calendar">', $page);
             $this->assertStringContainsString('January', $page);
             $this->assertMatchesRegularExpression('/<td colspan="2">&nbsp;<\/td><td[^>]*><a href="\/' . $type . '\/\?d=2014-01-01">1<\/a><\/td><td[^>]*><span>2<\/span><\/td>/', $page);
@@ -31,7 +31,7 @@ 
 
     public function testDebatesDay() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page([ 'type' => $type, 'd' => '2014-01-01' ]);
+            $page = $this->fetch_page(['type' => $type, 'd' => '2014-01-01']);
             $this->assertStringContainsString('Wednesday,  1 January 2014', $page);
             $this->assertStringContainsString('HeadingA', $page);
             if ($type == 'wrans') {
@@ -56,7 +56,7 @@ 
                 continue;
             }
 
-            $page = $this->fetch_page([ 'type' => $type, 'id' => '2014-01-01b.1.1' ]);
+            $page = $this->fetch_page(['type' => $type, 'id' => '2014-01-01b.1.1']);
             if ($type == 'wrans') {
                 $this->assertMatchesRegularExpression("#All .*?written answers on  1 Jan 2014#i", $page);
                 $this->assertStringContainsString("QuestionA", $page);
@@ -68,7 +68,7 @@ 
 
     public function testDebatesSubheading() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page([ 'type' => $type, 'id' => '2014-01-01b.1.2' ]);
+            $page = $this->fetch_page(['type' => $type, 'id' => '2014-01-01b.1.2']);
             $this->assertStringContainsString("HeadingA", $page);
             if ($type == 'spwrans') {
                 $this->assertStringContainsString("QuestionA", $page);
@@ -98,7 +98,7 @@ 
 
     public function testDebatesSpeech() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page([ 'type' => $type, 'id' => '2014-01-01b.1.3' ]);
+            $page = $this->fetch_page(['type' => $type, 'id' => '2014-01-01b.1.3']);
             if ($type == 'wrans' || $type == 'spwrans' || $type == 'wms') {
                 $this->assertMatchesRegularExpression("#Location: .*?/$type/\?id=2014-01-01b\.1\.2#", $page);
             } else {
@@ -123,13 +123,13 @@ 
      * @group xapian
      */
     public function testGlossaryAndSearchHighlights() {
-        $page = $this->fetch_page([ 'type' => 'lords', 's' => 'constituency', 'id' => '2014-02-02b.1.3' ]);
+        $page = $this->fetch_page(['type' => 'lords', 's' => 'constituency', 'id' => '2014-02-02b.1.3']);
         $this->assertStringContainsString("constituency", $page);
         $this->assertStringContainsString("<span class=\"hi\"><a href=\"/glossary/?gl=1\" title=\"In a general election, each Constituency chooses an MP to represent them....\" class=\"glossary\">constituency</a></span>", $page);
     }
 
     public function testGidRedirect() {
-        $page = $this->fetch_page([ 'type' => 'wrans', 'id' => '2014-01-01a.187335.h' ]);
+        $page = $this->fetch_page(['type' => 'wrans', 'id' => '2014-01-01a.187335.h']);
         $this->assertMatchesRegularExpression("#Location: .*?/wrans/\?id=2014-01-01b\.1\.2#", $page);
     }
 }

classes/Utility/LibFilter.php

Spacing +4 added lines, -4 removed lines

@@ -153,7 +153,7 @@ 
 
     public function escape_comments($data) {
 
-        $data = preg_replace_callback("/<!--(.*?)-->/s", function ($matches) {
+        $data = preg_replace_callback("/<!--(.*?)-->/s", function($matches) {
             return '<!--' . HtmlSpecialChars($this->StripSingle($matches[1])) . '-->';
         }, $data);
 
@@ -203,7 +203,7 @@ 
 
     public function check_tags($data) {
 
-        $data = preg_replace_callback("/<(.*?)>/s", function ($matches) {
+        $data = preg_replace_callback("/<(.*?)>/s", function($matches) {
             return $this->process_tag($this->StripSingle($matches[1]));
         }, $data);
 
@@ -391,7 +391,7 @@ 
 
         $data = preg_replace_callback(
             '/(^|[^\w\s\';,\\-])(\s*)([a-z])/',
-            function ($m) {
+            function($m) {
                 return $m[1] . $m[2] . strtoupper($m[3]);
             },
             $data
@@ -432,7 +432,7 @@ 
 
         $data = preg_replace_callback(
             '!&([^&;]*)(?=(;|&|$))!',
-            function ($matches) {
+            function($matches) {
                 return $this->check_entity($this->StripSingle($matches[1]), $this->StripSingle($matches[2]));
             },
             $data

classes/Utility/Wikipedia.php

Spacing +7 added lines, -7 removed lines

@@ -106,7 +106,7 @@ 
         }
 
         # Sort into order, largest first
-        usort($phrases, function ($a, $b) {
+        usort($phrases, function($a, $b) {
             return strlen($a) < strlen($b);
         });
 
@@ -156,31 +156,31 @@ 
 
     public static function antiTagInTag($content = '', $format = 'htmlhead') {
         $tagend = -1;
-        for($tagstart = strpos($content, '<', $tagend + 1) ; $tagstart !== false && $tagstart < strlen($content); $tagstart = strpos($content, '<', $tagend)) {
+        for ($tagstart = strpos($content, '<', $tagend + 1); $tagstart !== false && $tagstart < strlen($content); $tagstart = strpos($content, '<', $tagend)) {
             // got the start of a tag.  Now find the proper end!
             $walker = $tagstart + 1;
             $open = 1;
-            while($open != 0 && $walker < strlen($content)) {
+            while ($open != 0 && $walker < strlen($content)) {
                 $nextopen = strpos($content, '<', $walker);
                 $nextclose = strpos($content, '>', $walker);
-                if($nextclose === false) {
+                if ($nextclose === false) {
                     // ERROR! Open waka without close waka!
                     // echo '<code>Error in antiTagInTag - malformed tag!</code> ';
                     return $content;
                 }
-                if($nextopen === false || $nextopen > $nextclose) {
+                if ($nextopen === false || $nextopen > $nextclose) {
                     // No more opens, but there was a close; or, a close happens before the next open.
                     // walker goes to the close+1, and open decrements
                     $open--;
                     $walker = $nextclose + 1;
-                } elseif($nextopen < $nextclose) {
+                } elseif ($nextopen < $nextclose) {
                     // an open before the next close
                     $open++;
                     $walker = $nextopen + 1;
                 }
             }
             $tagend = $walker;
-            if($tagend > strlen($content)) {
+            if ($tagend > strlen($content)) {
                 $tagend = strlen($content);
             } else {
                 $tagend--;

classes/Search/Normal.php

Spacing +5 added lines, -5 removed lines

@@ -12,7 +12,7 @@ 
         }
 
         $o = get_http_var('o');
-        $args =  [
+        $args = [
             's' => $this->searchstring,
             'p' => $pagenum,
             'num' => get_http_var('num'),
@@ -246,22 +246,22 @@ 
 
             if ($page != 1) {
                 $prev_page = $page - 1;
-                $URL->insert([ 'p' => $prev_page ]);
+                $URL->insert(['p' => $prev_page]);
                 $pagelinks['prev'] = [
                     'url' => $URL->generate(),
                 ];
-                $URL->insert([ 'p' => 1 ]);
+                $URL->insert(['p' => 1]);
                 $pagelinks['firstpage'] = [
                     'url' => $URL->generate(),
                 ];
             }
             if ($page != $numpages) {
                 $next_page = $page + 1;
-                $URL->insert([ 'p' => $next_page ]);
+                $URL->insert(['p' => $next_page]);
                 $pagelinks['next'] = [
                     'url' => $URL->generate(),
                 ];
-                $URL->insert([ 'p' => $numpages ]);
+                $URL->insert(['p' => $numpages]);
                 $pagelinks['lastpage'] = [
                     'url' => $URL->generate(),
                 ];

classes/Divisions.php

Spacing +5 added lines, -5 removed lines

@@ -68,7 +68,7 @@ 
         $where = [];
         if ($houses) {
             if (is_string($houses)) {
-                $houses = [ $houses ];
+                $houses = [$houses];
             }
             $where[] = 'house IN ("' . implode('", "', $houses) . '")';
         }
@@ -410,7 +410,7 @@ 
                     FROM person_names AS pn
                     WHERE person_id = :person_id
                     AND start_date <= :division_date AND end_date >= :division_date",
-                    [ ':person_id' => $vote['proxy'], ':division_date' => $row['division_date'] ]
+                    [':person_id' => $vote['proxy'], ':division_date' => $row['division_date']]
                 )->first();
                 $detail['proxy'] = ucfirst(member_full_name(
                     HOUSE_TYPE_COMMONS,
@@ -438,7 +438,7 @@ 
 
         foreach ($votes as $vote => $count) { // array('yes_votes', 'no_votes', 'absent_votes', 'both_votes') as $vote) {
             $votes[$vote . '_by_party'] = $votes[$vote];
-            usort($votes[$vote . '_by_party'], function ($a, $b) {
+            usort($votes[$vote . '_by_party'], function($a, $b) {
                 return $a['party'] > $b['party'];
             });
         }
@@ -561,7 +561,7 @@ 
     }
 
     private function constructYesNoVoteDescription($direction, $title, $short_text) {
-        $text = ' ' ;
+        $text = ' ';
         if ($short_text) {
             $text .= sprintf(gettext('voted %s'), $short_text);
         } else {
@@ -711,7 +711,7 @@ 
 
         $gid = get_canonical_gid($gid);
 
-        $q = $this->db->query("SELECT gid, major FROM hansard WHERE epobject_id = ( SELECT subsection_id FROM hansard WHERE gid = :gid )", [ ':gid' => $gid ])->first();
+        $q = $this->db->query("SELECT gid, major FROM hansard WHERE epobject_id = ( SELECT subsection_id FROM hansard WHERE gid = :gid )", [':gid' => $gid])->first();
         if (!$q) {
             return '';
         }