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

www/includes/easyparliament/templates/html/glossary/addterm.php

Indentation +6 added lines, -6 removed lines

@@ -21,12 +21,12 @@
             <p>It seems we already have <?= ngettext('a definition', 'some definitions', $glossary->num_search_matches) ?> for that. Would you care to see <?= ngettext('it', 'them', $glossary->num_search_matches) ?>?</p>
             <ul class="glossary">
             <?php
-              foreach ($glossary->search_matches as $match) {
-                  $URL = new \MySociety\TheyWorkForYou\Url('glossary');
-                  $URL->insert(['gl' => $match['glossary_id']]);
-                  $URL->remove(['g']);
-                  $term_link = $URL->generate('url');
-                  ?>
+                foreach ($glossary->search_matches as $match) {
+                    $URL = new \MySociety\TheyWorkForYou\Url('glossary');
+                    $URL->insert(['gl' => $match['glossary_id']]);
+                    $URL->remove(['g']);
+                    $term_link = $URL->generate('url');
+                    ?>
                   <li>
                     <a href="<?= $term_link ?>"><?= $match['title']?></a>
                   </li>

www/docs/addlink/index.php

Spacing +7 added lines, -7 removed lines

@@ -1,16 +1,16 @@ 
     <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH."easyparliament/glossary.php";
-include_once INCLUDESPATH."easyparliament/glossarylist.php";
+include_once INCLUDESPATH . "easyparliament/glossary.php";
+include_once INCLUDESPATH . "easyparliament/glossarylist.php";
 
 $this_page = "glossary_addlink";
 
-$args = array( 'action' => $this_page);
+$args = array('action' => $this_page);
 
 // First things first...
 
-if ((get_http_var('g') != '') && (get_http_var('previewterm') == '') ) {
+if ((get_http_var('g') != '') && (get_http_var('previewterm') == '')) {
     // We're searching for something.
     $args['s'] = filter_user_input(get_http_var('g'), 'strict');
     $GLOSSARY = new GLOSSARY($args);
@@ -25,7 +25,7 @@ 
 
 $PAGE->stripe_start();
 
-$data = array (
+$data = array(
     'title' => get_http_var('g'),
     'body'	=> get_http_var('definition')
 );
@@ -115,8 +115,8 @@ 
 
     $PAGE->glossary_atoz($GLOSSARY);
 
-    $PAGE->stripe_end(array (
-        array (
+    $PAGE->stripe_end(array(
+        array(
             'type'		=> 'include',
             'content'	=> 'glossary_add'
         )

Braces +3 added lines, -6 removed lines

@@ -14,8 +14,7 @@ 
     // We're searching for something.
     $args['s'] = filter_user_input(get_http_var('g'), 'strict');
     $GLOSSARY = new GLOSSARY($args);
-}
-else {
+} else {
     $args['sort'] = "regexp_replace";
     $GLOSSARY = new GLOSSARY($args);
     $args['s'] = filter_user_input(get_http_var('g'), 'strict');
@@ -86,13 +85,11 @@ 
             if ($args['count']) {
                 // Display the Add definition form
                 $PAGE->glossary_add_link_form($args);
-            }
-            else {
+            } else {
                 print "<h4>No dice!</h4><p>Much as we'd love you to add a definition for <strong></strong>, it doesn't seem to appear in hansard at all...</p>";
                 $PAGE->glossary_links();
             }
-        }
-        else {
+        } else {
             print "<h4>Humdinger!</h4><p>it would appear that you aren't allowed to add glossary terms. How odd...</p>";
             $PAGE->glossary_links();
         }