mysociety / theyworkforyou

classes/Utility/Search.php

Spacing +3 added lines, -3 removed lines

@@ -115,7 +115,7 @@ 
             }
         }
 
-        uasort($speakers, function ($a, $b) {
+        uasort($speakers, function($a, $b) {
 
             if ($a['count'] > $b['count']) {
                 return -1;
@@ -259,7 +259,7 @@ 
             // Looks like a postcode - can we find the constituency?
             $constituency = Postcode::postcodeToConstituency($searchterm);
             if ($constituency) {
-                return [ [$constituency], true ];
+                return [[$constituency], true];
             }
         }
 
@@ -277,7 +277,7 @@ 
             $constituencies[] = $row['name'];
         }
 
-        return [ $constituencies, false ];
+        return [$constituencies, false];
     }
 
     /**

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 +35 added lines, -35 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,15 +271,15 @@ 
     }
 
     /**
-    * 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.
-    *
-    * @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.
+     *
+     * @return array An array of Office objects.
+     */
 
     public function offices($include_only = null, $ignore_committees = false) {
 
@@ -333,12 +333,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() {
 
@@ -357,12 +357,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() {
 
@@ -375,14 +375,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");

www/includes/easyparliament/commentlist.php

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

@@ -548,11 +548,11 @@
         }
         if ($limit != '') {
             # Can't use parameter as >1 argument
-            $limit = "LIMIT $limit";
+            $limit = "limit $limit";
         }
 
         // Finally, do the query!
-        $q = $this->db->query("SELECT $fields
+        $q = $this->db->query("select $fields
                         FROM 	comments
                         $join
                         WHERE $where

Spacing +12 added lines, -12 removed lines

@@ -102,7 +102,7 @@ 
         }
 
         // For getting the data.
-        $input =  [
+        $input = [
             'amount' =>  [
                 'user' => true,
             ],
@@ -238,7 +238,7 @@ 
                 // This does rely on both this and the previous query returning
                 // stuff in the same order...
                 foreach ($comments as $n => $commentdata) {
-                    $comments[$n]['body'] = $commentbodies[ $comments[$n]['comment_id'] ];
+                    $comments[$n]['body'] = $commentbodies[$comments[$n]['comment_id']];
                 }
             }
         }
@@ -283,7 +283,7 @@ 
         if (isset($args['pid']) && is_numeric($args['pid'])) {
             $where['person_id='] = $args['pid'];
         }
-        $input =  [
+        $input = [
             'amount' =>  [
                 'user' => true,
             ],
@@ -323,7 +323,7 @@ 
             'date(posted)>=' => $args['start_date'],
             'date(posted)<=' => $args['end_date'],
         ];
-        $input =  [
+        $input = [
             'amount' =>  [
                 'user' => true,
             ],
@@ -357,7 +357,7 @@ 
 
         $limit = $num * ($page - 1) . ',' . $num;
 
-        $input =  [
+        $input = [
             'amount' =>  [
                 'user' => true,
             ],
@@ -388,7 +388,7 @@ 
         // It returns the URL for the comment.
 
         $major 		= $urldata['major'];
-        $gid 		= $urldata['gid'];
+        $gid = $urldata['gid'];
         $comment_id = $urldata['comment_id'];
         $user_id = $urldata['user_id'] ?? false;
 
@@ -402,7 +402,7 @@ 
         $URL = new \MySociety\TheyWorkForYou\Url($page);
 
         $gid = fix_gid_from_db($gid); // In includes/utility.php
-        $URL->insert(['id' => $gid ]);
+        $URL->insert(['id' => $gid]);
         if ($user_id) {
             $URL->insert(['u' => $user_id]);
         }
@@ -480,7 +480,7 @@ 
         $limit = $input['limit'] ?? '';
 
         // The fields to fetch from db. 'table' => array ('field1', 'field2').
-        $fieldsarr =  [
+        $fieldsarr = [
             'comments' =>  ['comment_id', 'user_id', 'epobject_id', 'body', 'posted', 'modflagged', 'visible'],
             'hansard' =>  ['major', 'gid'],
         ];
@@ -493,7 +493,7 @@ 
 
         // Add on the stuff for getting a user's details.
         if (isset($amount['user']) && $amount['user'] == true) {
-            $fieldsarr['users'] =  ['firstname', 'lastname', 'user_id'];
+            $fieldsarr['users'] = ['firstname', 'lastname', 'user_id'];
             // Like doing "FROM comments, users" but it's easier to add
             // an "INNER JOIN..." automatically to the query.
             $join .= ' INNER JOIN users ON comments.user_id = users.user_id ';
@@ -504,7 +504,7 @@ 
             $fieldsarr['epobject'] = ['body'];
         }
 
-        $fieldsarr2 =  [];
+        $fieldsarr2 = [];
         // Construct the $fields clause.
         foreach ($fieldsarr as $table => $tablesfields) {
             foreach ($tablesfields as $n => $field) {
@@ -521,7 +521,7 @@ 
         $fields = implode(', ', $fieldsarr2);
 
 
-        $wherearr2 =  [];
+        $wherearr2 = [];
         $params = [];
         $i = 0;
         // Construct the $where clause.
@@ -550,7 +550,7 @@ 
                         ", $params);
 
         // Format the data into an array for returning.
-        $data =  [];
+        $data = [];
 
         // If you change stuff here, you might have to change it in
         // $COMMENT->_set_url() too...

www/includes/easyparliament/recess.php

Spacing +62 added lines, -62 removed lines

@@ -12,31 +12,31 @@ 
     ],
     2001 => [
         1 => ['less' => 8],
-        2 => ['between' => [15,26]],
-        4 => ['between' => [10,23]],
+        2 => ['between' => [15, 26]],
+        4 => ['between' => [10, 23]],
         5 => ['more' => 13],
         6 => ['less' => 13],
         7 => ['more' => 20],
         8 => ['all' => 1],
         9 => ['less' => 14, 'more' => 14],
-        10 => ['less' => 4, 'between' => [4,8, 8,15]],
-        12 => ['more' => 19] ],
+        10 => ['less' => 4, 'between' => [4, 8, 8, 15]],
+        12 => ['more' => 19]],
     2002 => [
         1 => ['less' => 8],
-        2 => ['between' => [14,25]],
+        2 => ['between' => [14, 25]],
         3 => ['more' => 26],
-        4 => ['less' => 3, 'between' => [3,10]],
+        4 => ['less' => 3, 'between' => [3, 10]],
         5 => ['more' => 24],
         6 => ['less' => 10],
         7 => ['more' => 24],
         8 => ['all' => 1],
         9 => ['less' => 19, 'more' => 24],
         10 => ['less' => 14],
-        12 => ['more' => 19] ],
+        12 => ['more' => 19]],
     2003 => [
         1 => ['less' => 7],
-        2 => ['between' => [13,24]],
-        4 => ['between' => [14,28]],
+        2 => ['between' => [13, 24]],
+        4 => ['between' => [14, 28]],
         5 => ['more' => 22],
         6 => ['less' => 3],
         7 => ['more' => 17],
@@ -46,18 +46,18 @@ 
         12 => ['more' => 18]],
     2004 => [
         1 => ['less' => 5],
-        2 => ['between' => [12,23]],
-        4 => ['between' => [1,19]],
+        2 => ['between' => [12, 23]],
+        4 => ['between' => [1, 19]],
         5 => ['more' => 27],
         6 => ['less' => 7],
         7 => ['more' => 22],
         8 => ['all' => 1],
         9 => ['less' => 7, 'more' => 16],
         10 => ['less' => 11],
-        12 => ['more' => 21] ],
+        12 => ['more' => 21]],
     2005 => [
         1 => ['less' => 10],
-        2 => ['between' => [10,21]],
+        2 => ['between' => [10, 21]],
         3 => ['more' => 24],
         4 => ['less' => 4, 'more' => 10],
         5 => ['less' => 11, 'more' => 26],
@@ -66,10 +66,10 @@ 
         8 => ['all' => 1],
         9 => ['all' => 1],
         10 => ['less' => 10],
-        12 => ['more' => 20] ],
+        12 => ['more' => 20]],
     2006 => [
         1 => ['less' => 9],
-        2 => ['between' => [16,27]],
+        2 => ['between' => [16, 27]],
         3 => ['more' => 30],
         4 => ['less' => 18],
         5 => ['more' => 25],
@@ -82,7 +82,7 @@ 
     ],
     2007 => [
         1 => ['less' => 8],
-        2 => ['between' => [8,19]],
+        2 => ['between' => [8, 19]],
         3 => ['more' => 29],
         4 => ['less' => 16],
         5 => ['more' => 24],
@@ -95,8 +95,8 @@ 
     ],
     2008 => [
         1 => ['less' => 7],
-        2 => ['between' => [7,18]],
-        4 => ['between' => [3,21]],
+        2 => ['between' => [7, 18]],
+        4 => ['between' => [3, 21]],
         5 => ['more' => 22],
         6 => ['less' => 2],
         7 => ['more' => 22],
@@ -107,8 +107,8 @@ 
     ],
     2009 => [
         1 => ['less' => 12],
-        2 => ['between' => [12,23]],
-        4 => ['between' => [2,20]],
+        2 => ['between' => [12, 23]],
+        4 => ['between' => [2, 20]],
         5 => ['more' => 21],
         6 => ['less' => 1],
         7 => ['more' => 21],
@@ -119,7 +119,7 @@ 
     ],
     2010 => [
         1 => ['less' => 5],
-        2 => ['between' => [10,22]],
+        2 => ['between' => [10, 22]],
         3 => ['more' => 30],
         4 => ['less' => 6, 'more' => 8],
         5 => ['less' => 18, 'more' => 27],
@@ -132,62 +132,62 @@ 
     ],
     2011 => [
         1 => ['less' => 10],
-        2 => ['between' => [17,28]],
-        4 => ['between' => [5,26]],
+        2 => ['between' => [17, 28]],
+        4 => ['between' => [5, 26]],
         5 => ['more' => 24],
         6 => ['less' => 7],
         7 => ['more' => 19],
         8 => ['all' => 1],
         9 => ['less' => 5, 'more' => 15],
         10 => ['less' => 10],
-        11 => ['between' => [15,21]],
+        11 => ['between' => [15, 21]],
         12 => ['more' => 20],
     ],
     2012 => [
         1 => ['less' => 10],
-        2 => ['between' => [9,20]],
+        2 => ['between' => [9, 20]],
         3 => ['more' => 27],
         4 => ['less' => 16],
         5 => ['more' => 24],
         6 => ['less' => 11],
         7 => ['more' => 17],
         8 => ['all' => 1],
-        9 => ['less' => 3,'more' => 18],
+        9 => ['less' => 3, 'more' => 18],
         10 => ['less' => 15],
-        11 => ['between' => [13,19]],
+        11 => ['between' => [13, 19]],
         12 => ['more' => 20],
     ],
     2013 => [
         1 => ['less' => 7],
-        2 => ['between' => [14,25]],
+        2 => ['between' => [14, 25]],
         3 => ['more' => 26],
         4 => ['less' => 15],
         5 => ['more' => 21],
         6 => ['less' => 3],
         7 => ['more' => 18],
         8 => ['all' => 1],
-        9 => ['less' => 2,'more' => 13],
+        9 => ['less' => 2, 'more' => 13],
         10 => ['less' => 8],
-        11 => ['between' => [12,18]],
+        11 => ['between' => [12, 18]],
         12 => ['more' => 19],
     ],
     2014 => [
         1 => ['less' => 6],
-        2 => ['between' => [13,24]],
-        4 => ['between' => [10,28]],
-        5 => ['between' => [1,6]],
+        2 => ['between' => [13, 24]],
+        4 => ['between' => [10, 28]],
+        5 => ['between' => [1, 6]],
     ],
     2015 => [
         7 => ['more' => 21],
         8 => ['all' => 1],
         9 => ['less' => 7, 'more' => 17],
         10 => ['less' => 12],
-        11 => ['between' => [10,16]],
+        11 => ['between' => [10, 16]],
         12 => ['more' => 17],
     ],
     2016 => [
         1 => ['less' => 5],
-        2 => ['between' => [11,22]],
+        2 => ['between' => [11, 22]],
     ],
 ];
 # Lords differences
@@ -199,15 +199,15 @@ 
 $GLOBALS['recessdates'][101][2010][12]['more'] = 22;
 $GLOBALS['recessdates'][101][2011] = [
     1 => ['less' => 10],
-    2 => ['between' => [16,28]],
-    4 => ['between' => [6,26]],
+    2 => ['between' => [16, 28]],
+    4 => ['between' => [6, 26]],
     5 => ['more' => 25],
     6 => ['less' => 6],
     7 => ['more' => 20],
     8 => ['all' => 1],
     9 => ['less' => 5, 'more' => 15],
     10 => ['less' => 3],
-    11 => ['between' => [16,21]],
+    11 => ['between' => [16, 21]],
     12 => ['more' => 21],
 ];
 
@@ -216,74 +216,74 @@ 
     1999 => [
         7 => ['more' => 2],
         8 => ['less' => 31],
-        10 => ['between' => [8,25]],
+        10 => ['between' => [8, 25]],
         12 => ['more' => 17],
     ],
     2000 => [
         1 => ['less' => 10],
-        4 => ['between' => [7,25]],
+        4 => ['between' => [7, 25]],
         7 => ['more' => 7],
         8 => ['all' => 1],
         9 => ['less' => 4],
-        10 => ['between' => [6,23]],
+        10 => ['between' => [6, 23]],
         12 => ['more' => 20],
     ],
     2001 => [
         1 => ['less' => 8],
-        2 => ['between' => [16,26]],
-        4 => ['between' => [6,23]],
+        2 => ['between' => [16, 26]],
+        4 => ['between' => [6, 23]],
         6 => ['more' => 29],
         7 => ['all' => 1],
         8 => ['all' => 1],
         9 => ['less' => 3],
-        10 => ['between' => [5,22]],
-        12 => ['more' => 21] ],
+        10 => ['between' => [5, 22]],
+        12 => ['more' => 21]],
     2002 => [
         1 => ['less' => 7],
-        2 => ['between' => [15,25]],
+        2 => ['between' => [15, 25]],
         3 => ['more' => 28],
         4 => ['less' => 15],
         7 => ['more' => 10],
         8 => ['all' => 1],
         9 => ['less' => 2],
-        10 => ['between' => [11,28]],
-        12 => ['more' => 20] ],
+        10 => ['between' => [11, 28]],
+        12 => ['more' => 20]],
     2003 => [
         1 => ['less' => 6],
-        4 => ['between' => [0,31]],
+        4 => ['between' => [0, 31]],
         5 => ['less' => 2],
         6 => ['more' => 27],
         7 => ['all' => 1],
         8 => ['all' => 1],
-        10 => ['between' => [10,27]],
+        10 => ['between' => [10, 27]],
         12 => ['more' => 19]],
     2004 => [
         1 => ['less' => 5],
-        2 => ['between' => [13,23]],
-        4 => ['between' => [2,19]],
+        2 => ['between' => [13, 23]],
+        4 => ['between' => [2, 19]],
         6 => ['more' => 25],
         7 => ['all' => 1],
         8 => ['less' => 30],
-        10 => ['between' => [10,23]],
-        12 => ['more' => 26] ],
+        10 => ['between' => [10, 23]],
+        12 => ['more' => 26]],
     2005 => [
         1 => ['less' => 8],
-        2 => ['between' => [11,21]],
+        2 => ['between' => [11, 21]],
         3 => ['more' => 24],
         4 => ['less' => 11],
         7 => ['more' => 1],
         8 => ['all' => 1],
         9 => ['less' => 5],
-        10 => ['between' => [7,24]],
-        12 => ['more' => 23] ],
+        10 => ['between' => [7, 24]],
+        12 => ['more' => 23]],
     2006 => [
         1 => ['less' => 9],
-        2 => ['between' => [10,20]],
+        2 => ['between' => [10, 20]],
         4 => ['less' => 18],
         7 => ['more' => 0],
         8 => ['all' => 1],
         9 => ['less' => 4],
-        10 => ['between' => [6,23]],
+        10 => ['between' => [6, 23]],
         12 => ['more' => 22],
     ],
     2007 => [
@@ -293,18 +293,18 @@ 
         7 => ['all' => 1],
         8 => ['all' => 1],
         9 => ['less' => 3],
-        10 => ['between' => [5,22]],
+        10 => ['between' => [5, 22]],
         12 => ['more' => 21],
     ],
     2008 => [
         1 => ['less' => 5],
-        2 => ['between' => [8,18]],
+        2 => ['between' => [8, 18]],
         3 => ['more' => 28],
         4 => ['less' => 14],
         6 => ['more' => 27],
         7 => ['all' => 1],
         8 => ['all' => 1],
-        10 => ['between' => [10,27]],
+        10 => ['between' => [10, 27]],
     ],
 ];
 

www/includes/easyparliament/searchengine.php

Spacing +6 added lines, -6 removed lines

@@ -84,7 +84,7 @@ 
         }
 
         # Force words to lower case
-        $this->query = preg_replace_callback('#(department|party):.+?\b#i', function ($m) {
+        $this->query = preg_replace_callback('#(department|party):.+?\b#i', function($m) {
             return strtolower($m[0]);
         }, $this->query);
 
@@ -162,9 +162,9 @@ 
                     } elseif ($value == 'lmqs') {
                         $newv = 9;
                     } elseif ($value == 'uk') {
-                        $newv = [1,2,3,4,6,101];
+                        $newv = [1, 2, 3, 4, 6, 101];
                     } elseif ($value == 'scotland') {
-                        $newv = [7,8];
+                        $newv = [7, 8];
                     } elseif ($value == 'wales') {
                         $newv = ($lang == 'cy' || LANGUAGE == 'cy') ? 11 : 10;
                     } elseif ($value == 'future') {
@@ -267,7 +267,7 @@ 
         $qd = preg_replace('#@[0-9]+#', '', $qd); # Strip position variable
         $qd = preg_replace('#^\((.*) AND_NOT M1[01]\)$#', '$1', $qd); # Strip Welsh handling
         # Date range
-        $qd = preg_replace_callback('#VALUE_RANGE 1 (\d+) (\d+)#', function ($m) {
+        $qd = preg_replace_callback('#VALUE_RANGE 1 (\d+) (\d+)#', function($m) {
             return preg_replace("#(\d{4})(\d\d)(\d\d)#", '$3/$2/$1', $m[1])
                 . ".." . preg_replace("#(\d{4})(\d\d)(\d\d)#", '$3/$2/$1', $m[2]);
         }, $qd);
@@ -293,7 +293,7 @@ 
         $qd = preg_replace('#\bU(\d+)\b#', 'segment:$1', $qd);
         $qd = preg_replace('#\bC(\d+)\b#', 'column:$1', $qd);
         $qd = preg_replace('#\bQ(.*?)\b#', 'gid:$1', $qd);
-        $qd = preg_replace_callback('#\bP(.*?)\b#', function ($m) {
+        $qd = preg_replace_callback('#\bP(.*?)\b#', function($m) {
             global $parties;
             $pu = ucfirst($m[1]);
             return "party:" . ($parties[$pu] ?? $m[1]);
@@ -305,7 +305,7 @@ 
         } elseif (strstr($qd, 'M7 OR M8')) {
             $qd = str_replace('M7 OR M8', 'section:scotland', $qd);
         }
-        $qd = preg_replace_callback('#\bM(\d+)\b#', function ($m) {
+        $qd = preg_replace_callback('#\bM(\d+)\b#', function($m) {
             global $hansardmajors;
             $title = $hansardmajors[$m[1]]["title"] ?? $m[1];
             return sprintf(gettext("in the '%s'"), $title);

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

@@ -333,15 +333,15 @@
         foreach ($merged as $row) {
             $from_id = str_replace('uk.org.publicwhip/person/', '', $row['gid_from']);
             $to_id = str_replace('uk.org.publicwhip/person/', '', $row['gid_to']);
-            $qd = str_replace("(S$from_id OR S$to_id)", "S$to_id", $qd);
-            $qd = str_replace("S$from_id OR S$to_id", "S$to_id", $qd);
+            $qd = str_replace("(S$from_id OR S$to_id)", "s$to_id", $qd);
+            $qd = str_replace("s$from_id OR S$to_id", "s$to_id", $qd);
         }
 
         preg_match_all('#S(\d+)#', $qd, $m);
         foreach ($m[1] as $mm) {
             $member = new MEMBER(['person_id' => $mm]);
             $name = $member->full_name();
-            $qd = str_replace("S$mm", "speaker:$name", $qd);
+            $qd = str_replace("s$mm", "speaker:$name", $qd);
         }
 
         # Simplify display of excluded words