mysociety / theyworkforyou

scripts/video-speed.php

Braces +6 added lines, -2 removed lines

@@ -26,9 +26,13 @@
         $body = strip_tags($q->field($i, 'body'));
         $qq = $db->query('select time_to_sec(atime) as atime from hansard,video_timestamps where hansard.gid=video_timestamps.gid and deleted=0 and video_status in (5,7) and hdate="' . $hdate . '" and hpos=' . ($hpos+1) . ' group by video_timestamps.gid');
         $next_atime = $qq->field(0, 'atime');
-        if (!$next_atime) continue;
+        if (!$next_atime) {
+            continue;
+        }
         $duration = $next_atime - $atime;
-        if ($duration<=0) continue;
+        if ($duration<=0) {
+            continue;
+        }
         $words = preg_split('/\W+/', $body, -1, PREG_SPLIT_NO_EMPTY);
         $num_words = count($words);
         $speed = $num_words / ($duration/60);

Spacing +9 added lines, -9 removed lines

@@ -5,7 +5,7 @@ 
 $db = new ParlDB;
 
 $q = $db->query('select distinct(person_id) from hansard where video_status in (5,7) and person_id>0 limit 5');
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $spid = $q->field($i, 'person_id');
     calculate_speed($db, $spid);
 }
@@ -18,20 +18,20 @@ 
     $total_words = 0;
     $total_speed = 0;
     $num = 0;
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $hpos = $q->field($i, 'hpos');
         $hdate = $q->field($i, 'hdate');
         $gid = $q->field($i, 'gid');
         $atime = $q->field($i, 'atime');
         $body = strip_tags($q->field($i, 'body'));
-        $qq = $db->query('select time_to_sec(atime) as atime from hansard,video_timestamps where hansard.gid=video_timestamps.gid and deleted=0 and video_status in (5,7) and hdate="' . $hdate . '" and hpos=' . ($hpos+1) . ' group by video_timestamps.gid');
+        $qq = $db->query('select time_to_sec(atime) as atime from hansard,video_timestamps where hansard.gid=video_timestamps.gid and deleted=0 and video_status in (5,7) and hdate="' . $hdate . '" and hpos=' . ($hpos + 1) . ' group by video_timestamps.gid');
         $next_atime = $qq->field(0, 'atime');
         if (!$next_atime) continue;
         $duration = $next_atime - $atime;
-        if ($duration<=0) continue;
+        if ($duration <= 0) continue;
         $words = preg_split('/\W+/', $body, -1, PREG_SPLIT_NO_EMPTY);
         $num_words = count($words);
-        $speed = $num_words / ($duration/60);
+        $speed = $num_words / ($duration / 60);
         $total_speed += $speed;
         print "$gid, $num_words words, from $atime to $next_atime, duration $duration s, speed $speed wpm\n";
         $total += $duration;
@@ -39,12 +39,12 @@ 
         $num++;
     }
 
-    $total_min = $total/60;
+    $total_min = $total / 60;
 
     print "Person ID $spid\n";
-    print "Average length = " . ($total/$num) . "s\n";
-    print "Average speed = " . ($total_words/$total_min) . "wpm\n";
-    print "Average of speeds = " . ($total_speed/$num) . "wpm\n";
+    print "Average length = " . ($total / $num) . "s\n";
+    print "Average speed = " . ($total_words / $total_min) . "wpm\n";
+    print "Average of speeds = " . ($total_speed / $num) . "wpm\n";
     print "\n";
 }
 

tests/MemberTest.php

Indentation +8 added lines, -8 removed lines

@@ -325,10 +325,10 @@ 
 
         $msps = array(
             array(
-             'person_id' => "19",
-              'name' => "Mr Regional MSP1",
-              'constituency' => "Mid Scotland and Fife",
-              'house' => "4"
+                'person_id' => "19",
+                'name' => "Mr Regional MSP1",
+                'constituency' => "Mid Scotland and Fife",
+                'house' => "4"
             ),
             array(
                 'person_id' => "20",
@@ -340,10 +340,10 @@ 
         $this->assertEquals($msps, \MySociety\TheyWorkForYou\Member::getRegionalList('KY16 8YG', 4, 'SPE'));
         $mlas = array(
             array(
-              'person_id' => "21",
-              'name' => "Mr Regional MLA1",
-              'constituency' => "Belfast West",
-              'house' => "3"
+                'person_id' => "21",
+                'name' => "Mr Regional MLA1",
+                'constituency' => "Belfast West",
+                'house' => "3"
             ),
             array(
                 'person_id' => "22",

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/member.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/member.xml');
     }
 
     /**

tests/PostcodeTest.php

Indentation +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
     /**
      * Test converting a postcode to a constituency
      */
-	public function testPostcodeToConstituency()
+    public function testPostcodeToConstituency()
     {
         $this->assertEquals(
             'Cities of London and Westminster',

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/postcode.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/postcode.xml');
     }
 
     /**

tests/CommentTest.php

Indentation +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     /**
      * Ensures the database is prepared and the comment class is included for every test.
      */
-	public function setUp() {
+    public function setUp() {
 
         parent::setUp();
 

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/comment.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/comment.xml');
     }
 
     /**
@@ -56,7 +56,7 @@ 
     public function testHTMLCleaningOfAngleBrackets() {
         $text = 'Is 2 < 3?';
 
-        $this->assertEquals('Is 2 &lt; 3?', filter_user_input( $text, 'comment' ) );
+        $this->assertEquals('Is 2 &lt; 3?', filter_user_input($text, 'comment'));
     }
 
     public function testHTMLCleaningWithNonASCIIChars()

tests/UserTest.php

Indentation +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
         );
 
         $expectedTable = $this->createXmlDataSet(dirname(__FILE__).'/_fixtures/expectedTokens.xml')
-                              ->getTable("tokens");
+                                ->getTable("tokens");
         $this->assertTablesEqual($expectedTable, $queryTable);
 
         $alertCount = $this->getConnection()->getRowCount('alerts', 'email = "user@example.org"');

Spacing +17 added lines, -17 removed lines

@@ -11,7 +11,7 @@ 
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/user.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/user.xml');
     }
 
     /**
@@ -44,8 +44,8 @@ 
         $id = $u->user_id();
         $u->init($id);
 
-        $this->assertEquals( 'Test', $u->firstname() );
-        $this->assertEquals( 'EH1 99SP', $u->postcode() );
+        $this->assertEquals('Test', $u->firstname());
+        $this->assertEquals('EH1 99SP', $u->postcode());
     }
 
     public function testEditUser() {
@@ -53,9 +53,9 @@ 
         $u = new THEUSER();
         $u->loggedin = 1;
 
-        $this->assertEquals( 'Test', $u->firstname() );
+        $this->assertEquals('Test', $u->firstname());
 
-        $d = $u->update_self( array(
+        $d = $u->update_self(array(
             'firstname' => 'Experiment',
             'lastname' => 'User',
             'emailpublic' => '0',
@@ -64,9 +64,9 @@ 
             'url' => '',
             'optin' => '',
             'user_id' => 1
-        ) );
+        ));
 
-        $this->assertEquals( 'Experiment', $u->firstname() );
+        $this->assertEquals('Experiment', $u->firstname());
     }
 
     public function testEditUserEmail() {
@@ -74,9 +74,9 @@ 
         $u = new THEUSER();
         $u->loggedin = 1;
 
-        $this->assertEquals( 'user@example.org', $u->email() );
+        $this->assertEquals('user@example.org', $u->email());
 
-        $d = $u->update_self( array(
+        $d = $u->update_self(array(
             'firstname' => 'Experiment',
             'lastname' => 'User',
             'email' => 'user@example.com',
@@ -86,10 +86,10 @@ 
             'url' => '',
             'optin' => '',
             'user_id' => 1
-        ), false );
+        ), false);
 
         // email should not change as user needs to confirm
-        $this->assertEquals( 'user@example.org', $u->email() );
+        $this->assertEquals('user@example.org', $u->email());
 
         $tokenCount = $this->getConnection()->getRowCount('tokens', 'data = "1::user@example.com"');
         $this->assertEquals(1, $tokenCount, 'correct number of email confirm tokens');
@@ -99,7 +99,7 @@ 
             'tokens', 'SELECT type, data FROM tokens WHERE data = "1::user@example.com"'
         );
 
-        $expectedTable = $this->createXmlDataSet(dirname(__FILE__).'/_fixtures/expectedTokens.xml')
+        $expectedTable = $this->createXmlDataSet(dirname(__FILE__) . '/_fixtures/expectedTokens.xml')
                               ->getTable("tokens");
         $this->assertTablesEqual($expectedTable, $queryTable);
 
@@ -113,9 +113,9 @@ 
         $tokenRow = $queryTable->getRow(0);
         $token = '2-' . $tokenRow['token'];
 
-        $u->confirm_email($token,false);
+        $u->confirm_email($token, false);
 
-        $this->assertEquals( 'user@example.com', $u->email(), 'confirming with token updates email address' );
+        $this->assertEquals('user@example.com', $u->email(), 'confirming with token updates email address');
         $tokenCount = $this->getConnection()->getRowCount('tokens', 'data = "1::user@example.com"');
         $this->assertEquals(0, $tokenCount, 'token deleted once email confirmed');
 
@@ -131,15 +131,15 @@ 
         $u = new THEUSER();
         $u->loggedin = 1;
 
-        $this->assertEquals( 'user@example.org', $u->email(), 'confirming inital email address' );
+        $this->assertEquals('user@example.org', $u->email(), 'confirming inital email address');
 
         $tokenCount = $this->getConnection()->getRowCount('tokens', 'data = "1::user@example.net"');
         $this->assertEquals(1, $tokenCount, 'correct number of email confirm tokens');
 
         $token = '2-lkdsjafhsadjhf';
 
-        $u->confirm_email($token,false);
-        $this->assertEquals( 'user@example.org', $u->email(), 'expired token does not update email address' );
+        $u->confirm_email($token, false);
+        $this->assertEquals('user@example.org', $u->email(), 'expired token does not update email address');
 
         $tokenCount = $this->getConnection()->getRowCount('tokens', 'data = "1::user@example.net"');
         $this->assertEquals(1, $tokenCount, 'correct number of email confirm tokens');

tests/PageTest.php

Indentation +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
         $this->assertContains('<span class="party Lab">Labour</span>', $page);
     }
 
-	public function testSittingMLA()
+    public function testSittingMLA()
     {
         $page = $this->fetch_page( array( 'pid' => 4, 'url' => '/mp/4/test_current-mla/test_northern_ireland_constituency' ) );
         $this->assertContains('Test Current-MLA', $page);
@@ -63,7 +63,7 @@ 
     /**
      * Ensure that the Speaker is given the correct constituency.
      */
-	public function testSpeaker()
+    public function testSpeaker()
     {
         $page = $this->fetch_page( array( 'pid' => 13, 'url' => '/mp/13/test_speaker/buckingham' ) );
         $this->assertContains('<span class="party SPK">Speaker</span>', $page);

Spacing +12 added lines, -12 removed lines

@@ -11,7 +11,7 @@ 
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/member.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/member.xml');
     }
 
     private function fetch_page($vars)
@@ -21,14 +21,14 @@ 
 
     public function testQueenie()
     {
-        $page = $this->fetch_page( array( 'royal' => 1, 'n' => 'elizabeth_the_second' ) );
+        $page = $this->fetch_page(array('royal' => 1, 'n' => 'elizabeth_the_second'));
         $this->assertContains('Elizabeth the Second', $page);
         $this->assertContains('Coronated on 2 June 1953', $page);
     }
 
     public function testSittingMP()
     {
-        $page = $this->fetch_page( array( 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency'));
         $this->assertContains('Test Current-MP', $page);
         $this->assertContains('<span class="constituency">Test Westminster Constituency</span>', $page);
         $this->assertContains('<span class="party Lab">Labour</span>', $page);
@@ -36,7 +36,7 @@ 
 
 	public function testSittingMLA()
     {
-        $page = $this->fetch_page( array( 'pid' => 4, 'url' => '/mp/4/test_current-mla/test_northern_ireland_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 4, 'url' => '/mp/4/test_current-mla/test_northern_ireland_constituency'));
         $this->assertContains('Test Current-MLA', $page);
         $this->assertContains('<span class="constituency">Test Northern Ireland Constituency</span>', $page);
         $this->assertContains('<span class="party SinnFéin">Sinn Féin</span>', $page);
@@ -47,7 +47,7 @@ 
      */
     public function testSittingSinnFeinMP()
     {
-        $page = $this->fetch_page( array( 'pid' => 15, 'url' => '/mp/15/test_current-sf-mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 15, 'url' => '/mp/15/test_current-sf-mp/test_westminster_constituency'));
         $this->assertContains('Sinn F&eacute;in MPs do not take their seats in Parliament.', $page);
     }
 
@@ -56,7 +56,7 @@ 
      */
     public function testSittingNonSinnFeinMP()
     {
-        $page = $this->fetch_page( array( 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency'));
         $this->assertNotContains('Sinn F&eacute;in MPs do not take their seats in Parliament.', $page);
     }
 
@@ -65,7 +65,7 @@ 
      */
 	public function testSpeaker()
     {
-        $page = $this->fetch_page( array( 'pid' => 13, 'url' => '/mp/13/test_speaker/buckingham' ) );
+        $page = $this->fetch_page(array('pid' => 13, 'url' => '/mp/13/test_speaker/buckingham'));
         $this->assertContains('<span class="party SPK">Speaker</span>', $page);
     }
 
@@ -75,25 +75,25 @@ 
         # makes sure it is empty in case there's something hanging
         # about in memcached
         $banner->set_text('');
-        $page = $this->fetch_page( array( 'url' => '/' ) );
+        $page = $this->fetch_page(array('url' => '/'));
         $this->assertNotContains('<div class="banner">', $page);
         $this->assertNotContains('This is a banner', $page);
 
         $banner->set_text('This is a banner');
-        $page = $this->fetch_page( array( 'url' => '/' ) );
+        $page = $this->fetch_page(array('url' => '/'));
         $this->assertContains('This is a banner', $page);
 
         $banner->set_text('');
-        $page = $this->fetch_page( array( 'url' => '/' ) );
+        $page = $this->fetch_page(array('url' => '/'));
         $this->assertNotContains('<div class="banner">', $page);
         $this->assertNotContains('This is a banner', $page);
     }
 
     public function testNewMPMessage() {
-        $page = $this->fetch_page( array( 'pid' => 17, 'url' => '/mp/17/recent_mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 17, 'url' => '/mp/17/recent_mp/test_westminster_constituency'));
         $this->assertNotContains('is a recently elected MP', $page);
         $this->db->query('UPDATE member SET entered_house = NOW() WHERE person_id = 17');
-        $page = $this->fetch_page( array( 'pid' => 17, 'url' => '/mp/17/recent_mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 17, 'url' => '/mp/17/recent_mp/test_westminster_constituency'));
         $this->assertContains('is a recently elected MP', $page);
     }
 

tests/GlossaryTest.php

Indentation +11 added lines, -11 removed lines

@@ -17,8 +17,8 @@ 
     /**
      * Ensures the database is prepared and the glossary class is included for every test.
      */
-	public function setUp()
-	{
+    public function setUp()
+    {
         parent::setUp();
         
         include_once('www/includes/easyparliament/glossary.php');
@@ -27,10 +27,10 @@ 
     /**
      * Test that glossarising a single word works as expected.
      */
-	public function testGlossariseNormal()
+    public function testGlossariseNormal()
     {
         $args['sort'] = "regexp_replace";
-		$glossary = new GLOSSARY($args);
+        $glossary = new GLOSSARY($args);
 		
         $this->assertEquals('<a href="/glossary/?gl=1" title="In a general election, each Constituency chooses an MP to represent them...." class="glossary">constituency</a>', $glossary->glossarise('constituency'));
     }
@@ -41,7 +41,7 @@ 
     public function testGlossariseInLink()
     {
         $args['sort'] = "regexp_replace";
-		$glossary = new GLOSSARY($args);
+        $glossary = new GLOSSARY($args);
 		
         $this->assertEquals('<a href="#">constituency</a>', $glossary->glossarise('<a href="#">constituency</a>'));
     }
@@ -52,7 +52,7 @@ 
     public function testGlossariseInString()
     {
         $args['sort'] = "regexp_replace";
-		$glossary = new GLOSSARY($args);
+        $glossary = new GLOSSARY($args);
 		
         $this->assertEquals('fooconstituencybar', $glossary->glossarise('fooconstituencybar'));
     }
@@ -63,7 +63,7 @@ 
     public function testGlossariseInSpacedString()
     {
         $args['sort'] = "regexp_replace";
-		$glossary = new GLOSSARY($args);
+        $glossary = new GLOSSARY($args);
 		
         $this->assertEquals('foo <a href="/glossary/?gl=1" title="In a general election, each Constituency chooses an MP to represent them...." class="glossary">constituency</a> bar', $glossary->glossarise('foo constituency bar'));
     }
@@ -74,7 +74,7 @@ 
     public function testWikipediaLinkNormal()
     {
         $args['sort'] = "regexp_replace";
-		$glossary = new GLOSSARY($args);
+        $glossary = new GLOSSARY($args);
 		
         $this->assertEquals('<a href="https://en.wikipedia.org/wiki/MP">MP</a>', $glossary->glossarise('MP'));
     }
@@ -85,7 +85,7 @@ 
     public function testWikipediaLinkInLink()
     {
         $args['sort'] = "regexp_replace";
-		$glossary = new GLOSSARY($args);
+        $glossary = new GLOSSARY($args);
 		
         $this->assertEquals('<a href="#">MP</a>', $glossary->glossarise('<a href="#">MP</a>'));
     }
@@ -96,7 +96,7 @@ 
     public function testWikipediaLinkInString()
     {
         $args['sort'] = "regexp_replace";
-		$glossary = new GLOSSARY($args);
+        $glossary = new GLOSSARY($args);
 		
         $this->assertEquals('fooMPbar', $glossary->glossarise('fooMPbar'));
     }
@@ -107,7 +107,7 @@ 
     public function testWikipediaLinkInSpacedString()
     {
         $args['sort'] = "regexp_replace";
-		$glossary = new GLOSSARY($args);
+        $glossary = new GLOSSARY($args);
 		
         $this->assertEquals('foo <a href="https://en.wikipedia.org/wiki/MP">MP</a> bar', $glossary->glossarise('foo MP bar'));
     }

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/glossary.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/glossary.xml');
     }
 
     /**

tests/UtilityTest.php

Indentation +3 added lines, -3 removed lines

@@ -6,8 +6,8 @@ 
 
 class UtilityTest extends PHPUnit_Framework_TestCase
 {
-	public function setUp()
-	{
+    public function setUp()
+    {
         parent::setUp();
         include_once('www/includes/utility.php');
     }
@@ -16,7 +16,7 @@ 
      * Test the escaping of replacement strings for use with
      * preg_replace.
      */
-	public function testPregReplacement()
+    public function testPregReplacement()
     {
         $example = 'try \1 and $0, also backslash \ and dollar $ alone';
         $this->assertEquals(

tests/SectionTest.php

Indentation +6 added lines, -6 removed lines

@@ -18,13 +18,13 @@ 
 
     var $types = array('debates', 'whall', 'wrans', 'wms', 'ni', 'sp', 'spwrans', 'lords');
 
-	public function testDebatesFront() {
+    public function testDebatesFront() {
         foreach ($this->types as $type) {
             $this->fetch_page( array( 'type' => $type ) );
         }
     }
 
-	public function testDebatesYear() {
+    public function testDebatesYear() {
         foreach ($this->types as $type) {
             $page = $this->fetch_page( array( 'type' => $type, 'y' => '2014' ) );
             $this->assertContains('<div class="calendar">', $page);
@@ -33,7 +33,7 @@ 
         }
     }
 
-	public function testDebatesDay() {
+    public function testDebatesDay() {
         foreach ($this->types as $type) {
             $page = $this->fetch_page( array( 'type' => $type, 'd' => '2014-01-01' ) );
             $this->assertContains('Wednesday, 1 January 2014', $page);
@@ -53,7 +53,7 @@ 
         }
     }
 
-	public function testDebatesHeading() {
+    public function testDebatesHeading() {
         foreach ($this->types as $type) {
             if ($type == 'spwrans') {
                 # Only one level of headings on spwrans
@@ -70,7 +70,7 @@ 
         }
     }
 
-	public function testDebatesSubheading() {
+    public function testDebatesSubheading() {
         foreach ($this->types as $type) {
             $page = $this->fetch_page( array( 'type' => $type, 'id' => '2014-01-01b.1.2' ) );
             $this->assertContains("HeadingA", $page);
@@ -99,7 +99,7 @@ 
         }
     }
 
-	public function testDebatesSpeech() {
+    public function testDebatesSpeech() {
         foreach ($this->types as $type) {
             $page = $this->fetch_page( array( 'type' => $type, 'id' => '2014-01-01b.1.3' ) );
             if ($type == 'wrans' || $type == 'spwrans' || $type == 'wms') {

Spacing +8 added lines, -8 removed lines

@@ -20,13 +20,13 @@ 
 
 	public function testDebatesFront() {
         foreach ($this->types as $type) {
-            $this->fetch_page( array( 'type' => $type ) );
+            $this->fetch_page(array('type' => $type));
         }
     }
 
 	public function testDebatesYear() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page( array( 'type' => $type, 'y' => '2014' ) );
+            $page = $this->fetch_page(array('type' => $type, 'y' => '2014'));
             $this->assertContains('<div class="calendar">', $page);
             $this->assertContains('January', $page);
             $this->assertRegExp('/<td colspan="2">&nbsp;<\/td><td[^>]*><a href="\/' . $type . '\/\?d=2014-01-01">1<\/a><\/td><td[^>]*><span>2<\/span><\/td>/', $page);
@@ -35,7 +35,7 @@ 
 
 	public function testDebatesDay() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page( array( 'type' => $type, 'd' => '2014-01-01' ) );
+            $page = $this->fetch_page(array('type' => $type, 'd' => '2014-01-01'));
             $this->assertContains('Wednesday, 1 January 2014', $page);
             $this->assertContains('HeadingA', $page);
             if ($type == 'wrans') {
@@ -60,7 +60,7 @@ 
                 continue;
             }
 
-            $page = $this->fetch_page( array( 'type' => $type, 'id' => '2014-01-01b.1.1' ) );
+            $page = $this->fetch_page(array('type' => $type, 'id' => '2014-01-01b.1.1'));
             if ($type == 'wrans') {
                 $this->assertRegexp("#All .*?written answers on 1 Jan 2014#i", $page);
                 $this->assertContains("QuestionA", $page);
@@ -72,7 +72,7 @@ 
 
 	public function testDebatesSubheading() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page( array( 'type' => $type, 'id' => '2014-01-01b.1.2' ) );
+            $page = $this->fetch_page(array('type' => $type, 'id' => '2014-01-01b.1.2'));
             $this->assertContains("HeadingA", $page);
             if ($type == 'spwrans') {
                 $this->assertContains("QuestionA", $page);
@@ -101,7 +101,7 @@ 
 
 	public function testDebatesSpeech() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page( array( 'type' => $type, 'id' => '2014-01-01b.1.3' ) );
+            $page = $this->fetch_page(array('type' => $type, 'id' => '2014-01-01b.1.3'));
             if ($type == 'wrans' || $type == 'spwrans' || $type == 'wms') {
                 $this->assertRegexp("#Location: .*?/$type/\?id=2014-01-01b\.1\.2#", $page);
             } else {
@@ -125,13 +125,13 @@ 
      * @group xapian
      */
     public function testGlossaryAndSearchHighlights() {
-            $page = $this->fetch_page( array( 'type' => 'lords', 's' => 'constituency', 'id' => '2014-02-02b.1.3' ) );
+            $page = $this->fetch_page(array('type' => 'lords', 's' => 'constituency', 'id' => '2014-02-02b.1.3'));
             $this->assertContains("constituency", $page);
             $this->assertContains("<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( array( 'type' => 'wrans', 'id' => '2014-01-01a.187335.h' ) );
+        $page = $this->fetch_page(array('type' => 'wrans', 'id' => '2014-01-01a.187335.h'));
         $this->assertRegexp("#Location: .*?/wrans/\?id=2014-01-01b\.1\.2#", $page);
     }
 }

Braces +16 added lines, -8 removed lines

@@ -41,12 +41,15 @@ 
             if ($type == 'wrans') {
                 $this->assertContains('DepartmentA', $page);
                 $this->assertContains('QuestionA', $page);
-            } elseif ($type == 'spwrans') {
+            }
+            elseif ($type == 'spwrans') {
                 $this->assertContains('QuestionA', $page);
-            } elseif ($type == 'wms') {
+            }
+            elseif ($type == 'wms') {
                 $this->assertContains('DepartmentA', $page);
                 $this->assertContains('StatementA', $page);
-            } else {
+            }
+            else {
                 $this->assertContains('SubheadingA', $page);
                 $this->assertContains('SpeechA', $page);
             }
@@ -64,7 +67,8 @@ 
             if ($type == 'wrans') {
                 $this->assertRegexp("#All .*?written answers on 1 Jan 2014#i", $page);
                 $this->assertContains("QuestionA", $page);
-            } else {
+            }
+            else {
                 $this->assertRegexp("#Location: .*?/$type/\?id=2014-01-01b\.1\.2#", $page);
             }
         }
@@ -77,7 +81,8 @@ 
             if ($type == 'spwrans') {
                 $this->assertContains("QuestionA", $page);
                 $this->assertContains("AnswerA", $page);
-            } elseif ($type == 'wrans') {
+            }
+            elseif ($type == 'wrans') {
                 $this->assertContains("DepartmentA", $page);
                 $this->assertContains("QuestionA", $page);
                 $this->assertContains("AnswerA", $page);
@@ -86,10 +91,12 @@ 
                 $this->assertContains('Mp2 Mp2', $page);
                 $this->assertContains('Birmingham', $page);
                 $this->assertContains('Independent', $page);
-            } elseif ($type == 'wms') {
+            }
+            elseif ($type == 'wms') {
                 $this->assertContains('DepartmentA', $page);
                 $this->assertContains('StatementA', $page);
-            } else {
+            }
+            else {
                 $this->assertContains("SubheadingA", $page);
                 $this->assertContains("SpeechA", $page);
             }
@@ -104,7 +111,8 @@ 
             $page = $this->fetch_page( array( 'type' => $type, 'id' => '2014-01-01b.1.3' ) );
             if ($type == 'wrans' || $type == 'spwrans' || $type == 'wms') {
                 $this->assertRegexp("#Location: .*?/$type/\?id=2014-01-01b\.1\.2#", $page);
-            } else {
+            }
+            else {
                 $this->assertContains("HeadingA", $page);
                 $this->assertContains("SubheadingA", $page);
                 $this->assertContains("2:30 pm", $page);