mysociety / theyworkforyou

scripts/alertmpchanged.php

Indentation +15 added lines, -15 removed lines

@@ -22,26 +22,26 @@ 
 $toemail = '';
 $template = 'alert_new_mp';
 for ($k=1; $k<$argc; $k++) {
-	if ($argv[$k] == '--nomail')
-		$nomail = true;
-	if (preg_match('#^--only=(.*)$#', $argv[$k], $m))
-		$onlyemail = $m[1];
-	if (preg_match('#^--from=(.*)$#', $argv[$k], $m))
-		$fromemail = $m[1];
-	if (preg_match('#^--to=(.*)$#', $argv[$k], $m))
-		$toemail = $m[1];
+    if ($argv[$k] == '--nomail')
+        $nomail = true;
+    if (preg_match('#^--only=(.*)$#', $argv[$k], $m))
+        $onlyemail = $m[1];
+    if (preg_match('#^--from=(.*)$#', $argv[$k], $m))
+        $fromemail = $m[1];
+    if (preg_match('#^--to=(.*)$#', $argv[$k], $m))
+        $toemail = $m[1];
 }
 
 if (DEVSITE)
-  $nomail = true;
+    $nomail = true;
 
 # Change this to the end date
 $END_DATE = '2017-05-03';
 
 if ($nomail) mlog("NOT SENDING EMAIL\n");
 if (($fromemail && $onlyemail) || ($toemail && $onlyemail)) {
-	mlog("Can't have both from/to and only!\n");
-	exit;
+    mlog("Can't have both from/to and only!\n");
+    exit;
 }
 
 $active = 0;
@@ -66,8 +66,8 @@ 
 $members = array();
 $start_time = time();
 foreach ($alertdata as $alertitem) {
-	$active++;
-	$email = $alertitem['email'];
+    $active++;
+    $email = $alertitem['email'];
     if ($onlyemail && $email != $onlyemail) continue;
     if ($fromemail && strtolower($email) == $fromemail) $fromflag = true;
     if ($fromemail && !$fromflag) continue;
@@ -143,9 +143,9 @@ 
 
 $sss = "Active alerts: $active\nEmail lookups: $registered registered, $unregistered unregistered\nQuery lookups: $queries\nSent emails: $sentemails\n";
 if ($globalsuccess) {
-      $sss .= 'Everything went swimmingly, in ';
+        $sss .= 'Everything went swimmingly, in ';
 } else {
-      $sss .= 'Something went wrong! Total time: ';
+        $sss .= 'Something went wrong! Total time: ';
 }
 $sss .= (getmicrotime()-$global_start)."\n\n";
 mlog($sss);

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

@@ -155,7 +155,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 = array('to' => $current['email'], 'template' => $template);
     $m = array(
         'DATA' => join("\n", $data),

Spacing +13 added lines, -13 removed lines

@@ -21,7 +21,7 @@ 
 $fromflag = false;
 $toemail = '';
 $template = 'alert_new_mp';
-for ($k=1; $k<$argc; $k++) {
+for ($k = 1; $k < $argc; $k++) {
 	if ($argv[$k] == '--nomail')
 		$nomail = true;
 	if (preg_match('#^--only=(.*)$#', $argv[$k], $m))
@@ -91,9 +91,9 @@ 
     // skip if they didn't lose their westminster seat in the most recent election
     if ($member->left_house(1)['date'] != $END_DATE) continue;
 
-    if ( !isset($cons[$member->constituency]) ) {
+    if (!isset($cons[$member->constituency])) {
         $cons_member = new MEMBER(array('constituency' => $member->constituency, 'house' => 1));
-        if ( !$cons_member ) {
+        if (!$cons_member) {
             continue;
         }
         $cons[$member->constituency] = $cons_member;
@@ -102,7 +102,7 @@ 
     }
 
     // these should never happen but let's just be sure
-    if ( $cons_member->person_id == $member->person_id ) continue;
+    if ($cons_member->person_id == $member->person_id) continue;
     if (!$cons_member->current_member_anywhere()) continue;
 
     if ($email != $current['email']) {
@@ -122,7 +122,7 @@ 
             $user_id = 0;
             $unregistered++;
         }
-        mlog("\nEMAIL: $email, uid $user_id; memory usage : ".memory_get_usage()."\n");
+        mlog("\nEMAIL: $email, uid $user_id; memory usage : " . memory_get_usage() . "\n");
     }
 
     $lh = $member->left_house();
@@ -147,7 +147,7 @@ 
 } else {
       $sss .= 'Something went wrong! Total time: ';
 }
-$sss .= (getmicrotime()-$global_start)."\n\n";
+$sss .= (getmicrotime() - $global_start) . "\n\n";
 mlog($sss);
 mlog(date('r') . "\n");
 
@@ -160,18 +160,18 @@ 
     $m = array(
         'DATA' => join("\n", $data),
         'CHANGE' => join("\n", $change),
-        'ALERT_IS' => count($data)==1 ? 'alert is' : 'alerts are',
-        'MPS' => count($data)==1 ? 'This MP' : 'These MPs',
-        'MPS2' => count($data)==1 ? 'MP' : 'MPs',
-        'ALERTS' => count($data)==1 ? 'an alert' : 'some alerts',
-        'ALERTS2' => count($data)==1 ? 'alert' : 'alerts',
-        'LINKS' => count($data)==1 ? 'link' : 'links',
+        'ALERT_IS' => count($data) == 1 ? 'alert is' : 'alerts are',
+        'MPS' => count($data) == 1 ? 'This MP' : 'These MPs',
+        'MPS2' => count($data) == 1 ? 'MP' : 'MPs',
+        'ALERTS' => count($data) == 1 ? 'an alert' : 'some alerts',
+        'ALERTS2' => count($data) == 1 ? 'alert' : 'alerts',
+        'LINKS' => count($data) == 1 ? 'link' : 'links',
     );
     if (!$nomail) {
         $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);
         }

Braces +48 added lines, -22 removed lines

@@ -22,23 +22,30 @@ 
 $toemail = '';
 $template = 'alert_new_mp';
 for ($k=1; $k<$argc; $k++) {
-	if ($argv[$k] == '--nomail')
-		$nomail = true;
-	if (preg_match('#^--only=(.*)$#', $argv[$k], $m))
-		$onlyemail = $m[1];
-	if (preg_match('#^--from=(.*)$#', $argv[$k], $m))
-		$fromemail = $m[1];
-	if (preg_match('#^--to=(.*)$#', $argv[$k], $m))
-		$toemail = $m[1];
-}
-
-if (DEVSITE)
+	if ($argv[$k] == '--nomail') {
+			$nomail = true;
+	}
+	if (preg_match('#^--only=(.*)$#', $argv[$k], $m)) {
+			$onlyemail = $m[1];
+	}
+	if (preg_match('#^--from=(.*)$#', $argv[$k], $m)) {
+			$fromemail = $m[1];
+	}
+	if (preg_match('#^--to=(.*)$#', $argv[$k], $m)) {
+			$toemail = $m[1];
+	}
+	}
+
+if (DEVSITE) {
   $nomail = true;
+}
 
 # Change this to the end date
 $END_DATE = '2017-05-03';
 
-if ($nomail) mlog("NOT SENDING EMAIL\n");
+if ($nomail) {
+    mlog("NOT SENDING EMAIL\n");
+}
 if (($fromemail && $onlyemail) || ($toemail && $onlyemail)) {
 	mlog("Can't have both from/to and only!\n");
 	exit;
@@ -68,14 +75,24 @@ 
 foreach ($alertdata as $alertitem) {
 	$active++;
 	$email = $alertitem['email'];
-    if ($onlyemail && $email != $onlyemail) continue;
-    if ($fromemail && strtolower($email) == $fromemail) $fromflag = true;
-    if ($fromemail && !$fromflag) continue;
-    if ($toemail && strtolower($email) >= $toemail) continue;
+    if ($onlyemail && $email != $onlyemail) {
+        continue;
+    }
+    if ($fromemail && strtolower($email) == $fromemail) {
+        $fromflag = true;
+    }
+    if ($fromemail && !$fromflag) {
+        continue;
+    }
+    if ($toemail && strtolower($email) >= $toemail) {
+        continue;
+    }
     $criteria_raw = $alertitem['criteria'];
 
     // we only care about alerts for people speaking
-    if (!strstr($criteria_raw, 'speaker:')) continue;
+    if (!strstr($criteria_raw, 'speaker:')) {
+        continue;
+    }
 
     preg_match('#speaker:(\d+)#', $criteria_raw, $m);
     $person_id = $m[1];
@@ -86,10 +103,14 @@ 
     $member = $members[$person_id];
 
     // if they're still elected then don't send the email
-    if ($member->current_member_anywhere()) continue;
+    if ($member->current_member_anywhere()) {
+        continue;
+    }
 
     // skip if they didn't lose their westminster seat in the most recent election
-    if ($member->left_house(1)['date'] != $END_DATE) continue;
+    if ($member->left_house(1)['date'] != $END_DATE) {
+        continue;
+    }
 
     if ( !isset($cons[$member->constituency]) ) {
         $cons_member = new MEMBER(array('constituency' => $member->constituency, 'house' => 1));
@@ -102,8 +123,12 @@ 
     }
 
     // these should never happen but let's just be sure
-    if ( $cons_member->person_id == $member->person_id ) continue;
-    if (!$cons_member->current_member_anywhere()) continue;
+    if ( $cons_member->person_id == $member->person_id ) {
+        continue;
+    }
+    if (!$cons_member->current_member_anywhere()) {
+        continue;
+    }
 
     if ($email != $current['email']) {
         if ($email_text && $change_text) {
@@ -171,7 +196,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);
         }

scripts/wrans-votes-by-dept.php

Indentation +27 added lines, -27 removed lines

@@ -10,7 +10,7 @@ 
 
 # Done directly as storing everything in an array as $db->query() does runs out of memory, unsurprisingly
 $q = mysql_query(
-	'select section.body, gid, yes_votes, no_votes
+    'select section.body, gid, yes_votes, no_votes
 	from hansard
 		inner join epobject as section on hansard.section_id = section.epobject_id
 		left join anonvotes on hansard.epobject_id = anonvotes.epobject_id
@@ -24,34 +24,34 @@ 
 
 $votes = array();
 while ($row = mysql_fetch_assoc($q)) {
-	$dept = $row['body'];
-	if (!isset($votes[$dept])) $votes[$dept] = array(
-		'verymoreyes'=>0, 'moreyes'=>0, 'verymoreno'=>0, 'moreno'=>0, 'same'=>0, 'none'=>0
-	);
-	$yes = $row['yes_votes'];
-	$no = $row['no_votes'];
-	$gid = $row['gid'];
-	if (is_null($yes)) {
-		$votes[$dept]['none']++;
-	} else {
-		if ($no > $yes+10) {
-			$votes[$dept]['verymoreno']++;
-		} elseif ($no > $yes) {
-			$votes[$dept]['moreno']++;
-		} elseif ($no + 10 < $yes) {
-			$votes[$dept]['verymoreyes']++;
-		} elseif ($no < $yes) {
-			$votes[$dept]['moreyes']++;
-		} else {
-			$votes[$dept]['same']++;
-		}
-	}
+    $dept = $row['body'];
+    if (!isset($votes[$dept])) $votes[$dept] = array(
+        'verymoreyes'=>0, 'moreyes'=>0, 'verymoreno'=>0, 'moreno'=>0, 'same'=>0, 'none'=>0
+    );
+    $yes = $row['yes_votes'];
+    $no = $row['no_votes'];
+    $gid = $row['gid'];
+    if (is_null($yes)) {
+        $votes[$dept]['none']++;
+    } else {
+        if ($no > $yes+10) {
+            $votes[$dept]['verymoreno']++;
+        } elseif ($no > $yes) {
+            $votes[$dept]['moreno']++;
+        } elseif ($no + 10 < $yes) {
+            $votes[$dept]['verymoreyes']++;
+        } elseif ($no < $yes) {
+            $votes[$dept]['moreyes']++;
+        } else {
+            $votes[$dept]['same']++;
+        }
+    }
 }
 
 print "Department,11+ more yes votes than no,1-10 more yes votes than no,11+ more no votes than yes,1-10 more no votes than yes,Same votes yes/no,No votes\n";
 foreach ($votes as $dept => $v) {
-	#if (!$v['moreyes'] && !$v['moreno'] && !$v['same']) continue;
-	if (strstr($dept, ','))
-		$dept = "\"$dept\"";
-	print "$dept,$v[verymoreyes],$v[moreyes],$v[verymoreno],$v[moreno],$v[same],$v[none]\n";
+    #if (!$v['moreyes'] && !$v['moreno'] && !$v['same']) continue;
+    if (strstr($dept, ','))
+        $dept = "\"$dept\"";
+    print "$dept,$v[verymoreyes],$v[moreyes],$v[verymoreno],$v[moreno],$v[same],$v[none]\n";
 }

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	if (is_null($yes)) {
 		$votes[$dept]['none']++;
 	} else {
-		if ($no > $yes+10) {
+		if ($no > $yes + 10) {
 			$votes[$dept]['verymoreno']++;
 		} elseif ($no > $yes) {
 			$votes[$dept]['moreno']++;

Braces +6 added lines, -3 removed lines

@@ -25,9 +25,11 @@ 
 $votes = array();
 while ($row = mysql_fetch_assoc($q)) {
 	$dept = $row['body'];
-	if (!isset($votes[$dept])) $votes[$dept] = array(
+	if (!isset($votes[$dept])) {
+	    $votes[$dept] = array(
 		'verymoreyes'=>0, 'moreyes'=>0, 'verymoreno'=>0, 'moreno'=>0, 'same'=>0, 'none'=>0
 	);
+	}
 	$yes = $row['yes_votes'];
 	$no = $row['no_votes'];
 	$gid = $row['gid'];
@@ -51,7 +53,8 @@ 
 print "Department,11+ more yes votes than no,1-10 more yes votes than no,11+ more no votes than yes,1-10 more no votes than yes,Same votes yes/no,No votes\n";
 foreach ($votes as $dept => $v) {
 	#if (!$v['moreyes'] && !$v['moreno'] && !$v['same']) continue;
-	if (strstr($dept, ','))
-		$dept = "\"$dept\"";
+	if (strstr($dept, ',')) {
+			$dept = "\"$dept\"";
+	}
 	print "$dept,$v[verymoreyes],$v[moreyes],$v[verymoreno],$v[moreno],$v[same],$v[none]\n";
 }

scripts/create_initial_topics.php

Indentation +10 added lines, -10 removed lines

@@ -133,14 +133,14 @@
 );
 
 foreach ($all_topics as $name => $topic) {
-  $existing = $topics->getTopic($name);
-  if ($existing) {
-      print "$name already exists\n";
-  } else {
-      $topic['slug'] = $name;
-      $topic['description'] = $topic['blurb'];
-      $topic = new MySociety\TheyWorkForYou\Topic($topic);
-      $topic->save();
-      print "created $name\n";
-  }
+    $existing = $topics->getTopic($name);
+    if ($existing) {
+        print "$name already exists\n";
+    } else {
+        $topic['slug'] = $name;
+        $topic['description'] = $topic['blurb'];
+        $topic = new MySociety\TheyWorkForYou\Topic($topic);
+        $topic->save();
+        print "created $name\n";
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 <?php
 
-include_once dirname(__FILE__) .'/../www/includes/easyparliament/init.php';
+include_once dirname(__FILE__) . '/../www/includes/easyparliament/init.php';
 
 $topics = new MySociety\TheyWorkForYou\Topics();
 

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');
     }
 
     /**
@@ -43,8 +43,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() {
@@ -52,9 +52,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',
             'postcode' => 'EH1 99SP',
@@ -62,9 +62,9 @@ 
             'url' => '',
             'optin' => '',
             'user_id' => 1
-        ) );
+        ));
 
-        $this->assertEquals( 'Experiment', $u->firstname() );
+        $this->assertEquals('Experiment', $u->firstname());
     }
 
     public function testEditUserEmail() {
@@ -72,9 +72,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',
@@ -83,10 +83,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');
@@ -96,7 +96,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);
 
@@ -110,9 +110,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');
 
@@ -128,15 +128,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/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(