mysociety / theyworkforyou

classes/AlertView/Simple.php

Spacing +4 added lines, -4 removed lines

@@ -121,8 +121,8 @@ 
         $existing = $this->alert->fetch_by_token($confirmation);
         preg_match('/speaker:(\d+)/', $existing['criteria'], $matches);
         $old_mp_id = $matches[1];
-        $old_mp = new \MySociety\TheyWorkForYou\Member([ 'person_id' => $old_mp_id ]);
-        $new_mp = new \MySociety\TheyWorkForYou\Member([ 'constituency' => $old_mp->constituency, 'house' => 1 ]);
+        $old_mp = new \MySociety\TheyWorkForYou\Member(['person_id' => $old_mp_id]);
+        $new_mp = new \MySociety\TheyWorkForYou\Member(['constituency' => $old_mp->constituency, 'house' => 1]);
 
         $q = $this->db->query(
             "SELECT alert_id, criteria, registrationtoken FROM alerts
@@ -185,8 +185,8 @@ 
         preg_match('/speaker:(\d+)/', $existing['criteria'], $matches);
         $criteria = $matches[1];
 
-        $old_mp = new \MySociety\TheyWorkForYou\Member([ 'person_id' => $criteria ]);
-        $new_mp = new \MySociety\TheyWorkForYou\Member([ 'constituency' => $old_mp->constituency, 'house' => 1 ]);
+        $old_mp = new \MySociety\TheyWorkForYou\Member(['person_id' => $criteria]);
+        $new_mp = new \MySociety\TheyWorkForYou\Member(['constituency' => $old_mp->constituency, 'house' => 1]);
 
         if ($this->alert->fetch_by_mp($existing['email'], $new_mp->person_id)) {
             $data = [

classes/Search.php

Spacing +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
         $data['search_keyword'] = $this->searchkeyword;
 
         $is_adv = false;
-        foreach (['to', 'from', 'person', 'section', 'column', 'phrase', 'exclude' ] as $var) {
+        foreach (['to', 'from', 'person', 'section', 'column', 'phrase', 'exclude'] as $var) {
             $key = "search_$var";
             $data[$key] = get_http_var($var);
             if ($data[$key]) {

classes/Utility/Postcode.php

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

@@ -42,7 +42,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;
         }
 

classes/Utility/Hansard.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
         global $hansardmajors;
         $db = new \ParlDB();
 
-        $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", [ ':gid' => $gid ])->first();
+        $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", [':gid' => $gid])->first();
         $url_gid = fix_gid_from_db($gid);
         $url = new \MySociety\TheyWorkForYou\Url($hansardmajors[$q['major']]['page']);
         $url->insert(['id' => $url_gid]);

classes/User.php

Spacing +2 added lines, -2 removed lines

@@ -63,9 +63,9 @@
         $data['optin_service'] = $optin_values['optin_service'];
         $data['optin_stream'] = $optin_values['optin_stream'];
         $data['optin_org'] = $optin_values['optin_org'];
-        $data['postcode']	= $user->postcode();
+        $data['postcode'] = $user->postcode();
         $data['website']	= $user->url();
-        $data['registrationtime']	= $user->registrationtime();
+        $data['registrationtime'] = $user->registrationtime();
         $data['status'] = $user->status();
         $data["deleted"] = $user->deleted();
         $data["confirmed"] = $user->confirmed();

classes/Homepage.php

Spacing +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
             $instance = new $class();
             $more_url = new Url($recent[1]);
             if ($recent[0] == 'recent_pbc_debates') {
-                $content = [ 'data' => $instance->display($recent[0], ['num' => 5], 'none') ];
+                $content = ['data' => $instance->display($recent[0], ['num' => 5], 'none')];
             } else {
                 $content = $instance->display($recent[0], ['days' => 7, 'num' => 1], 'none');
                 if (isset($content['data']) && count($content['data'])) {

classes/Member.php

Spacing +2 added lines, -2 removed lines

@@ -260,7 +260,7 @@ 
 
         usort(
             $departures,
-            function ($a, $b) {
+            function($a, $b) {
                 if ($a['date'] == $b['date']) {
                     return 0;
                 } elseif ($a['date'] < $b['date']) {
@@ -512,7 +512,7 @@ 
             }
         }
 
-        uasort($policy_diffs, function ($a, $b) {
+        uasort($policy_diffs, function($a, $b) {
             return $b['score_difference'] - $a['score_difference'];
         });
 

Indentation +36 added lines, -36 removed lines

@@ -213,12 +213,12 @@ 
     }
 
     /**
-    * Image
-    *
-    * Return a URL for the member's image.
-    *
-    * @return string The URL of the member's image.
-    */
+     * Image
+     *
+     * Return a URL for the member's image.
+     *
+     * @return string The URL of the member's image.
+     */
 
     public function image() {
 
@@ -271,16 +271,16 @@ 
     }
 
     /**
-    * Offices
-    *
-    * Return an array of Office objects held (or previously held) by the member.
-    *
-    * @param string $include_only  Restrict the list to include only "previous" or "current" offices.
-    * @param bool   $ignore_committees Ignore offices that appear to be committee memberships.
-    * @param bool   $committees_only Only return committee memberships.
-    *
-    * @return array An array of Office objects.
-    */
+     * Offices
+     *
+     * Return an array of Office objects held (or previously held) by the member.
+     *
+     * @param string $include_only  Restrict the list to include only "previous" or "current" offices.
+     * @param bool   $ignore_committees Ignore offices that appear to be committee memberships.
+     * @param bool   $committees_only Only return committee memberships.
+     *
+     * @return array An array of Office objects.
+     */
 
     public function offices($include_only = null, $ignore_committees = false, $committees_only = false) {
 
@@ -338,12 +338,12 @@ 
     }
 
     /**
-    * Get Other Parties String
-    *
-    * Return a readable list of party changes for this member.
-    *
-    * @return string|null A readable list of the party changes for this member.
-    */
+     * Get Other Parties String
+     *
+     * Return a readable list of party changes for this member.
+     *
+     * @return string|null A readable list of the party changes for this member.
+     */
 
     public function getOtherPartiesString() {
 
@@ -362,12 +362,12 @@ 
     }
 
     /**
-    * Get Other Constituencies String
-    *
-    * Return a readable list of other constituencies for this member.
-    *
-    * @return string|null A readable list of the other constituencies for this member.
-    */
+     * Get Other Constituencies String
+     *
+     * Return a readable list of other constituencies for this member.
+     *
+     * @return string|null A readable list of the other constituencies for this member.
+     */
 
     public function getOtherConstituenciesString() {
 
@@ -380,14 +380,14 @@ 
     }
 
     /**
-    * Get Entered/Left Strings
-    *
-    * Return an array of readable strings covering when people entered or left
-    * various houses. Returns an array since it's possible for a member to have
-    * done several of these things.
-    *
-    * @return array An array of strings of when this member entered or left houses.
-    */
+     * Get Entered/Left Strings
+     *
+     * Return an array of readable strings covering when people entered or left
+     * various houses. Returns an array since it's possible for a member to have
+     * done several of these things.
+     *
+     * @return array An array of strings of when this member entered or left houses.
+     */
     public function getEnterLeaveStrings() {
         $output = [];
 

tests/Bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
     define('OPTION_MAPIT_URL', 'https://mapit.mysociety.org/');
 
     // If there isn't a config file (most likely this is running an automated test) copy one in.
-    if (! file_exists(dirname(__FILE__) . '/../conf/general')) {
+    if (!file_exists(dirname(__FILE__) . '/../conf/general')) {
         copy(dirname(__FILE__) . '/../conf/general-example', dirname(__FILE__) . '/../conf/general');
     }
 

www/includes/easyparliament/init.php

Spacing +6 added lines, -6 removed lines

@@ -17,10 +17,10 @@ 
 // 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
@@ -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);
 }
 
@@ -105,7 +105,7 @@ 
 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");