mysociety / theyworkforyou

tests/DivisionsTest.php

Spacing +3 added lines, -3 removed lines

@@ -13,12 +13,12 @@ 
     }
 
     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');
     }
 
 
@@ -54,7 +54,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.

classes/Renderer/Markdown.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
         $og_image_parl = $extra_vars['_social_image_parliament'] ?? 'uk';
         $og_image_url = \MySociety\TheyWorkForYou\Url::generateSocialImageUrl($og_image_title, $og_image_subtitle, $og_image_parl);
 
-        $html = preg_replace_callback('/<h([1-3])>([^<]+)<\/h[1-3]>/i', function ($matches) {
+        $html = preg_replace_callback('/<h([1-3])>([^<]+)<\/h[1-3]>/i', function($matches) {
             $level = $matches[1];
             $htitle = $matches[2];
             $slug = slugify($htitle);

classes/PolicyDistributionCollection.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
             $group_name = $policies->getSetDescriptions()[$set_slug];
             $group_slug = $set_slug;
             $comparison_period_slug = $period_slug;
-            $policy_pairs = array_filter($pairs, function ($pair) use ($policy_ids) {
+            $policy_pairs = array_filter($pairs, function($pair) use ($policy_ids) {
                 $is_policy_valid = in_array($pair->getPolicyID(), $policy_ids);
                 $has_own_distribution = $pair->member_distribution !== null && !$pair->member_distribution->noDataAvailable();
                 return $is_policy_valid && $has_own_distribution;

tests/PartyTest.php

Spacing +3 added lines, -3 removed lines

@@ -108,7 +108,7 @@ 
 
 
     private function getMemberFromPersonId($person_id) {
-        return new MySociety\TheyWorkForYou\Member([ "person_id" => $person_id ]);
+        return new MySociety\TheyWorkForYou\Member(["person_id" => $person_id]);
     }
 
     public function testMPPartyPolicyTextWhenDiffersVotes() {
@@ -137,7 +137,7 @@ 
         // this is a single person party i think - so no party comparison?
         // need to check what votes would actually produce
 
-        $page = $this->fetch_page(['pid' => 4, 'pagetype' => 'votes','url' => '/mp/4/test_mp_d/test_westminster_constituency/votes']);
+        $page = $this->fetch_page(['pid' => 4, 'pagetype' => 'votes', 'url' => '/mp/4/test_mp_d/test_westminster_constituency/votes']);
         $this->assertStringContainsString('Test MP D', $page);
         $this->assertStringContainsString('<li class="vote-description"', $page);
         $this->assertStringNotContainsString('comparable B Party MPs voted', $page);
@@ -148,7 +148,7 @@ 
 
         // this is just a boring, person aligned with party example
 
-        $page = $this->fetch_page(['pagetype' => 'votes', 'pid' => 16,  'url' => '/mp/16/test_mp_g_party_2/test_westminster_constituency/votes']);
+        $page = $this->fetch_page(['pagetype' => 'votes', 'pid' => 16, 'url' => '/mp/16/test_mp_g_party_2/test_westminster_constituency/votes']);
         $this->assertStringContainsString('Test MP G Party 2', $page);
 
         $this->assertStringNotContainsString('sometimes differs from their party colleagues', $page);

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

Braces +4 added lines, -1 removed lines

@@ -114,7 +114,10 @@
                                                 <ul>
                                                     <li><span class="appg-property-label">Purpose:</span> <?= $membership->appg->purpose ?></li>
                                                     <li><span class="appg-property-label">Membership Source:</span> <a href="<?= $membership->membership_source_url ?>">Source</a></li>
-                                                    <li><span class="appg-property-label">APPG Website:</span> <?php if ($membership->appg->website): ?><a href="<?= $membership->appg->website ?>"><?= $membership->appg->website ?></a><?php else: ?>N/A<?php endif; ?></li>
+                                                    <li><span class="appg-property-label">APPG Website:</span> <?php if ($membership->appg->website): ?><a href="<?= $membership->appg->website ?>"><?= $membership->appg->website ?></a><?php else {
+    : ?>N/A<?php endif;
+}
+?></li>
                                                     <li><span class="appg-property-label">APPG register:</span> <a href="<?= $membership->appg->source_url ?>">Parliament website</a></li>
                                                 </ul>
                                             </div>

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

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
                 </div>
                 <?php endif; ?>
 
-                <?php $vote_count = isset($divisions) ? count($divisions) : 0;?>
+                <?php $vote_count = isset($divisions) ? count($divisions) : 0; ?>
 
                 <div class="panel">
                     <div class="policy-votes-intro">

www/includes/easyparliament/comment.php

Spacing +18 added lines, -18 removed lines

@@ -30,8 +30,8 @@ 
     public $body = '';
     public $posted = '';
     public $visible = false;
-    public $modflagged = null;	// Is a datetime when set.
-    public $firstname = '';	// Of the person who posted it.
+    public $modflagged = null; // Is a datetime when set.
+    public $firstname = ''; // Of the person who posted it.
     public $lastname = '';
     public $url = '';
 
@@ -70,12 +70,12 @@ 
             if ($q) {
 
                 $this->comment_id 	= $comment_id;
-                $this->user_id		= $q['user_id'];
+                $this->user_id = $q['user_id'];
                 $this->epobject_id	= $q['epobject_id'];
-                $this->body			= $q['body'];
-                $this->posted		= $q['posted'];
-                $this->visible		= $q['visible'];
-                $this->modflagged	= $q['modflagged'];
+                $this->body = $q['body'];
+                $this->posted = $q['posted'];
+                $this->visible = $q['visible'];
+                $this->modflagged = $q['modflagged'];
 
                 // Sets the URL and username for this comment. Duh.
                 $this->_set_url();
@@ -142,7 +142,7 @@ 
         }
 
         if (!$THEUSER->is_able_to('addcomment')) {
-            $message = 	[
+            $message = [
                 'title' => 'Sorry',
                 'text' => 'You are not allowed to post annotations.',
             ];
@@ -203,12 +203,12 @@ 
 
         if ($q->success()) {
             // Set the object varibales up.
-            $this->comment_id 	= $q->insert_id();
-            $this->user_id	  	= $THEUSER->user_id();
-            $this->epobject_id 	= $data['epobject_id'];
-            $this->body			= $data['body'];
-            $this->posted		= $posted;
-            $this->visible		= 1;
+            $this->comment_id = $q->insert_id();
+            $this->user_id = $THEUSER->user_id();
+            $this->epobject_id = $data['epobject_id'];
+            $this->body = $data['body'];
+            $this->posted = $posted;
+            $this->visible = 1;
 
             return $this->comment_id();
 
@@ -219,7 +219,7 @@ 
 
 
     public function display($format = 'html', $template = 'comments') {
-        $data['comments'][0] =  [
+        $data['comments'][0] = [
             'comment_id'	=> $this->comment_id,
             'user_id'		=> $this->user_id,
             'epobject_id'	=> $this->epobject_id,
@@ -267,7 +267,7 @@ 
             $this->modflagged = $date;
             return true;
         } else {
-            $message =  [
+            $message = [
                 'title' => 'Sorry',
                 'text' => "We couldn't update the annotation's modflag.",
             ];
@@ -289,7 +289,7 @@ 
             if ($q->success()) {
                 return true;
             } else {
-                $message =  [
+                $message = [
                     'title' => 'Sorry',
                     'text' => "We were unable to delete the annotation.",
                 ];
@@ -298,7 +298,7 @@ 
             }
 
         } else {
-            $message =  [
+            $message = [
                 'title' => 'Sorry',
                 'text' => "You are not authorised to delete annotations.",
             ];

www/docs/addcomment/index.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
             'posted' => date('Y-m-d H:i:s', time()),
             'modflagged' => null,
             'visible' => 1,
-            'preview' => true,	// Extra tag so we know this is just a preview.
+            'preview' => true, // Extra tag so we know this is just a preview.
         ];
 
         $COMMENTLIST = new COMMENTLIST();

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

Braces +5 added lines, -2 removed lines

@@ -12,11 +12,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; ?>
\ No newline at end of file