mysociety / theyworkforyou

classes/Divisions.php

Indentation +67 added lines, -67 removed lines

@@ -38,25 +38,25 @@ 
     }
 
     public static function getMostRecentDivisionDate() {
-      $db = new \ParlDB;
-      $q = $db->query(
+        $db = new \ParlDB;
+        $q = $db->query(
         "SELECT policy_id, max(division_date) as recent from policydivisions GROUP BY policy_id"
-      );
+        );
 
-      $policy_maxes = array();
-      $row_count = $q->rows();
-      for ($n = 0; $n < $row_count; $n++) {
+        $policy_maxes = array();
+        $row_count = $q->rows();
+        for ($n = 0; $n < $row_count; $n++) {
         $policy_maxes[$q->field($n, 'policy_id')] = $q->field( $n, 'recent' );
-      }
-      $policy_maxes['latest'] = $policy_maxes ? max(array_values($policy_maxes)) : '';
-      return $policy_maxes;
+        }
+        $policy_maxes['latest'] = $policy_maxes ? max(array_values($policy_maxes)) : '';
+        return $policy_maxes;
     }
 
     public function getRecentDivisions($number = 20) {
         // Grab distinct divisions as sometimes we have the same division for more than one policy
         // and we don't want to display it twice
         $q = $this->db->query(
-          "SELECT distinct division_id, division_title, yes_text, no_text, division_date, division_number, gid, direction, majority_vote,
+            "SELECT distinct division_id, division_title, yes_text, no_text, division_date, division_number, gid, direction, majority_vote,
           yes_total, no_total, absent_total, both_total
           FROM policydivisions ORDER BY division_date DESC, division_number DESC LIMIT :count",
             array(
@@ -94,7 +94,7 @@ 
         $divisions = array();
         $row_count = $q->rows();
         for ($n = 0; $n < $row_count; $n++) {
-          $divisions[] = $this->getParliamentDivisionDetails($q->row($n));
+            $divisions[] = $this->getParliamentDivisionDetails($q->row($n));
         }
 
         return $divisions;
@@ -148,44 +148,44 @@ 
 
         $row_count = $q->rows();
         for ($n = 0; $n < $row_count; $n++) {
-          $policy_id = $q->field($n, 'policy_id');
+            $policy_id = $q->field($n, 'policy_id');
 
-          if (!array_key_exists($policy_id, $policy_divisions)) {
+            if (!array_key_exists($policy_id, $policy_divisions)) {
             $summary = array(
-              'max' => $q->field($n, 'latest'),
-              'min' => $q->field($n, 'earliest'),
-              'total' => $q->field($n, 'total'),
-              'for' => 0, 'against' => 0, 'absent' => 0, 'both' => 0, 'tell' => 0
+                'max' => $q->field($n, 'latest'),
+                'min' => $q->field($n, 'earliest'),
+                'total' => $q->field($n, 'total'),
+                'for' => 0, 'against' => 0, 'absent' => 0, 'both' => 0, 'tell' => 0
             );
 
             $policy_divisions[$policy_id] = $summary;
-          }
-
-          $summary = $policy_divisions[$policy_id];
-
-          $summary['total'] += $q->field($n, 'total');
-          if ($summary['max'] < $q->field($n, 'latest')) {
-              $summary['max'] = $q->field($n, 'latest');
-          }
-          if ($summary['min'] > $q->field($n, 'latest')) {
-              $summary['min'] = $q->field($n, 'latest');
-          }
-
-          $vote = $q->field($n, 'vote');
-          $policy_vote = str_replace('3', '', $q->field($n, 'policy_vote'));
-          if ( $vote == 'absent' ) {
-              $summary['absent'] += $q->field($n, 'total');
-          } else if ( $vote == 'both' ) {
-              $summary['both'] += $q->field($n, 'total');
-          } else if ( strpos($vote, 'tell') !== FALSE ) {
-              $summary['tell'] += $q->field($n, 'total');
-          } else if ( $policy_vote == $vote ) {
-              $summary['for'] += $q->field($n, 'total');
-          } else if ( $policy_vote != $vote ) {
-              $summary['against'] += $q->field($n, 'total');
-          }
-
-          $policy_divisions[$policy_id] = $summary;
+            }
+
+            $summary = $policy_divisions[$policy_id];
+
+            $summary['total'] += $q->field($n, 'total');
+            if ($summary['max'] < $q->field($n, 'latest')) {
+                $summary['max'] = $q->field($n, 'latest');
+            }
+            if ($summary['min'] > $q->field($n, 'latest')) {
+                $summary['min'] = $q->field($n, 'latest');
+            }
+
+            $vote = $q->field($n, 'vote');
+            $policy_vote = str_replace('3', '', $q->field($n, 'policy_vote'));
+            if ( $vote == 'absent' ) {
+                $summary['absent'] += $q->field($n, 'total');
+            } else if ( $vote == 'both' ) {
+                $summary['both'] += $q->field($n, 'total');
+            } else if ( strpos($vote, 'tell') !== FALSE ) {
+                $summary['tell'] += $q->field($n, 'total');
+            } else if ( $policy_vote == $vote ) {
+                $summary['for'] += $q->field($n, 'total');
+            } else if ( $policy_vote != $vote ) {
+                $summary['against'] += $q->field($n, 'total');
+            }
+
+            $policy_divisions[$policy_id] = $summary;
         }
 
         return $policy_divisions;
@@ -219,17 +219,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()
         );
 
         foreach ($q->data as $vote) {
             $detail = array(
-              'person_id' => $vote['person_id'],
-              'name' => $vote['given_name'] . ' ' . $vote['family_name'],
-              'teller' => false
+                'person_id' => $vote['person_id'],
+                'name' => $vote['given_name'] . ' ' . $vote['family_name'],
+                'teller' => false
             );
 
             if (strpos($vote['vote'], 'tell') !== FALSE) {
@@ -237,13 +237,13 @@ 
             }
 
             if ($vote['vote'] == 'aye' or $vote['vote'] == 'tellaye') {
-              $votes['yes_votes'][] = $detail;
+                $votes['yes_votes'][] = $detail;
             } else if ($vote['vote'] == 'no' or $vote['vote'] == 'tellno') {
-              $votes['no_votes'][] = $detail;
+                $votes['no_votes'][] = $detail;
             } else if ($vote['vote'] == 'absent') {
-              $votes['absent_votes'][] = $detail;
+                $votes['absent_votes'][] = $detail;
             } else if ($vote['vote'] == 'both') {
-              $votes['both_votes'][] = $detail;
+                $votes['both_votes'][] = $detail;
             }
 
         }
@@ -338,11 +338,11 @@ 
         $divisions = array();
         $row_count = $q->rows();
         for ($n = 0; $n < $row_count; $n++) {
-          if ($context == 'Parliament') {
-              $divisions[] = $this->getParliamentDivisionDetails($q->row($n));
-          } else {
-              $divisions[] = $this->getDivisionDetails($q->row($n));
-          }
+            if ($context == 'Parliament') {
+                $divisions[] = $this->getParliamentDivisionDetails($q->row($n));
+            } else {
+                $divisions[] = $this->getDivisionDetails($q->row($n));
+            }
         }
 
         return $divisions;
@@ -444,13 +444,13 @@ 
 
         $division['mp_vote'] = '';
         if (array_key_exists('vote', $row)) {
-          $mp_vote = ' was absent';
-          if ($row['vote'] == 'aye') {
-              $mp_vote = 'voted in favour';
-          } else if ($row['vote'] == 'no') {
-              $mp_vote = 'voted against';
-          }
-          $division['mp_vote'] = $mp_vote;
+            $mp_vote = ' was absent';
+            if ($row['vote'] == 'aye') {
+                $mp_vote = 'voted in favour';
+            } else if ($row['vote'] == 'no') {
+                $mp_vote = 'voted against';
+            }
+            $division['mp_vote'] = $mp_vote;
         }
         $division['division_title'] = $row['division_title'];
         $division['vote'] = $vote;

Upper-Lower-Casing +6 added lines, -6 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;
@@ -177,7 +177,7 @@ 
               $summary['absent'] += $q->field($n, 'total');
           } else if ( $vote == 'both' ) {
               $summary['both'] += $q->field($n, 'total');
-          } else if ( strpos($vote, 'tell') !== FALSE ) {
+          } else if ( strpos($vote, 'tell') !== false ) {
               $summary['tell'] += $q->field($n, 'total');
           } else if ( $policy_vote == $vote ) {
               $summary['for'] += $q->field($n, 'total');
@@ -232,7 +232,7 @@ 
               'teller' => false
             );
 
-            if (strpos($vote['vote'], 'tell') !== FALSE) {
+            if (strpos($vote['vote'], 'tell') !== false) {
                 $detail['teller'] = true;
             }
 
@@ -399,10 +399,10 @@ 
         $division = array();
 
         $direction = $row['direction'];
-        if ( strpos( $direction, 'strong') !== FALSE ) {
-            $division['strong'] = TRUE;
+        if ( strpos( $direction, 'strong') !== false ) {
+            $division['strong'] = true;
         } else {
-            $division['strong'] = FALSE;
+            $division['strong'] = false;
         }
 
         $division['division_id'] = $row['division_id'];

Spacing +18 added lines, -18 removed lines

@@ -46,7 +46,7 @@ 
       $policy_maxes = array();
       $row_count = $q->rows();
       for ($n = 0; $n < $row_count; $n++) {
-        $policy_maxes[$q->field($n, 'policy_id')] = $q->field( $n, 'recent' );
+        $policy_maxes[$q->field($n, 'policy_id')] = $q->field($n, 'recent');
       }
       $policy_maxes['latest'] = $policy_maxes ? max(array_values($policy_maxes)) : '';
       return $policy_maxes;
@@ -117,7 +117,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;
         }
@@ -173,15 +173,15 @@ 
 
           $vote = $q->field($n, 'vote');
           $policy_vote = str_replace('3', '', $q->field($n, 'policy_vote'));
-          if ( $vote == 'absent' ) {
+          if ($vote == 'absent') {
               $summary['absent'] += $q->field($n, 'total');
-          } else if ( $vote == 'both' ) {
+          } else if ($vote == 'both') {
               $summary['both'] += $q->field($n, 'total');
-          } else if ( strpos($vote, 'tell') !== FALSE ) {
+          } else if (strpos($vote, 'tell') !== FALSE) {
               $summary['tell'] += $q->field($n, 'total');
-          } else if ( $policy_vote == $vote ) {
+          } else if ($policy_vote == $vote) {
               $summary['for'] += $q->field($n, 'total');
-          } else if ( $policy_vote != $vote ) {
+          } else if ($policy_vote != $vote) {
               $summary['against'] += $q->field($n, 'total');
           }
 
@@ -284,10 +284,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) {
@@ -351,7 +351,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>";
@@ -369,7 +369,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);
@@ -399,7 +399,7 @@ 
         $division = array();
 
         $direction = $row['direction'];
-        if ( strpos( $direction, 'strong') !== FALSE ) {
+        if (strpos($direction, 'strong') !== FALSE) {
             $division['strong'] = TRUE;
         } else {
             $division['strong'] = FALSE;
@@ -471,24 +471,24 @@ 
         for ($n = 0; $n < $row_count; $n++) {
             $policy_id = $q->field($n, '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($q->row($n));
 
-            if ( !$division['strong'] ) {
+            if (!$division['strong']) {
                 $policies[$policy_id]['weak_count']++;
             }
 
@@ -503,9 +503,9 @@ 
 
         $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 ));
+        $q = $this->db->query("SELECT gid, major FROM hansard WHERE epobject_id = ( SELECT subsection_id FROM hansard WHERE gid = :gid )", array(':gid' => $gid));
         $parent_gid = $q->field(0, 'gid');
-        if ( !$parent_gid ) {
+        if (!$parent_gid) {
             return '';
         }
         $parent_gid = fix_gid_from_db($parent_gid);

classes/Party.php

Spacing +25 added lines, -25 removed lines

@@ -20,7 +20,7 @@ 
     public function __construct($name) {
         // treat Labour and Labour/Co-operative the same as that's how
         // people view them and it'll confuse the results otherwise
-        if ( $name == 'Labour/Co-operative' ) {
+        if ($name == 'Labour/Co-operative') {
             $name = 'Labour';
         }
         $this->name = $name;
@@ -42,7 +42,7 @@ 
                 ':date' => date('Y-m-d'),
             )
         );
-        if ( $member_count->rows ) {
+        if ($member_count->rows) {
             $num_members = $member_count->field(0, 'num_members');
             return $num_members;
         } else {
@@ -70,12 +70,12 @@ 
             )
         );
 
-        if ( $position->rows ) {
+        if ($position->rows) {
             $score = $position->field(0, 'score');
             $score_desc = score_to_strongly($score);
 
-            if ( $want_score ) {
-                return array( $score_desc, $score);
+            if ($want_score) {
+                return array($score_desc, $score);
             } else {
                 return $score_desc;
             }
@@ -114,7 +114,7 @@ 
             ':party' => $this->name
         );
 
-        if ( $this->name == 'Labour' ) {
+        if ($this->name == 'Labour') {
             $party_where = '( party = :party OR party = :party2 )';
             $params = array(
                 ':party' => $this->name,
@@ -122,7 +122,7 @@ 
             );
         }
 
-        for ( $i = 0; $i < $num_divs; $i++ ) {
+        for ($i = 0; $i < $num_divs; $i++) {
             $division_id = $divisions->field($i, 'division_id');
             $weights = $this->get_vote_scores($divisions->field($i, 'policy_vote'));
 
@@ -142,42 +142,42 @@ 
             );
 
             $num_votes = 0;
-            for ( $j = 0; $j < $votes->rows(); $j++ ) {
+            for ($j = 0; $j < $votes->rows(); $j++) {
                 $vote_dir = $votes->field($j, 'vote');
-                if ( $vote_dir == '' ) continue;
-                if ( $vote_dir == 'tellno' ) $vote_dir = 'no';
-                if ( $vote_dir == 'tellaye' ) $vote_dir = 'aye';
+                if ($vote_dir == '') continue;
+                if ($vote_dir == 'tellno') $vote_dir = 'no';
+                if ($vote_dir == 'tellaye') $vote_dir = 'aye';
 
                 $num_votes += $votes->field($j, 'num_votes');
                 $score += ($votes->field($j, 'num_votes') * $weights[$vote_dir]);
             }
 
             $total_votes += $num_votes;
-            $max_score += $num_votes * max( array_values( $weights ) );
+            $max_score += $num_votes * max(array_values($weights));
         }
 
-        if ( $total_votes == 0 ) {
+        if ($total_votes == 0) {
             return null;
         }
 
         // this implies that all the divisions in the policy have a policy
         // position of absent so we set weight to -1 to indicate we can't
         // really say what the parties position is.
-        if ( $max_score == 0 ) {
+        if ($max_score == 0) {
             $weight = -1;
         } else {
-            $weight = 1 - ( $score/$max_score );
+            $weight = 1 - ($score / $max_score);
         }
         $score_desc = score_to_strongly($weight);
 
-        if ( $want_score ) {
-            return array( $score_desc, $weight);
+        if ($want_score) {
+            return array($score_desc, $weight);
         } else {
             return $score_desc;
         }
     }
 
-    public function cache_position( $position ) {
+    public function cache_position($position) {
         $this->db->query(
             "REPLACE INTO partypolicy
                 (party, house, policy_id, score)
@@ -197,9 +197,9 @@ 
             return $positions;
         }
 
-        foreach ( $policies->getPolicies() as $policy_id => $policy_text ) {
-            list( $position, $score ) = $this->$method($policy_id, true);
-            if ( $position === null ) {
+        foreach ($policies->getPolicies() as $policy_id => $policy_text) {
+            list($position, $score) = $this->$method($policy_id, true);
+            if ($position === null) {
                 continue;
             }
 
@@ -219,7 +219,7 @@ 
         $both = 1;
         $agree = 10;
 
-        if ( stripos($vote, '3') !== FALSE ) {
+        if (stripos($vote, '3') !== FALSE) {
             $agree = 50;
             $absent = 25;
             $both = 25;
@@ -230,10 +230,10 @@ 
             'both' => $both
         );
 
-        if ( stripos($vote, 'aye') !== FALSE ) {
+        if (stripos($vote, 'aye') !== FALSE) {
             $scores['aye'] = $agree;
             $scores['no'] = 0;
-        } else if ( stripos($vote, 'no') !== FALSE ) {
+        } else if (stripos($vote, 'no') !== FALSE) {
             $scores['no'] = $agree;
             $scores['aye'] = 0;
         } else {
@@ -256,7 +256,7 @@ 
         $parties = array();
         $party_count = $party_list->rows;
 
-        for ( $i = 0; $i < $party_count; $i++ ) {
+        for ($i = 0; $i < $party_count; $i++) {
             $party = $party_list->field($i, 'party');
             if (
                 !$party

Braces +9 added lines, -3 removed lines

@@ -144,9 +144,15 @@
             $num_votes = 0;
             for ( $j = 0; $j < $votes->rows(); $j++ ) {
                 $vote_dir = $votes->field($j, 'vote');
-                if ( $vote_dir == '' ) continue;
-                if ( $vote_dir == 'tellno' ) $vote_dir = 'no';
-                if ( $vote_dir == 'tellaye' ) $vote_dir = 'aye';
+                if ( $vote_dir == '' ) {
+                    continue;
+                }
+                if ( $vote_dir == 'tellno' ) {
+                    $vote_dir = 'no';
+                }
+                if ( $vote_dir == 'tellaye' ) {
+                    $vote_dir = 'aye';
+                }
 
                 $num_votes += $votes->field($j, 'num_votes');
                 $score += ($votes->field($j, 'num_votes') * $weights[$vote_dir]);

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

@@ -219,7 +219,7 @@ 
         $both = 1;
         $agree = 10;
 
-        if ( stripos($vote, '3') !== FALSE ) {
+        if ( stripos($vote, '3') !== false ) {
             $agree = 50;
             $absent = 25;
             $both = 25;
@@ -230,10 +230,10 @@ 
             'both' => $both
         );
 
-        if ( stripos($vote, 'aye') !== FALSE ) {
+        if ( stripos($vote, 'aye') !== false ) {
             $scores['aye'] = $agree;
             $scores['no'] = 0;
-        } else if ( stripos($vote, 'no') !== FALSE ) {
+        } else if ( stripos($vote, 'no') !== false ) {
             $scores['no'] = $agree;
             $scores['aye'] = 0;
         } else {

classes/Office.php

Indentation +25 added lines, -25 removed lines

@@ -19,12 +19,12 @@ 
     public $source;
 
     /**
-    * To String
-    *
-    * Return the office title as a string.
-    *
-    * @return string The title of the office, or "Unnamed Office"
-    */
+     * To String
+     *
+     * Return the office title as a string.
+     *
+     * @return string The title of the office, or "Unnamed Office"
+     */
 
     public function __toString() {
         if (isset ($this->title)){
@@ -35,25 +35,25 @@ 
     }
 
     /**
-    * Pretty Dates
-    *
-    * Return a string containing prettified dates of this office.
-    *
-    * 2004-05-28 and 2004-05-13 are the first dates for data scraped from the
-    * old selctee/privsec pages on parliament.uk (you can see this in
-    * cmpages/chgpages' privsec0001_2004-06-08.html and
-    * selctee0001_2004-06-08.html). So if the date is those dates for those two
-    * things, you don't want to display it because it's not a known start date,
-    * it could have been before that date. 2005-11-10 is because the PPS changes
-    * did not all happen on that date but the website did not update until that
-    * date so it outputs "before" in either from/to date in that case.
-    * 2009-01-16 is the last date before the page disappeared off parliament.uk
-    * entirely so that displays that fact that after then we don't know.
-    *
-    * @todo https://github.com/mysociety/theyworkforyou/issues/632
-    *
-    * @return string The dates of this office in a readable form.
-    */
+     * Pretty Dates
+     *
+     * Return a string containing prettified dates of this office.
+     *
+     * 2004-05-28 and 2004-05-13 are the first dates for data scraped from the
+     * old selctee/privsec pages on parliament.uk (you can see this in
+     * cmpages/chgpages' privsec0001_2004-06-08.html and
+     * selctee0001_2004-06-08.html). So if the date is those dates for those two
+     * things, you don't want to display it because it's not a known start date,
+     * it could have been before that date. 2005-11-10 is because the PPS changes
+     * did not all happen on that date but the website did not update until that
+     * date so it outputs "before" in either from/to date in that case.
+     * 2009-01-16 is the last date before the page disappeared off parliament.uk
+     * entirely so that displays that fact that after then we don't know.
+     *
+     * @todo https://github.com/mysociety/theyworkforyou/issues/632
+     *
+     * @return string The dates of this office in a readable form.
+     */
 
     public function pretty_dates() {
 

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

@@ -64,7 +64,7 @@
         $output = '';
 
         if (
-            !($this->source == 'chgpages/selctee' && $this->from_date == '2004-05-28') AND
+            !($this->source == 'chgpages/selctee' && $this->from_date == '2004-05-28') and
             !($this->source == 'chgpages/privsec' && $this->from_date == '2004-05-13')
         ) {
             if ($this->source == 'chgpages/privsec' && $this->from_date == '2005-11-10') {

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
     */
 
     public function __toString() {
-        if (isset ($this->title)){
+        if (isset ($this->title)) {
             return (string) $this->title;
         } else {
             return 'Unnamed Office';
@@ -70,7 +70,7 @@ 
             if ($this->source == 'chgpages/privsec' && $this->from_date == '2005-11-10') {
                 $output .= 'before ';
             }
-            $output .= format_date($this->from_date,SHORTDATEFORMAT) . ' ';
+            $output .= format_date($this->from_date, SHORTDATEFORMAT) . ' ';
         }
 
         $output .= 'to ';

Braces +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
     */
 
     public function __toString() {
-        if (isset ($this->title)){
+        if (isset ($this->title)) {
             return (string) $this->title;
         } else {
             return 'Unnamed Office';

classes/Search/Normal.php

Braces +3 added lines, -1 removed lines

@@ -141,7 +141,9 @@
 
     private function find_members() {
         $searchstring = trim(preg_replace('#-?[a-z]+:[a-z0-9]+#', '', $this->searchstring));
-        if (!$searchstring) return array();
+        if (!$searchstring) {
+            return array();
+        }
 
         $members = array();
 

Doc Comments +3 added lines

@@ -188,6 +188,9 @@
         return $items;
     }
 
+    /**
+     * @param \MySociety\TheyWorkForYou\Url $url
+     */
     private function generate_pagination_links($data, $url, $first, $last) {
         $links = array();
 

Spacing +23 added lines, -23 removed lines

@@ -12,12 +12,12 @@ 
         }
 
         $o = get_http_var('o');
-        $args = array (
+        $args = array(
             's' => $this->searchstring,
             'p' => $pagenum,
             'num' => get_http_var('num'),
             'pop' => get_http_var('pop'),
-            'o' => ($o=='d' || $o=='r' || $o=='o') ? $o : 'd',
+            'o' => ($o == 'd' || $o == 'r' || $o == 'o') ? $o : 'd',
         );
 
         return $args;
@@ -55,9 +55,9 @@ 
         }
 
         $sort_order = 'newest';
-        if ( $args['o'] == 'o' ) {
+        if ($args['o'] == 'o') {
             $sort_order = 'oldest';
-        } else if ( $args['o'] == 'r' ) {
+        } else if ($args['o'] == 'r') {
             $sort_order = 'relevance';
         }
 
@@ -73,7 +73,7 @@ 
             return array('error' => $SEARCHENGINE->error);
         } else {
             $LIST = new \HANSARDLIST();
-            $data = $LIST->display('search', $args , 'none');
+            $data = $LIST->display('search', $args, 'none');
             $data['search_type'] = 'normal';
             $data['sort_order'] = $sort_order;
             $data['members'] = $members;
@@ -93,10 +93,10 @@ 
             return false;
         }
 
-        list ($constituencies, ) = \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery($searchterm);
+        list ($constituencies,) = \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery($searchterm);
 
         $constituency = "";
-        if (count($constituencies)==1) {
+        if (count($constituencies) == 1) {
             $constituency = $constituencies[0];
         }
 
@@ -112,12 +112,12 @@ 
 
                 $MEMBER = new \MySociety\TheyWorkForYou\Member(array('constituency'=>$constituency, 'house' => 1));
                 $cons[] = $MEMBER;
-                if ( $MEMBER->current_member(1) ) {
+                if ($MEMBER->current_member(1)) {
                     $mp_types['mp']++;
                 } else {
                     $mp_types['former']++;
                 }
-            } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+            } catch (\MySociety\TheyWorkForYou\MemberException $e) {
                 $cons = array();
             }
         } elseif (count($constituencies)) {
@@ -125,12 +125,12 @@ 
                 try {
                     $MEMBER = new \MySociety\TheyWorkForYou\Member(array('constituency'=>$constituency, 'house' => 1));
                     $cons[] = $MEMBER;
-                    if ( $MEMBER->current_member(1) ) {
+                    if ($MEMBER->current_member(1)) {
                         $mp_types['mp']++;
                     } else {
                         $mp_types['former']++;
                     }
-                } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+                } catch (\MySociety\TheyWorkForYou\MemberException $e) {
                     continue;
                 }
             }
@@ -147,7 +147,7 @@ 
 
         $q = \MySociety\TheyWorkForYou\Utility\Search::searchMemberDbLookup($searchstring);
         $row_count = $q->rows();
-        for ($n=0; $n<$row_count; $n++) {
+        for ($n = 0; $n < $row_count; $n++) {
             $members[] = $q->field($n, 'person_id');
         }
 
@@ -155,7 +155,7 @@ 
         $q = $db->query("SELECT person FROM moffice WHERE position LIKE :pos ORDER BY from_date DESC, moffice_id",
             array('pos' => "%$searchstring%"));
         $row_count = $q->rows();
-        for ($n=0; $n<$row_count; $n++) {
+        for ($n = 0; $n < $row_count; $n++) {
             $members[] = $q->field($n, 'person');
         }
 
@@ -203,7 +203,7 @@ 
             $link = array(
                 'url' => $url->generate(),
                 'page' => $n,
-                'current' => ( $n == $data['page'] )
+                'current' => ($n == $data['page'])
             );
 
             $links[] = $link;
@@ -244,27 +244,27 @@ 
             $numlinks = $this->generate_pagination_links($data, $URL, $firstpage, $lastpage);
 
             $pagelinks['nums'] = $numlinks;
-            $pagelinks['first_result'] = $page == 1 ? 1 : ( ( $page - 1 ) * $results_per_page ) + 1;
-            $pagelinks['last_result'] = $page == $numpages ? $total_results : $pagelinks['first_result'] + ( $results_per_page - 1 );
+            $pagelinks['first_result'] = $page == 1 ? 1 : (($page - 1) * $results_per_page) + 1;
+            $pagelinks['last_result'] = $page == $numpages ? $total_results : $pagelinks['first_result'] + ($results_per_page - 1);
 
-            if ( $page != 1 ) {
+            if ($page != 1) {
                 $prev_page = $page - 1;
-                $URL->insert(array( 'p' => $prev_page ) );
+                $URL->insert(array('p' => $prev_page));
                 $pagelinks['prev'] = array(
                     'url' => $URL->generate()
                 );
-                $URL->insert(array( 'p' => 1 ) );
+                $URL->insert(array('p' => 1));
                 $pagelinks['firstpage'] = array(
                     'url' => $URL->generate()
                 );
             }
             if ($page != $numpages) {
                 $next_page = $page + 1;
-                $URL->insert(array( 'p' => $next_page ) );
+                $URL->insert(array('p' => $next_page));
                 $pagelinks['next'] = array(
                     'url' => $URL->generate()
                 );
-                $URL->insert(array( 'p' => $numpages ) );
+                $URL->insert(array('p' => $numpages));
                 $pagelinks['lastpage'] = array(
                     'url' => $URL->generate()
                 );
@@ -281,7 +281,7 @@ 
         $links['rss'] = $DATA->page_metadata($this_page, 'rss');
 
         if ($SEARCHENGINE) {
-            $links['email'] = '/alert/?' . ($this->searchstring ? 'alertsearch='.urlencode($this->searchstring) : '');
+            $links['email'] = '/alert/?' . ($this->searchstring ? 'alertsearch=' . urlencode($this->searchstring) : '');
             $links['email_desc'] = $SEARCHENGINE->query_description_long();
         }
 
@@ -295,7 +295,7 @@ 
             $search_engine = new \SEARCHENGINE($filter_ss);
             $links['email_section'] = $links['email'];
             $links['email_desc_section'] = $links['email_desc'];
-            $links['email'] = '/alert/?' . ($filter_ss ? 'alertsearch='.urlencode($filter_ss) : '');
+            $links['email'] = '/alert/?' . ($filter_ss ? 'alertsearch=' . urlencode($filter_ss) : '');
             $links['email_desc'] = $search_engine->query_description_long();
         }
 

classes/Search/ParseArgs.php

Braces +14 added lines, -6 removed lines

@@ -28,11 +28,17 @@ 
 
         if (get_http_var('from') || get_http_var('to')) {
             $from = parse_date(get_http_var('from'));
-            if ($from) $from = $from['iso'];
-            else $from = '1935-10-01';
+            if ($from) {
+                $from = $from['iso'];
+            } else {
+                $from = '1935-10-01';
+            }
             $to = parse_date(get_http_var('to'));
-            if ($to) $to = $to['iso'];
-            else $to = date('Y-m-d');
+            if ($to) {
+                $to = $to['iso'];
+            } else {
+                $to = date('Y-m-d');
+            }
             $searchstring .= " $from..$to";
         }
 
@@ -105,8 +111,10 @@ 
         }
 
         $advsection = get_http_var('section');
-        if (!$advsection)
-            $advsection = get_http_var('maj'); # Old URLs had this
+        if (!$advsection) {
+                    $advsection = get_http_var('maj');
+        }
+        # Old URLs had this
         if (is_array($advsection)) {
             $searchstring .= ' section:' . join(' section:', $advsection);
         } elseif ($advsection) {

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
             $q = \MySociety\TheyWorkForYou\Utility\Search::searchMemberDbLookup($searchspeaker);
             $pids = array();
             $row_count = $q->rows();
-            for ($i=0; $i<$row_count; $i++) {
+            for ($i = 0; $i < $row_count; $i++) {
                 $pids[$q->field($i, 'person_id')] = true;
             }
             $pids = array_keys($pids);

classes/Topic.php

Indentation +29 added lines, -29 removed lines

@@ -33,7 +33,7 @@ 
         $this->db = new \ParlDB;
 
         if (is_null($data)) {
-          return;
+            return;
         }
 
         $this->id = $data['id'];
@@ -124,7 +124,7 @@ 
 
     private function _getContentIDs() {
         $q = $this->db->query(
-          "SELECT body, gid, ep.epobject_id FROM epobject ep
+            "SELECT body, gid, ep.epobject_id FROM epobject ep
            JOIN hansard h on ep.epobject_id = h.epobject_id
            JOIN topic_epobjects te on te.epobject_id = ep.epobject_id
            WHERE topic_key = :topic_key",
@@ -180,24 +180,24 @@ 
 
     function addContent($gid) {
         $q = $this->db->query(
-          "SELECT epobject_id FROM hansard WHERE gid = :gid",
-          array(
+            "SELECT epobject_id FROM hansard WHERE gid = :gid",
+            array(
             ":gid" => $gid
-          )
+            )
         );
 
         if (!$q->success() || $q->rows == 0) {
-          return false;
+            return false;
         }
 
         $epobject_id = $q->field(0, 'epobject_id');
 
         $q = $this->db->query(
-          "INSERT INTO topic_epobjects (topic_key, epobject_id) VALUES (:topic, :ep_id)",
-          array(
+            "INSERT INTO topic_epobjects (topic_key, epobject_id) VALUES (:topic, :ep_id)",
+            array(
             ":topic" => $this->id,
             ":ep_id" => $epobject_id
-          )
+            )
         );
 
         return $q->success();
@@ -205,31 +205,31 @@ 
 
     function deleteContent($id) {
         $q = $this->db->query(
-          "DELETE FROM topic_epobjects WHERE topic_key = :topic AND epobject_id = :ep_id",
-          array(
+            "DELETE FROM topic_epobjects WHERE topic_key = :topic AND epobject_id = :ep_id",
+            array(
             ":topic" => $this->id,
             ":ep_id" => $id
-          )
+            )
         );
 
         return $q->success();
     }
 
     function getPolicySets() {
-      $q = $this->db->query(
+        $q = $this->db->query(
         "SELECT policyset FROM topic_policysets WHERE topic_key = :key",
         array(
-          ':key' => $this->id
+            ':key' => $this->id
         )
-      );
+        );
 
-      $sets = array();
-      $count = $q->rows;
-      for ($i = 0; $i < $count; $i++) {
+        $sets = array();
+        $count = $q->rows;
+        for ($i = 0; $i < $count; $i++) {
         $sets[] = $q->field($i, 'policyset');
-      }
+        }
 
-      return $sets;
+        return $sets;
     }
 
     function addPolicySets($sets) {
@@ -259,20 +259,20 @@ 
     }
 
     function getPolicies() {
-      $q = $this->db->query(
+        $q = $this->db->query(
         'SELECT policy_id FROM topic_policies WHERE topic_key = :key',
         array(
-          ':key' => $this->id
+            ':key' => $this->id
         )
-      );
+        );
 
-      $policies = array();
-      $count = $q->rows;
-      for ($i = 0; $i < $count; $i++) {
+        $policies = array();
+        $count = $q->rows;
+        for ($i = 0; $i < $count; $i++) {
         $policies[] = $q->field($i, 'policy_id');
-      }
+        }
 
-      return $policies;
+        return $policies;
     }
 
     function addPolicies($policies) {
@@ -316,7 +316,7 @@ 
 
     function save() {
         $q = $this->db->query(
-          "REPLACE INTO topics
+            "REPLACE INTO topics
           (id, title, slug, description, search_string, front_page, image)
           VALUES
           (:id, :title, :slug, :description, :search_string, :front_page, :image)",

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

@@ -28,7 +28,7 @@
      *
      */
 
-    public function __construct($data = NULL)
+    public function __construct($data = null)
     {
         $this->db = new \ParlDB;
 

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
 
     function sctitle() {
         $title = $this->title;
-        if (strpos($title, 'The ') === 0 ) {
+        if (strpos($title, 'The ') === 0) {
             $title = lcfirst($title);
         }
 
@@ -242,7 +242,7 @@ 
             );
         } else {
             foreach ($sets as $set) {
-                if ($set == '' ) {
+                if ($set == '') {
                     continue;
                 }
                 $q = $this->db->query(
@@ -285,7 +285,7 @@ 
             );
         } else {
             foreach ($policies as $policy) {
-                if ($policy == '' ) {
+                if ($policy == '') {
                     continue;
                 }
                 $q = $this->db->query(

classes/SectionView/SpView.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'sp' )
+            array('section' => 'sp')
         );
     }
 }

classes/SectionView/WransView.php

Spacing +6 added lines, -6 removed lines

@@ -12,13 +12,13 @@ 
 
     protected function display_front() {
         global $DATA, $this_page;
-        if ( get_http_var('type') == 'wrans') {
+        if (get_http_var('type') == 'wrans') {
             return parent::display_front();
         }
 
         $data = array();
 
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $WRANSLIST = new \WRANSLIST;
 
         $wrans = array();
@@ -50,10 +50,10 @@ 
 
     protected function getSearchSections() {
         $sections = array(
-            array( 'section' => 'wrans', 'title' => 'Written Answers' ),
+            array('section' => 'wrans', 'title' => 'Written Answers'),
         );
-        if ( get_http_var('type') == '') {
-            $sections[] = array( 'section' => 'wms', 'title' => 'Written Ministerial Statements' );
+        if (get_http_var('type') == '') {
+            $sections[] = array('section' => 'wms', 'title' => 'Written Ministerial Statements');
         }
         return $sections;
     }
@@ -62,7 +62,7 @@ 
     # speech bar the first (assuming that's the question)
     private $votelinks_so_far = 0;
 
-    protected function generate_votes ($votes, $id, $gid) {
+    protected function generate_votes($votes, $id, $gid) {
         /*
         Returns HTML for the 'Does this answer the question?' links (wrans) in the sidebar.
         $votes = => array (

classes/SectionView/DebatesView.php

Braces +6 added lines, -2 removed lines

@@ -66,7 +66,9 @@ 
     private $first_gid = '';
 
     protected function get_video_html($row, $heading_hpos, $speeches) {
-        if (!$this->first_gid) $this->first_gid = $row['gid'];
+        if (!$this->first_gid) {
+            $this->first_gid = $row['gid'];
+        }
 
         $video_content = '';
         if (!$this->first_video_displayed && $row['video_status']&4 && !($row['video_status']&8)) {
@@ -97,7 +99,9 @@ 
         $adate = $vq->field(0, 'adate');
         $time = $vq->field(0, 'atime');
         $videodb = \MySociety\TheyWorkForYou\Utility\Video::dbConnect();
-        if (!$videodb) return '';
+        if (!$videodb) {
+            return '';
+        }
         $video = \MySociety\TheyWorkForYou\Utility\Video::fromTimestamp($videodb, $adate, $time);
         $start = $video['offset'];
         $out = '';

Spacing +9 added lines, -9 removed lines

@@ -16,7 +16,7 @@ 
         $DEBATELIST = new \DEBATELIST;
         $debates = array();
         $debates['data'] = $DEBATELIST->display('biggest_debates', array('days'=>7, 'num'=>10), 'none');
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $debates['calendar'] = $DEBATELIST->display('calendar', $args, 'none');
         $debates['rssurl'] = $DATA->page_metadata($this_page, 'rss');
 
@@ -26,7 +26,7 @@ 
 
         $WHALLLIST = new \WHALLLIST;
         $whall['data'] = $WHALLLIST->display('biggest_debates', array('days'=>7, 'num'=>10), 'none');
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $whall['calendar'] = $WHALLLIST->display('calendar', $args, 'none');
         $whall['rssurl'] = $DATA->page_metadata($this_page, 'rss');
 
@@ -36,7 +36,7 @@ 
 
         $LORDSDEBATELIST = new \LORDSDEBATELIST;
         $lords['data'] = $LORDSDEBATELIST->display('biggest_debates', array('days'=>7, 'num'=>10), 'none');
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $lords['calendar'] = $LORDSDEBATELIST->display('calendar', $args, 'none');
 
         $lords['rssurl'] = $DATA->page_metadata($this_page, 'rss');
@@ -55,9 +55,9 @@ 
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'debates', 'title' => 'House of Commons' ),
-            array( 'section' => 'lords', 'title' => 'House of Lords' ),
-            array( 'section' => 'whall', 'title' => 'Westminster Hall' )
+            array('section' => 'debates', 'title' => 'House of Commons'),
+            array('section' => 'lords', 'title' => 'House of Lords'),
+            array('section' => 'whall', 'title' => 'Westminster Hall')
         );
     }
 
@@ -69,11 +69,11 @@ 
         if (!$this->first_gid) $this->first_gid = $row['gid'];
 
         $video_content = '';
-        if (!$this->first_video_displayed && $row['video_status']&4 && !($row['video_status']&8)) {
+        if (!$this->first_video_displayed && $row['video_status'] & 4 && !($row['video_status'] & 8)) {
             $video_content = $this->video_sidebar($row, $heading_hpos, $speeches);
             $this->first_video_displayed = true;
         }
-        if (!$video_content && !$this->first_speech_displayed && $row['video_status']&1 && !($row['video_status']&12)) {
+        if (!$video_content && !$this->first_speech_displayed && $row['video_status'] & 1 && !($row['video_status'] & 12)) {
             $video_content = $this->video_advert($row);
             $this->first_speech_displayed = true;
         }
@@ -104,7 +104,7 @@ 
         if ($count > 1) {
             $out .= '<div class="debate__video" id="video_wrap"><div>';
             if ($row['gid'] != $this->first_gid) {
-                $out .= '<p class="video-instructions">This video starts around ' . ($row['hpos']-$heading_hpos) . ' speeches in (<a href="#g' . gid_to_anchor($row['gid']) . '">move there in text</a>)</p>';
+                $out .= '<p class="video-instructions">This video starts around ' . ($row['hpos'] - $heading_hpos) . ' speeches in (<a href="#g' . gid_to_anchor($row['gid']) . '">move there in text</a>)</p>';
             }
         }
         $out .= \MySociety\TheyWorkForYou\Utility\Video::object($video['id'], $start, "$gid_type/$row[gid]");