@@ -158,7 +158,7 @@ |
||
158 | 158 | ]; |
159 | 159 | $hansardmajors[104] = $hansardmajors[4]; |
160 | 160 | |
161 | -$parties = [ |
|
161 | +$parties = [ |
|
162 | 162 | 'Bp' => 'Bishop', |
163 | 163 | 'Con' => 'Conservative', |
164 | 164 | 'CWM' => 'Deputy Speaker', |
@@ -16,14 +16,14 @@ discard block |
||
16 | 16 | |
17 | 17 | public function testDebatesFront() { |
18 | 18 | foreach ($this->types as $type) { |
19 | - $page = $this->fetch_page([ 'type' => $type ]); |
|
19 | + $page = $this->fetch_page(['type' => $type]); |
|
20 | 20 | $this->assertStringContainsString($type, $page); |
21 | 21 | } |
22 | 22 | } |
23 | 23 | |
24 | 24 | public function testDebatesYear() { |
25 | 25 | foreach ($this->types as $type) { |
26 | - $page = $this->fetch_page([ 'type' => $type, 'y' => '2014' ]); |
|
26 | + $page = $this->fetch_page(['type' => $type, 'y' => '2014']); |
|
27 | 27 | $this->assertStringContainsString('<div class="calendar">', $page); |
28 | 28 | $this->assertStringContainsString('January', $page); |
29 | 29 | $this->assertMatchesRegularExpression('/<td colspan="2"> <\/td><td[^>]*><a href="\/' . $type . '\/\?d=2014-01-01">1<\/a><\/td><td[^>]*><span>2<\/span><\/td>/', $page); |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | |
33 | 33 | public function testDebatesDay() { |
34 | 34 | foreach ($this->types as $type) { |
35 | - $page = $this->fetch_page([ 'type' => $type, 'd' => '2014-01-01' ]); |
|
35 | + $page = $this->fetch_page(['type' => $type, 'd' => '2014-01-01']); |
|
36 | 36 | $this->assertStringContainsString('Wednesday, 1 January 2014', $page); |
37 | 37 | $this->assertStringContainsString('HeadingA', $page); |
38 | 38 | if ($type == 'wrans') { |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | continue; |
58 | 58 | } |
59 | 59 | |
60 | - $page = $this->fetch_page([ 'type' => $type, 'id' => '2014-01-01b.1.1' ]); |
|
60 | + $page = $this->fetch_page(['type' => $type, 'id' => '2014-01-01b.1.1']); |
|
61 | 61 | if ($type == 'wrans') { |
62 | 62 | $this->assertMatchesRegularExpression("#All .*?written answers on 1 Jan 2014#i", $page); |
63 | 63 | $this->assertStringContainsString("QuestionA", $page); |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | |
70 | 70 | public function testDebatesSubheading() { |
71 | 71 | foreach ($this->types as $type) { |
72 | - $page = $this->fetch_page([ 'type' => $type, 'id' => '2014-01-01b.1.2' ]); |
|
72 | + $page = $this->fetch_page(['type' => $type, 'id' => '2014-01-01b.1.2']); |
|
73 | 73 | $this->assertStringContainsString("HeadingA", $page); |
74 | 74 | if ($type == 'spwrans') { |
75 | 75 | $this->assertStringContainsString("QuestionA", $page); |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | |
100 | 100 | public function testDebatesSpeech() { |
101 | 101 | foreach ($this->types as $type) { |
102 | - $page = $this->fetch_page([ 'type' => $type, 'id' => '2014-01-01b.1.3' ]); |
|
102 | + $page = $this->fetch_page(['type' => $type, 'id' => '2014-01-01b.1.3']); |
|
103 | 103 | if ($type == 'wrans' || $type == 'spwrans' || $type == 'wms') { |
104 | 104 | $this->assertMatchesRegularExpression("#Location: .*?/$type/\?id=2014-01-01b\.1\.2#", $page); |
105 | 105 | } else { |
@@ -124,13 +124,13 @@ discard block |
||
124 | 124 | * @group xapian |
125 | 125 | */ |
126 | 126 | public function testGlossaryAndSearchHighlights() { |
127 | - $page = $this->fetch_page([ 'type' => 'lords', 's' => 'constituency', 'id' => '2014-02-02b.1.3' ]); |
|
127 | + $page = $this->fetch_page(['type' => 'lords', 's' => 'constituency', 'id' => '2014-02-02b.1.3']); |
|
128 | 128 | $this->assertStringContainsString("constituency", $page); |
129 | 129 | $this->assertStringContainsString("<span class=\"hi\"><a href=\"/glossary/?gl=1\" title=\"In a general election, each Constituency chooses an MP to represent them....\" class=\"glossary\">constituency</a></span>", $page); |
130 | 130 | } |
131 | 131 | |
132 | 132 | public function testGidRedirect() { |
133 | - $page = $this->fetch_page([ 'type' => 'wrans', 'id' => '2014-01-01a.187335.h' ]); |
|
133 | + $page = $this->fetch_page(['type' => 'wrans', 'id' => '2014-01-01a.187335.h']); |
|
134 | 134 | $this->assertMatchesRegularExpression("#Location: .*?/wrans/\?id=2014-01-01b\.1\.2#", $page); |
135 | 135 | } |
136 | 136 | } |
@@ -42,6 +42,6 @@ |
||
42 | 42 | return $category; |
43 | 43 | } |
44 | 44 | } |
45 | - throw new InvalidArgumentException("Category $categoryId not found in register"); |
|
45 | + throw new InvalidArgumentException("category $categoryId not found in register"); |
|
46 | 46 | } |
47 | 47 | } |
@@ -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 }; ?> |
@@ -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. |