@@ -13,12 +13,15 @@ |
||
| 13 | 13 | <?php $detail = $upper_detail; ?> |
| 14 | 14 | </ul> |
| 15 | 15 | </li> |
| 16 | - <?php else : ?> |
|
| 16 | + <?php else { |
|
| 17 | + : ?> |
|
| 17 | 18 | <?php if ($detail->has_value()): ?> |
| 18 | 19 | <li class="interest-detail"> |
| 19 | 20 | <span class="interest-detail-name"><?= $detail->display_as ?>: </span> |
| 20 | 21 | <span class="interest-detail-value"><?= htmlspecialchars($detail->value) ?></span> |
| 21 | 22 | </li> |
| 22 | - <?php endif; ?> |
|
| 23 | + <?php endif; |
|
| 24 | +} |
|
| 25 | +?> |
|
| 23 | 26 | |
| 24 | 27 | <?php endif; ?> |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | <th>MP's comment</th> |
| 54 | 54 | </tr> |
| 55 | 55 | <?php foreach ($register->persons as $person) { ?> |
| 56 | - <?php foreach($person->categories as $category) { ?> |
|
| 56 | + <?php foreach ($person->categories as $category) { ?> |
|
| 57 | 57 | <?php if ($category->category_id != $category_id) { ?> |
| 58 | 58 | <?php continue; ?> |
| 59 | 59 | <?php }; ?> |
@@ -28,9 +28,12 @@ |
||
| 28 | 28 | <?php // This is a more mininal style of entry, don't use the header structure, just print the xml content?> |
| 29 | 29 | <?php if ($entry->content_format == "xml") : ?> |
| 30 | 30 | <?= $entry->content ?> |
| 31 | - <?php else: ?> |
|
| 31 | + <?php else { |
|
| 32 | + : ?> |
|
| 32 | 33 | <p class="interest-content"><?= htmlspecialchars($entry->content) ?></p> |
| 33 | - <?php endif; ?> |
|
| 34 | + <?php endif; |
|
| 35 | +} |
|
| 36 | +?> |
|
| 34 | 37 | <?php endif; ?> |
| 35 | 38 | |
| 36 | 39 | </ul> |
@@ -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"> |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | |
| 24 | 24 | <h3 class="browse-content">Comparison periods</h3> |
| 25 | 25 | <ul> |
| 26 | - <?php foreach($available_periods as $period) { ?> |
|
| 26 | + <?php foreach ($available_periods as $period) { ?> |
|
| 27 | 27 | <li class="active"><a href="?comparison_period=<?= $period->lslug() ?>"><?= $period->description ?></a></li> |
| 28 | 28 | <?php } ?> |
| 29 | 29 | </ul> |
@@ -66,7 +66,7 @@ |
||
| 66 | 66 | $group_name = $policies->getSetDescriptions()[$set_slug]; |
| 67 | 67 | $group_slug = $set_slug; |
| 68 | 68 | $comparison_period_slug = $period_slug; |
| 69 | - $policy_pairs = array_filter($pairs, function ($pair) use ($policy_ids) { |
|
| 69 | + $policy_pairs = array_filter($pairs, function($pair) use ($policy_ids) { |
|
| 70 | 70 | return in_array($pair->getPolicyID(), $policy_ids) && !$pair->member_distribution->noDataAvailable(); |
| 71 | 71 | }); |
| 72 | 72 | $collection = new PolicyDistributionCollection($group_slug, $group_name, $comparison_period_slug, $person_id, $party_slug, $policy_pairs); |
@@ -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. |