mysociety / theyworkforyou

www/includes/easyparliament/templates/html/section/_section_content.php

Indentation +4 added lines, -4 removed lines

@@ -12,9 +12,9 @@ 
         if ($hansardmajors[$data['info']['major']]['location'] == 'Scotland') {
             $body = preg_replace('# (S\d[O0WF]-\d+)[, ]#', ' <a href="/spwrans/?spid=$1">$1</a> ', $body);
             $body = preg_replace_callback('#<citation id="uk\.org\.publicwhip/(.*?)/(.*?)">\[(.*?)\]</citation>#', function($matches) {
-                   if ($matches[1] == 'spor') {
-                       $href_segment = 'sp/?g';
-                   } elseif ($matches[1] == 'spwa') {
+                    if ($matches[1] == 'spor') {
+                        $href_segment = 'sp/?g';
+                    } elseif ($matches[1] == 'spwa') {
                         $href_segment = 'spwrans/?';
                     } else {
                         $href_segment = 'debates/?';
@@ -187,7 +187,7 @@ 
                 $before_mp = isset($speech['before_mp']);
                 $after_mp = isset($speech['after_mp']);
                 include dirname(__FILE__) . '/../divisions/_your_mp.php';
-              } ?>
+                } ?>
                 <div class="debate-speech__division__details">
                   <?php include dirname(__FILE__) . '/../divisions/_votes.php'; ?>
                 </div>

Spacing +16 added lines, -16 removed lines

@@ -1,4 +1,4 @@ 
-  <?php foreach($data['rows'] as $speech) { ?>
+  <?php foreach ($data['rows'] as $speech) { ?>
 
     <?php
 
@@ -61,27 +61,27 @@ 
     $source = array();
 
     $major = $data['info']['major'];
-    if ($major==1 || $major==2 || (($major==3 || $major==4) && isset($speech['speaker']['house'])) || $major==101 || $major==6) {
+    if ($major == 1 || $major == 2 || (($major == 3 || $major == 4) && isset($speech['speaker']['house'])) || $major == 101 || $major == 6) {
         $source['title'] = 'Citation: ';
-        if ($major==1 || $major==2) {
+        if ($major == 1 || $major == 2) {
             $source['title'] .= 'HC';
-        } elseif ($major==3 || $major==4) {
-            if ($speech['speaker']['house']==1) {
+        } elseif ($major == 3 || $major == 4) {
+            if ($speech['speaker']['house'] == 1) {
                 $source['title'] .= 'HC';
             } else {
                 $source['title'] .= 'HL';
             }
-        } elseif ($major==6) {
+        } elseif ($major == 6) {
             $source['title'] .= $data['section_title'];
         } else {
             $source['title'] .= 'HL';
         }
         $source['title'] .= ' Deb, ' . format_date($data['info']['date'], LONGDATEFORMAT) . ', c' . $speech['colnum'];
-        if ($major==2) {
+        if ($major == 2) {
             $source['title'] .= 'WH';
-        } elseif ($major==3) {
+        } elseif ($major == 3) {
             $source['title'] .= 'W';
-        } elseif ($major==4) {
+        } elseif ($major == 4) {
             $source['title'] .= 'WS';
         }
     }
@@ -110,7 +110,7 @@ 
             <div class="debate-speech__speaker-and-content">
             <?php } ?>
 
-          <?php if(isset($speech['speaker']) && count($speech['speaker']) > 0) { ?>
+          <?php if (isset($speech['speaker']) && count($speech['speaker']) > 0) { ?>
             <h2 class="debate-speech__speaker">
                 <?php
 
@@ -177,13 +177,13 @@ 
                 <?php if ($division['has_description']) { ?>
                 <div class="debate-speech__division__details">
                     <span class="policy-vote__text">
-                        <?php include( dirname(__FILE__) . '/../divisions/_vote_description.php'); ?>
+                        <?php include(dirname(__FILE__) . '/../divisions/_vote_description.php'); ?>
                     </span><br>
                 </div>
                 <?php } ?>
 
               <?php if (isset($speech['mp_vote'])) {
-                $mp_vote = array( 'vote' => $speech['mp_vote']['vote'] );
+                $mp_vote = array('vote' => $speech['mp_vote']['vote']);
                 $before_mp = isset($speech['before_mp']);
                 $after_mp = isset($speech['after_mp']);
                 include dirname(__FILE__) . '/../divisions/_your_mp.php';
@@ -195,7 +195,7 @@ 
             <div class="debate-speech__content"><?=$body ?></div>
             <?php } ?>
 
-            <?php if ( $section ) {
+            <?php if ($section) {
                 if ($speech['voting_data']) { ?>
 
                 <div class="debate-speech__question-answered">
@@ -220,10 +220,10 @@ 
 
                 // Video
                 if ($data['info']['major'] == 1 && !$individual_item) { # Commons debates only
-                    if ($speech['video_status']&4) { ?>
+                    if ($speech['video_status'] & 4) { ?>
                         <a href="<?= $speech['commentsurl'] ?>" class="watch debate-speech__meta__link" onclick="return moveVideo(\'debate/'<?= $speech['gid'] ?>\');">Watch this</a>
                     <?php
-                    } elseif (!$speech['video'] && $speech['video_status']&1 && !($speech['video_status']&8)) {
+                    } elseif (!$speech['video'] && $speech['video_status'] & 1 && !($speech['video_status'] & 8)) {
                         $gid_type = $data['info']['major'] == 1 ? 'debate' : 'lords'; ?>
                         <a href="/video/?from=debate&amp;gid=<?= $gid_type ?>/<?= $speech['gid'] ?>" class="timestamp debate-speech__meta__link">Video match this</a>
                     <?php
@@ -350,7 +350,7 @@ 
                     $moreinfo[] = $row['totalcomments'] . " $plural";
                 }
                 if (count($moreinfo) > 0) {
-                    print "<small>(" . implode (', ', $moreinfo) . ") </small>";
+                    print "<small>(" . implode(', ', $moreinfo) . ") </small>";
                 }
             } else {
                 // Nothing in this item, so no link.

www/includes/easyparliament/hansardlist.php

Indentation +8 added lines, -8 removed lines

@@ -1840,14 +1840,14 @@
                     $division_votes = $divisions->getDivisionByGid($this->gidprefix . $item['gid']);
                     $item['division'] = $division_votes;
                     if (isset($MEMBER)) {
-                      $item['mp_vote'] = $divisions->getDivisionResultsForMember($division_votes['division_id'], $MEMBER->person_id());
-                      if (!$item['mp_vote']) {
-                          if ($division_votes['date'] < $MEMBER->entered_house($division_votes['house_number'])['date']) {
-                              $item['before_mp'] = true;
-                          } else if ($division_votes['date'] > $MEMBER->left_house($division_votes['house_number'])['date']) {
-                              $item['after_mp'] = true;
-                          }
-                      }
+                        $item['mp_vote'] = $divisions->getDivisionResultsForMember($division_votes['division_id'], $MEMBER->person_id());
+                        if (!$item['mp_vote']) {
+                            if ($division_votes['date'] < $MEMBER->entered_house($division_votes['house_number'])['date']) {
+                                $item['before_mp'] = true;
+                            } else if ($division_votes['date'] > $MEMBER->left_house($division_votes['house_number'])['date']) {
+                                $item['after_mp'] = true;
+                            }
+                        }
                     }
                 }
 

tests/DivisionsTest.php

Spacing +5 added lines, -5 removed lines

@@ -17,17 +17,17 @@ 
     }
 
     private function fetch_division_page() {
-        return $this->fetch_page( array( 'pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions' ) );
+        return $this->fetch_page(array('pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions'));
     }
 
     private function fetch_mp_recent_page()
     {
-        $vars = array( 'pagetype' => 'recent', 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/recent' );
+        $vars = array('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( array('url' => '/divisions' ), 'divisions', 'index.php', '/divisions/index.php' );
+        return $this->base_fetch_page(array('url' => '/divisions'), 'divisions', 'index.php', '/divisions/index.php');
     }
 
 
@@ -113,7 +113,7 @@ 
     }
 
     public function testNotEnoughInfoStatement() {
-        return $this->fetch_page( array( 'pagetype' => 'divisions', 'pid' => 2, 'policy' => 810, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions' ) );
+        return $this->fetch_page(array('pagetype' => 'divisions', 'pid' => 2, 'policy' => 810, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions'));
         $this->assertContains('we don’t have enough information to calculate Test Current-MP’s position', $page);
     }
 
@@ -124,7 +124,7 @@ 
     }
 
     public function testSingleDivision() {
-        $page = $this->base_fetch_page( array('url' => '/divisions/division.php', 'vote' => 'pw-3012-01-01-1-commons' ), 'divisions', 'division.php', '/divisions/division.php' );
+        $page = $this->base_fetch_page(array('url' => '/divisions/division.php', 'vote' => 'pw-3012-01-01-1-commons'), 'divisions', 'division.php', '/divisions/division.php');
         $this->assertContains('A majority of MPs  <b>voted in favour</b> of a thing', $page);
         $this->assertContains('Aye: 1', $page);
         $this->assertNotContains('No:', $page);