mysociety / theyworkforyou

www/includes/dbtypes.php

Spacing +3 added lines, -3 removed lines

@@ -3,8 +3,8 @@ 
 // $Id: dbtypes.php,v 1.8 2009-04-28 13:13:04 matthew Exp $
 
 // The type field in the epobject database table
-define ('EPTYPE_HANSARD', 1);
-define ('EPTYPE_GLOSSARY', 2);
+define('EPTYPE_HANSARD', 1);
+define('EPTYPE_GLOSSARY', 2);
 
 // The major field in the hansard database table
 $hansardmajors = array(
@@ -121,7 +121,7 @@ 
 );
 $hansardmajors[104] = $hansardmajors[4];
 
-$parties = array (
+$parties = array(
     'Bp'    => 'Bishop',
     'Con'   => 'Conservative',
     'CWM'   => 'Deputy Speaker',

tests/HousesTest.php

Indentation +8 added lines, -8 removed lines

@@ -9,7 +9,7 @@ 
     /**
      * Test that the Royal edge-case house is correctly defined.
      */
-	public function testRoyalHouseDefined()
+    public function testRoyalHouseDefined()
     {
         $this->assertEquals(0, HOUSE_TYPE_ROYAL);
     }
@@ -17,7 +17,7 @@ 
     /**
      * Test that the House of Commons is correctly defined.
      */
-	public function testCommonsHouseDefined()
+    public function testCommonsHouseDefined()
     {
         $this->assertEquals(1, HOUSE_TYPE_COMMONS);
     }
@@ -25,7 +25,7 @@ 
     /**
      * Test that the House of Lords is correctly defined.
      */
-	public function testLordsHouseDefined()
+    public function testLordsHouseDefined()
     {
         $this->assertEquals(2, HOUSE_TYPE_LORDS);
     }
@@ -33,7 +33,7 @@ 
     /**
      * Test that the Northern Ireland Assembly is correctly defined.
      */
-	public function testNIHouseDefined()
+    public function testNIHouseDefined()
     {
         $this->assertEquals(3, HOUSE_TYPE_NI);
     }
@@ -41,7 +41,7 @@ 
     /**
      * Test that the Scottish Parliament is correctly defined.
      */
-	public function testScotlandHouseDefined()
+    public function testScotlandHouseDefined()
     {
         $this->assertEquals(4, HOUSE_TYPE_SCOTLAND);
     }
@@ -49,15 +49,15 @@ 
     /**
      * Test that the Assembly for Wales is correctly defined.
      */
-	public function testWalesHouseDefined()
+    public function testWalesHouseDefined()
     {
         $this->assertEquals(5, HOUSE_TYPE_WALES);
     }
 
-	/**
+    /**
      * Test that the London Assembly is correctly defined.
      */
-	public function testLondonAssemblyHouseDefined()
+    public function testLondonAssemblyHouseDefined()
     {
         $this->assertEquals(6, HOUSE_TYPE_LONDON_ASSEMBLY);
     }

classes/Utility/House.php

Indentation +11 added lines, -11 removed lines

@@ -24,24 +24,24 @@
     public static function house_to_members($house) {
         $house_to_members = array(
             HOUSE_TYPE_COMMONS => array(
-              'singular' => 'MP',
-              'plural'   => 'MPs'
+                'singular' => 'MP',
+                'plural'   => 'MPs'
             ),
             HOUSE_TYPE_LORDS => array(
-              'singular' => 'Member of the House of Lords',
-              'plural'   => 'Members of the House of Lords'
+                'singular' => 'Member of the House of Lords',
+                'plural'   => 'Members of the House of Lords'
             ),
             HOUSE_TYPE_NI => array(
-              'singular' => 'MLA',
-              'plural'   => 'MLAs'
+                'singular' => 'MLA',
+                'plural'   => 'MLAs'
             ),
             HOUSE_TYPE_SCOTLAND => array(
-              'singular' => 'MSP',
-              'plural'   => 'MSPs'
-          ),
+                'singular' => 'MSP',
+                'plural'   => 'MSPs'
+            ),
             HOUSE_TYPE_LONDON_ASSEMBLY => array(
-              'singular' => 'Member of the London Assembly',
-              'plural'   => 'Members of the London Assembly'
+                'singular' => 'Member of the London Assembly',
+                'plural'   => 'Members of the London Assembly'
             )
         );
 

Spacing +5 added lines, -5 removed lines

@@ -50,35 +50,35 @@
 
     public static function getCountryDetails($house) {
         $details = array(
-            HOUSE_TYPE_COMMONS => array (
+            HOUSE_TYPE_COMMONS => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => '– in the House of Commons',
                 'cons_type' => 'WMC',
                 'assembly_name' => 'House of Commons',
             ),
-            HOUSE_TYPE_NI => array (
+            HOUSE_TYPE_NI => array(
                 'country' => 'NORTHERN IRELAND',
                 'assembly' => 'ni',
                 'location' => '– in the Northern Ireland Assembly',
                 'cons_type' => 'NIE',
                 'assembly_name' => 'Northern Ireland Assembly',
             ),
-            HOUSE_TYPE_SCOTLAND => array (
+            HOUSE_TYPE_SCOTLAND => array(
                 'country' => 'SCOTLAND',
                 'assembly' => 'scotland',
                 'location' => '– in the Scottish Parliament',
                 'cons_type' => 'SPC',
                 'assembly_name' => 'Scottish Parliament',
             ),
-            HOUSE_TYPE_LORDS => array (
+            HOUSE_TYPE_LORDS => array(
                 'country' => 'UK',
                 'assembly' => 'uk-lords',
                 'location' => '– in the House of Lords',
                 'cons_type' => '',
                 'assembly_name' => 'House of Lords',
             ),
-            HOUSE_TYPE_LONDON_ASSEMBLY => array (
+            HOUSE_TYPE_LONDON_ASSEMBLY => array(
                 'country' => 'UK',
                 'assembly' => 'london-assembly',
                 'location' => '– in the London Assembly',

tests/PageTest.php

Indentation +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
         $this->assertRegexp('#<span class="person-header__about__position__role">\s*Labour\s*MP\s*</span>#', $page);
     }
 
-	public function testSittingMLA()
+    public function testSittingMLA()
     {
         $page = $this->fetch_page( array( 'pid' => 4, 'representative_type' => 'mla', 'url' => '/mp/4/test_current-mla' ) );
         $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->assertRegexp('#<span class="person-header__about__position__role">\s*Speaker\s*MP\s*</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( 'representative_type' => 'royal', 'n' => 'elizabeth_the_second' ) );
+        $page = $this->fetch_page(array('representative_type' => 'royal', '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->assertRegexp('#<span class="person-header__about__position__constituency">\s*Test Westminster Constituency\s*</span>#', $page);
         $this->assertRegexp('#<span class="person-header__about__position__role">\s*Labour\s*MP\s*</span>#', $page);
@@ -36,7 +36,7 @@ 
 
 	public function testSittingMLA()
     {
-        $page = $this->fetch_page( array( 'pid' => 4, 'representative_type' => 'mla', 'url' => '/mp/4/test_current-mla' ) );
+        $page = $this->fetch_page(array('pid' => 4, 'representative_type' => 'mla', 'url' => '/mp/4/test_current-mla'));
         $this->assertContains('Test Current-MLA', $page);
         $this->assertRegexp('#<span class="person-header__about__position__constituency">\s*Test Northern Ireland Constituency\s*</span>#', $page);
         $this->assertRegexp('#<span class="person-header__about__position__role">\s*Sinn Féin\s*MLA\s*</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->assertRegexp('#<span class="person-header__about__position__role">\s*Speaker\s*MP\s*</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);
     }
 

www/includes/easyparliament/templates/html/london/index.php

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
                 <div class="row nested-row">
                     <div class="homepage-in-the-news homepage-content-section">
                         <?php if ( $featured ) {
-                             include dirname(__FILE__) . "/../homepage/featured.php";
+                                include dirname(__FILE__) . "/../homepage/featured.php";
                         } ?>
                     </div>
                     <div class="homepage-create-alert homepage-content-section">

Spacing +4 added lines, -4 removed lines

@@ -4,10 +4,10 @@ 
             <div class="hero__mp-search__wrap">
                 <h1>Do your Assembly Members represent you?</h1>
                 <div class="row collapse">
-                    <?php if ( count($data['regional']) > 0 ) { ?>
+                    <?php if (count($data['regional']) > 0) { ?>
                         <ul class="homepage-rep-list">
                             <li>Your Assembly Memberss: </li>
-                        <?php foreach ( $data['regional'] as $member ) { ?>
+                        <?php foreach ($data['regional'] as $member) { ?>
                             <li class="homepage-rep-list__rep"><a href="/london-assembly-member/?p=<?= $member['person_id'] ?>"><?= $member['name'] ?></a></li>
                         <?php } ?>
                         </ul>
@@ -40,7 +40,7 @@ 
             <div class="panel panel--flushtop clearfix">
                 <div class="row nested-row">
                     <div class="homepage-in-the-news homepage-content-section">
-                        <?php if ( $featured ) {
+                        <?php if ($featured) {
                              include dirname(__FILE__) . "/../homepage/featured.php";
                         } ?>
                     </div>
@@ -85,7 +85,7 @@ 
                     <div class="homepage-recently homepage-content-section">
                         <h2>Recently answered questions to the Mayor of London</h2>
                         <ul class="recently__list"><?php
-                            foreach ( $debates['recent'] as $recent ) {
+                            foreach ($debates['recent'] as $recent) {
                                 include dirname(__FILE__) . '/../homepage/recent-debates.php';
                             }
                         ?></ul>

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', 'london_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);
     }
 
     /**

classes/SectionView/LondonView.php

Spacing +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'london' )
+            array('section' => 'london')
         );
     }
 
@@ -51,23 +51,23 @@ 
 
         $debates = $DEBATELIST->display('recent_debates', array('days' => 30, 'num' => 9), 'none');
         $MOREURL = new \MySociety\TheyWorkForYou\Url('londondebatesfront');
-        $MOREURL->insert( array( 'more' => 1 ) );
+        $MOREURL->insert(array('more' => 1));
 
         // this makes sure that we don't repeat this debate in the list below
         $random_debate = NULL;
-        if ( isset($debates['data']) && count($debates['data']) ) {
+        if (isset($debates['data']) && count($debates['data'])) {
             $random_debate = $debates['data'][0];
         }
 
         $recent = array();
-        if ( isset($debates['data']) && count($debates['data']) ) {
+        if (isset($debates['data']) && count($debates['data'])) {
             // at the start of a session there may be less than 6
             // debates
             $max = 6;
-            if ( count($debates['data']) < 6 ) {
+            if (count($debates['data']) < 6) {
                 $max = count($debates['data']);
             }
-            for ( $i = 1; $i < $max; $i++ ) {
+            for ($i = 1; $i < $max; $i++) {
                 $debate = $debates['data'][$i];
                 $debate['desc'] = "questions to the Mayor of London";
                 $debate['more_url'] = $MOREURL->generate();
@@ -76,7 +76,7 @@ 
         }
 
         $featured = array();
-        if ( $random_debate ) {
+        if ($random_debate) {
             $featured = $random_debate;
             $featured['more_url'] = $MOREURL->generate();
             $featured['desc'] = 'question to the Mayor of London';
@@ -85,7 +85,7 @@ 
         }
 
         $data['featured'] = $featured;
-        $data['debates'] = array( 'recent' => $recent);
+        $data['debates'] = array('recent' => $recent);
 
         $data['regional'] = $this->getAssemblyMemberList();
         $data['template'] = 'london/index';

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

@@ -42,7 +42,7 @@ 
 
         $data = array();
 
-        $data['popular_searches'] = NULL;
+        $data['popular_searches'] = null;
 
 
         $data['urls'] = $this->getURLs($data);
@@ -54,7 +54,7 @@ 
         $MOREURL->insert( array( 'more' => 1 ) );
 
         // this makes sure that we don't repeat this debate in the list below
-        $random_debate = NULL;
+        $random_debate = null;
         if ( isset($debates['data']) && count($debates['data']) ) {
             $random_debate = $debates['data'][0];
         }