mysociety / theyworkforyou

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 +11 added lines, -11 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;
 
@@ -167,21 +167,21 @@ 
             $item = $args[$type];
             $key = $args['key'];
         } else {
-            $var = "this_".$type;
+            $var = "this_" . $type;
             $item = $$var; // $this_page or $this_section.
             $key = $args;
         }
 
         twfy_debug("DATA", "$type: $item, $key");
-        $dataarray =& $this->$type;
+        $dataarray = & $this->$type;
 
         if ($this->test_for_metadata($type, $item, $key)) {
             $return = $dataarray[$item][$key];
-            $debugtext = "Key: ".$type."[".$item."][".$key."]";
+            $debugtext = "Key: " . $type . "[" . $item . "][" . $key . "]";
 
         } elseif ($this->test_for_metadata($type, "default", $key)) {
             $return = $dataarray["default"][$key];
-            $debugtext = "Key: ".$type."['default'][".$key."]";
+            $debugtext = "Key: " . $type . "['default'][" . $key . "]";
 
         } else {
             $return = false;
@@ -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;
     }
 

Braces +12 added lines, -6 removed lines

@@ -121,7 +121,8 @@ 
     public function metadata($type, $item, $key) {
         if ($this->test_for_metadata($type, $item, $key)) {
             return $this->$type[$item][$key];
-        } else {
+        }
+        else {
             return "INVALID METADATA: $type[$item][$key]";
         }
     }
@@ -135,7 +136,8 @@ 
 
         if (isset($dataarray[$item][$key])) {
             return true;
-        } else {
+        }
+        else {
             return false;
         }
     }
@@ -152,7 +154,8 @@ 
         if (is_array($args)) {
             $item = $args[$type];
             $key = $args['key'];
-        } else {
+        }
+        else {
             $var = "this_".$type;
             $item = $$var; // $this_page or $this_section.
             $key = $args;
@@ -165,11 +168,13 @@ 
             $return = $dataarray[$item][$key];
             $debugtext = "Key: ".$type."[".$item."][".$key."]";
 
-        } elseif ($this->test_for_metadata($type, "default", $key)) {
+        }
+        elseif ($this->test_for_metadata($type, "default", $key)) {
             $return = $dataarray["default"][$key];
             $debugtext = "Key: ".$type."['default'][".$key."]";
 
-        } else {
+        }
+        else {
             $return = false;
             $debugtext = "No metadata found for key '$key'";
         }
@@ -184,7 +189,8 @@ 
         if (isset($args["section"])) {
             $type = "section";
             $item = $args["section"];
-        } else {
+        }
+        else {
             $type = "page";
             $item = $args["page"];
         }

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 {

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

Spacing +5 added lines, -5 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
@@ -133,7 +133,7 @@ 
 
         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);
         }
     }

Braces +19 added lines, -10 removed lines

@@ -112,7 +112,8 @@ 
 
                 if (is_int($paramValue)) {
                     $paramType = \PDO::PARAM_INT;
-                } else {
+                }
+                else {
                     $paramType = \PDO::PARAM_STR;
                 }
 
@@ -121,7 +122,8 @@ 
 
             $pdoStatement->execute();
 
-        } else {
+        }
+        else {
             // Execute the raw query
             $pdoStatement = $this->conn->query($sql);
         }
@@ -131,13 +133,16 @@ 
             $this->error($this->conn->errorCode() . ': ' . $this->conn->errorInfo()[2]);
         }
 
-        if (!$this->success) return;
+        if (!$this->success) {
+            return;
+        }
 
         if ( (!$pdoStatement) or (empty($pdoStatement)) ) {
             // A failed query.
             $this->success = false;
 
-        } else {
+        }
+        else {
 
             // A successful SELECT, SHOW, EXPLAIN or DESCRIBE query.
             $this->success = true;
@@ -150,7 +155,8 @@ 
             // Sanity check that lastInsertId() is actually a number, otherwise panic
             if (is_numeric($this->conn->lastInsertId())) {
                 $this->insert_id = (int) $this->conn->lastInsertId();
-            } else {
+            }
+            else {
                 throw new Exception('Last connection ID was not numeric!');
             }
             $this->affected_rows = $pdoStatement->rowCount();
@@ -176,8 +182,9 @@ 
 
     // After SELECT.
     public function field($row_index, $column_name) {
-        if ($this->rows > 0)
-            return $this->data[$row_index][$column_name];
+        if ($this->rows > 0) {
+                    return $this->data[$row_index][$column_name];
+        }
         return "";
     }
 
@@ -188,8 +195,9 @@ 
 
     // After SELECT.
     public function row($row_index) {
-        if ($this->success && $this->rows > 0)
-            return $this->data[$row_index];
+        if ($this->success && $this->rows > 0) {
+                    return $this->data[$row_index];
+        }
         return array();
     }
 
@@ -212,7 +220,8 @@ 
                     if ($n == "email" || $n == "password" || $n == "postcode") {
                         // Don't want to risk this data being displayed on any page.
                         $html .= "<td>**MASKED**</td>";
-                    } else {
+                    }
+                    else {
                         $html .= "<td>" . _htmlentities($field) . "</td>";
                     }
                 }

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) {

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

Spacing +2 added lines, -2 removed lines

@@ -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.");
     }
 
     /**

www/includes/easyparliament/init.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");

Braces +7 added lines, -3 removed lines

@@ -41,7 +41,9 @@ 
 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
 
@@ -51,7 +53,8 @@ 
     $error_level = E_ALL & ~E_NOTICE;
     if (DEVSITE) {
         $error_level = E_ALL | E_STRICT;
-    } elseif (version_compare(phpversion(), "5.3") >= 0) {
+    }
+    elseif (version_compare(phpversion(), "5.3") >= 0) {
         $error_level = $error_level & ~E_DEPRECATED;
     }
 
@@ -62,7 +65,8 @@ 
         $whoops = new \Whoops\Run;
         $whoops->pushHandler(new \Whoops\Handler\PrettyPageHandler);
         $whoops->register();
-    } else {
+    }
+    else {
         set_exception_handler("exception_handler");
     }
 

Spacing +24 added lines, -24 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,22 +12,22 @@ 
 ********************************************************************************/
 
 // 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.
@@ -41,7 +41,7 @@ 
 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,40 +70,40 @@ 
 
 // 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);
     }
 }
 
 $filter = new \MySociety\TheyWorkForYou\Utility\LibFilter;
 
-include_once (INCLUDESPATH."easyparliament/user.php");
+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");
+    include_once (INCLUDESPATH . "easyparliament/page.php");
 
 }
 
-include_once (INCLUDESPATH."easyparliament/hansardlist.php");
-include_once (INCLUDESPATH."dbtypes.php");
-include_once (INCLUDESPATH."easyparliament/commentlist.php");
-include_once (INCLUDESPATH."easyparliament/comment.php");
-include_once (INCLUDESPATH."easyparliament/trackback.php");
+include_once (INCLUDESPATH . "easyparliament/hansardlist.php");
+include_once (INCLUDESPATH . "dbtypes.php");
+include_once (INCLUDESPATH . "easyparliament/commentlist.php");
+include_once (INCLUDESPATH . "easyparliament/comment.php");
+include_once (INCLUDESPATH . "easyparliament/trackback.php");
 
 // Added in as new module by Richard Allan MP
-include_once (INCLUDESPATH."easyparliament/alert.php");
+include_once (INCLUDESPATH . "easyparliament/alert.php");
 
 twfy_debug_timestamp("at end of init.php");

www/includes/easyparliament/templates/html/calendar_date.php

Braces +6 added lines, -3 removed lines

@@ -18,10 +18,13 @@
 # Content goes here
 foreach ($data['dates'] as $date => $day_events) {
     foreach ($order as $i => $chamber) {
-        if (!array_key_exists($chamber, $day_events))
-            continue;
+        if (!array_key_exists($chamber, $day_events)) {
+                    continue;
+        }
         $events = $day_events[$chamber];
-        if ($plural[$i]) $chamber .= 's';
+        if ($plural[$i]) {
+            $chamber .= 's';
+        }
         print "<h2 class='calendar'>$chamber";
         if (in_array($major[$i], $data['majors'])) {
             $URL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$major[$i]]['page_all']);

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
         print "<h2 class='calendar'>$chamber";
         if (in_array($major[$i], $data['majors'])) {
             $URL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$major[$i]]['page_all']);
-            $URL->insert( array( 'd' => $date ) );
+            $URL->insert(array('d' => $date));
             print ' &nbsp; <a href="' . $URL->generate() . '">See this day &rarr;</a>';
         }
         print "</h2>\n";

www/includes/easyparliament/templates/html/comments_recent.php

Braces +6 added lines, -2 removed lines

@@ -18,7 +18,9 @@ 
     }
     $PAGE->block_start(array('id'=>'recentcomments', 'title'=>$title));
 
-    if ($this_page != 'home') $PAGE->page_links($data);
+    if ($this_page != 'home') {
+        $PAGE->page_links($data);
+    }
     $USERURL = new \MySociety\TheyWorkForYou\Url('userview');
     ?>
                         <ul>
@@ -50,7 +52,9 @@ 
                         <p><a href="<?php echo $MOREURL->generate(); ?>#c<?php echo count($data['comments'])+1; ?>">See more annotations posted recently</a></p>
 <?php
     }
-    if ($this_page != 'home') $PAGE->page_links($data);
+    if ($this_page != 'home') {
+        $PAGE->page_links($data);
+    }
     $PAGE->block_end();
 }
 ?>

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
         $date = format_date($date, SHORTDATEFORMAT);
         $time = format_time($time, TIMEFORMAT);
 
-        $count = $n+1;
+        $count = $n + 1;
 
         $USERURL->insert(array('u'=>$comment['user_id']));
 
@@ -47,7 +47,7 @@ 
     if ($this_page == 'home') {
         $MOREURL = new \MySociety\TheyWorkForYou\Url('comments_recent');
         ?>
-                        <p><a href="<?php echo $MOREURL->generate(); ?>#c<?php echo count($data['comments'])+1; ?>">See more annotations posted recently</a></p>
+                        <p><a href="<?php echo $MOREURL->generate(); ?>#c<?php echo count($data['comments']) + 1; ?>">See more annotations posted recently</a></p>
 <?php
     }
     if ($this_page != 'home') $PAGE->page_links($data);

classes/Search/Normal.php

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

Braces +19 added lines, -9 removed lines

@@ -57,7 +57,8 @@ 
         $sort_order = 'newest';
         if ( $args['o'] == 'o' ) {
             $sort_order = 'oldest';
-        } else if ( $args['o'] == 'r' ) {
+        }
+        else if ( $args['o'] == 'r' ) {
             $sort_order = 'relevance';
         }
 
@@ -71,7 +72,8 @@ 
 
         if (!$SEARCHENGINE->valid) {
             return array('error' => $SEARCHENGINE->error);
-        } else {
+        }
+        else {
             $LIST = new \HANSARDLIST();
             $data = $LIST->display('search', $args , 'none');
             $data['search_type'] = 'normal';
@@ -89,7 +91,8 @@ 
     private function find_constituency($args) {
         if ($args['s'] != '') {
             $searchterm = $args['s'];
-        } else {
+        }
+        else {
             return false;
         }
 
@@ -114,20 +117,23 @@ 
                 $cons[] = $MEMBER;
                 if ( $MEMBER->current_member(1) ) {
                     $mp_types['mp']++;
-                } else {
+                }
+                else {
                     $mp_types['former']++;
                 }
             } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
                 $cons = array();
             }
-        } elseif (count($constituencies)) {
+        }
+        elseif (count($constituencies)) {
             foreach ($constituencies as $constituency) {
                 try {
                     $MEMBER = new \MySociety\TheyWorkForYou\Member(array('constituency'=>$constituency, 'house' => 1));
                     $cons[] = $MEMBER;
                     if ( $MEMBER->current_member(1) ) {
                         $mp_types['mp']++;
-                    } else {
+                    }
+                    else {
                         $mp_types['former']++;
                     }
                 } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
@@ -141,7 +147,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();
 
@@ -195,7 +203,8 @@ 
 
             if ($n > 1) {
                 $url->insert(array('p'=>$n));
-            } else {
+            }
+            else {
                 // No page number for the first page.
                 $url->remove(array('p'));
             }
@@ -229,7 +238,8 @@ 
             if ($page < 10) {
                 $firstpage = 1;
                 $lastpage = 10;
-            } else {
+            }
+            else {
                 $firstpage = $page - 4;
                 $lastpage = $page + 5;
             }

classes/Url.php

Doc Comments +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
     /**
      * Remove Session Key/Value Pair
      *
-     * @param array $arr A list array of key names to remove
+     * @param string[] $arr A list array of key names to remove
      */
 
     public function remove($arr) {

Spacing +4 added lines, -4 removed lines

@@ -42,7 +42,7 @@ 
 
         // These stores an associative array of key/value pairs that
         // we'll want passed on to other pages.
-        $this->session_vars = array ();
+        $this->session_vars = array();
 
         // Prevent things using $DATA running if it hasn't been set, ie in testing
         if (isset($DATA)) {
@@ -93,7 +93,7 @@ 
 
     public function reset() {
         // Call this to remove all the session_vars.
-        $this->session_vars = array ();
+        $this->session_vars = array();
     }
 
     /**
@@ -162,11 +162,11 @@ 
      *                            override just one or two of them.
      */
 
-    public function generate($encode = "html", $overrideVars=array()) {
+    public function generate($encode = "html", $overrideVars = array()) {
 
         global $DATA;
 
-        $url_args = array ();
+        $url_args = array();
 
         foreach (array_merge($this->session_vars, $overrideVars) as $key => $var) {
             if (is_array($var)) {

Braces +8 added lines, -4 removed lines

@@ -173,18 +173,22 @@
                 foreach ($var as $v) {
                     $url_args[] = "$key=" . urlencode(stripslashes($v));
                 }
-            } elseif ($var != null)
-                $url_args[] = "$key=" . urlencode(stripslashes($var));
+            }
+            elseif ($var != null) {
+                            $url_args[] = "$key=" . urlencode(stripslashes($var));
+            }
         }
 
         $page_url = WEBPATH . $DATA->page_metadata($this->destinationpage, "url");
 
         if (sizeof($url_args) == 0) {
             return $page_url;
-        } else {
+        }
+        else {
             if ($encode == "html") {
                 return $page_url . "?" . implode("&", $url_args);
-            } elseif ($encode == "none" || $encode == "url") {
+            }
+            elseif ($encode == "none" || $encode == "url") {
                 return $page_url . "?" . implode("&", $url_args);
             }
         }

classes/Memcache.php

Spacing +4 added lines, -4 removed lines

@@ -26,9 +26,9 @@ 
 
     public function set($key, $value, $timeout = 3600) {
         if (class_exists('\Memcached')) {
-            self::$memcache->set(OPTION_TWFY_DB_NAME.':'.$key, $value, $timeout);
+            self::$memcache->set(OPTION_TWFY_DB_NAME . ':' . $key, $value, $timeout);
         } else {
-            self::$memcache->set(OPTION_TWFY_DB_NAME.':'.$key, $value, MEMCACHE_COMPRESSED, $timeout);
+            self::$memcache->set(OPTION_TWFY_DB_NAME . ':' . $key, $value, MEMCACHE_COMPRESSED, $timeout);
         }
     }
 
@@ -36,9 +36,9 @@ 
         // see http://php.net/manual/en/memcache.get.php#112056 for explanation of this
         $was_found = false;
         if (class_exists('\Memcached')) {
-            $value = self::$memcache->get(OPTION_TWFY_DB_NAME.':'.$key, null, $was_found);
+            $value = self::$memcache->get(OPTION_TWFY_DB_NAME . ':' . $key, null, $was_found);
         } else {
-            $value = self::$memcache->get(OPTION_TWFY_DB_NAME.':'.$key, $was_found);
+            $value = self::$memcache->get(OPTION_TWFY_DB_NAME . ':' . $key, $was_found);
         }
         if ($was_found === false) {
             return false; // mmmmm

Braces +8 added lines, -4 removed lines

@@ -17,7 +17,8 @@ 
             if (class_exists('\Memcached')) {
                 self::$memcache = new \Memcached;
                 self::$memcache->addServer('localhost', 11211);
-            } else {
+            }
+            else {
                 self::$memcache = new \Memcache;
                 self::$memcache->connect('localhost', 11211);
             }
@@ -27,7 +28,8 @@ 
     public function set($key, $value, $timeout = 3600) {
         if (class_exists('\Memcached')) {
             self::$memcache->set(OPTION_TWFY_DB_NAME.':'.$key, $value, $timeout);
-        } else {
+        }
+        else {
             self::$memcache->set(OPTION_TWFY_DB_NAME.':'.$key, $value, MEMCACHE_COMPRESSED, $timeout);
         }
     }
@@ -37,12 +39,14 @@ 
         $was_found = false;
         if (class_exists('\Memcached')) {
             $value = self::$memcache->get(OPTION_TWFY_DB_NAME.':'.$key, null, $was_found);
-        } else {
+        }
+        else {
             $value = self::$memcache->get(OPTION_TWFY_DB_NAME.':'.$key, $was_found);
         }
         if ($was_found === false) {
             return false; // mmmmm
-        } else {
+        }
+        else {
             return $value;
         }
     }