mysociety / theyworkforyou

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 +10 added lines, -10 removed lines

@@ -8,7 +8,7 @@ 
 
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/section.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/section.xml');
     }
 
     private function fetch_page($vars)
@@ -20,22 +20,22 @@ 
 
 	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);
+            $this->assertRegExp('/<td colspan="2">&nbsp;<\/td><td[^>]*><a href="\/'.$type.'\/\?d=2014-01-01">1<\/a><\/td><td[^>]*><span>2<\/span><\/td>/', $page);
         }
     }
 
 	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);
     }
 }

tests/SearchTest.php

Indentation +4 added lines, -4 removed lines

@@ -7,8 +7,8 @@ 
 
 class SearchTest extends FetchPageTestCase
 {
-	public function setUp()
-	{
+    public function setUp()
+    {
         parent::setUp();
         include_once('www/includes/easyparliament/searchengine.php');
     }
@@ -87,7 +87,7 @@ 
      *
      * @group xapian
      */
-	public function testSearchNormal()
+    public function testSearchNormal()
     {
         $SEARCHENGINE = new SEARCHENGINE('test');
 
@@ -102,7 +102,7 @@ 
      *
      * @group xapian
      */
-	public function testSearchLink()
+    public function testSearchLink()
     {
         $SEARCHENGINE = new SEARCHENGINE('test');
 

Spacing +13 added lines, -13 removed lines

@@ -15,7 +15,7 @@ 
 
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/search.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/search.xml');
     }
 
     private function fetch_page($vars)
@@ -26,11 +26,11 @@ 
     public function testConstituencySearch()
     {
         $this->assertEquals(
-            array( array( 'Alyn and Deeside' ), false ),
+            array(array('Alyn and Deeside'), false),
             \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery('Alyn')
         );
         $this->assertEquals(
-            array( array( 'Alyn and Deeside' ), false ),
+            array(array('Alyn and Deeside'), false),
             \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery('Alyn and Deeside')
         );
     }
@@ -119,7 +119,7 @@ 
      */
     public function testSearchPage()
     {
-        $page = $this->fetch_page( array( ) );
+        $page = $this->fetch_page(array( ));
         $this->assertContains('Search', $page);
     }
 
@@ -130,7 +130,7 @@ 
      */
     public function testSearchPageMP()
     {
-        $page = $this->fetch_page( array( 'q' => 'Mary Smith' ) );
+        $page = $this->fetch_page(array('q' => 'Mary Smith'));
         $this->assertContains('Mary Smith', $page);
         $this->assertContains('MP, Amber Valley', $page);
     }
@@ -142,7 +142,7 @@ 
      */
     public function testSearchPageMultipleMP()
     {
-        $page = $this->fetch_page( array( 'q' => 'Jones' ) );
+        $page = $this->fetch_page(array('q' => 'Jones'));
         $this->assertContains('People matching <em class="current-search-term">Jones</em>', $page);
         $this->assertContains('Andrew Jones', $page);
         $this->assertContains('Simon Jones', $page);
@@ -154,7 +154,7 @@ 
      * @group xapian
      */
     public function testSearchPageCons() {
-        $page = $this->fetch_page( array( 'q' => 'Amber' ) );
+        $page = $this->fetch_page(array('q' => 'Amber'));
         $this->assertContains('MP for <em class="current-search-term">Amber</em>', $page);
         $this->assertContains('Mary Smith', $page);
     }
@@ -166,7 +166,7 @@ 
      * @group xapian
      */
     public function testSearchPageConsWithNoMp() {
-        $page = $this->fetch_page( array( 'q' => 'Alyn' ) );
+        $page = $this->fetch_page(array('q' => 'Alyn'));
         $this->assertNotContains('MP for <em class="current-search-term">Alyn</em>', $page);
         $this->assertNotContains('MPs in constituencies matching', $page);
     }
@@ -178,7 +178,7 @@ 
      * @group xapian
      */
     public function testSearchPageMultipleCons() {
-        $page = $this->fetch_page( array( 'q' => 'Liverpool' ) );
+        $page = $this->fetch_page(array('q' => 'Liverpool'));
         $this->assertContains('MPs in constituencies matching <em class="current-search-term">Liverpool</em>', $page);
         $this->assertContains('Susan Brown', $page);
         $this->assertContains('MP, Liverpool, Riverside', $page);
@@ -192,7 +192,7 @@ 
      * @group xapian
      */
     public function testSearchPageGlossary() {
-        $page = $this->fetch_page( array( 'q' => 'other place' ) );
+        $page = $this->fetch_page(array('q' => 'other place'));
         $this->assertContains('Glossary items matching', $page);
         $this->assertContains('<a href="/glossary/?gl=1">&ldquo;other place', $page);
     }
@@ -203,7 +203,7 @@ 
      * @group xapian
      */
     public function testSearchPageSpellCorrect() {
-        $page = $this->fetch_page( array( 'q' => 'plice' ) );
+        $page = $this->fetch_page(array('q' => 'plice'));
         $this->assertContains('Did you mean <a href="/search/?q=place">place', $page);
     }
 
@@ -213,7 +213,7 @@ 
      * @group xapian
      */
     public function testSearchBySpeakerNoResults() {
-        $page = $this->fetch_page( array( 'q' => 'splice', 'o' => 'p' ) );
+        $page = $this->fetch_page(array('q' => 'splice', 'o' => 'p'));
         $this->assertContains('Who says splice the most', $page);
         $this->assertContains('No results', $page);
     }
@@ -240,7 +240,7 @@ 
      * @group xapian
      */
     public function testSearchPageRSS() {
-        $page = $this->fetch_page( array( 'q' => 'test' ) );
+        $page = $this->fetch_page(array('q' => 'test'));
         $this->assertContains('<a href="/search/rss/?s=test">get an RSS feed', $page);
     }
 

tests/AlertsTest.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
     {
         $ALERT = new ALERT();
 
-        $response = $ALERT->fetch(0,0);
+        $response = $ALERT->fetch(0, 0);
 
         // Make sure we only get one response
         $this->assertEquals(1, count($response['data']));
@@ -48,7 +48,7 @@ 
     {
         $ALERT = new ALERT();
 
-        $response = $ALERT->fetch(1,0);
+        $response = $ALERT->fetch(1, 0);
 
         // Make sure we only get two responses
         $this->assertEquals(2, count($response['data']));
@@ -65,7 +65,7 @@ 
     {
         $ALERT = new ALERT();
 
-        $response = $ALERT->fetch(0,1);
+        $response = $ALERT->fetch(0, 1);
 
         // Make sure we only get one response
         $this->assertEquals(1, count($response['data']));
@@ -82,7 +82,7 @@ 
     {
         $ALERT = new ALERT();
 
-        $response = $ALERT->fetch(1,1);
+        $response = $ALERT->fetch(1, 1);
 
         // Make sure we only get one response
         $this->assertEquals(1, count($response['data']));
@@ -99,7 +99,7 @@ 
     {
         $ALERT = new ALERT();
 
-        $response = $ALERT->fetch_between(1,1, '2014-02-01', '2014-02-02');
+        $response = $ALERT->fetch_between(1, 1, '2014-02-01', '2014-02-02');
 
         // Make sure we only get one response
         $this->assertEquals(1, count($response['alerts']));

tests/TWFY_Database_TestCase.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
      */
     public function getConnection()
     {
-        $dsn = 'mysql:host=' . OPTION_TWFY_DB_HOST . ' ;dbname=' . OPTION_TWFY_DB_NAME . ';charset=utf8';
+        $dsn = 'mysql:host='.OPTION_TWFY_DB_HOST.' ;dbname='.OPTION_TWFY_DB_NAME.';charset=utf8';
         $username = OPTION_TWFY_DB_USER;
         $password = OPTION_TWFY_DB_PASS;
         $pdo = new PDO($dsn, $username, $password);

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

@@ -25,7 +25,7 @@
 
     public function tearDown()
     {
-        $this->db = NULL;
+        $this->db = null;
 
         parent::tearDown();
     }

classes/Renderer.php

Indentation +5 added lines, -5 removed lines

@@ -84,12 +84,12 @@
         // Require the templates and output
 
         if ($template_only) {
-          require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
+            require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
         } else {
-          header('Content-Type: text/html; charset=utf-8');
-          require_once INCLUDESPATH . 'easyparliament/templates/html/header.php';
-          require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
-          require_once INCLUDESPATH . 'easyparliament/templates/html/footer.php';
+            header('Content-Type: text/html; charset=utf-8');
+            require_once INCLUDESPATH . 'easyparliament/templates/html/header.php';
+            require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
+            require_once INCLUDESPATH . 'easyparliament/templates/html/footer.php';
         }
     }
 

Spacing +8 added lines, -8 removed lines

@@ -43,7 +43,7 @@ 
         $user = new Renderer\User();
         $data = array_merge($user->data, $data);
 
-        if ( isset($page_errors) ) {
+        if (isset($page_errors)) {
             $data['page_errors'] = $page_errors;
         }
 
@@ -84,25 +84,25 @@ 
         // Require the templates and output
 
         if ($template_only) {
-          require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
+          require_once INCLUDESPATH.'easyparliament/templates/html/'.$template.'.php';
         } else {
           header('Content-Type: text/html; charset=utf-8');
-          require_once INCLUDESPATH . 'easyparliament/templates/html/header.php';
-          require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
-          require_once INCLUDESPATH . 'easyparliament/templates/html/footer.php';
+          require_once INCLUDESPATH.'easyparliament/templates/html/header.php';
+          require_once INCLUDESPATH.'easyparliament/templates/html/'.$template.'.php';
+          require_once INCLUDESPATH.'easyparliament/templates/html/footer.php';
         }
     }
 
     private static function addCommonURLs($data) {
         $urls = array();
-        if ( isset($data['urls']) ) {
+        if (isset($data['urls'])) {
             $urls = $data['urls'];
         }
 
         $common_urls = array('search', 'alert');
 
-        foreach ( $common_urls as $path ) {
-            if (!isset($urls[$path]) ) {
+        foreach ($common_urls as $path) {
+            if (!isset($urls[$path])) {
                 $url = new Url($path);
                 $urls[$path] = $url->generate();
             }

classes/AlertView/Simple.php

Spacing +22 added lines, -22 removed lines

@@ -7,7 +7,7 @@ 
     public function display() {
         $data = array();
         $data['recent_election'] = false;
-        if ( $this->user->loggedin() ) {
+        if ($this->user->loggedin()) {
             $data['user_signed_in'] = true;
         }
 
@@ -17,21 +17,21 @@ 
             $data['postcode'] = get_http_var('postcode');
 
             $result = $this->createAlertForPostCode($data['email'], $data['postcode']);
-            $data = array_merge( $data, $result );
+            $data = array_merge($data, $result);
         } elseif (get_http_var('update')) {
             $result = $this->getNewMP(get_http_var('update'));
-            $data = array_merge( $data, $result );
+            $data = array_merge($data, $result);
         } elseif (get_http_var('update-alert')) {
-            $success = $this->replaceAlert( get_http_var('confirmation') );
+            $success = $this->replaceAlert(get_http_var('confirmation'));
             $data['confirmation_received'] = $success;
         } elseif (get_http_var('confirmed')) {
-            $success = $this->confirmAlert( get_http_var('confirmed') );
+            $success = $this->confirmAlert(get_http_var('confirmed'));
             $data['confirmation_received'] = $success;
         } else {
             $data['email'] = $this->user->email() ? $this->user->email() : '';
             $data['postcode'] = $this->user->postcode_is_set() ? $this->user->postcode() : '';
 
-            if ( $this->isEmailSignedUpForPostCode( $data['email'], $data['postcode'] ) ) {
+            if ($this->isEmailSignedUpForPostCode($data['email'], $data['postcode'])) {
                 $data['already_signed_up'] = True;
                 $mp = $this->getPersonFromPostcode($data['postcode']);
                 $data['mp_name'] = $mp->full_name();
@@ -66,13 +66,13 @@ 
     }
 
     private function createAlertForPostCode($email, $postcode) {
-        if ( !$this->validateDetails($email, $postcode) ) {
+        if (!$this->validateDetails($email, $postcode)) {
             return array('invalid-postcode-or-email' => True);
         }
 
         try {
             $person = $this->getPersonFromPostcode($postcode);
-        } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+        } catch (\MySociety\TheyWorkForYou\MemberException $e) {
             return array('bad-constituency' => True);
         }
 
@@ -80,7 +80,7 @@ 
             'email' => $email,
             'pid' => $person->person_id,
             'pc' => $postcode,
-            'confirm_base' => 'https://' . DOMAIN . '/alert/by-postcode?confirmed=',
+            'confirm_base' => 'https://'.DOMAIN.'/alert/by-postcode?confirmed=',
         );
 
         $data = array();
@@ -89,7 +89,7 @@ 
 
         switch ($result) {
             case self::ALERT_EXISTS:
-                if ( $not_logged_in ) {
+                if ($not_logged_in) {
                     // no logged in user so send them an email to let them
                     // know someone tried to create an alert
                     $this->alert->send_already_signedup_email($details);
@@ -102,7 +102,7 @@ 
                 $data['error'] = True;
                 break;
             default: // alert created
-                if ( $not_logged_in ) {
+                if ($not_logged_in) {
                     $data['confirmation_sent'] = True;
                 } else {
                     $data['signedup_no_confirm'] = True;
@@ -116,8 +116,8 @@ 
         $existing = $this->alert->fetch_by_token($confirmation);
         preg_match('/speaker:(\d+)/', $existing['criteria'], $matches);
         $old_mp_id = $matches[1];
-        $old_mp = new \MySociety\TheyWorkForYou\Member(array( 'person_id' => $old_mp_id ) );
-        $new_mp = new \MySociety\TheyWorkForYou\Member(array( 'constituency' => $old_mp->constituency, 'house' => 1 ));
+        $old_mp = new \MySociety\TheyWorkForYou\Member(array('person_id' => $old_mp_id));
+        $new_mp = new \MySociety\TheyWorkForYou\Member(array('constituency' => $old_mp->constituency, 'house' => 1));
 
         $q = $this->db->query(
             "SELECT alert_id, criteria, registrationtoken FROM alerts
@@ -127,11 +127,11 @@ 
              AND deleted = 0",
             array(
                 ':email' => $existing['email'],
-                ':criteria' => '%speaker:' . $old_mp_id . '%'
+                ':criteria' => '%speaker:'.$old_mp_id.'%'
             )
         );
 
-        for ( $i = 0; $i < $q->rows; $i++ ) {
+        for ($i = 0; $i < $q->rows; $i++) {
             // need to reset this otherwise delete does not work
             $this->alert->token_checked = null;
             $other_criteria = trim(preg_replace('/speaker:\d+/', '', $q->field($i, 'criteria')));
@@ -141,11 +141,11 @@ 
                 'pid' => $new_mp->person_id,
                 'pc' => '',
             );
-            if ( $other_criteria ) {
+            if ($other_criteria) {
                 $details['keyword'] = $other_criteria;
             }
 
-            $this->alert->delete($q->field($i, 'alert_id') . '::' . $q->field($i ,'registrationtoken'));
+            $this->alert->delete($q->field($i, 'alert_id').'::'.$q->field($i, 'registrationtoken'));
             $this->alert->add($details, False);
         }
 
@@ -158,11 +158,11 @@ 
     private function isEmailSignedUpForPostCode($email, $postcode) {
         $is_signed_up = false;
 
-        if ( $email && $postcode ) {
+        if ($email && $postcode) {
             try {
                 $person = $this->getPersonFromPostcode($postcode);
                 $is_signed_up = $this->alert->fetch_by_mp($email, $person->person_id);
-            } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+            } catch (\MySociety\TheyWorkForYou\MemberException $e) {
                 $is_signed_up = false;
             }
         }
@@ -178,10 +178,10 @@ 
         preg_match('/speaker:(\d+)/', $existing['criteria'], $matches);
         $criteria = $matches[1];
 
-        $old_mp = new \MySociety\TheyWorkForYou\Member(array( 'person_id' => $criteria ) );
-        $new_mp = new \MySociety\TheyWorkForYou\Member(array( 'constituency' => $old_mp->constituency, 'house' => 1 ));
+        $old_mp = new \MySociety\TheyWorkForYou\Member(array('person_id' => $criteria));
+        $new_mp = new \MySociety\TheyWorkForYou\Member(array('constituency' => $old_mp->constituency, 'house' => 1));
 
-        if ( $this->alert->fetch_by_mp( $existing['email'], $new_mp->person_id) ) {
+        if ($this->alert->fetch_by_mp($existing['email'], $new_mp->person_id)) {
             $data = array(
                 'already_signed_up' => True,
                 'old_mp' => $old_mp->full_name(),

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

@@ -32,7 +32,7 @@ 
             $data['postcode'] = $this->user->postcode_is_set() ? $this->user->postcode() : '';
 
             if ( $this->isEmailSignedUpForPostCode( $data['email'], $data['postcode'] ) ) {
-                $data['already_signed_up'] = True;
+                $data['already_signed_up'] = true;
                 $mp = $this->getPersonFromPostcode($data['postcode']);
                 $data['mp_name'] = $mp->full_name();
             }
@@ -67,13 +67,13 @@ 
 
     private function createAlertForPostCode($email, $postcode) {
         if ( !$this->validateDetails($email, $postcode) ) {
-            return array('invalid-postcode-or-email' => True);
+            return array('invalid-postcode-or-email' => true);
         }
 
         try {
             $person = $this->getPersonFromPostcode($postcode);
         } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
-            return array('bad-constituency' => True);
+            return array('bad-constituency' => true);
         }
 
         $details = array(
@@ -93,19 +93,19 @@ 
                     // no logged in user so send them an email to let them
                     // know someone tried to create an alert
                     $this->alert->send_already_signedup_email($details);
-                    $data['confirmation_sent'] = True;
+                    $data['confirmation_sent'] = true;
                 } else {
-                    $data['already_signed_up'] = True;
+                    $data['already_signed_up'] = true;
                 }
                 break;
             case self::CREATE_FAILED:
-                $data['error'] = True;
+                $data['error'] = true;
                 break;
             default: // alert created
                 if ( $not_logged_in ) {
-                    $data['confirmation_sent'] = True;
+                    $data['confirmation_sent'] = true;
                 } else {
-                    $data['signedup_no_confirm'] = True;
+                    $data['signedup_no_confirm'] = true;
                 }
         }
 
@@ -146,11 +146,11 @@ 
             }
 
             $this->alert->delete($q->field($i, 'alert_id') . '::' . $q->field($i ,'registrationtoken'));
-            $this->alert->add($details, False);
+            $this->alert->add($details, false);
         }
 
         return array(
-            'signedup_no_confirm' => True,
+            'signedup_no_confirm' => true,
             'new_mp' => $new_mp->full_name(),
         );
     }
@@ -183,7 +183,7 @@ 
 
         if ( $this->alert->fetch_by_mp( $existing['email'], $new_mp->person_id) ) {
             $data = array(
-                'already_signed_up' => True,
+                'already_signed_up' => true,
                 'old_mp' => $old_mp->full_name(),
                 'mp_name' => $new_mp->full_name(),
             );
@@ -194,7 +194,7 @@ 
             );
         }
 
-        $data['update'] = True;
+        $data['update'] = true;
         $data['confirmation'] = $confirmation;
 
         return $data;

classes/AlertView/Standard.php

Spacing +34 added lines, -34 removed lines

@@ -3,11 +3,11 @@ 
 namespace MySociety\TheyWorkForYou\AlertView;
 
 include_once '../../../www/includes/easyparliament/init.php';
-include_once INCLUDESPATH . "easyparliament/people.php";
-include_once INCLUDESPATH . "easyparliament/member.php";
-include_once INCLUDESPATH . "easyparliament/searchengine.php";
-include_once INCLUDESPATH . '../../commonlib/phplib/auth.php';
-include_once INCLUDESPATH . '../../commonlib/phplib/crosssell.php';
+include_once INCLUDESPATH."easyparliament/people.php";
+include_once INCLUDESPATH."easyparliament/member.php";
+include_once INCLUDESPATH."easyparliament/searchengine.php";
+include_once INCLUDESPATH.'../../commonlib/phplib/auth.php';
+include_once INCLUDESPATH.'../../commonlib/phplib/crosssell.php';
 
 class Standard extends \MySociety\TheyWorkForYou\AlertView {
     public $data;
@@ -139,7 +139,7 @@ 
 
         $se = new \SEARCHENGINE($text);
         if (!$se->valid) {
-            $errors['alertsearch'] = 'That search appears to be invalid - ' . $se->error . ' - please check and try again.';
+            $errors['alertsearch'] = 'That search appears to be invalid - '.$se->error.' - please check and try again.';
         }
 
         if (strlen($text) > 255) {
@@ -179,7 +179,7 @@ 
                 try {
                     $MEMBER = new \MEMBER(array('constituency'=>$constituency, 'house' => 1));
                     $cons[$constituency] = $MEMBER;
-                } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+                } catch (\MySociety\TheyWorkForYou\MemberException $e) {
                     // do nothing
                 }
             }
@@ -199,17 +199,17 @@ 
 
         // If this goes well, the alert will be added to the database and a confirmation email
         // will be sent to them.
-        $success = $this->alert->add( $this->data, $confirm );
+        $success = $this->alert->add($this->data, $confirm);
 
-        if ($success>0 && !$confirm) {
+        if ($success > 0 && !$confirm) {
             $result = 'alert-added';
-        } elseif ($success>0) {
+        } elseif ($success > 0) {
             $result = 'alert-confirmation';
         } elseif ($success == -2) {
             // we need to make sure we know that the person attempting to sign up
             // for the alert has that email address to stop people trying to work
             // out what alerts they are signed up to
-            if ( $this->data['email_verified'] || ( $this->user->loggedin && $this->user->email() == $this->data['email'] ) ) {
+            if ($this->data['email_verified'] || ($this->user->loggedin && $this->user->email() == $this->data['email'])) {
                 $result = 'alert-exists';
             } else {
                 // don't throw an error message as that implies that they have already signed
@@ -234,7 +234,7 @@ 
 
 
     private function formatSearchTerms() {
-        if ( $this->data['alertsearch'] ) {
+        if ($this->data['alertsearch']) {
             $this->data['alertsearch_pretty'] = $this->prettifyCriteria($this->data['alertsearch']);
             $this->data['search_text'] = $this->data['alertsearch'];
         } else {
@@ -244,22 +244,22 @@ 
 
     private function prettifyCriteria($alert_criteria) {
         $text = '';
-        if ( $alert_criteria ) {
+        if ($alert_criteria) {
             $criteria = explode(' ', $alert_criteria);
             $words = array();
             $spokenby = array_values(\MySociety\TheyWorkForYou\Utility\Search::speakerNamesForIDs($alert_criteria));
 
             foreach ($criteria as $c) {
-                if (!preg_match('#^speaker:(\d+)#',$c,$m)) {
+                if (!preg_match('#^speaker:(\d+)#', $c, $m)) {
                     $words[] = $c;
                 }
             }
-            if ( $spokenby && count($words) ) {
-                $text = implode(' or ', $spokenby) . ' mentions [' . implode(' ', $words) . ']';
-            } else if ( count( $words ) ) {
-                $text = '[' . implode(' ', $words) . ']' . ' is mentioned';
-            } else if ( $spokenby ) {
-                $text = implode(' or ', $spokenby) . " speaks";
+            if ($spokenby && count($words)) {
+                $text = implode(' or ', $spokenby).' mentions ['.implode(' ', $words).']';
+            } else if (count($words)) {
+                $text = '['.implode(' ', $words).']'.' is mentioned';
+            } else if ($spokenby) {
+                $text = implode(' or ', $spokenby)." speaks";
             }
 
             return $text;
@@ -293,38 +293,38 @@ 
     }
 
     private function formatSearchMemberData() {
-        if ( isset($this->data['postcode']) ) {
+        if (isset($this->data['postcode'])) {
             try {
                 $postcode = $this->data['postcode'];
 
-                $MEMBER = new \MEMBER( array('postcode' => $postcode) );
+                $MEMBER = new \MEMBER(array('postcode' => $postcode));
                 // move the postcode to the front just to be tidy
-                $tidy_alertsearch = $postcode . " " . trim(str_replace("$postcode", "", $this->data['alertsearch']));
+                $tidy_alertsearch = $postcode." ".trim(str_replace("$postcode", "", $this->data['alertsearch']));
                 $alertsearch_display = str_replace("$postcode ", "", $tidy_alertsearch);
 
-                $this->data['member_alertsearch'] = str_replace("$postcode", "speaker:" . $MEMBER->person_id, $tidy_alertsearch);
+                $this->data['member_alertsearch'] = str_replace("$postcode", "speaker:".$MEMBER->person_id, $tidy_alertsearch);
                 $this->data['member_displaysearch'] = $alertsearch_display;
                 $this->data['member'] = $MEMBER;
 
-                if ( $this->data['scottish_text'] ) {
+                if ($this->data['scottish_text']) {
                     $constituencies = \MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituencies($postcode);
-                    if ( isset($constituencies['SPC']) ) {
+                    if (isset($constituencies['SPC'])) {
                         $MEMBER = new \MEMBER(array('constituency' => $constituencies['SPC'], 'house' => 4));
-                        $this->data['scottish_alertsearch'] = str_replace("$postcode", "speaker:" . $MEMBER->person_id, $tidy_alertsearch);
+                        $this->data['scottish_alertsearch'] = str_replace("$postcode", "speaker:".$MEMBER->person_id, $tidy_alertsearch);
                         $this->data['scottish_member'] = $MEMBER;
                     }
                 }
-            } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+            } catch (\MySociety\TheyWorkForYou\MemberException $e) {
                 $this->data['member_error'] = 1;
             }
         }
 
-        if ( $this->data['pid'] ) {
-            $MEMBER = new \MEMBER( array('person_id' => $this->data['pid']) );
+        if ($this->data['pid']) {
+            $MEMBER = new \MEMBER(array('person_id' => $this->data['pid']));
             $this->data['pid_member'] = $MEMBER;
         }
 
-        if ( $this->data['keyword'] ) {
+        if ($this->data['keyword']) {
             $this->data['display_keyword'] = $this->prettifyCriteria($this->data['keyword']);
         }
     }
@@ -354,12 +354,12 @@ 
         for ($i = 0; $i < $num_alerts; $i++) {
             $row = $q->row($i);
             $criteria = $this->prettifyCriteria($row['criteria']);
-            $token = $row['alert_id'] . '-' . $row['registrationtoken'];
+            $token = $row['alert_id'].'-'.$row['registrationtoken'];
 
             $status = 'confirmed';
-            if ( !$row['confirmed'] ) {
+            if (!$row['confirmed']) {
                 $status = 'unconfirmed';
-            } elseif ( $row['deleted'] == 2 ) {
+            } elseif ($row['deleted'] == 2) {
                 $status = 'suspended';
             }
 

Braces +3 added lines, -1 removed lines

@@ -127,7 +127,9 @@
         }
 
         $text = $this->data['alertsearch'];
-        if (!$text) $text = $this->data['keyword'];
+        if (!$text) {
+            $text = $this->data['keyword'];
+        }
 
         if ($this->data['submitted'] && !$this->data['pid'] && !$text) {
             $errors['alertsearch'] = 'Please enter what you want to be alerted about';

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

@@ -12,7 +12,7 @@
 class Standard extends \MySociety\TheyWorkForYou\AlertView {
     public $data;
 
-    public function __construct($THEUSER = NULL) {
+    public function __construct($THEUSER = null) {
         parent::__construct($THEUSER);
         $this->data = array();
     }

classes/Renderer/Footer.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 
     public $data;
 
-    private $about_links = array ('help', 'about', 'linktous', 'houserules', 'blog', 'news', 'contact', 'privacy');
+    private $about_links = array('help', 'about', 'linktous', 'houserules', 'blog', 'news', 'contact', 'privacy');
     private $assemblies_links = array('hansard', 'sp_home', 'ni_home', 'wales_home');
     private $international_links = array('newzealand', 'australia', 'ireland', 'mzalendo');
     private $tech_links = array('code', 'api', 'data', 'pombola', 'devmailinglist', 'irc');
@@ -28,10 +28,10 @@ 
     public function __construct() {
         $this->data = array();
 
-        $this->data['about'] = $this->get_menu_links( $this->about_links );
-        $this->data['assemblies'] = $this->get_menu_links( $this->assemblies_links );
-        $this->data['international'] = $this->get_menu_links( $this->international_links );
-        $this->data['tech'] = $this->get_menu_links( $this->tech_links );
+        $this->data['about'] = $this->get_menu_links($this->about_links);
+        $this->data['assemblies'] = $this->get_menu_links($this->assemblies_links);
+        $this->data['international'] = $this->get_menu_links($this->international_links);
+        $this->data['tech'] = $this->get_menu_links($this->tech_links);
     }
 
     /**