mysociety / theyworkforyou

www/docs/admin/featured.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
     global $hansardmajors;
     global $db;
 
-    $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]);
@@ -115,7 +115,7 @@ 
     print "<h2>Preview Content</h2>";
     if ($gid !== null) {
         $h = new MySociety\TheyWorkForYou\Homepage\UK();
-        $featured = $h->getFeaturedDebate($gid, $title, $context, [ $related_gid1, $related_gid2, $related_gid3 ]);
+        $featured = $h->getFeaturedDebate($gid, $title, $context, [$related_gid1, $related_gid2, $related_gid3]);
 
         include INCLUDESPATH . 'easyparliament/templates/html/homepage/featured.php';
     } else {

classes/SectionView/NiView.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 
     protected function getSearchSections() {
         return [
-            [ 'section' => 'ni' ],
+            ['section' => 'ni'],
         ];
     }
 }

classes/SectionView/SeneddView.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
     protected function getSearchSections() {
         return [
-            [ 'section' => 'wales' ],
+            ['section' => 'wales'],
         ];
     }
 }

classes/Homepage/Wales.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         $featured = [];
         if (count($data['debates']['recent'])) {
             $MOREURL = new \MySociety\TheyWorkForYou\Url('senedddebatesfront');
-            $MOREURL->insert([ 'more' => 1 ]);
+            $MOREURL->insert(['more' => 1]);
             $featured = array_shift($data['debates']['recent']);
             $featured['more_url'] = $MOREURL->generate();
             $featured['desc'] = 'Senedd';

classes/Homepage/Base.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
             $instance = new $class();
             $more_url = new \MySociety\TheyWorkForYou\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')];
             } elseif ($recent[1] == 'senedddebatesfront' || $recent[1] == 'nidebatesfront') {
                 $content = $instance->display($recent[0], ['days' => 30, 'num' => 6], 'none');
                 # XXX Bit hacky, for now

classes/Homepage/NI.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
         $featured = [];
         if (count($data['debates']['recent'])) {
             $MOREURL = new \MySociety\TheyWorkForYou\Url('nidebatesfront');
-            $MOREURL->insert([ 'more' => 1 ]);
+            $MOREURL->insert(['more' => 1]);
             $featured = array_shift($data['debates']['recent']);
             $featured['more_url'] = $MOREURL->generate();
             $featured['desc'] = 'Northern Ireland Assembly debate';

www/includes/easyparliament/hansardlist.php

Spacing +83 added lines, -83 removed lines

@@ -53,7 +53,7 @@ 
 class HANSARDLIST {
     // This will be used to cache information about speakers on this page
     // so we don't have to keep fetching the same data from the DB.
-    public $speakers =  [];
+    public $speakers = [];
     /*
     $this->speakers[ $person_id ] = array (
         "name" => $name,
@@ -66,7 +66,7 @@ 
 
     // This will be used to cache mappings from epobject_id to gid,
     // so we don't have to continually fetch the same data in get_hansard_data().
-    public $epobjectid_to_gid =  [];
+    public $epobjectid_to_gid = [];
     /*
     $this->epobjectid_to_gid[ $epobject_id ] => $gid;
     */
@@ -143,7 +143,7 @@ 
             return false;
         }
 
-        $validviews =  ['calendar', 'date', 'gid', 'person', 'search', 'recent', 'recent_mostvotes', 'biggest_debates', 'recent_wrans', 'recent_wms', 'column', 'mp', 'bill', 'session', 'recent_debates', 'recent_pbc_debates', 'featured_gid'];
+        $validviews = ['calendar', 'date', 'gid', 'person', 'search', 'recent', 'recent_mostvotes', 'biggest_debates', 'recent_wrans', 'recent_wms', 'column', 'mp', 'bill', 'session', 'recent_debates', 'recent_pbc_debates', 'featured_gid'];
         if (in_array($view, $validviews)) {
 
             // What function do we call for this view?
@@ -234,7 +234,7 @@ 
                 [$year, $month, $date] = explode('-', $hdate);
                 $timestamp = gmmktime(0, 0, 0, $month, $date, $year);
 
-                $data =  [
+                $data = [
                     'hdate'		=> $hdate,
                     'timestamp'	=> $timestamp,
                     'listurl'	=> $URL->generate(),
@@ -277,7 +277,7 @@ 
             // so get the section info above this item.
 
             // For getting hansard data.
-            $input =  [
+            $input = [
                 'amount' =>  [
                     'body' => true,
                 ],
@@ -311,14 +311,14 @@ 
         twfy_debug(get_class($this), "getting an item's subsection");
 
         // What we return.
-        $subsectiondata =  [];
+        $subsectiondata = [];
 
         if ($itemdata['htype'] == '12' || $itemdata['htype'] == '13' || $itemdata['htype'] == '14') {
             // This item is a speech or procedural, so get the
             // subsection info above this item.
 
             // For getting hansard data.
-            $input =  [
+            $input = [
                 'amount' =>  [
                     'body' => true,
                 ],
@@ -416,7 +416,7 @@ 
             $wherearr['hansard.epobject_id='] = $prev_item_id;
 
             // For getting hansard data.
-            $input =  [
+            $input = [
                 'amount' =>  [
                     'body' => true,
                     'speaker' => true,
@@ -432,7 +432,7 @@ 
                 if ($itemdata['htype'] == '10' || $itemdata['htype'] == '11') {
                     // Linking to the prev (sub)section.
                     $thing = $hansardmajors[$this->major]['singular'];
-                    $nextprevdata['prev'] =  [
+                    $nextprevdata['prev'] = [
                         'body'		=> sprintf(gettext("Previous %s"), $thing),
                         'url'		=> $prevdata[0]['listurl'],
                         'title'		=> $prevdata[0]['body'],
@@ -445,7 +445,7 @@ 
                     } else {
                         $title = '';
                     }
-                    $nextprevdata['prev'] =  [
+                    $nextprevdata['prev'] = [
                         'body'		=> gettext('Previous speaker'),
                         'url'		=> $prevdata[0]['commentsurl'],
                         'title'		=> $title,
@@ -461,7 +461,7 @@ 
             $wherearr['hansard.epobject_id='] = $next_item_id;
 
             // For getting hansard data.
-            $input =  [
+            $input = [
                 'amount' =>  [
                     'body' => true,
                     'speaker' => true,
@@ -476,7 +476,7 @@ 
                 if ($itemdata['htype'] == '10' || $itemdata['htype'] == '11') {
                     // Linking to the next (sub)section.
                     $thing = $hansardmajors[$this->major]['singular'];
-                    $nextprevdata['next'] =  [
+                    $nextprevdata['next'] = [
                         'body'		=> sprintf(gettext("Next %s"), $thing),
                         'url'		=> $nextdata[0]['listurl'],
                         'title'		=> $nextdata[0]['body'],
@@ -489,7 +489,7 @@ 
                     } else {
                         $title = '';
                     }
-                    $nextprevdata['next'] =  [
+                    $nextprevdata['next'] = [
                         'body'		=> gettext('Next speaker'),
                         'url'		=> $nextdata[0]['commentsurl'],
                         'title'		=> $title,
@@ -536,11 +536,11 @@ 
         twfy_debug(get_class($this), "getting next/prev dates");
 
         // What we return.
-        $nextprevdata =  [];
+        $nextprevdata = [];
 
         $URL = new \MySociety\TheyWorkForYou\Url($this->listpage);
 
-        $looper =  ["next", "prev"];
+        $looper = ["next", "prev"];
 
         foreach ($looper as $n => $nextorprev) {
 
@@ -564,7 +564,7 @@ 
             // when displaying the first day of debates.
             if ($q && $q['hdate'] != null) {
 
-                $URL->insert([ 'd' => $q['hdate'] ]);
+                $URL->insert(['d' => $q['hdate']]);
 
                 if ($nextorprev == 'next') {
                     $body = gettext('Next day');
@@ -574,7 +574,7 @@ 
 
                 $title = format_date($q['hdate'], SHORTDATEFORMAT);
 
-                $nextprevdata[$nextorprev] =  [
+                $nextprevdata[$nextorprev] = [
                     'hdate' => $q['hdate'],
                     'url' => $URL->generate(),
                     'body' => $body,
@@ -588,7 +588,7 @@ 
         $thing = $hansardmajors[$this->major]['plural'];
         $URL->insert(['y' => $year]);
 
-        $nextprevdata['up'] =  [
+        $nextprevdata['up'] = [
             'body' 	=> sprintf(gettext("All of %s’s %s"), $year, $thing),
             'title'	=> '',
             'url' 	=> $URL->generate(),
@@ -645,7 +645,7 @@ 
 
 
         // Get all the data just for this epobject_id.
-        $input =  [
+        $input = [
             'amount' =>  [
                 'body' => true,
                 'speaker' => true,
@@ -686,7 +686,7 @@ 
             $this->check_gid_change($args['gid'], 'a', '');
 
             if (substr($args['gid'], -1) == 'L') {
-                $letts = ['a','b','c','d','e'];
+                $letts = ['a', 'b', 'c', 'd', 'e'];
                 for ($i = 0; $i < 4; $i++) {
                     $this->check_gid_change($args['gid'], $letts[$i], $letts[$i + 1]);
                 }
@@ -730,7 +730,7 @@ 
     }
 
     private function check_gid_change($gid, $from, $to) {
-        $input =  [
+        $input = [
             'amount' =>  [
                 'body' => true,
                 'speaker' => true,
@@ -758,7 +758,7 @@ 
         twfy_debug(get_class($this), "getting data by date");
 
         // Where we'll put all the data we want to render.
-        $data =  [];
+        $data = [];
 
         $date = $this->_validate_date($args);
 
@@ -772,7 +772,7 @@ 
 
             // Get all the sections for this date.
             // Then for each of those we'll get the subsections and rows.
-            $input =  [
+            $input = [
                 'amount' =>  [
                     'body' => true,
                     'comment' => true,
@@ -801,7 +801,7 @@ 
                     $sectionrow = $this->_get_section($sections[$n]);
 
                     // Get the subsections within the section.
-                    $input =  [
+                    $input = [
                         'amount' =>  [
                             'body' => true,
                             'comment' => true,
@@ -857,7 +857,7 @@ 
             $major = '';
         }
 
-        $data =  [];
+        $data = [];
 
         $q = $this->db->query("SELECT DISTINCT(hdate)
                         FROM 	hansard
@@ -932,7 +932,7 @@ 
 
         $speeches = [];
         foreach ($q as $row) {
-            $speech =  [
+            $speech = [
                 'subsection_id' => $row['subsection_id'],
                 'section_id' => $row['section_id'],
                 'htype' => $row['htype'],
@@ -949,7 +949,7 @@ 
             // Cache parent id to speed up _get_listurl
             $this->epobjectid_to_gid[$row['subsection_id']] = fix_gid_from_db($row['gid_subsection']);
 
-            $url_args =  ['p' => $row['person_id']];
+            $url_args = ['p' => $row['person_id']];
             $speech['listurl'] = $this->_get_listurl($speech, $url_args);
             $speeches[] = $speech;
         }
@@ -997,7 +997,7 @@ 
         }
 
         // What we'll return.
-        $data =  [];
+        $data = [];
 
         $data['info']['s'] = $args['s'];
 
@@ -1057,7 +1057,7 @@ 
 
         // Log this query so we can improve them - if it wasn't a "popular
         // query" link
-        if (! isset($args['pop']) or $args['pop'] != 1) {
+        if (!isset($args['pop']) or $args['pop'] != 1) {
             global $SEARCHLOG;
             $SEARCHLOG->add(
                 ['query' => $searchstring,
@@ -1185,7 +1185,7 @@ 
                 //////////////////////////
                 // 2. Create the URL to link to this bit of text.
 
-                $id_data =  [
+                $id_data = [
                     'major'            => $itemdata['major'],
                     'minor'            => $itemdata['minor'],
                     'htype'         => $itemdata['htype'],
@@ -1196,7 +1196,7 @@ 
 
                 // We append the query onto the end of the URL as variable 's'
                 // so we can highlight them on the debate/wrans list page.
-                $url_args =  ['s' => $searchstring];
+                $url_args = ['s' => $searchstring];
 
                 $itemdata['listurl'] = $this->_get_listurl($id_data, $url_args, $encode);
 
@@ -1249,14 +1249,14 @@ 
                     } else {
                         $listurl = '';
                     }
-                    $itemdata['parent'] =  [
+                    $itemdata['parent'] = [
                         'body' => $body,
                         'listurl' => $listurl,
                     ];
                     if ($itemdata['htype'] == 11) {
                         # Search result was a subsection heading; fetch the first entry
                         # from the wrans/wms to show under the heading
-                        $input =  [
+                        $input = [
                             'amount' => [
                                 'body' => true,
                                 'speaker' => true,
@@ -1502,7 +1502,7 @@ 
 
         $params[':major'] = $this->major;
         $params[':firstdate'] = $firstyear . '-' . $firstmonth . '-01';
-        $q =  $this->db->query("SELECT 	DISTINCT(hdate) AS hdate
+        $q = $this->db->query("SELECT 	DISTINCT(hdate) AS hdate
                         FROM		hansard
                         WHERE		major = :major
                         AND			hdate >= :firstdate
@@ -1570,7 +1570,7 @@ 
 
                 $YEARURL->insert(['y' => $firstyear - 1]);
 
-                $nextprev['prev'] =  [
+                $nextprev['prev'] = [
                     'body' => 'Previous year',
                     'title' => $firstyear - 1,
                     'url' => $YEARURL->generate(),
@@ -1579,8 +1579,8 @@ 
             } else {
                 // action is 'year'.
 
-                $nextprev['prev'] =  ['body' => 'Previous year'];
-                $nextprev['next'] =  ['body' => 'Next year'];
+                $nextprev['prev'] = ['body' => 'Previous year'];
+                $nextprev['next'] = ['body' => 'Next year'];
 
                 $q = $this->db->query("SELECT DATE_FORMAT(hdate, '%Y') AS year
                             FROM hansard WHERE major = :major
@@ -1669,13 +1669,13 @@ 
         // $input['limit'] as a string for the $limit clause, eg '21,20'.
 
         $amount 		= $input['amount'] ?? [];
-        $wherearr 		= $input['where'] ?? [];
+        $wherearr = $input['where'] ?? [];
         $order 			= $input['order'] ?? '';
         $limit 			= $input['limit'] ?? '';
 
 
         // The fields to fetch from db. 'table' => array ('field1', 'field2').
-        $fieldsarr =  [
+        $fieldsarr = [
             'hansard' =>  ['epobject_id', 'htype', 'gid', 'hpos', 'section_id', 'subsection_id', 'hdate', 'htime', 'source_url', 'major', 'minor', 'colnum'],
         ];
 
@@ -1688,14 +1688,14 @@ 
         if ((isset($amount['body']) && $amount['body'] == true) ||
             (isset($amount['comment']) && $amount['comment'] == true)
         ) {
-            $fieldsarr['epobject'] =  ['body'];
+            $fieldsarr['epobject'] = ['body'];
             $join = 'LEFT OUTER JOIN epobject ON hansard.epobject_id = epobject.epobject_id';
         } else {
             $join = '';
         }
 
 
-        $fieldsarr2 =  [];
+        $fieldsarr2 = [];
         // Construct the $fields clause.
         foreach ($fieldsarr as $table => $tablesfields) {
             foreach ($tablesfields as $n => $field) {
@@ -1704,7 +1704,7 @@ 
         }
         $fields = implode(', ', $fieldsarr2);
 
-        $wherearr2 =  [];
+        $wherearr2 = [];
         // Construct the $where clause.
         $i = 0;
         foreach ($wherearr as $key => $val) {
@@ -1862,7 +1862,7 @@ 
             // 'commentsurl' is the URL of the item on its own page, with comments.
 
             // All the things we need to work out a listurl!
-            $item_data =  [
+            $item_data = [
                 'major'			=> $this->major,
                 'minor' 		=> $item['minor'],
                 'htype' 		=> $item['htype'],
@@ -1910,7 +1910,7 @@ 
             if (isset($amount['comment']) && $amount['comment'] == true) {
 
                 // All the things we need to get the comment data.
-                $item_data =  [
+                $item_data = [
                     'htype' => $item['htype'],
                     'epobject_id' => $item['epobject_id'],
                 ];
@@ -2031,7 +2031,7 @@ 
                 $DATA->set_page_metadata('pbc_clause', 'url', "$pbc_url/$id");
                 $LISTURL->remove(['id']);
             } else {
-                $LISTURL->insert([ 'id' => $id_data['gid'] ]);
+                $LISTURL->insert(['id' => $id_data['gid']]);
             }
         } else {
             // A debate speech or question/answer, etc.
@@ -2043,10 +2043,10 @@ 
             // Find the gid of this item's (sub)section.
             $parent_gid = '';
 
-            if (isset($this->epobjectid_to_gid[ $parent_epobject_id ])) {
+            if (isset($this->epobjectid_to_gid[$parent_epobject_id])) {
                 // We've previously cached the gid for this epobject_id, so use that.
 
-                $parent_gid = $this->epobjectid_to_gid[ $parent_epobject_id ];
+                $parent_gid = $this->epobjectid_to_gid[$parent_epobject_id];
 
             } else {
                 // We haven't cached the gid, so fetch from db.
@@ -2064,7 +2064,7 @@ 
                     $parent_gid = fix_gid_from_db($r['gid']);
 
                     // Cache it for if we need it again:
-                    $this->epobjectid_to_gid[ $parent_epobject_id ] = $parent_gid;
+                    $this->epobjectid_to_gid[$parent_epobject_id] = $parent_gid;
                 }
             }
 
@@ -2075,7 +2075,7 @@ 
                     $DATA->set_page_metadata('pbc_clause', 'url', "$pbc_url/$parent_gid");
                     $LISTURL->remove(['id']);
                 } else {
-                    $LISTURL->insert([ 'id' => $parent_gid ]);
+                    $LISTURL->insert(['id' => $parent_gid]);
                 }
                 // Use a truncated form of this item's gid for the anchor.
                 $fragment = '#g' . gid_to_anchor($id_data['gid']);
@@ -2140,7 +2140,7 @@ 
         $URL->insert(['p' => $person_id]);
 
         $name = member_full_name($member['house'], $member['title'], $member['given_name'], $member['family_name'], $member['lordofname']);
-        $speaker =  [
+        $speaker = [
             'member_id' => $member['member_id'],
             "name" => $name,
             'house' => $member['house'],
@@ -2164,7 +2164,7 @@ 
     private function _get_speaker_alone($q, $person_id, $hdate, $htime, $major) {
         $members = $q->fetchAll();
         if (count($members) > 1) {
-            $members = array_filter($members, function ($m) use ($major) {
+            $members = array_filter($members, function($m) use ($major) {
                 $houses = \MySociety\TheyWorkForYou\Utility\House::majorToHouse($major);
                 return in_array($m['house'], $houses);
             });
@@ -2272,7 +2272,7 @@ 
                 )->first();
 
                 // Add this comment to the data structure.
-                $comment =  [
+                $comment = [
                     'comment_id' => $q['comment_id'],
                     'user_id'	=> $q['user_id'],
                     'body'		=> $q['body'],
@@ -2287,7 +2287,7 @@ 
         // or subsection itself, only the items within them. So
         // we don't get the most recent comment. Because there isn't one.
 
-        $return =  [
+        $return = [
             'totalcomments' => $totalcomments,
             'comment' => $comment,
         ];
@@ -2350,7 +2350,7 @@ 
         // If part of a Written Answer (just question or just answer), select the whole thing
         if (isset($itemdata['major']) && $hansardmajors[$itemdata['major']]['type'] == 'other' and ($itemdata['htype'] == '12' or $itemdata['htype'] == '13' or $itemdata['htype'] == '14')) {
             // find the gid of the subheading which holds this part
-            $input =  [
+            $input = [
                 'amount' => ['gid' => true],
                 'where' =>  [
                     'epobject_id=' => $itemdata['subsection_id'],
@@ -2366,7 +2366,7 @@ 
 
         # If a WMS main heading, go to next gid
         if (isset($itemdata['major']) && $itemdata['major'] == 4 && $itemdata['htype'] == '10') {
-            $input =  [
+            $input = [
                 'amount' => ['gid' => true],
                 'where' => [
                     'section_id=' => $itemdata['epobject_id'],
@@ -2446,7 +2446,7 @@ 
                 $nextprev['up']['url'] 		= $sectionrow['listurl'];
                 $nextprev['up']['title'] 	= $sectionrow['body'];
             }
-            $nextprev['up']['body']		= gettext('See the whole debate');
+            $nextprev['up']['body'] = gettext('See the whole debate');
         }
 
         // We can then access this from $PAGE and the templates.
@@ -2455,7 +2455,7 @@ 
         // Now get all the non-heading rows.
 
         // What data do we want for each item?
-        $amount =  [
+        $amount = [
             'body' => true,
             'speaker' => true,
             'comment' => true,
@@ -2466,7 +2466,7 @@ 
             // This item is a section, so we're displaying all the items within
             // it that aren't within a subsection.
 
-            $input =  [
+            $input = [
                 'amount' => $amount,
                 'where' =>  [
                     'section_id=' => $itemdata['epobject_id'],
@@ -2478,7 +2478,7 @@ 
             $data['rows'] = $this->_get_hansard_data($input);
             if (!count($data['rows']) || (count($data['rows']) == 1 && strstr($data['rows'][0]['body'], 'was asked'))) {
 
-                $input =  [
+                $input = [
                     'amount' =>  [
                         'body' => true,
                         'comment' => true,
@@ -2500,7 +2500,7 @@ 
         } elseif ($itemdata['htype'] == '11') {
             // This item is a subsection, so we're displaying everything within it.
 
-            $input =  [
+            $input = [
                 'amount' => $amount,
                 'where' =>  [
                     'subsection_id=' => $itemdata['epobject_id'],
@@ -2537,8 +2537,8 @@ 
 
         twfy_debug(get_class($this), "getting data by column");
 
-        $input = [ 'amount' => ['body' => true, 'comment' => true, 'speaker' => true],
-            'where' => [ 'hdate=' => $args['date'], 'major=' => $this->major, 'gid LIKE ' => '%.' . $args['column'] . '.%' ],
+        $input = ['amount' => ['body' => true, 'comment' => true, 'speaker' => true],
+            'where' => ['hdate=' => $args['date'], 'major=' => $this->major, 'gid LIKE ' => '%.' . $args['column'] . '.%'],
             'order' => 'hpos',
         ];
         $data = $this->_get_hansard_data($input);
@@ -2698,10 +2698,10 @@ 
                         ", [':major' => $this->major]);
 
         // What we return.
-        $data =  [];
+        $data = [];
         $speeches = [];
         foreach ($q as $row) {
-            $speech =  [
+            $speech = [
                 'subsection_id' => $row['subsection_id'],
                 'section_id' => $row['section_id'],
                 'htype' => $row['htype'],
@@ -2746,7 +2746,7 @@ 
             $data['rows'] = $speeches;
 
         } else {
-            $data['rows'] =  [];
+            $data['rows'] = [];
         }
 
         $data['info']['days'] = $days;
@@ -2798,7 +2798,7 @@ 
         if ($q) {
 
             // This array just used for getting further data about this debate.
-            $item_data =  [
+            $item_data = [
                 'major'         => $this->major,
                 'minor'         => $q['minor'],
                 'gid'           => fix_gid_from_db($q['gid']),
@@ -2862,7 +2862,7 @@ 
                                 ORDER BY hpos
                                 LIMIT 1
                                 ",
-                    [ ':object_id' => $item_data['epobject_id'] ]
+                    [':object_id' => $item_data['epobject_id']]
                 )->first();
                 $childbody = $r['body'];
                 $speaker = $this->_get_speaker($r['person_id'], $r['hdate'], $r['htime'], $this->major);
@@ -2901,7 +2901,7 @@ 
                 'more_url' => $more_url->generate(),
             ];
 
-            $data =  [
+            $data = [
                 'gid' => $args['gid'],
                 'major' => $this->major,
                 'info' => [],
@@ -2974,7 +2974,7 @@ 
         foreach ($q as $row) {
 
             // This array just used for getting further data about this debate.
-            $item_data =  [
+            $item_data = [
                 'major' => $this->major,
                 'gid' => fix_gid_from_db($row['gid']),
                 'htype' => $row['htype'],
@@ -3092,7 +3092,7 @@ 
         foreach ($q as $row) {
 
             // This array just used for getting further data about this debate.
-            $item_data =  [
+            $item_data = [
                 'major' => $this->major,
                 'gid' => fix_gid_from_db($row['gid']),
                 'htype' => $row['htype'],
@@ -3101,8 +3101,8 @@ 
                 'epobject_id' => $row['epobject_id'],
             ];
 
-            $list_url 		= $this->_get_listurl($item_data);
-            $totalcomments	= $this->_get_comment_count_for_epobject($item_data);
+            $list_url = $this->_get_listurl($item_data);
+            $totalcomments = $this->_get_comment_count_for_epobject($item_data);
 
             $contentcount = $row['count'];
             $body = $row['body'];
@@ -3110,7 +3110,7 @@ 
 
 
             // This array will be added to $data, which is what gets returned.
-            $debate =  [
+            $debate = [
                 'contentcount'	=> $contentcount,
                 'body'			=> $body,
                 'hdate'			=> $hdate,
@@ -3150,7 +3150,7 @@ 
             $data[] = $debate;
         }
 
-        $data =  [
+        $data = [
             'info' => [],
             'data' => $data,
         ];
@@ -3238,7 +3238,7 @@ 
 
         foreach ($q as $row) {
             // This array just used for getting further data about this debate.
-            $item_data =  [
+            $item_data = [
                 'major' => $this->major,
                 'gid' => fix_gid_from_db($row['gid']),
                 'htype' => $row['htype'],
@@ -3247,8 +3247,8 @@ 
                 'epobject_id' => $row['epobject_id'],
             ];
 
-            $list_url 		= $this->_get_listurl($item_data);
-            $totalcomments	= $this->_get_comment_count_for_epobject($item_data);
+            $list_url = $this->_get_listurl($item_data);
+            $totalcomments = $this->_get_comment_count_for_epobject($item_data);
 
             $body = $row['body'];
             $hdate = $row['hdate'];
@@ -3276,7 +3276,7 @@ 
             $childbody = $r['body'];
             $speaker = $this->_get_speaker($r['person_id'], $r['hdate'], $r['htime'], $this->major);
 
-            $data[] =  [
+            $data[] = [
                 'body'			=> $body,
                 'hdate'			=> $hdate,
                 'list_url'		=> $list_url,
@@ -3292,7 +3292,7 @@ 
 
         }
 
-        $data =  [
+        $data = [
             'info' => [],
             'data' => $data,
         ];
@@ -3352,7 +3352,7 @@ 
     public function _get_data_by_bill($args) {
         global $DATA, $this_page;
         $data = [];
-        $input =  [
+        $input = [
             'amount' =>  [
                 'body' => true,
                 'comment' => true,
@@ -3374,7 +3374,7 @@ 
                 [$sitting, $part] = $this->_get_sitting($sectionrow['gid']);
                 $sectionrow['sitting'] = $sitting;
                 $sectionrow['part'] = $part;
-                $input =  [
+                $input = [
                     'amount' =>  [
                         'body' => true,
                         'comment' => true,
@@ -3445,8 +3445,8 @@ 
 
         $YEARURL = new \MySociety\TheyWorkForYou\Url('pbc_session');
         $nextprev = [];
-        $nextprev['prev'] =  ['body' => 'Previous session', 'title' => ''];
-        $nextprev['next'] =  ['body' => 'Next session', 'title' => ''];
+        $nextprev['prev'] = ['body' => 'Previous session', 'title' => ''];
+        $nextprev['next'] = ['body' => 'Next session', 'title' => ''];
         $q = $this->db->query(
             "SELECT session FROM bills WHERE session < :session ORDER BY session DESC LIMIT 1",
             [':session' => $session]