mysociety / theyworkforyou

tests/SearchTest.php

Spacing +12 added lines, -12 removed lines

@@ -21,11 +21,11 @@ 
 
     public function testConstituencySearch() {
         $this->assertEquals(
-            [ [ 'Alyn and Deeside' ], false ],
+            [['Alyn and Deeside'], false],
             \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery('Alyn')
         );
         $this->assertEquals(
-            [ [ 'Alyn and Deeside' ], false ],
+            [['Alyn and Deeside'], false],
             \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery('Alyn and Deeside')
         );
     }
@@ -109,7 +109,7 @@ 
      * @group xapian
      */
     public function testSearchPage() {
-        $page = $this->fetch_page([ ]);
+        $page = $this->fetch_page([]);
         $this->assertStringContainsString('Search', $page);
     }
 
@@ -119,7 +119,7 @@ 
      * @group xapian
      */
     public function testSearchPageMP() {
-        $page = $this->fetch_page([ 'q' => 'Mary Smith' ]);
+        $page = $this->fetch_page(['q' => 'Mary Smith']);
         $this->assertStringContainsString('Mary Smith', $page);
         $this->assertMatchesRegularExpression('/MP *for Amber Valley/', $page);
     }
@@ -130,7 +130,7 @@ 
      * @group xapian
      */
     public function testSearchPageMultipleMP() {
-        $page = $this->fetch_page([ 'q' => 'Jones' ]);
+        $page = $this->fetch_page(['q' => 'Jones']);
         $this->assertStringContainsString('People matching <em class="current-search-term">Jones</em>', $page);
         $this->assertStringContainsString('Andrew Jones', $page);
         $this->assertStringContainsString('Simon Jones', $page);
@@ -142,7 +142,7 @@ 
      * @group xapian
      */
     public function testSearchPageCons() {
-        $page = $this->fetch_page([ 'q' => 'Amber' ]);
+        $page = $this->fetch_page(['q' => 'Amber']);
         $this->assertStringContainsString('MP for <em class="current-search-term">Amber</em>', $page);
         $this->assertStringContainsString('Mary Smith', $page);
     }
@@ -154,7 +154,7 @@ 
      * @group xapian
      */
     public function testSearchPageConsWithNoMp() {
-        $page = $this->fetch_page([ 'q' => 'Alyn' ]);
+        $page = $this->fetch_page(['q' => 'Alyn']);
         $this->assertStringNotContainsString('MP for <em class="current-search-term">Alyn</em>', $page);
         $this->assertStringNotContainsString('MPs in constituencies matching', $page);
     }
@@ -166,7 +166,7 @@ 
      * @group xapian
      */
     public function testSearchPageMultipleCons() {
-        $page = $this->fetch_page([ 'q' => 'Liverpool' ]);
+        $page = $this->fetch_page(['q' => 'Liverpool']);
         $this->assertStringContainsString('MPs in constituencies matching <em class="current-search-term">Liverpool</em>', $page);
         $this->assertStringContainsString('Susan Brown', $page);
         $this->assertMatchesRegularExpression('/MP *for Liverpool, Riverside/', $page);
@@ -180,7 +180,7 @@ 
      * @group xapian
      */
     public function testSearchPageGlossary() {
-        $page = $this->fetch_page([ 'q' => 'other place' ]);
+        $page = $this->fetch_page(['q' => 'other place']);
         $this->assertStringContainsString('Glossary items matching', $page);
         $this->assertStringContainsString('<a href="/glossary/?gl=1">&ldquo;other place', $page);
     }
@@ -191,7 +191,7 @@ 
      * @group xapian
      */
     public function testSearchPageSpellCorrect() {
-        $page = $this->fetch_page([ 'q' => 'plice' ]);
+        $page = $this->fetch_page(['q' => 'plice']);
         $this->assertStringContainsString('Did you mean <a href="/search/?q=place">place', $page);
     }
 
@@ -201,7 +201,7 @@ 
      * @group xapian
      */
     public function testSearchBySpeakerNoResults() {
-        $page = $this->fetch_page([ 'q' => 'splice', 'o' => 'p' ]);
+        $page = $this->fetch_page(['q' => 'splice', 'o' => 'p']);
         $this->assertStringContainsString('Who says splice the most', $page);
         $this->assertStringContainsString('No results', $page);
     }
@@ -228,7 +228,7 @@ 
      * @group xapian
      */
     public function testSearchPageRSS() {
-        $page = $this->fetch_page([ 'q' => 'test' ]);
+        $page = $this->fetch_page(['q' => 'test']);
         $this->assertStringContainsString('<a href="/search/rss/?s=test">get an RSS feed', $page);
     }
 

tests/DivisionsTest.php

Spacing +7 added lines, -7 removed lines

@@ -13,16 +13,16 @@ 
     }
 
     private function fetch_division_page() {
-        return $this->fetch_page([ '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 = [ 'pagetype' => 'recent', 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/recent' ];
+        $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(['url' => '/divisions' ], 'divisions', 'index.php', '/divisions/index.php');
+        return $this->base_fetch_page(['url' => '/divisions'], 'divisions', 'index.php', '/divisions/index.php');
     }
 
 
@@ -51,13 +51,13 @@ 
 
     public function testMPPageContainsAgreement() {
         // Checks this MP contains a reference to the agreement
-        $page = $this->fetch_page([ '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() {
         // Checks this MP does not contain agreement - should be out of time scope
-        $page = $this->fetch_page([ '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);
 
@@ -121,7 +121,7 @@ 
     }
 
     public function testNotEnoughInfoStatement() {
-        $page = $this->fetch_page([ 'pagetype' => 'divisions', 'pid' => 2, 'policy' => 810, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions' ]);
+        $page = $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 Mrs Test Current-MP’s position', $page);
     }
 
@@ -132,7 +132,7 @@ 
     }
 
     public function testSingleDivision() {
-        $page = $this->base_fetch_page(['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  <b>voted in favour</b> 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.

tests/SectionTest.php

Spacing +8 added lines, -8 removed lines

@@ -16,14 +16,14 @@ 
 
     public function testDebatesFront() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page([ 'type' => $type ]);
+            $page = $this->fetch_page(['type' => $type]);
             $this->assertStringContainsString($type, $page);
         }
     }
 
     public function testDebatesYear() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page([ 'type' => $type, 'y' => '2014' ]);
+            $page = $this->fetch_page(['type' => $type, 'y' => '2014']);
             $this->assertStringContainsString('<div class="calendar">', $page);
             $this->assertStringContainsString('January', $page);
             $this->assertMatchesRegularExpression('/<td colspan="2">&nbsp;<\/td><td[^>]*><a href="\/' . $type . '\/\?d=2014-01-01">1<\/a><\/td><td[^>]*><span>2<\/span><\/td>/', $page);
@@ -32,7 +32,7 @@ 
 
     public function testDebatesDay() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page([ 'type' => $type, 'd' => '2014-01-01' ]);
+            $page = $this->fetch_page(['type' => $type, 'd' => '2014-01-01']);
             $this->assertStringContainsString('Wednesday,  1 January 2014', $page);
             $this->assertStringContainsString('HeadingA', $page);
             if ($type == 'wrans') {
@@ -57,7 +57,7 @@ 
                 continue;
             }
 
-            $page = $this->fetch_page([ 'type' => $type, 'id' => '2014-01-01b.1.1' ]);
+            $page = $this->fetch_page(['type' => $type, 'id' => '2014-01-01b.1.1']);
             if ($type == 'wrans') {
                 $this->assertMatchesRegularExpression("#All .*?written answers on  1 Jan 2014#i", $page);
                 $this->assertStringContainsString("QuestionA", $page);
@@ -69,7 +69,7 @@ 
 
     public function testDebatesSubheading() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page([ 'type' => $type, 'id' => '2014-01-01b.1.2' ]);
+            $page = $this->fetch_page(['type' => $type, 'id' => '2014-01-01b.1.2']);
             $this->assertStringContainsString("HeadingA", $page);
             if ($type == 'spwrans') {
                 $this->assertStringContainsString("QuestionA", $page);
@@ -99,7 +99,7 @@ 
 
     public function testDebatesSpeech() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page([ 'type' => $type, 'id' => '2014-01-01b.1.3' ]);
+            $page = $this->fetch_page(['type' => $type, 'id' => '2014-01-01b.1.3']);
             if ($type == 'wrans' || $type == 'spwrans' || $type == 'wms') {
                 $this->assertMatchesRegularExpression("#Location: .*?/$type/\?id=2014-01-01b\.1\.2#", $page);
             } else {
@@ -124,13 +124,13 @@ 
      * @group xapian
      */
     public function testGlossaryAndSearchHighlights() {
-        $page = $this->fetch_page([ 'type' => 'lords', 's' => 'constituency', 'id' => '2014-02-02b.1.3' ]);
+        $page = $this->fetch_page(['type' => 'lords', 's' => 'constituency', 'id' => '2014-02-02b.1.3']);
         $this->assertStringContainsString("constituency", $page);
         $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);
     }
 
     public function testGidRedirect() {
-        $page = $this->fetch_page([ 'type' => 'wrans', 'id' => '2014-01-01a.187335.h' ]);
+        $page = $this->fetch_page(['type' => 'wrans', 'id' => '2014-01-01a.187335.h']);
         $this->assertMatchesRegularExpression("#Location: .*?/wrans/\?id=2014-01-01b\.1\.2#", $page);
     }
 }

classes/DataClass/Regmem/Person.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -42,6 +42,6 @@
                 return $category;
             }
         }
-        throw new InvalidArgumentException("Category $categoryId not found in register");
+        throw new InvalidArgumentException("category $categoryId not found in register");
     }
 }

www/includes/easyparliament/templates/html/mp/_register_field.php

Braces +5 added lines, -2 removed lines

@@ -13,11 +13,14 @@
             <?php $detail = $upper_detail; ?>
         </ul>
         </li>
-    <?php else : ?>
+    <?php else {
+    : ?>
         <li class="interest-detail">
         <?php if ($detail->has_value()): ?>
             <span class="interest-detail-name"><?= $detail->display_as ?>: </span>
             <span class="interest-detail-value"><?= htmlspecialchars($detail->value) ?></span>
-        <?php endif; ?>
+        <?php endif;
+}
+?>
         </li>
     <?php endif; ?>

www/includes/easyparliament/templates/html/homepage/devolved-list.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
-$nav_items =  [
+$nav_items = [
     ['hansard', 'alldebatesfront', 'mps', 'peers', 'interests_home', 'wranswmsfront', 'divisions_recent_commons', 'divisions_recent_lords'],
-    ['sp_home', 'sp_home', 'spdebatesfront', 'msps',  'spwransfront', 'divisions_recent_sp'],
+    ['sp_home', 'sp_home', 'spdebatesfront', 'msps', 'spwransfront', 'divisions_recent_sp'],
     ['wales_home', 'wales_home', 'wales_debates', 'mss', 'welshlanguage', 'divisions_recent_wales'],
     ['ni_home', 'ni_home', 'nioverview', 'mlas'],
 ];

www/includes/easyparliament/templates/html/interests/_register_field.php

Braces +5 added lines, -2 removed lines

@@ -13,12 +13,15 @@
             <?php $detail = $upper_detail; ?>
         </ul>
         </li>
-    <?php else : ?>
+    <?php else {
+    : ?>
         <?php if ($detail->has_value()): ?>
         <li class="interest-detail">
             <span class="interest-detail-name"><?= $detail->display_as ?>: </span>
             <span class="interest-detail-value"><?= htmlspecialchars($detail->value) ?></span>
         </li>
-        <?php endif; ?>
+        <?php endif;
+}
+?>
 
     <?php endif; ?>

www/includes/easyparliament/templates/html/interests/highlighted_2024.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
                                     <th>MP's comment</th>
                                 </tr>
                     <?php foreach ($register->persons as $person) { ?>
-                        <?php foreach($person->categories as $category) { ?>
+                        <?php foreach ($person->categories as $category) { ?>
                             <?php if ($category->category_id != $category_id) { ?>
                                 <?php continue; ?>
                             <?php }; ?>

www/includes/easyparliament/templates/html/interests/_register_entry.php

Braces +5 added lines, -2 removed lines

@@ -28,9 +28,12 @@
     <?php // This is a more mininal style of entry, don't use the header structure, just print the xml content?>
     <?php if ($entry->content_format == "xml") : ?>
         <?= $entry->content ?>
-    <?php else: ?>
+    <?php else {
+    : ?>
         <p class="interest-content"><?= htmlspecialchars($entry->content) ?></p>
-    <?php endif; ?>
+    <?php endif;
+}
+?>
 <?php endif; ?>
 
     </ul>