mysociety / theyworkforyou

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/includes/easyparliament/metadata.php

Spacing +6 added lines, -6 removed lines

@@ -66,7 +66,7 @@ 
 
 */
 
-$page =  [
+$page = [
 
     // Things used on EVERY page, unless overridden for a page:
     'default' =>  [
@@ -498,24 +498,24 @@ 
         'url'			=> 'glossary/',
     ],
     'glossary_addterm' => [
-        'menu'			=> array (
+        'menu'			=> array(
             'text'			=> 'Add a term',
             'title'			=> "Add a definition for a term to the glossary"
         ),
         'parent'		=> 'help_us_out',
         'title'			=> 'Add a glossary item',
         'url'			=> 'addterm/',
-        'session_vars'	=> array ('g')
+        'session_vars'	=> array('g')
     ],
     'glossary_addlink' => [
-        'menu'			=> array (
+        'menu'			=> array(
             'text'			=> 'Add a link',
             'title'			=> "Add an external link"
         ),
         'parent'		=> 'help_us_out',
         'title'			=> 'Add a link',
         'url'			=> 'addlink/',
-        'session_vars'	=> array ('g')
+        'session_vars'	=> array('g')
     ],
     'glossary_item' => [
         'heading'		=> 'Glossary heading',
@@ -1361,7 +1361,7 @@ 
 // The text displayed on the page itself will also be this,
 // UNLESS the section has a 'heading', in which case that's used instead.
 
-$section =  [
+$section = [
 
 
     'about' =>  [

www/includes/easyparliament/glossary.php

Spacing +7 added lines, -7 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"];
 
     }
 
@@ -189,7 +189,7 @@ 
         global $THEUSER;
 
         if (!$THEUSER->is_able_to('addterm')) {
-            error ("Sorry, you are not allowed to add Glossary terms.");
+            error("Sorry, you are not allowed to add Glossary terms.");
             return false;
         }
 

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