mysociety / theyworkforyou

www/includes/easyparliament/glossary.php

Spacing +6 added lines, -6 removed lines

@@ -24,12 +24,12 @@ 
 include_once INCLUDESPATH . "easyparliament/searchengine.php";
 
 class GLOSSARY {
-    public $num_terms;			// how many glossary entries do we have
+    public $num_terms; // how many glossary entries do we have
     // (changes depending on how GLOSSARY is called
-    public $hansard_count;		// how many times does the phrase appear in hansard?
-    public $query;				// search term
-    public $glossary_id;		// if this is set then we only have 1 glossary term
-    public $current_term;		// will only be set if we have a valid epobject_id
+    public $hansard_count; // how many times does the phrase appear in hansard?
+    public $query; // search term
+    public $glossary_id; // if this is set then we only have 1 glossary term
+    public $current_term; // will only be set if we have a valid epobject_id
     public $current_letter;
 
     // constructor...
@@ -72,7 +72,7 @@ 
 
         // These stop stupid submissions.
         // everything should be lowercase.
-        $this->stopwords = [ "the", "of", "to", "and", "for", "in", "a", "on", "is", "that", "will", "secretary", "are", "ask", "state", "have", "be", "has", "by", "with", "i", "not", "what", "as", "it", "hon", "he", "which", "from", "if", "been", "this", "s", "we", "at", "government", "was", "my", "an", "department", "there", "make", "or", "made", "their", "all", "but", "they", "how", "debate" ];
+        $this->stopwords = ["the", "of", "to", "and", "for", "in", "a", "on", "is", "that", "will", "secretary", "are", "ask", "state", "have", "be", "has", "by", "with", "i", "not", "what", "as", "it", "hon", "he", "which", "from", "if", "been", "this", "s", "we", "at", "government", "was", "my", "an", "department", "there", "make", "or", "made", "their", "all", "but", "they", "how", "debate"];
 
     }
 

www/includes/dbtypes.php

Spacing +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
 ];
 $hansardmajors[104] = $hansardmajors[4];
 
-$parties =  [
+$parties = [
     'Bp'    => 'Bishop',
     'Con'   => 'Conservative',
     'CWM'   => 'Deputy Speaker',

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);
     }
 }

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

Braces +5 added lines, -2 removed lines

@@ -10,9 +10,12 @@
             <?php endforeach; ?>
             <?php $detail = $upper_detail; ?>
         </ul>
-    <?php else : ?>
+    <?php else {
+    : ?>
         <?php if ($detail->value): ?>
             <span class="interest-detail-value"><?= htmlspecialchars($detail->value) ?></span>
-        <?php endif; ?>
+        <?php endif;
+}
+?>
     <?php endif; ?>
 </li>
\ No newline at end of file

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_entry.php

Braces +10 added lines, -4 removed lines

@@ -7,9 +7,12 @@ 
     <?php if ($entry->content): ?>
         <?php if ($entry->info_type == "subentry"): ?>
             <h6 class="interest-summary"><?= htmlspecialchars($entry->content) ?></h6>
-        <?php else: ?>
+        <?php else {
+    : ?>
             <h4 class="interest-summary"><?= htmlspecialchars($entry->content) ?></h4>
-        <?php endif; ?>
+        <?php endif;
+}
+?>
     <?php endif; ?>
         <ul class="interest-details-list">
             <?php foreach ($entry->details as $detail): ?>
@@ -26,14 +29,17 @@ 
             <?php endif; ?>
         </ul>
 
-    <?php else: ?>
+    <?php else {
+    : ?>
     <?php if ($entry->content): ?>
         <?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: ?>
             <p class="interest-content"><?= htmlspecialchars($entry->content) ?></p>
-        <?php endif; ?>
+        <?php endif;
+}
+?>
     <?php endif; ?>
 <?php endif; ?>