mysociety / theyworkforyou

www/docs/mps/index.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 $args = $people->getArgs();
 $people->setMetaData($args);
 $data = $people->getData($args);
-if ( isset($args['f']) && $args['f'] == 'csv' ) {
+if (isset($args['f']) && $args['f'] == 'csv') {
     $people->sendAsCSV($data);
 } else {
     MySociety\TheyWorkForYou\Renderer::output("people/index", $data);

www/docs/news/rdf.php

Braces +6 added lines, -2 removed lines

@@ -25,7 +25,9 @@ 
 <?php
     $c = 0;
     foreach ($all_news as $id => $news_row) {
-        if ($c++ == 10) break;
+        if ($c++ == 10) {
+            break;
+        }
         list($title, $content, $date) = $news_row;
         $url = "https://www.theyworkforyou.com".news_individual_link($date, $title);
         print "<rdf:li rdf:resource=\"$url\" />\n";
@@ -39,7 +41,9 @@ 
 <?php
     $c = 0;
     foreach ($all_news as $id => $news_row) {
-        if ($c++ == 10) break;
+        if ($c++ == 10) {
+            break;
+        }
         list($title, $content, $date) = $news_row;
         $url = "https://www.theyworkforyou.com".news_individual_link($date, $title);
         $excerpt = trim_characters(news_format_body($content), 0, 250);

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
     foreach ($all_news as $id => $news_row) {
         if ($c++ == 10) break;
         list($title, $content, $date) = $news_row;
-        $url = "https://www.theyworkforyou.com".news_individual_link($date, $title);
+        $url = "https://www.theyworkforyou.com" . news_individual_link($date, $title);
         print "<rdf:li rdf:resource=\"$url\" />\n";
     }
 ?>
@@ -41,7 +41,7 @@ 
     foreach ($all_news as $id => $news_row) {
         if ($c++ == 10) break;
         list($title, $content, $date) = $news_row;
-        $url = "https://www.theyworkforyou.com".news_individual_link($date, $title);
+        $url = "https://www.theyworkforyou.com" . news_individual_link($date, $title);
         $excerpt = trim_characters(news_format_body($content), 0, 250);
         $date = str_replace(" ", "T", $date) . "+00:00";
 ?>

www/docs/api/api_getComments.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 }
 
 function api_getComments_start_date($start_date) {
-        $args = array (
+        $args = array(
             'start_date' => $start_date,
             'end_date' => get_http_var('end_date')
         );
@@ -33,7 +33,7 @@ 
 }
 
 function api_getComments_search($s) {
-        $args = array (
+        $args = array(
             's' => $s,
             'p' => get_http_var('page'),
             'num' => get_http_var('num'),

www/docs/bills/2005-06/identity-cards/index.php

Spacing +5 added lines, -5 removed lines

@@ -2,12 +2,12 @@ 
 
 $this_page = 'bill_index';
 include_once '../../../../includes/easyparliament/init.php';
-$DATA->set_page_metadata($this_page, 'heading','Identity Cards Act 2006');
+$DATA->set_page_metadata($this_page, 'heading', 'Identity Cards Act 2006');
 
 $PAGE->page_start();
 $PAGE->stripe_start();
 
-$PAGE->block_start(array ('title'=>'House of Commons - Normal Run'));
+$PAGE->block_start(array('title'=>'House of Commons - Normal Run'));
 ?>
 <ul> <li>Back on 25th May 2005, a bill was introduced: the <a
 href="http://www.publications.parliament.uk/pa/cm200506/cmbills/009/2006009.htm">Identity
@@ -32,7 +32,7 @@ 
 
 <?php
 $PAGE->block_end();
-$PAGE->block_start(array ('title'=>'House of Lords - Normal Run'));
+$PAGE->block_start(array('title'=>'House of Lords - Normal Run'));
 ?>
 
 <ul>
@@ -49,7 +49,7 @@ 
 
 <?php
 $PAGE->block_end();
-$PAGE->block_start(array ('title'=>'Ping Pong'));
+$PAGE->block_start(array('title'=>'Ping Pong'));
 ?>
 
 <ul>
@@ -94,7 +94,7 @@ 
 $PAGE->block_end();
 
     $includes = array(
-        array (
+        array(
             'type' => 'include',
             'content' => 'bills_intro'
         ),

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/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/SectionView/SpView.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'sp' )
+            array('section' => 'sp')
         );
     }
 }

classes/SectionView/WransView.php

Spacing +6 added lines, -6 removed lines

@@ -12,13 +12,13 @@ 
 
     protected function display_front() {
         global $DATA, $this_page;
-        if ( get_http_var('type') == 'wrans') {
+        if (get_http_var('type') == 'wrans') {
             return parent::display_front();
         }
 
         $data = array();
 
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $WRANSLIST = new \WRANSLIST;
 
         $wrans = array();
@@ -50,10 +50,10 @@ 
 
     protected function getSearchSections() {
         $sections = array(
-            array( 'section' => 'wrans', 'title' => 'Written Answers' ),
+            array('section' => 'wrans', 'title' => 'Written Answers'),
         );
-        if ( get_http_var('type') == '') {
-            $sections[] = array( 'section' => 'wms', 'title' => 'Written Ministerial Statements' );
+        if (get_http_var('type') == '') {
+            $sections[] = array('section' => 'wms', 'title' => 'Written Ministerial Statements');
         }
         return $sections;
     }
@@ -62,7 +62,7 @@ 
     # speech bar the first (assuming that's the question)
     private $votelinks_so_far = 0;
 
-    protected function generate_votes ($votes, $id, $gid) {
+    protected function generate_votes($votes, $id, $gid) {
         /*
         Returns HTML for the 'Does this answer the question?' links (wrans) in the sidebar.
         $votes = => array (

classes/Utility/Postcode.php

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

@@ -39,7 +39,7 @@
 
         if ($last_postcode == $postcode) {
             $return_value = $mp_only ? $last_postcode_value['WMC'] : $last_postcode_value;
-            twfy_debug ("TIME", "Postcode $postcode looked up last time, is " . ( is_array($return_value) ? implode(', ', $return_value) : $return_value ));
+            twfy_debug ("TIME", "postcode $postcode looked up last time, is " . ( is_array($return_value) ? implode(', ', $return_value) : $return_value ));
             return $return_value;
         }
 

Spacing +4 added lines, -4 removed lines

@@ -39,7 +39,7 @@ 
 
         if ($last_postcode == $postcode) {
             $return_value = $mp_only ? $last_postcode_value['WMC'] : $last_postcode_value;
-            twfy_debug ("TIME", "Postcode $postcode looked up last time, is " . ( is_array($return_value) ? implode(', ', $return_value) : $return_value ));
+            twfy_debug("TIME", "Postcode $postcode looked up last time, is " . (is_array($return_value) ? implode(', ', $return_value) : $return_value));
             return $return_value;
         }
 
@@ -82,9 +82,9 @@ 
             $name = explode('|', $name);
             if ($country == 'W') {
                 return array('WMC' => $name[0], 'WAC' => $name[1], 'WAE' => $name[2]);
-            } elseif ($country == 'S' || count($name)==3) {
+            } elseif ($country == 'S' || count($name) == 3) {
                 return array('WMC' => $name[0], 'SPC' => $name[1], 'SPE' => $name[2]);
-            } elseif ($country == 'N' || count($name)==2) {
+            } elseif ($country == 'N' || count($name) == 2) {
                 return array('WMC' => $name[0], 'NIE' => $name[1]);
             } else {
                 return array('WMC' => $name[0]);
@@ -118,7 +118,7 @@ 
 
         $r = json_decode($file, true);
         if (!$r) {
-            trigger_error("Postcode database is not working. Content:\n".$file.", request: ". $filename, E_USER_WARNING);
+            trigger_error("Postcode database is not working. Content:\n" . $file . ", request: " . $filename, E_USER_WARNING);
             return '';
         }
         if (isset($r['error']) || !isset($r['areas'])) {

Braces +6 added lines, -3 removed lines

@@ -52,7 +52,9 @@ 
             $ret = self::postcodeFetchFromMapit($postcode);
         }
 
-        if (is_string($ret)) return $ret;
+        if (is_string($ret)) {
+            return $ret;
+        }
 
         $last_postcode = $postcode;
         $last_postcode_value = $ret;
@@ -126,8 +128,9 @@ 
         }
         $areas = array();
         foreach ($r['areas'] as $row) {
-            if (in_array($row['type'], array('WMC', 'SPC', 'SPE', 'NIE', 'WAC', 'WAE')))
-                $areas[$row['type']] = $row['name'];
+            if (in_array($row['type'], array('WMC', 'SPC', 'SPE', 'NIE', 'WAC', 'WAE'))) {
+                            $areas[$row['type']] = $row['name'];
+            }
         }
 
         if (!isset($areas['WMC'])) {