mysociety / theyworkforyou

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

Indentation +9 added lines, -9 removed lines

@@ -44,15 +44,15 @@
     <text font-size="24" font-weight="normal" fill="#000000">
         <?php foreach ($lines as $j => $line) { ?>
             <tspan x="40" y="<?= $stance_y + $stance_padding_top + $stance_baseline_offset + ($stance_lineheight * $j) ?>"><?php
-               if (strpos($line, '*') !== false) {
-                   echo preg_replace(
-                       '#(?:^|[*])([^\r\n *][^*\n]*[^\r\n *])(?:$|[*])#i',
-                       '$1',
-                       $line
-                   );
-               } else {
-                   echo $line;
-               }
+                if (strpos($line, '*') !== false) {
+                    echo preg_replace(
+                        '#(?:^|[*])([^\r\n *][^*\n]*[^\r\n *])(?:$|[*])#i',
+                        '$1',
+                        $line
+                    );
+                } else {
+                    echo $line;
+                }
             ?></tspan>
         <?php } ?>
     </text>

www/includes/easyparliament/commentreportlist.php

Spacing +2 added lines, -2 removed lines

@@ -96,7 +96,7 @@ 
 
         $data = [];
         foreach ($q as $row) {
-            $data[] =  [
+            $data[] = [
                 'report_id'		=> $row['report_id'],
                 'comment_id' 	=> $row['comment_id'],
                 'firstname'		=> $row['firstname'],
@@ -107,7 +107,7 @@ 
             ];
         }
         foreach ($r as $row) {
-            $data[] =  [
+            $data[] = [
                 'report_id'		=> $row['report_id'],
                 'comment_id' 	=> $row['comment_id'],
                 'firstname'		=> $row['firstname'],

www/includes/easyparliament/alert.php

Spacing +7 added lines, -7 removed lines

@@ -40,7 +40,7 @@ 
     public $token_checked = null;
     private $alert_id = "";
     public $email = "";
-    public $criteria = "";		// Sets the terms that are used to produce the search results.
+    public $criteria = ""; // Sets the terms that are used to produce the search results.
 
     private $db;
 
@@ -71,7 +71,7 @@ 
             $contents = ['criteria' => $row['criteria'], 'count' => $row['cnt']];
             $data[] = $contents;
         }
-        $data =  ['alerts' => $data];
+        $data = ['alerts' => $data];
         return $data;
     }
 
@@ -99,7 +99,7 @@ 
 
         $data = $q->fetchAll();
         $info = "Alert";
-        $data =  ['info' => $info, 'data' => $data];
+        $data = ['info' => $info, 'data' => $data];
 
         return $data;
     }
@@ -254,12 +254,12 @@ 
         }
 
         // Arrays we need to send a templated email.
-        $data =  [
+        $data = [
             'to' 		=> $details['email'],
             'template' 	=> 'alert_confirmation',
         ];
 
-        $merge =  [
+        $merge = [
             'CONFIRMURL'	=> $confirmurl,
             'CRITERIA'	=> $this->criteria_pretty(),
         ];
@@ -273,7 +273,7 @@ 
     }
 
     public function send_already_signedup_email($details) {
-        $data =  [
+        $data = [
             'to' 		=> $details['email'],
             'template' 	=> 'alert_already_signedup',
         ];
@@ -281,7 +281,7 @@ 
         $criteria = \MySociety\TheyWorkForYou\Utility\Alert::detailsToCriteria($details);
         $this->criteria = $criteria;
 
-        $merge =  [
+        $merge = [
             'CRITERIA'	=> $this->criteria_pretty(),
         ];
 

www/includes/easyparliament/member.php

Spacing +3 added lines, -3 removed lines

@@ -86,7 +86,7 @@ 
 
         # All the following only happen if the house to display isn't yet set.
         # TODO: This relies on interpreting the default value of 0 as a false, which may be error-prone.
-        if (! (bool) $this->house_disp) {
+        if (!(bool) $this->house_disp) {
             if ($house == HOUSE_TYPE_LONDON_ASSEMBLY # London Assembly
                 || $house == HOUSE_TYPE_SCOTLAND     # MSPs and
                 || $house == HOUSE_TYPE_WALES        # MSs and
@@ -251,7 +251,7 @@ 
             $policiesList = new Policies($policyID);
         }
         $rel_agreements = $policiesList->all_policy_agreements[$policyID] ?? [];
-        $rel_agreements = array_filter($rel_agreements, function ($agreement) use ($house) {
+        $rel_agreements = array_filter($rel_agreements, function($agreement) use ($house) {
             return $this->date_in_memberships($house, $agreement['date']);
         });
         return $rel_agreements;
@@ -526,7 +526,7 @@ 
         }
 
         if ($display && array_key_exists('register_member_interests_html', $this->extra_info) && ($this->extra_info['register_member_interests_html'] != '')) {
-            $args =  [
+            $args = [
                 "sort" => "regexp_replace",
             ];
             $GLOSSARY = new GLOSSARY($args);

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/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; ?>