mysociety / theyworkforyou

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

www/includes/easyparliament/templates/html/mp/_vote_footer.php

Spacing +2 added lines, -2 removed lines

@@ -5,9 +5,9 @@
     <p>For an explanation of the vote descriptions please see our page about
       <a href="/voting-information">voting information on TheyWorkForYou</a>.</p>
 
-  <?php if(isset($data['photo_attribution_text'])) { ?>
+  <?php if (isset($data['photo_attribution_text'])) { ?>
     <p>
-      <?php if(isset($data['photo_attribution_link'])) { ?>
+      <?php if (isset($data['photo_attribution_link'])) { ?>
         Profile photo:
         <a href="<?= $data['photo_attribution_link'] ?>"><?= $data['photo_attribution_text'] ?></a>
       <?php } else { ?>

classes/SectionView/LondonView.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'lmqs', 'title' => 'Mayoral Questions' )
+            array('section' => 'lmqs', 'title' => 'Mayoral Questions')
         );
     }
 }

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

Spacing +17 added lines, -17 removed lines

@@ -26,7 +26,7 @@ 
                           Based on postcode <strong><?= $mp_data['postcode'] ?></strong>
                           <a href="<?= $mp_data['change_url'] ?>">(Change postcode)</a>
                       </p>
-                    <?php if ( isset( $mp_data ) && $type != 'mlas' ) { ?>
+                    <?php if (isset($mp_data) && $type != 'mlas') { ?>
                       <h3>Your <?= $mp_data['former'] ? $mp_data['former'] . ' ' : '' ?><?= $rep_name ?> is</h3>
                     </div>
                     <a href="<?= $mp_data['mp_url'] ?>" class="people-list__person">
@@ -38,13 +38,13 @@ 
                         </p>
                     </a>
                     <?php }
-                    if ( isset($reps) ) {
-                        if ( isset($mp_data) && $type != 'mlas' ) { ?>
+                    if (isset($reps)) {
+                        if (isset($mp_data) && $type != 'mlas') { ?>
                     <div class="people-list__your-mp__replist-header">
                         <?php } ?>
                       <h3>Your <?=$former ?> <?= $rep_plural == 'MSPs' ? 'regional ' : '' ?><?= $rep_plural ?> are</h3>
                     </div>
-                        <?php foreach ( $reps as $rep ) { ?>
+                        <?php foreach ($reps as $rep) { ?>
                     <a href="<?= $rep['mp_url'] ?>" class="people-list__person">
                     <img class="people-list__person__image" src="<?= $rep['image'] ?>">
                         <h2 class="people-list__person__name"><?= $rep['name'] ?></h2>
@@ -65,9 +65,9 @@ 
             <div class="search-page__section search-page__section--search">
                 <div class="search-page__section__primary">
                     <p class="search-page-main-inputs">
-                    <?php if ( $type == 'peers' ) { ?>
+                    <?php if ($type == 'peers') { ?>
                         <label for="find-mp-by-name-or-postcode">Find <?= $rep_plural ?> by name:</label>
-                    <?php } elseif ( $type == 'mlas' || $type == 'msps' ) { ?>
+                    <?php } elseif ($type == 'mlas' || $type == 'msps') { ?>
                         <label for="find-mp-by-name-or-postcode">Find your <?= $rep_name ?> by postcode:</label>
                     <?php } else { ?>
                         <label for="find-mp-by-name-or-postcode">Find your <?= $rep_name ?> by name or postcode:</label>
@@ -108,12 +108,12 @@ 
             <div class="search-page__section__primary">
             <h2>All <?= $rep_plural ?></h2>
 
-                <?php if ( $type != 'peers' ) { ?>
+                <?php if ($type != 'peers') { ?>
                 <ul class="search-result-display-options">
-                    <?php if ( $order == 'given_name' ) { ?>
+                    <?php if ($order == 'given_name') { ?>
                     <li><strong>Sorted by</strong> First name</li>
                     <li>Sort by <a href="<?= $urls['by_last'] ?>">Last name</a> / <a href="<?= $urls['by_party'] ?>">Party</a></li>
-                    <?php } else if ( $order == 'party' ) { ?>
+                    <?php } else if ($order == 'party') { ?>
                     <li><strong>Sorted by</strong> Party</li>
                     <li>Sort by <a href="<?= $urls['by_first'] ?>">First name</a> / <a href="<?= $urls['by_last'] ?>">Last name</a></li>
                     <?php } else { ?>
@@ -123,7 +123,7 @@ 
                 </ul>
                 <?php } else { ?>
                 <ul class="search-result-display-options">
-                    <?php if ( $order == 'party' ) { ?>
+                    <?php if ($order == 'party') { ?>
                     <li><strong>Sorted by</strong> Party</li>
                     <li>Sort by <a href="<?= $urls['by_name'] ?>">Name</a></li>
                     <?php } else { ?>
@@ -173,10 +173,10 @@ 
                     }
                 }
                 $initial_link = '';
-                foreach ( $data as $person ) {
+                foreach ($data as $person) {
                     if ($order != 'party') {
-                        $initial = substr( strtoupper($person[$a_to_z_key]), 0, 1);
-                        if ( $initial != $current_initial ) {
+                        $initial = substr(strtoupper($person[$a_to_z_key]), 0, 1);
+                        if ($initial != $current_initial) {
                             $current_initial = $initial;
                             $initial_link = "name=\"$initial\" ";
                         } else {
@@ -190,7 +190,7 @@ 
                 </noscript>
                         <h2 class="people-list__person__name"><?= ucfirst($person['name']) ?></h2>
                         <p class="people-list__person__memberships">
-                        <?php if ( $person['constituency'] ) { ?>
+                        <?php if ($person['constituency']) { ?>
                         <span class="people-list__person__constituency"><?= $person['constituency'] ?></span>
                         <?php } ?>
                         <span class="people-list__person__party <?= slugify($person['party']) ?>"><?= $person['party'] ?></span>
@@ -208,7 +208,7 @@ 
                 <a href="<?= $urls['by_csv'] ?>">Download this list as a CSV</a>
                     suitable for Excel
                 </p>
-                <?php if ( $type == 'mps' ) { ?>
+                <?php if ($type == 'mps') { ?>
                 <form method="get" action="<?= $urls['plain'] ?>" class="sidebar-item-with-icon sidebar-item-with-icon--date">
                     <p>
                         Or view a past list
@@ -260,7 +260,7 @@ 
                   })
                 });
                 </script>
-                <?php } else if ( $type == 'msps' ) { ?>
+                <?php } else if ($type == 'msps') { ?>
                     <p class="past-list-dates" id="past-list-dates">
                         <a href="<?= $urls['plain'] ?>?date=2011-05-05">MSPs at 2011 election</a>
                         <a href="<?= $urls['plain'] ?>?date=2007-05-03">MSPs at 2007 election</a>
@@ -274,7 +274,7 @@ 
                     </p>
                 <?php } ?>
 
-                <?php include( dirname(__FILE__) . '/../sidebar/looking_for.php' ) ?>
+                <?php include(dirname(__FILE__) . '/../sidebar/looking_for.php') ?>
             </div>
         </div>
 

www/docs/api/key.php

Spacing +2 added lines, -2 removed lines

@@ -45,9 +45,9 @@
 
             try {
                 $invoice = $sub->latest_invoice;
-                $invoice->pay([ 'expand' => [ 'payment_intent' ] ]);
+                $invoice->pay(['expand' => ['payment_intent']]);
             } catch (\Stripe\Error\Card $e) {
-                $invoice = \Stripe\Invoice::retrieve($sub->latest_invoice, ['expand' => [ 'payment_intent'] ]);
+                $invoice = \Stripe\Invoice::retrieve($sub->latest_invoice, ['expand' => ['payment_intent']]);
             }
         } else {
             $invoice = $subscription->stripe->latest_invoice;

Braces +2 added lines, -1 removed lines

@@ -155,7 +155,8 @@
     # The subscription has been created, but it is possible that the
     # payment failed (card error), or we need to do 3DS or similar
     $pi = $invoice->payment_intent;
-    if (!$pi) { # Free plan
+    if (!$pi) {
+# Free plan
         return;
     }
     if ($pi->status == 'requires_payment_method' || $pi->status == 'requires_source') {

www/docs/api/hook.php

Spacing +2 added lines, -2 removed lines

@@ -53,10 +53,10 @@
         # Update the invoice's PaymentIntent and Charge to say it came from TWFY (for CSV export)
         # Both are shown in the Stripe admin, annoyingly
         if ($obj->payment_intent) {
-            \Stripe\PaymentIntent::update($obj->payment_intent, [ 'description' => 'TheyWorkForYou' ]);
+            \Stripe\PaymentIntent::update($obj->payment_intent, ['description' => 'TheyWorkForYou']);
         }
         if ($obj->charge) {
-            \Stripe\Charge::update($obj->charge, [ 'description' => 'TheyWorkForYou' ]);
+            \Stripe\Charge::update($obj->charge, ['description' => 'TheyWorkForYou']);
         }
     } catch (\Stripe\Error\Base $e) {
     }