mysociety / theyworkforyou

scripts/alertgonemps.php

Braces +2 added lines, -1 removed lines

@@ -166,7 +166,8 @@
         $success = send_template_email($d, $m, true);
         mlog("sent ... ");
         # sleep if time between sending mails is less than a certain number of seconds on average
-        if (((time() - $start_time) / $sentemails) < 0.5) { # number of seconds per mail not to be quicker than
+        if (((time() - $start_time) / $sentemails) < 0.5) {
+# number of seconds per mail not to be quicker than
             mlog("pausing ... ");
             sleep(1);
         }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -154,7 +154,7 @@
     global $globalsuccess, $sentemails, $nomail, $start_time;
 
     $sentemails++;
-    mlog("SEND $sentemails : Sending email to $current[email] ... ");
+    mlog("send $sentemails : Sending email to $current[email] ... ");
     $d = ['to' => $current['email'], 'template' => $template];
     $m = [
         'DATA' => join("\n", $data),

scripts/mprss.php

Braces +2 added lines, -1 removed lines

@@ -106,7 +106,8 @@
     // Write the text to the file...
     $filename = $rsspath . $person_id . '.rdf';
     $fh = @fopen($filename, "w");
-    if (!$fh) { # Problem writing, just carry on
+    if (!$fh) {
+# Problem writing, just carry on
         echo "Could not write to file ($filename)\n";
         continue;
     }

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 foreach ($q as $person) {
     $person_id = $person['person_id'];
 
-    $args =  [ 'person_id' => $person_id ];
+    $args = ['person_id' => $person_id];
     $speeches = $HANSARDLIST->display('person', $args, 'none');
 
     // Some data about this person that we'll need for the feed.

tests/PageTest.php

Spacing +11 added lines, -11 removed lines

@@ -16,20 +16,20 @@ 
     }
 
     public function testQueenie() {
-        $page = $this->fetch_page([ 'representative_type' => 'royal', 'n' => 'elizabeth_the_second' ]);
+        $page = $this->fetch_page(['representative_type' => 'royal', 'n' => 'elizabeth_the_second']);
         $this->assertStringContainsString('Elizabeth the Second', $page);
         $this->assertStringContainsString('Coronated on 2 June 1953', $page);
     }
 
     public function testSittingMP() {
-        $page = $this->fetch_page([ 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency' ]);
+        $page = $this->fetch_page(['pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency']);
         $this->assertStringContainsString('Test Current-MP', $page);
         $this->assertMatchesRegularExpression('#<span class="person-header__about__position__constituency">\s*Test Westminster Constituency\s*</span>#', $page);
         $this->assertMatchesRegularExpression('#<span class="person-header__about__position__role">\s*Labour\s*MP\s*</span>#', $page);
     }
 
     public function testSittingMLA() {
-        $page = $this->fetch_page([ 'pid' => 4, 'representative_type' => 'mla', 'url' => '/mp/4/test_current-mla' ]);
+        $page = $this->fetch_page(['pid' => 4, 'representative_type' => 'mla', 'url' => '/mp/4/test_current-mla']);
         $this->assertStringContainsString('Test Current-MLA', $page);
         $this->assertMatchesRegularExpression('#<span class="person-header__about__position__constituency">\s*Test Northern Ireland Constituency\s*</span>#', $page);
         $this->assertMatchesRegularExpression('#<span class="person-header__about__position__role">\s*Sinn Féin\s*MLA\s*</span>#', $page);
@@ -39,7 +39,7 @@ 
      * Ensure that the Sinn Fein message is displayed for SF MPs.
      */
     public function testSittingSinnFeinMP() {
-        $page = $this->fetch_page([ 'pid' => 15, 'url' => '/mp/15/test_current-sf-mp/test_westminster_constituency' ]);
+        $page = $this->fetch_page(['pid' => 15, 'url' => '/mp/15/test_current-sf-mp/test_westminster_constituency']);
         $this->assertStringContainsString('Sinn F&eacute;in MPs do not take their seats in Parliament.', $page);
     }
 
@@ -47,7 +47,7 @@ 
      * Ensure that the Sinn Fein message is not displayed for non-SF MPs.
      */
     public function testSittingNonSinnFeinMP() {
-        $page = $this->fetch_page([ 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency' ]);
+        $page = $this->fetch_page(['pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency']);
         $this->assertStringNotContainsString('Sinn F&eacute;in MPs do not take their seats in Parliament.', $page);
     }
 
@@ -55,7 +55,7 @@ 
      * Ensure that the Speaker is given the correct constituency.
      */
     public function testSpeaker() {
-        $page = $this->fetch_page([ 'pid' => 13, 'url' => '/mp/13/test_speaker/buckingham' ]);
+        $page = $this->fetch_page(['pid' => 13, 'url' => '/mp/13/test_speaker/buckingham']);
         $this->assertMatchesRegularExpression('#<span class="person-header__about__position__role">\s*Speaker\s*MP\s*</span>#', $page);
     }
 
@@ -65,7 +65,7 @@ 
         # makes sure it is empty in case there's something hanging
         # about in memcached
         $banner->set_text('', "banner");
-        $page = $this->fetch_page([ 'url' => '/' ]);
+        $page = $this->fetch_page(['url' => '/']);
         $this->assertStringNotContainsString('<div class="banner">', $page);
         $this->assertStringNotContainsString('This is a banner', $page);
 
@@ -85,20 +85,20 @@ 
         ';
 
         $banner->set_text($banner_config, "banner");
-        $page = $this->fetch_page([ 'url' => '/' ]);
+        $page = $this->fetch_page(['url' => '/']);
         $this->assertStringContainsString('This is a banner', $page);
 
         $banner->set_text('', "banner");
-        $page = $this->fetch_page([ 'url' => '/' ]);
+        $page = $this->fetch_page(['url' => '/']);
         $this->assertStringNotContainsString('<div class="banner">', $page);
         $this->assertStringNotContainsString('This is a banner', $page);
     }
 
     public function testNewMPMessage() {
-        $page = $this->fetch_page([ 'pid' => 17, 'url' => '/mp/17/recent_mp/test_westminster_constituency' ]);
+        $page = $this->fetch_page(['pid' => 17, 'url' => '/mp/17/recent_mp/test_westminster_constituency']);
         $this->assertStringNotContainsString('is a recently elected MP', $page);
         self::$db->query('UPDATE member SET entered_house = NOW() WHERE person_id = 17');
-        $page = $this->fetch_page([ 'pid' => 17, 'url' => '/mp/17/recent_mp/test_westminster_constituency' ]);
+        $page = $this->fetch_page(['pid' => 17, 'url' => '/mp/17/recent_mp/test_westminster_constituency']);
         $this->assertStringContainsString('is a recently elected MP', $page);
     }
 

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->assertStringContainsString('MP, 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->assertStringContainsString('MP, 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);
     }
 

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

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