mysociety / theyworkforyou

www/includes/easyparliament/commentlist.php

Spacing +45 added lines, -45 removed lines

@@ -42,7 +42,7 @@ 
     }
 
 
-    public function display ($view, $args=array(), $format='html') {
+    public function display($view, $args = array(), $format = 'html') {
         // $view is what we're viewing by:
         //	'ep' is all the comments attached to an epobject.
         //	'user' is all the comments written by a user.
@@ -66,7 +66,7 @@ 
 
         } else {
             // Don't have a valid $view;
-            $PAGE->error_message ("You haven't specified a view type.");
+            $PAGE->error_message("You haven't specified a view type.");
             return false;
         }
 
@@ -85,7 +85,7 @@ 
         return true;
     }
 
-    public function render($data, $format='html', $template='comments') {
+    public function render($data, $format = 'html', $template = 'comments') {
         include (INCLUDESPATH."easyparliament/templates/$format/$template.php");
     }
 
@@ -93,21 +93,21 @@ 
         // Get all the data attached to an epobject.
         global $PAGE;
 
-        twfy_debug (get_class($this), "getting data by epobject");
+        twfy_debug(get_class($this), "getting data by epobject");
 
         // What we return.
         $data = array();
         if (!is_numeric($args['epobject_id'])) {
-            $PAGE->error_message ("Sorry, we don't have a valid epobject id");
+            $PAGE->error_message("Sorry, we don't have a valid epobject id");
             return $data;
         }
 
         // For getting the data.
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'user' => true
             ),
-            'where' => array (
+            'where' => array(
                 'comments.epobject_id=' => $args['epobject_id'],
                 #'visible=' => '1'
             ),
@@ -135,13 +135,13 @@ 
         // comments by things in $args?
         global $PAGE;
 
-        twfy_debug (get_class($this), "getting data by user");
+        twfy_debug(get_class($this), "getting data by user");
 
         // What we return.
         $data = array();
 
         if (!is_numeric($args['user_id'])) {
-            $PAGE->error_message ("Sorry, we don't have a valid user id");
+            $PAGE->error_message("Sorry, we don't have a valid user id");
             return $data;
         }
 
@@ -151,13 +151,13 @@ 
             $num = 10;
         }
 
-        if (isset($args['page']) && is_numeric($args['page']) && $args['page']>1) {
+        if (isset($args['page']) && is_numeric($args['page']) && $args['page'] > 1) {
             $page = $args['page'];
         } else {
             $page = 1;
         }
 
-        $limit = $num*($page-1) . ',' . $num;
+        $limit = $num * ($page - 1).','.$num;
 
         // We're getting the most recent comments posted to epobjects.
         // We're grouping them by epobject so we can just link to each hansard thing once.
@@ -193,10 +193,10 @@ 
 
         if ($q->rows() > 0) {
 
-            for ($n=0; $n<$q->rows(); $n++) {
+            for ($n = 0; $n < $q->rows(); $n++) {
 
                 // All the basic stuff...
-                $comments[$n] = array (
+                $comments[$n] = array(
                     'comment_id'		=> $q->field($n, 'comment_id'),
                     'posted'			=> $q->field($n, 'posted'),
                     'total_comments'	=> $q->field($n, 'total_comments'),
@@ -208,7 +208,7 @@ 
                 );
 
                 // Add the URL...
-                $urldata = array (
+                $urldata = array(
                     'major' 		=> $q->field($n, 'major'),
                     'gid'			=> $q->field($n, 'gid'),
                     'comment_id'	=> $q->field($n, 'comment_id'),
@@ -234,14 +234,14 @@ 
 
                 $commentbodies = array();
 
-                for ($n=0; $n<$r->rows(); $n++) {
-                    $commentbodies[ $r->field($n, 'comment_id') ] = $r->field($n, 'body');
+                for ($n = 0; $n < $r->rows(); $n++) {
+                    $commentbodies[$r->field($n, 'comment_id')] = $r->field($n, 'body');
                 }
 
                 // This does rely on both this and the previous query returning
                 // stuff in the same order...
                 foreach ($comments as $n => $commentdata) {
-                    $comments[$n]['body'] = $commentbodies[ $comments[$n]['comment_id'] ];
+                    $comments[$n]['body'] = $commentbodies[$comments[$n]['comment_id']];
                 }
             }
         }
@@ -249,7 +249,7 @@ 
         $data['comments'] = $comments;
         $data['results_per_page'] = $num;
         $data['page'] = $page;
-        $q = $this->db->query('SELECT COUNT(DISTINCT(epobject_id)) AS count FROM comments WHERE visible=1 AND user_id=' . $args['user_id']);
+        $q = $this->db->query('SELECT COUNT(DISTINCT(epobject_id)) AS count FROM comments WHERE visible=1 AND user_id='.$args['user_id']);
         $data['total_results'] = $q->field(0, 'count');
         return $data;
 
@@ -261,7 +261,7 @@ 
         // $args should contain 'num', indicating how many to get.
         // and perhaps pid too, for a particular person
 
-        twfy_debug (get_class($this), "getting data by recent");
+        twfy_debug(get_class($this), "getting data by recent");
 
         // What we return.
         $data = array();
@@ -278,7 +278,7 @@ 
             $page = 1;
         }
 
-        $limit = $num*($page-1) . ',' . $num;
+        $limit = $num * ($page - 1).','.$num;
 
         $where = array(
             'visible=' => '1'
@@ -286,8 +286,8 @@ 
         if (isset($args['pid']) && is_numeric($args['pid'])) {
             $where['person_id='] = $args['pid'];
         }
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'user' => true
             ),
             'where'  => $where,
@@ -305,7 +305,7 @@ 
             $data['pid'] = $args['pid'];
             $q = 'SELECT title, given_name, family_name, lordofname, house FROM member m, person_names p WHERE m.person_id=p.person_id AND p.type="name" AND left_house="9999-12-31" AND m.person_id = :pid';
             $q = $this->db->query($q, array(':pid' => $args['pid']));
-            $data['full_name'] = member_full_name($q->field(0, 'house'), $q->field(0, 'title'), $q->field(0, 'given_name'), $q->field(0, 'family_name'), $q->field(0,'lordofname'));
+            $data['full_name'] = member_full_name($q->field(0, 'house'), $q->field(0, 'title'), $q->field(0, 'given_name'), $q->field(0, 'family_name'), $q->field(0, 'lordofname'));
             $q = 'SELECT COUNT(*) AS count FROM comments,hansard WHERE visible=1 AND comments.epobject_id = hansard.epobject_id and hansard.person_id = :pid';
             $params[':pid'] = $args['pid'];
         } else {
@@ -319,15 +319,15 @@ 
   public function _get_data_by_dates($args) {
     // $args should contain start_date and end_date
 
-        twfy_debug (get_class($this), "getting data by recent");
+        twfy_debug(get_class($this), "getting data by recent");
         $data = array();
         $where = array(
             'visible=' => '1',
             'date(posted)>=' => $args['start_date'],
             'date(posted)<=' => $args['end_date']
         );
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'user' => true
             ),
             'where'  => $where,
@@ -341,7 +341,7 @@ 
     public function _get_data_by_search($args) {
         // $args should contain 'num', indicating how many to get.
 
-        twfy_debug (get_class($this), "getting data by search");
+        twfy_debug(get_class($this), "getting data by search");
 
         // What we return.
         $data = array();
@@ -358,13 +358,13 @@ 
             $page = 1;
         }
 
-        $limit = $num*($page-1) . ',' . $num;
+        $limit = $num * ($page - 1).','.$num;
 
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'user'=> true
             ),
-            'where'  => array (
+            'where'  => array(
                 'comments.body LIKE' => "%$args[s]%"
             ),
             'order' => 'posted DESC',
@@ -391,7 +391,7 @@ 
         // It returns the URL for the comment.
 
         $major 		= $urldata['major'];
-        $gid 		= $urldata['gid'];
+        $gid = $urldata['gid'];
         $comment_id = $urldata['comment_id'];
         $user_id = isset($urldata['user_id']) ? $urldata['user_id'] : false;
 
@@ -405,11 +405,11 @@ 
         $URL = new URL($page);
 
         $gid = fix_gid_from_db($gid); // In includes/utility.php
-        $URL->insert(array('id' => $gid ));
+        $URL->insert(array('id' => $gid));
         if ($user_id) {
             $URL->insert(array('u' => $user_id));
         }
-        $url = $URL->generate() . '#c' . $comment_id;
+        $url = $URL->generate().'#c'.$comment_id;
 
         return $url;
     }
@@ -483,9 +483,9 @@ 
         $limit = isset($input['limit']) ? $input['limit'] : '';
 
         // The fields to fetch from db. 'table' => array ('field1', 'field2').
-        $fieldsarr = array (
-            'comments' => array ('comment_id', 'user_id', 'epobject_id', 'body', 'posted', 'modflagged', 'visible'),
-            'hansard' => array ('major', 'gid')
+        $fieldsarr = array(
+            'comments' => array('comment_id', 'user_id', 'epobject_id', 'body', 'posted', 'modflagged', 'visible'),
+            'hansard' => array('major', 'gid')
         );
 
         // Yes, we need the gid of a comment's associated hansard object
@@ -496,7 +496,7 @@ 
 
         // Add on the stuff for getting a user's details.
         if (isset($amount['user']) && $amount['user'] == true) {
-            $fieldsarr['users'] = array ('firstname', 'lastname', 'user_id');
+            $fieldsarr['users'] = array('firstname', 'lastname', 'user_id');
             // Like doing "FROM comments, users" but it's easier to add
             // an "INNER JOIN..." automatically to the query.
             $join .= ' INNER JOIN users ON comments.user_id = users.user_id ';
@@ -507,7 +507,7 @@ 
             $fieldsarr['epobject'] = array('body');
         }
 
-        $fieldsarr2 = array ();
+        $fieldsarr2 = array();
         // Construct the $fields clause.
         foreach ($fieldsarr as $table => $tablesfields) {
             foreach ($tablesfields as $n => $field) {
@@ -524,7 +524,7 @@ 
         $fields = implode(', ', $fieldsarr2);
 
 
-        $wherearr2 = array ();
+        $wherearr2 = array();
         $params = array();
         $i = 0;
         // Construct the $where clause.
@@ -533,7 +533,7 @@ 
             $params[":where$i"] = $val;
             $i++;
         }
-        $where = implode (" AND ", $wherearr2);
+        $where = implode(" AND ", $wherearr2);
 
         if ($order != '') {
             $order = "ORDER BY $order";
@@ -544,7 +544,7 @@ 
         }
 
         // Finally, do the query!
-        $q = $this->db->query ("SELECT $fields
+        $q = $this->db->query("SELECT $fields
                         FROM 	comments
                         $join
                         WHERE $where
@@ -553,7 +553,7 @@ 
                         ", $params);
 
         // Format the data into an array for returning.
-        $data = array ();
+        $data = array();
 
         if ($q->rows() > 0) {
 
@@ -563,7 +563,7 @@ 
             // We'll generate permalinks for each comment.
             // Assuming every comment is from the same major...
 
-            for ($n=0; $n<$q->rows(); $n++) {
+            for ($n = 0; $n < $q->rows(); $n++) {
 
                 // Put each row returned into its own array in $data.
                 foreach ($fieldsarr as $table => $tablesfields) {

www/includes/easyparliament/searchengine.php

Spacing +36 added lines, -36 removed lines

@@ -46,7 +46,7 @@ 
             if (strstr(XAPIANDB, ":")) {
                 //ini_set('display_errors', 'On');
                 list ($xapian_host, $xapian_port) = explode(":", XAPIANDB);
-                twfy_debug("SEARCH", "Using Xapian remote backend: " . $xapian_host . " port " . $xapian_port);
+                twfy_debug("SEARCH", "Using Xapian remote backend: ".$xapian_host." port ".$xapian_port);
                 $xapiandb_remote = remote_open($xapian_host, intval($xapian_port));
                 $xapiandb = new XapianDatabase($xapiandb_remote);
             } else {
@@ -92,12 +92,12 @@ 
         $this->prefixed = array();
 
         // Split words up into individual words, and quoted phrases
-        preg_match_all('/(' .
-            '"|' . # match either a quote, or...
-            '(?:(?<![' .$this->wordchars. '])-)?' . # optionally a - (exclude)
+        preg_match_all('/('.
+            '"|'.# match either a quote, or...
+            '(?:(?<!['.$this->wordchars.'])-)?'.# optionally a - (exclude)
             # if at start of word (i.e. not preceded by a word character, in
             # which case it is probably a hyphenated-word)
-            '['.$this->wordchars.']+' . # followed by a string of word-characters
+            '['.$this->wordchars.']+'.# followed by a string of word-characters
             ')/', $this->query, $all_words);
         if ($all_words) {
             $all_words = $all_words[0];
@@ -122,8 +122,8 @@ 
             if (strpos($word, ':') !== false) {
                 $items = explode(":", strtolower($word));
                 $type = $items[0];
-                if (substr($type, 0, 1)=='-') $type = substr($type, 1);
-                $value = strtolower(join(":", array_slice($items,1)));
+                if (substr($type, 0, 1) == '-') $type = substr($type, 1);
+                $value = strtolower(join(":", array_slice($items, 1)));
                 if ($type == 'section') {
                     $newv = $value;
                     if ($value == 'debates' || $value == 'debate') $newv = 1;
@@ -135,11 +135,11 @@ 
                     elseif ($value == 'pbc' || $value == 'standing') $newv = 6;
                     elseif ($value == 'sp') $newv = 7;
                     elseif ($value == 'spwrans' || $value == 'spwran') $newv = 8;
-                    elseif ($value == 'uk') $newv = array(1,2,3,4,6,101);
-                    elseif ($value == 'scotland') $newv = array(7,8);
+                    elseif ($value == 'uk') $newv = array(1, 2, 3, 4, 6, 101);
+                    elseif ($value == 'scotland') $newv = array(7, 8);
                     elseif ($value == 'future') $newv = 'F';
                     if (is_array($newv)) {
-                        $newv = 'major:' . join(' major:', $newv);
+                        $newv = 'major:'.join(' major:', $newv);
                     } else {
                         $newv = "major:$newv";
                     }
@@ -179,15 +179,15 @@ 
         # Merged people
         $db = new ParlDB;
         $merged = $db->query('SELECT * FROM gidredirect WHERE gid_from LIKE :gid_from', array(':gid_from' => "uk.org.publicwhip/person/%"));
-        for ($n=0; $n<$merged->rows(); $n++) {
+        for ($n = 0; $n < $merged->rows(); $n++) {
             $from_id = str_replace('uk.org.publicwhip/person/', '', $merged->field($n, 'gid_from'));
             $to_id = str_replace('uk.org.publicwhip/person/', '', $merged->field($n, 'gid_to'));
             $this->query = preg_replace("#speaker:($from_id|$to_id)#i", "(speaker:$from_id OR speaker:$to_id)", $this->query);
         }
 
-        twfy_debug("SEARCH", "prefixed: " . var_export($this->prefixed, true));
+        twfy_debug("SEARCH", "prefixed: ".var_export($this->prefixed, true));
 
-        twfy_debug("SEARCH", "query -- ". $this->query);
+        twfy_debug("SEARCH", "query -- ".$this->query);
         $flags = XapianQueryParser::FLAG_BOOLEAN | XapianQueryParser::FLAG_LOVEHATE |
             XapianQueryParser::FLAG_WILDCARD | XapianQueryParser::FLAG_SPELLING_CORRECTION;
         $flags = $flags | XapianQueryParser::FLAG_PHRASE;
@@ -205,7 +205,7 @@ 
         # Now parse the parsed query back into a query string, yummy
 
         $qd = $query->get_description();
-        twfy_debug("SEARCH", "queryparser original description -- " . $qd);
+        twfy_debug("SEARCH", "queryparser original description -- ".$qd);
         $qd = substr($qd, 14, -1); # Strip Xapian::Query()
         $qd = preg_replace('#:\(.*?\)#', '', $qd); # Don't need pos or weight
         # Date range
@@ -256,11 +256,11 @@ 
                 $iter->next();
             }
             $used[] = $tt;
-            $qd = preg_replace('#' . preg_quote($mm, '#') . '#', $tt, $qd, 1);
+            $qd = preg_replace('#'.preg_quote($mm, '#').'#', $tt, $qd, 1);
         }
 
         # Speakers
-        for ($n=0; $n<$merged->rows(); $n++) {
+        for ($n = 0; $n < $merged->rows(); $n++) {
             $from_id = str_replace('uk.org.publicwhip/person/', '', $merged->field($n, 'gid_from'));
             $to_id = str_replace('uk.org.publicwhip/person/', '', $merged->field($n, 'gid_to'));
             $qd = str_replace("(S$from_id OR S$to_id)", "S$to_id", $qd);
@@ -278,7 +278,7 @@ 
         $qd = preg_replace('#AND_NOT ([a-z0-9"]+)#', '-$1', $qd);
         preg_match_all('#AND_NOT \((.*?)\)#', $qd, $m);
         foreach ($m[1] as $mm) {
-            $mmn = '-' . join(' -', explode(' OR ', $mm));
+            $mmn = '-'.join(' -', explode(' OR ', $mm));
             $qd = str_replace("AND_NOT ($mm)", $mmn, $qd);
         }
 
@@ -297,9 +297,9 @@ 
         $this->query_desc = trim($qd);
 
         #print 'DEBUG: ' . $query->get_description();
-        twfy_debug("SEARCH", "words: " . var_export($this->words, true));
-        twfy_debug("SEARCH", "phrases: " . var_export($this->phrases, true));
-        twfy_debug("SEARCH", "queryparser description -- " . $this->query_desc);
+        twfy_debug("SEARCH", "words: ".var_export($this->words, true));
+        twfy_debug("SEARCH", "phrases: ".var_export($this->phrases, true));
+        twfy_debug("SEARCH", "queryparser description -- ".$this->query_desc);
 
         $this->valid = true;
     }
@@ -339,7 +339,7 @@ 
     }
 
     // Perform partial query to get a count of number of matches
-    public function run_count($first_result, $results_per_page, $sort_order='relevance') {
+    public function run_count($first_result, $results_per_page, $sort_order = 'relevance') {
         if (!defined('XAPIANDB') || !XAPIANDB)
             return null;
 
@@ -412,13 +412,13 @@ 
         #}
 
         $duration = getmicrotime() - $start;
-        twfy_debug ("SEARCH", "Search count took $duration seconds.");
+        twfy_debug("SEARCH", "Search count took $duration seconds.");
 
         return $count;
     }
 
     // Perform the full search...
-    public function run_search($first_result, $results_per_page, $sort_order='relevance') {
+    public function run_search($first_result, $results_per_page, $sort_order = 'relevance') {
         $start = getmicrotime();
 
         #$matches = $this->enquire->get_mset($first_result, $results_per_page);
@@ -445,7 +445,7 @@ 
             $iter->next();
         }
         $duration = getmicrotime() - $start;
-        twfy_debug ("SEARCH", "Run search took $duration seconds.");
+        twfy_debug("SEARCH", "Run search took $duration seconds.");
     }
     // ... use these to get the results
     public function get_gids() {
@@ -510,7 +510,7 @@ 
             if ($hl) {
                 $hlextract .= "<span class=\"hi\">$extractword</span>$endswithamp";
             } else {
-                $hlextract .= $extractword . $endswithamp;
+                $hlextract .= $extractword.$endswithamp;
             }
         }
         $body = preg_replace("#</span>\s+<span class=\"hi\">#", " ", $hlextract);
@@ -547,17 +547,17 @@ 
 
     // Find the position of the first of the search words/phrases in $body.
     public function position_of_first_word($body) {
-        $lcbody = ' ' . html_entity_decode(strtolower($body)) . ' '; // spaces to make regexp mapping easier
+        $lcbody = ' '.html_entity_decode(strtolower($body)).' '; // spaces to make regexp mapping easier
         $pos = -1;
 
         // look for phrases
         foreach ($this->phrases as $phrase) {
             $phrasematch = join($phrase, '[^'.$this->wordchars.']+');
-            if (preg_match('/([^'.$this->wordchars.']' . $phrasematch . '[^A-Za-z0-9])/', $lcbody, $matches))
+            if (preg_match('/([^'.$this->wordchars.']'.$phrasematch.'[^A-Za-z0-9])/', $lcbody, $matches))
             {
-                $wordpos = strpos( $lcbody, $matches[0] );
+                $wordpos = strpos($lcbody, $matches[0]);
                 if ($wordpos) {
-                   if ( ($wordpos < $pos) || ($pos==-1) ) {
+                   if (($wordpos < $pos) || ($pos == -1)) {
                         $pos = $wordpos;
                     }
                 }
@@ -575,7 +575,7 @@ 
             foreach ($stemmed_words as $word) {
                 if ($word == '') continue;
                 $matchword = $this->stem($extractword);
-                if ($matchword == $word && ($wordpos < $pos || $pos==-1)) {
+                if ($matchword == $word && ($wordpos < $pos || $pos == -1)) {
                     $pos = $wordpos;
                 }
             }
@@ -585,10 +585,10 @@ 
 
         foreach ($this->words as $word) {
             if (ctype_digit($word)) $word = '(?:'.$word.'|'.number_format($word).')';
-            if (preg_match('/([^'.$this->wordchars.']' . $word . '[^'.$this->wordchars. '])/', $lcbody, $matches)) {
-                $wordpos = strpos( $lcbody, $matches[0] );
+            if (preg_match('/([^'.$this->wordchars.']'.$word.'[^'.$this->wordchars.'])/', $lcbody, $matches)) {
+                $wordpos = strpos($lcbody, $matches[0]);
                 if ($wordpos) {
-                    if ( ($wordpos < $pos) || ($pos==-1) ) {
+                    if (($wordpos < $pos) || ($pos == -1)) {
                         $pos = $wordpos;
                     }
                 }
@@ -599,10 +599,10 @@ 
 
         foreach ($this->words as $word) {
             if (ctype_digit($word)) $word = '(?:'.$word.'|'.number_format($word).')';
-            if (preg_match('/(' . $word . ')/', $lcbody, $matches)) {
-                $wordpos = strpos( $lcbody, $matches[0] );
+            if (preg_match('/('.$word.')/', $lcbody, $matches)) {
+                $wordpos = strpos($lcbody, $matches[0]);
                 if ($wordpos) {
-                    if ( ($wordpos < $pos) || ($pos==-1) ) {
+                    if (($wordpos < $pos) || ($pos == -1)) {
                         $pos = $wordpos;
                     }
                 }

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

@@ -25,7 +25,7 @@ 
 
 */
 
-if (defined('XAPIANDB') AND XAPIANDB != '') {
+if (defined('XAPIANDB') and XAPIANDB != '') {
     if (file_exists('/usr/share/php/xapian.php')) {
         include_once '/usr/share/php/xapian.php';
     } else {
@@ -263,15 +263,15 @@ 
         for ($n=0; $n<$merged->rows(); $n++) {
             $from_id = str_replace('uk.org.publicwhip/person/', '', $merged->field($n, 'gid_from'));
             $to_id = str_replace('uk.org.publicwhip/person/', '', $merged->field($n, 'gid_to'));
-            $qd = str_replace("(S$from_id OR S$to_id)", "S$to_id", $qd);
-            $qd = str_replace("S$from_id OR S$to_id", "S$to_id", $qd);
+            $qd = str_replace("(S$from_id OR S$to_id)", "s$to_id", $qd);
+            $qd = str_replace("s$from_id OR S$to_id", "s$to_id", $qd);
         }
 
         preg_match_all('#S(\d+)#', $qd, $m);
         foreach ($m[1] as $mm) {
             $member = new MEMBER(array('person_id' => $mm));
             $name = $member->full_name();
-            $qd = str_replace("S$mm", "speaker:$name", $qd);
+            $qd = str_replace("s$mm", "speaker:$name", $qd);
         }
 
         # Simplify display of excluded words

tests/HousesTest.php

Indentation +6 added lines, -6 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,7 +49,7 @@ 
     /**
      * Test that the Assembly for Wales is correctly defined.
      */
-	public function testWalesHouseDefined()
+    public function testWalesHouseDefined()
     {
         $this->assertEquals(5, HOUSE_TYPE_WALES);
     }

classes/Utility/LibFilter.php

Spacing +8 added lines, -8 removed lines

@@ -155,7 +155,7 @@ 
     public function escape_comments($data) {
 
         $data = preg_replace_callback("/<!--(.*?)-->/s", function($matches) {
-                return '<!--' . HtmlSpecialChars($this->StripSingle($matches[1])) . '-->';
+                return '<!--'.HtmlSpecialChars($this->StripSingle($matches[1])).'-->';
             }, $data);
 
         return $data;
@@ -209,7 +209,7 @@ 
             }, $data);
 
         foreach (array_keys($this->tag_counts) as $tag) {
-            for ($i=0; $i<$this->tag_counts[$tag]; $i++) {
+            for ($i = 0; $i < $this->tag_counts[$tag]; $i++) {
                 $data .= "</$tag>";
             }
         }
@@ -244,9 +244,9 @@ 
             $ending = $matches[3];
             if (in_array($name, array_keys($this->allowed))) {
                 $params = "";
-                preg_match_all("/([a-z0-9]+)=([\"'])(.*?)\\2/si", $body, $matches_2, PREG_SET_ORDER);		# <foo a="b" />
-                preg_match_all("/([a-z0-9]+)(=)([^\"\s']+)/si", $body, $matches_1, PREG_SET_ORDER);		# <foo a=b />
-                preg_match_all("/([a-z0-9]+)=([\"'])([^\"']*?)\s*$/si", $body, $matches_3, PREG_SET_ORDER);	# <foo a="b />
+                preg_match_all("/([a-z0-9]+)=([\"'])(.*?)\\2/si", $body, $matches_2, PREG_SET_ORDER); # <foo a="b" />
+                preg_match_all("/([a-z0-9]+)(=)([^\"\s']+)/si", $body, $matches_1, PREG_SET_ORDER); # <foo a=b />
+                preg_match_all("/([a-z0-9]+)=([\"'])([^\"']*?)\s*$/si", $body, $matches_3, PREG_SET_ORDER); # <foo a="b />
                 $matches = array_merge($matches_1, $matches_2, $matches_3);
 
                 foreach ($matches as $match) {
@@ -302,7 +302,7 @@ 
 
         if (preg_match("/^([^:]+)\:/si", $data, $matches)) {
             if (!in_array($matches[1], $this->allowed_protocols)) {
-                $data = '#'.substr($data, strlen($matches[1])+1);
+                $data = '#'.substr($data, strlen($matches[1]) + 1);
             }
         }
 
@@ -352,7 +352,7 @@ 
         # if there are less than 5, just allow it as-is
         #
 
-        if (strlen($data_notags)<5) {
+        if (strlen($data_notags) < 5) {
             return $data;
         }
 
@@ -562,7 +562,7 @@ 
     # inside strings. within general text, we decode hex/dec entities.
     #
 
-    public function decode_entities($data, $in_attribute=1) {
+    public function decode_entities($data, $in_attribute = 1) {
 
         $data = preg_replace_callback('!(&)#(\d+);?!', array($this, 'decode_dec_entity'), $data);
         $data = preg_replace_callback('!(&)#x([0-9a-f]+);?!i', array($this, 'decode_hex_entity'), $data);

Braces +3 added lines, -1 removed lines

@@ -324,7 +324,9 @@
             while (1) {
                 $len = strlen($data);
                 $data = preg_replace("/<({$tags})(\s[^>]*)?(><\\/\\1>|\\/>)/", '', $data);
-                if ($len == strlen($data)) break;
+                if ($len == strlen($data)) {
+                    break;
+                }
             }
         }
 

classes/Data.php

Doc Comments +3 added lines

@@ -159,6 +159,9 @@
         }
     }
 
+    /**
+     * @param string $type
+     */
     private function getMetadata($args="", $type) {
         // $type is either 'page' or 'section'
         global $this_page, $this_section;

Spacing +9 added lines, -9 removed lines

@@ -54,7 +54,7 @@ 
 
     public function __construct() {
 
-        include_once METADATAPATH;	// defined in config.php
+        include_once METADATAPATH; // defined in config.php
 
     }
 
@@ -114,7 +114,7 @@ 
      */
 
     public function set_page_metadata($page, $key, $value) {
-        $this->setMetadata(array("page"=>$page,"key"=>$key,"value"=>$value));
+        $this->setMetadata(array("page"=>$page, "key"=>$key, "value"=>$value));
     }
 
     /**
@@ -126,7 +126,7 @@ 
      */
 
     public function set_section_metadata($section, $key, $value) {
-        $this->setMetadata(array("section"=>$section,"key"=>$key,"value"=>$value));
+        $this->setMetadata(array("section"=>$section, "key"=>$key, "value"=>$value));
     }
 
     /**
@@ -150,7 +150,7 @@ 
      */
 
     public function test_for_metadata($type, $item, $key) {
-        $dataarray =& $this->$type;
+        $dataarray = & $this->$type;
 
         if (isset($dataarray[$item][$key])) {
             return true;
@@ -159,7 +159,7 @@ 
         }
     }
 
-    private function getMetadata($args="", $type) {
+    private function getMetadata($args = "", $type) {
         // $type is either 'page' or 'section'
         global $this_page, $this_section;
 
@@ -173,7 +173,7 @@ 
         }
 
         twfy_debug("DATA", "$type: $item, $key");
-        $dataarray =& $this->$type;
+        $dataarray = & $this->$type;
 
         if ($this->test_for_metadata($type, $item, $key)) {
             $return = $dataarray[$item][$key];
@@ -188,7 +188,7 @@ 
             $debugtext = "No metadata found for key '$key'";
         }
 
-        twfy_debug("DATA", "$debugtext, returning '" . (is_scalar($return) ? $return : gettype($return)) . "'.");
+        twfy_debug("DATA", "$debugtext, returning '".(is_scalar($return) ? $return : gettype($return))."'.");
 
         return $return;
     }
@@ -206,9 +206,9 @@ 
         $key = $args["key"];
         $value = $args["value"];
 
-        twfy_debug("DATA", "Setting: ".$type."[".$item."][".$key."] = '" . print_r($value, 1) . "'");
+        twfy_debug("DATA", "Setting: ".$type."[".$item."][".$key."] = '".print_r($value, 1)."'");
 
-        $dataarray =& $this->$type;
+        $dataarray = & $this->$type;
         $dataarray[$item][$key] = $value;
     }
 

classes/Db/Query.php

Doc Comments +12 added lines

@@ -175,6 +175,11 @@ 
     }
 
     // After SELECT.
+
+    /**
+     * @param integer $row_index
+     * @param string $column_name
+     */
     public function field($row_index, $column_name) {
         if ($this->rows > 0)
             return $this->data[$row_index][$column_name];
@@ -187,6 +192,10 @@ 
     }
 
     // After SELECT.
+
+    /**
+     * @param integer $row_index
+     */
     public function row($row_index) {
         if ($this->success && $this->rows > 0)
             return $this->data[$row_index];
@@ -224,6 +233,9 @@ 
         return $html;
     }
 
+    /**
+     * @param string $errormsg
+     */
     public function error($errormsg) {
         // When a query goes wrong...
         $this->success = false;

Indentation -1 removed lines

@@ -72,7 +72,6 @@
  * - `$this->field(n,col)` returns an empty string.
  * - `$this->insert_id()` returns `null`.
  * - `$this->affected_rows()` returns `null`.
-
  */
 
 class Query {

Spacing +8 added lines, -8 removed lines

@@ -87,7 +87,7 @@ 
         $this->conn = $conn;
     }
 
-    public function query($sql="", $params = NULL) {
+    public function query($sql = "", $params = NULL) {
 
         if (empty($sql)) {
             $this->success = false;
@@ -101,8 +101,8 @@ 
             return;
         }
 
-        twfy_debug ("SQL", $sql);
-        twfy_debug ("SQL", print_r($params, 1));
+        twfy_debug("SQL", $sql);
+        twfy_debug("SQL", print_r($params, 1));
 
         if ($params !== NULL) {
             // Prepare and execute a statement
@@ -128,12 +128,12 @@ 
 
         // Test the query actually worked
         if (!$pdoStatement) {
-            $this->error($this->conn->errorCode() . ': ' . $this->conn->errorInfo()[2]);
+            $this->error($this->conn->errorCode().': '.$this->conn->errorInfo()[2]);
         }
 
         if (!$this->success) return;
 
-        if ( (!$pdoStatement) or (empty($pdoStatement)) ) {
+        if ((!$pdoStatement) or (empty($pdoStatement))) {
             // A failed query.
             $this->success = false;
 
@@ -155,7 +155,7 @@ 
             }
             $this->affected_rows = $pdoStatement->rowCount();
 
-            twfy_debug ("SQLRESULT", array($this, 'displayResult'));
+            twfy_debug("SQLRESULT", array($this, 'displayResult'));
             // mysql_free_result($q);
         }
     }
@@ -202,7 +202,7 @@ 
             $html .= "<table border=\"1\">\n<tr>\n";
 
             foreach (array_keys($this->data[0]) as $fieldname) {
-                $html .= "<th>" . _htmlentities($fieldname) . "</th>";
+                $html .= "<th>"._htmlentities($fieldname)."</th>";
             }
             $html .= "</tr>\n";
 
@@ -213,7 +213,7 @@ 
                         // Don't want to risk this data being displayed on any page.
                         $html .= "<td>**MASKED**</td>";
                     } else {
-                        $html .= "<td>" . _htmlentities($field) . "</td>";
+                        $html .= "<td>"._htmlentities($field)."</td>";
                     }
                 }
                 $html .= "</tr>\n";

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

@@ -78,16 +78,16 @@ 
 class Query {
 
     public $success = true;
-    public $rows = NULL;
+    public $rows = null;
     public $data = array();
-    public $insert_id = NULL;
-    public $affected_rows = NULL;
+    public $insert_id = null;
+    public $affected_rows = null;
 
     public function __construct($conn) {
         $this->conn = $conn;
     }
 
-    public function query($sql="", $params = NULL) {
+    public function query($sql="", $params = null) {
 
         if (empty($sql)) {
             $this->success = false;
@@ -104,7 +104,7 @@ 
         twfy_debug ("SQL", $sql);
         twfy_debug ("SQL", print_r($params, 1));
 
-        if ($params !== NULL) {
+        if ($params !== null) {
             // Prepare and execute a statement
             $pdoStatement = $this->conn->prepare($sql);
 

classes/Db/Connection.php

Doc Comments +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
      * @param string $db_pass The password for the database user
      * @param string $db_name The name of the database
      *
-     * @return true If the connection has been created successfully.
+     * @return boolean If the connection has been created successfully.
      */
 
     public function init($db_host, $db_user, $db_pass, $db_name) {

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
         // These vars come from config.php.
 
         if (!$global_connection) {
-            $dsn = 'mysql:charset=utf8;dbname=' . $db_name . ';host=' . $db_host;
+            $dsn = 'mysql:charset=utf8;dbname='.$db_name.';host='.$db_host;
 
             try {
                 $conn = new \PDO($dsn, $db_user, $db_pass);
@@ -111,7 +111,7 @@ 
         $duration = getmicrotime() - $start;
         global $mysqltotalduration;
         $mysqltotalduration += $duration;
-        twfy_debug ("SQL", "Complete after $duration seconds.");
+        twfy_debug("SQL", "Complete after $duration seconds.");
         // We could also output $q->mysql_info() here, but that's for
         // PHP >= 4.3.0.
         return $q;
@@ -126,7 +126,7 @@ 
 
     public function display_total_duration() {
         global $mysqltotalduration;
-        twfy_debug ("TIME", "Total time for MySQL queries on this page: " . $mysqltotalduration . " seconds.");
+        twfy_debug("TIME", "Total time for MySQL queries on this page: ".$mysqltotalduration." seconds.");
     }
 
     /**

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

@@ -102,7 +102,7 @@
      * @return Query An object containing the results of the query.
      */
 
-    public function query($sql, $params = NULL) {
+    public function query($sql, $params = null) {
 
         $start = getmicrotime();
         $q = new \MySociety\TheyWorkForYou\Db\Query($this->conn);

www/includes/easyparliament/init.php

Spacing +19 added lines, -19 removed lines

@@ -4,7 +4,7 @@ 
 First some things to help make our PHP nicer and betterer
 ********************************************************************************/
 
-error_reporting (E_ALL);
+error_reporting(E_ALL);
 
 /********************************************************************************
 Now some constants that are the same for live and dev versions
@@ -12,36 +12,36 @@ 
 ********************************************************************************/
 
 // In case we need to switch these off globally at some point...
-define ("ALLOWCOMMENTS", true);
-define ("ALLOWTRACKBACKS", true);
+define("ALLOWCOMMENTS", true);
+define("ALLOWTRACKBACKS", true);
 
 // These variables are so we can keep date/time formats consistent across the site
 // and change them easily.
 // Formats here: http://www.php.net/manual/en/function.date.php
-define ("LONGERDATEFORMAT",		"l, j F Y");// Monday, 31 December 2003
-define ("LONGDATEFORMAT", 		"j F Y"); 	// 31 December 2003
-define ("SHORTDATEFORMAT", 		"j M Y");	// 31 Dec 2003
-define ("TIMEFORMAT", 			"g:i a");	// 11:59 pm
+define("LONGERDATEFORMAT", "l, j F Y"); // Monday, 31 December 2003
+define("LONGDATEFORMAT", "j F Y"); // 31 December 2003
+define("SHORTDATEFORMAT", "j M Y"); // 31 Dec 2003
+define("TIMEFORMAT", "g:i a"); // 11:59 pm
 
-define ("SHORTDATEFORMAT_SQL",	"%e %b %Y"); // 31 Dec 2003
-define ("TIMEFORMAT_SQL", 		"%l:%i %p"); // 11:59 PM
+define("SHORTDATEFORMAT_SQL", "%e %b %Y"); // 31 Dec 2003
+define("TIMEFORMAT_SQL", "%l:%i %p"); // 11:59 PM
 
 // Where we store the postcode of users if they search for an MP by postcode.
-define ('POSTCODE_COOKIE', 		'eppc');
+define('POSTCODE_COOKIE', 'eppc');
 
 /********************************************************************************
 And now all the files we'll include on every page.
 ********************************************************************************/
 
 // The Composer autoloader, which also handles our internal autoloading magic.
-require_once dirname(__FILE__) . '/../../../vendor/autoload.php';
+require_once dirname(__FILE__).'/../../../vendor/autoload.php';
 
-include_once dirname(__FILE__) . '/../../../conf/general';
-include_once INCLUDESPATH . 'utility.php';
+include_once dirname(__FILE__).'/../../../conf/general';
+include_once INCLUDESPATH.'utility.php';
 twfy_debug_timestamp("after including utility.php");
 
 // Set the default timezone
-if(function_exists('date_default_timezone_set')) date_default_timezone_set(TIMEZONE);
+if (function_exists('date_default_timezone_set')) date_default_timezone_set(TIMEZONE);
 
 // Only do clever things with errors if we're not testing, otherwise show as default
 
@@ -70,18 +70,18 @@ 
 
 // The time the page starts, so we can display the total at the end.
 // getmicrotime() is in utiltity.php.
-define ("STARTTIME", getmicrotime());
+define("STARTTIME", getmicrotime());
 if (!isset($_SERVER['WINDIR'])) {
     $rusage = getrusage();
-    define ('STARTTIMES', $rusage['ru_stime.tv_sec']*1000000 + $rusage['ru_stime.tv_usec']);
-    define ('STARTTIMEU', $rusage['ru_utime.tv_sec']*1000000 + $rusage['ru_utime.tv_usec']);
+    define('STARTTIMES', $rusage['ru_stime.tv_sec'] * 1000000 + $rusage['ru_stime.tv_usec']);
+    define('STARTTIMEU', $rusage['ru_utime.tv_sec'] * 1000000 + $rusage['ru_utime.tv_usec']);
 }
 
 $DATA = new \MySociety\TheyWorkForYou\Data;
 
 class ParlDB extends \MySociety\TheyWorkForYou\Db\Connection {
     public function __construct() {
-        $this->init (OPTION_TWFY_DB_HOST, OPTION_TWFY_DB_USER, OPTION_TWFY_DB_PASS, OPTION_TWFY_DB_NAME);
+        $this->init(OPTION_TWFY_DB_HOST, OPTION_TWFY_DB_USER, OPTION_TWFY_DB_PASS, OPTION_TWFY_DB_NAME);
     }
 }
 
@@ -92,7 +92,7 @@ 
 include_once (INCLUDESPATH."easyparliament/user.php");
 
 // Test to see if this is a new-style template using the renderer class.
-if (! isset($new_style_template) OR $new_style_template !== TRUE) {
+if (!isset($new_style_template) OR $new_style_template !== TRUE) {
 
     // This is an old-style page. Use the old page classes.
     include_once (INCLUDESPATH."easyparliament/page.php");

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

@@ -92,7 +92,7 @@
 include_once (INCLUDESPATH."easyparliament/user.php");
 
 // Test to see if this is a new-style template using the renderer class.
-if (! isset($new_style_template) OR $new_style_template !== TRUE) {
+if (! isset($new_style_template) or $new_style_template !== true) {
 
     // This is an old-style page. Use the old page classes.
     include_once (INCLUDESPATH."easyparliament/page.php");