mysociety / theyworkforyou

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(

tests/SectionTest.php

Indentation +6 added lines, -6 removed lines

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

Spacing +8 added lines, -8 removed lines

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

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

@@ -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);
     }
 

classes/AlertView/Standard.php

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();
     }

Spacing +14 added lines, -14 removed lines

@@ -177,7 +177,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
                 }
             }
@@ -197,17 +197,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
@@ -232,7 +232,7 @@ 
 
 
     private function formatSearchTerms() {
-        if ( $this->data['alertsearch'] ) {
+        if ($this->data['alertsearch']) {
             $this->data['alertsearch_pretty'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($this->data['alertsearch']);
             $this->data['search_text'] = $this->data['alertsearch'];
         } else {
@@ -265,11 +265,11 @@ 
     }
 
     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']));
                 $alertsearch_display = str_replace("$postcode ", "", $tidy_alertsearch);
@@ -278,25 +278,25 @@ 
                 $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_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'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($this->data['keyword']);
         }
     }

classes/Renderer/Header.php

Indentation +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
     private function get_page_url() {
         $protocol = 'https://';
         if (DEVSITE) {
-          $protocol = 'http://';
+            $protocol = 'http://';
         }
         $url = $protocol . DOMAIN;
         if (array_key_exists('REQUEST_URI', $_SERVER)) {

Spacing +4 added lines, -4 removed lines

@@ -135,7 +135,7 @@ 
         if (isset($nextprev[$linktype]) && isset($nextprev[$linktype]['url'])) {
 
             if (isset($nextprev[$linktype]['body'])) {
-                $linktitle = _htmlentities( trim_characters($nextprev[$linktype]['body'], 0, 40) );
+                $linktitle = _htmlentities(trim_characters($nextprev[$linktype]['body'], 0, 40));
                 if (isset($nextprev[$linktype]['speaker']) &&
                     count($nextprev[$linktype]['speaker']) > 0) {
                     $linktitle = $nextprev[$linktype]['speaker']['name'] . ': ' . $linktitle;
@@ -162,10 +162,10 @@ 
 
         if ($nextprev) {
             // Four different kinds of back/forth links we might build.
-            $links = array ("first", "prev", "up", "next", "last");
+            $links = array("first", "prev", "up", "next", "last");
 
             foreach ($links as $type) {
-                if ( $link = $this->generate_next_prev_link( $nextprev, $type ) ) {
+                if ($link = $this->generate_next_prev_link($nextprev, $type)) {
 
                     $this->data['header_links'][] = $link;
                 }
@@ -258,7 +258,7 @@ 
         // Page names mapping to those in metadata.php.
         // Links in the top menu, and the sublinks we see if
         // we're within that section.
-        $nav_items = array (
+        $nav_items = array(
             array('home'),
             array('hansard', 'mps', 'peers', 'alldebatesfront', 'wranswmsfront', 'pbc_front', 'divisions_recent', 'calendar_summary'),
             array('sp_home', 'spoverview', 'msps', 'spdebatesfront', 'spwransfront'),

Braces +12 added lines, -4 removed lines

@@ -81,7 +81,9 @@ 
 
             $parent_page = $DATA->page_metadata($this_page, 'parent');
             if ($parent_title = $DATA->page_metadata($parent_page, 'title')) {
-                if ($this->data['page_title']) $this->data['page_title'] .= ': ';
+                if ($this->data['page_title']) {
+                    $this->data['page_title'] .= ': ';
+                }
                 $this->data['page_title'] .= $parent_title;
             }
 
@@ -103,7 +105,9 @@ 
         // Meta keywords
         if (!$this->data['meta_keywords'] = $DATA->page_metadata($this_page, "meta_keywords")) {
             $this->data['meta_keywords'] = $this->keywords_title;
-            if ($this->data['meta_keywords']) $this->data['meta_keywords'] .= ', ';
+            if ($this->data['meta_keywords']) {
+                $this->data['meta_keywords'] .= ', ';
+            }
             $this->data['meta_keywords'] .= 'Hansard, Official Report, Parliament, government, House of Commons, House of Lords, MP, Peer, Member of Parliament, MPs, Peers, Lords, Commons, Scottish Parliament, Northern Ireland Assembly, MSP, MLA, MSPs, MLAs, London Assembly Members';
         }
 
@@ -204,7 +208,9 @@ 
             $p = $parent;
             while ($p) {
                 $p = $DATA->page_metadata($p, 'parent');
-                if ($p) $parents[] = $p;
+                if ($p) {
+                    $parents[] = $p;
+                }
             }
 
             $top_highlight = array_pop($parents);
@@ -283,7 +289,9 @@ 
             $menudata = $DATA->page_metadata($toppage, 'menu');
             $text = $menudata['text'];
             $title = $menudata['title'];
-            if (!$title) continue;
+            if (!$title) {
+                continue;
+            }
 
             //get link and description for the menu ans add it to the array
             $class = $toppage == $this->nav_highlights['top'] ? 'on' : '';