mysociety / theyworkforyou

classes/Divisions.php

Upper-Lower-Casing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
      * @param Member   $member   The member to get positions for.
      */
 
-    public function __construct(Member $member = NULL, PolicyPositions $positions = NULL, Policies $policies = NULL)
+    public function __construct(Member $member = null, PolicyPositions $positions = null, Policies $policies = null)
     {
         $this->member = $member;
         $this->positions = $positions;
@@ -59,7 +59,7 @@ 
      * @param  string|string[]  $houses  House name (eg: "commons") or array of
      *                                   house names. Optional.
      */
-    public function getRecentDivisions($number = 20, $houses = NULL) {
+    public function getRecentDivisions($number = 20, $houses = null) {
         $select = '';
         $where = '';
         $order = 'ORDER BY division_date DESC, division_number DESC';
@@ -123,7 +123,7 @@ 
      * @param  int|int[]        $majors  Major types (e.g. 1) or array of
      *                                   major types. Optional.
      */
-    public function getRecentDebatesWithDivisions($number = 20, $majors = NULL) {
+    public function getRecentDebatesWithDivisions($number = 20, $majors = null) {
         global $hansardmajors;
 
         if (!is_array($majors)) {
@@ -276,7 +276,7 @@ 
               $summary['absent'] += $row['total'];
           } else if ( $vote == 'both' ) {
               $summary['both'] += $row['total'];
-          } else if ( strpos($vote, 'tell') !== FALSE ) {
+          } else if ( strpos($vote, 'tell') !== false ) {
               $summary['tell'] += $row['total'];
           } else if ( $policy_vote == $vote ) {
               $summary['for'] += $row['total'];
@@ -365,7 +365,7 @@ 
               'teller' => false
             );
 
-            if (strpos($vote['vote'], 'tell') !== FALSE) {
+            if (strpos($vote['vote'], 'tell') !== false) {
                 $detail['teller'] = true;
             }
 
@@ -568,10 +568,10 @@ 
 
         if (array_key_exists('direction', $row)) {
             $division['direction'] = $row['direction'];
-            if ( strpos( $row['direction'], 'strong') !== FALSE ) {
-                $division['strong'] = TRUE;
+            if ( strpos( $row['direction'], 'strong') !== false ) {
+                $division['strong'] = true;
             } else {
-                $division['strong'] = FALSE;
+                $division['strong'] = false;
             }
         }
 

Indentation +57 added lines, -57 removed lines

@@ -192,7 +192,7 @@ 
 
         $divisions = array();
         foreach ($q as $row) {
-          $divisions[] = $this->getParliamentDivisionDetails($row);
+            $divisions[] = $this->getParliamentDivisionDetails($row);
         }
 
         return $divisions;
@@ -247,44 +247,44 @@ 
         );
 
         foreach ($q as $row) {
-          $policy_id = $row['policy_id'];
+            $policy_id = $row['policy_id'];
 
-          if (!array_key_exists($policy_id, $policy_divisions)) {
+            if (!array_key_exists($policy_id, $policy_divisions)) {
             $summary = array(
-              'max' => $row['latest'],
-              'min' => $row['earliest'],
-              'total' => $row['total'],
-              'for' => 0, 'against' => 0, 'absent' => 0, 'both' => 0, 'tell' => 0
+                'max' => $row['latest'],
+                'min' => $row['earliest'],
+                'total' => $row['total'],
+                'for' => 0, 'against' => 0, 'absent' => 0, 'both' => 0, 'tell' => 0
             );
 
             $policy_divisions[$policy_id] = $summary;
-          }
-
-          $summary = $policy_divisions[$policy_id];
-
-          $summary['total'] += $row['total'];
-          if ($summary['max'] < $row['latest']) {
-              $summary['max'] = $row['latest'];
-          }
-          if ($summary['min'] > $row['latest']) {
-              $summary['min'] = $row['latest'];
-          }
-
-          $vote = $row['vote'];
-          $policy_vote = str_replace('3', '', $row['policy_vote']);
-          if ( $vote == 'absent' ) {
-              $summary['absent'] += $row['total'];
-          } else if ( $vote == 'both' ) {
-              $summary['both'] += $row['total'];
-          } else if ( strpos($vote, 'tell') !== FALSE ) {
-              $summary['tell'] += $row['total'];
-          } else if ( $policy_vote == $vote ) {
-              $summary['for'] += $row['total'];
-          } else if ( $policy_vote != $vote ) {
-              $summary['against'] += $row['total'];
-          }
-
-          $policy_divisions[$policy_id] = $summary;
+            }
+
+            $summary = $policy_divisions[$policy_id];
+
+            $summary['total'] += $row['total'];
+            if ($summary['max'] < $row['latest']) {
+                $summary['max'] = $row['latest'];
+            }
+            if ($summary['min'] > $row['latest']) {
+                $summary['min'] = $row['latest'];
+            }
+
+            $vote = $row['vote'];
+            $policy_vote = str_replace('3', '', $row['policy_vote']);
+            if ( $vote == 'absent' ) {
+                $summary['absent'] += $row['total'];
+            } else if ( $vote == 'both' ) {
+                $summary['both'] += $row['total'];
+            } else if ( strpos($vote, 'tell') !== FALSE ) {
+                $summary['tell'] += $row['total'];
+            } else if ( $policy_vote == $vote ) {
+                $summary['for'] += $row['total'];
+            } else if ( $policy_vote != $vote ) {
+                $summary['against'] += $row['total'];
+            }
+
+            $policy_divisions[$policy_id] = $summary;
         }
 
         return $policy_divisions;
@@ -338,17 +338,17 @@ 
         );
 
         $votes = array(
-          'yes_votes' => array(),
-          'no_votes' => array(),
-          'absent_votes' => array(),
-          'both_votes' => array()
+            'yes_votes' => array(),
+            'no_votes' => array(),
+            'absent_votes' => array(),
+            'both_votes' => array()
         );
 
         $party_breakdown = array(
-          'yes_votes' => array(),
-          'no_votes' => array(),
-          'absent_votes' => array(),
-          'both_votes' => array()
+            'yes_votes' => array(),
+            'no_votes' => array(),
+            'absent_votes' => array(),
+            'both_votes' => array()
         );
 
         # Sort Lords specially
@@ -359,12 +359,12 @@ 
 
         foreach ($data as $vote) {
             $detail = array(
-              'person_id' => $vote['person_id'],
-              'name' => ucfirst(member_full_name($args['house'], $vote['title'], $vote['given_name'],
+                'person_id' => $vote['person_id'],
+                'name' => ucfirst(member_full_name($args['house'], $vote['title'], $vote['given_name'],
                     $vote['family_name'], $vote['lordofname'])),
-              'party' => $vote['party'],
-              'proxy' => false,
-              'teller' => false
+                'party' => $vote['party'],
+                'proxy' => false,
+                'teller' => false
             );
 
             if (strpos($vote['vote'], 'tell') !== FALSE) {
@@ -385,23 +385,23 @@ 
             }
 
             if ($vote['vote'] == 'aye' or $vote['vote'] == 'tellaye') {
-              $votes['yes_votes'][] = $detail;
-              @$party_breakdown['yes_votes'][$detail['party']]++;
+                $votes['yes_votes'][] = $detail;
+                @$party_breakdown['yes_votes'][$detail['party']]++;
             } else if ($vote['vote'] == 'no' or $vote['vote'] == 'tellno') {
-              $votes['no_votes'][] = $detail;
-              @$party_breakdown['no_votes'][$detail['party']]++;
+                $votes['no_votes'][] = $detail;
+                @$party_breakdown['no_votes'][$detail['party']]++;
             } else if ($vote['vote'] == 'absent') {
-              $votes['absent_votes'][] = $detail;
-              @$party_breakdown['absent_votes'][$detail['party']]++;
+                $votes['absent_votes'][] = $detail;
+                @$party_breakdown['absent_votes'][$detail['party']]++;
             } else if ($vote['vote'] == 'both') {
-              $votes['both_votes'][] = $detail;
-              @$party_breakdown['both_votes'][$detail['party']]++;
+                $votes['both_votes'][] = $detail;
+                @$party_breakdown['both_votes'][$detail['party']]++;
             }
         }
 
         foreach ($votes as $vote => $count) { // array('yes_votes', 'no_votes', 'absent_votes', 'both_votes') as $vote) {
-          $votes[$vote . '_by_party'] = $votes[$vote];
-          usort($votes[$vote . '_by_party'], function ($a, $b) {
+            $votes[$vote . '_by_party'] = $votes[$vote];
+            usort($votes[$vote . '_by_party'], function ($a, $b) {
                 return $a['party']>$b['party'];
             });
         }

Spacing +23 added lines, -23 removed lines

@@ -68,15 +68,15 @@ 
             ':count' => $number
         );
 
-        if ( is_string($houses) ) {
-            $houses = array( $houses );
+        if (is_string($houses)) {
+            $houses = array($houses);
         }
 
-        if ( is_array($houses) && count($houses) > 0 ) {
+        if (is_array($houses) && count($houses) > 0) {
             $where = 'WHERE house IN ("' . implode('", "', $houses) . '")';
         }
 
-        if ( $this->member ) {
+        if ($this->member) {
             $select = "SELECT divisions.*, vote FROM divisions
                 LEFT JOIN persondivisionvotes ON divisions.division_id=persondivisionvotes.division_id AND person_id=:person_id";
             $params[':person_id'] = $this->member->person_id;
@@ -215,7 +215,7 @@ 
     public function getMemberDivisionsForPolicy($policyID = null) {
         $where_extra = '';
         $args = array(':person_id' => $this->member->person_id);
-        if ( $policyID ) {
+        if ($policyID) {
             $where_extra = 'AND policy_id = :policy_id';
             $args[':policy_id'] = $policyID;
         }
@@ -272,15 +272,15 @@ 
 
           $vote = $row['vote'];
           $policy_vote = str_replace('3', '', $row['policy_vote']);
-          if ( $vote == 'absent' ) {
+          if ($vote == 'absent') {
               $summary['absent'] += $row['total'];
-          } else if ( $vote == 'both' ) {
+          } else if ($vote == 'both') {
               $summary['both'] += $row['total'];
-          } else if ( strpos($vote, 'tell') !== FALSE ) {
+          } else if (strpos($vote, 'tell') !== FALSE) {
               $summary['tell'] += $row['total'];
-          } else if ( $policy_vote == $vote ) {
+          } else if ($policy_vote == $vote) {
               $summary['for'] += $row['total'];
-          } else if ( $policy_vote != $vote ) {
+          } else if ($policy_vote != $vote) {
               $summary['against'] += $row['total'];
           }
 
@@ -377,7 +377,7 @@ 
                     FROM person_names AS pn
                     WHERE person_id = :person_id
                     AND start_date <= :division_date AND end_date >= :division_date",
-                    [ ':person_id' => $vote['proxy'], ':division_date' => $row['division_date'] ]
+                    [':person_id' => $vote['proxy'], ':division_date' => $row['division_date']]
                 )->first();
                 $detail['proxy'] = ucfirst(member_full_name(
                     HOUSE_TYPE_COMMONS, $q['title'], $q['given_name'],
@@ -401,8 +401,8 @@ 
 
         foreach ($votes as $vote => $count) { // array('yes_votes', 'no_votes', 'absent_votes', 'both_votes') as $vote) {
           $votes[$vote . '_by_party'] = $votes[$vote];
-          usort($votes[$vote . '_by_party'], function ($a, $b) {
-                return $a['party']>$b['party'];
+          usort($votes[$vote . '_by_party'], function($a, $b) {
+                return $a['party'] > $b['party'];
             });
         }
 
@@ -456,10 +456,10 @@ 
             $votes['against'] . ' ' . make_plural('vote', $votes['against']) . ' against'
         );
 
-        if ( $votes['both'] ) {
+        if ($votes['both']) {
             $actions[] = $votes['both'] . ' ' . make_plural('abstention', $votes['both']);
         }
-        if ( $votes['absent'] ) {
+        if ($votes['absent']) {
             $actions[] = $votes['absent'] . ' ' . make_plural('absence', $votes['absent']);
         }
         if ($max == $min) {
@@ -517,7 +517,7 @@ 
 
     private function constructYesNoVoteDescription($direction, $title, $short_text) {
         $text = ' voted ';
-        if ( $short_text ) {
+        if ($short_text) {
             $text .= $short_text;
         } else {
             $text .= "$direction on <em>$title</em>";
@@ -535,7 +535,7 @@ 
          * votes so we need to generate some text using the title of the division
          */
 
-        switch ( strtolower($vote) ) {
+        switch (strtolower($vote)) {
             case 'yes':
             case 'aye':
                 $description = $this->constructYesNoVoteDescription('yes', $division_title, $yes_text);
@@ -583,7 +583,7 @@ 
 
         if (array_key_exists('direction', $row)) {
             $division['direction'] = $row['direction'];
-            if ( strpos( $row['direction'], 'strong') !== FALSE ) {
+            if (strpos($row['direction'], 'strong') !== FALSE) {
                 $division['strong'] = TRUE;
             } else {
                 $division['strong'] = FALSE;
@@ -615,24 +615,24 @@ 
         foreach ($q as $row) {
             $policy_id = $row['policy_id'];
 
-            if ( !array_key_exists($policy_id, $policies) ) {
+            if (!array_key_exists($policy_id, $policies)) {
                 $policies[$policy_id] = array(
                     'policy_id' => $policy_id,
                     'weak_count' => 0,
                     'divisions' => array()
                 );
-                if ( $this->policies ) {
+                if ($this->policies) {
                     $policies[$policy_id]['desc'] = $this->policies->getPolicies()[$policy_id];
                     $policies[$policy_id]['header'] = $this->policies->getPolicyDetails($policy_id);
                 }
-                if ( $this->positions ) {
+                if ($this->positions) {
                     $policies[$policy_id]['position'] = $this->positions->positionsById[$policy_id];
                 }
             }
 
             $division = $this->getDivisionDetails($row);
 
-            if ( !$division['strong'] ) {
+            if (!$division['strong']) {
                 $policies[$policy_id]['weak_count']++;
             }
 
@@ -647,7 +647,7 @@ 
 
         $gid = get_canonical_gid($gid);
 
-        $q = $this->db->query("SELECT gid, major FROM hansard WHERE epobject_id = ( SELECT subsection_id FROM hansard WHERE gid = :gid )", array( ':gid' => $gid ))->first();
+        $q = $this->db->query("SELECT gid, major FROM hansard WHERE epobject_id = ( SELECT subsection_id FROM hansard WHERE gid = :gid )", array(':gid' => $gid))->first();
         if (!$q) {
             return '';
         }

www/includes/easyparliament/templates/html/homepage/recent-votes.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if ( count($divisions) > 0 ) { ?>
+<?php if (count($divisions) > 0) { ?>
     <h2 style="position: relative;">
         Recent Votes
         <div class="meta excerpt__category"><a href="/divisions/">Show all recent votes</a></div>

www/docs/admin/wikipedia.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 remove_form();
 list_ignored();
 $PAGE->stripe_end([
-    [ 'type' => 'html', 'content' => $PAGE->admin_menu() ],
+    ['type' => 'html', 'content' => $PAGE->admin_menu()],
 ]);
 $PAGE->page_end();
 

www/includes/easyparliament/templates/html/divisions/_name_vote_list.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (!function_exists('print_voter')) {
-  function print_voter($vote){
+  function print_voter($vote) {
     echo sprintf(
       '<li><a href="/mp/?p=%d">%s</a> <span class="party">%s%s</span></li>',
       $vote['person_id'],
@@ -28,7 +28,7 @@ 
     <?php if (count($tellers) > 0) { ?>
       <h4>Tellers</h4>
       <ul class="division-names">
-        <?php foreach($tellers as $teller) {
+        <?php foreach ($tellers as $teller) {
           print_voter($teller);
         } ?>
       </p>

Indentation +12 added lines, -12 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 
 if (!function_exists('print_voter')) {
-  function print_voter($vote){
+    function print_voter($vote){
     echo sprintf(
-      '<li><a href="/mp/?p=%d">%s</a> <span class="party">%s%s</span></li>',
-      $vote['person_id'],
-      $vote['name'],
-      $vote['party'],
-      $vote['proxy'] ? " (proxy vote cast by $vote[proxy])" : ''
+        '<li><a href="/mp/?p=%d">%s</a> <span class="party">%s%s</span></li>',
+        $vote['person_id'],
+        $vote['name'],
+        $vote['party'],
+        $vote['proxy'] ? " (proxy vote cast by $vote[proxy])" : ''
     );
-  }
+    }
 }
 
 if (count($votes) > 0) { ?>
@@ -18,18 +18,18 @@ 
       <?php $tellers = array(); ?>
       <ul class="division-names js-vote-accordion">
         <?php foreach ($votes as $vote) {
-          if ($vote['teller']) {
-              $tellers[] = $vote;
-          } else {
+            if ($vote['teller']) {
+                $tellers[] = $vote;
+            } else {
             print_voter($vote);
-          }
+            }
         } ?>
       </ul>
     <?php if (count($tellers) > 0) { ?>
       <h4>Tellers</h4>
       <ul class="division-names">
         <?php foreach($tellers as $teller) {
-          print_voter($teller);
+            print_voter($teller);
         } ?>
       </p>
     <?php } ?>

www/includes/dbtypes.php

Spacing +3 added lines, -3 removed lines

@@ -3,8 +3,8 @@ 
 // $Id: dbtypes.php,v 1.8 2009-04-28 13:13:04 matthew Exp $
 
 // The type field in the epobject database table
-define ('EPTYPE_HANSARD', 1);
-define ('EPTYPE_GLOSSARY', 2);
+define('EPTYPE_HANSARD', 1);
+define('EPTYPE_GLOSSARY', 2);
 
 // The major field in the hansard database table
 $hansardmajors = array(
@@ -121,7 +121,7 @@ 
 );
 $hansardmajors[104] = $hansardmajors[4];
 
-$parties = array (
+$parties = array(
     'Bp'    => 'Bishop',
     'Con'   => 'Conservative',
     'CWM'   => 'Deputy Speaker',

tests/HousesTest.php

Indentation +8 added lines, -8 removed lines

@@ -9,7 +9,7 @@ 
     /**
      * Test that the Royal edge-case house is correctly defined.
      */
-	public function testRoyalHouseDefined()
+    public function testRoyalHouseDefined()
     {
         $this->assertEquals(0, HOUSE_TYPE_ROYAL);
     }
@@ -17,7 +17,7 @@ 
     /**
      * Test that the House of Commons is correctly defined.
      */
-	public function testCommonsHouseDefined()
+    public function testCommonsHouseDefined()
     {
         $this->assertEquals(1, HOUSE_TYPE_COMMONS);
     }
@@ -25,7 +25,7 @@ 
     /**
      * Test that the House of Lords is correctly defined.
      */
-	public function testLordsHouseDefined()
+    public function testLordsHouseDefined()
     {
         $this->assertEquals(2, HOUSE_TYPE_LORDS);
     }
@@ -33,7 +33,7 @@ 
     /**
      * Test that the Northern Ireland Assembly is correctly defined.
      */
-	public function testNIHouseDefined()
+    public function testNIHouseDefined()
     {
         $this->assertEquals(3, HOUSE_TYPE_NI);
     }
@@ -41,7 +41,7 @@ 
     /**
      * Test that the Scottish Parliament is correctly defined.
      */
-	public function testScotlandHouseDefined()
+    public function testScotlandHouseDefined()
     {
         $this->assertEquals(4, HOUSE_TYPE_SCOTLAND);
     }
@@ -49,15 +49,15 @@ 
     /**
      * Test that the Assembly for Wales is correctly defined.
      */
-	public function testWalesHouseDefined()
+    public function testWalesHouseDefined()
     {
         $this->assertEquals(5, HOUSE_TYPE_WALES);
     }
 
-	/**
+    /**
      * Test that the London Assembly is correctly defined.
      */
-	public function testLondonAssemblyHouseDefined()
+    public function testLondonAssemblyHouseDefined()
     {
         $this->assertEquals(6, HOUSE_TYPE_LONDON_ASSEMBLY);
     }

classes/Utility/House.php

Indentation +11 added lines, -11 removed lines

@@ -24,24 +24,24 @@
     public static function house_to_members($house) {
         $house_to_members = array(
             HOUSE_TYPE_COMMONS => array(
-              'singular' => 'MP',
-              'plural'   => 'MPs'
+                'singular' => 'MP',
+                'plural'   => 'MPs'
             ),
             HOUSE_TYPE_LORDS => array(
-              'singular' => 'Member of the House of Lords',
-              'plural'   => 'Members of the House of Lords'
+                'singular' => 'Member of the House of Lords',
+                'plural'   => 'Members of the House of Lords'
             ),
             HOUSE_TYPE_NI => array(
-              'singular' => 'MLA',
-              'plural'   => 'MLAs'
+                'singular' => 'MLA',
+                'plural'   => 'MLAs'
             ),
             HOUSE_TYPE_SCOTLAND => array(
-              'singular' => 'MSP',
-              'plural'   => 'MSPs'
-          ),
+                'singular' => 'MSP',
+                'plural'   => 'MSPs'
+            ),
             HOUSE_TYPE_LONDON_ASSEMBLY => array(
-              'singular' => 'Member of the London Assembly',
-              'plural'   => 'Members of the London Assembly'
+                'singular' => 'Member of the London Assembly',
+                'plural'   => 'Members of the London Assembly'
             )
         );
 

Spacing +5 added lines, -5 removed lines

@@ -50,35 +50,35 @@
 
     public static function getCountryDetails($house) {
         $details = array(
-            HOUSE_TYPE_COMMONS => array (
+            HOUSE_TYPE_COMMONS => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => '– in the House of Commons',
                 'cons_type' => 'WMC',
                 'assembly_name' => 'House of Commons',
             ),
-            HOUSE_TYPE_NI => array (
+            HOUSE_TYPE_NI => array(
                 'country' => 'NORTHERN IRELAND',
                 'assembly' => 'ni',
                 'location' => '– in the Northern Ireland Assembly',
                 'cons_type' => 'NIE',
                 'assembly_name' => 'Northern Ireland Assembly',
             ),
-            HOUSE_TYPE_SCOTLAND => array (
+            HOUSE_TYPE_SCOTLAND => array(
                 'country' => 'SCOTLAND',
                 'assembly' => 'scotland',
                 'location' => '– in the Scottish Parliament',
                 'cons_type' => 'SPC',
                 'assembly_name' => 'Scottish Parliament',
             ),
-            HOUSE_TYPE_LORDS => array (
+            HOUSE_TYPE_LORDS => array(
                 'country' => 'UK',
                 'assembly' => 'uk-lords',
                 'location' => '– in the House of Lords',
                 'cons_type' => '',
                 'assembly_name' => 'House of Lords',
             ),
-            HOUSE_TYPE_LORDS => array (
+            HOUSE_TYPE_LORDS => array(
                 'country' => 'UK',
                 'assembly' => 'london-assembly',
                 'location' => '– in the London Assembly',