mysociety / theyworkforyou

tests/AlertsPageTest.php

Spacing +7 added lines, -7 removed lines

@@ -11,7 +11,7 @@ 
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/alertspage.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/alertspage.xml');
     }
 
     private function fetch_page($vars)
@@ -21,37 +21,37 @@ 
 
     public function testFetchPage()
     {
-        $page = $this->fetch_page( array() );
+        $page = $this->fetch_page(array());
         $this->assertStringContainsString('TheyWorkForYou Email Alerts', $page);
     }
 
     public function testKeywordOnly() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'elephant'));
         $this->assertStringContainsString('Receive alerts when [elephant] is mentioned', $page);
     }
 
     public function testPostCodeOnly() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'SE17 3HE') );
+        $page = $this->fetch_page(array('alertsearch' => 'SE17 3HE'));
         $this->assertStringContainsString('when Mrs Test Current-MP', $page);
     }
 
     public function testPostCodeWithKeyWord()
     {
-        $page = $this->fetch_page( array( 'alertsearch' => 'SE17 3HE elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'SE17 3HE elephant'));
         $this->assertStringContainsString('You have used a postcode and something else', $page);
         $this->assertStringContainsString('Mentions of [elephant] by your MP, Mrs Test Current-MP', $page);
         $this->assertStringNotContainsString('by your MSP', $page);
     }
 
     public function testScottishPostcodeWithKeyword() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'PH6 2DB elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'PH6 2DB elephant'));
         $this->assertStringContainsString('You have used a postcode and something else', $page);
         $this->assertStringContainsString('Mentions of [elephant] by your MP, Mr Test2 Current-MP', $page);
         $this->assertStringContainsString('Mentions of [elephant] by your MSP, Mrs Test Current-MSP', $page);
     }
 
     public function testPostcodeAndKeywordWithNoSittingMP() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'OX1 4LF elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'OX1 4LF elephant'));
         $this->assertStringContainsString('You have used a postcode and something else', $page);
         $this->assertStringNotContainsString('Did you mean to get alerts for when your MP', $page);
     }

www/includes/easyparliament/init.php

Spacing +22 added lines, -22 removed lines

@@ -4,7 +4,7 @@ 
 First some things to help make our PHP nicer and betterer
 ********************************************************************************/
 
-error_reporting (E_ALL ^ E_DEPRECATED);
+error_reporting(E_ALL ^ E_DEPRECATED);
 
 /********************************************************************************
 Now some constants that are the same for live and dev versions
@@ -12,21 +12,21 @@ 
 ********************************************************************************/
 
 // In case we need to switch these off globally at some point...
-define ("ALLOWCOMMENTS", true);
+define("ALLOWCOMMENTS", true);
 
 // These variables are so we can keep date/time formats consistent across the site
 // and change them easily.
 // Formats here: http://www.php.net/manual/en/function.date.php
-define ("LONGERDATEFORMAT",		"%A, %e %B %Y");// Monday, 31 December 2003
-define ("LONGDATEFORMAT", 		"%e %B %Y"); 	// 31 December 2003
-define ("SHORTDATEFORMAT", 		"%e %b %Y");	// 31 Dec 2003
-define ("TIMEFORMAT", 			"%l:%M %p");	// 11:59 pm
+define("LONGERDATEFORMAT", "%A, %e %B %Y"); // Monday, 31 December 2003
+define("LONGDATEFORMAT", "%e %B %Y"); // 31 December 2003
+define("SHORTDATEFORMAT", "%e %b %Y"); // 31 Dec 2003
+define("TIMEFORMAT", "%l:%M %p"); // 11:59 pm
 
-define ("SHORTDATEFORMAT_SQL",	"%e %b %Y"); // 31 Dec 2003
-define ("TIMEFORMAT_SQL", 		"%l:%i %p"); // 11:59 PM
+define("SHORTDATEFORMAT_SQL", "%e %b %Y"); // 31 Dec 2003
+define("TIMEFORMAT_SQL", "%l:%i %p"); // 11:59 PM
 
 // Where we store the postcode of users if they search for an MP by postcode.
-define ('POSTCODE_COOKIE', 		'eppc');
+define('POSTCODE_COOKIE', 'eppc');
 
 /********************************************************************************
 And now all the files we'll include on every page.
@@ -52,7 +52,7 @@ 
 textdomain('TheyWorkForYou');
 
 // Set the default timezone
-if(function_exists('date_default_timezone_set')) {
+if (function_exists('date_default_timezone_set')) {
     date_default_timezone_set(TIMEZONE);
 }
 
@@ -83,39 +83,39 @@ 
 
 // The time the page starts, so we can display the total at the end.
 // getmicrotime() is in utiltity.php.
-define ("STARTTIME", getmicrotime());
+define("STARTTIME", getmicrotime());
 if (!isset($_SERVER['WINDIR'])) {
     $rusage = getrusage();
-    define ('STARTTIMES', $rusage['ru_stime.tv_sec']*1000000 + $rusage['ru_stime.tv_usec']);
-    define ('STARTTIMEU', $rusage['ru_utime.tv_sec']*1000000 + $rusage['ru_utime.tv_usec']);
+    define('STARTTIMES', $rusage['ru_stime.tv_sec'] * 1000000 + $rusage['ru_stime.tv_usec']);
+    define('STARTTIMEU', $rusage['ru_utime.tv_sec'] * 1000000 + $rusage['ru_utime.tv_usec']);
 }
 
 $DATA = new \MySociety\TheyWorkForYou\Data;
 
 class ParlDB extends \MySociety\TheyWorkForYou\Db\Connection {
     public function __construct() {
-        $this->init (OPTION_TWFY_DB_HOST, OPTION_TWFY_DB_USER, OPTION_TWFY_DB_PASS, OPTION_TWFY_DB_NAME);
+        $this->init(OPTION_TWFY_DB_HOST, OPTION_TWFY_DB_USER, OPTION_TWFY_DB_PASS, OPTION_TWFY_DB_NAME);
     }
 }
 
 $filter = new \MySociety\TheyWorkForYou\Utility\LibFilter;
 
-include_once (INCLUDESPATH."easyparliament/user.php");
+include_once (INCLUDESPATH . "easyparliament/user.php");
 
 // Test to see if this is a new-style template using the renderer class.
-if (! isset($new_style_template) or $new_style_template !== true) {
+if (!isset($new_style_template) or $new_style_template !== true) {
 
     // This is an old-style page. Use the old page classes.
-    include_once (INCLUDESPATH."easyparliament/page.php");
+    include_once (INCLUDESPATH . "easyparliament/page.php");
 
 }
 
-include_once (INCLUDESPATH."easyparliament/hansardlist.php");
-include_once (INCLUDESPATH."dbtypes.php");
-include_once (INCLUDESPATH."easyparliament/commentlist.php");
-include_once (INCLUDESPATH."easyparliament/comment.php");
+include_once (INCLUDESPATH . "easyparliament/hansardlist.php");
+include_once (INCLUDESPATH . "dbtypes.php");
+include_once (INCLUDESPATH . "easyparliament/commentlist.php");
+include_once (INCLUDESPATH . "easyparliament/comment.php");
 
 // Added in as new module by Richard Allan MP
-include_once (INCLUDESPATH."easyparliament/alert.php");
+include_once (INCLUDESPATH . "easyparliament/alert.php");
 
 twfy_debug_timestamp("at end of init.php");

tests/DivisionsTest.php

Spacing +7 added lines, -7 removed lines

@@ -17,17 +17,17 @@ 
     }
 
     private function fetch_division_page() {
-        return $this->fetch_page( array( 'pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions' ) );
+        return $this->fetch_page(array('pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions'));
     }
 
     private function fetch_mp_recent_page()
     {
-        $vars = array( 'pagetype' => 'recent', 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/recent' );
+        $vars = array('pagetype' => 'recent', 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/recent');
         return $this->base_fetch_page($vars, 'mp', 'index.php', '/mp/recent.php');
     }
 
     private function fetch_recent_page() {
-        return $this->base_fetch_page( array('url' => '/divisions' ), 'divisions', 'index.php', '/divisions/index.php' );
+        return $this->base_fetch_page(array('url' => '/divisions'), 'divisions', 'index.php', '/divisions/index.php');
     }
 
 
@@ -57,14 +57,14 @@ 
     public function testMPPageContainsAgreement()
     {
         // Checks this MP contains a reference to the agreement
-        $page = $this->fetch_page( array( 'pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions' ) );
+        $page = $this->fetch_page(array('pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions'));
         $this->assertStringContainsString('Example Agreement', $page);
     }
 
     public function testMPPageDoesNotContainsAgreement()
     {
         // Checks this MP does not contain agreement - should be out of time scope
-        $page = $this->fetch_page( array( 'pagetype' => 'divisions', 'pid' => 6, 'policy' => 363, 'url' => '/mp/6/test_current-mp/test_westminster_constituency/divisions' ) );
+        $page = $this->fetch_page(array('pagetype' => 'divisions', 'pid' => 6, 'policy' => 363, 'url' => '/mp/6/test_current-mp/test_westminster_constituency/divisions'));
         $this->assertStringNotContainsString('Example Agreement', $page);
         $this->assertStringNotContainsString('This person has not voted on this policy', $page);
 
@@ -128,7 +128,7 @@ 
     }
 
     public function testNotEnoughInfoStatement() {
-        return $this->fetch_page( array( 'pagetype' => 'divisions', 'pid' => 2, 'policy' => 810, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions' ) );
+        return $this->fetch_page(array('pagetype' => 'divisions', 'pid' => 2, 'policy' => 810, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions'));
         $this->assertStringContainsString('we don’t have enough information to calculate Test Current-MP’s position', $page);
     }
 
@@ -139,7 +139,7 @@ 
     }
 
     public function testSingleDivision() {
-        $page = $this->base_fetch_page( array('url' => '/divisions/division.php', 'vote' => 'pw-3012-01-01-1-commons' ), 'divisions', 'division.php', '/divisions/division.php' );
+        $page = $this->base_fetch_page(array('url' => '/divisions/division.php', 'vote' => 'pw-3012-01-01-1-commons'), 'divisions', 'division.php', '/divisions/division.php');
         $this->assertStringContainsString('A majority of MPs  <b>voted in favour</b> of a thing', $page);
         $this->assertStringContainsString('Aye: 200', $page);
         $this->assertStringNotContainsString('No:', $page); # Summary 100, but no actual votes. In reality, summary can only be <= actual.

www/includes/easyparliament/templates/html/homepage/devolved-list.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php 
-$nav_items = array (
+$nav_items = array(
     array('hansard', 'alldebatesfront', 'mps', 'peers', 'wranswmsfront', 'divisions_recent_commons', 'divisions_recent_lords'),
-    array('sp_home', 'sp_home', 'spdebatesfront', 'msps',  'spwransfront', 'divisions_recent_sp'),
+    array('sp_home', 'sp_home', 'spdebatesfront', 'msps', 'spwransfront', 'divisions_recent_sp'),
     array('wales_home', 'wales_home', 'wales_debates', 'mss', 'welshlanguage', 'divisions_recent_wales'),
     array('ni_home', 'ni_home', 'nioverview', 'mlas'),
 );

classes/Renderer/Markdown.php

Braces +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
             $level = $matches[1];
             $htitle = $matches[2];
             $slug = slugify($htitle);
-            if ($level == 1){
+            if ($level == 1) {
                 $title_class = "js-toc-title";
             } else {
                 $title_class = "js-toc-item";

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
 
 class Markdown
 {
-    public function markdown_document($this_page, $show_menu = true){
+    public function markdown_document($this_page, $show_menu = true) {
         // This function takes a markdown file and converts it to HTML
     
         $markdown_file = '../../../markdown/' . $this_page . '.md';
@@ -37,7 +37,7 @@ 
             $level = $matches[1];
             $htitle = $matches[2];
             $slug = slugify($htitle);
-            if ($level == 1){
+            if ($level == 1) {
                 $title_class = "js-toc-title";
             } else {
                 $title_class = "js-toc-item";

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

Indentation +4 added lines, -4 removed lines

@@ -25,11 +25,11 @@ 
 
                 if ( isset($divisions) && $divisions ) {
                         foreach ($divisions as $division) {
-                          $displayed_votes = true;
+                            $displayed_votes = true;
 
-                          if ($current_date != $division['date']) {
+                            if ($current_date != $division['date']) {
                             if ($current_date != '' ) {
-                              print('</ul></div>');
+                                print('</ul></div>');
                             }
                             $current_date = $division['date'];
                             $sidebar_links[] = $division['date'];
@@ -38,7 +38,7 @@ 
                             <h2><?= strftime('%e %b %Y', strtotime($division['date'])) ?></h2>
                              <ul class="vote-descriptions policy-votes">
                           <?php }
-                          include('_division_description.php');
+                            include('_division_description.php');
                         }
                         echo('</div>');
                 } ?>

Spacing +3 added lines, -3 removed lines

@@ -23,12 +23,12 @@ 
                 $current_date = '';
                 $sidebar_links = array();
 
-                if ( isset($divisions) && $divisions ) {
+                if (isset($divisions) && $divisions) {
                         foreach ($divisions as $division) {
                           $displayed_votes = true;
 
                           if ($current_date != $division['date']) {
-                            if ($current_date != '' ) {
+                            if ($current_date != '') {
                               print('</ul></div>');
                             }
                             $current_date = $division['date'];
@@ -56,7 +56,7 @@ 
                 <div>
                     <h3 class="browse-content"><?= gettext('Browse content') ?></h3>
                     <ul>
-                        <?php foreach($sidebar_links as $date) { ?>
+                        <?php foreach ($sidebar_links as $date) { ?>
                           <li>
                               <a href="#<?= strftime('%Y-%m-%d', strtotime($date)) ?>">
                                   <?= strftime('%e %b %Y', strtotime($date)) ?>

tests/PartyTest.php

Spacing +4 added lines, -4 removed lines

@@ -110,7 +110,7 @@ 
         $this->assertEquals($specific_policy["date_max"], "2002-00-00");
     }
 
-    public function testPartyChangeHistoryRobustness(){
+    public function testPartyChangeHistoryRobustness() {
         //The cohort comparison for a set of MPs does not change if one of those MPs changes party *after* the division.
         //Person 10 and 11 are in party D. 
         //Person 12 is in Party E the whole time.
@@ -249,7 +249,7 @@ 
 
     private function getMemberFromPersonId($person_id)
     {
-        return new MySociety\TheyWorkForYou\Member([ "person_id" => $person_id ]);
+        return new MySociety\TheyWorkForYou\Member(["person_id" => $person_id]);
     }
 
     public function testMPPartyPolicyTextWhenDiffers()
@@ -279,7 +279,7 @@ 
     {
         // When an MP has votes, but there is no broader party policy to compare it to
         // this goes down a funnel that shows the votes, but does not make the comparison to party.
-        $page = $this->fetch_page(array('pid' => 4, 'pagetype' => 'votes','url' => '/mp/4/test_mp_d/test_westminster_constituency/votes'));
+        $page = $this->fetch_page(array('pid' => 4, 'pagetype' => 'votes', 'url' => '/mp/4/test_mp_d/test_westminster_constituency/votes'));
         $this->assertStringContainsString('Test MP D', $page);
         $this->assertStringContainsString('<li class="vote-description"', $page);
         $this->assertStringNotContainsString('comparable B Party MPs voted', $page);
@@ -288,7 +288,7 @@ 
     public function testMPPartyPolicyTextWhenAgrees()
     {
         // Test when an MP mostly agrees with their party, as MP G Party 2 does with party G
-        $page = $this->fetch_page(array('pagetype' => 'votes', 'pid' => 16,  'url' => '/mp/16/test_mp_g_party_2/test_westminster_constituency/votes'));
+        $page = $this->fetch_page(array('pagetype' => 'votes', 'pid' => 16, 'url' => '/mp/16/test_mp_g_party_2/test_westminster_constituency/votes'));
         $this->assertStringContainsString('Test MP G Party 2', $page);
 
         $this->assertStringNotContainsString('sometimes <b>differs</b> from their party colleagues', $page);

classes/Utility/Calendar.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
         return $q['m'];
     }
 
-    private static function fetchQuery($where, $order_by='', $params=null) {
+    private static function fetchQuery($where, $order_by = '', $params = null) {
         $query = "SELECT pn.person_id, pn.given_name, pn.family_name, pn.lordofname, pn.title AS name_title, member.house,
             future.*
             FROM future

www/includes/easyparliament/templates/html/donate/_stripe_donate.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
               id="how-much-<?=$payment_type?>-<?=$amount?>"
               name="how-much"
               value="<?=$amount?>"
-              required <?= (($how_much == $amount) and ($payment_type == $initial_payment_type) ) ? ' checked': '' ?> />
+              required <?= (($how_much == $amount) and ($payment_type == $initial_payment_type)) ? ' checked' : '' ?> />
             <span class="radio-label-large"><?=$label?></span>
         </label>
       <?php } ?>

Indentation +12 added lines, -12 removed lines

@@ -4,27 +4,27 @@ 
 # note - new annual and monthly payments need to be defined as new prices in stripe
 # e.g. 'donate_monthly_10'. 
 $payment_amounts = array(
-  'monthly' => array(
+    'monthly' => array(
     '2' => '£2',
     '5' => '£5',
     '10' => '£10',
-  ),
-  'annually' => array(
+    ),
+    'annually' => array(
     '10' => '£10',
     '50' => '£50',
     '100' => '£100',
-  ),
-  'one-off' => array(
+    ),
+    'one-off' => array(
     '5' => '£5',
     '10' => '£10',
     '20' => '£20',
-  ),
+    ),
 );
 
 $default_amounts = array(
-  'monthly' => '5',
-  'annually' => '10',
-  'one-off' => '10',
+    'monthly' => '5',
+    'annually' => '10',
+    'one-off' => '10',
 );
 
 $default_type = 'one-off';
@@ -37,10 +37,10 @@ 
 
 # if how-much is not in the allowed values for the current payment type, set to 'other', and set $other_how_much to the value of how-much
 if (!array_key_exists($how_much, $payment_amounts[$initial_payment_type])) {
-  $how_much = 'other';
-  $other_how_much = get_http_var('how-much');
+    $how_much = 'other';
+    $other_how_much = get_http_var('how-much');
 } else {
-  $other_how_much = '';
+    $other_how_much = '';
 }
 
 ?>