@@ -1,9 +1,9 @@ |
||
| 1 | 1 | <?php |
| 2 | -$nav_items = [ |
|
| 2 | +$nav_items = [ |
|
| 3 | 3 | ['hansard', 'alldebatesfront', 'mps', 'peers', 'interests_home', 'wranswmsfront', 'divisions_recent_commons', 'divisions_recent_lords'], |
| 4 | 4 | ['sp_home', 'sp_home', 'spdebatesfront', 'msps', 'interest_category_sp', 'spwransfront', 'divisions_recent_sp'], |
| 5 | - ['wales_home', 'wales_home', 'wales_debates', 'mss','interest_category_wp', 'welshlanguage', 'divisions_recent_wales'], |
|
| 6 | - ['ni_home', 'ni_home', 'nioverview', 'mlas','interest_category_ni'], |
|
| 5 | + ['wales_home', 'wales_home', 'wales_debates', 'mss', 'interest_category_wp', 'welshlanguage', 'divisions_recent_wales'], |
|
| 6 | + ['ni_home', 'ni_home', 'nioverview', 'mlas', 'interest_category_ni'], |
|
| 7 | 7 | ]; |
| 8 | 8 | |
| 9 | 9 | ?> |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | |
| 17 | 17 | public function limitToCategoryIds(array $categoryIds) { |
| 18 | 18 | // Filter the categories to only include those with the given IDs |
| 19 | - $this->items = array_filter($this->items, function ($category) use ($categoryIds) { |
|
| 19 | + $this->items = array_filter($this->items, function($category) use ($categoryIds) { |
|
| 20 | 20 | return in_array($category->category_id, $categoryIds); |
| 21 | 21 | }); |
| 22 | 22 | } |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | |
| 170 | 170 | if ($nextprev) { |
| 171 | 171 | // Four different kinds of back/forth links we might build. |
| 172 | - $links = ["first", "prev", "up", "next", "last"]; |
|
| 172 | + $links = ["first", "prev", "up", "next", "last"]; |
|
| 173 | 173 | |
| 174 | 174 | foreach ($links as $type) { |
| 175 | 175 | if ($link = $this->generate_next_prev_link($nextprev, $type)) { |
@@ -307,9 +307,9 @@ discard block |
||
| 307 | 307 | // Page names mapping to those in metadata.php. |
| 308 | 308 | // Links in the top menu, and the sublinks we see if |
| 309 | 309 | // we're within that section. |
| 310 | - $nav_items = [ |
|
| 310 | + $nav_items = [ |
|
| 311 | 311 | ['home'], |
| 312 | - ['hansard', 'mps', 'peers', 'alldebatesfront', 'interests_home', 'wranswmsfront', 'pbc_front', 'divisions_recent_commons', 'divisions_recent_lords', 'calendar_summary'], |
|
| 312 | + ['hansard', 'mps', 'peers', 'alldebatesfront', 'interests_home', 'wranswmsfront', 'pbc_front', 'divisions_recent_commons', 'divisions_recent_lords', 'calendar_summary'], |
|
| 313 | 313 | ['sp_home', 'spoverview', 'msps', 'interest_category_sp', 'spdebatesfront', 'divisions_recent_sp'], #'spwransfront' |
| 314 | 314 | ['ni_home', 'nioverview', 'mlas', 'interest_category_ni'], |
| 315 | 315 | ['wales_home', 'seneddoverview', 'mss', 'interest_category_wp', 'wales_debates', 'divisions_recent_wales'], |
@@ -131,8 +131,8 @@ discard block |
||
| 131 | 131 | |
| 132 | 132 | <ul class="vote-descriptions"> |
| 133 | 133 | <?php foreach ($sig_diff_policy->policy_pairs as $policy_pair) { |
| 134 | - include '_vote_description.php'; |
|
| 135 | - } ?> |
|
| 134 | + include '_vote_description.php'; |
|
| 135 | + } ?> |
|
| 136 | 136 | </ul> |
| 137 | 137 | |
| 138 | 138 | <?php } ?> |
@@ -165,9 +165,9 @@ discard block |
||
| 165 | 165 | <ul class="vote-descriptions"> |
| 166 | 166 | <?php foreach ($segment->policy_pairs as $policy_pair) { |
| 167 | 167 | |
| 168 | - include '_vote_description.php'; |
|
| 168 | + include '_vote_description.php'; |
|
| 169 | 169 | |
| 170 | - } ?> |
|
| 170 | + } ?> |
|
| 171 | 171 | </ul> |
| 172 | 172 | |
| 173 | 173 | <p class="voting-information-provenance"> |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | <nav class="subpage-content-list js-accordion" aria-label="Comparison periods"> |
| 35 | 35 | <h3 class="js-accordion-button">For period: <?= $comparison_period->description ?></h3> |
| 36 | 36 | <ul class="js-accordion-content"> |
| 37 | - <?php foreach($available_periods as $period) { ?> |
|
| 37 | + <?php foreach ($available_periods as $period) { ?> |
|
| 38 | 38 | <li><a href="?comparison_period=<?= $period->lslug() ?>" class="<?= $period->lslug() === $comparison_period->lslug() ? 'active-comparison-period' : '' ?>"><?= $period->description ?></a></li> |
| 39 | 39 | <?php } ?> |
| 40 | 40 | </ul> |
@@ -13,12 +13,12 @@ discard block |
||
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | private function fetch_mp_recent_page() { |
| 16 | - $vars = [ 'pagetype' => 'recent', 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/recent' ]; |
|
| 16 | + $vars = ['pagetype' => 'recent', 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/recent']; |
|
| 17 | 17 | return $this->base_fetch_page($vars, 'mp', 'index.php', '/mp/recent.php'); |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | private function fetch_recent_page() { |
| 21 | - return $this->base_fetch_page(['url' => '/divisions' ], 'divisions', 'index.php', '/divisions/index.php'); |
|
| 21 | + return $this->base_fetch_page(['url' => '/divisions'], 'divisions', 'index.php', '/divisions/index.php'); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | public function testSingleDivision() { |
| 57 | - $page = $this->base_fetch_page(['url' => '/divisions/division.php', 'vote' => 'pw-3012-01-01-1-commons' ], 'divisions', 'division.php', '/divisions/division.php'); |
|
| 57 | + $page = $this->base_fetch_page(['url' => '/divisions/division.php', 'vote' => 'pw-3012-01-01-1-commons'], 'divisions', 'division.php', '/divisions/division.php'); |
|
| 58 | 58 | $this->assertStringContainsString('A majority of MPs <b>voted in favour</b> of a thing', $page); |
| 59 | 59 | $this->assertStringContainsString('Aye: 200', $page); |
| 60 | 60 | $this->assertStringNotContainsString('No:', $page); # Summary 100, but no actual votes. In reality, summary can only be <= actual. |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | $og_image_parl = $extra_vars['_social_image_parliament'] ?? 'uk'; |
| 32 | 32 | $og_image_url = \MySociety\TheyWorkForYou\Url::generateSocialImageUrl($og_image_title, $og_image_subtitle, $og_image_parl); |
| 33 | 33 | |
| 34 | - $html = preg_replace_callback('/<h([1-3])>([^<]+)<\/h[1-3]>/i', function ($matches) { |
|
| 34 | + $html = preg_replace_callback('/<h([1-3])>([^<]+)<\/h[1-3]>/i', function($matches) { |
|
| 35 | 35 | $level = $matches[1]; |
| 36 | 36 | $htitle = $matches[2]; |
| 37 | 37 | $slug = slugify($htitle); |
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | $group_name = $policies->getSetDescriptions()[$set_slug]; |
| 88 | 88 | $group_slug = $set_slug; |
| 89 | 89 | $comparison_period_slug = $period_slug; |
| 90 | - $policy_pairs = array_filter($pairs, function ($pair) use ($policy_ids) { |
|
| 90 | + $policy_pairs = array_filter($pairs, function($pair) use ($policy_ids) { |
|
| 91 | 91 | $is_policy_valid = in_array($pair->getPolicyID(), $policy_ids); |
| 92 | 92 | $has_own_distribution = $pair->member_distribution !== null && !$pair->member_distribution->noDataAvailable(); |
| 93 | 93 | return $is_policy_valid && $has_own_distribution; |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | |
| 109 | 109 | |
| 110 | 110 | private function getMemberFromPersonId($person_id) { |
| 111 | - return new MySociety\TheyWorkForYou\Member([ "person_id" => $person_id ]); |
|
| 111 | + return new MySociety\TheyWorkForYou\Member(["person_id" => $person_id]); |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | public function testMPPartyPolicyTextWhenDiffersVotes() { |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | // this is a single person party i think - so no party comparison? |
| 138 | 138 | // need to check what votes would actually produce |
| 139 | 139 | |
| 140 | - $page = $this->fetch_page(['pid' => 4, 'pagetype' => 'votes','url' => '/mp/4/test_mp_d/test_westminster_constituency/votes']); |
|
| 140 | + $page = $this->fetch_page(['pid' => 4, 'pagetype' => 'votes', 'url' => '/mp/4/test_mp_d/test_westminster_constituency/votes']); |
|
| 141 | 141 | $this->assertStringContainsString('Test MP D', $page); |
| 142 | 142 | $this->assertStringContainsString('<li class="vote-description"', $page); |
| 143 | 143 | $this->assertStringNotContainsString('comparable B Party MPs voted', $page); |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | |
| 149 | 149 | // this is just a boring, person aligned with party example |
| 150 | 150 | |
| 151 | - $page = $this->fetch_page(['pagetype' => 'votes', 'pid' => 16, 'url' => '/mp/16/test_mp_g_party_2/test_westminster_constituency/votes']); |
|
| 151 | + $page = $this->fetch_page(['pagetype' => 'votes', 'pid' => 16, 'url' => '/mp/16/test_mp_g_party_2/test_westminster_constituency/votes']); |
|
| 152 | 152 | $this->assertStringContainsString('Test MP G Party 2', $page); |
| 153 | 153 | |
| 154 | 154 | $this->assertStringNotContainsString('sometimes differs from their party colleagues', $page); |
@@ -114,7 +114,10 @@ |
||
| 114 | 114 | <ul> |
| 115 | 115 | <li><span class="appg-property-label">Purpose:</span> <?= $membership->appg->purpose ?></li> |
| 116 | 116 | <li><span class="appg-property-label">Membership Source:</span> <a href="<?= $membership->membership_source_url ?>">Source</a></li> |
| 117 | - <li><span class="appg-property-label">APPG Website:</span> <?php if ($membership->appg->website): ?><a href="<?= $membership->appg->website ?>"><?= $membership->appg->website ?></a><?php else: ?>N/A<?php endif; ?></li> |
|
| 117 | + <li><span class="appg-property-label">APPG Website:</span> <?php if ($membership->appg->website): ?><a href="<?= $membership->appg->website ?>"><?= $membership->appg->website ?></a><?php else { |
|
| 118 | + : ?>N/A<?php endif; |
|
| 119 | +} |
|
| 120 | +?></li> |
|
| 118 | 121 | <li><span class="appg-property-label">APPG register:</span> <a href="<?= $membership->appg->source_url ?>">Parliament website</a></li> |
| 119 | 122 | </ul> |
| 120 | 123 | </div> |