mysociety / theyworkforyou

scripts/alertgonemps.php

Indentation +60 added lines, -60 removed lines

@@ -23,19 +23,19 @@ 
 $toemail = '';
 $template = 'alert_gone';
 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 (preg_match('#^--template=(.*)$#', $argv[$k], $m)) {
-		$template = $m[1];
-		# Tee hee
-		$template = "../../../../../../../../../../home/twfy-live/email-alert-templates/alert_mailout_$template";
-	}
+    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 (preg_match('#^--template=(.*)$#', $argv[$k], $m)) {
+        $template = $m[1];
+        # Tee hee
+        $template = "../../../../../../../../../../home/twfy-live/email-alert-templates/alert_mailout_$template";
+    }
 }
 
 #if (DEVSITE)
@@ -43,8 +43,8 @@ 
 
 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;
@@ -68,22 +68,22 @@ 
 $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;
     if ($toemail && strtolower($email) >= $toemail) continue;
     $criteria_raw = $alertitem['criteria'];
 
-	if (!strstr($criteria_raw, 'speaker:')) continue;
+    if (!strstr($criteria_raw, 'speaker:')) continue;
 
-	preg_match('#speaker:(\d+)#', $criteria_raw, $m);
-	$person_id = $m[1];
-	if (!isset($members[$person_id])) {
+    preg_match('#speaker:(\d+)#', $criteria_raw, $m);
+    $person_id = $m[1];
+    if (!isset($members[$person_id])) {
         $queries++;
         $members[$person_id] = new MEMBER(array('person_id' => $person_id));
-	}
+    }
     $member = $members[$person_id];
     if ($member->current_member_anywhere()) continue;
 
@@ -96,29 +96,29 @@ 
         'John Reid', 'Angela Smith', 'Don Touhig', 'Michael Wills', 'Ian Paisley',
     ))) continue;
 
-	if ($email != $current['email']) {
-		if ($email_text)
+    if ($email != $current['email']) {
+        if ($email_text)
             write_and_send_email($current, $email_text, $template);
-		$current['email'] = $email;
-		$current['token'] = $alertitem['alert_id'] . '-' . $alertitem['registrationtoken'];
-		$email_text = array();
-		$q = $db->query('SELECT user_id FROM users WHERE email = :email', array(
+        $current['email'] = $email;
+        $current['token'] = $alertitem['alert_id'] . '-' . $alertitem['registrationtoken'];
+        $email_text = array();
+        $q = $db->query('SELECT user_id FROM users WHERE email = :email', array(
             ':email' => $email));
         if ($q->rows() > 0) {
             $user_id = $q->field(0, 'user_id');
             $registered++;
-		} else {
-			$user_id = 0;
-			$unregistered++;
-		}	
-		mlog("\nEMAIL: $email, uid $user_id; memory usage : ".memory_get_usage()."\n");
-	}
+        } else {
+            $user_id = 0;
+            $unregistered++;
+        }	
+        mlog("\nEMAIL: $email, uid $user_id; memory usage : ".memory_get_usage()."\n");
+    }
 
     $lh = $member->left_house();
     $lh = array_shift($lh);
     $text = '* ' . $member->full_name() . ', left ' . $lh['date_pretty'];
     if (!in_array($text, $email_text))
-	    $email_text[] = $text;
+        $email_text[] = $text;
 }
 if ($email_text)
     write_and_send_email($current, $email_text, $template);
@@ -127,39 +127,39 @@ 
 
 $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);
 mlog(date('r') . "\n");
 
 function write_and_send_email($current, $data, $template) {
-	global $globalsuccess, $sentemails, $nomail, $start_time;
-
-	$sentemails++;
-	mlog("SEND $sentemails : Sending email to $current[email] ... ");
-	$d = array('to' => $current['email'], 'template' => $template);
-	$m = array(
-		'DATA' => join("\n", $data),
-		'MANAGE' => 'https://www.theyworkforyou.com/D/' . $current['token'],
+    global $globalsuccess, $sentemails, $nomail, $start_time;
+
+    $sentemails++;
+    mlog("SEND $sentemails : Sending email to $current[email] ... ");
+    $d = array('to' => $current['email'], 'template' => $template);
+    $m = array(
+        'DATA' => join("\n", $data),
+        'MANAGE' => 'https://www.theyworkforyou.com/D/' . $current['token'],
         'ALERT_IS' => count($data)==1 ? 'alert is' : 'alerts are',
         'ALERTS' => count($data)==1 ? 'an alert' : 'some alerts',
-	);
-	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
-			mlog("pausing ... ");
-			sleep(1);
-		}
-	} else {
-		mlog(join('', $data));
-		$success = 1;
-	}
-	mlog("done\n");
-	if (!$success) $globalsuccess = 0;
+    );
+    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
+            mlog("pausing ... ");
+            sleep(1);
+        }
+    } else {
+        mlog(join('', $data));
+        $success = 1;
+    }
+    mlog("done\n");
+    if (!$success) $globalsuccess = 0;
 }
 

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

@@ -139,7 +139,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 +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
 $fromflag = false;
 $toemail = '';
 $template = 'alert_gone';
-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))
@@ -111,7 +111,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();
@@ -131,7 +131,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");
 
@@ -144,14 +144,14 @@ 
 	$m = array(
 		'DATA' => join("\n", $data),
 		'MANAGE' => 'https://www.theyworkforyou.com/D/' . $current['token'],
-        'ALERT_IS' => count($data)==1 ? 'alert is' : 'alerts are',
-        'ALERTS' => count($data)==1 ? 'an alert' : 'some alerts',
+        'ALERT_IS' => count($data) == 1 ? 'alert is' : 'alerts are',
+        'ALERTS' => count($data) == 1 ? 'an alert' : 'some alerts',
 	);
 	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 +57 added lines, -28 removed lines

@@ -23,14 +23,18 @@ 
 $toemail = '';
 $template = 'alert_gone';
 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 (preg_match('#^--template=(.*)$#', $argv[$k], $m)) {
 		$template = $m[1];
 		# Tee hee
@@ -41,7 +45,9 @@ 
 #if (DEVSITE)
 #	$nomail = true;
 
-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;
@@ -70,13 +76,23 @@ 
 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'];
 
-	if (!strstr($criteria_raw, 'speaker:')) continue;
+	if (!strstr($criteria_raw, 'speaker:')) {
+	    continue;
+	}
 
 	preg_match('#speaker:(\d+)#', $criteria_raw, $m);
 	$person_id = $m[1];
@@ -85,7 +101,9 @@ 
         $members[$person_id] = new MEMBER(array('person_id' => $person_id));
 	}
     $member = $members[$person_id];
-    if ($member->current_member_anywhere()) continue;
+    if ($member->current_member_anywhere()) {
+        continue;
+    }
 
     if (in_array($member->full_name(), array(
         'Mr Paul Boateng', 'Mrs Helen Liddell', 'Jack McConnell', 'Tim Boswell',
@@ -94,11 +112,14 @@ 
         'Hilary Armstrong', 'Des Browne', 'Quentin Davies', 'Beverley Hughes',
         'John Hutton', 'Jim Knight', 'Thomas McAvoy', 'John McFall', 'John Prescott',
         'John Reid', 'Angela Smith', 'Don Touhig', 'Michael Wills', 'Ian Paisley',
-    ))) continue;
+    ))) {
+        continue;
+    }
 
 	if ($email != $current['email']) {
-		if ($email_text)
-            write_and_send_email($current, $email_text, $template);
+		if ($email_text) {
+		            write_and_send_email($current, $email_text, $template);
+		}
 		$current['email'] = $email;
 		$current['token'] = $alertitem['alert_id'] . '-' . $alertitem['registrationtoken'];
 		$email_text = array();
@@ -107,7 +128,8 @@ 
         if ($q->rows() > 0) {
             $user_id = $q->field(0, 'user_id');
             $registered++;
-		} else {
+		}
+		else {
 			$user_id = 0;
 			$unregistered++;
 		}	
@@ -117,18 +139,21 @@ 
     $lh = $member->left_house();
     $lh = array_shift($lh);
     $text = '* ' . $member->full_name() . ', left ' . $lh['date_pretty'];
-    if (!in_array($text, $email_text))
-	    $email_text[] = $text;
-}
-if ($email_text)
+    if (!in_array($text, $email_text)) {
+    	    $email_text[] = $text;
+    }
+    }
+if ($email_text) {
     write_and_send_email($current, $email_text, $template);
+}
 
 mlog("\n");
 
 $sss = "Active alerts: $active\nEmail lookups: $registered registered, $unregistered unregistered\nQuery lookups: $queries\nSent emails: $sentemails\n";
 if ($globalsuccess) {
       $sss .= 'Everything went swimmingly, in ';
-} else {
+}
+else {
       $sss .= 'Something went wrong! Total time: ';
 }
 $sss .= (getmicrotime()-$global_start)."\n\n";
@@ -151,15 +176,19 @@ 
 		$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);
 		}
-	} else {
+	}
+	else {
 		mlog(join('', $data));
 		$success = 1;
 	}
 	mlog("done\n");
-	if (!$success) $globalsuccess = 0;
-}
+	if (!$success) {
+	    $globalsuccess = 0;
+	}
+	}
 

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(