From 7d5383b694bd692dd4fb2f9478473df5256fecac Mon Sep 17 00:00:00 2001 From: Alex Parsons Date: Tue, 1 Oct 2024 10:52:48 +0000 Subject: [PATCH] Apply formatting change --- classes/AlertView.php | 9 +- classes/AlertView/Simple.php | 79 +- classes/AlertView/Standard.php | 60 +- classes/Common.php | 1 - classes/Data.php | 16 +- classes/Db/Connection.php | 1 - classes/Db/Query.php | 11 +- classes/Dissolution.php | 12 +- classes/Divisions.php | 281 +-- classes/EditQueue.php | 71 +- classes/FacebookLogin.php | 14 +- classes/Gid.php | 7 +- classes/GlossaryEditQueue.php | 9 +- classes/Hansard.php | 1 - classes/Homepage.php | 77 +- classes/Member.php | 119 +- classes/MemberException.php | 4 +- classes/Memcache.php | 15 +- classes/Model/AnnouncementManagement.php | 31 +- classes/Model/Featured.php | 41 +- classes/Office.php | 5 +- classes/Party.php | 13 +- classes/PartyCohort.php | 22 +- classes/People.php | 67 +- classes/People/LondonAssemblyMembers.php | 4 +- classes/People/MLAs.php | 1 - classes/People/MPs.php | 9 +- classes/People/MSPs.php | 1 - classes/People/MSs.php | 2 - classes/People/Peers.php | 9 +- classes/Policies.php | 82 +- classes/PolicyPositions.php | 54 +- classes/Redis.php | 2 +- classes/Renderer.php | 21 +- classes/Renderer/Footer.php | 36 +- classes/Renderer/Header.php | 72 +- classes/Renderer/Markdown.php | 28 +- classes/Renderer/User.php | 67 +- classes/SPHomepage.php | 25 +- classes/Search.php | 62 +- classes/Search/ByUsage.php | 2 +- classes/Search/Normal.php | 142 +- classes/Search/ParseArgs.php | 2 +- classes/Search/SearchBox.php | 22 +- classes/SectionView/DebatesView.php | 40 +- classes/SectionView/LondonView.php | 10 +- classes/SectionView/LordsView.php | 2 +- classes/SectionView/NiView.php | 46 +- classes/SectionView/PbcView.php | 36 +- classes/SectionView/SectionView.php | 193 ++- classes/SectionView/SeneddView.php | 44 +- classes/SectionView/SpView.php | 10 +- classes/SectionView/SpwransView.php | 58 +- classes/SectionView/WhallView.php | 2 +- classes/SectionView/WmsView.php | 4 +- classes/SectionView/WransView.php | 44 +- classes/Stripe.php | 2 +- classes/Subscription.php | 21 +- classes/TestStripe.php | 2 +- classes/Topic.php | 134 +- classes/Topics.php | 11 +- classes/Url.php | 9 +- classes/User.php | 68 +- classes/Utility/Alert.php | 38 +- classes/Utility/Calendar.php | 20 +- classes/Utility/Constituencies.php | 12 +- classes/Utility/Gaze.php | 7 +- classes/Utility/Hansard.php | 11 +- classes/Utility/House.php | 107 +- classes/Utility/LibFilter.php | 80 +- classes/Utility/Member.php | 9 +- classes/Utility/Postcode.php | 51 +- classes/Utility/Search.php | 68 +- classes/Utility/Shuffle.php | 5 +- classes/Utility/Wikipedia.php | 131 +- scripts/alertgonemps.php | 162 +- scripts/alertmailer.php | 77 +- scripts/alertmpchanged.php | 96 +- scripts/create_initial_topics.php | 102 +- scripts/mprss.php | 92 +- scripts/populate-policy-images.php | 18 +- scripts/wrans-votes-by-dept.php | 17 +- scripts/wranstats.php | 9 +- tests/AcceptApiTest.php | 111 +- tests/AcceptBasicTest.php | 38 +- tests/AlertsPageTest.php | 30 +- tests/AlertsTest.php | 112 +- tests/Bootstrap.php | 6 +- tests/CommentTest.php | 29 +- tests/DivisionsTest.php | 37 +- tests/FetchPageTestCase.php | 13 +- tests/GlossaryTest.php | 54 +- tests/HansardTest.php | 54 +- tests/HousesTest.php | 25 +- tests/LibFilterTest.php | 24 +- tests/MemberTest.php | 179 +- tests/PageTest.php | 56 +- tests/PartyTest.php | 152 +- tests/PeopleTest.php | 49 +- tests/PostcodeTest.php | 24 +- tests/SearchTest.php | 60 +- tests/SectionTest.php | 32 +- tests/TWFY_Database_TestCase.php | 22 +- tests/TopicsTest.php | 31 +- tests/UserPageTest.php | 45 +- tests/UserTest.php | 52 +- tests/UtilityTest.php | 9 +- tests/VotesTest.php | 12 +- www/docs/404.php | 10 +- www/docs/about/index.php | 2 +- www/docs/admin/alert_stats.php | 85 +- www/docs/admin/badusers.php | 62 +- www/docs/admin/banner.php | 24 +- www/docs/admin/comments.php | 16 +- www/docs/admin/edittopic.php | 74 +- www/docs/admin/failedsearches.php | 30 +- www/docs/admin/featured.php | 40 +- www/docs/admin/glossary.php | 37 +- www/docs/admin/glossary_pending.php | 48 +- www/docs/admin/index.php | 42 +- www/docs/admin/photos.php | 86 +- www/docs/admin/policies.php | 35 +- www/docs/admin/popularsearches.php | 32 +- www/docs/admin/profile-message.php | 46 +- www/docs/admin/report.php | 62 +- www/docs/admin/reporting_stats.php | 14 +- www/docs/admin/reports.php | 14 +- www/docs/admin/searchlogs.php | 32 +- www/docs/admin/statistics.php | 22 +- www/docs/admin/topics.php | 12 +- www/docs/admin/users.php | 70 +- www/docs/admin/websites.php | 40 +- www/docs/admin/wikipedia.php | 4 +- www/docs/alert/authed.php | 19 +- www/docs/alert/by-postcode/index.php | 1 - www/docs/alert/update-mp/index.php | 3 +- www/docs/api/api_convertURL.php | 48 +- www/docs/api/api_functions.php | 246 +-- www/docs/api/api_getAlerts.php | 6 +- www/docs/api/api_getBoundary.php | 2 +- www/docs/api/api_getComments.php | 42 +- www/docs/api/api_getCommittee.php | 40 +- www/docs/api/api_getConstituencies.php | 48 +- www/docs/api/api_getConstituency.php | 8 +- www/docs/api/api_getDebates.php | 6 +- www/docs/api/api_getGeometry.php | 80 +- www/docs/api/api_getHansard.php | 44 +- www/docs/api/api_getLord.php | 5 +- www/docs/api/api_getLords.php | 2 +- www/docs/api/api_getMLA.php | 2 +- www/docs/api/api_getMLAs.php | 2 +- www/docs/api/api_getMP.php | 2 +- www/docs/api/api_getMPInfo.php | 2 +- www/docs/api/api_getMPs.php | 2 +- www/docs/api/api_getMPsInfo.php | 14 +- www/docs/api/api_getMS.php | 3 +- www/docs/api/api_getMSP.php | 2 +- www/docs/api/api_getMSPs.php | 2 +- www/docs/api/api_getMSs.php | 2 +- www/docs/api/api_getMembers.php | 41 +- www/docs/api/api_getPerson.php | 55 +- www/docs/api/api_getQuota.php | 4 +- www/docs/api/api_getWMS.php | 10 +- www/docs/api/api_getWrans.php | 10 +- www/docs/api/cancel-plan.php | 2 +- www/docs/api/hook.php | 6 +- www/docs/api/index.php | 62 +- www/docs/api/invoices.php | 2 +- www/docs/api/key.php | 14 +- www/docs/api/terms.php | 2 +- www/docs/api/update-plan.php | 4 +- .../bills/2005-06/identity-cards/index.php | 20 +- .../index.php | 162 +- www/docs/boundaries/index.php | 54 +- www/docs/calendar/index.php | 54 +- www/docs/comments/recent/index.php | 8 +- www/docs/contact/index.php | 2 +- www/docs/departments/index.php | 12 +- www/docs/departments/questions.php | 14 +- www/docs/departments/statements.php | 14 +- www/docs/divisions/division.php | 16 +- www/docs/divisions/index.php | 2 +- www/docs/email/index.php | 24 +- www/docs/foiorder2009/index.php | 2 +- www/docs/foiorder2009/share.php | 4 +- www/docs/freeourbills/doshare.php | 2 +- www/docs/freeourbills/index.php | 6 +- www/docs/freeourbills/share.php | 4 +- www/docs/freeourbills/sharethis.php | 24 +- www/docs/glossary/index.php | 54 +- www/docs/hansardbugs/index.php | 8 +- www/docs/help/index.php | 2 +- www/docs/help/linktous/index.php | 2 +- www/docs/houserules/index.php | 2 +- www/docs/images/mps/photo-status.php | 8 +- www/docs/index-election.php | 78 +- www/docs/index.php | 2 +- www/docs/mp/index.php | 245 +-- www/docs/mps/index.php | 2 +- www/docs/mps/multiple.php | 8 +- www/docs/news/editme.php | 842 +++++---- www/docs/news/home_page_include.php | 2 +- www/docs/news/index.php | 22 +- www/docs/news/rdf.php | 32 +- www/docs/news/sidebar_archives.php | 6 +- www/docs/parliament/index.php | 7 +- www/docs/parliaments/index.php | 2 +- www/docs/postcode/index.php | 44 +- www/docs/privacy/index.php | 2 +- www/docs/random/index.php | 2 +- www/docs/regmem/index.php | 98 +- www/docs/report/index.php | 20 +- www/docs/rss/index.php | 10 +- www/docs/scotland/index.php | 2 +- www/docs/search-hansard/index.php | 7 +- www/docs/search/rss/index.php | 9 +- www/docs/section.php | 7 +- www/docs/support-us/failed.php | 4 +- www/docs/support-us/index.php | 4 +- www/docs/support-us/thanks.php | 4 +- www/docs/topic/image.php | 2 +- www/docs/topic/topic.php | 20 +- www/docs/user/confirm/index.php | 70 +- www/docs/user/index.php | 18 +- www/docs/user/login/fb.php | 10 +- www/docs/user/login/index.php | 28 +- www/docs/user/logout/index.php | 2 +- www/docs/user/password/index.php | 25 +- www/docs/user/prompt/index.php | 2 +- www/docs/vote/index.php | 44 +- www/docs/voting-information/index.php | 4 +- .../written-answers-and-statements/index.php | 3 +- www/includes/dbtypes.php | 253 +-- www/includes/easyparliament/alert.php | 179 +- www/includes/easyparliament/comment.php | 107 +- www/includes/easyparliament/commentlist.php | 234 +-- www/includes/easyparliament/commentreport.php | 139 +- .../easyparliament/commentreportlist.php | 21 +- www/includes/easyparliament/glossary.php | 113 +- www/includes/easyparliament/glossarylist.php | 5 +- www/includes/easyparliament/hansardlist.php | 1154 ++++++------ www/includes/easyparliament/helper-donate.php | 25 +- www/includes/easyparliament/init.php | 48 +- www/includes/easyparliament/member.php | 241 +-- www/includes/easyparliament/metadata.php | 1539 +++++++++-------- www/includes/easyparliament/page.php | 302 ++-- www/includes/easyparliament/recess.php | 739 ++++---- www/includes/easyparliament/searchengine.php | 246 ++- www/includes/easyparliament/searchlog.php | 25 +- .../easyparliament/sidebars/bills_intro.php | 2 +- .../sidebars/comments_recent.php | 5 +- .../easyparliament/sidebars/donate.php | 2 +- .../easyparliament/sidebars/front.php | 2 +- .../easyparliament/sidebars/glossary_add.php | 2 +- .../easyparliament/sidebars/hocdebates.php | 2 +- .../sidebars/hocdebates_short.php | 13 +- .../easyparliament/sidebars/holdebates.php | 2 +- .../sidebars/holdebates_short.php | 13 +- .../easyparliament/sidebars/mla_search.php | 8 +- .../sidebars/mp_email_friend.php | 2 +- .../easyparliament/sidebars/mp_search.php | 8 +- .../sidebars/mp_speech_search.php | 2 +- www/includes/easyparliament/sidebars/mps.php | 8 +- .../easyparliament/sidebars/msp_search.php | 8 +- .../easyparliament/sidebars/nidebates.php | 2 +- .../sidebars/nidebates_short.php | 13 +- www/includes/easyparliament/sidebars/pbc.php | 2 +- .../easyparliament/sidebars/pbc_short.php | 13 +- .../easyparliament/sidebars/peer_search.php | 8 +- .../easyparliament/sidebars/sitenews.php | 4 +- .../sidebars/sitenews_recent.php | 2 +- .../easyparliament/sidebars/spdebates.php | 2 +- .../sidebars/spdebates_short.php | 13 +- .../easyparliament/sidebars/userjoin.php | 2 +- .../easyparliament/sidebars/userlogin.php | 2 +- .../easyparliament/sidebars/whalldebates.php | 2 +- .../sidebars/whalldebates_short.php | 13 +- .../sidebars/whatisthissite.php | 2 +- www/includes/easyparliament/sidebars/wms.php | 2 +- .../easyparliament/sidebars/wms_short.php | 13 +- .../easyparliament/sidebars/wrans.php | 2 +- .../easyparliament/sidebars/wrans_short.php | 13 +- .../staticpages/search_help.php | 4 +- .../easyparliament/templates/api/comments.php | 16 +- .../templates/api/comments_recent.php | 2 +- .../templates/api/comments_user.php | 2 +- .../templates/api/hansard_calendar.php | 3 +- .../templates/api/hansard_date.php | 11 +- .../templates/api/hansard_gid.php | 18 +- .../templates/html/alert/_list.php | 6 +- .../templates/html/alert/index.php | 60 +- .../_sidebar_right_announcements.php | 6 +- .../templates/html/api/check.php | 4 +- .../templates/html/api/update.php | 44 +- .../templates/html/calendar/index.php | 10 +- .../templates/html/comments.php | 20 +- .../templates/html/comments_recent.php | 10 +- .../templates/html/comments_user.php | 2 +- .../html/divisions/_name_vote_list.php | 32 +- .../html/divisions/_vote_description.php | 2 +- .../html/divisions/_vote_summary.php | 4 +- .../templates/html/divisions/_votes.php | 26 +- .../templates/html/divisions/_your_mp.php | 12 +- .../templates/html/divisions/index.php | 6 +- .../templates/html/divisions/vote.php | 10 +- .../templates/html/donate/_stripe_donate.php | 56 +- .../easyparliament/templates/html/footer.php | 28 +- .../templates/html/glossary.php | 18 +- .../html/hansard_glossary_search.php | 8 +- .../templates/html/hansard_person.php | 2 +- .../html/hansard_recent_mostvotes.php | 38 +- .../easyparliament/templates/html/header.php | 14 +- .../templates/html/homepage/devolved-list.php | 54 +- .../html/homepage/featured-content.php | 10 +- .../html/homepage/recent-debates.php | 8 +- .../templates/html/homepage/recent-votes.php | 2 +- .../easyparliament/templates/html/index.php | 33 +- .../templates/html/london/index.php | 12 +- .../templates/html/mp/_chamber_info_panel.php | 2 +- .../html/mp/_division_description.php | 74 +- .../templates/html/mp/_donation.php | 4 +- .../templates/html/mp/_featured_content.php | 4 +- .../templates/html/mp/_vote_description.php | 6 +- .../templates/html/mp/divisions.php | 72 +- .../templates/html/mp/header.php | 76 +- .../templates/html/mp/profile.php | 2 +- .../templates/html/mp/recent.php | 34 +- .../templates/html/mp/votes.php | 148 +- .../templates/html/mp/votes_svg.php | 60 +- .../templates/html/ni/index.php | 8 +- .../templates/html/people/index.php | 64 +- .../templates/html/postcode/index.php | 52 +- .../templates/html/scotland/index.php | 8 +- .../templates/html/search/by-person.php | 66 +- .../templates/html/search/form_main.php | 4 +- .../templates/html/search/person.php | 4 +- .../templates/html/search/results.php | 62 +- .../templates/html/search/sidebar.php | 4 +- .../html/section/_business_list_item.php | 8 +- .../html/section/_business_section.php | 10 +- .../templates/html/section/_calendar.php | 230 +-- .../html/section/_calendar_section.php | 2 +- .../templates/html/section/_search.php | 4 +- .../html/section/_section_content.php | 229 +-- .../templates/html/section/_section_toc.php | 8 +- .../templates/html/section/column.php | 11 +- .../templates/html/section/day.php | 31 +- .../templates/html/section/index.php | 25 +- .../templates/html/section/ni_index.php | 7 +- .../templates/html/section/pbc_bill.php | 32 +- .../templates/html/section/pbc_index.php | 5 +- .../templates/html/section/pbc_session.php | 6 +- .../templates/html/section/recent.php | 3 +- .../templates/html/section/section.php | 19 +- .../templates/html/section/senedd_index.php | 7 +- .../templates/html/section/wrans_index.php | 13 +- .../templates/html/section/year.php | 5 +- .../templates/html/senedd/index.php | 8 +- .../templates/html/static/linktous.php | 38 +- .../templates/html/topic/topic.php | 2 +- .../templates/html/user/form.php | 16 +- .../templates/html/user/index.php | 2 +- .../templates/html/user/join.php | 18 +- .../templates/html/user/view_user.php | 2 +- .../templates/rss/hansard_search.php | 34 +- www/includes/easyparliament/user.php | 426 +++-- www/includes/test/utility_test.php | 17 +- www/includes/utility.php | 453 ++--- 368 files changed, 8737 insertions(+), 8526 deletions(-) diff --git a/classes/AlertView.php b/classes/AlertView.php index 91b2c56277..0ececa8671 100644 --- a/classes/AlertView.php +++ b/classes/AlertView.php @@ -3,9 +3,8 @@ namespace MySociety\TheyWorkForYou; class AlertView { - - const ALERT_EXISTS = -2; - const CREATE_FAILED = -1; + public const ALERT_EXISTS = -2; + public const CREATE_FAILED = -1; protected $user; protected $db; @@ -13,8 +12,8 @@ class AlertView { public function __construct($THEUSER = null) { $this->user = $THEUSER; - $this->db = new \ParlDB; - $this->alert = new \ALERT; + $this->db = new \ParlDB(); + $this->alert = new \ALERT(); } protected function confirmAlert($token) { diff --git a/classes/AlertView/Simple.php b/classes/AlertView/Simple.php index d61e4ec811..90a0ff2e76 100644 --- a/classes/AlertView/Simple.php +++ b/classes/AlertView/Simple.php @@ -3,11 +3,10 @@ namespace MySociety\TheyWorkForYou\AlertView; class Simple extends \MySociety\TheyWorkForYou\AlertView { - public function display() { - $data = array(); + $data = []; $data['recent_election'] = false; - if ( $this->user->loggedin() ) { + if ($this->user->loggedin()) { $data['user_signed_in'] = true; } @@ -17,21 +16,21 @@ public function display() { $data['postcode'] = trim(get_http_var('postcode')); $result = $this->createAlertForPostCode($data['email'], $data['postcode']); - $data = array_merge( $data, $result ); + $data = array_merge($data, $result); } elseif (get_http_var('update')) { $result = $this->getNewMP(get_http_var('update')); - $data = array_merge( $data, $result ); + $data = array_merge($data, $result); } elseif (get_http_var('update-alert')) { - $success = $this->replaceAlert( get_http_var('confirmation') ); + $success = $this->replaceAlert(get_http_var('confirmation')); $data['confirmation_received'] = $success; } elseif (get_http_var('confirmed')) { - $success = $this->confirmAlert( get_http_var('confirmed') ); + $success = $this->confirmAlert(get_http_var('confirmed')); $data['confirmation_received'] = $success; } else { $data['email'] = $this->user->email() ? $this->user->email() : ''; $data['postcode'] = $this->user->postcode_is_set() ? $this->user->postcode() : ''; - if ( $this->isEmailSignedUpForPostCode( $data['email'], $data['postcode'] ) ) { + if ($this->isEmailSignedUpForPostCode($data['email'], $data['postcode'])) { $data['already_signed_up'] = true; $mp = $this->getPersonFromPostcode($data['postcode']); $data['mp_name'] = $mp->full_name(); @@ -42,10 +41,10 @@ public function display() { } private function getPersonFromPostcode($postcode) { - $args = array( + $args = [ 'postcode' => $postcode, - 'house' => 1 - ); + 'house' => 1, + ]; $member = new \MySociety\TheyWorkForYou\Member($args); return $member; @@ -66,30 +65,30 @@ private function validateDetails($email, $postcode) { } private function createAlertForPostCode($email, $postcode) { - if ( !$this->validateDetails($email, $postcode) ) { - return array('invalid-postcode-or-email' => true); + if (!$this->validateDetails($email, $postcode)) { + return ['invalid-postcode-or-email' => true]; } try { $person = $this->getPersonFromPostcode($postcode); - } catch ( \MySociety\TheyWorkForYou\MemberException $e ) { - return array('bad-constituency' => true); + } catch (\MySociety\TheyWorkForYou\MemberException $e) { + return ['bad-constituency' => true]; } - $details = array( + $details = [ 'email' => $email, 'pid' => $person->person_id, 'pc' => $postcode, 'confirm_base' => 'https://' . DOMAIN . '/alert/by-postcode?confirmed=', - ); + ]; - $data = array(); + $data = []; $not_logged_in = $this->user->loggedin ? false : true; $result = $this->alert->add($details, $not_logged_in); switch ($result) { case self::ALERT_EXISTS: - if ( $not_logged_in ) { + if ($not_logged_in) { // no logged in user so send them an email to let them // know someone tried to create an alert $this->alert->send_already_signedup_email($details); @@ -102,7 +101,7 @@ private function createAlertForPostCode($email, $postcode) { $data['error'] = true; break; default: // alert created - if ( $not_logged_in ) { + if ($not_logged_in) { $data['confirmation_sent'] = true; } else { $data['signedup_no_confirm'] = true; @@ -116,8 +115,8 @@ private function replaceAlert($confirmation) { $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(array( 'person_id' => $old_mp_id ) ); - $new_mp = new \MySociety\TheyWorkForYou\Member(array( '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 @@ -125,10 +124,10 @@ private function replaceAlert($confirmation) { AND criteria LIKE :criteria AND confirmed = 1 AND deleted = 0", - array( + [ ':email' => $existing['email'], - ':criteria' => '%speaker:' . $old_mp_id . '%' - ) + ':criteria' => '%speaker:' . $old_mp_id . '%', + ] ); foreach ($q as $row) { @@ -136,12 +135,12 @@ private function replaceAlert($confirmation) { $this->alert->token_checked = null; $other_criteria = trim(preg_replace('/speaker:\d+/', '', $row['criteria'])); - $details = array( + $details = [ 'email' => $existing['email'], 'pid' => $new_mp->person_id, 'pc' => '', - ); - if ( $other_criteria ) { + ]; + if ($other_criteria) { $details['keyword'] = $other_criteria; } @@ -149,20 +148,20 @@ private function replaceAlert($confirmation) { $this->alert->add($details, false); } - return array( + return [ 'signedup_no_confirm' => true, 'new_mp' => $new_mp->full_name(), - ); + ]; } private function isEmailSignedUpForPostCode($email, $postcode) { $is_signed_up = false; - if ( $email && $postcode ) { + if ($email && $postcode) { try { $person = $this->getPersonFromPostcode($postcode); $is_signed_up = $this->alert->fetch_by_mp($email, $person->person_id); - } catch ( \MySociety\TheyWorkForYou\MemberException $e ) { + } catch (\MySociety\TheyWorkForYou\MemberException $e) { $is_signed_up = false; } } @@ -171,27 +170,27 @@ private function isEmailSignedUpForPostCode($email, $postcode) { private function getNewMP($confirmation) { if (!$confirmation) { - return array(); + return []; } $existing = $this->alert->fetch_by_token($confirmation); preg_match('/speaker:(\d+)/', $existing['criteria'], $matches); $criteria = $matches[1]; - $old_mp = new \MySociety\TheyWorkForYou\Member(array( 'person_id' => $criteria ) ); - $new_mp = new \MySociety\TheyWorkForYou\Member(array( '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 = array( + if ($this->alert->fetch_by_mp($existing['email'], $new_mp->person_id)) { + $data = [ 'already_signed_up' => true, 'old_mp' => $old_mp->full_name(), 'mp_name' => $new_mp->full_name(), - ); + ]; } else { - $data = array( + $data = [ 'old_mp' => $old_mp->full_name(), 'new_mp' => $new_mp->full_name(), - ); + ]; } $data['update'] = true; diff --git a/classes/AlertView/Standard.php b/classes/AlertView/Standard.php index 29a7f2e1de..0f07f09dcb 100644 --- a/classes/AlertView/Standard.php +++ b/classes/AlertView/Standard.php @@ -13,7 +13,7 @@ class Standard extends \MySociety\TheyWorkForYou\AlertView { public function __construct($THEUSER = null) { parent::__construct($THEUSER); - $this->data = array(); + $this->data = []; } public function display() { @@ -111,7 +111,7 @@ private function getBasicData() { private function checkInput() { global $SEARCHENGINE; - $errors = array(); + $errors = []; // Check each of the things the user has input. // If there is a problem with any of them, set an entry in the $errors array. @@ -159,15 +159,15 @@ private function searchForConstituenciesAndMembers() { // Do the search if ($this->data['alertsearch']) { $this->data['members'] = \MySociety\TheyWorkForYou\Utility\Search::searchMemberDbLookupWithNames($this->data['alertsearch'], true); - list ($this->data['constituencies'], $this->data['valid_postcode']) = \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery($this->data['alertsearch']); + [$this->data['constituencies'], $this->data['valid_postcode']] = \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery($this->data['alertsearch']); } else { - $this->data['members'] = array(); + $this->data['members'] = []; } # If the above search returned one result for constituency # search by postcode, use it immediately if (isset($this->data['constituencies']) && count($this->data['constituencies']) == 1 && $this->data['valid_postcode']) { - $MEMBER = new \MEMBER(array('constituency' => $this->data['constituencies'][0], 'house' => 1)); + $MEMBER = new \MEMBER(['constituency' => $this->data['constituencies'][0], 'house' => 1]); $this->data['pid'] = $MEMBER->person_id(); $this->data['pc'] = $this->data['alertsearch']; unset($this->data['constituencies']); @@ -175,12 +175,12 @@ private function searchForConstituenciesAndMembers() { } if (isset($this->data['constituencies'])) { - $cons = array(); + $cons = []; foreach ($this->data['constituencies'] as $constituency) { try { - $MEMBER = new \MEMBER(array('constituency'=>$constituency, 'house' => 1)); + $MEMBER = new \MEMBER(['constituency' => $constituency, 'house' => 1]); $cons[$constituency] = $MEMBER; - } catch ( \MySociety\TheyWorkForYou\MemberException $e ) { + } catch (\MySociety\TheyWorkForYou\MemberException $e) { // do nothing } } @@ -200,17 +200,17 @@ private function addAlert() { // If this goes well, the alert will be added to the database and a confirmation email // will be sent to them. - $success = $this->alert->add( $this->data, $confirm ); + $success = $this->alert->add($this->data, $confirm); - if ($success>0 && !$confirm) { + if ($success > 0 && !$confirm) { $result = 'alert-added'; - } elseif ($success>0) { + } elseif ($success > 0) { $result = 'alert-confirmation'; } elseif ($success == -2) { // we need to make sure we know that the person attempting to sign up // for the alert has that email address to stop people trying to work // out what alerts they are signed up to - if ( $this->data['email_verified'] || ( $this->user->loggedin && $this->user->email() == $this->data['email'] ) ) { + if ($this->data['email_verified'] || ($this->user->loggedin && $this->user->email() == $this->data['email'])) { $result = 'alert-exists'; } else { // don't throw an error message as that implies that they have already signed @@ -235,7 +235,7 @@ private function addAlert() { private function formatSearchTerms() { - if ( $this->data['alertsearch'] ) { + if ($this->data['alertsearch']) { $this->data['alertsearch_pretty'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($this->data['alertsearch']); $this->data['search_text'] = $this->data['alertsearch']; } else { @@ -244,15 +244,15 @@ private function formatSearchTerms() { } private function checkForCommonMistakes() { - $mistakes = array(); + $mistakes = []; if (strstr($this->data['alertsearch'], ',') > -1) { $mistakes['multiple'] = 1; } if ( - preg_match('#([A-Z]{1,2}\d+[A-Z]? ?\d[A-Z]{2})#i', $this->data['alertsearch'], $m) && - strlen($this->data['alertsearch']) > strlen($m[1]) && - validate_postcode($m[1]) + preg_match('#([A-Z]{1,2}\d+[A-Z]? ?\d[A-Z]{2})#i', $this->data['alertsearch'], $m) && + strlen($this->data['alertsearch']) > strlen($m[1]) && + validate_postcode($m[1]) ) { $this->data['postcode'] = $m[1]; $mistakes['postcode_and'] = 1; @@ -262,11 +262,11 @@ private function checkForCommonMistakes() { } private function formatSearchMemberData() { - if ( isset($this->data['postcode']) ) { + if (isset($this->data['postcode'])) { try { $postcode = $this->data['postcode']; - $MEMBER = new \MEMBER( array('postcode' => $postcode) ); + $MEMBER = new \MEMBER(['postcode' => $postcode]); // move the postcode to the front just to be tidy $tidy_alertsearch = $postcode . " " . trim(str_replace("$postcode", "", $this->data['alertsearch'])); $alertsearch_display = str_replace("$postcode ", "", $tidy_alertsearch); @@ -275,39 +275,39 @@ private function formatSearchMemberData() { $this->data['member_displaysearch'] = $alertsearch_display; $this->data['member'] = $MEMBER; - if ( isset($this->data['mistakes']['postcode_and']) ) { + if (isset($this->data['mistakes']['postcode_and'])) { $constituencies = \MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituencies($postcode); - if ( isset($constituencies['SPC']) ) { - $MEMBER = new \MEMBER(array('constituency' => $constituencies['SPC'], 'house' => HOUSE_TYPE_SCOTLAND)); + if (isset($constituencies['SPC'])) { + $MEMBER = new \MEMBER(['constituency' => $constituencies['SPC'], 'house' => HOUSE_TYPE_SCOTLAND]); $this->data['scottish_alertsearch'] = str_replace("$postcode", "speaker:" . $MEMBER->person_id, $tidy_alertsearch); $this->data['scottish_member'] = $MEMBER; - } elseif ( isset($constituencies['WAC']) ) { - $MEMBER = new \MEMBER(array('constituency' => $constituencies['WAC'], 'house' => HOUSE_TYPE_WALES)); + } elseif (isset($constituencies['WAC'])) { + $MEMBER = new \MEMBER(['constituency' => $constituencies['WAC'], 'house' => HOUSE_TYPE_WALES]); $this->data['welsh_alertsearch'] = str_replace("$postcode", "speaker:" . $MEMBER->person_id, $tidy_alertsearch); $this->data['welsh_member'] = $MEMBER; } } - } catch ( \MySociety\TheyWorkForYou\MemberException $e ) { + } catch (\MySociety\TheyWorkForYou\MemberException $e) { $this->data['member_error'] = 1; } } - if ( $this->data['pid'] ) { - $MEMBER = new \MEMBER( array('person_id' => $this->data['pid']) ); + if ($this->data['pid']) { + $MEMBER = new \MEMBER(['person_id' => $this->data['pid']]); $this->data['pid_member'] = $MEMBER; } - if ( $this->data['keyword'] ) { + if ($this->data['keyword']) { $this->data['display_keyword'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($this->data['keyword']); } } private function setUserData() { $this->data['current_mp'] = false; - $this->data['alerts'] = array(); + $this->data['alerts'] = []; if ($this->data['email_verified']) { if ($this->user->postcode()) { - $current_mp = new \MEMBER(array('postcode' => $this->user->postcode())); + $current_mp = new \MEMBER(['postcode' => $this->user->postcode()]); if (!$this->alert->fetch_by_mp($this->data['email'], $current_mp->person_id())) { $this->data['current_mp'] = $current_mp; } diff --git a/classes/Common.php b/classes/Common.php index 8086a3c554..812d15e594 100644 --- a/classes/Common.php +++ b/classes/Common.php @@ -3,7 +3,6 @@ namespace MySociety\TheyWorkForYou; class Common { - public function getPopularSearches() { global $SEARCHLOG; $popular_searches = $SEARCHLOG->popular_recent(10, 2000); diff --git a/classes/Data.php b/classes/Data.php index ccc57becce..4ddb904433 100644 --- a/classes/Data.php +++ b/classes/Data.php @@ -82,10 +82,10 @@ public function set_section() { public function page_metadata($page, $key) { return $this->getMetadata( - array( + [ 'page' => $page, - 'key' => $key - ), + 'key' => $key, + ], 'page' ); } @@ -99,10 +99,10 @@ public function page_metadata($page, $key) { public function section_metadata($section, $key) { return $this->getMetadata( - array( + [ 'section' => $section, - 'key' => $key - ), + 'key' => $key, + ], 'section' ); } @@ -116,7 +116,7 @@ public function section_metadata($section, $key) { */ public function set_page_metadata($page, $key, $value) { - $this->setMetadata(array("page"=>$page, "key"=>$key, "value"=>$value)); + $this->setMetadata(["page" => $page, "key" => $key, "value" => $value]); } /** @@ -128,7 +128,7 @@ public function set_page_metadata($page, $key, $value) { */ public function set_section_metadata($section, $key, $value) { - $this->setMetadata(array("section"=>$section, "key"=>$key, "value"=>$value)); + $this->setMetadata(["section" => $section, "key" => $key, "value" => $value]); } /** diff --git a/classes/Db/Connection.php b/classes/Db/Connection.php index c7064eaa5c..aec310c7c0 100644 --- a/classes/Db/Connection.php +++ b/classes/Db/Connection.php @@ -43,7 +43,6 @@ */ class Connection { - /** * Initialise Connection * diff --git a/classes/Db/Query.php b/classes/Db/Query.php index 365e91769e..633e61185e 100644 --- a/classes/Db/Query.php +++ b/classes/Db/Query.php @@ -37,10 +37,9 @@ */ class Query implements \IteratorAggregate, \ArrayAccess { - private $success = true; private $rows = null; - private $data = array(); + private $data = []; private $insert_id = null; private $affected_rows = null; @@ -118,7 +117,7 @@ public function query($sql = "", $params = null) { } $this->affected_rows = $pdoStatement->rowCount(); - twfy_debug("SQLRESULT", array($this, 'displayResult')); + twfy_debug("SQLRESULT", [$this, 'displayResult']); // mysql_free_result($q); } } @@ -146,7 +145,7 @@ public function offsetGet($offset) { } public function offsetSet($offset, $value) { - throw new \Exception; + throw new \Exception(); } public function offsetExists($offset) { @@ -154,7 +153,7 @@ public function offsetExists($offset) { } public function offsetUnset($offset) { - throw new \Exception; + throw new \Exception(); } public function fetchAll() { @@ -185,7 +184,7 @@ public function row($row_index) { if ($this->success && $this->rows > 0) { return $this->data[$row_index]; } - return array(); + return []; } public function exists() { diff --git a/classes/Dissolution.php b/classes/Dissolution.php index 23410cb37a..aed4b8ae1c 100644 --- a/classes/Dissolution.php +++ b/classes/Dissolution.php @@ -4,10 +4,10 @@ class Dissolution { public static function dates() { - $out = array(); + $out = []; $dates = array_filter(explode(',', DISSOLUTION_DATE)); foreach ($dates as $houseanddate) { - list ($house, $date) = explode(':', $houseanddate); + [$house, $date] = explode(':', $houseanddate); $out[$house] = $date; } return $out; @@ -18,16 +18,16 @@ public static function db() { return null; } - $params = array(); - $query = array(); + $params = []; + $query = []; foreach ($dates as $house => $date) { $params[":dissdate$house"] = $date; $query[] = "left_house = :dissdate$house"; } - return array( + return [ 'query' => '(' . join(' OR ', $query) . ')', 'params' => $params, - ); + ]; } } diff --git a/classes/Divisions.php b/classes/Divisions.php index 73d7ebc0af..586366c555 100644 --- a/classes/Divisions.php +++ b/classes/Divisions.php @@ -8,7 +8,6 @@ namespace MySociety\TheyWorkForYou; class Divisions { - /** * Member */ @@ -29,16 +28,15 @@ class Divisions { * @param Member $member The member to get positions for. */ - public function __construct(Member $member = null, PolicyPositions $positions = null) - { + public function __construct(Member $member = null, PolicyPositions $positions = null) { $this->member = $member; $this->positions = $positions; - $this->policies = new Policies; - $this->db = new \ParlDB; + $this->policies = new Policies(); + $this->db = new \ParlDB(); } public static function getMostRecentDivisionDate() { - $db = new \ParlDB; + $db = new \ParlDB(); $q = $db->query( "SELECT policy_id, max(division_date) as recent FROM policydivisions @@ -46,7 +44,7 @@ public static function getMostRecentDivisionDate() { GROUP BY policy_id" ); - $policy_maxes = array(); + $policy_maxes = []; foreach ($q as $row) { $policy_maxes[$row['policy_id']] = $row['recent']; } @@ -63,14 +61,14 @@ public function getRecentDivisions($number = 20, $houses = null) { $select = ''; $order = 'ORDER BY division_date DESC, division_number DESC'; $limit = 'LIMIT :count'; - $params = array( - ':count' => $number - ); + $params = [ + ':count' => $number, + ]; $where = []; if ($houses) { - if ( is_string($houses) ) { - $houses = array( $houses ); + if (is_string($houses)) { + $houses = [ $houses ]; } $where[] = 'house IN ("' . implode('", "', $houses) . '")'; } @@ -83,7 +81,7 @@ public function getRecentDivisions($number = 20, $houses = null) { } $where = 'WHERE ' . join(' AND ', $where); - if ( $this->member ) { + if ($this->member) { $select = "SELECT divisions.*, vote FROM divisions LEFT JOIN persondivisionvotes ON divisions.division_id=persondivisionvotes.division_id AND person_id=:person_id"; $params[':person_id'] = $this->member->person_id; @@ -96,7 +94,7 @@ public function getRecentDivisions($number = 20, $houses = null) { $params ); - $divisions = array(); + $divisions = []; foreach ($q as $division) { $data = $this->getParliamentDivisionDetails($division); @@ -122,7 +120,7 @@ public function getRecentDivisions($number = 20, $houses = null) { $divisions[] = $data; } - return array('divisions' => $divisions); + return ['divisions' => $divisions]; } /** @@ -157,10 +155,10 @@ public function getRecentDebatesWithDivisions($number = 20, $majors = null) { GROUP BY h.subsection_id ORDER BY h.hdate DESC, h.hpos DESC LIMIT :count", - array(':count' => $number) + [':count' => $number] ); - $debates = array(); + $debates = []; foreach ($q as $debate) { $debate_gid = fix_gid_from_db($debate['debate_gid']); $anchor = ''; @@ -168,7 +166,7 @@ public function getRecentDebatesWithDivisions($number = 20, $majors = null) { $anchor = '#g' . gid_to_anchor(fix_gid_from_db($debate['gid'])); } $url = new Url($hansardmajors[$debate['major']]['page']); - $url->insert(array('gid' => $debate_gid)); + $url->insert(['gid' => $debate_gid]); $debates[] = [ 'url' => $url->generate() . $anchor, 'title' => "$debate[section_body] : $debate[subsection_body]", @@ -180,9 +178,9 @@ public function getRecentDebatesWithDivisions($number = 20, $majors = null) { } public function getRecentDivisionsForPolicies($policies, $number = 20) { - $args = array(':number' => $number); + $args = [':number' => $number]; - $quoted = array(); + $quoted = []; foreach ($policies as $policy) { $quoted[] = $this->db->quote($policy); } @@ -198,9 +196,9 @@ public function getRecentDivisionsForPolicies($policies, $number = 20) { $args ); - $divisions = array(); + $divisions = []; foreach ($q as $row) { - $divisions[] = $this->getParliamentDivisionDetails($row); + $divisions[] = $this->getParliamentDivisionDetails($row); } return $divisions; @@ -222,8 +220,8 @@ public function getRecentDivisionsForPolicies($policies, $number = 20) { public function getMemberDivisionsForPolicy($policyID = null) { $where_extra = ''; - $args = array(':person_id' => $this->member->person_id); - if ( $policyID ) { + $args = [':person_id' => $this->member->person_id]; + if ($policyID) { $where_extra = 'AND policy_id = :policy_id'; $args[':policy_id'] = $policyID; } @@ -240,9 +238,9 @@ public function getMemberDivisionsForPolicy($policyID = null) { } public function getMemberDivisionDetails($strong_only = false) { - $args = array(':person_id' => $this->member->person_id); + $args = [':person_id' => $this->member->person_id]; - $policy_divisions = array(); + $policy_divisions = []; if ($strong_only) { $where_extra = "AND (policy_vote = 'no3' OR policy_vote = 'aye3')"; } else { @@ -259,54 +257,54 @@ public function getMemberDivisionDetails($strong_only = false) { ); foreach ($q as $row) { - $policy_id = $row['policy_id']; + $policy_id = $row['policy_id']; + + if (!array_key_exists($policy_id, $policy_divisions)) { + $summary = [ + 'max' => $row['latest'], + 'min' => $row['earliest'], + 'total' => $row['total'], + 'for' => 0, 'against' => 0, 'absent' => 0, 'both' => 0, 'tell' => 0, + ]; + + $policy_divisions[$policy_id] = $summary; + } - if (!array_key_exists($policy_id, $policy_divisions)) { - $summary = array( - 'max' => $row['latest'], - 'min' => $row['earliest'], - 'total' => $row['total'], - 'for' => 0, 'against' => 0, 'absent' => 0, 'both' => 0, 'tell' => 0 - ); + $summary = $policy_divisions[$policy_id]; + + $summary['total'] += $row['total']; + if ($summary['max'] < $row['latest']) { + $summary['max'] = $row['latest']; + } + if ($summary['min'] > $row['latest']) { + $summary['min'] = $row['latest']; + } + + $vote = $row['vote']; + $policy_vote = str_replace('3', '', $row['policy_vote']); + if ($vote == 'absent') { + $summary['absent'] += $row['total']; + } elseif ($vote == 'both') { + $summary['both'] += $row['total']; + } elseif (strpos($vote, 'tell') !== false) { + $summary['tell'] += $row['total']; + } elseif ($policy_vote == $vote) { + $summary['for'] += $row['total']; + } elseif ($policy_vote != $vote) { + $summary['against'] += $row['total']; + } $policy_divisions[$policy_id] = $summary; - } - - $summary = $policy_divisions[$policy_id]; - - $summary['total'] += $row['total']; - if ($summary['max'] < $row['latest']) { - $summary['max'] = $row['latest']; - } - if ($summary['min'] > $row['latest']) { - $summary['min'] = $row['latest']; - } - - $vote = $row['vote']; - $policy_vote = str_replace('3', '', $row['policy_vote']); - if ( $vote == 'absent' ) { - $summary['absent'] += $row['total']; - } else if ( $vote == 'both' ) { - $summary['both'] += $row['total']; - } else if ( strpos($vote, 'tell') !== false ) { - $summary['tell'] += $row['total']; - } else if ( $policy_vote == $vote ) { - $summary['for'] += $row['total']; - } else if ( $policy_vote != $vote ) { - $summary['against'] += $row['total']; - } - - $policy_divisions[$policy_id] = $summary; } // for each key in $policy_divisions, we want to add agreement information - + $policies_list = new \MySociety\TheyWorkForYou\Policies(); foreach ($policy_divisions as $policy_id => &$summary) { - $agreement_details = $this->member->member_agreements($policy_id, HOUSE_TYPE_COMMONS, $policies_list ); + $agreement_details = $this->member->member_agreements($policy_id, HOUSE_TYPE_COMMONS, $policies_list); $summary["agreements_for"] = 0; $summary["agreements_against"] = 0; - foreach ($agreement_details as $agreement){ + foreach ($agreement_details as $agreement) { if ($strong_only == true & $agreement["strength"] != "strong") { continue; } @@ -321,9 +319,9 @@ public function getMemberDivisionDetails($strong_only = false) { } public function getDivisionByGid($gid) { - $args = array( - ':gid' => $gid - ); + $args = [ + ':gid' => $gid, + ]; $q = $this->db->query("SELECT * FROM divisions WHERE gid = :gid", $args)->first(); if (!$q) { @@ -334,9 +332,9 @@ public function getDivisionByGid($gid) { } public function getDivisionResults($division_id) { - $args = array( - ':division_id' => $division_id - ); + $args = [ + ':division_id' => $division_id, + ]; $q = $this->db->query("SELECT * FROM divisions WHERE division_id = :division_id", $args)->first(); if (!$q) { @@ -367,19 +365,19 @@ private function _division_data($row) { $args ); - $votes = array( - 'yes_votes' => array(), - 'no_votes' => array(), - 'absent_votes' => array(), - 'both_votes' => array() - ); + $votes = [ + 'yes_votes' => [], + 'no_votes' => [], + 'absent_votes' => [], + 'both_votes' => [], + ]; - $party_breakdown = array( - 'yes_votes' => array(), - 'no_votes' => array(), - 'absent_votes' => array(), - 'both_votes' => array() - ); + $party_breakdown = [ + 'yes_votes' => [], + 'no_votes' => [], + 'absent_votes' => [], + 'both_votes' => [], + ]; # Sort Lords specially $data = $q->fetchAll(); @@ -388,14 +386,19 @@ private function _division_data($row) { } foreach ($data as $vote) { - $detail = array( - 'person_id' => $vote['person_id'], - 'name' => ucfirst(member_full_name($args['house'], $vote['title'], $vote['given_name'], - $vote['family_name'], $vote['lordofname'])), - 'party' => $vote['party'], - 'proxy' => false, - 'teller' => false - ); + $detail = [ + 'person_id' => $vote['person_id'], + 'name' => ucfirst(member_full_name( + $args['house'], + $vote['title'], + $vote['given_name'], + $vote['family_name'], + $vote['lordofname'] + )), + 'party' => $vote['party'], + 'proxy' => false, + 'teller' => false, + ]; if (strpos($vote['vote'], 'tell') !== false) { $detail['teller'] = true; @@ -410,34 +413,38 @@ private function _division_data($row) { [ ':person_id' => $vote['proxy'], ':division_date' => $row['division_date'] ] )->first(); $detail['proxy'] = ucfirst(member_full_name( - HOUSE_TYPE_COMMONS, $q['title'], $q['given_name'], - $q['family_name'], $q['lordofname'])); + HOUSE_TYPE_COMMONS, + $q['title'], + $q['given_name'], + $q['family_name'], + $q['lordofname'] + )); } if ($vote['vote'] == 'aye' or $vote['vote'] == 'tellaye') { - $votes['yes_votes'][] = $detail; - @$party_breakdown['yes_votes'][$detail['party']]++; - } else if ($vote['vote'] == 'no' or $vote['vote'] == 'tellno') { - $votes['no_votes'][] = $detail; - @$party_breakdown['no_votes'][$detail['party']]++; - } else if ($vote['vote'] == 'absent') { - $votes['absent_votes'][] = $detail; - @$party_breakdown['absent_votes'][$detail['party']]++; - } else if ($vote['vote'] == 'both') { - $votes['both_votes'][] = $detail; - @$party_breakdown['both_votes'][$detail['party']]++; + $votes['yes_votes'][] = $detail; + @$party_breakdown['yes_votes'][$detail['party']]++; + } elseif ($vote['vote'] == 'no' or $vote['vote'] == 'tellno') { + $votes['no_votes'][] = $detail; + @$party_breakdown['no_votes'][$detail['party']]++; + } elseif ($vote['vote'] == 'absent') { + $votes['absent_votes'][] = $detail; + @$party_breakdown['absent_votes'][$detail['party']]++; + } elseif ($vote['vote'] == 'both') { + $votes['both_votes'][] = $detail; + @$party_breakdown['both_votes'][$detail['party']]++; } } foreach ($votes as $vote => $count) { // array('yes_votes', 'no_votes', 'absent_votes', 'both_votes') as $vote) { - $votes[$vote . '_by_party'] = $votes[$vote]; - usort($votes[$vote . '_by_party'], function ($a, $b) { - return $a['party']>$b['party']; + $votes[$vote . '_by_party'] = $votes[$vote]; + usort($votes[$vote . '_by_party'], function ($a, $b) { + return $a['party'] > $b['party']; }); } foreach ($party_breakdown as $vote => $parties) { - $summary = array(); + $summary = []; foreach ($parties as $party => $count) { array_push($summary, "$party: $count"); } @@ -456,10 +463,10 @@ private function _division_data($row) { } public function getDivisionResultsForMember($division_id, $person_id) { - $args = array( + $args = [ ':division_id' => $division_id, - ':person_id' => $person_id - ); + ':person_id' => $person_id, + ]; $q = $this->db->query( "SELECT division_id, division_title, yes_text, no_text, division_date, division_number, gid, vote FROM divisions JOIN persondivisionvotes USING(division_id) @@ -481,23 +488,23 @@ public function generateSummary($votes) { $max = $votes['max']; $min = $votes['min']; - $actions = array( + $actions = [ $votes['for'] . ' ' . make_plural('vote', $votes['for']) . ' for', - $votes['against'] . ' ' . make_plural('vote', $votes['against']) . ' against' - ); + $votes['against'] . ' ' . make_plural('vote', $votes['against']) . ' against', + ]; - if ( $votes['agreements_for']) { + if ($votes['agreements_for']) { $actions[] = $votes['agreements_for'] . ' ' . make_plural('agreement', $votes['agreements_for']) . ' for'; } - if ( $votes['agreements_against']) { + if ($votes['agreements_against']) { $actions[] = $votes['agreements_against'] . ' ' . make_plural('agreement', $votes['agreements_against']) . ' against'; } - if ( $votes['both'] ) { + if ($votes['both']) { $actions[] = $votes['both'] . ' ' . make_plural('abstention', $votes['both']); } - if ( $votes['absent'] ) { + if ($votes['absent']) { $actions[] = $votes['absent'] . ' ' . make_plural('absence', $votes['absent']); } if ($max == $min) { @@ -535,7 +542,7 @@ public function getAllMemberDivisionsByPolicy() { * Returns an array of divisions */ public function getRecentMemberDivisions($number = 20) { - $args = array(':person_id' => $this->member->person_id, ':number' => $number); + $args = [':person_id' => $this->member->person_id, ':number' => $number]; $q = $this->db->query( "SELECT * FROM persondivisionvotes @@ -545,7 +552,7 @@ public function getRecentMemberDivisions($number = 20) { $args ); - $divisions = array(); + $divisions = []; foreach ($q as $row) { $divisions[] = $this->getDivisionDetails($row); } @@ -555,7 +562,7 @@ public function getRecentMemberDivisions($number = 20) { private function constructYesNoVoteDescription($direction, $title, $short_text) { $text = ' ' ; - if ( $short_text ) { + if ($short_text) { $text .= sprintf(gettext('voted %s'), $short_text); } else { $text .= sprintf(gettext('voted %s on %s'), $direction, $title); @@ -572,7 +579,7 @@ private function constructVoteDescription($vote, $yes_text, $no_text, $division_ * votes so we need to generate some text using the title of the division */ - switch ( strtolower($vote) ) { + switch (strtolower($vote)) { case 'yes': case 'aye': $description = $this->constructYesNoVoteDescription('yes', $division_title, $yes_text); @@ -602,7 +609,7 @@ private function getBasicDivisionDetails($row, $vote) { $yes_text = $row['yes_text']; $no_text = $row['no_text']; - $division = array( + $division = [ 'division_id' => $row['division_id'], 'date' => $row['division_date'], 'gid' => fix_gid_from_db($row['gid']), @@ -610,7 +617,7 @@ private function getBasicDivisionDetails($row, $vote) { 'text' => $this->constructVoteDescription($vote, $yes_text, $no_text, $row['division_title']), 'has_description' => $yes_text && $no_text, 'vote' => $vote, - ); + ]; if ($row['gid']) { $division['debate_url'] = $this->divisionUrlFromGid($row['gid']); @@ -628,22 +635,22 @@ private function getBasicDivisionDetails($row, $vote) { "SELECT policy_id, direction FROM policydivisions WHERE division_id = :division_id", - array(':division_id' => $row['division_id']) + [':division_id' => $row['division_id']] ); - $division['related_policies'] = array(); + $division['related_policies'] = []; $policy_lookup = $this->policies->getPolicies(); foreach ($q as $policy) { - $division['related_policies'][] = array( + $division['related_policies'][] = [ 'policy_id' => $policy['policy_id'], 'policy_title' => preg_replace('#]*>#', '', $policy_lookup[$policy['policy_id']]), 'direction' => $policy['direction'], - ); + ]; } if (array_key_exists('direction', $row)) { $division['direction'] = $row['direction']; - if ( strpos( $row['direction'], 'strong') !== false ) { + if (strpos($row['direction'], 'strong') !== false) { $division['strong'] = true; } else { $division['strong'] = false; @@ -670,7 +677,7 @@ private function getParliamentDivisionDetails($row) { } private function divisionsByPolicy($q) { - $policies = array(); + $policies = []; # iterate through each division, and adds it to an array of policies # if there is only one policy being queried, it will be an array of 1 @@ -678,19 +685,19 @@ private function divisionsByPolicy($q) { $policy_id = $row['policy_id']; # if this policy hasn't come up yet, create the key for it - if ( !array_key_exists($policy_id, $policies) ) { - $policies[$policy_id] = array( + if (!array_key_exists($policy_id, $policies)) { + $policies[$policy_id] = [ 'policy_id' => $policy_id, - 'divisions' => array() - ); + 'divisions' => [], + ]; $policies[$policy_id]['desc'] = $this->policies->getPolicies()[$policy_id]; $policies[$policy_id]['header'] = $this->policies->getPolicyDetails($policy_id); - if ( $this->positions ) { + if ($this->positions) { $policies[$policy_id]['position'] = $this->positions->positionsById[$policy_id]; } } - + $division = $this->getDivisionDetails($row); $policies[$policy_id]['divisions'][] = $division; @@ -704,13 +711,13 @@ private function divisionUrlFromGid($gid) { $gid = get_canonical_gid($gid); - $q = $this->db->query("SELECT gid, major FROM hansard WHERE epobject_id = ( SELECT subsection_id FROM hansard WHERE gid = :gid )", array( ':gid' => $gid ))->first(); + $q = $this->db->query("SELECT gid, major FROM hansard WHERE epobject_id = ( SELECT subsection_id FROM hansard WHERE gid = :gid )", [ ':gid' => $gid ])->first(); if (!$q) { return ''; } $parent_gid = fix_gid_from_db($q['gid']); $url = new Url($hansardmajors[$q['major']]['page']); - $url->insert(array('gid' => $parent_gid)); + $url->insert(['gid' => $parent_gid]); return $url->generate() . '#g' . gid_to_anchor(fix_gid_from_db($gid)); } } diff --git a/classes/EditQueue.php b/classes/EditQueue.php index bcd3ef0700..b93b567469 100644 --- a/classes/EditQueue.php +++ b/classes/EditQueue.php @@ -54,11 +54,10 @@ // [TODO] what happens when two things with the same name are in the editqueue? class EditQueue { - public $pending_count = ''; public function __construct() { - $this->db = new \ParlDB; + $this->db = new \ParlDB(); } public function add($data) { @@ -108,8 +107,8 @@ public function add($data) { } public function approve($data) { - // Approve items for inclusion - // Create new epobject and update the editqueue + // Approve items for inclusion + // Create new epobject and update the editqueue global $THEUSER; @@ -155,20 +154,22 @@ public function approve($data) { case EPTYPE_GLOSSARY: $previous_insert_id = $q->insert_id(); - $q = $this->db->query('INSERT INTO glossary + $q = $this->db->query( + 'INSERT INTO glossary (epobject_id, type, visible) VALUES (:id, :type, :enabled);', - array( - ':id' => $q->insert_id(), - ':type' => EPTYPE_GLOSSARY, - ':enabled' => 1, - )); + [ + ':id' => $q->insert_id(), + ':type' => EPTYPE_GLOSSARY, + ':enabled' => 1, + ] + ); // Again, no point carrying on if this fails, // so remove the previous entry if (!$q->success()) { print "glossary trouble!"; - $this->db->query('DELETE FROM epobject WHERE epobject_id=:id ;', array(':id' => $previous_insert_id)); + $this->db->query('DELETE FROM epobject WHERE epobject_id=:id ;', [':id' => $previous_insert_id]); return false; } break; @@ -178,20 +179,22 @@ public function approve($data) { // Then finally update the editqueue with // the new epobject id and approval details. - $q = $this->db->query('UPDATE editqueue + $q = $this->db->query( + 'UPDATE editqueue SET epobject_id_l=:current, editor_id=:editor, approved=:approved, decided=:timestamp WHERE edit_id=:approval_id ;', - array( - ':current' => $this->current_epobject_id, - ':editor' => addslashes($THEUSER->user_id()), - ':approved' => '1', - ':timestamp' => $timestamp, - ':approval_id' => $approval_id - )); + [ + ':current' => $this->current_epobject_id, + ':editor' => addslashes($THEUSER->user_id()), + ':approved' => '1', + ':timestamp' => $timestamp, + ':approval_id' => $approval_id, + ] + ); if (!$q->success()) { break; } else { @@ -199,7 +202,7 @@ public function approve($data) { // Scrub that one from the list of pending items - unset ($this->pending[$approval_id]); + unset($this->pending[$approval_id]); } } @@ -209,7 +212,7 @@ public function approve($data) { } public function decline($data) { - // Decline a list of term submissions from users + // Decline a list of term submissions from users global $THEUSER; @@ -237,7 +240,7 @@ public function decline($data) { break; } else { // Scrub that one from the list of pending items - unset ($this->pending[$decline_id]); + unset($this->pending[$decline_id]); } } @@ -248,9 +251,9 @@ public function decline($data) { } public function get_pending() { - // Fetch all pending editqueue items. - // Sets $this->pending and returns a body count. - // Return organised by type? - maybe not for the moment + // Fetch all pending editqueue items. + // Sets $this->pending and returns a body count. + // Return organised by type? - maybe not for the moment $q = $this->db->query("SELECT eq.edit_id, eq.user_id, u.firstname, u.lastname, eq.glossary_id, eq.title, eq.body, eq.submitted FROM editqueue AS eq, users AS u WHERE eq.user_id = u.user_id AND eq.approved IS NULL ORDER BY eq.submitted DESC;"); if ($q->success() && $q->rows()) { @@ -267,27 +270,27 @@ public function get_pending() { } public function display() { - // Print all our pending items out in a nice list or something - // Add links later for "approve, decline, refer" - // Just get the fucker working for now + // Print all our pending items out in a nice list or something + // Add links later for "approve, decline, refer" + // Just get the fucker working for now - $URL = new Url('admin_glossary_pending'); - $URL->reset(); - $form_link = $URL->generate('url'); + $URL = new Url('admin_glossary_pending'); + $URL->reset(); + $form_link = $URL->generate('url'); ?>
pending as $editqueue_id => $pender) { $URL = new Url('admin_glossary_pending'); - $URL->insert(array('approve' => $editqueue_id)); + $URL->insert(['approve' => $editqueue_id]); $approve_link = $URL->generate('url'); $URL = new Url('admin_glossary_pending'); - $URL->insert(array('modify' => $editqueue_id)); + $URL->insert(['modify' => $editqueue_id]); $modify_link = $URL->generate('url'); $URL = new Url('admin_glossary_pending'); - $URL->insert(array('decline' => $editqueue_id)); + $URL->insert(['decline' => $editqueue_id]); $decline_link = $URL->generate('url'); ?>
diff --git a/classes/FacebookLogin.php b/classes/FacebookLogin.php index 339359dbc3..216a55b085 100644 --- a/classes/FacebookLogin.php +++ b/classes/FacebookLogin.php @@ -39,7 +39,7 @@ public function getLoginURL() { public function handleFacebookRedirect() { $helper = $this->getFacebookObject()->getRedirectLoginHelper(); - $data = array('login_url' => $this->getLoginURL()); + $data = ['login_url' => $this->getLoginURL()]; try { $accessToken = $helper->getAccessToken(); @@ -54,7 +54,7 @@ public function handleFacebookRedirect() { $token = $this->checkAccessToken($accessToken); if ($token) { - return array('token' => $token); + return ['token' => $token]; } else { $data['error'] = 'Problem getting Facebook token'; return $data; @@ -127,7 +127,7 @@ public function createUser($accessToken, $user) { $first_name = array_shift($name_parts); $last_name = implode(' ', $name_parts); global $THEUSER; - $details = array( + $details = [ 'firstname' => $first_name, 'lastname' => $last_name, 'email' => $user['email'], @@ -137,8 +137,8 @@ public function createUser($accessToken, $user) { 'password' => '', 'optin' => false, 'mp_alert' => false, - 'facebook_id' => $user['id'] - ); + 'facebook_id' => $user['id'], + ]; $added = $THEUSER->add($details, false); if ($added) { twfy_debug("THEUSER", "Added new user from facebook details " . $THEUSER->user_id()); @@ -155,7 +155,7 @@ public function updateUser($user) { $first_name = array_shift($name_parts); $last_name = implode(' ', $name_parts); - $details = array( + $details = [ 'firstname' => $first_name, 'lastname' => $last_name, 'email' => $user['email'], @@ -163,7 +163,7 @@ public function updateUser($user) { 'url' => $THEUSER->url(), 'optin' => $THEUSER->optin(), 'password' => '', - ); + ]; $THEUSER->update_self_no_confirm($details); } diff --git a/classes/Gid.php b/classes/Gid.php index f17f464b17..6878b0aab9 100644 --- a/classes/Gid.php +++ b/classes/Gid.php @@ -3,19 +3,18 @@ namespace MySociety\TheyWorkForYou; class Gid { - public $gid; private $db; public function __construct($gid) { $this->gid = $gid; - $this->db = new \ParlDB; + $this->db = new \ParlDB(); } public function checkForRedirect() { $q = $this->db->query( "SELECT gid_to FROM gidredirect WHERE gid_from = :gid", - array(':gid' => $this->gid) + [':gid' => $this->gid] )->first(); if (!$q) { @@ -25,7 +24,7 @@ public function checkForRedirect() { $gid = $q['gid_to']; $q = $this->db->query( "SELECT gid_to FROM gidredirect WHERE gid_from = :gid", - array(':gid' => $gid) + [':gid' => $gid] )->first(); } while ($q); return $gid; diff --git a/classes/GlossaryEditQueue.php b/classes/GlossaryEditQueue.php index 2c904761c9..6d84493a26 100644 --- a/classes/GlossaryEditQueue.php +++ b/classes/GlossaryEditQueue.php @@ -13,10 +13,9 @@ // Glossary overrides class GlossaryEditQueue extends EditQueue { - public function approve($data) { - // Approve items for inclusion - // Create new epobject and update the editqueue + // Approve items for inclusion + // Create new epobject and update the editqueue global $THEUSER; @@ -61,7 +60,7 @@ public function approve($data) { // the new epobject id and approval details. $q = $this->db->query("UPDATE editqueue SET - glossary_id='" . $this->current_epobject_id. "', + glossary_id='" . $this->current_epobject_id . "', editor_id='" . addslashes($THEUSER->user_id()) . "', approved='1', decided='" . $timestamp . "' @@ -70,7 +69,7 @@ public function approve($data) { break; } else { // Scrub that one from the list of pending items - unset ($this->pending[$approval_id]); + unset($this->pending[$approval_id]); } } diff --git a/classes/Hansard.php b/classes/Hansard.php index 13cf1802ca..1686740722 100644 --- a/classes/Hansard.php +++ b/classes/Hansard.php @@ -7,7 +7,6 @@ */ class Hansard extends \HANSARDLIST { - /** * Search * diff --git a/classes/Homepage.php b/classes/Homepage.php index 13aeda313b..b442bfd813 100644 --- a/classes/Homepage.php +++ b/classes/Homepage.php @@ -3,35 +3,34 @@ namespace MySociety\TheyWorkForYou; class Homepage { - private $db; protected $mp_house = 1; protected $cons_type = 'WMC'; protected $mp_url = 'yourmp'; protected $page = 'overview'; - protected $houses = array(1, 101); + protected $houses = [1, 101]; - protected $recent_types = array( - 'DEBATELIST' => array('recent_debates', 'debatesfront', 'Commons debates'), - 'LORDSDEBATELIST' => array('recent_debates', 'lordsdebatesfront', 'Lords debates'), - 'WHALLLIST' => array('recent_debates', 'whallfront', 'Westminster Hall debates'), - 'WMSLIST' => array('recent_wms', 'wmsfront', 'Written ministerial statements'), - 'WRANSLIST' => array('recent_wrans', 'wransfront', 'Written answers'), - 'StandingCommittee' => array('recent_pbc_debates', 'pbcfront', 'Public Bill committees') - ); + protected $recent_types = [ + 'DEBATELIST' => ['recent_debates', 'debatesfront', 'Commons debates'], + 'LORDSDEBATELIST' => ['recent_debates', 'lordsdebatesfront', 'Lords debates'], + 'WHALLLIST' => ['recent_debates', 'whallfront', 'Westminster Hall debates'], + 'WMSLIST' => ['recent_wms', 'wmsfront', 'Written ministerial statements'], + 'WRANSLIST' => ['recent_wrans', 'wransfront', 'Written answers'], + 'StandingCommittee' => ['recent_pbc_debates', 'pbcfront', 'Public Bill committees'], + ]; public function __construct() { - $this->db = new \ParlDB; + $this->db = new \ParlDB(); } public function display() { global $this_page; $this_page = $this->page; - $data = array(); + $data = []; - $common = new Common; + $common = new Common(); $dissolution = Dissolution::dates(); $data['debates'] = $this->getDebatesData(); @@ -52,7 +51,7 @@ public function display() { return $data; } - protected function getSearchBox(array $data): Search\SearchBox{ + protected function getSearchBox(array $data): Search\SearchBox { $search_box = new Search\SearchBox(); $search_box->homepage_panel_class = "panel--homepage--overall"; $search_box->homepage_subhead = ""; @@ -74,27 +73,27 @@ protected function getRegionalList() { } protected function getEditorialContent() { - $debatelist = new \DEBATELIST; - $featured = new Model\Featured; + $debatelist = new \DEBATELIST(); + $featured = new Model\Featured(); $gid = $featured->get_gid(); $gidCheck = new Gid($gid); $gid = $gidCheck->checkForRedirect(); - if ( $gid ) { + if ($gid) { $title = $featured->get_title(); $context = $featured->get_context(); $related = $featured->get_related(); $item = $this->getFeaturedDebate($gid, $title, $context, $related); } else { - $item = $debatelist->display('recent_debates', array('days' => 7, 'num' => 1), 'none'); - if ( isset($item['data']) && count($item['data']) ) { + $item = $debatelist->display('recent_debates', ['days' => 7, 'num' => 1], 'none'); + if (isset($item['data']) && count($item['data'])) { $item = $item['data'][0]; $more_url = new Url('debates'); $item['more_url'] = $more_url->generate(); $item['desc'] = 'Commons Debates'; - $item['related'] = array(); + $item['related'] = []; $item['featured'] = false; } else { - $item = array(); + $item = []; } } @@ -103,23 +102,23 @@ protected function getEditorialContent() { public function getFeaturedDebate($gid, $title, $context, $related) { if (strpos($gid, 'lords') !== false) { - $debatelist = new \LORDSDEBATELIST; + $debatelist = new \LORDSDEBATELIST(); } elseif (strpos($gid, 'westminhall') !== false) { - $debatelist = new \WHALLLIST; + $debatelist = new \WHALLLIST(); } else { - $debatelist = new \DEBATELIST; + $debatelist = new \DEBATELIST(); } - $item = $debatelist->display('featured_gid', array('gid' => $gid), 'none'); + $item = $debatelist->display('featured_gid', ['gid' => $gid], 'none'); $item = $item['data']; $item['headline'] = $title; $item['context'] = $context; $item['featured'] = true; - $related_debates = array(); - foreach ( $related as $related_gid ) { - if ( $related_gid ) { - $related_item = $debatelist->display('featured_gid', array('gid' => $related_gid), 'none'); + $related_debates = []; + foreach ($related as $related_gid) { + if ($related_gid) { + $related_item = $debatelist->display('featured_gid', ['gid' => $related_gid], 'none'); $related_debates[] = $related_item['data']; } } @@ -138,31 +137,31 @@ private function getRecentDivisions() { } protected function getURLs() { - $urls = array(); + $urls = []; return $urls; } protected function getDebatesData() { - $debates = array(); // holds the most recent data there is data for, indexed by type + $debates = []; // holds the most recent data there is data for, indexed by type - $recent_content = array(); + $recent_content = []; - foreach ( $this->recent_types as $class => $recent ) { + foreach ($this->recent_types as $class => $recent) { $class = "\\$class"; $instance = new $class(); $more_url = new Url($recent[1]); - if ( $recent[0] == 'recent_pbc_debates' ) { - $content = array( 'data' => $instance->display($recent[0], array('num' => 5), 'none') ); + if ($recent[0] == 'recent_pbc_debates') { + $content = [ 'data' => $instance->display($recent[0], ['num' => 5], 'none') ]; } else { - $content = $instance->display($recent[0], array('days' => 7, 'num' => 1), 'none'); - if ( isset($content['data']) && count($content['data']) ) { + $content = $instance->display($recent[0], ['days' => 7, 'num' => 1], 'none'); + if (isset($content['data']) && count($content['data'])) { $content = $content['data'][0]; } else { - $content = array(); + $content = []; } } - if ( $content ) { + if ($content) { $content['more_url'] = $more_url->generate(); $content['desc'] = $recent[2]; $recent_content[] = $content; diff --git a/classes/Member.php b/classes/Member.php index a2f6b86834..943afef938 100644 --- a/classes/Member.php +++ b/classes/Member.php @@ -12,7 +12,6 @@ */ class Member extends \MEMBER { - /** * Is Dead * @@ -30,14 +29,14 @@ public function isDead() { // This member has left a house, and might be dead. See if they are. // Types of house to test for death. - $house_types = array( + $house_types = [ HOUSE_TYPE_COMMONS, HOUSE_TYPE_LORDS, HOUSE_TYPE_SCOTLAND, HOUSE_TYPE_NI, HOUSE_TYPE_WALES, HOUSE_TYPE_LONDON_ASSEMBLY, - ); + ]; foreach ($house_types as $house_type) { @@ -63,15 +62,15 @@ public function isDead() { public function cohortPartyComparisonDirection() { // Is this MP and their cohort compared against the // first or last party they have? - // By default, mirroring the partycohort query, - // this is the first party. + // By default, mirroring the partycohort query, + // this is the first party. // However, this is ignored for the Speaker, and additional // individual overrides can be added below. // This makes most sense when a party switch was a long time ago. - // As long as this person is in a cohort of 1 and has a unique set + // As long as this person is in a cohort of 1 and has a unique set // of memberships (which is likely for edge cases) it doesn't matter // that their original party is what is used when in the party cohort - // construction query. + // construction query. $person_id = $this->person_id(); @@ -82,7 +81,7 @@ public function cohortPartyComparisonDirection() { // MPs who have switched parties but should be compared against their // current party can go here. - $use_last_party = array(10172, 14031, 25873, 10218); + $use_last_party = [10172, 14031, 25873, 10218]; if (in_array($person_id, $use_last_party)) { $direction = "last"; @@ -91,23 +90,23 @@ public function cohortPartyComparisonDirection() { return $direction; } - public function currentPartyComparison(){ + public function currentPartyComparison() { # Simplify the current party when being compared to the original # Stops co-op and labour being seen as different $party = $this->party; - if ( $party == 'Labour/Co-operative' ) { + if ($party == 'Labour/Co-operative') { $party = 'Labour'; } return $party; } - public function cohortParty($house = HOUSE_TYPE_COMMONS){ + public function cohortParty($house = HOUSE_TYPE_COMMONS) { // The party being compared against for party comparison purposes // Unless specified by the condition in cohortPartyComparisonDirection // This is the first, not last, party a person has. $person_id = $this->person_id(); - $db = new \ParlDB; + $db = new \ParlDB(); $cohort_direction = $this->cohortPartyComparisonDirection(); @@ -122,11 +121,11 @@ public function cohortParty($house = HOUSE_TYPE_COMMONS){ and person_id = :person_id and party != '' order by entered_house - " . $direction, array(":house" => $house, - ":person_id" => $person_id))->first(); + " . $direction, [":house" => $house, + ":person_id" => $person_id])->first(); if ($row) { $party = $row["party"]; - if ( $party == 'Labour/Co-operative' ) { + if ($party == 'Labour/Co-operative') { $party = 'Labour'; } elseif ($party == 'Sinn Féin') { $party = 'Sinn Fein'; @@ -156,7 +155,7 @@ public function isNew($house = HOUSE_TYPE_COMMONS) { $now = new \DateTime(); $diff = $date_entered->diff($now); - if ( $diff->y == 0 && $diff->m <= 6 ) { + if ($diff->y == 0 && $diff->m <= 6) { return true; } } @@ -177,7 +176,7 @@ public function getEntryDate($house = HOUSE_TYPE_COMMONS) { $entered_house = $this->entered_house($house); - if ( $entered_house ) { + if ($entered_house) { $date_entered = $entered_house['date']; } @@ -197,7 +196,7 @@ public function getLeftDate($house = HOUSE_TYPE_COMMONS) { $left_house = $this->left_house($house); - if ( $left_house ) { + if ($left_house) { $date_left = $left_house['date']; } @@ -225,9 +224,9 @@ public function image() { $is_lord = $this->house(HOUSE_TYPE_LORDS); if ($is_lord) { - list($image,$size) = Utility\Member::findMemberImage($this->person_id(), false, 'lord'); + [$image, $size] = Utility\Member::findMemberImage($this->person_id(), false, 'lord'); } else { - list($image,$size) = Utility\Member::findMemberImage($this->person_id(), false, true); + [$image, $size] = Utility\Member::findMemberImage($this->person_id(), false, true); } // We can determine if the image exists or not by testing if size is set @@ -237,11 +236,11 @@ public function image() { $exists = false; } - return array( + return [ 'url' => $image, 'size' => $size, - 'exists' => $exists - ); + 'exists' => $exists, + ]; } @@ -251,9 +250,9 @@ public function getMostRecentMembership() { usort( $departures, function ($a, $b) { - if ( $a['date'] == $b['date'] ) { + if ($a['date'] == $b['date']) { return 0; - } else if ( $a['date'] < $b['date'] ) { + } elseif ($a['date'] < $b['date']) { return -1; } else { return 1; @@ -284,14 +283,14 @@ function ($a, $b) { public function offices($include_only = null, $ignore_committees = false) { - $out = array(); + $out = []; if (array_key_exists('office', $this->extra_info())) { $office = $this->extra_info(); $office = $office['office']; foreach ($office as $row) { - if ( $officeObject = $this->getOfficeObject($include_only, $ignore_committees, $row) ) { + if ($officeObject = $this->getOfficeObject($include_only, $ignore_committees, $row)) { $out[] = $officeObject; } } @@ -309,7 +308,7 @@ private function getOfficeObject($include_only, $ignore_committees, $row) { return null; } - $officeObject = new Office; + $officeObject = new Office(); $officeObject->title = prettify_office($row['position'], $row['dept']); $officeObject->from_date = $row['from_date']; $officeObject->to_date = $row['to_date']; @@ -345,7 +344,7 @@ public function getOtherPartiesString() { if (!empty($this->other_parties) && $this->party != 'Speaker' && $this->party != 'Deputy Speaker') { $output = 'Party was '; - $other_parties = array(); + $other_parties = []; foreach ($this->other_parties as $r) { $other_parties[] = $r['from'] . ' until ' . format_date($r['date'], SHORTDATEFORMAT); } @@ -385,7 +384,7 @@ public function getOtherConstituenciesString() { * @return array An array of strings of when this member entered or left houses. */ public function getEnterLeaveStrings() { - $output = array(); + $output = []; $output[] = $this->entered_house_line(HOUSE_TYPE_LORDS, gettext('House of Lords')); @@ -430,7 +429,7 @@ public function getEnterLeaveStrings() { private function entered_house_line($house, $house_name) { if (isset($this->entered_house[$house]['date'])) { $string = ""; - if (strlen($this->entered_house[$house]['date_pretty'])==4) { + if (strlen($this->entered_house[$house]['date_pretty']) == 4) { $string .= sprintf(gettext("Entered the %s in %s"), $house_name, $this->entered_house[$house]['date_pretty']); } else { $string .= sprintf(gettext("Entered the %s on %s"), $house_name, $this->entered_house[$house]['date_pretty']); @@ -446,7 +445,7 @@ private function entered_house_line($house, $house_name) { private function left_house_line($house, $house_name) { if ($this->house($house) && !$this->current_member($house)) { $string = ""; - if (strlen($this->left_house[$house]['date_pretty'])==4) { + if (strlen($this->left_house[$house]['date_pretty']) == 4) { $string .= sprintf(gettext("Left the %s in %s"), $house_name, $this->left_house[$house]['date_pretty']); } else { $string .= sprintf(gettext("Left the %s on %s"), $house_name, $this->left_house[$house]['date_pretty']); @@ -460,15 +459,15 @@ private function left_house_line($house, $house_name) { } public function getPartyPolicyDiffs($partyCohort, $policiesList, $positions) { - $policy_diffs = array(); + $policy_diffs = []; $party_positions = $partyCohort->getAllPolicyPositions($policiesList); - if ( !$party_positions ) { + if (!$party_positions) { return $policy_diffs; } - foreach ( $positions->positionsById as $policy_id => $details ) { - if ( $details['has_strong'] && $details['score'] != -1 && isset($party_positions[$policy_id])) { + foreach ($positions->positionsById as $policy_id => $details) { + if ($details['has_strong'] && $details['score'] != -1 && isset($party_positions[$policy_id])) { $mp_score = $details['score']; $party_position = $party_positions[$policy_id]; $party_score = $party_position['score']; @@ -493,25 +492,25 @@ public function getPartyPolicyDiffs($partyCohort, $policiesList, $positions) { } } - uasort($policy_diffs, function($a, $b) { + uasort($policy_diffs, function ($a, $b) { return $b['score_difference'] - $a['score_difference']; }); return $policy_diffs; } - private function calculatePolicyDiffScore( $mp_score, $party_score ) { + private function calculatePolicyDiffScore($mp_score, $party_score) { $score_diff = abs($mp_score - $party_score); // if they are on opposite sides of mixture of for and against if ( - ( $mp_score < 0.4 && $party_score > 0.6 ) || - ( $mp_score > 0.6 && $party_score < 0.4 ) + ($mp_score < 0.4 && $party_score > 0.6) || + ($mp_score > 0.6 && $party_score < 0.4) ) { $score_diff += 2; - // if on is mixture of for and against and one is for/against - } else if ( - ( $mp_score > 0.4 && $mp_score < 0.6 && ( $party_score > 0.6 || $party_score < 0.4 ) ) || - ( $party_score > 0.4 && $party_score < 0.6 && ( $mp_score > 0.6 || $mp_score < 0.4 ) ) + // if on is mixture of for and against and one is for/against + } elseif ( + ($mp_score > 0.4 && $mp_score < 0.6 && ($party_score > 0.6 || $party_score < 0.4)) || + ($party_score > 0.4 && $party_score < 0.6 && ($mp_score > 0.6 || $mp_score < 0.4)) ) { $score_diff += 1; } @@ -520,11 +519,11 @@ private function calculatePolicyDiffScore( $mp_score, $party_score ) { } public static function getRegionalList($postcode, $house, $type) { - $db = new \ParlDB; + $db = new \ParlDB(); - $mreg = array(); + $mreg = []; $constituencies = \MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituencies($postcode); - if ( isset($constituencies[$type]) ) { + if (isset($constituencies[$type])) { $cons_name = $constituencies[$type]; $query_base = "SELECT member.person_id, title, lordofname, given_name, family_name, constituency, house FROM member, person_names @@ -535,29 +534,31 @@ public static function getRegionalList($postcode, $house, $type) { AND house = :house AND left_house >= start_date AND left_house <= end_date"; - $q = $db->query("$query_base AND left_reason = 'still_in_office'", - array( + $q = $db->query( + "$query_base AND left_reason = 'still_in_office'", + [ ':house' => $house, - ':cons_name' => $cons_name - ) + ':cons_name' => $cons_name, + ] ); - if ( !$q->rows() && ($dissolution = Dissolution::db()) ) { - $q = $db->query("$query_base AND $dissolution[query]", - array( + if (!$q->rows() && ($dissolution = Dissolution::db())) { + $q = $db->query( + "$query_base AND $dissolution[query]", + [ ':house' => $house, ':cons_name' => $cons_name, - ) + $dissolution['params'] + ] + $dissolution['params'] ); } foreach ($q as $row) { $name = member_full_name($house, $row['title'], $row['given_name'], $row['family_name'], $row['lordofname']); - $mreg[] = array( + $mreg[] = [ 'person_id' => $row['person_id'], 'name' => $name, 'house' => $row['house'], - 'constituency' => gettext($row['constituency']) - ); + 'constituency' => gettext($row['constituency']), + ]; } } @@ -565,7 +566,7 @@ public static function getRegionalList($postcode, $house, $type) { } public static function getRepNameForHouse($house) { - switch ( $house ) { + switch ($house) { case HOUSE_TYPE_COMMONS: $name = 'MP'; break; diff --git a/classes/MemberException.php b/classes/MemberException.php index 6da5d3f844..be6eb78e3f 100644 --- a/classes/MemberException.php +++ b/classes/MemberException.php @@ -8,6 +8,4 @@ * For when something has gone wrong identifying a member. */ -class MemberException extends \Exception { - -} +class MemberException extends \Exception {} diff --git a/classes/Memcache.php b/classes/Memcache.php index e78f9b47ba..5d29ce80cc 100644 --- a/classes/Memcache.php +++ b/classes/Memcache.php @@ -9,16 +9,15 @@ namespace MySociety\TheyWorkForYou; class Memcache { - - static $memcache; + public static $memcache; public function __construct() { if (!self::$memcache) { if (class_exists('\Memcached')) { - self::$memcache = new \Memcached; + self::$memcache = new \Memcached(); self::$memcache->addServer(OPTION_TWFY_MEMCACHED_HOST, OPTION_TWFY_MEMCACHED_PORT); } elseif (class_exists('\Memcache')) { - self::$memcache = new \Memcache; + self::$memcache = new \Memcache(); self::$memcache->connect(OPTION_TWFY_MEMCACHED_HOST, OPTION_TWFY_MEMCACHED_PORT); } } @@ -29,9 +28,9 @@ public function set($key, $value, $timeout = 3600) { return; } if (class_exists('\Memcached')) { - self::$memcache->set(OPTION_TWFY_DB_NAME.':'.$key, $value, $timeout); + self::$memcache->set(OPTION_TWFY_DB_NAME . ':' . $key, $value, $timeout); } else { - self::$memcache->set(OPTION_TWFY_DB_NAME.':'.$key, $value, MEMCACHE_COMPRESSED, $timeout); + self::$memcache->set(OPTION_TWFY_DB_NAME . ':' . $key, $value, MEMCACHE_COMPRESSED, $timeout); } } @@ -39,9 +38,9 @@ public function get($key) { // see http://php.net/manual/en/memcache.get.php#112056 for explanation of this $was_found = false; if (class_exists('\Memcached')) { - $value = self::$memcache->get(OPTION_TWFY_DB_NAME.':'.$key, null, $was_found); + $value = self::$memcache->get(OPTION_TWFY_DB_NAME . ':' . $key, null, $was_found); } elseif (class_exists('\Memcache')) { - $value = self::$memcache->get(OPTION_TWFY_DB_NAME.':'.$key, $was_found); + $value = self::$memcache->get(OPTION_TWFY_DB_NAME . ':' . $key, $was_found); } if ($was_found === false) { return false; // mmmmm diff --git a/classes/Model/AnnouncementManagement.php b/classes/Model/AnnouncementManagement.php index 8f4bd31ed3..6c77066b7f 100644 --- a/classes/Model/AnnouncementManagement.php +++ b/classes/Model/AnnouncementManagement.php @@ -7,8 +7,7 @@ namespace MySociety\TheyWorkForYou\Model; -function is_valid_item($item) -{ +function is_valid_item($item) { // used in an array sort to filter out invalid items // set default language @@ -45,8 +44,7 @@ function is_valid_item($item) $end_time > date("Y-m-d\TH:i:s"); } -function select_based_on_weight($items) -{ +function select_based_on_weight($items) { # banners have a weight attribute, which is the probability of being selected # the higher the weight, the higher the probability $total_weight = 0; @@ -65,8 +63,7 @@ function select_based_on_weight($items) } } -class AnnouncementManagement -{ +class AnnouncementManagement { // Multi-purpose announcement storage system // Builds on previous banner system, but extends to // other locations for announcements @@ -80,14 +77,12 @@ class AnnouncementManagement */ private $mem; - public function __construct() - { + public function __construct() { $this->db = new \ParlDB(); $this->mem = new \MySociety\TheyWorkForYou\Memcache(); } - public function get_text($editorial_option) - { + public function get_text($editorial_option) { $text = $this->mem->get($editorial_option); if ($text === false) { @@ -110,8 +105,7 @@ public function get_text($editorial_option) return $text; } - public function set_text($text, $editorial_option) - { + public function set_text($text, $editorial_option) { $q = $this->db->query( "REPLACE INTO editorial set item = :editorial_option, value = :announcement_text", [ @@ -130,8 +124,7 @@ public function set_text($text, $editorial_option) return false; } - public function set_json($text, $editorial_option) - { + public function set_json($text, $editorial_option) { // check text is valid json $json_obj = json_decode($text); @@ -142,8 +135,7 @@ public function set_json($text, $editorial_option) return $this->set_text($text, $editorial_option); } - private function get_json($editorial_option) - { + private function get_json($editorial_option) { // for debugging, can use json files instead of db $use_json_file = false; @@ -163,8 +155,7 @@ private function get_json($editorial_option) return $json_obj; } - public function get_random_valid_banner() - { + public function get_random_valid_banner() { // get banners stored in json $banners = $this->get_json("banner"); @@ -185,8 +176,7 @@ public function get_random_valid_banner() return select_based_on_weight($banners); } - public function get_random_valid_item($location) - { + public function get_random_valid_item($location) { // get announcements stored in json $items = $this->get_json("announcements"); @@ -212,4 +202,3 @@ public function get_random_valid_item($location) return select_based_on_weight($items); } } -?> diff --git a/classes/Model/Featured.php b/classes/Model/Featured.php index 3d975282dc..a70e108975 100644 --- a/classes/Model/Featured.php +++ b/classes/Model/Featured.php @@ -8,14 +8,13 @@ namespace MySociety\TheyWorkForYou\Model; class Featured { - /** * DB handle */ private $db; public function __construct() { - $this->db = new \ParlDB; + $this->db = new \ParlDB(); } public function get_title() { @@ -57,14 +56,14 @@ private function _get($key) { $q = $this->db->query( "SELECT value FROM editorial WHERE item = :key", - array( - ':key' => $key - ) + [ + ':key' => $key, + ] )->first(); if ($q) { $text = $q['value']; - if ( trim($text) == '' ) { + if (trim($text) == '') { $text = null; } } @@ -73,32 +72,34 @@ private function _get($key) { } private function _set($key, $value) { - if ( trim($value) == '' ) { + if (trim($value) == '') { $value = null; } $check_q = $this->db->query( "SELECT value FROM editorial WHERE item = :key", - array( - ':key' => $key - ) + [ + ':key' => $key, + ] ); - if ( $check_q->rows() ) { - $set_q = $this->db->query("UPDATE editorial set value = :value WHERE item = :key", - array( + if ($check_q->rows()) { + $set_q = $this->db->query( + "UPDATE editorial set value = :value WHERE item = :key", + [ ':key' => $key, - ':value' => $value - ) + ':value' => $value, + ] ); } else { - $set_q = $this->db->query("INSERT INTO editorial (item, value ) VALUES (:key, :value)", - array( + $set_q = $this->db->query( + "INSERT INTO editorial (item, value ) VALUES (:key, :value)", + [ ':key' => $key, - ':value' => $value - ) + ':value' => $value, + ] ); } - if ( $set_q->success() ) { + if ($set_q->success()) { return true; } return false; diff --git a/classes/Office.php b/classes/Office.php index e2e879d1d5..f4f1f335c1 100644 --- a/classes/Office.php +++ b/classes/Office.php @@ -12,7 +12,6 @@ */ class Office { - public $title; public $from_date; public $to_date; @@ -27,7 +26,7 @@ class Office { */ public function __toString() { - if (isset ($this->title)) { + if (isset($this->title)) { return (string) $this->title; } else { return 'Unnamed Office'; @@ -70,7 +69,7 @@ public function pretty_dates() { if ($this->source == 'chgpages/privsec' && $this->from_date == '2005-11-10') { $output .= 'before '; } - $output .= format_date($this->from_date,SHORTDATEFORMAT) . ' '; + $output .= format_date($this->from_date, SHORTDATEFORMAT) . ' '; } $output .= 'to '; diff --git a/classes/Party.php b/classes/Party.php index 7cf55bc7bb..dcc264a6ff 100644 --- a/classes/Party.php +++ b/classes/Party.php @@ -12,7 +12,6 @@ */ class Party { - public $name; private $db; @@ -20,11 +19,11 @@ class Party { public function __construct($name) { // treat Labour and Labour/Co-operative the same as that's how // people view them and it'll confuse the results otherwise - if ( $name == 'Labour/Co-operative' ) { + if ($name == 'Labour/Co-operative') { $name = 'Labour'; } $this->name = $name; - $this->db = new \ParlDB; + $this->db = new \ParlDB(); } public function getCurrentMemberCount($house) { @@ -42,11 +41,11 @@ public function getCurrentMemberCount($house) { AND house = :house AND entered_house <= :date AND left_house >= :date", - array( + [ ':party' => $this->name, ':house' => $house, ':date' => $date, - ) + ] )->first(); if ($member_count) { $num_members = $member_count['num_members']; @@ -57,13 +56,13 @@ public function getCurrentMemberCount($house) { } public static function getParties() { - $db = new \ParlDB; + $db = new \ParlDB(); $party_list = $db->query( "SELECT DISTINCT party FROM member WHERE party <> ''" ); - $parties = array(); + $parties = []; foreach ($party_list as $row) { $party = $row['party']; if ( diff --git a/classes/PartyCohort.php b/classes/PartyCohort.php index d599c928a7..98d6b1f4b8 100644 --- a/classes/PartyCohort.php +++ b/classes/PartyCohort.php @@ -12,25 +12,22 @@ * Party */ -class PartyCohort -{ +class PartyCohort { private $db; private $party; private $hash; - public function __construct($person_id, $party) - { + public function __construct($person_id, $party) { // treat Labour and Labour/Co-operative the same as that's how // people view them and it'll confuse the results otherwise $this->party = $party; $this->hash = "$person_id-$party"; - $this->db = new \ParlDB; + $this->db = new \ParlDB(); } - public function getAllPolicyPositions($policies) - { - $positions = array(); + public function getAllPolicyPositions($policies) { + $positions = []; $party = $this->party; if ($party == 'Independent') { @@ -51,8 +48,7 @@ public function getAllPolicyPositions($policies) return $positions; } - public function policy_position($policy_id) - { + public function policy_position($policy_id) { $position = $this->db->query( "SELECT score, divisions, date_min, date_max FROM partypolicy @@ -60,10 +56,10 @@ public function policy_position($policy_id) party = :party AND house = 1 AND policy_id = :policy_id", - array( + [ ':party' => $this->hash, - ':policy_id' => $policy_id - ) + ':policy_id' => $policy_id, + ] )->first(); if ($position) { diff --git a/classes/People.php b/classes/People.php index 5ed382ff23..943612a548 100644 --- a/classes/People.php +++ b/classes/People.php @@ -12,7 +12,6 @@ */ class People { - public $type; public $rep_name; public $rep_plural; @@ -32,18 +31,18 @@ protected function getRegionalReps($user) { return $user->getRegionalReps($this->reg_cons_type, $this->house); } - public function getData($args = array()) { + public function getData($args = []) { $data = $this->_get_data_by_group($args); $user = new User(); - if ( $reps = $this->getRegionalReps($user) ) { + if ($reps = $this->getRegionalReps($user)) { $data['reps'] = $reps; } $data['mp_data'] = $user->getRep($this->cons_type, $this->house); $data['data'] = $this->addImagesToData($data['data']); $data['urls'] = $this->addUrlsToData(); - $data['order'] = isset($args['order']) ? $args['order'] : 'l'; + $data['order'] = $args['order'] ?? 'l'; $data['rep_plural'] = $this->rep_plural; $data['rep_name'] = $this->rep_name; $data['type'] = $this->type; @@ -55,7 +54,7 @@ public function getData($args = array()) { } public function getArgs() { - $args = array(); + $args = []; if (get_http_var('f') == 'csv') { $args['f'] = 'csv'; @@ -71,15 +70,15 @@ public function getArgs() { $args['all'] = true; } - if ( $this->type == 'peers' ) { + if ($this->type == 'peers') { $args['order'] = 'name'; } $order = get_http_var('o'); - $orders = array( + $orders = [ 'n' => 'name', 'f' => 'given_name', 'l' => 'family_name', 'c' => 'constituency', 'p' => 'party', - ); + ]; if (array_key_exists($order, $orders)) { $args['order'] = $orders[$order]; } @@ -100,17 +99,17 @@ public function setMetaData($args) { } protected function getCSVHeaders() { - return array(gettext('Person ID'), gettext('Name'), gettext('Party'), gettext('Constituency'), gettext('URI')); + return [gettext('Person ID'), gettext('Name'), gettext('Party'), gettext('Constituency'), gettext('URI')]; } protected function getCSVRow($details) { - return array( + return [ $details['person_id'], $details['name'], $details['party'], $details['constituency'], - 'https://www.theyworkforyou.com/mp/' . $details['url'] - ); + 'https://www.theyworkforyou.com/mp/' . $details['url'], + ]; } public function sendAsCSV($data) { @@ -130,9 +129,9 @@ public function sendAsCSV($data) { } private function addImagesToData($data) { - $new_data = array(); - foreach ( $data as $pid => $details ) { - list($image, ) = Utility\Member::findMemberImage($pid, true, $this->subs_missing_image); + $new_data = []; + foreach ($data as $pid => $details) { + [$image, ] = Utility\Member::findMemberImage($pid, true, $this->subs_missing_image); $details['image'] = $image; $new_data[$pid] = $details; } @@ -143,28 +142,28 @@ private function addImagesToData($data) { private function addUrlsToData() { global $this_page; - $urls = array(); + $urls = []; $URL = new Url($this_page); $urls['plain'] = $URL->generate(); - $URL->insert(array( 'o' => 'n')); + $URL->insert([ 'o' => 'n']); $urls['by_name'] = $URL->generate(); - $URL->insert(array( 'o' => 'l')); + $URL->insert([ 'o' => 'l']); $urls['by_last'] = $URL->generate(); - $URL->insert(array( 'o' => 'f')); + $URL->insert([ 'o' => 'f']); $urls['by_first'] = $URL->generate(); - $URL->insert(array( 'o' => 'p')); + $URL->insert([ 'o' => 'p']); $urls['by_party'] = $URL->generate(); - $URL->insert(array( 'f' => 'csv')); - $URL->remove(array( 'o')); - if ( $date = get_http_var('date') ) { - $URL->insert(array('date' => $date)); + $URL->insert([ 'f' => 'csv']); + $URL->remove([ 'o']); + if ($date = get_http_var('date')) { + $URL->insert(['date' => $date]); } $urls['by_csv'] = $URL->generate(); @@ -176,7 +175,7 @@ private function _get_data_by_group($args) { $order = 'family_name'; $sqlorder = 'family_name, given_name'; - $params = array(); + $params = []; $query = 'SELECT distinct member.person_id, title, given_name, family_name, lordofname, constituency, party, left_reason '; $query .= 'FROM member JOIN person_names p ON p.person_id = member.person_id AND p.type = "name" '; if (isset($args['date'])) { @@ -206,7 +205,7 @@ private function _get_data_by_group($args) { $q = $this->db->query($query . "ORDER BY $sqlorder", $params); - $data = array(); + $data = []; foreach ($q as $row) { $p_id = $row['person_id']; if (!isset($data[$p_id])) { @@ -214,7 +213,7 @@ private function _get_data_by_group($args) { $constituency = $row['constituency'] ? gettext($row['constituency']) : ''; $party = $row['party'] ? gettext($row['party']) : ''; $url = make_member_url($name, $constituency, $this->house, $p_id); - $narray = array ( + $narray = [ 'person_id' => $p_id, 'given_name' => $row['given_name'], 'family_name' => $row['family_name'], @@ -224,7 +223,7 @@ private function _get_data_by_group($args) { 'constituency' => $constituency, 'party' => $party, 'left_reason' => $row['left_reason'], - ); + ]; $data[$p_id] = $narray; } } @@ -232,12 +231,12 @@ private function _get_data_by_group($args) { uasort($data, 'by_peer_name'); } - $data = array ( - 'info' => array ( - 'order' => $order - ), - 'data' => $data - ); + $data = [ + 'info' => [ + 'order' => $order, + ], + 'data' => $data, + ]; return $data; diff --git a/classes/People/LondonAssemblyMembers.php b/classes/People/LondonAssemblyMembers.php index 473d503a51..8386f121af 100644 --- a/classes/People/LondonAssemblyMembers.php +++ b/classes/People/LondonAssemblyMembers.php @@ -7,9 +7,7 @@ namespace MySociety\TheyWorkForYou\People; -class LondonAssemblyMembers extends \MySociety\TheyWorkForYou\People -{ - +class LondonAssemblyMembers extends \MySociety\TheyWorkForYou\People { public $type = 'london-assembly-members'; public $rep_name = 'London Assembly Member'; public $rep_plural = 'London Assembly Members'; diff --git a/classes/People/MLAs.php b/classes/People/MLAs.php index f9557c5d5c..56003610bc 100644 --- a/classes/People/MLAs.php +++ b/classes/People/MLAs.php @@ -8,7 +8,6 @@ namespace MySociety\TheyWorkForYou\People; class MLAs extends \MySociety\TheyWorkForYou\People { - public $type = 'mlas'; public $rep_name = 'MLA'; public $rep_plural = 'MLAs'; diff --git a/classes/People/MPs.php b/classes/People/MPs.php index fa9f6106fc..47d95d67b5 100644 --- a/classes/People/MPs.php +++ b/classes/People/MPs.php @@ -8,7 +8,6 @@ namespace MySociety\TheyWorkForYou\People; class MPs extends \MySociety\TheyWorkForYou\People { - public $type = 'mps'; public $rep_name = 'MP'; public $rep_plural = 'MPs'; @@ -20,17 +19,17 @@ protected function getRegionalReps($user) { } protected function getCSVHeaders() { - return array('Person ID', 'First name', 'Last name', 'Party', 'Constituency', 'URI'); + return ['Person ID', 'First name', 'Last name', 'Party', 'Constituency', 'URI']; } protected function getCSVRow($details) { - return array( + return [ $details['person_id'], $details['given_name'], $details['family_name'], $details['party'], $details['constituency'], - 'https://www.theyworkforyou.com/mp/' . $details['url'] - ); + 'https://www.theyworkforyou.com/mp/' . $details['url'], + ]; } } diff --git a/classes/People/MSPs.php b/classes/People/MSPs.php index 814d041f8c..567e9b982b 100644 --- a/classes/People/MSPs.php +++ b/classes/People/MSPs.php @@ -8,7 +8,6 @@ namespace MySociety\TheyWorkForYou\People; class MSPs extends \MySociety\TheyWorkForYou\People { - public $type = 'msps'; public $rep_name = 'MSP'; public $rep_plural = 'MSPs'; diff --git a/classes/People/MSs.php b/classes/People/MSs.php index 392913dc82..9c0076f468 100644 --- a/classes/People/MSs.php +++ b/classes/People/MSs.php @@ -8,7 +8,6 @@ namespace MySociety\TheyWorkForYou\People; class MSs extends \MySociety\TheyWorkForYou\People { - public $type = 'mss'; public $house = HOUSE_TYPE_WALES; public $cons_type = 'WAC'; @@ -25,4 +24,3 @@ public function __construct() { parent::__construct(); } } - diff --git a/classes/People/Peers.php b/classes/People/Peers.php index a9fb9d7842..453e401579 100644 --- a/classes/People/Peers.php +++ b/classes/People/Peers.php @@ -8,7 +8,6 @@ namespace MySociety\TheyWorkForYou\People; class Peers extends \MySociety\TheyWorkForYou\People { - public $type = 'peers'; public $rep_name = 'Member of the House of Lords'; public $rep_plural = 'Members of the House of Lords'; @@ -20,15 +19,15 @@ protected function getRegionalReps($user) { } protected function getCSVHeaders() { - return array('Person ID', 'Name', 'Party', 'URI'); + return ['Person ID', 'Name', 'Party', 'URI']; } protected function getCSVRow($details) { - return array( + return [ $details['person_id'], $details['name'], $details['party'], - 'https://www.theyworkforyou.com/peer/' . $details['url'] - ); + 'https://www.theyworkforyou.com/peer/' . $details['url'], + ]; } } diff --git a/classes/Policies.php b/classes/Policies.php index bca4fb1df4..966b02f202 100644 --- a/classes/Policies.php +++ b/classes/Policies.php @@ -14,12 +14,11 @@ */ class Policies { - - private $commons_only = array( + private $commons_only = [ 811, 826, 1053, - ); + ]; # policies where votes affected by covid voting restrictions protected $covid_affected = [1136, 6860]; @@ -34,22 +33,22 @@ class Policies { private array $policies; /** - * @var array $sets - key-value pair of a set slug to an array of policy IDs + * @var array $sets - key-value pair of a set slug to an array of policy IDs * in that set. * e.g. "foreignpolicy": ["975", "984"[] */ private array $sets; /** - * @var array $set_descs - key-value pairs of a set slug to a description + * @var array $set_descs - key-value pairs of a set slug to a description * of that set. * e.g. "foreignpolicy": "Foreign Policy" */ private array $set_descs; /** - * @var array $all_policy_agreements - key-value pair of a policy ID to - * an array of + * @var array $all_policy_agreements - key-value pair of a policy ID to + * an array of * agreements links. * e.g. "1030": [{ * "division_name": "Approval of SI setting 2050 Net Zero target date", @@ -64,7 +63,7 @@ class Policies { public array $all_policy_agreements; public function __construct($policy_id = null) { - $this->db = new \ParlDB; + $this->db = new \ParlDB(); if (defined('TESTING') && TESTING == true) { $policy_data = json_decode(file_get_contents(dirname(__FILE__) . '/../tests/policies.json'), true); @@ -77,11 +76,11 @@ public function __construct($policy_id = null) { $this->all_policy_agreements = $policy_data['agreements'] ?? []; - if ( $policy_id ) { + if ($policy_id) { $this->policy_id = $policy_id; - $this->policies = array( - $policy_id => $this->policies[$policy_id] - ); + $this->policies = [ + $policy_id => $this->policies[$policy_id], + ]; } } @@ -109,13 +108,13 @@ public function getSetDescriptions() { * @return array Array of policies in the form `[ {id} , {text} ]` */ public function getPoliciesData() { - $out = array(); + $out = []; foreach ($this->policies as $policy_id => $policy_text) { - $out[] = array( + $out[] = [ 'id' => $policy_id, 'text' => $policy_text, - 'commons_only'=> in_array($policy_id, $this->commons_only), - ); + 'commons_only' => in_array($policy_id, $this->commons_only), + ]; } return $out; } @@ -149,22 +148,19 @@ public function shuffle() { public function limitToSet($set) { // Sanity check the set exists - if (isset($this->sets[$set])) - { - $out = array(); + if (isset($this->sets[$set])) { + $out = []; // Reassemble the new policies list based on the set. - foreach ($this->sets[$set] as $set_policy) - { - if (isset($this->policies[$set_policy])) - { + foreach ($this->sets[$set] as $set_policy) { + if (isset($this->policies[$set_policy])) { $out[$set_policy] = $this->policies[$set_policy]; } else { // if we've limited the policies to a single one then we only // want to complain here if we're looking for that policy and // it does not exist. Otherwise, if the single policy isn't in // the set we want to return an empty set - if ( !isset($this->policy_id) || $set_policy == $this->policy_id ) { - throw new \Exception ('Policy ' . $set_policy . ' in set "' . $set . '" does not exist.'); + if (!isset($this->policy_id) || $set_policy == $this->policy_id) { + throw new \Exception('Policy ' . $set_policy . ' in set "' . $set . '" does not exist.'); } } } @@ -175,33 +171,33 @@ public function limitToSet($set) { return $new_policies->shuffle(); } else { - throw new \Exception ('Policy set "' . $set . '" does not exist.'); + throw new \Exception('Policy set "' . $set . '" does not exist.'); } } public function limitToArray($policies) { - $out = array(); - // Reassemble the new policies list based on the set. - foreach ($policies as $policy) { - if (isset($this->policies[$policy])) { - $out[$policy] = $this->policies[$policy]; - } - } - - $new_policies = new self(); - $new_policies->policies = $out; - - return $new_policies; + $out = []; + // Reassemble the new policies list based on the set. + foreach ($policies as $policy) { + if (isset($this->policies[$policy])) { + $out[$policy] = $this->policies[$policy]; + } + } + + $new_policies = new self(); + $new_policies->policies = $out; + + return $new_policies; } public function getPolicyDetails($policyID) { $q = $this->db->query( "SELECT policy_id, title, description, image, image_attrib, image_license, image_license_url, image_source FROM policies WHERE policy_id = :policy_id", - array(':policy_id' => $policyID) + [':policy_id' => $policyID] )->first(); - $props = array( + $props = [ 'policy_id' => $q['policy_id'], 'title' => $q['title'], // remove full stops from the end of descriptions. Some of them have them and @@ -211,12 +207,12 @@ public function getPolicyDetails($policyID) { 'image_license' => '', 'image_attribution' => '', 'image_source' => '', - 'image_license_url' => '' - ); + 'image_license_url' => '', + ]; $image = $q['image']; - if ( $image && file_exists(BASEDIR . '/' . $image)) { + if ($image && file_exists(BASEDIR . '/' . $image)) { $props['image'] = $image; $props['image_license'] = $q['image_license']; $props['image_attribution'] = $q['image_attrib']; diff --git a/classes/PolicyPositions.php b/classes/PolicyPositions.php index 8286f498e9..a034b1036b 100644 --- a/classes/PolicyPositions.php +++ b/classes/PolicyPositions.php @@ -15,7 +15,6 @@ */ class PolicyPositions { - /** * Member */ @@ -40,9 +39,9 @@ class PolicyPositions { * Array of positions held by the member. */ - public $positions = array(); + public $positions = []; - public $positionsById = array(); + public $positionsById = []; /** * 'Since' String @@ -62,14 +61,13 @@ class PolicyPositions { * @param int $limit The number of policies to limit the list to. */ - public function __construct(Policies $policies, Member $member, $options = array()) - { + public function __construct(Policies $policies, Member $member, $options = []) { $this->policies = $policies; $this->member = $member; - $this->summaries = isset($options['summaries']) ? $options['summaries'] : array(); + $this->summaries = $options['summaries'] ?? []; $this->divisions = new \MySociety\TheyWorkForYou\Divisions($member); - $limit = isset($options['limit']) ? $options['limit'] : null; + $limit = $options['limit'] ?? null; // Do the actual getting of positions $this->getMemberPolicyPositions($limit); @@ -83,7 +81,7 @@ public function __construct(Policies $policies, Member $member, $options = array * @param int $limit The number of results to limit the output to. */ - private function getMemberPolicyPositions ($limit = null) { + private function getMemberPolicyPositions($limit = null) { // Make sure member info has actually been set. if (count($this->member->extra_info) === 0) { @@ -104,7 +102,7 @@ private function getMemberPolicyPositions ($limit = null) { // Set the current policy count to 0 $i = 0; - $this->positions = array(); + $this->positions = []; // Loop around all the policies. foreach ($policies as $policy) { @@ -124,35 +122,35 @@ private function getMemberPolicyPositions ($limit = null) { continue; } - $votes_summary = array_key_exists($policy['id'], $this->summaries) ? $this->summaries[$policy['id']] : array(); + $votes_summary = array_key_exists($policy['id'], $this->summaries) ? $this->summaries[$policy['id']] : []; $dream_info = $this->displayDreamComparison($policy['id'], $policy['text'], $votes_summary); // don't return votes where they haven't voted on a strong division // if we're limiting the number of votes - if ( $limit && !empty($dream_info) && !$dream_info['has_strong'] ) { + if ($limit && !empty($dream_info) && !$dream_info['has_strong']) { continue; } // Make sure the dream actually exists if (!empty($dream_info)) { $summary = $votes_summary ? $this->divisions->generateSummary($votes_summary) : ''; - $this->positions[] = array( + $this->positions[] = [ 'policy_id' => $policy['id'], 'policy' => $policy['text'], 'desc' => $dream_info['full_sentence'], 'has_strong' => $dream_info['has_strong'], 'position' => $dream_info['position'], - 'summary' => $summary - ); - $this->positionsById[$policy['id']] = array( + 'summary' => $summary, + ]; + $this->positionsById[$policy['id']] = [ 'policy_id' => $policy['id'], 'policy' => $policy['text'], 'desc' => $dream_info['full_sentence'], 'position' => $dream_info['position'], 'has_strong' => $dream_info['has_strong'], 'score' => $dream_info['score'], - 'summary' => $summary - ); + 'summary' => $summary, + ]; $i++; } } @@ -183,7 +181,7 @@ private function getMemberPolicyPositions ($limit = null) { */ private function displayDreamComparison($dreamid, $policy_description, $votes_summary) { - $out = array(); + $out = []; $extra_info = $this->member->extra_info(); @@ -208,14 +206,13 @@ private function displayDreamComparison($dreamid, $policy_description, $votes_su $has_strong = 1; } $full_sentence = $consistency . ' ' . $policy_description; - $out = array( 'full_sentence' => $full_sentence, 'score' => $dmpscore, 'position' => $consistency, 'has_strong' => $has_strong ); + $out = [ 'full_sentence' => $full_sentence, 'score' => $dmpscore, 'position' => $consistency, 'has_strong' => $has_strong ]; } return $out; } - private function generateSinceString() - { + private function generateSinceString() { $member_houses = $this->member->houses(); $entered_house = $this->member->entered_house(); @@ -239,7 +236,7 @@ private function generateSinceString() # If not current MP/Lord, but current MLA/MSP, need to say voting record is when MP if (!$current_member[HOUSE_TYPE_COMMONS] and !$current_member[HOUSE_TYPE_LORDS] and - ( $current_member[HOUSE_TYPE_SCOTLAND] or $current_member[HOUSE_TYPE_NI] ) + ($current_member[HOUSE_TYPE_SCOTLAND] or $current_member[HOUSE_TYPE_NI]) ) { $since .= ' whilst an MP'; } @@ -248,23 +245,22 @@ private function generateSinceString() } } - private function generateMoreLinksString() - { + private function generateMoreLinksString() { $extra_info = $this->member->extra_info; // Links to full record at Guardian and Public Whip - $record = array(); + $record = []; if (isset($extra_info['guardian_howtheyvoted'])) { $record[] = 'well-known issues (from the Guardian)'; } if ( - ( isset($extra_info['public_whip_division_attendance']) and - $extra_info['public_whip_division_attendance'] != 'n/a' ) + (isset($extra_info['public_whip_division_attendance']) and + $extra_info['public_whip_division_attendance'] != 'n/a') or - ( isset($extra_info['Lpublic_whip_division_attendance']) and - $extra_info['Lpublic_whip_division_attendance'] != 'n/a' ) + (isset($extra_info['Lpublic_whip_division_attendance']) and + $extra_info['Lpublic_whip_division_attendance'] != 'n/a') ) { $record[] = 'data, $data); - if ( isset($page_errors) ) { + if (isset($page_errors)) { $data['page_errors'] = $page_errors; } @@ -62,7 +59,7 @@ public static function output($template, $data = array(), $template_only = false $data['footer_links'] = $footer->data; # banner text - $announcement_manager = new Model\AnnouncementManagement; + $announcement_manager = new Model\AnnouncementManagement(); $data['random_banner'] = $announcement_manager->get_random_valid_banner(); $data = self::addCommonURLs($data); @@ -86,15 +83,15 @@ public static function output($template, $data = array(), $template_only = false } private static function addCommonURLs($data) { - $urls = array(); - if ( isset($data['urls']) ) { + $urls = []; + if (isset($data['urls'])) { $urls = $data['urls']; } - $common_urls = array('search', 'alert'); + $common_urls = ['search', 'alert']; - foreach ( $common_urls as $path ) { - if (!isset($urls[$path]) ) { + foreach ($common_urls as $path) { + if (!isset($urls[$path])) { $url = new Url($path); $urls[$path] = $url->generate(); } diff --git a/classes/Renderer/Footer.php b/classes/Renderer/Footer.php index 319ece628c..2418b762f9 100644 --- a/classes/Renderer/Footer.php +++ b/classes/Renderer/Footer.php @@ -9,15 +9,13 @@ * for use in header and footer. */ -class Footer -{ - +class Footer { public $data; - private $about_links = array ('help', 'about', 'linktous', 'news', 'privacy'); - private $assemblies_links = array('hansard', 'sp_home', 'wales_home', 'ni_home', 'london_home'); - private $international_links = array('australia', 'ireland', 'mzalendo'); - private $tech_links = array('code', 'api', 'data', 'devmailinglist', 'contact'); + private $about_links = ['help', 'about', 'linktous', 'news', 'privacy']; + private $assemblies_links = ['hansard', 'sp_home', 'wales_home', 'ni_home', 'london_home']; + private $international_links = ['australia', 'ireland', 'mzalendo']; + private $tech_links = ['code', 'api', 'data', 'devmailinglist', 'contact']; /* @@ -26,12 +24,12 @@ class Footer * Populates $data with array of array of links in the footer */ public function __construct() { - $this->data = array(); + $this->data = []; - $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); } /** @@ -43,7 +41,7 @@ public function __construct() { private function get_menu_links($pages) { global $DATA, $this_page; - $links = array(); + $links = []; foreach ($pages as $page) { @@ -65,19 +63,19 @@ private function get_menu_links($pages) { //make the link if ($page == $this_page) { - $links[] = array( + $links[] = [ 'href' => '#', 'title' => '', 'classes' => '', - 'text' => $title - ); + 'text' => $title, + ]; } else { - $links[] = array( + $links[] = [ 'href' => $url, 'title' => $tooltip, 'classes' => '', - 'text' => $title - ); + 'text' => $title, + ]; } } diff --git a/classes/Renderer/Header.php b/classes/Renderer/Header.php index 0e1d83c458..809d4a12eb 100644 --- a/classes/Renderer/Header.php +++ b/classes/Renderer/Header.php @@ -8,9 +8,7 @@ * Prepares variables for inclusion in a template header. */ -class Header -{ - +class Header { public $nav_highlights; public $data; @@ -18,7 +16,7 @@ class Header private $keywords_title; public function __construct() { - $this->data = array(); + $this->data = []; $this->get_page_url(); $this->get_page_title(); @@ -125,16 +123,16 @@ private function get_page_keywords() { private function get_header_links() { global $this_page; - $this->data['header_links'] = array(); + $this->data['header_links'] = []; if ($this_page != 'overview') { $URL = new \MySociety\TheyWorkForYou\Url('overview'); - $this->data['header_links'][] = array( + $this->data['header_links'][] = [ 'rel' => 'start', 'title' => 'Home', - 'href' => $URL->generate() - ); + 'href' => $URL->generate(), + ]; } } @@ -144,7 +142,7 @@ private function generate_next_prev_link($nextprev, $linktype) { if (isset($nextprev[$linktype]) && isset($nextprev[$linktype]['url'])) { if (isset($nextprev[$linktype]['body'])) { - $linktitle = _htmlentities( trim_characters($nextprev[$linktype]['body'], 0, 40) ); + $linktitle = _htmlentities(trim_characters($nextprev[$linktype]['body'], 0, 40)); if (isset($nextprev[$linktype]['speaker']) && count($nextprev[$linktype]['speaker']) > 0) { $linktitle = $nextprev[$linktype]['speaker']['name'] . ': ' . $linktitle; @@ -154,11 +152,11 @@ private function generate_next_prev_link($nextprev, $linktype) { $linktitle = format_date($nextprev[$linktype]['hdate'], SHORTDATEFORMAT); } - $link = array( + $link = [ 'rel' => $linktype, 'title' => $linktitle, - 'href' => $nextprev[$linktype]['url'] - ); + 'href' => $nextprev[$linktype]['url'], + ]; } return $link; @@ -171,10 +169,10 @@ private function get_next_prev_links() { if ($nextprev) { // Four different kinds of back/forth links we might build. - $links = array ("first", "prev", "up", "next", "last"); + $links = ["first", "prev", "up", "next", "last"]; foreach ($links as $type) { - if ( $link = $this->generate_next_prev_link( $nextprev, $type ) ) { + if ($link = $this->generate_next_prev_link($nextprev, $type)) { $this->data['header_links'][] = $link; } @@ -209,7 +207,7 @@ private function get_menu_highlights() { } else { - $parents = array($parent); + $parents = [$parent]; $p = $parent; while ($p) { $p = $DATA->page_metadata($p, 'parent'); @@ -280,7 +278,7 @@ private function get_menu_highlights() { // in the top bar if ($this_page == "alert") { if ($pid = get_http_var('pid')) { - $person = new \MySociety\TheyWorkForYou\Member(array('person_id' => $pid)); + $person = new \MySociety\TheyWorkForYou\Member(['person_id' => $pid]); $membership = $person->getMostRecentMembership(); $parliament = $membership['house']; if ($parliament == 'ni') { @@ -295,12 +293,12 @@ private function get_menu_highlights() { } } - $this->nav_highlights = array( + $this->nav_highlights = [ 'top' => $top_highlight, 'bottom' => $bottom_highlight, 'top_selected' => $selected_top_link, 'section' => $section, - ); + ]; } private function get_top_and_bottom_links() { @@ -309,17 +307,17 @@ private function get_top_and_bottom_links() { // Page names mapping to those in metadata.php. // Links in the top menu, and the sublinks we see if // we're within that section. - $nav_items = array ( - array('home'), - array('hansard', 'mps', 'peers', 'alldebatesfront', 'wranswmsfront', 'pbc_front', 'divisions_recent_commons', 'divisions_recent_lords', 'calendar_summary'), - array('sp_home', 'spoverview', 'msps', 'spdebatesfront', 'divisions_recent_sp'), #'spwransfront' - array('ni_home', 'nioverview', 'mlas'), - array('wales_home', 'seneddoverview', 'mss', 'wales_debates', 'divisions_recent_wales'), - array('london_home', 'lmqsfront', 'london-assembly-members'), - ); - - $this->data['assembly_nav_links'] = array(); - $this->data['section_nav_links'] = array(); + $nav_items = [ + ['home'], + ['hansard', 'mps', 'peers', 'alldebatesfront', 'wranswmsfront', 'pbc_front', 'divisions_recent_commons', 'divisions_recent_lords', 'calendar_summary'], + ['sp_home', 'spoverview', 'msps', 'spdebatesfront', 'divisions_recent_sp'], #'spwransfront' + ['ni_home', 'nioverview', 'mlas'], + ['wales_home', 'seneddoverview', 'mss', 'wales_debates', 'divisions_recent_wales'], + ['london_home', 'lmqsfront', 'london-assembly-members'], + ]; + + $this->data['assembly_nav_links'] = []; + $this->data['section_nav_links'] = []; //get the top and bottom links foreach ($nav_items as $bottompages) { @@ -345,17 +343,17 @@ private function get_top_and_bottom_links() { // we need to escape back to the english site $URL = new \MySociety\TheyWorkForYou\Url($toppage); $url = $URL->generate(); - if (LANGUAGE == 'cy' && strpos($url, '/senedd/') === false ) { + if (LANGUAGE == 'cy' && strpos($url, '/senedd/') === false) { $url = "//" . DOMAIN . $url; } - $top_link = array( + $top_link = [ 'href' => $url, 'title' => $title, 'classes' => $class, - 'text' => $text - ); - if ($toppage != "london_home"){ + 'text' => $text, + ]; + if ($toppage != "london_home") { array_push($this->data['assembly_nav_links'], $top_link); } @@ -369,12 +367,12 @@ private function get_top_and_bottom_links() { // Where we're linking to. $URL = new \MySociety\TheyWorkForYou\Url($bottompage); $class = $bottompage == $this->nav_highlights['bottom'] ? 'on' : ''; - $this->data['section_nav_links'][] = array( + $this->data['section_nav_links'][] = [ 'href' => $URL->generate(), 'title' => $title, 'classes' => $class, - 'text' => $text - ); + 'text' => $text, + ]; } } } diff --git a/classes/Renderer/Markdown.php b/classes/Renderer/Markdown.php index 00ed6f33b5..4749659909 100644 --- a/classes/Renderer/Markdown.php +++ b/classes/Renderer/Markdown.php @@ -9,35 +9,33 @@ */ -function render_php($template_file) -{ +function render_php($template_file) { $path = INCLUDESPATH . 'easyparliament/templates/html/' . $template_file . '.php'; ob_start(); include($path); return ob_get_clean(); } -class Markdown -{ - public function markdown_document($this_page, $show_menu = true){ +class Markdown { + 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'; $Parsedown = new \Parsedown(); - + $text = file_get_contents($markdown_file); $html = $Parsedown->text($text); - + # title is the first h1 preg_match('/

([^<]+)<\/h1>/i', $html, $matches); - + $title = $matches[1]; - - $html = preg_replace_callback('/([^<]+)<\/h[1-3]>/i', function($matches) { + + $html = preg_replace_callback('/([^<]+)<\/h[1-3]>/i', function ($matches) { $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"; @@ -53,12 +51,12 @@ public function markdown_document($this_page, $show_menu = true){ $html = str_replace('{{ donate_box }}', render_php('donate/_stripe_donate'), $html); } - \MySociety\TheyWorkForYou\Renderer::output('static/markdown_template', array( + \MySociety\TheyWorkForYou\Renderer::output('static/markdown_template', [ 'html' => $html, 'this_page' => $this_page, 'page_title' => $title, 'show_menu' => $show_menu, - )); - + ]); + } } diff --git a/classes/Renderer/User.php b/classes/Renderer/User.php index 9493a4d3a9..c9f5a46821 100644 --- a/classes/Renderer/User.php +++ b/classes/Renderer/User.php @@ -6,8 +6,7 @@ * User data for headers */ -class User -{ +class User { public $data; private $user; @@ -21,12 +20,12 @@ public function __construct() { $this->user = $THEUSER; $this->pagedata = $DATA; $this->page = $this_page; - $this->data = array(); + $this->data = []; $this->setupNavLinks(); } private function setupNavLinks() { - $this->data['user_nav_links'] = array(); + $this->data['user_nav_links'] = []; // We may want to send the user back to this current page after they've // joined, logged out or logged in. So we put the URL in $returl. @@ -41,7 +40,7 @@ private function setupNavLinks() { } } - private function AddLangSwitcher(){ + private function AddLangSwitcher() { if (preg_match('#^(senedd|wales|ms(?!p))#', $this->page)) { $href = $_SERVER['REQUEST_URI']; if (LANGUAGE == 'cy') { @@ -55,12 +54,12 @@ private function AddLangSwitcher(){ $href = "//cy." . DOMAIN . $href; } } - $this->data['user_nav_links'][] = array( + $this->data['user_nav_links'][] = [ 'href' => $href, 'classes' => '', 'title' => '', 'text' => $text, - ); + ]; } } @@ -69,7 +68,7 @@ private function addLoggedInLinks() { $menudata = $this->pagedata->page_metadata('userviewself', 'menu'); $edittitle = $menudata['title']; $EDITURL = new \MySociety\TheyWorkForYou\Url('userviewself'); - if ($this->page == 'userviewself' || $this->page == 'useredit' ) { + if ($this->page == 'userviewself' || $this->page == 'useredit') { $editclass = 'on'; } else { $editclass = ''; @@ -78,11 +77,11 @@ private function addLoggedInLinks() { // The 'Log out' link. $menudata = $this->pagedata->page_metadata('userlogout', 'menu'); $logouttext = $menudata['text']; - $logouttitle= $menudata['title']; + $logouttitle = $menudata['title']; $LOGOUTURL = new \MySociety\TheyWorkForYou\Url('userlogout'); if ($this->page != 'userlogout') { - $LOGOUTURL->insert(array("ret"=>$this->returl)); + $LOGOUTURL->insert(["ret" => $this->returl]); $logoutclass = ''; } else { $logoutclass = 'on'; @@ -92,19 +91,19 @@ private function addLoggedInLinks() { $this->addRepLinks(); - $this->data['user_nav_links'][] = array( + $this->data['user_nav_links'][] = [ 'href' => $EDITURL->generate(), 'title' => $edittitle, 'classes' => $editclass, - 'text' => _htmlentities($username) - ); + 'text' => _htmlentities($username), + ]; - $this->data['user_nav_links'][] = array( + $this->data['user_nav_links'][] = [ 'href' => $LOGOUTURL->generate(), 'title' => $logouttitle, 'classes' => $logoutclass, - 'text' => $logouttext - ); + 'text' => $logouttext, + ]; $this->addContactLink(); $this->addDonateLink(); @@ -123,7 +122,7 @@ private function addLoggedOutLinks() { // We don't do this on the logout page, because then the user // will return straight to the logout page and be logged out // immediately! - $JOINURL->insert(array("ret"=>$this->returl)); + $JOINURL->insert(["ret" => $this->returl]); } $joinclass = ''; } else { @@ -145,26 +144,26 @@ private function addLoggedOutLinks() { // immediately! // And it's also silly if we're sent back to Change Password. // And the join page. - $LOGINURL->insert(array("ret"=>$this->returl)); + $LOGINURL->insert(["ret" => $this->returl]); } $loginclass = ''; } else { $loginclass = 'on'; } - $this->data['user_nav_links'][] = array( + $this->data['user_nav_links'][] = [ 'href' => $LOGINURL->generate(), 'title' => $logintitle, 'classes' => $loginclass, - 'text' => $logintext - ); + 'text' => $logintext, + ]; - $this->data['user_nav_links'][] = array( + $this->data['user_nav_links'][] = [ 'href' => $JOINURL->generate(), 'title' => $jointitle, 'classes' => $joinclass, - 'text' => $jointext - ); + 'text' => $jointext, + ]; $this->addRepLinks(); $this->addContactLink(); @@ -177,7 +176,7 @@ private function addRepLinks() { if ($this->user->postcode_is_set()) { $areas = \MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituencies($this->user->postcode()); - $items = array('yourmp'); + $items = ['yourmp']; if (isset($areas['SPC'])) { $items[] = 'yourmsp'; } elseif (isset($areas['NIE'])) { @@ -190,12 +189,12 @@ private function addRepLinks() { $menudata = $this->pagedata->page_metadata($item, 'menu'); $logintext = $menudata['text']; $URL = new \MySociety\TheyWorkForYou\Url($item); - $this->data['user_nav_links'][] = array( + $this->data['user_nav_links'][] = [ 'href' => $URL->generate(), 'title' => '', 'classes' => '', - 'text' => $logintext - ); + 'text' => $logintext, + ]; } } @@ -206,12 +205,12 @@ private function addContactLink() { $text = $menudata['text']; $title = $menudata['title']; $url = new \MySociety\TheyWorkForYou\Url('contact'); - $this->data['user_nav_links'][] = array( + $this->data['user_nav_links'][] = [ 'href' => $url->generate(), 'title' => $title, 'classes' => '', - 'text' => $text - ); + 'text' => $text, + ]; } private function addDonateLink() { @@ -222,12 +221,12 @@ private function addDonateLink() { $text = $menudata['text']; $title = $menudata['title']; $url = new \MySociety\TheyWorkForYou\Url('donate'); - $this->data['user_nav_links'][] = array( + $this->data['user_nav_links'][] = [ 'href' => $url->generate(), 'title' => $title, 'classes' => 'donate-button', - 'text' => $text - ); + 'text' => $text, + ]; } } diff --git a/classes/SPHomepage.php b/classes/SPHomepage.php index fe5abefd79..e11bada617 100644 --- a/classes/SPHomepage.php +++ b/classes/SPHomepage.php @@ -3,19 +3,18 @@ namespace MySociety\TheyWorkForYou; class SPHomepage extends Homepage { - protected $mp_house = 4; protected $cons_type = 'SPC'; protected $mp_url = 'yourmsp'; protected $page = 'spoverview'; - protected $houses = array(7); + protected $houses = [7]; - protected $recent_types = array( - 'SPLIST' => array('recent_debates', 'spdebatesfront', 'Scottish parliament debates'), - 'SPWRANSLIST' => array('recent_wrans', 'spwransfront', 'Written answers'), - ); + protected $recent_types = [ + 'SPLIST' => ['recent_debates', 'spdebatesfront', 'Scottish parliament debates'], + 'SPWRANSLIST' => ['recent_wrans', 'spwransfront', 'Written answers'], + ]; - protected function getSearchBox(array $data): Search\SearchBox{ + protected function getSearchBox(array $data): Search\SearchBox { $search_box = new Search\SearchBox(); $search_box->homepage_panel_class = "panel--homepage--scotland"; $search_box->homepage_subhead = "Scottish Parliament"; @@ -24,7 +23,7 @@ protected function getSearchBox(array $data): Search\SearchBox{ $search_box->quick_links = []; if (count($data["mp_data"])) { $regional_con = $data["regional"][0]["constituency"]; - $search_box->add_quick_link('Find out more about your MSPs for ' . $data["mp_data"]["constituency"] . ' (' . $regional_con . ')', '/postcode/?pc=' . $data["mp_data"]['postcode'], 'torso' ); + $search_box->add_quick_link('Find out more about your MSPs for ' . $data["mp_data"]["constituency"] . ' (' . $regional_con . ')', '/postcode/?pc=' . $data["mp_data"]['postcode'], 'torso'); } $search_box->add_quick_link('Create and manage email alerts', '/alert/', 'megaphone'); $search_box->add_quick_link(gettext('Subscribe to our newsletter'), '/about/#about-mysociety', 'mail'); @@ -34,21 +33,21 @@ protected function getSearchBox(array $data): Search\SearchBox{ } protected function getEditorialContent() { - $debatelist = new \SPLIST; - $item = $debatelist->display('recent_debates', array('days' => 7, 'num' => 1), 'none'); + $debatelist = new \SPLIST(); + $item = $debatelist->display('recent_debates', ['days' => 7, 'num' => 1], 'none'); $item = $item['data'][0]; $more_url = new Url('spdebatesfront'); $item['more_url'] = $more_url->generate(); $item['desc'] = 'Scottish Parliament debate'; - $item['related'] = array(); + $item['related'] = []; $item['featured'] = false; return $item; } protected function getURLs() { - $urls = array(); + $urls = []; $regional = new Url('msp'); $urls['regional'] = $regional->generate(); @@ -64,7 +63,7 @@ protected function getCalendarData() { protected function getRegionalList() { global $THEUSER; - $mreg = array(); + $mreg = []; if ($THEUSER->isloggedin() && $THEUSER->postcode() != '' || $THEUSER->postcode_is_set()) { return Member::getRegionalList($THEUSER->postcode, 4, 'SPE'); diff --git a/classes/Search.php b/classes/Search.php index fec5043f25..439939b987 100644 --- a/classes/Search.php +++ b/classes/Search.php @@ -1,10 +1,10 @@ searchstring = $argparser->construct_search_string(); $this->searchkeyword = $argparser->searchkeyword; - if ( !$this->searchstring ) { + if (!$this->searchstring) { $data = $this->get_form_params($data); $data['searchstring'] = ''; $data['template'] = 'search/results'; @@ -28,14 +28,14 @@ public function display() { $this->searchstring = filter_user_input($this->searchstring, 'strict'); $warnings = $this->validate_search_string(); - if ( $warnings ) { + if ($warnings) { $data['warnings'] = $warnings; $data['template'] = 'search/results'; $data['searchstring'] = $this->searchstring; $data = $this->get_form_params($data); return $data; } else { - if (get_http_var('o')=='p') { + if (get_http_var('o') == 'p') { $search = new Search\ByUsage(); $data = $search->search($this->searchstring); $data['template'] = 'search/by-person'; @@ -48,11 +48,11 @@ public function display() { $data['person_id'] = $argparser->person_id; if ($argparser->person_id) { - $MEMBER = new \MEMBER(array('person_id'=>$argparser->person_id)); + $MEMBER = new \MEMBER(['person_id' => $argparser->person_id]); $data['person_name'] = $MEMBER->full_name(); } - if ( isset($data['info']['spelling_correction']) ) { + if (isset($data['info']['spelling_correction'])) { $data['info']['spelling_correction_display'] = $this->prettifySearchString($data['info']['spelling_correction']); } @@ -131,16 +131,16 @@ private function prettify_search_section($section) { private function get_urls() { global $this_page; - $urls = array(); + $urls = []; $url = new Url($this_page); - $url->insert(array('o' => 'r')); + $url->insert(['o' => 'r']); $urls['relevance'] = $url->generate(); - $url->insert(array('o' => 'o')); + $url->insert(['o' => 'o']); $urls['oldest'] = $url->generate(); - $url->insert(array('o' => 'd')); + $url->insert(['o' => 'd']); $urls['newest'] = $url->generate(); - $url->insert(array('o' => 'p')); + $url->insert(['o' => 'p']); $urls['by-person'] = $url->generate(); return $urls; @@ -150,15 +150,15 @@ private function get_form_params($data) { $data['search_keyword'] = $this->searchkeyword; $is_adv = false; - foreach ( array('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] ) { + $data[$key] = get_http_var($var); + if ($data[$key]) { $is_adv = true; } } - if ( isset($data['search_section']) ) { + if (isset($data['search_section'])) { $data['search_section_pretty'] = $this->prettify_search_section($data['search_section']); } @@ -168,16 +168,16 @@ private function get_form_params($data) { private function set_wtt_options($data) { $data['wtt'] = ''; - if ( $wtt = get_http_var('wtt') ) { + if ($wtt = get_http_var('wtt')) { $data['wtt'] = $wtt; - if ( $wtt == 2 && $pid = get_http_var('pid') ) { + if ($wtt == 2 && $pid = get_http_var('pid')) { $data['pid'] = null; try { - $lord = new Member(array('person_id' => $pid, 'house' => 2)); - } catch ( MemberException $e ) { + $lord = new Member(['person_id' => $pid, 'house' => 2]); + } catch (MemberException $e) { return $data; } - if ( $lord->valid ) { + if ($lord->valid) { $data['pid'] = $pid; $data['wtt_lord_name'] = $lord->full_name(); } @@ -197,20 +197,20 @@ protected function get_search_url($params = true) { if (preg_match_all('#speaker:(\d+)#', $value, $m) == 1) { $person_id = $m[1][0]; $value = str_replace('speaker:' . $person_id, '', $value); - $url->insert(array('pid' => $person_id)); - } - $url->insert(array('q' => $value)); + $url->insert(['pid' => $person_id]); + } + $url->insert(['q' => $value]); } - if ( $params ) { - if ( get_http_var('house') ) { - $url->insert(array('house' => get_http_var('house'))); + if ($params) { + if (get_http_var('house')) { + $url->insert(['house' => get_http_var('house')]); } - if ( get_http_var('wtt') ) { - $url->insert(array('wtt' => get_http_var('wtt'))); + if (get_http_var('wtt')) { + $url->insert(['wtt' => get_http_var('wtt')]); } } else { - $url->remove(array('o', 'house')); + $url->remove(['o', 'house']); } return $url; @@ -220,7 +220,7 @@ private function set_page_title($data) { global $DATA, $this_page; $pagetitle = ''; - if ( isset($data['search_type']) && $data['search_type'] == 'person' ) { + if (isset($data['search_type']) && $data['search_type'] == 'person') { if (isset($data['wtt']) && $data['wtt'] > 0) { $pagetitle = 'League table of Lords who say ' . $data['pagetitle']; } else { diff --git a/classes/Search/ByUsage.php b/classes/Search/ByUsage.php index 71d12f84a3..529e14e8fe 100644 --- a/classes/Search/ByUsage.php +++ b/classes/Search/ByUsage.php @@ -1,10 +1,10 @@ $this->searchstring, 'p' => $pagenum, 'num' => get_http_var('num'), 'pop' => get_http_var('pop'), - 'o' => ($o=='d' || $o=='r' || $o=='o') ? $o : 'd', - ); + 'o' => ($o == 'd' || $o == 'r' || $o == 'o') ? $o : 'd', + ]; return $args; } @@ -28,14 +28,14 @@ private function get_first_page_data($args) { $cons = null; $glossary = null; - $mp_types = array(); + $mp_types = []; if ($args['p'] == 1 && $args['s'] && !preg_match('#[a-z]+:[a-z0-9]+#', $args['s'])) { $members = $this->find_members(); - list($cons, $mp_types) = $this->find_constituency($args); + [$cons, $mp_types] = $this->find_constituency($args); $glossary = $this->find_glossary_items($args); } - return array($members, $cons, $mp_types, $glossary); + return [$members, $cons, $mp_types, $glossary]; } public function search($searchstring) { @@ -55,25 +55,25 @@ public function search($searchstring) { } $sort_order = 'newest'; - if ( $args['o'] == 'o' ) { + if ($args['o'] == 'o') { $sort_order = 'oldest'; - } else if ( $args['o'] == 'r' ) { + } elseif ($args['o'] == 'r') { $sort_order = 'relevance'; } - list($members, $cons, $mp_types, $glossary) = $this->get_first_page_data($args); + [$members, $cons, $mp_types, $glossary] = $this->get_first_page_data($args); if (!defined('FRONT_END_SEARCH') || !FRONT_END_SEARCH) { - return array( - 'error' =>'Apologies, search has been turned off currently for performance reasons.' - ); + return [ + 'error' => 'Apologies, search has been turned off currently for performance reasons.', + ]; } if (!$SEARCHENGINE->valid) { - return array('error' => $SEARCHENGINE->error); + return ['error' => $SEARCHENGINE->error]; } else { $LIST = new \HANSARDLIST(); - $data = $LIST->display('search', $args , 'none'); + $data = $LIST->display('search', $args, 'none'); $data['search_type'] = 'normal'; $data['sort_order'] = $sort_order; $data['members'] = $members; @@ -93,63 +93,65 @@ private function find_constituency($args) { return false; } - list ($constituencies, ) = \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery($searchterm); + [$constituencies, ] = \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery($searchterm); $constituency = ""; - if (count($constituencies)==1) { + if (count($constituencies) == 1) { $constituency = $constituencies[0]; } - $cons = array(); - $mp_types = array( + $cons = []; + $mp_types = [ 'mp' => 0, - 'former' => 0 - ); + 'former' => 0, + ]; if ($constituency != '') { try { - // Got a match, display.... + // Got a match, display.... - $MEMBER = new \MySociety\TheyWorkForYou\Member(array('constituency'=>$constituency, 'house' => 1)); + $MEMBER = new \MySociety\TheyWorkForYou\Member(['constituency' => $constituency, 'house' => 1]); $cons[] = $MEMBER; - if ( $MEMBER->current_member(1) ) { + if ($MEMBER->current_member(1)) { $mp_types['mp']++; } else { $mp_types['former']++; } - } catch ( \MySociety\TheyWorkForYou\MemberException $e ) { - $cons = array(); + } catch (\MySociety\TheyWorkForYou\MemberException $e) { + $cons = []; } } elseif (count($constituencies)) { foreach ($constituencies as $constituency) { try { - $MEMBER = new \MySociety\TheyWorkForYou\Member(array('constituency'=>$constituency, 'house' => 1)); + $MEMBER = new \MySociety\TheyWorkForYou\Member(['constituency' => $constituency, 'house' => 1]); $cons[] = $MEMBER; - if ( $MEMBER->current_member(1) ) { + if ($MEMBER->current_member(1)) { $mp_types['mp']++; } else { $mp_types['former']++; } - } catch ( \MySociety\TheyWorkForYou\MemberException $e ) { + } catch (\MySociety\TheyWorkForYou\MemberException $e) { continue; } } } - return array($cons, $mp_types); + return [$cons, $mp_types]; } private function find_members() { $searchstring = trim(preg_replace('#-?[a-z]+:[a-z0-9]+#', '', $this->searchstring)); if (!$searchstring) { - return array(); + return []; } $members = \MySociety\TheyWorkForYou\Utility\Search::searchMemberDbLookup($searchstring); - $db = new \ParlDB; - $q = $db->query("SELECT person FROM moffice WHERE position LIKE :pos ORDER BY from_date DESC, moffice_id", - array('pos' => "%$searchstring%")); + $db = new \ParlDB(); + $q = $db->query( + "SELECT person FROM moffice WHERE position LIKE :pos ORDER BY from_date DESC, moffice_id", + ['pos' => "%$searchstring%"] + ); foreach ($q as $row) { $members[] = $row['person']; } @@ -158,7 +160,7 @@ private function find_members() { $members = array_unique($members); foreach ($members as $i => $pid) { - $member = new \MySociety\TheyWorkForYou\Member(array('person_id' => $pid)); + $member = new \MySociety\TheyWorkForYou\Member(['person_id' => $pid]); $members[$i] = $member; } return $members; @@ -166,40 +168,40 @@ private function find_members() { private function find_glossary_items($args) { $GLOSSARY = new \GLOSSARY($args); - $items = array(); + $items = []; if (isset($GLOSSARY->num_search_matches) && $GLOSSARY->num_search_matches >= 1) { $URL = new \MySociety\TheyWorkForYou\Url('glossary'); - $URL->insert(array('gl' => "")); + $URL->insert(['gl' => ""]); foreach ($GLOSSARY->search_matches as $glossary_id => $term) { - $URL->update(array("gl" => $glossary_id)); - $items[] = array( + $URL->update(["gl" => $glossary_id]); + $items[] = [ 'url' => $URL->generate(), 'term' => $term['title'], - 'body' => $term['body'] - ); + 'body' => $term['body'], + ]; } } return $items; } private function generate_pagination_links($data, $url, $first, $last) { - $links = array(); + $links = []; for ($n = $first; $n <= $last; $n++) { if ($n > 1) { - $url->insert(array('p'=>$n)); + $url->insert(['p' => $n]); } else { // No page number for the first page. - $url->remove(array('p')); + $url->remove(['p']); } - $link = array( + $link = [ 'url' => $url->generate(), 'page' => $n, - 'current' => ( $n == $data['page'] ) - ); + 'current' => ($n == $data['page']), + ]; $links[] = $link; } @@ -211,7 +213,7 @@ private function generate_pagination($data) { $total_results = $data['total_results']; $results_per_page = $data['results_per_page']; $page = $data['page']; - $pagelinks = array(); + $pagelinks = []; $URL = $this->get_search_url($data); @@ -239,30 +241,30 @@ private function generate_pagination($data) { $numlinks = $this->generate_pagination_links($data, $URL, $firstpage, $lastpage); $pagelinks['nums'] = $numlinks; - $pagelinks['first_result'] = $page == 1 ? 1 : ( ( $page - 1 ) * $results_per_page ) + 1; - $pagelinks['last_result'] = $page == $numpages ? $total_results : $pagelinks['first_result'] + ( $results_per_page - 1 ); + $pagelinks['first_result'] = $page == 1 ? 1 : (($page - 1) * $results_per_page) + 1; + $pagelinks['last_result'] = $page == $numpages ? $total_results : $pagelinks['first_result'] + ($results_per_page - 1); - if ( $page != 1 ) { + if ($page != 1) { $prev_page = $page - 1; - $URL->insert(array( 'p' => $prev_page ) ); - $pagelinks['prev'] = array( - 'url' => $URL->generate() - ); - $URL->insert(array( 'p' => 1 ) ); - $pagelinks['firstpage'] = array( - 'url' => $URL->generate() - ); + $URL->insert([ 'p' => $prev_page ]); + $pagelinks['prev'] = [ + 'url' => $URL->generate(), + ]; + $URL->insert([ 'p' => 1 ]); + $pagelinks['firstpage'] = [ + 'url' => $URL->generate(), + ]; } if ($page != $numpages) { $next_page = $page + 1; - $URL->insert(array( 'p' => $next_page ) ); - $pagelinks['next'] = array( - 'url' => $URL->generate() - ); - $URL->insert(array( 'p' => $numpages ) ); - $pagelinks['lastpage'] = array( - 'url' => $URL->generate() - ); + $URL->insert([ 'p' => $next_page ]); + $pagelinks['next'] = [ + 'url' => $URL->generate(), + ]; + $URL->insert([ 'p' => $numpages ]); + $pagelinks['lastpage'] = [ + 'url' => $URL->generate(), + ]; } } @@ -272,11 +274,11 @@ private function generate_pagination($data) { private function get_sidebar_links() { global $DATA, $SEARCHENGINE, $this_page; - $links = array(); + $links = []; $links['rss'] = $DATA->page_metadata($this_page, 'rss'); if ($SEARCHENGINE) { - $links['email'] = '/alert/?' . ($this->searchstring ? 'alertsearch='.urlencode($this->searchstring) : ''); + $links['email'] = '/alert/?' . ($this->searchstring ? 'alertsearch=' . urlencode($this->searchstring) : ''); $links['email_desc'] = $SEARCHENGINE->query_description_long(); } @@ -290,7 +292,7 @@ private function get_sidebar_links() { $search_engine = new \SEARCHENGINE($filter_ss); $links['email_section'] = $links['email']; $links['email_desc_section'] = $links['email_desc']; - $links['email'] = '/alert/?' . ($filter_ss ? 'alertsearch='.urlencode($filter_ss) : ''); + $links['email'] = '/alert/?' . ($filter_ss ? 'alertsearch=' . urlencode($filter_ss) : ''); $links['email_desc'] = $search_engine->query_description_long(); } diff --git a/classes/Search/ParseArgs.php b/classes/Search/ParseArgs.php index c9a3e134db..5a6c950755 100644 --- a/classes/Search/ParseArgs.php +++ b/classes/Search/ParseArgs.php @@ -1,10 +1,10 @@ homepage_panel_class = $homepage_panel_class; $this->homepage_subhead = $homepage_subhead; $this->homepage_desc = $homepage_desc; @@ -24,11 +23,8 @@ public function __construct(string $homepage_panel_class = '', $this->quick_links = $quick_links; } - public function add_quick_link(string $title, string $url, string $icon): void - { + public function add_quick_link(string $title, string $url, string $icon): void { $this->quick_links[] = ['title' => $title, 'url' => $url, 'icon' => $icon]; } } - -?> \ No newline at end of file diff --git a/classes/SectionView/DebatesView.php b/classes/SectionView/DebatesView.php index 726233b9ab..5cc51bd867 100644 --- a/classes/SectionView/DebatesView.php +++ b/classes/SectionView/DebatesView.php @@ -13,39 +13,39 @@ protected function display_front() { $this_page = "alldebatesfront"; - $DEBATELIST = new \DEBATELIST; - $debates = array(); - $debates['data'] = $DEBATELIST->display('biggest_debates', array('days'=>7, 'num'=>10), 'none'); - $args = array( 'months' => 1 ); + $DEBATELIST = new \DEBATELIST(); + $debates = []; + $debates['data'] = $DEBATELIST->display('biggest_debates', ['days' => 7, 'num' => 10], 'none'); + $args = [ 'months' => 1 ]; $debates['calendar'] = $DEBATELIST->display('calendar', $args, 'none'); $debates['rssurl'] = $DATA->page_metadata($this_page, 'rss'); $this_page = "whallfront"; - $whall = array(); + $whall = []; - $WHALLLIST = new \WHALLLIST; - $whall['data'] = $WHALLLIST->display('biggest_debates', array('days'=>7, 'num'=>10), 'none'); - $args = array( 'months' => 1 ); + $WHALLLIST = new \WHALLLIST(); + $whall['data'] = $WHALLLIST->display('biggest_debates', ['days' => 7, 'num' => 10], 'none'); + $args = [ 'months' => 1 ]; $whall['calendar'] = $WHALLLIST->display('calendar', $args, 'none'); $whall['rssurl'] = $DATA->page_metadata($this_page, 'rss'); $this_page = "lordsdebatesfront"; - $lords = array(); + $lords = []; - $LORDSDEBATELIST = new \LORDSDEBATELIST; - $lords['data'] = $LORDSDEBATELIST->display('biggest_debates', array('days'=>7, 'num'=>10), 'none'); - $args = array( 'months' => 1 ); + $LORDSDEBATELIST = new \LORDSDEBATELIST(); + $lords['data'] = $LORDSDEBATELIST->display('biggest_debates', ['days' => 7, 'num' => 10], 'none'); + $args = [ 'months' => 1 ]; $lords['calendar'] = $LORDSDEBATELIST->display('calendar', $args, 'none'); $lords['rssurl'] = $DATA->page_metadata($this_page, 'rss'); - $data = array( + $data = [ 'debates' => $debates, 'lords' => $lords, - 'whall' => $whall - ); + 'whall' => $whall, + ]; $data['template'] = 'section/index'; $this_page = "alldebatesfront"; @@ -54,10 +54,10 @@ protected function display_front() { } protected function getSearchSections() { - return array( - array( 'section' => 'debates', 'title' => 'House of Commons' ), - array( 'section' => 'lords', 'title' => 'House of Lords' ), - array( 'section' => 'whall', 'title' => 'Westminster Hall' ) - ); + return [ + [ 'section' => 'debates', 'title' => 'House of Commons' ], + [ 'section' => 'lords', 'title' => 'House of Lords' ], + [ 'section' => 'whall', 'title' => 'Westminster Hall' ], + ]; } } diff --git a/classes/SectionView/LondonView.php b/classes/SectionView/LondonView.php index 566c6f7174..f3aa4bca3a 100644 --- a/classes/SectionView/LondonView.php +++ b/classes/SectionView/LondonView.php @@ -7,11 +7,11 @@ class LondonView extends SectionView { protected $class = 'LMQLIST'; protected function front_content() { - return $this->list->display('recent_wrans', array('days'=>30, 'num'=>20), 'none'); + return $this->list->display('recent_wrans', ['days' => 30, 'num' => 20], 'none'); } protected function getViewUrls() { - $urls = array(); + $urls = []; $day = new \MySociety\TheyWorkForYou\Url('lmqs'); $urls['lmqsday'] = $day; $urls['day'] = $day; @@ -19,8 +19,8 @@ protected function getViewUrls() { } protected function getSearchSections() { - return array( - array( 'section' => 'lmqs', 'title' => 'Mayoral Questions' ) - ); + return [ + [ 'section' => 'lmqs', 'title' => 'Mayoral Questions' ], + ]; } } diff --git a/classes/SectionView/LordsView.php b/classes/SectionView/LordsView.php index 42d2a8c57c..f18e1927e7 100644 --- a/classes/SectionView/LordsView.php +++ b/classes/SectionView/LordsView.php @@ -7,6 +7,6 @@ class LordsView extends SectionView { protected $class = 'LORDSDEBATELIST'; protected function front_content() { - return $this->list->display('biggest_debates', array('days'=>7, 'num'=>20), 'none'); + return $this->list->display('biggest_debates', ['days' => 7, 'num' => 20], 'none'); } } diff --git a/classes/SectionView/NiView.php b/classes/SectionView/NiView.php index 965fd1b29d..3530f3f4a1 100644 --- a/classes/SectionView/NiView.php +++ b/classes/SectionView/NiView.php @@ -16,11 +16,11 @@ protected function display_front() { } protected function front_content() { - return $this->list->display('biggest_debates', array('days'=>30, 'num'=>20), 'none'); + return $this->list->display('biggest_debates', ['days' => 30, 'num' => 20], 'none'); } protected function getURLs($data) { - $urls = array(); + $urls = []; $day = new \MySociety\TheyWorkForYou\Url('nidebates'); $urls['niday'] = $day; @@ -31,43 +31,43 @@ protected function getURLs($data) { } protected function getSearchSections() { - return array( - array( 'section' => 'ni' ) - ); + return [ + [ 'section' => 'ni' ], + ]; } protected function display_front_ni() { global $this_page; $this_page = "nioverview"; - $data = array(); + $data = []; $data['popular_searches'] = null; $data['urls'] = $this->getURLs($data); - $DEBATELIST = new \NILIST; + $DEBATELIST = new \NILIST(); - $debates = $DEBATELIST->display('recent_debates', array('days' => 30, 'num' => 6), 'none'); + $debates = $DEBATELIST->display('recent_debates', ['days' => 30, 'num' => 6], 'none'); $MOREURL = new \MySociety\TheyWorkForYou\Url('nidebatesfront'); - $MOREURL->insert( array( 'more' => 1 ) ); + $MOREURL->insert([ 'more' => 1 ]); // this makes sure that we don't repeat this debate in the list below $random_debate = null; - if ( isset($debates['data']) && count($debates['data']) ) { + if (isset($debates['data']) && count($debates['data'])) { $random_debate = $debates['data'][0]; } - $recent = array(); - if ( isset($debates['data']) && count($debates['data']) ) { + $recent = []; + if (isset($debates['data']) && count($debates['data'])) { // at the start of a session there may be less than 6 // debates $max = 6; - if ( count($debates['data']) < 6 ) { + if (count($debates['data']) < 6) { $max = count($debates['data']); } - for ( $i = 1; $i < $max; $i++ ) { + for ($i = 1; $i < $max; $i++) { $debate = $debates['data'][$i]; $debate['desc'] = "Northern Ireland Assembly debates"; $debate['more_url'] = $MOREURL->generate(); @@ -75,17 +75,17 @@ protected function display_front_ni() { } } - $featured = array(); - if ( $random_debate ) { + $featured = []; + if ($random_debate) { $featured = $random_debate; $featured['more_url'] = $MOREURL->generate(); $featured['desc'] = 'Northern Ireland Assembly debate'; - $featured['related'] = array(); + $featured['related'] = []; $featured['featured'] = false; } $data['featured'] = $featured; - $data['debates'] = array( 'recent' => $recent); + $data['debates'] = [ 'recent' => $recent]; $data['regional'] = $this->getMLAList(); $data['search_box'] = $this->getSearchBox($data); @@ -93,8 +93,8 @@ protected function display_front_ni() { return $data; } - - protected function getSearchBox(array $data): \MySociety\TheyWorkForYou\Search\SearchBox{ + + protected function getSearchBox(array $data): \MySociety\TheyWorkForYou\Search\SearchBox { global $THEUSER; @@ -114,9 +114,9 @@ protected function getSearchBox(array $data): \MySociety\TheyWorkForYou\Search\S $constituency = $data["regional"][0]["constituency"]; $search_box->add_quick_link('Find out more about your MLAs for ' . $constituency, '/postcode/?pc=' . $postcode, 'torso'); } - $search_box->add_quick_link('Create and manage email alerts', '/alert/','megaphone'); + $search_box->add_quick_link('Create and manage email alerts', '/alert/', 'megaphone'); $search_box->add_quick_link(gettext('Subscribe to our newsletter'), '/about/#about-mysociety', 'mail'); - $search_box->add_quick_link('Donate to support our work', '/support-us/','heart'); + $search_box->add_quick_link('Donate to support our work', '/support-us/', 'heart'); $search_box->add_quick_link('Learn more about TheyWorkForYou', '/about/', 'magnifying-glass'); return $search_box; } @@ -124,7 +124,7 @@ protected function getSearchBox(array $data): \MySociety\TheyWorkForYou\Search\S protected function getMLAList() { global $THEUSER; - $mreg = array(); + $mreg = []; if ($THEUSER->isloggedin() && $THEUSER->postcode() != '' || $THEUSER->postcode_is_set()) { return \MySociety\TheyWorkForYou\Member::getRegionalList($THEUSER->postcode, 3, 'NIE'); } diff --git a/classes/SectionView/PbcView.php b/classes/SectionView/PbcView.php index 7b1ca79a76..e6d29076e7 100644 --- a/classes/SectionView/PbcView.php +++ b/classes/SectionView/PbcView.php @@ -33,10 +33,10 @@ protected function public_bill_committees() { $bill_id = null; if ($this->session && $this->bill) { $q = $this->list->db->query('select id,standingprefix from bills where title = :bill - and session = :session', array( + and session = :session', [ ':bill' => $this->bill, - ':session' => $this->session - ))->first(); + ':session' => $this->session, + ])->first(); if ($q) { $bill_id = $q['id']; $standingprefix = $q['standingprefix']; @@ -44,18 +44,18 @@ protected function public_bill_committees() { } if ($bill_id && $id) { - return $this->display_section_or_speech(array( + return $this->display_section_or_speech([ 'gid' => $standingprefix . $id, - )); + ]); } elseif ($bill_id) { # Display the page for a particular bill $this_page = 'pbc_bill'; - $args = array ( + $args = [ 'id' => $bill_id, 'title' => $this->bill, 'session' => $this->session, - ); - $data = array(); + ]; + $data = []; $data['content'] = $this->list->display('bill', $args, 'none'); $data['session'] = $this->session; $data['template'] = 'section/pbc_bill'; @@ -69,10 +69,10 @@ protected function public_bill_committees() { # Display the bills for a particular session $this_page = 'pbc_session'; $DATA->set_page_metadata($this_page, 'title', "Session $this->session"); - $args = array ( + $args = [ 'session' => $this->session, - ); - $data = array(); + ]; + $data = []; $data['rows'] = $this->list->display('session', $args, 'none'); $data['template'] = 'section/pbc_session'; $data['session'] = $this->session; @@ -83,30 +83,30 @@ protected function public_bill_committees() { } protected function getViewUrls() { - $urls = array(); + $urls = []; $day = new \MySociety\TheyWorkForYou\Url('pbc_front'); $urls['pbcday'] = $day; return $urls; } protected function getSearchSections() { - return array( - array( 'section' => 'pbc' ) - ); + return [ + [ 'section' => 'pbc' ], + ]; } protected function front_content() { - return $this->list->display( 'recent_pbc_debates', array( 'num' => 50 ), 'none' ); + return $this->list->display('recent_pbc_debates', [ 'num' => 50 ], 'none'); } protected function display_front() { global $DATA, $this_page; $this_page = 'pbc_front'; - $data = array(); + $data = []; $data['template'] = $this->index_template; - $content = array(); + $content = []; $content['data'] = $this->front_content(); $content['rssurl'] = $DATA->page_metadata($this_page, 'rss'); diff --git a/classes/SectionView/SectionView.php b/classes/SectionView/SectionView.php index 4d16afbe78..4c8bf97491 100644 --- a/classes/SectionView/SectionView.php +++ b/classes/SectionView/SectionView.php @@ -1,4 +1,5 @@ list = new $this->class(); } - list($country, $location, $assembly) = $this->getCountryDetails(); + [$country, $location, $assembly] = $this->getCountryDetails(); $this->location = $location; $this->assembly = $assembly; } @@ -38,7 +39,7 @@ public function display() { $data = $this->addCommonData($data); } elseif ($date = get_http_var('d')) { $data = $this->display_day($date); - if ( !isset($data['template']) ) { + if (!isset($data['template'])) { $data['template'] = 'section/day'; } $data = $this->addCommonData($data); @@ -46,7 +47,7 @@ public function display() { $data = $this->display_section_or_speech(); } else { $data = $this->display_front(); - if ( !isset($data['template']) ) { + if (!isset($data['template'])) { $data['template'] = 'section/recent'; } $data['search_sections'] = $this->getSearchSections(); @@ -62,16 +63,16 @@ public function display() { protected function addCommonData($data) { global $DATA, $this_page; - $common = new \MySociety\TheyWorkForYou\Common; + $common = new \MySociety\TheyWorkForYou\Common(); $data['urls'] = $this->getURLs($data); $data['popular_searches'] = []; #$common->getPopularSearches(); $data['recess_major'] = $this->getRecessMajor(); $nextprev = $DATA->page_metadata($this_page, 'nextprev'); - if ( isset($nextprev['next']['url']) ) { + if (isset($nextprev['next']['url'])) { $data['next'] = $nextprev['next']; } - if ( isset($nextprev['prev']['url']) ) { + if (isset($nextprev['prev']['url'])) { $data['prev'] = $nextprev['prev']; } @@ -80,7 +81,7 @@ protected function addCommonData($data) { if (!isset($data['title']) && $parent_page != '') { $data['title'] = $DATA->page_metadata($parent_page, 'title'); } - if ( $parent_page ) { + if ($parent_page) { $data['parent_title'] = $DATA->page_metadata($parent_page, 'title'); } @@ -92,11 +93,11 @@ protected function addCommonData($data) { protected function getURLs($data) { global $DATA, $this_page; - $urls = array(); + $urls = []; $urls = array_merge($urls, $this->getViewUrls()); - if ( isset($data['info']['page']) ) { + if (isset($data['info']['page'])) { $day = new \MySociety\TheyWorkForYou\Url($data['info']['page']); $urls['day'] = $day; } @@ -105,7 +106,7 @@ protected function getURLs($data) { } protected function getViewUrls() { - $urls = array(); + $urls = []; $day = new \MySociety\TheyWorkForYou\Url('debates'); $urls['debatesday'] = $day; $urls['day'] = $day; @@ -117,7 +118,7 @@ protected function getViewUrls() { } protected function getSearchSections() { - return array(); + return []; } protected function getRecessMajor() { @@ -140,7 +141,7 @@ protected function display_year($year) { $DATA->set_page_metadata($this_page, 'title', $year); } - $args = array ( 'year' => $year ); + $args = [ 'year' => $year ]; $data = $this->list->display('calendar', $args, 'none'); return $data; } @@ -148,18 +149,18 @@ protected function display_year($year) { protected function display_column($date, $column) { global $this_page; $this_page = $this->page_base; - $args = array( 'date' => $date, 'column' => $column ); + $args = [ 'date' => $date, 'column' => $column ]; $content = $this->list->display('column', $args, 'none'); - $data = array(); + $data = []; $data['column'] = $column; $URL = new \MySociety\TheyWorkForYou\Url($this->list->listpage); - $URL->insert(array('d' => $date)); + $URL->insert(['d' => $date]); $data['debate_day_link'] = $URL->generate(); $data['debate_day_human'] = format_date($date, LONGDATEFORMAT); $data['rows'] = $content; - $data['info'] = array('major' => $this->major, 'date' => $date); + $data['info'] = ['major' => $this->major, 'date' => $date]; $data['template'] = 'section/column'; return $data; @@ -168,26 +169,26 @@ protected function display_column($date, $column) { protected function display_day($date) { global $this_page; $this_page = $this->page_base . 'day'; - $args = array ( 'date' => get_http_var('d') ); + $args = [ 'date' => get_http_var('d') ]; $data = $this->list->display('date', $args, 'none'); - list($year, $month, $day) = explode('-', $date); - $args = array( 'year' => $year, 'month' => $month, 'day' => $day); + [$year, $month, $day] = explode('-', $date); + $args = [ 'year' => $year, 'month' => $month, 'day' => $day]; $calendar = $this->list->display('calendar', $args, 'none'); - if ( isset($calendar['years']) ) { + if (isset($calendar['years'])) { $data['calendar'] = $calendar['years']; } return $data; } - protected function display_section_or_speech($args = array()) { + protected function display_section_or_speech($args = []) { global $DATA, $this_page, $THEUSER; # += as we *don't* want to override any already supplied argument - $args += array ( + $args += [ 'gid' => get_http_var('id'), 's' => get_http_var('s'), // Search terms to be highlighted. 'member_id' => get_http_var('m'), // Member's speeches to be highlighted. - ); + ]; if (preg_match('/speaker:(\d+)/', get_http_var('s'), $mmm)) { $args['person_id'] = $mmm[1]; @@ -200,14 +201,14 @@ protected function display_section_or_speech($args = array()) { if ($this->major == 6) { # Magically (as in I can't remember quite why), pbc_clause will # contain the new URL without any change... - $URL->remove( array('id') ); + $URL->remove(['id']); } else { - $URL->insert( array('id'=>$e->getMessage()) ); + $URL->insert(['id' => $e->getMessage()]); } # put the search term back in so highlighting works. # NB: as we don't see the # part of the URL we lose this :( - if ( $args['s'] !== '' ) { - $URL->insert( array('s'=>$args['s']) ); + if ($args['s'] !== '') { + $URL->insert(['s' => $args['s']]); } redirect($URL->generate('none'), 301); } @@ -215,16 +216,16 @@ protected function display_section_or_speech($args = array()) { $data['individual_item'] = ($this->list->commentspage == $this_page); if ($data['individual_item']) { - $COMMENTLIST = new \COMMENTLIST; + $COMMENTLIST = new \COMMENTLIST(); $args['user_id'] = get_http_var('u'); $args['epobject_id'] = $this->list->epobject_id(); $data['comments']['object'] = $COMMENTLIST; $data['comments']['args'] = $args; - $data['comments']['commentdata'] = array( + $data['comments']['commentdata'] = [ 'epobject_id' => $this->list->epobject_id(), 'gid' => get_http_var('id'), # wrans is LIST->gid? - 'return_page' => $this_page - ); + 'return_page' => $this_page, + ]; } if (!isset($data['info'])) { @@ -235,9 +236,9 @@ protected function display_section_or_speech($args = array()) { # Okay, let's set up highlighting and glossarisation - list($bodies, $speeches) = $this->highlightSpeeches($data); + [$bodies, $speeches] = $this->highlightSpeeches($data); - list($data, $first_speech, $subsection_title) = $this->annotateSpeeches($data, $bodies, $speeches); + [$data, $first_speech, $subsection_title] = $this->annotateSpeeches($data, $bodies, $speeches); $data = $this->setTitleAndAlertText($data, $subsection_title); @@ -247,8 +248,8 @@ protected function display_section_or_speech($args = array()) { $data['debate_day_human'] = format_date($data['info']['date'], LONGDATEFORMAT); $URL = new \MySociety\TheyWorkForYou\Url($this->list->listpage); - $URL->insert(array('d' => $data['info']['date'])); - $URL->remove(array('id')); + $URL->insert(['d' => $data['info']['date']]); + $URL->remove(['id']); $data['debate_day_link'] = $URL->generate(); $data['nextprev'] = $DATA->page_metadata($this_page, 'nextprev'); @@ -286,7 +287,7 @@ private function setTitleAndAlertText($data, $subsection_title) { if (array_key_exists('text_heading', $data['info'])) { // avoid having Clause 1 etc as the alert text search string on PBC pages as it's // almost certainly not what the person wants - if ( $this->major == 6 ) { + if ($this->major == 6) { $data['email_alert_text'] = $data['section_title']; } else { $data['email_alert_text'] = $data['info']['text_heading']; @@ -323,7 +324,7 @@ private function highlightSpeeches($data) { // and highlight search string words. $speeches = 0; - $bodies = array(); + $bodies = []; foreach ($data['rows'] as $row) { $htype = $row['htype']; if ($htype == 12 || $htype == 13 || $htype == 14) { @@ -332,8 +333,8 @@ private function highlightSpeeches($data) { $body = $row['body']; $body = preg_replace('#(.*?\s*\((.*?)\))#', '$4', $body); $body = preg_replace('#(.*?\s*\((.*?)\))#', '$4', $body); - $body = preg_replace_callback('#(.*?)#', function($matches) { - return '' . str_replace("Official Report", "Hansard", $matches[6]) . ''; + $body = preg_replace_callback('#(.*?)#', function ($matches) { + return '' . str_replace("Official Report", "Hansard", $matches[6]) . ''; }, $body); #$body = preg_replace('#(.*?)#e', "\"\" . str_replace('Official Report', 'Hansard', '$7') . ''", $body); $bodies[] = $body; @@ -357,7 +358,7 @@ private function highlightSpeeches($data) { twfy_debug_timestamp('After glossarise'); } - return array($bodies, $speeches); + return [$bodies, $speeches]; } private function annotateSpeeches($data, $bodies, $speeches) { @@ -366,7 +367,7 @@ private function annotateSpeeches($data, $bodies, $speeches) { $data['section_title'] = ''; $subsection_title = ''; $rows = count($data['rows']); - for ($i=0; $i<$rows; $i++) { + for ($i = 0; $i < $rows; $i++) { $row = $data['rows'][$i]; $htype = $row['htype']; // HPOS should be defined below if it's needed; otherwise default to 0 @@ -389,7 +390,7 @@ private function annotateSpeeches($data, $bodies, $speeches) { # Voting links $data['rows'][$i]['voting_data'] = ''; if (isset($row['votes'])) { - $data['rows'][$i]['voting_data'] = $this->generate_votes( $row['votes'], $row['epobject_id'], $row['gid'] ); + $data['rows'][$i]['voting_data'] = $this->generate_votes($row['votes'], $row['epobject_id'], $row['gid']); } # Annotation link @@ -421,79 +422,79 @@ private function annotateSpeeches($data, $bodies, $speeches) { } } - return array($data, $first_speech, $subsection_title); + return [$data, $first_speech, $subsection_title]; } private function getCountryDetails() { - $details = array( - 1 => array ( + $details = [ + 1 => [ 'country' => 'UK', 'assembly' => 'uk-commons', - 'location' => '– in the House of Commons' - ), - 2 => array ( + 'location' => '– in the House of Commons', + ], + 2 => [ 'country' => 'UK', 'assembly' => 'uk-commons', - 'location' => '– in Westminster Hall' - ), - 3 => array ( + 'location' => '– in Westminster Hall', + ], + 3 => [ 'country' => 'UK', 'assembly' => 'uk-commons', - 'location' => 'written question – answered' - ), - 4 => array ( + 'location' => 'written question – answered', + ], + 4 => [ 'country' => 'UK', 'assembly' => 'uk-commons', - 'location' => 'written statement – made' - ), - 5 => array ( + 'location' => 'written statement – made', + ], + 5 => [ 'country' => 'NORTHERN IRELAND', 'assembly' => 'ni', - 'location' => '– in the Northern Ireland Assembly' - ), - 6 => array ( + 'location' => '– in the Northern Ireland Assembly', + ], + 6 => [ 'country' => 'UK', 'assembly' => 'uk-commons', - 'location' => '– in a Public Bill Committee' - ), - 7 => array ( + 'location' => '– in a Public Bill Committee', + ], + 7 => [ 'country' => 'SCOTLAND', 'assembly' => 'scotland', - 'location' => '– in the Scottish Parliament' - ), - 8 => array ( + 'location' => '– in the Scottish Parliament', + ], + 8 => [ 'country' => 'SCOTLAND', 'assembly' => 'scotland', - 'location' => '– Scottish Parliament written question – answered' - ), - 9 => array ( + 'location' => '– Scottish Parliament written question – answered', + ], + 9 => [ 'country' => 'LONDON', 'assembly' => 'london-assembly', - 'location' => 'Questions to the Mayor of London – answered' - ), - 10 => array ( + 'location' => 'Questions to the Mayor of London – answered', + ], + 10 => [ 'country' => 'WALES', 'assembly' => 'senedd', - 'location' => '– in the Senedd' - ), - 11 => array ( + 'location' => '– in the Senedd', + ], + 11 => [ 'country' => 'WALES', 'assembly' => 'senedd', - 'location' => '– Senedd Cymru' - ), - 101 => array ( + 'location' => '– Senedd Cymru', + ], + 101 => [ 'country' => 'UK', 'assembly' => 'uk-lords', - 'location' => '– in the House of Lords' - ) - ); + 'location' => '– in the House of Lords', + ], + ]; $detail = $details[$this->major]; - return array($detail['country'], $detail['location'], $detail['assembly']); + return [$detail['country'], $detail['location'], $detail['assembly']]; } private function majorToConsType() { - $major_to_cons_type = array( + $major_to_cons_type = [ 1 => 'WMC', 2 => 'WMC', 3 => 'WMC', @@ -505,7 +506,7 @@ private function majorToConsType() { 10 => 'WAC', 11 => 'WAC', 101 => '', - ); + ]; return $major_to_cons_type[$this->major]; } @@ -513,18 +514,18 @@ private function majorToConsType() { protected function display_front() { global $DATA, $this_page; $this_page = $this->page_base . 'front'; - $data = array(); - if ( $this->index_template ) { + $data = []; + if ($this->index_template) { $data['template'] = $this->index_template; } - $class = new $this->class; - $content = array(); + $class = new $this->class(); + $content = []; $content['data'] = $this->front_content(); - $content['calendar'] = $class->display('calendar', array('months' => 1), 'none'); + $content['calendar'] = $class->display('calendar', ['months' => 1], 'none'); - if ( $rssurl = $DATA->page_metadata($this_page, 'rss') ) { + if ($rssurl = $DATA->page_metadata($this_page, 'rss')) { $content['rssurl'] = $rssurl; } @@ -539,7 +540,7 @@ public function is_debate_section_page() { } //$totalcomments, $comment, $commenturl - function generate_commentteaser ($row) { + public function generate_commentteaser($row) { // Returns HTML for the one fragment of comment and link for the sidebar. // $totalcomments is the number of comments this item has on it. // $comment is an array like: @@ -588,13 +589,13 @@ function generate_commentteaser ($row) { } } - return array( + return [ 'body' => prepare_comment_for_display($commentbody), 'username' => _htmlentities($comment['username']), 'linktext' => $linktext, 'commentsurl' => $row['commentsurl'], 'comment_id' => $comment['comment_id'], - ); + ]; } protected function get_question_mentions_html($row_data) { @@ -602,7 +603,7 @@ protected function get_question_mentions_html($row_data) { } private function pageToSection() { - $sections = array( + $sections = [ 1 => 'debates', 2 => 'whall', 3 => 'wrans', @@ -614,8 +615,8 @@ private function pageToSection() { 9 => 'lmqs', 10 => 'senedd', 11 => 'senedd', - 101 => 'lords' - ); + 101 => 'lords', + ]; return $sections[$this->major]; } diff --git a/classes/SectionView/SeneddView.php b/classes/SectionView/SeneddView.php index fad488dc95..4ea0b7d452 100644 --- a/classes/SectionView/SeneddView.php +++ b/classes/SectionView/SeneddView.php @@ -25,11 +25,11 @@ protected function display_front() { } protected function front_content() { - return $this->list->display('biggest_debates', array('days'=>30, 'num'=>20), 'none'); + return $this->list->display('biggest_debates', ['days' => 30, 'num' => 20], 'none'); } protected function getURLs($data) { - $urls = array(); + $urls = []; $day = new \MySociety\TheyWorkForYou\Url('senedddebates'); $urls['seneddday'] = $day; @@ -39,16 +39,16 @@ protected function getURLs($data) { } protected function getSearchSections() { - return array( - array( 'section' => 'wales' ) - ); + return [ + [ 'section' => 'wales' ], + ]; } protected function display_front_senedd() { global $this_page; $this_page = "seneddoverview"; - $data = array(); + $data = []; $data['popular_searches'] = null; @@ -59,25 +59,25 @@ protected function display_front_senedd() { $DEBATELIST = new $this->class(); - $debates = $DEBATELIST->display('recent_debates', array('days' => 30, 'num' => 6), 'none'); + $debates = $DEBATELIST->display('recent_debates', ['days' => 30, 'num' => 6], 'none'); $MOREURL = new \MySociety\TheyWorkForYou\Url('senedddebatesfront'); - $MOREURL->insert( array( 'more' => 1 ) ); + $MOREURL->insert([ 'more' => 1 ]); // this makes sure that we don't repeat this debate in the list below $random_debate = null; - if ( isset($debates['data']) && count($debates['data']) ) { + if (isset($debates['data']) && count($debates['data'])) { $random_debate = $debates['data'][0]; } - $recent = array(); - if ( isset($debates['data']) && count($debates['data']) ) { + $recent = []; + if (isset($debates['data']) && count($debates['data'])) { // at the start of a session there may be less than 6 // debates $max = 6; - if ( count($debates['data']) < 6 ) { + if (count($debates['data']) < 6) { $max = count($debates['data']); } - for ( $i = 1; $i < $max; $i++ ) { + for ($i = 1; $i < $max; $i++) { $debate = $debates['data'][$i]; $debate['desc'] = "Senedd"; $debate['more_url'] = $MOREURL->generate(); @@ -85,17 +85,17 @@ protected function display_front_senedd() { } } - $featured = array(); - if ( $random_debate ) { + $featured = []; + if ($random_debate) { $featured = $random_debate; $featured['more_url'] = $MOREURL->generate(); $featured['desc'] = 'Senedd'; - $featured['related'] = array(); + $featured['related'] = []; $featured['featured'] = false; } $data['featured'] = $featured; - $data['debates'] = array( 'recent' => $recent); + $data['debates'] = [ 'recent' => $recent]; $data['regional'] = $this->getMSList(); $data['search_box'] = $this->getSearchBox($data); @@ -104,7 +104,7 @@ protected function display_front_senedd() { return $data; } - protected function getSearchBox(array $data): \MySociety\TheyWorkForYou\Search\SearchBox{ + protected function getSearchBox(array $data): \MySociety\TheyWorkForYou\Search\SearchBox { $search_box = new \MySociety\TheyWorkForYou\Search\SearchBox(); $search_box->homepage_panel_class = "panel--homepage--senedd"; $search_box->homepage_subhead = gettext("Senedd / Welsh Parliament"); @@ -113,14 +113,14 @@ protected function getSearchBox(array $data): \MySociety\TheyWorkForYou\Search\S $search_box->quick_links = []; if (count($data["regional"])) { // get all unique constituencies - $constituencies = array(); + $constituencies = []; foreach ($data["regional"] as $member) { $constituencies[$member["constituency"]] = 1; } $constituencies = array_keys($constituencies); - $search_box->add_quick_link(sprintf(gettext('Find out more about your MSs for %s and %s'), $constituencies[0], $constituencies[1]), '/postcode/?pc=' . $data["mp_data"]['postcode'],'torso'); + $search_box->add_quick_link(sprintf(gettext('Find out more about your MSs for %s and %s'), $constituencies[0], $constituencies[1]), '/postcode/?pc=' . $data["mp_data"]['postcode'], 'torso'); } - $search_box->add_quick_link(gettext('Create and manage email alerts'), '/alert/','megaphone'); + $search_box->add_quick_link(gettext('Create and manage email alerts'), '/alert/', 'megaphone'); $search_box->add_quick_link(gettext('Subscribe to our newsletter'), '/about/#about-mysociety', 'mail'); $search_box->add_quick_link(gettext('Donate to support our work'), '/support-us/', 'heart'); $search_box->add_quick_link(gettext('Learn more about TheyWorkForYou'), '/about/', 'magnifying-glass'); @@ -130,7 +130,7 @@ protected function getSearchBox(array $data): \MySociety\TheyWorkForYou\Search\S protected function getMSList() { global $THEUSER; - $mreg = array(); + $mreg = []; if ($THEUSER->isloggedin() && $THEUSER->postcode() != '' || $THEUSER->postcode_is_set()) { return array_merge( \MySociety\TheyWorkForYou\Member::getRegionalList($THEUSER->postcode, 5, 'WAC'), diff --git a/classes/SectionView/SpView.php b/classes/SectionView/SpView.php index b4b61d8a4b..e1d11dff64 100644 --- a/classes/SectionView/SpView.php +++ b/classes/SectionView/SpView.php @@ -7,7 +7,7 @@ class SpView extends SectionView { protected $class = 'SPLIST'; protected function front_content() { - return $this->list->display('biggest_debates', array('days'=>7, 'num'=>20), 'none'); + return $this->list->display('biggest_debates', ['days' => 7, 'num' => 20], 'none'); } protected function get_question_mentions_html($row_data) { @@ -15,7 +15,7 @@ protected function get_question_mentions_html($row_data) { } protected function getViewUrls() { - $urls = array(); + $urls = []; $day = new \MySociety\TheyWorkForYou\Url('spdebates'); $urls['spdebatesday'] = $day; $urls['day'] = $day; @@ -23,8 +23,8 @@ protected function getViewUrls() { } protected function getSearchSections() { - return array( - array( 'section' => 'sp' ) - ); + return [ + [ 'section' => 'sp' ], + ]; } } diff --git a/classes/SectionView/SpwransView.php b/classes/SectionView/SpwransView.php index f125271ea0..fa56234ce2 100644 --- a/classes/SectionView/SpwransView.php +++ b/classes/SectionView/SpwransView.php @@ -19,13 +19,13 @@ public function display() { protected function display_front() { global $this_page, $DATA; $this_page = 'spwransfront'; - $data = array(); + $data = []; - $args = array( 'months' => 1 ); - $WRANSLIST = new \SPWRANSLIST; + $args = [ 'months' => 1 ]; + $WRANSLIST = new \SPWRANSLIST(); - $wrans = array(); - $wrans['data'] = $WRANSLIST->display('recent_wrans', array('days'=>7, 'num'=>5), 'none'); + $wrans = []; + $wrans['data'] = $WRANSLIST->display('recent_wrans', ['days' => 7, 'num' => 5], 'none'); $wrans['calendar'] = $WRANSLIST->display('calendar', $args, 'none'); $data['content'] = $wrans; @@ -34,7 +34,7 @@ protected function display_front() { } protected function getViewUrls() { - $urls = array(); + $urls = []; $day = new \MySociety\TheyWorkForYou\Url('spwrans'); $urls['day'] = $day; $urls['spwransday'] = $day; @@ -42,60 +42,60 @@ protected function getViewUrls() { } protected function getSearchSections() { - return array( - array( 'section' => 'spwrans' ) - ); + return [ + [ 'section' => 'spwrans' ], + ]; } private function spwrans_redirect($spid) { global $PAGE; # We have a Scottish Parliament ID, need to find the date - $SPWRANSLIST = new \SPWRANSLIST; + $SPWRANSLIST = new \SPWRANSLIST(); $gid = $SPWRANSLIST->get_gid_from_spid($spid); if ($gid) { - if (preg_match('/uk\.org\.publicwhip\/spwa\/(\d{4}-\d\d-\d\d\.(.*))/',$gid,$m)) { + if (preg_match('/uk\.org\.publicwhip\/spwa\/(\d{4}-\d\d-\d\d\.(.*))/', $gid, $m)) { $URL = new \MySociety\TheyWorkForYou\Url('spwrans'); $URL->reset(); - $URL->insert( array('id' => $m[1]) ); + $URL->insert(['id' => $m[1]]); $fragment_identifier = '#g' . $m[2]; header('Location: ' . $URL->generate('none') . $fragment_identifier, true, 303); exit; - } elseif (preg_match('/uk\.org\.publicwhip\/spor\/(\d{4}-\d\d-\d\d\.(.*))/',$gid,$m)) { + } elseif (preg_match('/uk\.org\.publicwhip\/spor\/(\d{4}-\d\d-\d\d\.(.*))/', $gid, $m)) { $URL = new \MySociety\TheyWorkForYou\Url('spdebates'); $URL->reset(); - $URL->insert( array('id' => $m[1]) ); + $URL->insert(['id' => $m[1]]); $fragment_identifier = '#g' . $m[2]; header('Location: ' . $URL->generate('none') . $fragment_identifier, true, 303); exit; } else { - $PAGE->error_message ("Strange GID ($gid) for that Scottish Parliament ID."); + $PAGE->error_message("Strange GID ($gid) for that Scottish Parliament ID."); } } - $PAGE->error_message ("Couldn't match that Scottish Parliament ID to a GID."); + $PAGE->error_message("Couldn't match that Scottish Parliament ID to a GID."); } protected function get_question_mentions_html($row_data) { - if( count($row_data) == 0 ) { + if(count($row_data) == 0) { return ''; } $result = ''; $last_date = null; $first_difference_output = true; // Keep the references until after the history that's in a timeline: - $references = array(); + $references = []; foreach ($row_data as $row) { - if( ! $row["date"] ) { + if(! $row["date"]) { // If this mention isn't associated with a date, the difference won't be interesting. $last_date = null; } $description = ''; if ($last_date && ($last_date != $row["date"])) { // Calculate how long the gap was in days: - $daysdiff = (integer)((strtotime($row["date"]) - strtotime($last_date)) / 86400); + $daysdiff = (int) ((strtotime($row["date"]) - strtotime($last_date)) / 86400); $daysstring = ($daysdiff == 1) ? "day" : "days"; $further = ""; - if( $first_difference_output ) { + if($first_difference_output) { $first_difference_output = false; } else { $further = " a further"; @@ -106,7 +106,7 @@ protected function get_question_mentions_html($row_data) { $inner = "BUG: Unknown mention type $row[type]"; $date = format_date($row['date'], SHORTDATEFORMAT); $url = $row['url']; - if ( strpos($url, 'business/businessBulletin') !== false ) { + if (strpos($url, 'business/businessBulletin') !== false) { $url = str_replace('www.scottish', 'archive.scottish', $url); } switch ($row["type"]) { @@ -120,9 +120,9 @@ protected function get_question_mentions_html($row_data) { $inner = "Mentioned in tabled written questions on $date"; break; case 4: - if( preg_match('/^uk.org.publicwhip\/spq\/(.*)$/',$row['gid'],$m) ) { + if(preg_match('/^uk.org.publicwhip\/spq\/(.*)$/', $row['gid'], $m)) { $URL = new \MySociety\TheyWorkForYou\Url("spwrans"); - $URL->insert( array('spid' => $m[1]) ); + $URL->insert(['spid' => $m[1]]); $relative_url = $URL->generate("none"); $inner = "Given a written answer on $date"; } @@ -131,25 +131,25 @@ protected function get_question_mentions_html($row_data) { $inner = "Given a holding answer on $date"; break; case 6: - if( preg_match('/^uk.org.publicwhip\/spor\/(.*)$/',$row['mentioned_gid'],$m) ) { + if(preg_match('/^uk.org.publicwhip\/spor\/(.*)$/', $row['mentioned_gid'], $m)) { $URL = new \MySociety\TheyWorkForYou\Url("spdebates"); - $URL->insert( array('id' => $m[1]) ); + $URL->insert(['id' => $m[1]]); $relative_url = $URL->generate("none"); $inner = "Asked in parliament on $date"; } break; case 7: - if( preg_match('/^uk.org.publicwhip\/spq\/(.*)$/',$row['mentioned_gid'],$m) ) { + if(preg_match('/^uk.org.publicwhip\/spq\/(.*)$/', $row['mentioned_gid'], $m)) { $referencing_spid = $m[1]; $URL = new \MySociety\TheyWorkForYou\Url("spwrans"); - $URL->insert( array('spid' => $referencing_spid) ); + $URL->insert(['spid' => $referencing_spid]); $relative_url = $URL->generate("none"); $inner = "Referenced in question $referencing_spid"; $reference = true; } break; } - if( $reference ) { + if($reference) { $references[] = "\n
  • $inner."; } else { $result .= "\n
  • $description$inner"; diff --git a/classes/SectionView/WhallView.php b/classes/SectionView/WhallView.php index d0e232e3db..f0141c5913 100644 --- a/classes/SectionView/WhallView.php +++ b/classes/SectionView/WhallView.php @@ -7,6 +7,6 @@ class WhallView extends SectionView { protected $class = 'WHALLLIST'; protected function front_content() { - return $this->list->display('biggest_debates', array('days'=>7, 'num'=>20), 'none'); + return $this->list->display('biggest_debates', ['days' => 7, 'num' => 20], 'none'); } } diff --git a/classes/SectionView/WmsView.php b/classes/SectionView/WmsView.php index 575bdf9b26..6a6e2c41bd 100644 --- a/classes/SectionView/WmsView.php +++ b/classes/SectionView/WmsView.php @@ -7,11 +7,11 @@ class WmsView extends SectionView { protected $class = 'WMSLIST'; protected function front_content() { - return $this->list->display('recent_wms', array('days'=>7, 'num'=>20), 'none'); + return $this->list->display('recent_wms', ['days' => 7, 'num' => 20], 'none'); } protected function getViewUrls() { - $urls = array(); + $urls = []; $day = new \MySociety\TheyWorkForYou\Url('wms'); $urls['day'] = $day; $urls['wmsday'] = $day; diff --git a/classes/SectionView/WransView.php b/classes/SectionView/WransView.php index 8d6d457542..11eff97d15 100644 --- a/classes/SectionView/WransView.php +++ b/classes/SectionView/WransView.php @@ -7,27 +7,27 @@ class WransView extends SectionView { protected $class = 'WRANSLIST'; protected function front_content() { - return $this->list->display('recent_wrans', array('days'=>7, 'num'=>20), 'none'); + return $this->list->display('recent_wrans', ['days' => 7, 'num' => 20], 'none'); } protected function display_front() { global $DATA, $this_page; - if ( get_http_var('type') == 'wrans') { + if (get_http_var('type') == 'wrans') { return parent::display_front(); } - $data = array(); + $data = []; - $args = array( 'months' => 1 ); - $WRANSLIST = new \WRANSLIST; + $args = [ 'months' => 1 ]; + $WRANSLIST = new \WRANSLIST(); - $wrans = array(); - $wrans['data'] = $WRANSLIST->display('recent_wrans', array('days'=>7, 'num'=>5), 'none'); + $wrans = []; + $wrans['data'] = $WRANSLIST->display('recent_wrans', ['days' => 7, 'num' => 5], 'none'); $wrans['calendar'] = $WRANSLIST->display('calendar', $args, 'none'); - $WMSLIST = new \WMSLIST; - $wms = array(); - $wms['data'] = $WMSLIST->display('recent_wms', array('days'=>7, 'num'=>20), 'none'); + $WMSLIST = new \WMSLIST(); + $wms = []; + $wms['data'] = $WMSLIST->display('recent_wms', ['days' => 7, 'num' => 20], 'none'); $wms['calendar'] = $WMSLIST->display('calendar', $args, 'none'); $wms['rssurl'] = $DATA->page_metadata('wmsfront', 'rss'); @@ -39,7 +39,7 @@ protected function display_front() { } protected function getViewUrls() { - $urls = array(); + $urls = []; $day = new \MySociety\TheyWorkForYou\Url('wrans'); $urls['day'] = $day; $urls['wransday'] = $day; @@ -49,11 +49,11 @@ protected function getViewUrls() { } protected function getSearchSections() { - $sections = array( - array( 'section' => 'wrans', 'title' => 'Written Answers' ), - ); - if ( get_http_var('type') == '') { - $sections[] = array( 'section' => 'wms', 'title' => 'Written Ministerial Statements' ); + $sections = [ + [ 'section' => 'wrans', 'title' => 'Written Answers' ], + ]; + if (get_http_var('type') == '') { + $sections[] = [ 'section' => 'wms', 'title' => 'Written Ministerial Statements' ]; } return $sections; } @@ -62,7 +62,7 @@ protected function getSearchSections() { # speech bar the first (assuming that's the question) private $votelinks_so_far = 0; - protected function generate_votes ($votes, $id, $gid) { + protected function generate_votes($votes, $id, $gid) { /* Returns HTML for the 'Does this answer the question?' links (wrans) in the sidebar. $votes = => array ( @@ -78,7 +78,7 @@ protected function generate_votes ($votes, $id, $gid) { return; } - $data = array(); + $data = []; if ($this->votelinks_so_far > 0 || strstr($gid, 'r')) { $yesvotes = $votes['user']['yes'] + $votes['anon']['yes']; $novotes = $votes['user']['no'] + $votes['anon']['no']; @@ -89,19 +89,19 @@ protected function generate_votes ($votes, $id, $gid) { $URL = new \MySociety\TheyWorkForYou\Url($this_page); $returl = $URL->generate(); $VOTEURL = new \MySociety\TheyWorkForYou\Url('epvote'); - $VOTEURL->insert(array('v'=>'1', 'id'=>$id, 'ret'=>$returl)); + $VOTEURL->insert(['v' => '1', 'id' => $id, 'ret' => $returl]); $yes_vote_url = $VOTEURL->generate(); - $VOTEURL->insert(array('v'=>'0')); + $VOTEURL->insert(['v' => '0']); $no_vote_url = $VOTEURL->generate(); - $data = array( + $data = [ 'yesvotes' => $yesvotes, 'yesplural' => $yesplural, 'yesvoteurl' => $yes_vote_url, 'novoteurl' => $no_vote_url, 'novotes' => $novotes, 'noplural' => $noplural, - ); + ]; } $this->votelinks_so_far++; diff --git a/classes/Stripe.php b/classes/Stripe.php index 7054ea5089..8fc90391d0 100644 --- a/classes/Stripe.php +++ b/classes/Stripe.php @@ -3,7 +3,7 @@ namespace MySociety\TheyWorkForYou; class Stripe { - static private $instance; + private static $instance; public function __construct($stripeSecretKey) { if (self::$instance) { diff --git a/classes/Subscription.php b/classes/Subscription.php index 8d90e5a5ab..0141d111c3 100644 --- a/classes/Subscription.php +++ b/classes/Subscription.php @@ -16,13 +16,13 @@ class Subscription { public function __construct($arg) { # User ID if (is_int($arg)) { - $user = new \USER; + $user = new \USER(); $user->init($arg); $arg = $user; } - $this->db = new \ParlDB; - $this->redis = new Redis; + $this->db = new \ParlDB(); + $this->redis = new Redis(); if (defined('TESTING')) { $this->api = new TestStripe(""); } else { @@ -46,7 +46,7 @@ public function __construct($arg) { $q = $this->db->query('SELECT * FROM api_subscription WHERE stripe_id = :stripe_id', [ ':stripe_id' => $id])->first(); if ($q) { - $user = new \USER; + $user = new \USER(); $user->init($q['user_id']); $this->user = $user; $this->redis_prefix = "user:{$this->user->user_id}:quota:" . REDIS_API_NAME; @@ -80,7 +80,8 @@ public function __construct($arg) { $data = $this->stripe; if ($data->discount && $data->discount->coupon && $data->discount->coupon->percent_off) { $this->actual_paid = add_vat(floor( - $data->plan->amount * (100 - $data->discount->coupon->percent_off) / 100)); + $data->plan->amount * (100 - $data->discount->coupon->percent_off) / 100 + )); $data->plan->amount = add_vat($data->plan->amount); } else { $data->plan->amount = add_vat($data->plan->amount); @@ -117,7 +118,7 @@ private function update_subscription($form_data) { $invoice = \Stripe\Invoice::create([ 'customer' => $this->stripe->customer, 'subscription' => $this->stripe, - 'tax_percent' => 20 + 'tax_percent' => 20, ]); $invoice->finalizeInvoice(); $invoice->pay(); @@ -179,7 +180,7 @@ private function add_subscription($form_data) { 'customer' => $customer, 'plan' => $form_data['plan'], 'coupon' => $form_data['coupon'], - 'metadata' => $form_data['metadata'] + 'metadata' => $form_data['metadata'], ]); $stripe_id = $obj->id; @@ -192,7 +193,7 @@ private function add_subscription($form_data) { public function invoices() { $invoices = $this->api->getInvoices([ 'subscription' => $this->stripe->id, - 'limit' => 24 + 'limit' => 24, ]); $invoices = $invoices->data; return $invoices; @@ -213,9 +214,9 @@ private function checkValidPlan() { private function checkPaymentGivenIfNeeded() { $payment_data = $this->form_data['stripeToken'] || $this->form_data['payment_method']; return ($this->has_payment_data || $payment_data || ( - $this->form_data['plan'] == $this::$plans[0] + $this->form_data['plan'] == $this::$plans[0] && in_array($this->form_data['charitable'], ['c', 'i']) - )); + )); } public function checkForErrors() { diff --git a/classes/TestStripe.php b/classes/TestStripe.php index aab2441391..0f57de6900 100644 --- a/classes/TestStripe.php +++ b/classes/TestStripe.php @@ -9,7 +9,7 @@ public function getSubscription($args) { 'id' => 'sub_123', 'discount' => [ 'coupon' => ['percent_off' => 100], - 'end' => null + 'end' => null, ], 'plan' => [ 'amount' => '2000', diff --git a/classes/Topic.php b/classes/Topic.php index deb8bd44d2..1282a35364 100644 --- a/classes/Topic.php +++ b/classes/Topic.php @@ -8,7 +8,6 @@ namespace MySociety\TheyWorkForYou; class Topic { - /** * DB handle */ @@ -28,12 +27,11 @@ class Topic { * */ - public function __construct($data = null) - { - $this->db = new \ParlDB; + public function __construct($data = null) { + $this->db = new \ParlDB(); if (is_null($data)) { - return; + return; } $this->id = $data['id']; @@ -53,7 +51,7 @@ public function title() { public function sctitle() { $title = $this->title; - if (strpos($title, 'The ') === 0 ) { + if (strpos($title, 'The ') === 0) { $title = lcfirst($title); } @@ -124,13 +122,13 @@ public function onFrontPage() { private function _getContentIDs() { $q = $this->db->query( - "SELECT body, gid, ep.epobject_id FROM epobject ep + "SELECT body, gid, ep.epobject_id FROM epobject ep JOIN hansard h on ep.epobject_id = h.epobject_id JOIN topic_epobjects te on te.epobject_id = ep.epobject_id WHERE topic_key = :topic_key", - array( - ':topic_key' => $this->id - ) + [ + ':topic_key' => $this->id, + ] ); return $q; @@ -139,13 +137,13 @@ private function _getContentIDs() { public function getContent() { $q = $this->_getContentIDs(); - $content = array(); + $content = []; foreach ($q as $row) { - $content[] = array( + $content[] = [ 'title' => $row['body'], 'href' => Utility\Hansard::gid_to_url($row['gid']), 'id' => $row['epobject_id'], - ); + ]; } return $content; @@ -154,17 +152,17 @@ public function getContent() { public function getFullContent() { $q = $this->_getContentIDs(); - $content = array(); + $content = []; foreach ($q as $row) { $gid = $row['gid']; if (strpos($gid, 'lords') !== false) { - $debatelist = new \LORDSDEBATELIST; + $debatelist = new \LORDSDEBATELIST(); } elseif (strpos($gid, 'westminhall') !== false) { - $debatelist = new \WHALLLIST; + $debatelist = new \WHALLLIST(); } else { - $debatelist = new \DEBATELIST; + $debatelist = new \DEBATELIST(); } - $data = $debatelist->display('featured_gid', array('gid' => $gid), 'none'); + $data = $debatelist->display('featured_gid', ['gid' => $gid], 'none'); $item = $data['data']; if (isset($item['parent']) && $item['body'] == $item['parent']['body']) { @@ -178,24 +176,24 @@ public function getFullContent() { public function addContent($gid) { $q = $this->db->query( - "SELECT epobject_id FROM hansard WHERE gid = :gid", - array( - ":gid" => $gid - ) + "SELECT epobject_id FROM hansard WHERE gid = :gid", + [ + ":gid" => $gid, + ] )->first(); if (!$q) { - return false; + return false; } $epobject_id = $q['epobject_id']; $q = $this->db->query( - "INSERT INTO topic_epobjects (topic_key, epobject_id) VALUES (:topic, :ep_id)", - array( - ":topic" => $this->id, - ":ep_id" => $epobject_id - ) + "INSERT INTO topic_epobjects (topic_key, epobject_id) VALUES (:topic, :ep_id)", + [ + ":topic" => $this->id, + ":ep_id" => $epobject_id, + ] ); return $q->success(); @@ -203,25 +201,25 @@ public function addContent($gid) { public function deleteContent($id) { $q = $this->db->query( - "DELETE FROM topic_epobjects WHERE topic_key = :topic AND epobject_id = :ep_id", - array( - ":topic" => $this->id, - ":ep_id" => $id - ) + "DELETE FROM topic_epobjects WHERE topic_key = :topic AND epobject_id = :ep_id", + [ + ":topic" => $this->id, + ":ep_id" => $id, + ] ); return $q->success(); } public function getPolicySets() { - $q = $this->db->query( - "SELECT policyset FROM topic_policysets WHERE topic_key = :key", - array( - ':key' => $this->id - ) - ); - - $sets = array(); + $q = $this->db->query( + "SELECT policyset FROM topic_policysets WHERE topic_key = :key", + [ + ':key' => $this->id, + ] + ); + + $sets = []; foreach ($q as $row) { $sets[] = $row['policyset']; } @@ -233,21 +231,21 @@ public function addPolicySets($sets) { if ($sets === '' or count($sets) == 0) { $q = $this->db->query( "DELETE FROM topic_policysets WHERE topic_key = :topic_key", - array( - ":topic_key" => $this->id - ) + [ + ":topic_key" => $this->id, + ] ); } else { foreach ($sets as $set) { - if ($set == '' ) { + if ($set == '') { continue; } $q = $this->db->query( "REPLACE INTO topic_policysets (policyset, topic_key) VALUES (:policyset, :topic_key)", - array( + [ ':topic_key' => $this->id, - ':policyset' => $set - ) + ':policyset' => $set, + ] ); } } @@ -256,14 +254,14 @@ public function addPolicySets($sets) { } public function getPolicies() { - $q = $this->db->query( - 'SELECT policy_id FROM topic_policies WHERE topic_key = :key', - array( - ':key' => $this->id - ) - ); - - $policies = array(); + $q = $this->db->query( + 'SELECT policy_id FROM topic_policies WHERE topic_key = :key', + [ + ':key' => $this->id, + ] + ); + + $policies = []; foreach ($q as $row) { $policies[] = $row['policy_id']; } @@ -275,21 +273,21 @@ public function addPolicies($policies) { if ($policies === '' or count($policies) == 0) { $q = $this->db->query( "DELETE FROM topic_policies WHERE topic_key = :topic_key", - array( - ":topic_key" => $this->id - ) + [ + ":topic_key" => $this->id, + ] ); } else { foreach ($policies as $policy) { - if ($policy == '' ) { + if ($policy == '') { continue; } $q = $this->db->query( "REPLACE INTO topic_policies (policy_id, topic_key) VALUES (:policy, :topic_key)", - array( + [ ':topic_key' => $this->id, - ':policy' => $policy - ) + ':policy' => $policy, + ] ); } } @@ -299,7 +297,7 @@ public function addPolicies($policies) { public function getAllPolicies() { $policy_sets = $this->getPolicySets(); - $all_policies = array(); + $all_policies = []; $policies = new Policies(); foreach ($policy_sets as $set) { $all_policies = array_merge($all_policies, array_keys($policies->limitToSet($set)->getPolicies())); @@ -312,19 +310,19 @@ public function getAllPolicies() { public function save() { $q = $this->db->query( - "REPLACE INTO topics + "REPLACE INTO topics (id, title, slug, description, search_string, front_page, image) VALUES (:id, :title, :slug, :description, :search_string, :front_page, :image)", - array( + [ ':id' => $this->id, ':slug' => $this->slug(), ':title' => $this->title(), ':description' => $this->description(), ':search_string' => $this->search_string(), ':front_page' => $this->onFrontPage(), - ':image' => $this->image() - ) + ':image' => $this->image(), + ] ); return $q->success(); diff --git a/classes/Topics.php b/classes/Topics.php index cb25522438..0b1447caa2 100644 --- a/classes/Topics.php +++ b/classes/Topics.php @@ -8,7 +8,6 @@ namespace MySociety\TheyWorkForYou; class Topics { - /** * DB handle */ @@ -20,15 +19,15 @@ class Topics { */ public function __construct() { - $this->db = new \ParlDB; + $this->db = new \ParlDB(); } - private function query($where='') { + private function query($where = '') { $q = $this->db->query( "SELECT id, slug, title, description, search_string, front_page, image FROM topics $where" ); - $topics = array(); + $topics = []; foreach ($q as $row) { $topic = $row; $topics[$topic['slug']] = new Topic($topic); @@ -43,7 +42,7 @@ public function getTopics() { public function getTopic($topic_name) { $q = $this->db->query( "SELECT id, slug, title, description, search_string, front_page, image FROM topics WHERE slug = :slug", - array(':slug' => $topic_name) + [':slug' => $topic_name] )->first(); if ($q) { return new Topic($q); @@ -58,7 +57,7 @@ public function getFrontPageTopics() { public function updateFrontPageTopics($topics) { // PDO doesn't cope with arrays so we have to do this by hand :| - $quoted = array(); + $quoted = []; if ($topics) { foreach ($topics as $topic) { $quoted[] = $this->db->quote($topic); diff --git a/classes/Url.php b/classes/Url.php index e93413269f..6bdef09e23 100644 --- a/classes/Url.php +++ b/classes/Url.php @@ -32,7 +32,6 @@ */ class Url { - public function __construct($pagename) { // Initialise. global $DATA; @@ -42,7 +41,7 @@ public function __construct($pagename) { // These stores an associative array of key/value pairs that // we'll want passed on to other pages. - $this->session_vars = array (); + $this->session_vars = []; // Prevent things using $DATA running if it hasn't been set, ie in testing if (isset($DATA)) { @@ -93,7 +92,7 @@ public function restore() { public function reset() { // Call this to remove all the session_vars. - $this->session_vars = array (); + $this->session_vars = []; } /** @@ -162,11 +161,11 @@ public function update($arr) { * override just one or two of them. */ - public function generate($encode = "html", $overrideVars=array()) { + public function generate($encode = "html", $overrideVars = []) { global $DATA; - $url_args = array (); + $url_args = []; foreach (array_merge($this->session_vars, $overrideVars) as $key => $var) { if (is_array($var)) { diff --git a/classes/User.php b/classes/User.php index 4692069894..234cf4ea07 100644 --- a/classes/User.php +++ b/classes/User.php @@ -11,7 +11,7 @@ * User */ - function calculateOptinValue($optin_service, $optin_stream, $optin_org) { +function calculateOptinValue($optin_service, $optin_stream, $optin_org) { // combine three booleans into a single integer to store in the database // +1 = optin_service // +2 = optin_stream @@ -28,12 +28,12 @@ function calculateOptinValue($optin_service, $optin_stream, $optin_org) { function extractOptinValues($value) { // convert an integer into three seperate optin values ('Yes', 'No') - return [ - 'optin_service' => ($value & 1) ? "Yes" : "No", - 'optin_stream' => ($value & 2) ? "Yes" : "No", - 'optin_org' => ($value & 4) ? "Yes" : "No", - ]; - } + return [ + 'optin_service' => ($value & 1) ? "Yes" : "No", + 'optin_stream' => ($value & 2) ? "Yes" : "No", + 'optin_org' => ($value & 4) ? "Yes" : "No", + ]; +} class User { public function getUserDetails($user_id = false) { @@ -41,15 +41,15 @@ public function getUserDetails($user_id = false) { $user = $THEUSER; if ($user_id && $user_id != $THEUSER->user_id()) { - $user = new \USER; + $user = new \USER(); $valid = $user->init($user_id); if (!$valid || !$user->confirmed || $user->deleted()) { - return array('error' => 'User does not exist'); + return ['error' => 'User does not exist']; } } - $data = array(); + $data = []; $data['firstname'] = $user->firstname(); $data['lastname'] = $user->lastname(); $data['name'] = $user->firstname() . " " . $user->lastname(); @@ -62,7 +62,7 @@ public function getUserDetails($user_id = false) { $data['postcode'] = $user->postcode(); $data['website'] = $user->url(); $data['registrationtime'] = $user->registrationtime(); - $data['status']= $user->status(); + $data['status'] = $user->status(); $data["deleted"] = $user->deleted(); $data["confirmed"] = $user->confirmed(); $data["status"] = $user->status(); @@ -72,7 +72,7 @@ public function getUserDetails($user_id = false) { } public function getUpdateDetails($this_page, $user) { - $details = array(); + $details = []; if ($user->facebook_user) { $details = $this->getUserDetails(); @@ -138,7 +138,7 @@ public function getUpdateDetails($this_page, $user) { public function checkUpdateDetails($details) { global $THEUSER, $this_page; - $errors = array(); + $errors = []; // Check each of the things the user has input. // If there is a problem with any of them, set an entry in the $errors array. @@ -165,7 +165,7 @@ public function checkUpdateDetails($details) { } else { - $USER = new \USER; + $USER = new \USER(); $id_of_user_with_this_addresss = $USER->email_exists($details["email"], true); if ($this_page == "useredit" && @@ -227,10 +227,10 @@ public function checkUpdateDetails($details) { $errors["postcode"] = gettext("Sorry, this isn't a valid UK postcode."); } else { try { - new \MySociety\TheyWorkForYou\Member(array( + new \MySociety\TheyWorkForYou\Member([ 'postcode' => $details['postcode'], 'house' => HOUSE_TYPE_COMMONS, - )); + ]); } catch (MemberException $e) { $errors["postcode"] = gettext("Sorry, we could not find an MP for that postcode."); } @@ -256,17 +256,17 @@ public function checkUpdateDetails($details) { public function update($details) { global $THEUSER, $this_page, $PAGE; - $results = array(); + $results = []; // There were no errors when the edit user form was submitted, // so make the changes in the DB. // Who are we updating? $THEUSER or someone else? if ($this_page == "otheruseredit") { $who = 'the user’s'; - $success = $THEUSER->update_other_user ( $details ); + $success = $THEUSER->update_other_user($details); } else { $who = 'your'; - $success = $THEUSER->update_self ( $details ); + $success = $THEUSER->update_self($details); } @@ -285,7 +285,7 @@ public function update($details) { } else { - $results['errors'] = array("db" => "Sorry, we were unable to update $who details. Please let us know what you were trying to change. Thanks."); + $results['errors'] = ["db" => "Sorry, we were unable to update $who details. Please let us know what you were trying to change. Thanks."]; } return $results; @@ -298,12 +298,12 @@ public function add($details) { // If this goes well, the user will have their data // added to the database and a confirmation email // will be sent to them. - $success = $THEUSER->add ( $details ); + $success = $THEUSER->add($details); - $errors = array(); + $errors = []; if (!$success) { - $errors["db"] = "Sorry, we were unable to create an account for you. Please let us know. Thanks."; + $errors["db"] = "Sorry, we were unable to create an account for you. Please let us know. Thanks."; } return $errors; @@ -311,8 +311,8 @@ public function add($details) { public function getRep($cons_type, $mp_house) { global $THEUSER; - if ( !$THEUSER->has_postcode() ) { - return array(); + if (!$THEUSER->has_postcode()) { + return []; } // User is logged in and has a postcode, or not logged in with a cookied postcode. @@ -324,23 +324,23 @@ public function getRep($cons_type, $mp_house) { // Scottish homepage try { $constituencies = \MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituencies($THEUSER->postcode()); - if ( isset($constituencies[$cons_type]) ) { + if (isset($constituencies[$cons_type])) { $constituency = $constituencies[$cons_type]; - $MEMBER = new Member(array('constituency'=>$constituency, 'house'=> $mp_house)); + $MEMBER = new Member(['constituency' => $constituency, 'house' => $mp_house]); } - } catch ( MemberException $e ) { - return array(); + } catch (MemberException $e) { + return []; } if (isset($MEMBER) && $MEMBER->valid) { return $this->constructMPData($MEMBER, $THEUSER, $mp_house); } - return array(); + return []; } private function constructMPData($member, $user, $mp_house) { - $mp_data = array(); + $mp_data = []; $mp_data['name'] = $member->full_name(); $mp_data['party'] = $member->party(); $mp_data['constituency'] = $member->constituency(); @@ -362,11 +362,11 @@ private function constructMPData($member, $user, $mp_house) { public function getRegionalReps($cons_type, $mp_house) { global $THEUSER; - $mreg = array(); + $mreg = []; if ($THEUSER->isloggedin() && $THEUSER->postcode() != '' || $THEUSER->postcode_is_set()) { $reps = \MySociety\TheyWorkForYou\Member::getRegionalList($THEUSER->postcode, $mp_house, $cons_type); - foreach ( $reps as $rep ) { - $member = new \MySociety\TheyWorkForYou\Member(array('person_id' => $rep['person_id'])); + foreach ($reps as $rep) { + $member = new \MySociety\TheyWorkForYou\Member(['person_id' => $rep['person_id']]); $mreg[$rep['person_id']] = $this->constructMPData($member, $THEUSER, $mp_house); } } diff --git a/classes/Utility/Alert.php b/classes/Utility/Alert.php index 320befdeaf..89da17ec29 100644 --- a/classes/Utility/Alert.php +++ b/classes/Utility/Alert.php @@ -8,18 +8,16 @@ * Utility functions related to alerts */ -class Alert -{ - +class Alert { public static function detailsToCriteria($details) { - $criteria = array(); + $criteria = []; if (!empty($details['keyword'])) { $criteria[] = $details['keyword']; } if (!empty($details['pid'])) { - $criteria[] = 'speaker:'.$details['pid']; + $criteria[] = 'speaker:' . $details['pid']; } $criteria = join(' ', $criteria); @@ -27,30 +25,30 @@ public static function detailsToCriteria($details) { } public static function forUser($email) { - $db = new \ParlDB; + $db = new \ParlDB(); $q = $db->query('SELECT * FROM alerts WHERE email = :email - AND deleted != 1 ORDER BY created', array( - ':email' => $email - )); + AND deleted != 1 ORDER BY created', [ + ':email' => $email, + ]); - $alerts = array(); + $alerts = []; foreach ($q as $row) { $criteria = self::prettifyCriteria($row['criteria']); $token = $row['alert_id'] . '-' . $row['registrationtoken']; $status = 'confirmed'; - if ( !$row['confirmed'] ) { + if (!$row['confirmed']) { $status = 'unconfirmed'; - } elseif ( $row['deleted'] == 2 ) { + } elseif ($row['deleted'] == 2) { $status = 'suspended'; } - $alerts[] = array( + $alerts[] = [ 'token' => $token, 'status' => $status, 'criteria' => $criteria, 'raw' => $row['criteria'], - ); + ]; } return $alerts; @@ -58,21 +56,21 @@ public static function forUser($email) { public static function prettifyCriteria($alert_criteria) { $text = ''; - if ( $alert_criteria ) { + if ($alert_criteria) { $criteria = explode(' ', $alert_criteria); - $words = array(); + $words = []; $spokenby = array_values(\MySociety\TheyWorkForYou\Utility\Search::speakerNamesForIDs($alert_criteria)); foreach ($criteria as $c) { - if (!preg_match('#^speaker:(\d+)#',$c,$m)) { + if (!preg_match('#^speaker:(\d+)#', $c, $m)) { $words[] = $c; } } - if ( $spokenby && count($words) ) { + if ($spokenby && count($words)) { $text = implode(' or ', $spokenby) . ' mentions [' . implode(' ', $words) . ']'; - } else if ( count( $words ) ) { + } elseif (count($words)) { $text = '[' . implode(' ', $words) . ']' . ' is mentioned'; - } else if ( $spokenby ) { + } elseif ($spokenby) { $text = implode(' or ', $spokenby) . " speaks"; } } diff --git a/classes/Utility/Calendar.php b/classes/Utility/Calendar.php index 002c7ae3a3..06052aefb5 100644 --- a/classes/Utility/Calendar.php +++ b/classes/Utility/Calendar.php @@ -8,16 +8,14 @@ * Utility functions related to calendars */ -class Calendar -{ - +class Calendar { public static function minFutureDate() { $db = new \ParlDB(); $q = $db->query('SELECT MIN(event_date) AS m FROM future WHERE event_date >= DATE(NOW()) AND deleted = 0')->first(); 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 @@ -50,7 +48,7 @@ public static function fetchDate($date) { $PAGE->error_message('There is no information available for that date.', false, 404); } - return array(); + return []; } $DATA->set_page_metadata($this_page, 'date', $date); @@ -64,9 +62,9 @@ public static function fetchItem($id) { } private static function tidyData($q) { - $data = array(); - $seen = array(); - $people = array(); + $data = []; + $seen = []; + $people = []; foreach ($q as $row) { if ($row['person_id']) { $name = member_full_name($row['house'], $row['name_title'], $row['given_name'], $row['family_name'], $row['lordofname']); @@ -87,7 +85,7 @@ private static function tidyData($q) { } public static function displayEntry($e) { - list($title, $meta) = self::meta($e); + [$title, $meta] = self::meta($e); if (strstr($e['chamber'], 'Select Committee')) { print '
    '; @@ -130,7 +128,7 @@ public static function meta($e) { } } - $meta = array(); + $meta = []; if ($d = $e['debate_type']) { @@ -159,7 +157,7 @@ public static function meta($e) { } } - return array($title, $meta); + return [$title, $meta]; } } diff --git a/classes/Utility/Constituencies.php b/classes/Utility/Constituencies.php index 6f592c35c2..11f5beadb8 100644 --- a/classes/Utility/Constituencies.php +++ b/classes/Utility/Constituencies.php @@ -8,9 +8,7 @@ * Utility functions for dealing with constituency names */ -class Constituencies -{ - +class Constituencies { /** * Normalise Constituency Name * @@ -22,15 +20,15 @@ class Constituencies */ public static function normaliseConstituencyName($name) { - $db = new \ParlDB; + $db = new \ParlDB(); // In case we still have an & lying around $name = str_replace("&", "&", $name); $query = "select cons_id from constituency where name like :name and from_date <= date(now()) and date(now()) <= to_date"; - $q1 = $db->query($query, array( - ':name' => $name - ))->first(); + $q1 = $db->query($query, [ + ':name' => $name, + ])->first(); if (!$q1) { return false; } diff --git a/classes/Utility/Gaze.php b/classes/Utility/Gaze.php index 7bd4423dc5..79fadde528 100644 --- a/classes/Utility/Gaze.php +++ b/classes/Utility/Gaze.php @@ -8,17 +8,14 @@ * Provides a wrapper for Gaze functions within commonlib. */ -class Gaze -{ - +class Gaze { /** * Get Country by IP Address * * Takes an IP address and looks it up against Gaze to return the country. */ - public static function getCountryByIp($ip) - { + public static function getCountryByIp($ip) { include_once INCLUDESPATH . '../../commonlib/phplib/gaze.php'; diff --git a/classes/Utility/Hansard.php b/classes/Utility/Hansard.php index 4ce48b843a..81350942a5 100644 --- a/classes/Utility/Hansard.php +++ b/classes/Utility/Hansard.php @@ -8,14 +8,13 @@ * Utility functions related to content */ -class Hansard -{ +class Hansard { public static function get_gid_from_url($url) { $gid = null; $parts = parse_url($url); parse_str($parts['query'], $query); - if ( $query['id'] ) { + if ($query['id']) { if (strpos($parts['path'], 'lords') !== false) { $gid = 'uk.org.publicwhip/lords/'; } elseif (strpos($parts['path'], 'whall') !== false) { @@ -30,16 +29,16 @@ public static function get_gid_from_url($url) { public static function gid_to_url($gid) { - if ( !$gid ) { + if (!$gid) { return ''; } global $hansardmajors; $db = new \ParlDB(); - $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array( ':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(array('id' => $url_gid)); + $url->insert(['id' => $url_gid]); return $url->generate(); } } diff --git a/classes/Utility/House.php b/classes/Utility/House.php index adc4ca8c1f..23881066fd 100644 --- a/classes/Utility/House.php +++ b/classes/Utility/House.php @@ -8,119 +8,118 @@ * Utility functions related to house types */ -class House -{ +class House { public static function division_house_name_to_number($name) { - $name_to_number = array( + $name_to_number = [ 'commons' => HOUSE_TYPE_COMMONS, 'lords' => HOUSE_TYPE_LORDS, 'scotland' => HOUSE_TYPE_SCOTLAND, 'pbc' => HOUSE_TYPE_COMMONS, 'senedd' => HOUSE_TYPE_WALES, - ); + ]; return $name_to_number[$name]; } public static function house_to_members($house) { - $house_to_members = array( - HOUSE_TYPE_COMMONS => array( + $house_to_members = [ + HOUSE_TYPE_COMMONS => [ 'singular' => 'MP', - 'plural' => 'MPs' - ), - HOUSE_TYPE_LORDS => array( + 'plural' => 'MPs', + ], + HOUSE_TYPE_LORDS => [ 'singular' => 'Member of the House of Lords', - 'plural' => 'Members of the House of Lords' - ), - HOUSE_TYPE_NI => array( + 'plural' => 'Members of the House of Lords', + ], + HOUSE_TYPE_NI => [ 'singular' => 'MLA', - 'plural' => 'MLAs' - ), - HOUSE_TYPE_SCOTLAND => array( + 'plural' => 'MLAs', + ], + HOUSE_TYPE_SCOTLAND => [ 'singular' => 'MSP', - 'plural' => 'MSPs' - ), - HOUSE_TYPE_WALES => array( + 'plural' => 'MSPs', + ], + HOUSE_TYPE_WALES => [ 'singular' => gettext('MS'), - 'plural' => gettext('MSs') - ), - HOUSE_TYPE_LONDON_ASSEMBLY => array( + 'plural' => gettext('MSs'), + ], + HOUSE_TYPE_LONDON_ASSEMBLY => [ 'singular' => 'Member of the London Assembly', - 'plural' => 'Members of the London Assembly' - ) - ); + 'plural' => 'Members of the London Assembly', + ], + ]; return $house_to_members[$house]; } public static function getCountryDetails($house) { - $details = array( - HOUSE_TYPE_COMMONS => array ( + $details = [ + HOUSE_TYPE_COMMONS => [ '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 => [ '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 => [ 'country' => 'SCOTLAND', 'assembly' => 'scotland', 'location' => '– in the Scottish Parliament', 'cons_type' => 'SPC', 'assembly_name' => 'Scottish Parliament', - ), - HOUSE_TYPE_WALES => array ( + ], + HOUSE_TYPE_WALES => [ 'country' => 'WALES', 'assembly' => 'wales', 'location' => '– in the Senedd', 'cons_type' => 'WAC', 'assembly_name' => 'Senedd', - ), - HOUSE_TYPE_LORDS => array ( + ], + HOUSE_TYPE_LORDS => [ '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 => [ 'country' => 'UK', 'assembly' => 'london-assembly', 'location' => '– in the London Assembly', 'cons_type' => 'LAS', 'assembly_name' => 'London Assembly', - ) - ); + ], + ]; if (!array_key_exists($house, $details)) { - return array('', '', '', '', ''); + return ['', '', '', '', '']; } $detail = $details[$house]; - return array($detail['country'], $detail['location'], $detail['assembly'], $detail['cons_type'], $detail['assembly_name']); + return [$detail['country'], $detail['location'], $detail['assembly'], $detail['cons_type'], $detail['assembly_name']]; } public static function majorToHouse($major) { - $major_to_house = array( - 1 => array(HOUSE_TYPE_COMMONS), - 2 => array(HOUSE_TYPE_COMMONS), - 3 => array(HOUSE_TYPE_COMMONS, HOUSE_TYPE_LORDS), - 4 => array(HOUSE_TYPE_COMMONS, HOUSE_TYPE_LORDS), - 5 => array(HOUSE_TYPE_NI), - 6 => array(HOUSE_TYPE_COMMONS), - 7 => array(HOUSE_TYPE_SCOTLAND), - 8 => array(HOUSE_TYPE_SCOTLAND), - 9 => array(HOUSE_TYPE_LONDON_ASSEMBLY), - 10 => array(HOUSE_TYPE_WALES), - 11 => array(HOUSE_TYPE_WALES), - 101 => array(HOUSE_TYPE_LORDS), - ); + $major_to_house = [ + 1 => [HOUSE_TYPE_COMMONS], + 2 => [HOUSE_TYPE_COMMONS], + 3 => [HOUSE_TYPE_COMMONS, HOUSE_TYPE_LORDS], + 4 => [HOUSE_TYPE_COMMONS, HOUSE_TYPE_LORDS], + 5 => [HOUSE_TYPE_NI], + 6 => [HOUSE_TYPE_COMMONS], + 7 => [HOUSE_TYPE_SCOTLAND], + 8 => [HOUSE_TYPE_SCOTLAND], + 9 => [HOUSE_TYPE_LONDON_ASSEMBLY], + 10 => [HOUSE_TYPE_WALES], + 11 => [HOUSE_TYPE_WALES], + 101 => [HOUSE_TYPE_LORDS], + ]; return $major_to_house[$major]; } diff --git a/classes/Utility/LibFilter.php b/classes/Utility/LibFilter.php index 24622af1d7..7c7935a36b 100644 --- a/classes/Utility/LibFilter.php +++ b/classes/Utility/LibFilter.php @@ -22,64 +22,63 @@ */ class LibFilter { - - public $tag_counts = array(); + public $tag_counts = []; # # tags and attributes that are allowed # - public $allowed = array( - 'a' => array('href', 'target'), - 'b' => array(), - 'img' => array('src', 'width', 'height', 'alt'), - ); + public $allowed = [ + 'a' => ['href', 'target'], + 'b' => [], + 'img' => ['src', 'width', 'height', 'alt'], + ]; # # tags which should always be self-closing (e.g. "") # - public $no_close = array( + public $no_close = [ 'img', - ); + ]; # # tags which must always have seperate opening and closing tags (e.g. "") # - public $always_close = array( + public $always_close = [ 'a', 'b', - ); + ]; # # attributes which should be checked for valid protocols # - public $protocol_attributes = array( + public $protocol_attributes = [ 'src', 'href', - ); + ]; # # protocols which are allowed # - public $allowed_protocols = array( + public $allowed_protocols = [ 'http', 'https', 'ftp', 'mailto', - ); + ]; # # tags which should be removed if they contain no content (e.g. "" or "") # - public $remove_blanks = array( + public $remove_blanks = [ 'a', 'b', - ); + ]; # # should we remove comments? @@ -105,12 +104,12 @@ class LibFilter { # converted from '&foo;' to '&foo;' # - public $allowed_entities = array( + public $allowed_entities = [ 'amp', 'gt', 'lt', 'quot', - ); + ]; # # should we convert dec/hex entities in the general doc (not inside protocol attribute) @@ -133,7 +132,7 @@ class LibFilter { public function go($data) { - $this->tag_counts = array(); + $this->tag_counts = []; $data = $this->escape_comments($data); $data = $this->balance_html($data); @@ -154,9 +153,9 @@ public function go($data) { public function escape_comments($data) { - $data = preg_replace_callback("//s", function($matches) { - return ''; - }, $data); + $data = preg_replace_callback("//s", function ($matches) { + return ''; + }, $data); return $data; } @@ -204,9 +203,9 @@ public function balance_html($data) { public function check_tags($data) { - $data = preg_replace_callback("/<(.*?)>/s", function($matches) { - return $this->process_tag($this->StripSingle($matches[1])); - }, $data); + $data = preg_replace_callback("/<(.*?)>/s", function ($matches) { + return $this->process_tag($this->StripSingle($matches[1])); + }, $data); foreach (array_keys($this->tag_counts) as $tag) { for ($i = 0; $i < $this->tag_counts[$tag]; $i++) { @@ -373,7 +372,7 @@ public function fix_case($data) { return preg_replace_callback( "/(>|^)([^<]+?)(<|$)/s", - array($this, 'fix_case_inner'), + [$this, 'fix_case_inner'], $data ); } @@ -392,7 +391,7 @@ public function fix_case_inner($m) { $data = preg_replace_callback( '/(^|[^\w\s\';,\\-])(\s*)([a-z])/', - function($m) { + function ($m) { return $m[1] . $m[2] . strtoupper($m[3]); }, $data @@ -432,7 +431,8 @@ public function validate_entities($data, $in_attribute) { # $data = preg_replace_callback( - '!&([^&;]*)(?=(;|&|$))!', function($matches) { + '!&([^&;]*)(?=(;|&|$))!', + function ($matches) { return $this->check_entity($this->StripSingle($matches[1]), $this->StripSingle($matches[2])); }, $data @@ -451,7 +451,7 @@ public function cleanup_non_tags($data) { return preg_replace_callback( "/(>|^)([^<]+?)(<|$)/s", - array($this, 'cleanup_non_tags_inner'), + [$this, 'cleanup_non_tags_inner'], $data ); @@ -565,11 +565,11 @@ public function is_valid_entity($entity) { public function decode_entities($data, $in_attribute = 1) { - $data = preg_replace_callback('!(&)#(\d+);?!', array($this, 'decode_dec_entity'), $data); - $data = preg_replace_callback('!(&)#x([0-9a-f]+);?!i', array($this, 'decode_hex_entity'), $data); + $data = preg_replace_callback('!(&)#(\d+);?!', [$this, 'decode_dec_entity'], $data); + $data = preg_replace_callback('!(&)#x([0-9a-f]+);?!i', [$this, 'decode_hex_entity'], $data); if ($in_attribute) { - $data = preg_replace_callback('!(%)([0-9a-f]{2});?!i', array($this, 'decode_hex_entity'), $data); + $data = preg_replace_callback('!(%)([0-9a-f]{2});?!i', [$this, 'decode_hex_entity'], $data); } return $data; @@ -595,7 +595,9 @@ public function decode_dec_entity($m) { public function decode_num_entity($orig_type, $d) { - if ($d < 0) { $d = 32; } # treat control characters as spaces + if ($d < 0) { + $d = 32; + } # treat control characters as spaces # # don't mess with high characters - what to replace them with is @@ -604,8 +606,12 @@ public function decode_num_entity($orig_type, $d) { # if ($d > 127) { - if ($orig_type == '%') { return '%' . dechex($d); } - if ($orig_type == '&') { return "&#$d;"; } + if ($orig_type == '%') { + return '%' . dechex($d); + } + if ($orig_type == '&') { + return "&#$d;"; + } } # @@ -620,7 +626,7 @@ public function decode_num_entity($orig_type, $d) { ##################################################################################### public function StripSingle($data) { - return str_replace(array('\\"', "\\0"), array('"', chr(0)), $data); + return str_replace(['\\"', "\\0"], ['"', chr(0)], $data); } ##################################################################################### diff --git a/classes/Utility/Member.php b/classes/Utility/Member.php index c27fc52d8c..94deee1d9e 100644 --- a/classes/Utility/Member.php +++ b/classes/Utility/Member.php @@ -8,9 +8,7 @@ * Utility functions related to members */ -class Member -{ - +class Member { /** * Find Member Image * @@ -24,7 +22,8 @@ class Member */ public static function findMemberImage($pid, $smallonly = false, $substitute_missing = false) { - $image = null; $sz = null; + $image = null; + $sz = null; if (!$smallonly && is_file(BASEDIR . IMAGEPATH . 'mpsL/' . $pid . '.jpeg')) { $image = IMAGEPATH . 'mpsL/' . $pid . '.jpeg'; $sz = 'L'; @@ -63,7 +62,7 @@ public static function findMemberImage($pid, $smallonly = false, $substitute_mis $sz = 'L'; } } - return array($image, $sz); + return [$image, $sz]; } } diff --git a/classes/Utility/Postcode.php b/classes/Utility/Postcode.php index 92813853c9..7cde72d68a 100644 --- a/classes/Utility/Postcode.php +++ b/classes/Utility/Postcode.php @@ -1,4 +1,5 @@ query('select name from postcode_lookup where postcode = :postcode', array( - ':postcode' => $postcode - ))->first(); + $db = new \ParlDB(); + $q = $db->query('select name from postcode_lookup where postcode = :postcode', [ + ':postcode' => $postcode, + ])->first(); if ($q) { $name = $q['name']; @@ -81,13 +82,13 @@ private static function postcodeFetchFromDb($postcode) { } $name = explode('|', $name); if ($country == 'W') { - return array('WMC' => $name[0], 'WAC' => $name[1], 'WAE' => $name[2]); - } elseif ($country == 'S' || count($name)==3) { - return array('WMC' => $name[0], 'SPC' => $name[1], 'SPE' => $name[2]); - } elseif ($country == 'N' || count($name)==2) { - return array('WMC' => $name[0], 'NIE' => $name[1]); + return ['WMC' => $name[0], 'WAC' => $name[1], 'WAE' => $name[2]]; + } elseif ($country == 'S' || count($name) == 3) { + return ['WMC' => $name[0], 'SPC' => $name[1], 'SPE' => $name[2]]; + } elseif ($country == 'N' || count($name) == 2) { + return ['WMC' => $name[0], 'NIE' => $name[1]]; } else { - return array('WMC' => $name[0]); + return ['WMC' => $name[0]]; } } } @@ -118,16 +119,17 @@ private static function postcodeFetchFromMapit($postcode) { $r = json_decode($file, true); if (!$r) { - trigger_error("Postcode database is not working. Content:\n".$file.", request: ". $filename, E_USER_WARNING); + trigger_error("Postcode database is not working. Content:\n" . $file . ", request: " . $filename, E_USER_WARNING); return ''; } if (isset($r['error']) || !isset($r['areas'])) { return ''; } - $areas = array(); + $areas = []; foreach ($r['areas'] as $row) { - if (in_array($row['type'], array('WMC', 'SPC', 'SPE', 'NIE', 'WAC', 'WAE'))) + if (in_array($row['type'], ['WMC', 'SPC', 'SPE', 'NIE', 'WAC', 'WAE'])) { $areas[$row['type']] = $row['name']; + } } if (!isset($areas['WMC'])) { @@ -147,12 +149,14 @@ private static function postcodeFetchFromMapit($postcode) { } else { $serialized = "E;$areas[WMC]"; } - $db = new \ParlDB; - $db->query('replace into postcode_lookup values(:postcode, :serialized)', - array( + $db = new \ParlDB(); + $db->query( + 'replace into postcode_lookup values(:postcode, :serialized)', + [ ':postcode' => $postcode, - ':serialized' => $serialized - )); + ':serialized' => $serialized, + ] + ); } else { return ''; } @@ -175,4 +179,3 @@ public static function canonicalisePostcode($pc) { } } - diff --git a/classes/Utility/Search.php b/classes/Utility/Search.php index b97d366199..67200ee12e 100644 --- a/classes/Utility/Search.php +++ b/classes/Utility/Search.php @@ -8,10 +8,9 @@ * Utility functions related to search and search strings */ -class Search -{ +class Search { public static function searchByUsage($search, $house = 0) { - $data = array(); + $data = []; $SEARCHENGINE = new \SEARCHENGINE($search); $data['pagetitle'] = $SEARCHENGINE->query_description_short(); $SEARCHENGINE = new \SEARCHENGINE($search . ' groupby:speech'); @@ -33,9 +32,9 @@ public static function searchByUsage($search, $house = 0) { } # Fetch all the speakers of the results, count them up and get min/max date usage - $speaker_count = array(); + $speaker_count = []; $gids = join('","', $gids); - $db = new \ParlDB; + $db = new \ParlDB(); $q = $db->query('SELECT person_id,hdate FROM hansard WHERE gid IN ("' . $gids . '")'); foreach ($q as $row) { $person_id = $row['person_id']; @@ -55,8 +54,8 @@ public static function searchByUsage($search, $house = 0) { } # Fetch details of all the speakers - $speakers = array(); - $pids = array(); + $speakers = []; + $pids = []; if (count($speaker_count)) { $person_ids = join(',', array_keys($speaker_count)); $q = $db->query('SELECT member_id, member.person_id, title, given_name, family_name, lordofname, @@ -89,17 +88,17 @@ public static function searchByUsage($search, $house = 0) { $speakers[$pid]['office'][$moffice_id] = prettify_office($posn, $dept); } if (!isset($speakers[$pid]['name'])) { - $speakers[$pid]['name'] = $full_name . ($house==1?' MP':''); + $speakers[$pid]['name'] = $full_name . ($house == 1 ? ' MP' : ''); } - if ( !isset($speakers[$pid]['party']) && $party ) { + if (!isset($speakers[$pid]['party']) && $party) { $speakers[$pid]['party'] = $party; } } } if (isset($speaker_count[0])) { - $speakers[0] = array('party'=>'', 'name'=>'Headings, procedural text, etc.', 'house'=>0, 'count'=>0); + $speakers[0] = ['party' => '', 'name' => 'Headings, procedural text, etc.', 'house' => 0, 'count' => 0]; } - $party_count = array(); + $party_count = []; $ok = 0; foreach ($speakers as $pid => &$speaker) { $speaker['count'] = $speaker_count[$pid]; @@ -114,7 +113,7 @@ public static function searchByUsage($search, $house = 0) { } } - uasort($speakers, function($a, $b) { + uasort($speakers, function ($a, $b) { if ($a['count'] > $b['count']) { return -1; @@ -144,12 +143,12 @@ public static function searchByUsage($search, $house = 0) { * Return query result from looking for MPs */ - public static function searchMemberDbLookup($searchstring, $current_only=false) { + public static function searchMemberDbLookup($searchstring, $current_only = false) { if (!$searchstring) { - return array(); + return []; } $searchwords = explode(' ', $searchstring, 3); - $params = array(); + $params = []; if (count($searchwords) == 1) { $params[':like_0'] = '%' . $searchwords[0] . '%'; $where = "given_name LIKE :like_0 OR family_name LIKE :like_0 OR lordofname LIKE :like_0"; @@ -158,8 +157,8 @@ public static function searchMemberDbLookup($searchstring, $current_only=false) // And here we're assuming the user's put the names in the right order. $params[':like_0'] = '%' . $searchwords[0] . '%'; $params[':like_1'] = '%' . $searchwords[1] . '%'; - $params[':like_0_and_1'] = '%' . $searchwords[0] . ' '. $searchwords[1] . '%'; - $params[':like_0_and_1_hyphen'] = '%' . $searchwords[0] . '-'. $searchwords[1] . '%'; + $params[':like_0_and_1'] = '%' . $searchwords[0] . ' ' . $searchwords[1] . '%'; + $params[':like_0_and_1_hyphen'] = '%' . $searchwords[0] . '-' . $searchwords[1] . '%'; $where = "(given_name LIKE :like_0 AND family_name LIKE :like_1)"; $where .= " OR (given_name LIKE :like_1 AND family_name LIKE :like_0)"; $where .= " OR (title LIKE :like_0 AND family_name LIKE :like_1)"; @@ -174,9 +173,9 @@ public static function searchMemberDbLookup($searchstring, $current_only=false) $params[':like_0'] = '%' . $searchwords[0] . '%'; $params[':like_1'] = '%' . $searchwords[1] . '%'; $params[':like_2'] = '%' . $searchwords[2] . '%'; - $params[':like_0_and_1'] = '%' . $searchwords[0] . ' '. $searchwords[1] . '%'; - $params[':like_1_and_2'] = '%' . $searchwords[1] . ' '. $searchwords[2] . '%'; - $params[':like_1_and_2_hyphen'] = '%' . $searchwords[1] . '-'. $searchwords[2] . '%'; + $params[':like_0_and_1'] = '%' . $searchwords[0] . ' ' . $searchwords[1] . '%'; + $params[':like_1_and_2'] = '%' . $searchwords[1] . ' ' . $searchwords[2] . '%'; + $params[':like_1_and_2_hyphen'] = '%' . $searchwords[1] . '-' . $searchwords[2] . '%'; $where = "(given_name LIKE :like_0_and_1 AND family_name LIKE :like_2)"; $where .= " OR (given_name LIKE :like_0 AND family_name LIKE :like_1_and_2)"; $where .= " OR (given_name LIKE :like_0 AND family_name LIKE :like_1_and_2_hyphen)"; @@ -186,15 +185,16 @@ public static function searchMemberDbLookup($searchstring, $current_only=false) $where .= " OR (title LIKE :like_0 AND family_name LIKE :like_1 AND lordofname LIKE :like_2)"; } - $db = new \ParlDB; + $db = new \ParlDB(); $q = $db->query("SELECT person_id FROM person_names WHERE type='name' AND ($where)", $params); # Check for redirects - $pids = array(); + $pids = []; foreach ($q as $row) { $pid = $row['person_id']; - $redirect = $db->query("SELECT gid_to FROM gidredirect WHERE gid_from = :gid_from", - array(':gid_from' => "uk.org.publicwhip/person/$pid") + $redirect = $db->query( + "SELECT gid_to FROM gidredirect WHERE gid_from = :gid_from", + [':gid_from' => "uk.org.publicwhip/person/$pid"] )->first(); if ($redirect) { $pid = str_replace('uk.org.publicwhip/person/', '', $redirect['gid_to']); @@ -205,7 +205,7 @@ public static function searchMemberDbLookup($searchstring, $current_only=false) return array_unique($pids); } - public static function searchMemberDbLookupWithNames($searchstring, $current_only=false) { + public static function searchMemberDbLookupWithNames($searchstring, $current_only = false) { $pids = self::searchMemberDbLookup($searchstring, $current_only); if (!count($pids)) { @@ -221,7 +221,7 @@ public static function searchMemberDbLookupWithNames($searchstring, $current_onl # This is not totally accurate (e.g. minimum entered date may be from a # different house, or similar), but should be good enough. - $db = new \ParlDB; + $db = new \ParlDB(); $q = $db->query("SELECT member.person_id, title, given_name, family_name, lordofname, constituency, party, @@ -254,7 +254,7 @@ public static function searchConstituenciesByQuery($searchterm) { // Looks like a postcode - can we find the constituency? $constituency = Postcode::postcodeToConstituency($searchterm); if ($constituency) { - return array( array($constituency), true ); + return [ [$constituency], true ]; } } @@ -264,15 +264,15 @@ public static function searchConstituenciesByQuery($searchterm) { (select name from constituency where cons_id = o.cons_id and main_name) as name from constituency AS o where name like :try and from_date <= date(now()) and date(now()) <= to_date"; - $db = new \ParlDB; - $q = $db->query($query, array(':try' => '%' . $try . '%')); + $db = new \ParlDB(); + $q = $db->query($query, [':try' => '%' . $try . '%']); - $constituencies = array(); + $constituencies = []; foreach ($q as $row) { $constituencies[] = $row['name']; } - return array( $constituencies, false ); + return [ $constituencies, false ]; } /** @@ -288,8 +288,8 @@ public static function speakerNamesForIDs($searchstring) { $speakers = []; foreach ($criteria as $c) { - if (preg_match('#^speaker:(\d+)#',$c,$m)) { - $MEMBER = new \MEMBER(array('person_id'=>$m[1])); + if (preg_match('#^speaker:(\d+)#', $c, $m)) { + $MEMBER = new \MEMBER(['person_id' => $m[1]]); $speakers[$m[1]] = $MEMBER->full_name(); } } @@ -307,7 +307,7 @@ public static function speakerNamesForIDs($searchstring) { public static function speakerIDsToNames($searchstring) { $speakers = self::speakerNamesForIDs($searchstring); - foreach ( $speakers as $id => $name ) { + foreach ($speakers as $id => $name) { $searchstring = str_replace('speaker:' . $id, "speaker:$name", $searchstring); } diff --git a/classes/Utility/Shuffle.php b/classes/Utility/Shuffle.php index 7b4083310d..36a02a7bff 100644 --- a/classes/Utility/Shuffle.php +++ b/classes/Utility/Shuffle.php @@ -2,12 +2,11 @@ namespace MySociety\TheyWorkForYou\Utility; -class Shuffle -{ +class Shuffle { public static function keyValue($arr) { $keys = array_keys($arr); shuffle($keys); - $new = array(); + $new = []; foreach ($keys as $key) { $new[$key] = $arr[$key]; } diff --git a/classes/Utility/Wikipedia.php b/classes/Utility/Wikipedia.php index 3cef6ba8d8..b9ed31683f 100644 --- a/classes/Utility/Wikipedia.php +++ b/classes/Utility/Wikipedia.php @@ -18,9 +18,7 @@ * antiTaginTag stuff) */ -class Wikipedia -{ - +class Wikipedia { public static function wikipedize($source) { global $format_date_months; $months = join('|', array_slice($format_date_months, 1)); @@ -67,8 +65,14 @@ public static function wikipedize($source) { preg_match_all("/\b[A-Z]{2,}/ms", $source, $acronyms); # We don't want no steenking duplicates - $phrases = array_unique(array_merge($propernounphrases1[0], $propernounphrases2[0], - $propernounphrases3[1], $propernounphrases4[1], $propernounphrases5[0], $acronyms[0])); + $phrases = array_unique(array_merge( + $propernounphrases1[0], + $propernounphrases2[0], + $propernounphrases3[1], + $propernounphrases4[1], + $propernounphrases5[0], + $acronyms[0] + )); foreach ($phrases as $i => $phrase) { # Ignore months if (preg_match("#^($months)\s+\d+$#", $phrase)) { @@ -78,7 +82,7 @@ public static function wikipedize($source) { } // Assemble the resulting phrases into a parameter array - $params = array(); + $params = []; foreach ($phrases as $i => $phrase) { $params[':phrase' . $i] = $phrase; } @@ -92,17 +96,17 @@ public static function wikipedize($source) { # Open up a db connection, and whittle our list down even further, against # the real titles. - $matched = array(); - $db = new \ParlDB; + $matched = []; + $db = new \ParlDB(); $source = explode('|||', $source); $q = $db->query("SELECT titles.title FROM titles LEFT JOIN titles_ignored ON titles.title=titles_ignored.title WHERE titles.title IN (" . join(',', array_keys($params)) . ") AND titles_ignored.title IS NULL", $params); - $phrases = array(); + $phrases = []; foreach ($q as $row) { $phrases[] = $row['title']; } # Sort into order, largest first - usort($phrases, function($a, $b) { + usort($phrases, function ($a, $b) { return strlen($a) < strlen($b); }); @@ -120,7 +124,7 @@ public static function wikipedize($source) { twfy_debug("WIKIPEDIA", "Matched '$phrase'"); # 1 means only replace one match for phrase per paragraph - $source = preg_replace ('{ + $source = preg_replace('{ \b(' . $phrase_re . ')\b # Match the phrase itself (?! # Match as long as the following does *not* apply: (?: # Match, possessively, as many strings of: @@ -150,63 +154,60 @@ public static function wikipedize($source) { * @todo Remove this, it seems to be redundant. */ - public static function antiTagInTag($content = '', $format = 'htmlhead') - { - $tagend = -1; - for( $tagstart = strpos( $content, '<', $tagend + 1 ) ; $tagstart !== false && $tagstart < strlen( $content ); $tagstart = strpos( $content, '<', $tagend ) ) - { - // got the start of a tag. Now find the proper end! - $walker = $tagstart + 1; - $open = 1; - while( $open != 0 && $walker < strlen( $content ) ) - { - $nextopen = strpos( $content, '<', $walker ); - $nextclose = strpos( $content, '>', $walker ); - if( $nextclose === false ) { - // ERROR! Open waka without close waka! - // echo 'Error in antiTagInTag - malformed tag! '; - return $content; - } - if( $nextopen === false || $nextopen > $nextclose ) { - // No more opens, but there was a close; or, a close happens before the next open. - // walker goes to the close+1, and open decrements - $open --; - $walker = $nextclose + 1; - } elseif( $nextopen < $nextclose ) { - // an open before the next close - $open ++; - $walker = $nextopen + 1; - } + public static function antiTagInTag($content = '', $format = 'htmlhead') { + $tagend = -1; + for($tagstart = strpos($content, '<', $tagend + 1) ; $tagstart !== false && $tagstart < strlen($content); $tagstart = strpos($content, '<', $tagend)) { + // got the start of a tag. Now find the proper end! + $walker = $tagstart + 1; + $open = 1; + while($open != 0 && $walker < strlen($content)) { + $nextopen = strpos($content, '<', $walker); + $nextclose = strpos($content, '>', $walker); + if($nextclose === false) { + // ERROR! Open waka without close waka! + // echo 'Error in antiTagInTag - malformed tag! '; + return $content; + } + if($nextopen === false || $nextopen > $nextclose) { + // No more opens, but there was a close; or, a close happens before the next open. + // walker goes to the close+1, and open decrements + $open--; + $walker = $nextclose + 1; + } elseif($nextopen < $nextclose) { + // an open before the next close + $open++; + $walker = $nextopen + 1; + } + } + $tagend = $walker; + if($tagend > strlen($content)) { + $tagend = strlen($content); + } else { + $tagend--; + $tagstart++; + } + $tag = substr($content, $tagstart, $tagend - $tagstart); + $tags[] = '<' . $tag . '>'; + + if (function_exists('format_to_output')) { + $newtag = format_to_output($tag, $format); + } else { + $newtag = strip_tags($tag); + } + + $newtags[] = '<' . $newtag . '>'; + + if (function_exists('format_to_output')) { + $newtag = format_to_output($tag, $format); + } else { + $newtag = strip_tags($tag); + } } - $tagend = $walker; - if( $tagend > strlen( $content ) ) { - $tagend = strlen( $content ); - } else { - $tagend --; - $tagstart ++; - } - $tag = substr( $content, $tagstart, $tagend - $tagstart ); - $tags[] = '<' . $tag . '>'; - - if (function_exists('format_to_output')) { - $newtag = format_to_output($tag, $format); - } else { - $newtag = strip_tags($tag); - } - - $newtags[] = '<' . $newtag . '>'; - - if (function_exists('format_to_output')) { - $newtag = format_to_output($tag, $format); - } else { - $newtag = strip_tags($tag); - } + if (isset($tags) && isset($newtags)) { + $content = str_replace($tags, $newtags, $content); } - if (isset($tags)&&isset($newtags)) { - $content = str_replace($tags, $newtags, $content); - } - return $content; + return $content; } diff --git a/scripts/alertgonemps.php b/scripts/alertgonemps.php index 18689eb630..cd49d16b30 100644 --- a/scripts/alertgonemps.php +++ b/scripts/alertgonemps.php @@ -1,5 +1,5 @@ '', 'token' => ''); -$email_text = array(); +$current = ['email' => '', 'token' => '']; +$email_text = []; $globalsuccess = 1; # Fetch all confirmed, non-deleted alerts -$confirmed = 1; $deleted = 0; +$confirmed = 1; +$deleted = 0; $alertdata = $LIVEALERTS->fetch($confirmed, $deleted); $alertdata = $alertdata['data']; $outof = count($alertdata); -$members = array(); +$members = []; $start_time = time(); foreach ($alertdata as $alertitem) { - $active++; - $email = $alertitem['email']; + $active++; + $email = $alertitem['email']; if ($onlyemail && $email != $onlyemail) { continue; } @@ -90,39 +91,39 @@ function mlog($message) { } $criteria_raw = $alertitem['criteria']; - if (!strstr($criteria_raw, 'speaker:')) { - continue; - } + if (!strstr($criteria_raw, 'speaker:')) { + continue; + } - preg_match('#speaker:(\d+)#', $criteria_raw, $m); - $person_id = $m[1]; - if (!isset($members[$person_id])) { + preg_match('#speaker:(\d+)#', $criteria_raw, $m); + $person_id = $m[1]; + if (!isset($members[$person_id])) { $queries++; - $members[$person_id] = new MEMBER(array('person_id' => $person_id)); - } + $members[$person_id] = new MEMBER(['person_id' => $person_id]); + } $member = $members[$person_id]; if ($member->current_member_anywhere()) { continue; } - if ($email != $current['email']) { - if ($email_text) { - write_and_send_email($current, $email_text, $template); - } - $current['email'] = $email; - $current['token'] = $alertitem['alert_id'] . '-' . $alertitem['registrationtoken']; - $email_text = array(); - $q = $db->query('SELECT user_id FROM users WHERE email = :email', array( - ':email' => $email))->first(); + if ($email != $current['email']) { + if ($email_text) { + write_and_send_email($current, $email_text, $template); + } + $current['email'] = $email; + $current['token'] = $alertitem['alert_id'] . '-' . $alertitem['registrationtoken']; + $email_text = []; + $q = $db->query('SELECT user_id FROM users WHERE email = :email', [ + ':email' => $email])->first(); if ($q) { $user_id = $q['user_id']; $registered++; - } else { - $user_id = 0; - $unregistered++; - } - mlog("\nEMAIL: $email, uid $user_id; memory usage : ".memory_get_usage()."\n"); - } + } else { + $user_id = 0; + $unregistered++; + } + mlog("\nEMAIL: $email, uid $user_id; memory usage : " . memory_get_usage() . "\n"); + } $lh = $member->left_house(); $lh = array_shift($lh); @@ -143,37 +144,36 @@ function mlog($message) { } else { $sss .= 'Something went wrong! Total time: '; } -$sss .= (getmicrotime()-$global_start)."\n\n"; +$sss .= (getmicrotime() - $global_start) . "\n\n"; mlog($sss); mlog(date('r') . "\n"); function write_and_send_email($current, $data, $template) { - global $globalsuccess, $sentemails, $nomail, $start_time; - - $sentemails++; - mlog("SEND $sentemails : Sending email to $current[email] ... "); - $d = array('to' => $current['email'], 'template' => $template); - $m = array( - 'DATA' => join("\n", $data), - 'MANAGE' => 'https://www.theyworkforyou.com/D/' . $current['token'], - 'ALERT_IS' => count($data)==1 ? 'alert is' : 'alerts are', - 'ALERTS' => count($data)==1 ? 'an alert' : 'some alerts', - ); - if (!$nomail) { - $success = send_template_email($d, $m, true); - mlog("sent ... "); - # sleep if time between sending mails is less than a certain number of seconds on average - if (((time() - $start_time) / $sentemails) < 0.5 ) { # number of seconds per mail not to be quicker than - mlog("pausing ... "); - sleep(1); - } - } else { - mlog(join('', $data)); - $success = 1; - } - mlog("done\n"); - if (!$success) { - $globalsuccess = 0; - } + global $globalsuccess, $sentemails, $nomail, $start_time; + + $sentemails++; + mlog("SEND $sentemails : Sending email to $current[email] ... "); + $d = ['to' => $current['email'], 'template' => $template]; + $m = [ + 'DATA' => join("\n", $data), + 'MANAGE' => 'https://www.theyworkforyou.com/D/' . $current['token'], + 'ALERT_IS' => count($data) == 1 ? 'alert is' : 'alerts are', + 'ALERTS' => count($data) == 1 ? 'an alert' : 'some alerts', + ]; + if (!$nomail) { + $success = send_template_email($d, $m, true); + mlog("sent ... "); + # sleep if time between sending mails is less than a certain number of seconds on average + if (((time() - $start_time) / $sentemails) < 0.5) { # number of seconds per mail not to be quicker than + mlog("pausing ... "); + sleep(1); + } + } else { + mlog(join('', $data)); + $success = 1; + } + mlog("done\n"); + if (!$success) { + $globalsuccess = 0; + } } - diff --git a/scripts/alertmailer.php b/scripts/alertmailer.php index b23b3d5801..3f9c2db8cc 100644 --- a/scripts/alertmailer.php +++ b/scripts/alertmailer.php @@ -1,5 +1,5 @@ query('SELECT max(indexbatch_id) as max_batch_id FROM indexbatch')->first(); @@ -26,7 +26,7 @@ function mlog($message) { if (is_file(RAWDATA . '/alerts-lastsent')) { $lastsent = file(RAWDATA . '/alerts-lastsent'); } else { - $lastsent = array('', 0); + $lastsent = ['', 0]; } $lastupdated = trim($lastsent[0]); @@ -98,21 +98,22 @@ function mlog($message) { $registered = 0; $sentemails = 0; -$LIVEALERTS = new ALERT; +$LIVEALERTS = new ALERT(); -$current = array('email' => '', 'token' => '', 'lang' => ''); +$current = ['email' => '', 'token' => '', 'lang' => '']; $email_text = ''; $html_text = ''; $globalsuccess = 1; # Fetch all confirmed, non-deleted alerts -$confirmed = 1; $deleted = 0; +$confirmed = 1; +$deleted = 0; $alertdata = $LIVEALERTS->fetch($confirmed, $deleted); $alertdata = $alertdata['data']; -$DEBATELIST = new DEBATELIST; # Nothing debate specific, but has to be one of them +$DEBATELIST = new DEBATELIST(); # Nothing debate specific, but has to be one of them -$sects = array( +$sects = [ 1 => gettext('Commons debate'), 2 => gettext('Westminster Hall debate'), 3 => gettext('Written Answer'), @@ -127,8 +128,8 @@ function mlog($message) { 101 => gettext('Lords debate'), 'F' => gettext('event'), 'V' => gettext('vote'), -); -$sects_plural = array( +]; +$sects_plural = [ 1 => gettext('Commons debates'), 2 => gettext('Westminster Hall debates'), 3 => gettext('Written Answers'), @@ -143,8 +144,8 @@ function mlog($message) { 101 => gettext('Lords debate'), 'F' => gettext('event'), 'V' => gettext('vote'), -); -$sects_gid = array( +]; +$sects_gid = [ 1 => 'debate', 2 => 'westminhall', 3 => 'wrans', @@ -158,8 +159,8 @@ function mlog($message) { 11 => 'senedd/cy', 101 => 'lords', 'F' => 'calendar', -); -$sects_search = array( +]; +$sects_search = [ 1 => 'debate', 2 => 'westminhall', 3 => 'wrans', @@ -173,7 +174,7 @@ function mlog($message) { 11 => 'wales', 101 => 'lords', 'F' => 'future', -); +]; $domain = ''; $outof = count($alertdata); @@ -217,9 +218,9 @@ function mlog($message) { $current['lang'] = $lang; $email_text = ''; $html_text = ''; - $q = $db->query('SELECT user_id FROM users WHERE email = :email', array( - ':email' => $email - ))->first(); + $q = $db->query('SELECT user_id FROM users WHERE email = :email', [ + ':email' => $email, + ])->first(); if ($q) { $user_id = $q['user_id']; $registered++; @@ -234,27 +235,27 @@ function mlog($message) { $start = getmicrotime(); $SEARCHENGINE = new SEARCHENGINE($criteria_batch, $lang); #mlog("query_remade: " . $SEARCHENGINE->query_remade() . "\n"); - $args = array( + $args = [ 's' => $criteria_raw, # Note: use raw here for URLs, whereas search engine has batch 'threshold' => $lastupdated, # Return everything added since last time this script was run 'o' => 'c', 'num' => 1000, // this is limited to 1000 in hansardlist.php anyway 'pop' => 1, - 'e' => 1 # Don't escape ampersands - ); + 'e' => 1, # Don't escape ampersands + ]; $data = $DEBATELIST->_get_data_by_search($args); $total_results = $data['info']['total_results']; $queries++; - mlog(", hits " . $total_results . ", time " . (getmicrotime()-$start) . "\n"); + mlog(", hits " . $total_results . ", time " . (getmicrotime() - $start) . "\n"); # Divisions if (preg_match('#^speaker:(\d+)$#', $criteria_raw, $m)) { $pid = $m[1]; $q = $db->query('SELECT * FROM persondivisionvotes pdv JOIN divisions USING(division_id) - WHERE person_id=:person_id AND pdv.lastupdate >= :time', array( - 'person_id' => $pid, - ':time' => date('Y-m-d H:i:s', $lastupdated), - )); + WHERE person_id=:person_id AND pdv.lastupdate >= :time', [ + 'person_id' => $pid, + ':time' => date('Y-m-d H:i:s', $lastupdated), + ]); foreach ($q as $row) { # Skip other-language divisions if needed, set locale if (strpos($row['division_id'], '-cy-')) { @@ -310,11 +311,15 @@ function mlog($message) { if (isset($data['rows']) && count($data['rows']) > 0) { usort($data['rows'], 'sort_by_stuff'); # Sort results into order, by major, then date, then hpos - $o = array(); $major = 0; $count = array(); $total = 0; + $o = []; + $major = 0; + $count = []; + $total = 0; $any_content = false; foreach ($data['rows'] as $row) { if ($major !== $row['major']) { - $count[$major] = $total; $total = 0; + $count[$major] = $total; + $total = 0; $major = $row['major']; $o[$major] = ['text' => '', 'html' => '']; $k = 3; @@ -322,9 +327,9 @@ function mlog($message) { #mlog($row['major'] . " " . $row['gid'] ."\n"); if (isset($sects_gid[$major])) { - $q = $db->query('SELECT gid_from FROM gidredirect WHERE gid_to = :gid_to', array( - ':gid_to' => 'uk.org.publicwhip/' . $sects_gid[$major] . '/' . $row['gid'] - )); + $q = $db->query('SELECT gid_from FROM gidredirect WHERE gid_to = :gid_to', [ + ':gid_to' => 'uk.org.publicwhip/' . $sects_gid[$major] . '/' . $row['gid'], + ]); if ($q->rows() > 0) { continue; } @@ -461,12 +466,12 @@ function write_and_send_email($current, $text, $html, $template) { $text .= '===================='; $sentemails++; mlog("SEND $sentemails : Sending email to $current[email] ... "); - $d = array('to' => $current['email'], 'template' => $template); - $m = array( + $d = ['to' => $current['email'], 'template' => $template]; + $m = [ 'DATA' => $text, '_HTML_' => $html, 'MANAGE' => "https://$domain/D/" . $current['token'], - ); + ]; if (!$nomail) { $success = send_template_email($d, $m, true, true, $current['lang']); # true = "Precedence: bulk", want bounces mlog("sent ... "); @@ -490,8 +495,8 @@ function text_html_to_email($s) { $s = preg_replace('##', '', $s); $s = preg_replace('#]*>#', '*', $s); $s = str_replace( - array('£', '–', '—', '’', '
    '), - array("\xa3", '-', '-', "'", "\n"), + ['£', '–', '—', '’', '
    '], + ["\xa3", '-', '-', "'", "\n"], $s ); return $s; diff --git a/scripts/alertmpchanged.php b/scripts/alertmpchanged.php index 113a2d2209..6a7a268bee 100644 --- a/scripts/alertmpchanged.php +++ b/scripts/alertmpchanged.php @@ -13,7 +13,7 @@ function mlog($message) { include_once INCLUDESPATH . 'easyparliament/member.php'; $global_start = getmicrotime(); -$db = new ParlDB; +$db = new ParlDB(); $nomail = false; $onlyemail = ''; @@ -21,19 +21,19 @@ function mlog($message) { $fromflag = false; $toemail = ''; $template = 'alert_new_mp'; -for ($k=1; $k<$argc; $k++) { - if ($argv[$k] == '--nomail') { - $nomail = true; - } - if (preg_match('#^--only=(.*)$#', $argv[$k], $m)) { - $onlyemail = $m[1]; - } - if (preg_match('#^--from=(.*)$#', $argv[$k], $m)) { - $fromemail = $m[1]; - } - if (preg_match('#^--to=(.*)$#', $argv[$k], $m)) { - $toemail = $m[1]; - } +for ($k = 1; $k < $argc; $k++) { + if ($argv[$k] == '--nomail') { + $nomail = true; + } + if (preg_match('#^--only=(.*)$#', $argv[$k], $m)) { + $onlyemail = $m[1]; + } + if (preg_match('#^--from=(.*)$#', $argv[$k], $m)) { + $fromemail = $m[1]; + } + if (preg_match('#^--to=(.*)$#', $argv[$k], $m)) { + $toemail = $m[1]; + } } if (DEVSITE) { @@ -47,8 +47,8 @@ function mlog($message) { mlog("NOT SENDING EMAIL\n"); } if (($fromemail && $onlyemail) || ($toemail && $onlyemail)) { - mlog("Can't have both from/to and only!\n"); - exit; + mlog("Can't have both from/to and only!\n"); + exit; } $active = 0; @@ -57,24 +57,25 @@ function mlog($message) { $registered = 0; $sentemails = 0; -$LIVEALERTS = new ALERT; +$LIVEALERTS = new ALERT(); -$current = array('email' => '', 'token' => ''); -$email_text = array(); -$change_text = array(); +$current = ['email' => '', 'token' => '']; +$email_text = []; +$change_text = []; $globalsuccess = 1; # Fetch all confirmed, non-deleted alerts -$confirmed = 1; $deleted = 0; +$confirmed = 1; +$deleted = 0; $alertdata = $LIVEALERTS->fetch($confirmed, $deleted); $alertdata = $alertdata['data']; $outof = count($alertdata); -$members = array(); +$members = []; $start_time = time(); foreach ($alertdata as $alertitem) { - $active++; - $email = $alertitem['email']; + $active++; + $email = $alertitem['email']; if ($onlyemail && $email != $onlyemail) { continue; } @@ -98,7 +99,7 @@ function mlog($message) { $person_id = $m[1]; if (!isset($members[$person_id])) { $queries++; - $members[$person_id] = new MEMBER(array('person_id' => $person_id)); + $members[$person_id] = new MEMBER(['person_id' => $person_id]); } $member = $members[$person_id]; @@ -112,9 +113,9 @@ function mlog($message) { continue; } - if ( !isset($cons[$member->constituency]) ) { - $cons_member = new MEMBER(array('constituency' => $member->constituency, 'house' => 1)); - if ( !$cons_member ) { + if (!isset($cons[$member->constituency])) { + $cons_member = new MEMBER(['constituency' => $member->constituency, 'house' => 1]); + if (!$cons_member) { continue; } $cons[$member->constituency] = $cons_member; @@ -123,7 +124,7 @@ function mlog($message) { } // these should never happen but let's just be sure - if ( $cons_member->person_id == $member->person_id ) { + if ($cons_member->person_id == $member->person_id) { continue; } if (!$cons_member->current_member_anywhere()) { @@ -136,10 +137,10 @@ function mlog($message) { } $current['email'] = $email; $current['token'] = $alertitem['alert_id'] . '-' . $alertitem['registrationtoken']; - $email_text = array(); - $change_text = array(); - $q = $db->query('SELECT user_id FROM users WHERE email = :email', array( - ':email' => $email))->first(); + $email_text = []; + $change_text = []; + $q = $db->query('SELECT user_id FROM users WHERE email = :email', [ + ':email' => $email])->first(); if ($q) { $user_id = $q['user_id']; $registered++; @@ -147,7 +148,7 @@ function mlog($message) { $user_id = 0; $unregistered++; } - mlog("\nEMAIL: $email, uid $user_id; memory usage : ".memory_get_usage()."\n"); + mlog("\nEMAIL: $email, uid $user_id; memory usage : " . memory_get_usage() . "\n"); } $lh = $member->left_house(); @@ -168,11 +169,11 @@ function mlog($message) { $sss = "Active alerts: $active\nEmail lookups: $registered registered, $unregistered unregistered\nQuery lookups: $queries\nSent emails: $sentemails\n"; if ($globalsuccess) { - $sss .= 'Everything went swimmingly, in '; + $sss .= 'Everything went swimmingly, in '; } else { - $sss .= 'Something went wrong! Total time: '; + $sss .= 'Something went wrong! Total time: '; } -$sss .= (getmicrotime()-$global_start)."\n\n"; +$sss .= (getmicrotime() - $global_start) . "\n\n"; mlog($sss); mlog(date('r') . "\n"); @@ -181,22 +182,22 @@ function write_and_send_email($current, $data, $change, $template) { $sentemails++; mlog("SEND $sentemails : Sending email to $current[email] ... "); - $d = array('to' => $current['email'], 'template' => $template); - $m = array( + $d = ['to' => $current['email'], 'template' => $template]; + $m = [ 'DATA' => join("\n", $data), 'CHANGE' => join("\n", $change), - 'ALERT_IS' => count($data)==1 ? 'alert is' : 'alerts are', - 'MPS' => count($data)==1 ? 'This MP' : 'These MPs', - 'MPS2' => count($data)==1 ? 'MP' : 'MPs', - 'ALERTS' => count($data)==1 ? 'an alert' : 'some alerts', - 'ALERTS2' => count($data)==1 ? 'alert' : 'alerts', - 'LINKS' => count($data)==1 ? 'link' : 'links', - ); + 'ALERT_IS' => count($data) == 1 ? 'alert is' : 'alerts are', + 'MPS' => count($data) == 1 ? 'This MP' : 'These MPs', + 'MPS2' => count($data) == 1 ? 'MP' : 'MPs', + 'ALERTS' => count($data) == 1 ? 'an alert' : 'some alerts', + 'ALERTS2' => count($data) == 1 ? 'alert' : 'alerts', + 'LINKS' => count($data) == 1 ? 'link' : 'links', + ]; if (!$nomail) { $success = send_template_email($d, $m, true); mlog("sent ... "); # sleep if time between sending mails is less than a certain number of seconds on average - if (((time() - $start_time) / $sentemails) < 0.5 ) { + if (((time() - $start_time) / $sentemails) < 0.5) { # number of seconds per mail not to be quicker than mlog("pausing ... "); sleep(1); @@ -211,4 +212,3 @@ function write_and_send_email($current, $data, $change, $template) { $globalsuccess = 0; } } - diff --git a/scripts/create_initial_topics.php b/scripts/create_initial_topics.php index 0e0ad0ac5f..67abc5b92b 100644 --- a/scripts/create_initial_topics.php +++ b/scripts/create_initial_topics.php @@ -2,12 +2,12 @@ array( +$all_topics = [ + 'benefits' => [ 'title' => 'Benefits', 'page' => 'topicbenefits', 'blurb' => 'Benefits are a major political issue right now - they @@ -15,81 +15,81 @@ where to find the important debates.', 'policyset' => 'welfare', 'policytitle' => 'Welfare and Benefits', - 'actions' => array( + 'actions' => [ - array( + [ 'title' => 'Universal Credit Regulations', 'icon' => 'debate', 'href' => 'https://www.theyworkforyou.com/lords/?id=2013-02-13a.664.3', 'blurb' => 'Lords debate, and approve, the consolidation of all benefits into the - Universal Credit system.' - ), + Universal Credit system.', + ], - array( + [ 'title' => 'Welfare Benefits Up-rating Bill', 'icon' => 'bill', 'href' => 'https://www.theyworkforyou.com/lords/?id=2013-02-11a.457.8', - 'blurb' => 'Lords debate a cap on annual increases to working-age benefits.' - ), + 'blurb' => 'Lords debate a cap on annual increases to working-age benefits.', + ], - array( + [ 'title' => 'Search the whole site', 'icon' => 'search', 'href' => 'https://www.theyworkforyou.com/search/?s=%22benefits%22', - 'blurb' => 'Search TheyWorkForYou to find mentions of benefits. You may also filter your results by time, speaker and section.' - ), + 'blurb' => 'Search TheyWorkForYou to find mentions of benefits. You may also filter your results by time, speaker and section.', + ], - array( + [ 'title' => 'Sign up for email alerts', 'icon' => 'alert', 'href' => 'https://www.theyworkforyou.com/alert/?alertsearch=%22benefits%22', - 'blurb' => 'We’ll let you know every time benefits are mentioned in Parliament.' - ) + 'blurb' => 'We’ll let you know every time benefits are mentioned in Parliament.', + ], - ) + ], - ), + ], - 'crime-stats' => array( + 'crime-stats' => [ 'title' => 'Crime Statistics', 'page' => 'topiccrimestats', 'blurb' => 'MPs and Lords often talk about Crime Statistics, because they’re a major political issue.', - 'actions' => array( + 'actions' => [ - array( + [ 'title' => 'Anti-social Behaviour Crime and Policing Bill (second reading)', 'icon' => 'bill', 'href' => 'https://www.theyworkforyou.com/lords/?id=2013-10-29a.1482.5', - 'blurb' => 'The House of Lords debate a proposed law, making many references to crime statistics.' - ), + 'blurb' => 'The House of Lords debate a proposed law, making many references to crime statistics.', + ], - array( + [ 'title' => 'Police and Public trust', 'icon' => 'debate', 'href' => 'https://www.theyworkforyou.com/lords/?id=2013-11-28a.1576.0', - 'blurb' => 'A debate on police misconduct and how much the general public trust the police not to cover up crime statistics, mistakes and misbehaviour.' - ), + 'blurb' => 'A debate on police misconduct and how much the general public trust the police not to cover up crime statistics, mistakes and misbehaviour.', + ], - array( + [ 'title' => 'Search the whole site', 'icon' => 'search', 'href' => 'https://www.theyworkforyou.com/search/?s=%22crime+statistics%22', - 'blurb' => 'Search TheyWorkForYou to find mentions of crime statistics. You may also filter your results by time, speaker and section.' - ), + 'blurb' => 'Search TheyWorkForYou to find mentions of crime statistics. You may also filter your results by time, speaker and section.', + ], - array( + [ 'title' => 'Sign up for email alerts', 'icon' => 'alert', 'href' => 'https://www.theyworkforyou.com/alert/?alertsearch=%22crime+statistics%22', - 'blurb' => 'We’ll let you know every time crime statistics are mentioned in Parliament.' - ) + 'blurb' => 'We’ll let you know every time crime statistics are mentioned in Parliament.', + ], - ) + ], - ), + ], - 'nhs' => array( + 'nhs' => [ 'title' => 'The NHS', 'page' => 'topicnhs', 'blurb' => 'The NHS is a major political issue right now — @@ -97,40 +97,40 @@ exactly where to find the important debates.', 'policyset' => 'health', 'policytitle' => 'Healthcare', - 'actions' => array( + 'actions' => [ - array( + [ 'title' => 'Health and Social Care Bill', 'icon' => 'debate', 'href' => 'https://www.theyworkforyou.com/debates/?id=2011-01-31b.605.0', - 'blurb' => 'Andrew Lansley, Secretary of State for Health, sets out plans for a reorganisation of the NHS, which MPs then debate and vote on.' - ), + 'blurb' => 'Andrew Lansley, Secretary of State for Health, sets out plans for a reorganisation of the NHS, which MPs then debate and vote on.', + ], - array( + [ 'title' => 'NHS (Private Sector)', 'icon' => 'debate', 'href' => 'https://www.theyworkforyou.com/debates/?id=2012-01-16a.536.0', - 'blurb' => 'A year later, the opposition puts forward its concerns with the model, ending in a further vote.' - ), + 'blurb' => 'A year later, the opposition puts forward its concerns with the model, ending in a further vote.', + ], - array( + [ 'title' => 'Search the whole site', 'icon' => 'search', 'href' => 'https://www.theyworkforyou.com/search/?s=%22nhs%22', - 'blurb' => 'Search TheyWorkForYou to find mentions of the NHS. You may also filter your results by time, speaker and section.' - ), + 'blurb' => 'Search TheyWorkForYou to find mentions of the NHS. You may also filter your results by time, speaker and section.', + ], - array( + [ 'title' => 'Sign up for email alerts', 'icon' => 'alert', 'href' => 'https://www.theyworkforyou.com/alert/?alertsearch=%nhs%22', - 'blurb' => 'We’ll let you know every time the NHS is mentioned in Parliament.' - ) + 'blurb' => 'We’ll let you know every time the NHS is mentioned in Parliament.', + ], - ) + ], - ) -); + ], +]; foreach ($all_topics as $name => $topic) { $existing = $topics->getTopic($name); diff --git a/scripts/mprss.php b/scripts/mprss.php index 47c3b6bc24..275d388abb 100755 --- a/scripts/mprss.php +++ b/scripts/mprss.php @@ -9,7 +9,7 @@ $rsspath = BASEDIR . '/rss/mp/'; // Make things group writable. -umask (002); +umask(002); $HANSARDLIST = new HANSARDLIST(); $db = $HANSARDLIST->db; @@ -24,47 +24,47 @@ foreach ($q as $person) { $person_id = $person['person_id']; - $args = array ( 'person_id' => $person_id ); - $speeches = $HANSARDLIST->display('person', $args, 'none'); + $args = [ 'person_id' => $person_id ]; + $speeches = $HANSARDLIST->display('person', $args, 'none'); - // Some data about this person that we'll need for the feed. - $MEMBER = new MEMBER(array('person_id' => $person_id)); - $MPURL = new \MySociety\TheyWorkForYou\Url('mp'); - $MPURL->insert(array('pid'=>$person_id)); - $mpurl = $MPURL->generate(); + // Some data about this person that we'll need for the feed. + $MEMBER = new MEMBER(['person_id' => $person_id]); + $MPURL = new \MySociety\TheyWorkForYou\Url('mp'); + $MPURL->insert(['pid' => $person_id]); + $mpurl = $MPURL->generate(); - $date = gmdate('Y-m-d'); - $time = gmdate('H:i:s'); - $datenow = $date . 'T' . $time . '+00:00'; + $date = gmdate('Y-m-d'); + $time = gmdate('H:i:s'); + $datenow = $date . 'T' . $time . '+00:00'; - // Prepare the meat of the RSS file. - $items = ''; - $entries = ''; - if (isset ($speeches['rows']) && count($speeches['rows']) > 0) { + // Prepare the meat of the RSS file. + $items = ''; + $entries = ''; + if (isset($speeches['rows']) && count($speeches['rows']) > 0) { - foreach ($speeches['rows'] as $n => $row) { + foreach ($speeches['rows'] as $n => $row) { - // While we're linking to individual speeches, - // the text is the body of the parent, ie (sub)section. - $title = _htmlentities(str_replace('—', '-', $row['parent']['body'])); + // While we're linking to individual speeches, + // the text is the body of the parent, ie (sub)section. + $title = _htmlentities(str_replace('—', '-', $row['parent']['body'])); - $link = isset($row['listurl']) ? $row['listurl'] : ''; - $link = 'https://' . DOMAIN . $link; + $link = $row['listurl'] ?? ''; + $link = 'https://' . DOMAIN . $link; - $description = _htmlentities(trim_characters($row['body'], 0, 200)); - $contentencoded = $row['body']; + $description = _htmlentities(trim_characters($row['body'], 0, 200)); + $contentencoded = $row['body']; - $hdate = format_date($row['hdate'], '%Y-%m-%d'); - if ($row['htime'] != null) { - $htime = format_time($row['htime'], '%H:%M:%S'); - } else { - $htime = '00:00:00'; - } + $hdate = format_date($row['hdate'], '%Y-%m-%d'); + if ($row['htime'] != null) { + $htime = format_time($row['htime'], '%H:%M:%S'); + } else { + $htime = '00:00:00'; + } - $date = $hdate . 'T' . $htime . '+00:00'; + $date = $hdate . 'T' . $htime . '+00:00'; - $items .= '' . "\n"; - $entries .= " + $items .= '' . "\n"; + $entries .= " $title $link $description @@ -73,11 +73,11 @@ "; - } - } + } + } - // Prepare the whole text of the RSS file. - $rsstext = ' + // Prepare the whole text of the RSS file. + $rsstext = ' '; - // Write the text to the file... - $filename = $rsspath . $person_id . '.rdf'; - $fh = @fopen($filename, "w"); - if (!$fh) { # Problem writing, just carry on - echo "Could not write to file ($filename)\n"; - continue; - } - fwrite($fh, $rsstext); - fclose ($fh); + // Write the text to the file... + $filename = $rsspath . $person_id . '.rdf'; + $fh = @fopen($filename, "w"); + if (!$fh) { # Problem writing, just carry on + echo "Could not write to file ($filename)\n"; + continue; + } + fwrite($fh, $rsstext); + fclose($fh); } #print "Took " . (time()-$starttime) . " seconds\n"; - -?> diff --git a/scripts/populate-policy-images.php b/scripts/populate-policy-images.php index 4e4856ceaf..7bfc174e02 100755 --- a/scripts/populate-policy-images.php +++ b/scripts/populate-policy-images.php @@ -26,14 +26,14 @@ $ARGV = $_SERVER['argv']; $db = new ParlDB(); -$csvfile = isset($ARGV[1]) ? $ARGV[1] : ''; +$csvfile = $ARGV[1] ?? ''; if (!$csvfile) { print "Need a csv file with policy details\n"; exit(1); } -if ( !file_exists($csvfile) ) { +if (!file_exists($csvfile)) { print "$csvfile cannot be found\n"; exit(1); } @@ -46,8 +46,8 @@ } $count = 0; -while ( ( $policy = fgetcsv($file) ) !== FALSE ) { - if ( intval($policy[0]) ) { +while (($policy = fgetcsv($file)) !== false) { + if (intval($policy[0])) { $policy_id = $policy[0]; $img_id = $policy[1] ? $policy[1] : $policy_id; $title = $policy[2]; @@ -56,20 +56,22 @@ $licence_url = $policy[7]; $source = $policy[5]; - $q = $db->query("UPDATE policies SET + $q = $db->query( + "UPDATE policies SET image = :image, image_source = :image_source, image_attrib = :image_attribution, image_license_url = :license_url, title = :title, description = :description WHERE policy_id = :policy_id - ", array( + ", + [ ':policy_id' => $policy_id, ':title' => $title, ':description' => $description, ':image' => "/images/policies/" . $img_id . ".jpg", ':image_source' => $source, ':image_attribution' => $attribution, - ':license_url' => $licence_url) + ':license_url' => $licence_url] ); - if ( $q->success() ) { + if ($q->success()) { $count += $q->affected_rows(); } else { print "failed to update data for $policy_id\n"; diff --git a/scripts/wrans-votes-by-dept.php b/scripts/wrans-votes-by-dept.php index 79ab106bdf..d823ec25d7 100644 --- a/scripts/wrans-votes-by-dept.php +++ b/scripts/wrans-votes-by-dept.php @@ -3,7 +3,7 @@ include '../www/includes/easyparliament/init.php'; # include INCLUDESPATH . 'easyparliament/member.php'; -$db = new ParlDB; +$db = new ParlDB(); $q = $db->query('select count(*) as c from hansard where major=3 and minor=2')->first(); $answers = $q['c']; @@ -16,25 +16,28 @@ left join anonvotes on hansard.epobject_id = anonvotes.epobject_id where major = 3 and minor = 2 -'); +' +); #$rows = mysql_num_rows($q); #echo "Number of answers with votes: $rows\n"; #echo "Number of answers in system: $answers\n"; -$votes = array(); +$votes = []; while ($row = mysql_fetch_assoc($q)) { $dept = $row['body']; - if (!isset($votes[$dept])) $votes[$dept] = array( - 'verymoreyes'=>0, 'moreyes'=>0, 'verymoreno'=>0, 'moreno'=>0, 'same'=>0, 'none'=>0 - ); + if (!isset($votes[$dept])) { + $votes[$dept] = [ + 'verymoreyes' => 0, 'moreyes' => 0, 'verymoreno' => 0, 'moreno' => 0, 'same' => 0, 'none' => 0, + ]; + } $yes = $row['yes_votes']; $no = $row['no_votes']; $gid = $row['gid']; if (is_null($yes)) { $votes[$dept]['none']++; } else { - if ($no > $yes+10) { + if ($no > $yes + 10) { $votes[$dept]['verymoreno']++; } elseif ($no > $yes) { $votes[$dept]['moreno']++; diff --git a/scripts/wranstats.php b/scripts/wranstats.php index 0ef859b475..203e39e2f3 100644 --- a/scripts/wranstats.php +++ b/scripts/wranstats.php @@ -3,7 +3,7 @@ include '/data/vhost/www.theyworkforyou.com/includes/easyparliament/init.php'; # include INCLUDESPATH . 'easyparliament/member.php'; -$db = new ParlDB; +$db = new ParlDB(); $q = $db->query( 'select person_id, @@ -17,7 +17,8 @@ from hansard left join anonvotes on hansard.epobject_id=anonvotes.epobject_id where major = 3 and minor = 2 and left_house > curdate() - group by person_id'); + group by person_id' +); foreach ($q as $row) { $p_id = $row['person_id']; @@ -29,11 +30,11 @@ if ($p_id) { $qq = $db->query('(select hansard.epobject_id from hansard, uservotes where hansard.epobject_id=uservotes.epobject_id - and hansard.person_id = '.$p_id.' and major=3 and minor=2 and left_house>curdate()) + and hansard.person_id = ' . $p_id . ' and major=3 and minor=2 and left_house>curdate()) union (select hansard.epobject_id from hansard,member,anonvotes where hansard.epobject_id=anonvotes.epobject_id - and hansard.person_id = '.$p_id.' and major=3 and minor=2 and left_house>curdate())'); + and hansard.person_id = ' . $p_id . ' and major=3 and minor=2 and left_house>curdate())'); $wrans_with_votes = $qq->rows(); } else { $wrans_with_votes = ''; diff --git a/tests/AcceptApiTest.php b/tests/AcceptApiTest.php index f15248c55a..2f6aa4479a 100644 --- a/tests/AcceptApiTest.php +++ b/tests/AcceptApiTest.php @@ -3,38 +3,31 @@ /** * Provides acceptance(ish) tests for API functions. */ -class AcceptApiTest extends FetchPageTestCase -{ - +class AcceptApiTest extends FetchPageTestCase { /** * Loads the api testing fixture. */ - public function getDataSet() - { + public function getDataSet() { return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/api.xml'); } - private function fetch_page($method, $vars = array()) - { + private function fetch_page($method, $vars = []) { $vars['method'] = $method; return $this->base_fetch_page($vars, 'api'); } - private function get_page($page, $vars = array()) - { + private function get_page($page, $vars = []) { return $this->base_fetch_page_user($vars, '1.fbb689a0c092f5534b929d302db2c8a9', 'api', "$page.php"); } - private function post_page($page, $vars = array()) - { + private function post_page($page, $vars = []) { return $this->base_post_page_user($vars, '1.fbb689a0c092f5534b929d302db2c8a9', 'api', "$page.php"); } /** * Ensure that not providing a key throws the right error */ - public function testMissingKeyFailure() - { + public function testMissingKeyFailure() { $page = $this->fetch_page('getConstituencies'); $this->assertEquals('{"error":"No API key provided. Please see https://www.theyworkforyou.com/api/key for more information."}', $page); } @@ -42,19 +35,18 @@ public function testMissingKeyFailure() /** * Ensure that providing an incorrect key throws the right error */ - public function testIncorrectKeyFailure() - { - $page = $this->fetch_page('getConstituencies', array( - 'key' => 'invalid_key' - )); + public function testIncorrectKeyFailure() { + $page = $this->fetch_page('getConstituencies', [ + 'key' => 'invalid_key', + ]); $this->assertEquals('{"error":"Invalid API key."}', $page); } private function _testGetJSON($page, $key, $value, $result) { - $page = $this->fetch_page($page, array( + $page = $this->fetch_page($page, [ 'key' => 'test_key', - $key => $value - )); + $key => $value, + ]); $this->assertNotNull(json_decode($page)); $this->assertNotNull(json_decode($result)); $this->assertEquals(json_decode($result), json_decode($page)); @@ -71,41 +63,66 @@ public function testGetConstituencies() { } public function testGetConstituencyByName() { - $this->_testGetJSON('getConstituency', 'name', 'Amber Valley', - '{"name":"Amber Valley"}'); + $this->_testGetJSON( + 'getConstituency', + 'name', + 'Amber Valley', + '{"name":"Amber Valley"}' + ); } public function testGetConstituencyByPostcode() { - $this->_testGetJSON('getConstituency', 'postcode', 'SW1A 1AA', - '{"name":"Cities of London and Westminster"}'); + $this->_testGetJSON( + 'getConstituency', + 'postcode', + 'SW1A 1AA', + '{"name":"Cities of London and Westminster"}' + ); } public function testGetConstituencyByAlternateName() { - $this->_testGetJSON('getConstituency', 'name', 'Alyn & Deeside', - '{"name":"Alyn and Deeside"}'); + $this->_testGetJSON( + 'getConstituency', + 'name', + 'Alyn & Deeside', + '{"name":"Alyn and Deeside"}' + ); } public function testGetConstituencyByIncorrectName() { - $this->_testGetJSON('getConstituency', 'name', 'No Such Constituency', - '{"error":"Could not find anything with that name"}'); + $this->_testGetJSON( + 'getConstituency', + 'name', + 'No Such Constituency', + '{"error":"Could not find anything with that name"}' + ); } - public function testGetMpByPostcode() - { - $this->_testGetJSON('getMP', 'postcode', 'SW1A 1AA', - '{"member_id":"2","house":"1","given_name":"Test","family_name":"Current-City-MP","constituency":"Cities of London and Westminster","party":"Labour","entered_house":"2000-01-01","left_house":"9999-12-31","entered_reason":"general_election","left_reason":"still_in_office","person_id":"3","title":"Mr","lastupdate":"2013-08-07 15:06:19","full_name":"Mr Test Current-City-MP","url":"/mp/3/mr_test_current-city-mp/cities_of_london_and_westminster"}'); + public function testGetMpByPostcode() { + $this->_testGetJSON( + 'getMP', + 'postcode', + 'SW1A 1AA', + '{"member_id":"2","house":"1","given_name":"Test","family_name":"Current-City-MP","constituency":"Cities of London and Westminster","party":"Labour","entered_house":"2000-01-01","left_house":"9999-12-31","entered_reason":"general_election","left_reason":"still_in_office","person_id":"3","title":"Mr","lastupdate":"2013-08-07 15:06:19","full_name":"Mr Test Current-City-MP","url":"/mp/3/mr_test_current-city-mp/cities_of_london_and_westminster"}' + ); } - public function testGetMpByConstituency() - { - $this->_testGetJSON('getMP', 'constituency', 'Amber Valley', - '{"member_id":"1","house":"1","given_name":"Test","family_name":"Current-MP","constituency":"Amber Valley","party":"Labour","entered_house":"2000-01-01","left_house":"9999-12-31","entered_reason":"general_election","left_reason":"still_in_office","person_id":"2","title":"Mrs","lastupdate":"2013-08-07 15:06:19","full_name":"Mrs Test Current-MP","url":"/mp/2/mrs_test_current-mp/amber_valley"}'); + public function testGetMpByConstituency() { + $this->_testGetJSON( + 'getMP', + 'constituency', + 'Amber Valley', + '{"member_id":"1","house":"1","given_name":"Test","family_name":"Current-MP","constituency":"Amber Valley","party":"Labour","entered_house":"2000-01-01","left_house":"9999-12-31","entered_reason":"general_election","left_reason":"still_in_office","person_id":"2","title":"Mrs","lastupdate":"2013-08-07 15:06:19","full_name":"Mrs Test Current-MP","url":"/mp/2/mrs_test_current-mp/amber_valley"}' + ); } - public function testGetMpById() - { - $this->_testGetJSON('getMP', 'id', '2', - '[{"member_id":"1","house":"1","given_name":"Test","family_name":"Current-MP","constituency":"Amber Valley","party":"Labour","entered_house":"2000-01-01","left_house":"9999-12-31","entered_reason":"general_election","left_reason":"still_in_office","person_id":"2","title":"Mrs","lastupdate":"2013-08-07 15:06:19","full_name":"Mrs Test Current-MP","url":"/mp/2/mrs_test_current-mp/amber_valley"}]'); + public function testGetMpById() { + $this->_testGetJSON( + 'getMP', + 'id', + '2', + '[{"member_id":"1","house":"1","given_name":"Test","family_name":"Current-MP","constituency":"Amber Valley","party":"Labour","entered_house":"2000-01-01","left_house":"9999-12-31","entered_reason":"general_election","left_reason":"still_in_office","person_id":"2","title":"Mrs","lastupdate":"2013-08-07 15:06:19","full_name":"Mrs Test Current-MP","url":"/mp/2/mrs_test_current-mp/amber_valley"}]' + ); } public function testGetMlasLookup() { @@ -115,20 +132,24 @@ public function testGetMlasLookup() { ]'; $this->_testGetJSON('getMLA', 'postcode', 'BT17 0XD', $result); $this->_testGetJSON('getMLA', 'constituency', 'Belfast West', $result); - $this->_testGetJSON('getMLA', 'id', '101', - '[{"member_id":"101","house":"3","given_name":"Test1","family_name":"Nimember","constituency":"Belfast West","party":"DUP","entered_house":"2000-01-01","left_house":"9999-12-31","entered_reason":"general_election","left_reason":"still_in_office","person_id":"101","title":"Mr","lastupdate":"2013-08-07 15:06:19","full_name":"Mr Test1 Nimember"}]'); + $this->_testGetJSON( + 'getMLA', + 'id', + '101', + '[{"member_id":"101","house":"3","given_name":"Test1","family_name":"Nimember","constituency":"Belfast West","party":"DUP","entered_house":"2000-01-01","left_house":"9999-12-31","entered_reason":"general_election","left_reason":"still_in_office","person_id":"101","title":"Mr","lastupdate":"2013-08-07 15:06:19","full_name":"Mr Test1 Nimember"}]' + ); } public function testApiKeySignup() { $page = $this->post_page('key'); $this->assertStringContainsString('Subscribe to a plan', $page); - $page = $this->post_page('update-plan', array( + $page = $this->post_page('update-plan', [ 'plan' => 'twfy-1k', 'charitable_tick' => 'on', 'charitable' => 'c', 'charity_number' => '123456', 'tandcs_tick' => 'on', - )); + ]); $this->assertEquals('Location: /api/key?updated=1', $page); $page = $this->get_page('key', ['updated' => 1]); $this->assertStringContainsString('Your current plan is Some calls per month.', $page); diff --git a/tests/AcceptBasicTest.php b/tests/AcceptBasicTest.php index 19fc509dc1..02983ae2c5 100644 --- a/tests/AcceptBasicTest.php +++ b/tests/AcceptBasicTest.php @@ -3,27 +3,22 @@ /** * Provides acceptance(ish) tests to ensure key pages are working. */ -class AcceptBasicTest extends FetchPageTestCase -{ - +class AcceptBasicTest extends FetchPageTestCase { /** * Loads the acceptance testing fixture. */ - public function getDataSet() - { - return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/acceptance.xml'); + public function getDataSet() { + return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/acceptance.xml'); } - private function fetch_page($path, $file = 'index.php', $vars = array()) - { + private function fetch_page($path, $file = 'index.php', $vars = []) { return $this->base_fetch_page($vars, $path, $file); } /** * Does the homepage still work? */ - public function testHome() - { + public function testHome() { $page = $this->fetch_page(''); $this->assertStringContainsString('Learn more about', $page); $this->assertStringContainsString('Create an alert', $page); @@ -33,8 +28,7 @@ public function testHome() /** * Does the list of MPs still work? */ - public function testMPList() - { + public function testMPList() { $page = $this->fetch_page('mps'); $this->assertStringContainsString('All MPs', $page); $this->assertStringContainsString('Test Current-MP', $page); @@ -43,9 +37,8 @@ public function testMPList() /** * Does the list of Lords still work? */ - public function testLordsList() - { - $page = $this->fetch_page('mps', 'index.php', array('representative_type' => 'peer')); + public function testLordsList() { + $page = $this->fetch_page('mps', 'index.php', ['representative_type' => 'peer']); $this->assertStringContainsString('All Members of the House of Lords', $page); $this->assertStringContainsString('Mr Current-Lord', $page); } @@ -53,9 +46,8 @@ public function testLordsList() /** * Does the list of MSPs still work? */ - public function testMSPList() - { - $page = $this->fetch_page('mps', 'index.php', array('representative_type' => 'msp')); + public function testMSPList() { + $page = $this->fetch_page('mps', 'index.php', ['representative_type' => 'msp']); $this->assertStringContainsString('Scottish Parliament', $page); $this->assertStringContainsString('All MSPs', $page); $this->assertStringContainsString('Test Current-MSP', $page); @@ -64,9 +56,8 @@ public function testMSPList() /** * Does the list of MSPs still work? */ - public function testMLAList() - { - $page = $this->fetch_page('mps', 'index.php', array('representative_type' => 'mla')); + public function testMLAList() { + $page = $this->fetch_page('mps', 'index.php', ['representative_type' => 'mla']); $this->assertStringContainsString('Northern Ireland Assembly', $page); $this->assertStringContainsString('All MLAs', $page); $this->assertStringContainsString('Test Current-MLA', $page); @@ -75,9 +66,8 @@ public function testMLAList() /** * Does the debates top page still work? */ - public function testDebatesList() - { - $page = $this->fetch_page('', 'section.php', array('type' => 'debates')); + public function testDebatesList() { + $page = $this->fetch_page('', 'section.php', ['type' => 'debates']); $this->assertStringContainsString('UK Parliament Hansard Debates', $page); $this->assertStringContainsString('Recent House of Commons debates', $page); $this->assertStringContainsString('Test Hansard Section', $page); diff --git a/tests/AlertsPageTest.php b/tests/AlertsPageTest.php index a0d2773c84..6d62a781a7 100644 --- a/tests/AlertsPageTest.php +++ b/tests/AlertsPageTest.php @@ -3,55 +3,49 @@ /** * Provides test methods to ensure pages contain what we want them to in various ways. */ -class AlertsPageTest extends FetchPageTestCase -{ - +class AlertsPageTest extends FetchPageTestCase { /** * Loads the member testing fixture. */ - public function getDataSet() - { - return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/alertspage.xml'); + public function getDataSet() { + return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/alertspage.xml'); } - private function fetch_page($vars) - { + private function fetch_page($vars) { return $this->base_fetch_page($vars, 'alert'); } - public function testFetchPage() - { - $page = $this->fetch_page( array() ); + public function testFetchPage() { + $page = $this->fetch_page([]); $this->assertStringContainsString('TheyWorkForYou Email Alerts', $page); } public function testKeywordOnly() { - $page = $this->fetch_page( array( 'alertsearch' => 'elephant') ); + $page = $this->fetch_page([ '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([ 'alertsearch' => 'SE17 3HE']); $this->assertStringContainsString('when Mrs Test Current-MP', $page); } - public function testPostCodeWithKeyWord() - { - $page = $this->fetch_page( array( 'alertsearch' => 'SE17 3HE elephant') ); + public function testPostCodeWithKeyWord() { + $page = $this->fetch_page([ '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([ '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([ '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); } diff --git a/tests/AlertsTest.php b/tests/AlertsTest.php index 5645071a41..ce212441e7 100644 --- a/tests/AlertsTest.php +++ b/tests/AlertsTest.php @@ -3,22 +3,18 @@ /** * Provides test methods for alerts functionality. */ -class AlertsTest extends TWFY_Database_TestCase -{ - +class AlertsTest extends TWFY_Database_TestCase { /** * Loads the alerts testing fixture. */ - public function getDataSet() - { - return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/alerts.xml'); + public function getDataSet() { + return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/alerts.xml'); } /** * Ensures the database is prepared and the alert class is included for every test. */ - public function setUp(): void - { + public function setUp(): void { parent::setUp(); include_once('www/includes/easyparliament/alert.php'); @@ -27,11 +23,10 @@ public function setUp(): void /** * Test that unconfirmed, undeleted tests are correctly retrieved */ - public function testFetchUnconfirmedUndeleted() - { + public function testFetchUnconfirmedUndeleted() { $ALERT = new ALERT(); - $response = $ALERT->fetch(0,0); + $response = $ALERT->fetch(0, 0); // Make sure we only get one response $this->assertEquals(1, count($response['data'])); @@ -44,11 +39,10 @@ public function testFetchUnconfirmedUndeleted() /** * Test that confirmed, undeleted tests are correctly retrieved */ - public function testFetchConfirmedUndeleted() - { + public function testFetchConfirmedUndeleted() { $ALERT = new ALERT(); - $response = $ALERT->fetch(1,0); + $response = $ALERT->fetch(1, 0); // Make sure we only get two responses $this->assertEquals(2, count($response['data'])); @@ -61,11 +55,10 @@ public function testFetchConfirmedUndeleted() /** * Test that the correct alerts between given dates are retrieved */ - public function testFetchBetween() - { + public function testFetchBetween() { $ALERT = new ALERT(); - $response = $ALERT->fetch_between(1,0, '2014-02-03', '2014-02-04'); + $response = $ALERT->fetch_between(1, 0, '2014-02-03', '2014-02-04'); // Make sure we only get one response $this->assertEquals(1, count($response['alerts'])); @@ -74,15 +67,14 @@ public function testFetchBetween() /** * Test that alerts can be added */ - public function testAdd() - { + public function testAdd() { $ALERT = new ALERT(); - $details = array( + $details = [ 'email' => 'test@theyworkforyou.com', 'keyword' => 'test', - 'pc' => 'SW1A 1AA' - ); + 'pc' => 'SW1A 1AA', + ]; $response = $ALERT->add($details, false, true); @@ -97,15 +89,14 @@ public function testAdd() /** * Test that adding an already existing alert works as expected */ - public function testAddExisting() - { + public function testAddExisting() { $ALERT = new ALERT(); - $details = array( + $details = [ 'email' => 'test3@theyworkforyou.com', 'keyword' => 'test3', - 'pc' => 'SW1A 1AA' - ); + 'pc' => 'SW1A 1AA', + ]; $response = $ALERT->add($details, false, true); @@ -119,15 +110,14 @@ public function testAddExisting() /** * Test that adding an already deleted alert works as expected */ - public function testAddDeleted() - { + public function testAddDeleted() { $ALERT = new ALERT(); - $details = array( + $details = [ 'email' => 'test6@theyworkforyou.com', 'keyword' => 'test6', - 'pc' => 'SW1A 1AA' - ); + 'pc' => 'SW1A 1AA', + ]; $response = $ALERT->add($details, false, true); @@ -141,8 +131,7 @@ public function testAddDeleted() /** * Test that email_exists() returns true for correct emails */ - public function testEmailExistsPositive() - { + public function testEmailExistsPositive() { $ALERT = new ALERT(); $response = $ALERT->email_exists('test@theyworkforyou.com'); @@ -153,8 +142,7 @@ public function testEmailExistsPositive() /** * Test that email_exists() returns false for incorrect emails */ - public function testEmailExistsNegative() - { + public function testEmailExistsNegative() { $ALERT = new ALERT(); $response = $ALERT->email_exists('badtest@theyworkforyou.com'); @@ -165,24 +153,22 @@ public function testEmailExistsNegative() /** * Test that a correct token will pass */ - public function testCheckTokenCorrect() - { + public function testCheckTokenCorrect() { $ALERT = new ALERT(); $response = $ALERT->check_token('1::token1'); - $this->assertEquals(array( - 'id' => 1, - 'email' => 'test@theyworkforyou.com', - 'criteria' => 'test1', - ), $response); + $this->assertEquals([ + 'id' => 1, + 'email' => 'test@theyworkforyou.com', + 'criteria' => 'test1', + ], $response); } /** * Test that an incorrect token (wrong token for the alert ID) will fail */ - public function testCheckTokenIncorrectToken() - { + public function testCheckTokenIncorrectToken() { $ALERT = new ALERT(); $response = $ALERT->check_token('1::token2'); @@ -193,8 +179,7 @@ public function testCheckTokenIncorrectToken() /** * Test that an incorrect token (wrong parts count) will fail */ - public function testCheckTokenWrongPartsCount() - { + public function testCheckTokenWrongPartsCount() { $ALERT = new ALERT(); $response = $ALERT->check_token('foo'); @@ -205,8 +190,7 @@ public function testCheckTokenWrongPartsCount() /** * Test that an incorrect token (non-numeric alert ID) will fail */ - public function testCheckTokenNonNumericId() - { + public function testCheckTokenNonNumericId() { $ALERT = new ALERT(); $response = $ALERT->check_token('one:token1'); @@ -217,8 +201,7 @@ public function testCheckTokenNonNumericId() /** * Test that fetching alerts for an MP succeeds */ - public function testCheckFetchByMpExists() - { + public function testCheckFetchByMpExists() { $ALERT = new ALERT(); $response = $ALERT->fetch_by_mp('test5@theyworkforyou.com', 1234); @@ -229,8 +212,7 @@ public function testCheckFetchByMpExists() /** * Test that fetching alerts for an MP which doesn't exist fails */ - public function testCheckFetchByMpNotExists() - { + public function testCheckFetchByMpNotExists() { $ALERT = new ALERT(); $response = $ALERT->fetch_by_mp('test5@theyworkforyou.com', 9876); @@ -241,8 +223,7 @@ public function testCheckFetchByMpNotExists() /** * Test that confirming an alert with a valid token succeeds */ - public function testConfirm() - { + public function testConfirm() { $ALERT = new ALERT(); $response = $ALERT->confirm('1::token1'); @@ -255,8 +236,7 @@ public function testConfirm() /** * Test that confirming an alert with an invalid token succeeds */ - public function testConfirmInvalid() - { + public function testConfirmInvalid() { $ALERT = new ALERT(); $response = $ALERT->confirm('1::badtoken'); @@ -267,8 +247,7 @@ public function testConfirmInvalid() /** * Test that we can delete an alert */ - public function testDelete() - { + public function testDelete() { $ALERT = new ALERT(); $response = $ALERT->delete('1::token1'); @@ -281,8 +260,7 @@ public function testDelete() /** * Test that we can't delete an alert with a bad token */ - public function testDeleteInvalid() - { + public function testDeleteInvalid() { $ALERT = new ALERT(); $response = $ALERT->delete('1::badtoken'); @@ -293,8 +271,7 @@ public function testDeleteInvalid() /** * Test that we can suspend an alert */ - public function testSuspend() - { + public function testSuspend() { $ALERT = new ALERT(); $response = $ALERT->suspend('3::token3'); @@ -307,8 +284,7 @@ public function testSuspend() /** * Test that we can't suspend an alert with a bad token */ - public function testSuspendInvalid() - { + public function testSuspendInvalid() { $ALERT = new ALERT(); $response = $ALERT->suspend('3::badtoken'); @@ -319,8 +295,7 @@ public function testSuspendInvalid() /** * Test that we can resume an alert */ - public function testResume() - { + public function testResume() { $ALERT = new ALERT(); $response = $ALERT->resume('6::token6'); @@ -333,8 +308,7 @@ public function testResume() /** * Test that we can't delete an alert with a bad token */ - public function testResumeInvalid() - { + public function testResumeInvalid() { $ALERT = new ALERT(); $response = $ALERT->resume('6::badtoken'); diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 742bf7eb5b..72a759ff4f 100644 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -19,15 +19,15 @@ define('OPTION_TWFY_DB_USER', $_SERVER['TWFY_TEST_DB_USER']); define('OPTION_TWFY_DB_PASS', $_SERVER['TWFY_TEST_DB_PASS']); define('OPTION_TWFY_DB_NAME', $_SERVER['TWFY_TEST_DB_NAME']); - + // Define the base directory - define ("BASEDIR", dirname(__FILE__) . '/../www/docs'); + define("BASEDIR", dirname(__FILE__) . '/../www/docs'); # point to the default mapit 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'); } diff --git a/tests/CommentTest.php b/tests/CommentTest.php index c0132a0580..c7e3ca9192 100644 --- a/tests/CommentTest.php +++ b/tests/CommentTest.php @@ -3,15 +3,12 @@ /** * Provides test methods for commenting functionality. */ -class CommentTest extends TWFY_Database_TestCase -{ - +class CommentTest extends TWFY_Database_TestCase { /** * Loads the comments testing fixture. */ - public function getDataSet() - { - return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/comment.xml'); + public function getDataSet() { + return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/comment.xml'); } /** @@ -27,8 +24,7 @@ public function setUp(): void { /** * Makes sure the body of the test comment is returned correctly, testing HTML cleaning. */ - public function testHTMLCleaningGetBody() - { + public function testHTMLCleaningGetBody() { $comment = new COMMENT(1); $this->assertEquals($comment->body(), "This is a test comment, including https://www.theyworkforyou.com links, email addresses like test@theyworkforyou.com, bold, italics, and stray < brackets to ensure they're rendered correctly. @@ -38,29 +34,28 @@ public function testHTMLCleaningGetBody() /** * Makes sure a comment is correctly rendered, testing HTML cleaning. */ - public function testHTMLCleaningPrepareCommentForDisplay() - { + public function testHTMLCleaningPrepareCommentForDisplay() { $comment = new COMMENT(1); $this->assertEquals(prepare_comment_for_display($comment->body()), "This is a test comment, including https://www.theyworkforyou.com links, email addresses like test@theyworkforyou.com, bold, italics, and stray < brackets to ensure they're rendered correctly.

    It also spans multiple lines."); } - public function testCommentWithVeryLongLink() - { + public function testCommentWithVeryLongLink() { $comment = new COMMENT(2); - $this->assertEquals(prepare_comment_for_display($comment->body()), - 'https://www.theyworkforyou.example.org/this/is/a/coment/with...'); + $this->assertEquals( + prepare_comment_for_display($comment->body()), + 'https://www.theyworkforyou.example.org/this/is/a/coment/with...' + ); } public function testHTMLCleaningOfAngleBrackets() { $text = 'Is 2 < 3?'; - $this->assertEquals('Is 2 < 3?', filter_user_input( $text, 'comment' ) ); + $this->assertEquals('Is 2 < 3?', filter_user_input($text, 'comment')); } - public function testHTMLCleaningWithNonASCIIChars() - { + public function testHTMLCleaningWithNonASCIIChars() { // this file is UTF-8 but odd comments are sent up looking like Windows-1252 so we need the // input text to be encoded thus otherwise the output is different $text = "This is a curly ’ apostrophe. Is 2 < 3 ø ø € ’ « ö à"; diff --git a/tests/DivisionsTest.php b/tests/DivisionsTest.php index 2545c34143..e705fc207b 100644 --- a/tests/DivisionsTest.php +++ b/tests/DivisionsTest.php @@ -3,42 +3,37 @@ /** * Provides test methods to ensure pages contain what we want them to in various ways. */ -class DivisionsTest extends FetchPageTestCase -{ - - public function getDataSet() - { +class DivisionsTest extends FetchPageTestCase { + public function getDataSet() { return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/divisions.xml'); } - private function fetch_page($vars) - { + private function fetch_page($vars) { return $this->base_fetch_page($vars, 'mp', 'index.php', '/mp/divisions.php'); } 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([ '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' ); + private function fetch_mp_recent_page() { + $vars = [ '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(['url' => '/divisions' ], 'divisions', 'index.php', '/divisions/index.php'); } public function testSinglePolicy() { - $p = new MySociety\TheyWorkForYou\Policies; + $p = new MySociety\TheyWorkForYou\Policies(); $this->assertEquals(count($p->getPoliciesData()), 92); $p = $p->limitToSet('health'); $this->assertEquals(count($p->getPoliciesData()), 5); - $p = new MySociety\TheyWorkForYou\Policies; + $p = new MySociety\TheyWorkForYou\Policies(); $p = $p->limitToSet('education'); $this->assertEquals(count($p->getPoliciesData()), 5); @@ -54,17 +49,15 @@ public function testSinglePolicy() { } - public function testMPPageContainsAgreement() - { + 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([ 'pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions' ]); $this->assertStringContainsString('Example Agreement', $page); } - public function testMPPageDoesNotContainsAgreement() - { + 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([ '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 +121,7 @@ public function testStrongIndicators() { } 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([ '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 +132,7 @@ public function testRecentDivisionsForMP() { } 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(['url' => '/divisions/division.php', 'vote' => 'pw-3012-01-01-1-commons' ], 'divisions', 'division.php', '/divisions/division.php'); $this->assertStringContainsString('A majority of MPs voted in favour 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. diff --git a/tests/FetchPageTestCase.php b/tests/FetchPageTestCase.php index ff0024ffca..352dfbfc47 100644 --- a/tests/FetchPageTestCase.php +++ b/tests/FetchPageTestCase.php @@ -3,11 +3,8 @@ /** * Provides acceptance(ish) tests for API functions. */ -abstract class FetchPageTestCase extends TWFY_Database_TestCase -{ - - protected function base_fetch_page($vars, $dir, $page = 'index.php', $req_uri = '') - { +abstract class FetchPageTestCase extends TWFY_Database_TestCase { + protected function base_fetch_page($vars, $dir, $page = 'index.php', $req_uri = '') { foreach ($vars as $k => $v) { $vars[$k] = $k . '=' . urlencode($v); } @@ -23,8 +20,7 @@ protected function base_fetch_page($vars, $dir, $page = 'index.php', $req_uri = return $page; } - protected function base_fetch_page_user($vars, $cookie, $dir, $page = 'index.php', $req_uri = '') - { + protected function base_fetch_page_user($vars, $cookie, $dir, $page = 'index.php', $req_uri = '') { foreach ($vars as $k => $v) { $vars[$k] = $k . '=' . urlencode($v); } @@ -40,8 +36,7 @@ protected function base_fetch_page_user($vars, $cookie, $dir, $page = 'index.php return $page; } - protected function base_post_page_user($vars, $cookie, $dir, $page = 'index.php', $req_uri = '') - { + protected function base_post_page_user($vars, $cookie, $dir, $page = 'index.php', $req_uri = '') { foreach ($vars as $k => $v) { $vars[$k] = $k . '=' . urlencode($v); } diff --git a/tests/GlossaryTest.php b/tests/GlossaryTest.php index dd09dfedc5..d72089d720 100644 --- a/tests/GlossaryTest.php +++ b/tests/GlossaryTest.php @@ -3,112 +3,100 @@ /** * Provides test methods for glossary functionality. */ -class GlossaryTest extends TWFY_Database_TestCase -{ - +class GlossaryTest extends TWFY_Database_TestCase { /** * Loads the glossary testing fixture. */ - public function getDataSet() - { - return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/glossary.xml'); + public function getDataSet() { + return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/glossary.xml'); } /** * Ensures the database is prepared and the glossary class is included for every test. */ - public function setUp(): void - { + public function setUp(): void { parent::setUp(); - + include_once('www/includes/easyparliament/glossary.php'); } /** * Test that glossarising a single word works as expected. */ - public function testGlossariseNormal() - { + public function testGlossariseNormal() { $args['sort'] = "regexp_replace"; $glossary = new GLOSSARY($args); - + $this->assertEquals('constituency', $glossary->glossarise('constituency')); } /** * Test that glossarising a word within a link works as expected. */ - public function testGlossariseInLink() - { + public function testGlossariseInLink() { $args['sort'] = "regexp_replace"; $glossary = new GLOSSARY($args); - + $this->assertEquals('constituency', $glossary->glossarise('constituency')); } /** * Test that glossarising a word bounded by other characters without spaces works as expected. */ - public function testGlossariseInString() - { + public function testGlossariseInString() { $args['sort'] = "regexp_replace"; $glossary = new GLOSSARY($args); - + $this->assertEquals('fooconstituencybar', $glossary->glossarise('fooconstituencybar')); } /** * Test that glossarising a word bounded by other characters with spaces works as expected. */ - public function testGlossariseInSpacedString() - { + public function testGlossariseInSpacedString() { $args['sort'] = "regexp_replace"; $glossary = new GLOSSARY($args); - + $this->assertEquals('foo constituency bar', $glossary->glossarise('foo constituency bar')); } /** * Test that glossarising a single Wikipedia title works as expected. */ - public function testWikipediaLinkNormal() - { + public function testWikipediaLinkNormal() { $args['sort'] = "regexp_replace"; $glossary = new GLOSSARY($args); - + $this->assertEquals('MP', $glossary->glossarise('MP')); } /** * Test that glossarising a Wikipedia title within a link works as expected. */ - public function testWikipediaLinkInLink() - { + public function testWikipediaLinkInLink() { $args['sort'] = "regexp_replace"; $glossary = new GLOSSARY($args); - + $this->assertEquals('MP', $glossary->glossarise('MP')); } /** * Test that glossarising a Wikipedia title bounded by other characters without spaces works as expected. */ - public function testWikipediaLinkInString() - { + public function testWikipediaLinkInString() { $args['sort'] = "regexp_replace"; $glossary = new GLOSSARY($args); - + $this->assertEquals('fooMPbar', $glossary->glossarise('fooMPbar')); } /** * Test that glossarising a Wikipedia title bounded by other characters with spaces works as expected. */ - public function testWikipediaLinkInSpacedString() - { + public function testWikipediaLinkInSpacedString() { $args['sort'] = "regexp_replace"; $glossary = new GLOSSARY($args); - + $this->assertEquals('foo MP bar', $glossary->glossarise('foo MP bar')); } } diff --git a/tests/HansardTest.php b/tests/HansardTest.php index b39c58d400..b0892bc20b 100644 --- a/tests/HansardTest.php +++ b/tests/HansardTest.php @@ -3,22 +3,18 @@ /** * Provides test methods for Hansard functionality. */ -class HansardTest extends TWFY_Database_TestCase -{ - +class HansardTest extends TWFY_Database_TestCase { /** * Loads the Hansard testing fixture. */ - public function getDataSet() - { - return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/hansard.xml'); + public function getDataSet() { + return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/hansard.xml'); } /** * Ensures the database is prepared and the alert class is included for every test. */ - public function setUp(): void - { + public function setUp(): void { parent::setUp(); include_once('www/includes/easyparliament/hansardlist.php'); @@ -27,8 +23,7 @@ public function setUp(): void /** * Test getting the most recent day */ - public function testMostRecentDay() - { + public function testMostRecentDay() { $HANSARD = new HANSARDLIST(); $HANSARD->major = 1; $HANSARD->listpage = 'test'; @@ -42,13 +37,12 @@ public function testMostRecentDay() /** * Test that getting data by person works */ - public function testGetDataByPerson() - { + public function testGetDataByPerson() { $HANSARD = new HANSARDLIST(); - $args = array( - 'person_id' => '2' - ); + $args = [ + 'person_id' => '2', + ]; $response = $HANSARD->_get_data_by_person($args); @@ -65,16 +59,15 @@ public function testGetDataByPerson() /** * Test that getting data by date works */ - public function testGetDataByDate() - { + public function testGetDataByDate() { $HANSARD = new HANSARDLIST(); $HANSARD->major = 1; $HANSARD->listpage = 'test'; - $args = array( - 'date' => '2014-01-01' - ); + $args = [ + 'date' => '2014-01-01', + ]; $response = $HANSARD->_get_data_by_date($args); @@ -93,17 +86,16 @@ public function testGetDataByDate() * * This test inadvertently runs about a billion other bits of code. */ - public function testGetDataByGid() - { + public function testGetDataByGid() { $HANSARD = new HANSARDLIST(); $HANSARD->major = 1; $HANSARD->gidprefix = 'com.theyworkforyou/test/hansard/'; $HANSARD->listpage = 'test'; - $args = array( - 'gid' => '3' - ); + $args = [ + 'gid' => '3', + ]; $response = $HANSARD->_get_data_by_gid($args); @@ -117,16 +109,15 @@ public function testGetDataByGid() /** * Test that getting an item works as expected. */ - public function testGetItem() - { + public function testGetItem() { $HANSARD = new HANSARDLIST(); $HANSARD->major = 1; $HANSARD->gidprefix = 'com.theyworkforyou/test/hansard/'; - $args = array( - 'gid' => '3' - ); + $args = [ + 'gid' => '3', + ]; $response = $HANSARD->_get_item($args); @@ -137,8 +128,7 @@ public function testGetItem() /** * Test that getting a speaker works. */ - public function testGetSpeaker() - { + public function testGetSpeaker() { $HANSARD = new HANSARDLIST(); $response = $HANSARD->_get_speaker(3, '2014-01-01', '00:00:00', 1); diff --git a/tests/HousesTest.php b/tests/HousesTest.php index be0d1f9aec..51581edab1 100644 --- a/tests/HousesTest.php +++ b/tests/HousesTest.php @@ -3,62 +3,53 @@ /** * Provides test methods to ensure constants are available and as expected for all houses. */ -class HousesTest extends \PHPUnit\Framework\TestCase -{ - +class HousesTest extends \PHPUnit\Framework\TestCase { /** * Test that the Royal edge-case house is correctly defined. */ - public function testRoyalHouseDefined() - { + public function testRoyalHouseDefined() { $this->assertEquals(0, HOUSE_TYPE_ROYAL); } /** * Test that the House of Commons is correctly defined. */ - public function testCommonsHouseDefined() - { + public function testCommonsHouseDefined() { $this->assertEquals(1, HOUSE_TYPE_COMMONS); } /** * Test that the House of Lords is correctly defined. */ - public function testLordsHouseDefined() - { + public function testLordsHouseDefined() { $this->assertEquals(2, HOUSE_TYPE_LORDS); } /** * Test that the Northern Ireland Assembly is correctly defined. */ - public function testNIHouseDefined() - { + public function testNIHouseDefined() { $this->assertEquals(3, HOUSE_TYPE_NI); } /** * Test that the Scottish Parliament is correctly defined. */ - public function testScotlandHouseDefined() - { + public function testScotlandHouseDefined() { $this->assertEquals(4, HOUSE_TYPE_SCOTLAND); } /** * Test that the Welsh Parliament is correctly defined. */ - public function testWalesHouseDefined() - { + public function testWalesHouseDefined() { $this->assertEquals(5, HOUSE_TYPE_WALES); } /** * Test that the London Assembly is correctly defined. */ - public function testLondonAssemblyHouseDefined() - { + public function testLondonAssemblyHouseDefined() { $this->assertEquals(6, HOUSE_TYPE_LONDON_ASSEMBLY); } } diff --git a/tests/LibFilterTest.php b/tests/LibFilterTest.php index 32ad29c086..4a82f9da4f 100644 --- a/tests/LibFilterTest.php +++ b/tests/LibFilterTest.php @@ -4,22 +4,18 @@ * Testing for LibFilter */ -class LibFilterTest extends PHPUnit\Framework\TestCase -{ - +class LibFilterTest extends PHPUnit\Framework\TestCase { private $libFilter; - public function setUp(): void - { + public function setUp(): void { parent::setUp(); - $this->libFilter = new \MySociety\TheyWorkForYou\Utility\LibFilter; + $this->libFilter = new \MySociety\TheyWorkForYou\Utility\LibFilter(); } /** * Test that HTML inside comment tags is correctly escaped. */ - public function testEscapeComments() - { + public function testEscapeComments() { $this->assertEquals( 'Outside bold ', $this->libFilter->escape_comments('Outside bold ') @@ -29,8 +25,7 @@ public function testEscapeComments() /** * Test that tags are properly balanced, uneven pairs escaped etc */ - public function testBalanceHTML() - { + public function testBalanceHTML() { $this->assertEquals( '

    Hello World!

    ', $this->libFilter->balance_html('<<

    Hello World!

    >') @@ -40,8 +35,7 @@ public function testBalanceHTML() /** * Test that we allow allowed tags, and remove prohibited ones. */ - public function testCheckTags() - { + public function testCheckTags() { $this->assertEquals( 'bad_code();', $this->libFilter->check_tags('') @@ -59,8 +53,7 @@ public function testCheckTags() /** * Test that tags are removed as expected */ - public function testRemoveBlanks() - { + public function testRemoveBlanks() { $this->assertEquals( 'Hello World!', $this->libFilter->process_remove_blanks('Hello World!') @@ -70,8 +63,7 @@ public function testRemoveBlanks() /** * Test that comments are properly stripped. */ - public function testStripComments() - { + public function testStripComments() { $this->assertEquals( 'Outside ', $this->libFilter->check_tags('Outside ') diff --git a/tests/MemberTest.php b/tests/MemberTest.php index 7a8398f8f3..f8afddfca4 100644 --- a/tests/MemberTest.php +++ b/tests/MemberTest.php @@ -3,22 +3,18 @@ /** * Provides test methods for member functionality. */ -class MemberTest extends TWFY_Database_TestCase -{ - +class MemberTest extends TWFY_Database_TestCase { /** * Loads the member testing fixture. */ - public function getDataSet() - { - return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/member.xml'); + public function getDataSet() { + return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/member.xml'); } /** * Ensures the database is prepared and the member class is included for every test. */ - public function setUp(): void - { + public function setUp(): void { parent::setUp(); include_once('www/includes/easyparliament/member.php'); @@ -27,9 +23,8 @@ public function setUp(): void /** * Test that a member is correctly retrieved by person ID alone. */ - public function testGetMPByPersonID() - { - $MEMBER = new MEMBER(array('person_id' => 2)); + public function testGetMPByPersonID() { + $MEMBER = new MEMBER(['person_id' => 2]); $this->assertEquals(1, $MEMBER->member_id); $this->assertEquals(2, $MEMBER->person_id); @@ -38,9 +33,8 @@ public function testGetMPByPersonID() /** * Test that a member is correctly retrieved by member ID alone. */ - public function testGetMPByMemberID() - { - $MEMBER = new MEMBER(array('member_id' => 1)); + public function testGetMPByMemberID() { + $MEMBER = new MEMBER(['member_id' => 1]); $this->assertEquals(1, $MEMBER->member_id); $this->assertEquals(2, $MEMBER->person_id); @@ -49,12 +43,11 @@ public function testGetMPByMemberID() /** * Test that a member is correctly retrieved by name. */ - public function testGetMPByName() - { + public function testGetMPByName() { global $this_page; $this_page = 'mp'; - $MEMBER = new MEMBER(array('name' => 'test current-mp')); + $MEMBER = new MEMBER(['name' => 'test current-mp']); $this->assertEquals(1, $MEMBER->member_id); $this->assertEquals(2, $MEMBER->person_id); @@ -63,9 +56,8 @@ public function testGetMPByName() /** * Test that the current member is correctly retrieved by constituency. */ - public function testGetMPByConstituency() - { - $MEMBER = new MEMBER(array('constituency' => 'test westminster constituency')); + public function testGetMPByConstituency() { + $MEMBER = new MEMBER(['constituency' => 'test westminster constituency']); $this->assertEquals(1, $MEMBER->member_id); $this->assertEquals(2, $MEMBER->person_id); @@ -74,12 +66,11 @@ public function testGetMPByConstituency() /** * Test that a member is correctly retrieved by name and constituency. */ - public function testGetMPByNameAndConstituency() - { + public function testGetMPByNameAndConstituency() { global $this_page; $this_page = 'mp'; - $MEMBER = new MEMBER(array('name' => 'test current-mp', 'constituency' => 'test westminster constituency')); + $MEMBER = new MEMBER(['name' => 'test current-mp', 'constituency' => 'test westminster constituency']); $this->assertEquals(1, $MEMBER->member_id); $this->assertEquals(2, $MEMBER->person_id); @@ -88,16 +79,15 @@ public function testGetMPByNameAndConstituency() /** * Test that members with duplicate names are retrieved as expected. */ - public function testGetDuplicateMPsByName() - { + public function testGetDuplicateMPsByName() { global $this_page; $this_page = 'mp'; try { - $MEMBER = new MEMBER(array('name' => 'test duplicate-mp')); + $MEMBER = new MEMBER(['name' => 'test duplicate-mp']); } catch (MySociety\TheyWorkForYou\MemberMultipleException $e) { - $this->assertEquals(array(11 => 'Test Westminster Constituency', - 10 => 'Test Westminster Constituency'), $e->ids); + $this->assertEquals([11 => 'Test Westminster Constituency', + 10 => 'Test Westminster Constituency'], $e->ids); return; } $this->fail('Multiple member exception not raised'); @@ -106,9 +96,8 @@ public function testGetDuplicateMPsByName() /** * Test that MP URLs are generated correctly. */ - public function testGetMPURL() - { - $MEMBER = new MEMBER(array('person_id' => 2)); + public function testGetMPURL() { + $MEMBER = new MEMBER(['person_id' => 2]); $this->assertEquals('/mp/2/test_current-mp/test_westminster_constituency', $MEMBER->url()); } @@ -118,9 +107,8 @@ public function testGetMPURL() * * Special characters in URLs *should* be encoded. */ - public function testGetMPSpecialCharacterURL() - { - $MEMBER = new MEMBER(array('person_id' => 12)); + public function testGetMPSpecialCharacterURL() { + $MEMBER = new MEMBER(['person_id' => 12]); $this->assertEquals('/mp/12/test_special-character-constituency/test_constituency%2C_comma', $MEMBER->url()); } @@ -128,9 +116,8 @@ public function testGetMPSpecialCharacterURL() /** * Test that Peer URLs are generated correctly. */ - public function testGetPeerURL() - { - $MEMBER = new MEMBER(array('person_id' => 3)); + public function testGetPeerURL() { + $MEMBER = new MEMBER(['person_id' => 3]); $this->assertEquals('/peer/3/mr_current-lord', $MEMBER->url()); } @@ -138,9 +125,8 @@ public function testGetPeerURL() /** * Test that MLA URLs are generated correctly. */ - public function testGetMLAURL() - { - $MEMBER = new MEMBER(array('person_id' => 8)); + public function testGetMLAURL() { + $MEMBER = new MEMBER(['person_id' => 8]); $this->assertEquals('/mla/8/test_previous-mla', $MEMBER->url()); } @@ -148,9 +134,8 @@ public function testGetMLAURL() /** * Test that MSP URLs are generated correctly. */ - public function testGetMSPURL() - { - $MEMBER = new MEMBER(array('person_id' => 5)); + public function testGetMSPURL() { + $MEMBER = new MEMBER(['person_id' => 5]); $this->assertEquals('/msp/5/test_current-msp', $MEMBER->url()); } @@ -158,9 +143,8 @@ public function testGetMSPURL() /** * Test that edge case URL for Elizabeth II is generated correctly. */ - public function testGetElizabethIIURL() - { - $MEMBER = new MEMBER(array('person_id' => 13935)); + public function testGetElizabethIIURL() { + $MEMBER = new MEMBER(['person_id' => 13935]); $this->assertEquals('/royal/elizabeth_the_second', $MEMBER->url()); } @@ -168,14 +152,13 @@ public function testGetElizabethIIURL() /** * Test that entered/left house strings are being generated */ - public function testEnteredLeftHouseString() - { - $MEMBER = new MySociety\TheyWorkForYou\Member(array('person_id' => 9)); + public function testEnteredLeftHouseString() { + $MEMBER = new MySociety\TheyWorkForYou\Member(['person_id' => 9]); - $this->assertEquals(array( + $this->assertEquals([ "Entered the Scottish Parliament on 1 January 1990 — General election", - "Left the Scottish Parliament on 31 December 1999 — General election" - ), $MEMBER->getEnterLeaveStrings()); + "Left the Scottish Parliament on 31 December 1999 — General election", + ], $MEMBER->getEnterLeaveStrings()); } /** @@ -183,9 +166,8 @@ public function testEnteredLeftHouseString() * * @todo Implement testing of the Public Whip info loading */ - public function testLoadExtraInfo() - { - $MEMBER = new MEMBER(array('person_id' => 16)); + public function testLoadExtraInfo() { + $MEMBER = new MEMBER(['person_id' => 16]); $MEMBER->load_extra_info(); @@ -202,115 +184,114 @@ public function testLoadExtraInfo() $this->assertEquals('Test Constituency Value', $MEMBER->extra_info['test_constituency_key']); // Have we correctly loaded the PBC membership? - $this->assertEquals(array( + $this->assertEquals([ 'title' => 'Test Bill', 'session' => '2013-14', 'attending' => 1, 'chairman' => 1, - 'outof' => 0 - ), $MEMBER->extra_info['pbc'][1]); + 'outof' => 0, + ], $MEMBER->extra_info['pbc'][1]); } /** * Test to ensure Utility\Member::findMemberImage() works as expected */ - public function testFindMemberImage() - { + public function testFindMemberImage() { // A missing image with no backup should reply null/null $this->assertEquals( - array(null, null), + [null, null], \MySociety\TheyWorkForYou\Utility\Member::findMemberImage(1) ); // Missing, small, use default $this->assertEquals( - array('/images/unknownperson_large.png', 'L'), + ['/images/unknownperson_large.png', 'L'], \MySociety\TheyWorkForYou\Utility\Member::findMemberImage(1, false, true) ); // Missing, large, use default Lord $this->assertEquals( - array('/images/unknownlord_large.png', 'L'), + ['/images/unknownlord_large.png', 'L'], \MySociety\TheyWorkForYou\Utility\Member::findMemberImage(1, false, 'lord') ); // Missing, small, use default $this->assertEquals( - array('/images/unknownperson.png', 'S'), + ['/images/unknownperson.png', 'S'], \MySociety\TheyWorkForYou\Utility\Member::findMemberImage(1, true, true) ); // Missing, small, use default Lord $this->assertEquals( - array('/images/unknownlord.png', 'S'), + ['/images/unknownlord.png', 'S'], \MySociety\TheyWorkForYou\Utility\Member::findMemberImage(1, true, 'lord') ); // Does a large JPEG work? $this->assertEquals( - array('/images/mpsL/11132.jpeg', 'L'), + ['/images/mpsL/11132.jpeg', 'L'], \MySociety\TheyWorkForYou\Utility\Member::findMemberImage(11132) ); // Does a small JPEG work? $this->assertEquals( - array('/images/mps/10001.jpeg', 'S'), + ['/images/mps/10001.jpeg', 'S'], \MySociety\TheyWorkForYou\Utility\Member::findMemberImage(10001, true) ); // Does a large PNG work? No large PNGs $this->assertEquals( - array('/images/mps/13943.png', 'S'), + ['/images/mps/13943.png', 'S'], \MySociety\TheyWorkForYou\Utility\Member::findMemberImage(13943) ); // Does a small PNG work? $this->assertEquals( - array('/images/mps/13943.png', 'S'), + ['/images/mps/13943.png', 'S'], \MySociety\TheyWorkForYou\Utility\Member::findMemberImage(13943, true) ); // Does a large JPG work? $this->assertEquals( - array('/images/mpsL/10001.jpg', 'L'), + ['/images/mpsL/10001.jpg', 'L'], \MySociety\TheyWorkForYou\Utility\Member::findMemberImage(10001) ); // Does a small JPG work? $this->assertEquals( - array('/images/mps/10552.jpg', 'S'), + ['/images/mps/10552.jpg', 'S'], \MySociety\TheyWorkForYou\Utility\Member::findMemberImage(10552, true) ); // If we request one we know we have, but also say use a substitute? $this->assertEquals( - array('/images/mps/10001.jpeg', 'S'), + ['/images/mps/10001.jpeg', 'S'], \MySociety\TheyWorkForYou\Utility\Member::findMemberImage(10001, true, true) ); // If we only have a small, but don't request explicitly? $this->assertEquals( - array('/images/mps/28619.jpg', 'S'), + ['/images/mps/28619.jpg', 'S'], \MySociety\TheyWorkForYou\Utility\Member::findMemberImage(28619) ); } public function testIsNew() { - $MEMBER = new MySociety\TheyWorkForYou\Member(array('person_id' => 17)); + $MEMBER = new MySociety\TheyWorkForYou\Member(['person_id' => 17]); $this->assertNotTrue($MEMBER->isNew()); self::$db->query("UPDATE member SET entered_house = NOW() WHERE person_id = 17"); // do this to force a reload - $MEMBER = new MySociety\TheyWorkForYou\Member(array('person_id' => 17)); + $MEMBER = new MySociety\TheyWorkForYou\Member(['person_id' => 17]); $this->assertTrue($MEMBER->isNew()); } public function testGetEntryDate() { - $MEMBER = new MySociety\TheyWorkForYou\Member(array('person_id' => 18)); + $MEMBER = new MySociety\TheyWorkForYou\Member(['person_id' => 18]); $this->assertEquals($MEMBER->getEntryDate(), '2014-05-01'); $this->assertEquals($MEMBER->getEntryDate(1), '2014-05-01'); @@ -321,44 +302,44 @@ public function testGetEntryDate() { } public function testGetRegionalList() { - $this->assertEquals(array(), \MySociety\TheyWorkForYou\Member::getRegionalList('', '', '')); + $this->assertEquals([], \MySociety\TheyWorkForYou\Member::getRegionalList('', '', '')); - $msps = array( - array( + $msps = [ + [ 'person_id' => "19", 'name' => "Mr Regional MSP1", 'constituency' => "Mid Scotland and Fife", - 'house' => "4" - ), - array( + 'house' => "4", + ], + [ 'person_id' => "20", 'name' => "Mr Regional MSP2", 'constituency' => "Mid Scotland and Fife", - 'house' => "4" - ) - ); + 'house' => "4", + ], + ]; $this->assertEquals($msps, \MySociety\TheyWorkForYou\Member::getRegionalList('KY16 8YG', 4, 'SPE')); - $mlas = array( - array( + $mlas = [ + [ 'person_id' => "21", 'name' => "Mr Regional MLA1", 'constituency' => "Belfast West", - 'house' => "3" - ), - array( + 'house' => "3", + ], + [ 'person_id' => "22", 'name' => "Mr Regional MLA2", 'constituency' => "Belfast West", - 'house' => "3" - ) - ); + 'house' => "3", + ], + ]; $this->assertEquals($mlas, \MySociety\TheyWorkForYou\Member::getRegionalList('BT17 0XD', 3, 'NIE')); - $this->assertEquals(array(), \MySociety\TheyWorkForYou\Member::getRegionalList('BT17 0XD', 4, 'NIE')); - $this->assertEquals(array(), \MySociety\TheyWorkForYou\Member::getRegionalList('BT17 0XD', 3, 'SPE')); - $this->assertEquals(array(), \MySociety\TheyWorkForYou\Member::getRegionalList('KY16 8YG', 3, 'SPE')); - $this->assertEquals(array(), \MySociety\TheyWorkForYou\Member::getRegionalList('KY16 8YG', 4, 'NIE')); - $this->assertEquals(array(), \MySociety\TheyWorkForYou\Member::getRegionalList('KY16 8YG', 4, '')); - $this->assertEquals(array(), \MySociety\TheyWorkForYou\Member::getRegionalList('KY16 8YG', '', '')); + $this->assertEquals([], \MySociety\TheyWorkForYou\Member::getRegionalList('BT17 0XD', 4, 'NIE')); + $this->assertEquals([], \MySociety\TheyWorkForYou\Member::getRegionalList('BT17 0XD', 3, 'SPE')); + $this->assertEquals([], \MySociety\TheyWorkForYou\Member::getRegionalList('KY16 8YG', 3, 'SPE')); + $this->assertEquals([], \MySociety\TheyWorkForYou\Member::getRegionalList('KY16 8YG', 4, 'NIE')); + $this->assertEquals([], \MySociety\TheyWorkForYou\Member::getRegionalList('KY16 8YG', 4, '')); + $this->assertEquals([], \MySociety\TheyWorkForYou\Member::getRegionalList('KY16 8YG', '', '')); } } diff --git a/tests/PageTest.php b/tests/PageTest.php index 120f7d0218..fd25bd72de 100644 --- a/tests/PageTest.php +++ b/tests/PageTest.php @@ -3,40 +3,33 @@ /** * Provides test methods to ensure pages contain what we want them to in various ways. */ -class PageTest extends FetchPageTestCase -{ - +class PageTest extends FetchPageTestCase { /** * Loads the member testing fixture. */ - public function getDataSet() - { - return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/member.xml'); + public function getDataSet() { + return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/member.xml'); } - private function fetch_page($vars) - { + private function fetch_page($vars) { return $this->base_fetch_page($vars, 'mp'); } - public function testQueenie() - { - $page = $this->fetch_page( array( 'representative_type' => 'royal', 'n' => 'elizabeth_the_second' ) ); + public function testQueenie() { + $page = $this->fetch_page([ 'representative_type' => 'royal', 'n' => 'elizabeth_the_second' ]); $this->assertStringContainsString('Elizabeth the Second', $page); $this->assertStringContainsString('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' ) ); + public function testSittingMP() { + $page = $this->fetch_page([ 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency' ]); $this->assertStringContainsString('Test Current-MP', $page); $this->assertMatchesRegularExpression('#\s*Test Westminster Constituency\s*#', $page); $this->assertMatchesRegularExpression('#\s*Labour\s*MP\s*#', $page); } - public function testSittingMLA() - { - $page = $this->fetch_page( array( 'pid' => 4, 'representative_type' => 'mla', 'url' => '/mp/4/test_current-mla' ) ); + public function testSittingMLA() { + $page = $this->fetch_page([ 'pid' => 4, 'representative_type' => 'mla', 'url' => '/mp/4/test_current-mla' ]); $this->assertStringContainsString('Test Current-MLA', $page); $this->assertMatchesRegularExpression('#\s*Test Northern Ireland Constituency\s*#', $page); $this->assertMatchesRegularExpression('#\s*Sinn Féin\s*MLA\s*#', $page); @@ -45,37 +38,34 @@ public function testSittingMLA() /** * Ensure that the Sinn Fein message is displayed for SF MPs. */ - public function testSittingSinnFeinMP() - { - $page = $this->fetch_page( array( 'pid' => 15, 'url' => '/mp/15/test_current-sf-mp/test_westminster_constituency' ) ); + public function testSittingSinnFeinMP() { + $page = $this->fetch_page([ 'pid' => 15, 'url' => '/mp/15/test_current-sf-mp/test_westminster_constituency' ]); $this->assertStringContainsString('Sinn Féin MPs do not take their seats in Parliament.', $page); } /** * Ensure that the Sinn Fein message is not displayed for non-SF MPs. */ - public function testSittingNonSinnFeinMP() - { - $page = $this->fetch_page( array( 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency' ) ); + public function testSittingNonSinnFeinMP() { + $page = $this->fetch_page([ 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency' ]); $this->assertStringNotContainsString('Sinn Féin MPs do not take their seats in Parliament.', $page); } /** * Ensure that the Speaker is given the correct constituency. */ - public function testSpeaker() - { - $page = $this->fetch_page( array( 'pid' => 13, 'url' => '/mp/13/test_speaker/buckingham' ) ); + public function testSpeaker() { + $page = $this->fetch_page([ 'pid' => 13, 'url' => '/mp/13/test_speaker/buckingham' ]); $this->assertMatchesRegularExpression('#\s*Speaker\s*MP\s*#', $page); } public function testBanner() { - $banner = new MySociety\TheyWorkForYou\Model\AnnouncementManagement; + $banner = new MySociety\TheyWorkForYou\Model\AnnouncementManagement(); # makes sure it is empty in case there's something hanging # about in memcached $banner->set_text('', "banner"); - $page = $this->fetch_page( array( 'url' => '/' ) ); + $page = $this->fetch_page([ 'url' => '/' ]); $this->assertStringNotContainsString('

    • - - 1 ) { - if ( $mp_types['mp'] > 0 && $mp_types['former'] > 0 ) { + + 1) { + if ($mp_types['mp'] > 0 && $mp_types['former'] > 0) { $desc = gettext('MPs and former MPs'); - } elseif ( $mp_types['mp'] > 0 ) { + } elseif ($mp_types['mp'] > 0) { $desc = gettext('MPs'); - } elseif ( $mp_types['former'] > 0 ) { + } elseif ($mp_types['former'] > 0) { $desc = gettext('Former MPs'); } - ?> + ?>

    %s'), $desc, _htmlentities($searchstring)) ?>

    - +

    %s'), _htmlentities($searchstring)) ?>

    - +

    %s'), _htmlentities($searchstring)) ?>

    - + - +

    %s'), _htmlentities($searchstring)) ?>

    - +
    @@ -45,43 +45,43 @@

    Glossary items matching

    - +
    - +

    I want to write to

    - + There was an error – – searching for .

    %s', _htmlentities($searchdescription)); - if ( $pagination_links ) { ?> + $term = sprintf('%s', _htmlentities($searchdescription)); + if ($pagination_links) { ?> - + - +

    - -

    ' . _htmlentities( $info['spelling_correction_display'] ) . '') ?>

    + +

    ' . _htmlentities($info['spelling_correction_display']) . '') ?>

    - +
      - +
    • : /
      • - +
    • relevance'), $urls['relevance']) ?>
    • : /
      • @@ -92,7 +92,7 @@
    - +

    ()

    @@ -101,22 +101,22 @@
    - +
    - + << < - + > - + > >>
    - +
    diff --git a/www/includes/easyparliament/templates/html/search/sidebar.php b/www/includes/easyparliament/templates/html/search/sidebar.php index eaeb712146..560c3dea3d 100644 --- a/www/includes/easyparliament/templates/html/search/sidebar.php +++ b/www/includes/easyparliament/templates/html/search/sidebar.php @@ -1,9 +1,9 @@
    - +

    Subscribe to an email alert for %s'), $search_sidebar['email'], $search_sidebar['email_desc']) ?> - +
    %s)'), $search_sidebar['email_section'], $search_sidebar['email_desc_section']) ?>

    diff --git a/www/includes/easyparliament/templates/html/section/_business_list_item.php b/www/includes/easyparliament/templates/html/section/_business_list_item.php index c48b891e12..e59c2dcca7 100644 --- a/www/includes/easyparliament/templates/html/section/_business_list_item.php +++ b/www/includes/easyparliament/templates/html/section/_business_list_item.php @@ -1,6 +1,6 @@

    - +
    @@ -12,11 +12,11 @@     - +

    - 0 ) { ?> + 0) { ?> - +

    diff --git a/www/includes/easyparliament/templates/html/section/_business_section.php b/www/includes/easyparliament/templates/html/section/_business_section.php index 451b74146d..4f922f25a5 100644 --- a/www/includes/easyparliament/templates/html/section/_business_section.php +++ b/www/includes/easyparliament/templates/html/section/_business_section.php @@ -1,7 +1,7 @@

    - + Dadleuon diweddar Y Senedd @@ -10,7 +10,7 @@

    @@ -21,10 +21,10 @@
    + include '_calendar_section.php'; + ?>
    - +

    diff --git a/www/includes/easyparliament/templates/html/section/_calendar.php b/www/includes/easyparliament/templates/html/section/_calendar.php index 6786880602..44f006e544 100644 --- a/www/includes/easyparliament/templates/html/section/_calendar.php +++ b/www/includes/easyparliament/templates/html/section/_calendar.php @@ -1,45 +1,45 @@

    2 && $datebits[0] == $year && $datebits[1] == $month) { - $toDay = $datebits[2]; - } else { - $toDay = ''; - } - } else { - // If this calendar is for this current, real world, month - // we get the value of today, so we can highlight it. - $nowDateComponents = getdate(); - - if ($nowDateComponents['year'] == $year && $nowDateComponents['mon'] == $month) { - $toDay = $nowDateComponents['mday']; - } else { - $toDay = ''; - } - } - - $dayOfWeek = strftime('%w', $firstDayOfMonth) - 1; - - // Adjusted to cope with the week starting on Monday. - if ($dayOfWeek < 0) { - $dayOfWeek = 6; - } - ?> + // What is the first day of the month in question? + $firstDayOfMonth = mktime(0, 0, 0, $month, 1, $year); + + // How many days does this month contain? + $numberDays = date('t', $firstDayOfMonth); + + // What is the name of the month in question? + $monthName = strftime('%B', $firstDayOfMonth); + + if (isset($info['onday'])) { + // 'onday' is like 'yyyy-mm-dd'. + $datebits = explode('-', $info['onday']); + if (count($datebits) > 2 && $datebits[0] == $year && $datebits[1] == $month) { + $toDay = $datebits[2]; + } else { + $toDay = ''; + } + } else { + // If this calendar is for this current, real world, month + // we get the value of today, so we can highlight it. + $nowDateComponents = getdate(); + + if ($nowDateComponents['year'] == $year && $nowDateComponents['mon'] == $month) { + $toDay = $nowDateComponents['mday']; + } else { + $toDay = ''; + } + } + + $dayOfWeek = strftime('%w', $firstDayOfMonth) - 1; + + // Adjusted to cope with the week starting on Monday. + if ($dayOfWeek < 0) { + $dayOfWeek = 6; + } + ?> + if (!isset($years)) { ?>
    - + ←   @@ -47,7 +47,7 @@ - + →   @@ -75,93 +75,93 @@ 0) { - print " "; - } + if ($dayOfWeek > 0) { + print " "; + } - $currentDay = 1; + $currentDay = 1; - while ($currentDay <= $numberDays) { + while ($currentDay <= $numberDays) { - // Seventh column (Sunday) reached. Start a new row. + // Seventh column (Sunday) reached. Start a new row. - if ($dayOfWeek == 7) { + if ($dayOfWeek == 7) { - $dayOfWeek = 0; - ?> + $dayOfWeek = 0; + ?> '; - } elseif ($recess[0]) { - print ''; - } else { - print ''; - } - - // Is the $currentDay a member of $dates? If so, - // the day should be linked. - if (in_array($currentDay,$dates)) { - - $date = sprintf("%04d-%02d-%02d", $year, $month, $currentDay); - - if ($currentDay == $toDay) { - print '' . $currentDay . ''; - } else { - $day_section = $section; - if ($section == 'sp') { - $day_section = 'spdebates'; - } - $urls[$day_section . 'day']->insert(array('d'=>$date)); - print "generate() . "\">$currentDay"; - } - - // $currentDay is not a member of $dates. - - } else { - - print '' . $currentDay . ''; - } - // Increment counters - - $currentDay++; - $dayOfWeek++; - } - - // Complete the row of the last week in month, if necessary - - if ($dayOfWeek != 7) { - - $remainingDays = 7 - $dayOfWeek; - print " "; - } -?> + } + + $recess = recess_prettify($currentDay, $month, $year, $recess_major); + + // Is this day actually Today in the real world? + // If so, higlight it. + // Also highlight days where there are no + // sittings - e.g. WH is only Tuesday-Thursday + if ($currentDay == $toDay) { + print ''; + } elseif ($recess[0]) { + print ''; + } else { + print ''; + } + + // Is the $currentDay a member of $dates? If so, + // the day should be linked. + if (in_array($currentDay, $dates)) { + + $date = sprintf("%04d-%02d-%02d", $year, $month, $currentDay); + + if ($currentDay == $toDay) { + print '' . $currentDay . ''; + } else { + $day_section = $section; + if ($section == 'sp') { + $day_section = 'spdebates'; + } + $urls[$day_section . 'day']->insert(['d' => $date]); + print "generate() . "\">$currentDay"; + } + + // $currentDay is not a member of $dates. + + } else { + + print '' . $currentDay . ''; + } + // Increment counters + + $currentDay++; + $dayOfWeek++; + } + + // Complete the row of the last week in month, if necessary + + if ($dayOfWeek != 7) { + + $remainingDays = 7 - $dayOfWeek; + print " "; + } + ?> - +
    reset(); - $y->insert(array( 'y' => $year )); - $url = $y->generate(); - ?> + $y = $urls['day']; + $y->reset(); + $y->insert([ 'y' => $year ]); + $url = $y->generate(); + ?>
    diff --git a/www/includes/easyparliament/templates/html/section/_calendar_section.php b/www/includes/easyparliament/templates/html/section/_calendar_section.php index 142a6fe7ce..9a6fae6192 100644 --- a/www/includes/easyparliament/templates/html/section/_calendar_section.php +++ b/www/includes/easyparliament/templates/html/section/_calendar_section.php @@ -1,6 +1,6 @@ $months) { foreach ($months as $month => $dates) { - include '_calendar.php'; + include '_calendar.php'; } } ?> diff --git a/www/includes/easyparliament/templates/html/section/_search.php b/www/includes/easyparliament/templates/html/section/_search.php index 5d595e2030..8f5dee7260 100644 --- a/www/includes/easyparliament/templates/html/section/_search.php +++ b/www/includes/easyparliament/templates/html/section/_search.php @@ -13,14 +13,14 @@ - 1) { ?> + 1) { ?>
    + } elseif (isset($section)) { ?> diff --git a/www/includes/easyparliament/templates/html/section/_section_content.php b/www/includes/easyparliament/templates/html/section/_section_content.php index 771133ac10..b993407fd6 100644 --- a/www/includes/easyparliament/templates/html/section/_section_content.php +++ b/www/includes/easyparliament/templates/html/section/_section_content.php @@ -13,17 +13,20 @@ if ($speech['htype'] == 12) { if ($hansardmajors[$data['info']['major']]['location'] == 'Scotland') { $body = preg_replace('# (S\d[O0WF]-\d+)[, ]#', ' $1 ', $body); - $body = preg_replace_callback('#\[(.*?)\]#', function($matches) { - if ($matches[1] == 'spor') { - $href_segment = 'sp/?g'; - } elseif ($matches[1] == 'spwa') { + $body = preg_replace_callback( + '#\[(.*?)\]#', + function ($matches) { + if ($matches[1] == 'spor') { + $href_segment = 'sp/?g'; + } elseif ($matches[1] == 'spwa') { $href_segment = 'spwrans/?'; } else { $href_segment = 'debates/?'; } return '[' . $matches[3] . ']'; }, - $body); + $body + ); $body = str_replace('href="../../../', 'href="http://www.scottish.parliament.uk/', $body); } @@ -55,35 +58,35 @@ # Assume a paragraph starting with a lowercase character should be run on $body = preg_replace('#(?\s*]*>(?=[a-z])(?![ivx]+\.)#', ' ', $body); - $body = str_replace(array('
    ', '

    ', '

    ', '

    ', '

    + $speaker_name = ucfirst($speaker['name']); + + [$image_url, $size] = MySociety\TheyWorkForYou\Utility\Member::findMemberImage( + $speaker['person_id'], + true, + $data['info']['major'] == 101 ? 'lord' : 'general' + ); + + if (count($speaker['office'])) { + $desc = []; + foreach ($speaker['office'] as $off) { + $desc[] = $off['pretty']; + } + $speaker_position = join(', ', $desc); + } else { + $speaker_position = _htmlentities($speaker['party']); + if ($speaker['house'] == 1 && + $speaker['party'] != 'Speaker' && + $speaker['party'] != 'Deputy Speaker' && + $speaker['constituency'] + ) { + $speaker_position .= ', ' . $speaker['constituency']; + } + } + + ?> Photo of <?= $speaker_name ?> @@ -162,8 +165,8 @@

    + if ($data['info']['major'] == 8 && preg_match('#\d{4}-\d\d-\d\d\.(.*?)\.q#', $speech['gid'], $m)) { + ?>

    @@ -184,20 +187,20 @@
    - +
    $speech['mp_vote']['vote'] ); - if ( isset($speech['before_mp']) ) { - $before_mp = $speech['before_mp']; - } - if ( isset($speech['after_mp']) ) { - $after_mp = $speech['after_mp']; - } - include dirname(__FILE__) . '/../divisions/_your_mp.php'; + $mp_vote = [ 'vote' => $speech['mp_vote']['vote'] ]; + if (isset($speech['before_mp'])) { + $before_mp = $speech['before_mp']; + } + if (isset($speech['after_mp'])) { + $after_mp = $speech['after_mp']; + } + include dirname(__FILE__) . '/../divisions/_your_mp.php'; } ?>
    @@ -213,7 +216,7 @@
    -
    @@ -267,41 +270,41 @@ $in_context = gettext('See this item in context'); $link_to = gettext('Link to this item'); } - ?> + ?>
    • + if (!$section || !$individual_item) { ?>
    • + } + if ($speech['socialteaser'] && $speech['socialurl']) { + $twitter_href = sprintf( + 'https://twitter.com/share?url=%s&text=%s&related=%s', + urlencode($speech['socialurl']), + urlencode($speech['socialteaser']), + urlencode('theyworkforyou,mysociety') + ); + $facebook_href = sprintf( + 'https://www.facebook.com/dialog/share?app_id=%s&display=popup&href=%s"e=%s', + urlencode(FACEBOOK_APP_ID), + urlencode($speech['socialurl']), + urlencode($speech['socialteaser']) + ); ?>
    • + } + if ($source) { ?>
  • @@ -309,10 +312,10 @@ ()
    • + } + if (isset($speech['mentions'])) { + echo $speech['mentions']; + } ?> @@ -327,55 +330,55 @@ } // end foreach - if (isset($data['subrows'])) { - print '
      '; - foreach ($data['subrows'] as $row) { - print '
    • '; - if (isset($row['contentcount']) && $row['contentcount'] > 0) { - $has_content = true; - } elseif ($row['htype'] == '11' && $hansardmajors[$row['major']]['type'] == 'other') { - $has_content = true; - } else { - $has_content = false; +if (isset($data['subrows'])) { + print '
        '; + foreach ($data['subrows'] as $row) { + print '
      • '; + if (isset($row['contentcount']) && $row['contentcount'] > 0) { + $has_content = true; + } elseif ($row['htype'] == '11' && $hansardmajors[$row['major']]['type'] == 'other') { + $has_content = true; + } else { + $has_content = false; + } + if ($has_content) { + print '' . $row['body'] . ' '; + // For the "x speeches, x comments" text. + $moreinfo = []; + if ($hansardmajors[$row['major']]['type'] != 'other') { + // All wrans have 2 speeches, so no need for this. + // All WMS have 1 speech + $moreinfo[] = sprintf(ngettext('%s speech', '%s speeches', $row['contentcount']), $row['contentcount']); } - if ($has_content) { - print '' . $row['body'] . ' '; - // For the "x speeches, x comments" text. - $moreinfo = array(); - if ($hansardmajors[$row['major']]['type'] != 'other') { - // All wrans have 2 speeches, so no need for this. - // All WMS have 1 speech - $moreinfo[] = sprintf(ngettext('%s speech', '%s speeches', $row['contentcount']), $row['contentcount']); - } - if ($row['totalcomments'] > 0) { - $moreinfo[] = sprintf(ngettext('%s annotation', '%s annotations', $row['totalcomments']), $row['totalcomments']); - } - if (count($moreinfo) > 0) { - print "(" . implode (', ', $moreinfo) . ") "; - } - } else { - // Nothing in this item, so no link. - print $row['body']; + if ($row['totalcomments'] > 0) { + $moreinfo[] = sprintf(ngettext('%s annotation', '%s annotations', $row['totalcomments']), $row['totalcomments']); } - if (isset($row['excerpt'])) { - print "

        " . trim_characters($row['excerpt'], 0, 200) . "

        "; + if (count($moreinfo) > 0) { + print "(" . implode(', ', $moreinfo) . ") "; } + } else { + // Nothing in this item, so no link. + print $row['body']; + } + if (isset($row['excerpt'])) { + print "

        " . trim_characters($row['excerpt'], 0, 200) . "

        "; } - print '
      '; } + print '
    '; +} - if ($section && $individual_item) { ?> +if ($section && $individual_item) { ?>
    display('ep', $comments['args']); - # XXX COMMENT SIDEBAR SHOULD GO HERE IF LOGGED IN - ?> + # XXX + global $PAGE; + $comments['object']->display('ep', $comments['args']); + # XXX COMMENT SIDEBAR SHOULD GO HERE IF LOGGED IN + ?>
    + ?>
    @@ -30,11 +30,11 @@
      + ?>

    • - + diff --git a/www/includes/easyparliament/templates/html/section/column.php b/www/includes/easyparliament/templates/html/section/column.php index b1d09d83b0..c656df350c 100644 --- a/www/includes/easyparliament/templates/html/section/column.php +++ b/www/includes/easyparliament/templates/html/section/column.php @@ -1,7 +1,7 @@ @@ -19,11 +19,11 @@
    - +
    - + We only have information about columns for debates in the House of Commons and the House of Lords. We can't find anything in column on . @@ -32,7 +32,8 @@
    diff --git a/www/includes/easyparliament/templates/html/section/day.php b/www/includes/easyparliament/templates/html/section/day.php index ef3ec8373c..4828135d5a 100644 --- a/www/includes/easyparliament/templates/html/section/day.php +++ b/www/includes/easyparliament/templates/html/section/day.php @@ -6,32 +6,32 @@

    - +

    - +
      - + foreach ($rows as $row) { ?> +
    - +
  • + if ($prevlevel == '') { ?>
  • - +
    • - +

      @@ -42,26 +42,26 @@

      - 0 ) { ?> + 0) { ?> + if (isset($row['excerpt'])) { ?>

      - +

      -
      • - +
    • @@ -83,6 +83,7 @@
    - +
    diff --git a/www/includes/easyparliament/templates/html/section/index.php b/www/includes/easyparliament/templates/html/section/index.php index 30e270365a..93049641a8 100644 --- a/www/includes/easyparliament/templates/html/section/index.php +++ b/www/includes/easyparliament/templates/html/section/index.php @@ -1,18 +1,21 @@
    - - + + + $content = $whall; + $title = "Westminster Hall debates"; + $urls['day'] = $urls['whallday']; + include '_business_section.php'; ?> + $section = 'lords'; + $content = $lords; + $title = "House of Lords debates"; + $urls['day'] = $urls['lordsday']; + include '_business_section.php'; ?>
    diff --git a/www/includes/easyparliament/templates/html/section/ni_index.php b/www/includes/easyparliament/templates/html/section/ni_index.php index 21c40d6789..778be9873f 100644 --- a/www/includes/easyparliament/templates/html/section/ni_index.php +++ b/www/includes/easyparliament/templates/html/section/ni_index.php @@ -2,10 +2,11 @@ - + diff --git a/www/includes/easyparliament/templates/html/section/pbc_bill.php b/www/includes/easyparliament/templates/html/section/pbc_bill.php index eb20e028e3..a54b25f952 100644 --- a/www/includes/easyparliament/templates/html/section/pbc_bill.php +++ b/www/includes/easyparliament/templates/html/section/pbc_bill.php @@ -24,12 +24,12 @@
      '; - $first = 1; - } ?> + foreach ($content['rows'] as $row) { + if ($row['htype'] == 10) { + if (!$first) { + print ''; + $first = 1; + } ?>
    • href="" class="business-list__title">

      @@ -37,16 +37,16 @@

      - + sitting · - - 0 ) { ?> + + 0) { ?> ·

      - +

        @@ -61,7 +61,7 @@

        - +

        @@ -69,13 +69,13 @@
      + } ?>
    - + ?>

    All bills in this session @@ -85,13 +85,13 @@

    Chairpersons

      - +
    • ()

    Members

      - +
    • ()
    diff --git a/www/includes/easyparliament/templates/html/section/pbc_index.php b/www/includes/easyparliament/templates/html/section/pbc_index.php index 63b635a0d0..9fbe30695d 100644 --- a/www/includes/easyparliament/templates/html/section/pbc_index.php +++ b/www/includes/easyparliament/templates/html/section/pbc_index.php @@ -37,7 +37,7 @@

    + } ?>
    @@ -47,6 +47,7 @@
    - + diff --git a/www/includes/easyparliament/templates/html/section/pbc_session.php b/www/includes/easyparliament/templates/html/section/pbc_session.php index b5611d0519..68d024ff1b 100644 --- a/www/includes/easyparliament/templates/html/section/pbc_session.php +++ b/www/includes/easyparliament/templates/html/section/pbc_session.php @@ -24,7 +24,7 @@
      + foreach ($rows as $row) { ?>

    • @@ -42,7 +42,7 @@
      - + ←   @@ -50,7 +50,7 @@ session - + →   diff --git a/www/includes/easyparliament/templates/html/section/recent.php b/www/includes/easyparliament/templates/html/section/recent.php index c569c20656..a8255dd558 100644 --- a/www/includes/easyparliament/templates/html/section/recent.php +++ b/www/includes/easyparliament/templates/html/section/recent.php @@ -1,4 +1,5 @@
      - +
      diff --git a/www/includes/easyparliament/templates/html/section/section.php b/www/includes/easyparliament/templates/html/section/section.php index 6a783129dc..108fc6db7b 100644 --- a/www/includes/easyparliament/templates/html/section/section.php +++ b/www/includes/easyparliament/templates/html/section/section.php @@ -1,7 +1,7 @@ @@ -15,24 +15,25 @@ %s'), $debate_day_link, $debate_day_human); - ?>. +print ' '; +printf(gettext('on %s'), $debate_day_link, $debate_day_human); +?>.

      - +
      diff --git a/www/includes/easyparliament/templates/html/section/senedd_index.php b/www/includes/easyparliament/templates/html/section/senedd_index.php index 68753edd90..e7c0dba3d7 100644 --- a/www/includes/easyparliament/templates/html/section/senedd_index.php +++ b/www/includes/easyparliament/templates/html/section/senedd_index.php @@ -2,10 +2,11 @@ - + diff --git a/www/includes/easyparliament/templates/html/section/wrans_index.php b/www/includes/easyparliament/templates/html/section/wrans_index.php index 5312cff5c3..ce5dc4aeab 100644 --- a/www/includes/easyparliament/templates/html/section/wrans_index.php +++ b/www/includes/easyparliament/templates/html/section/wrans_index.php @@ -1,7 +1,14 @@
      - - - + + +
      diff --git a/www/includes/easyparliament/templates/html/section/year.php b/www/includes/easyparliament/templates/html/section/year.php index d4c3d5427a..34d6a44589 100644 --- a/www/includes/easyparliament/templates/html/section/year.php +++ b/www/includes/easyparliament/templates/html/section/year.php @@ -28,12 +28,13 @@ } ?> + } else { ?> - + diff --git a/www/includes/easyparliament/templates/html/senedd/index.php b/www/includes/easyparliament/templates/html/senedd/index.php index 455a7d47b2..72f3d5d282 100644 --- a/www/includes/easyparliament/templates/html/senedd/index.php +++ b/www/includes/easyparliament/templates/html/senedd/index.php @@ -6,8 +6,8 @@
      -
      @@ -23,10 +23,10 @@

      +?>

    diff --git a/www/includes/easyparliament/templates/html/static/linktous.php b/www/includes/easyparliament/templates/html/static/linktous.php index d42d4033d4..4f8b94dd76 100644 --- a/www/includes/easyparliament/templates/html/static/linktous.php +++ b/www/includes/easyparliament/templates/html/static/linktous.php @@ -8,25 +8,25 @@

    Alternatively, if you would like to place a TheyWorkForYou search box on your site, like this one…

    -
    -
    TheyWorkForYou.com
    -
    - - - -
    -
    - - - -
    -
    -
    - -END; -print $link_to_us_form; -?> + +
    +
    TheyWorkForYou.com
    +
    + + + +
    +
    + + + +
    +
    +
    + + END; + print $link_to_us_form; + ?>

    Cut and paste the code below into your webpage: