mysociety / theyworkforyou

classes/SectionView/PbcView.php

Spacing +6 added lines, -6 removed lines

@@ -42,12 +42,12 @@ 
 
         if ($bill_id && $id) {
             return $this->display_section_or_speech(array(
-                'gid' => $standingprefix . $id,
+                'gid' => $standingprefix.$id,
             ));
         } elseif ($bill_id) {
             # Display the page for a particular bill
             $this_page = 'pbc_bill';
-            $args = array (
+            $args = array(
                 'id' => $bill_id,
                 'title' => $this->bill,
                 'session' => $this->session,
@@ -60,13 +60,13 @@ 
         } elseif ($this->session && $this->bill) {
             # Illegal bill title, redirect to session page
             $URL = new \MySociety\TheyWorkForYou\Url('pbc_session');
-            header('Location: ' . $URL->generate() . urlencode($this->session));
+            header('Location: '.$URL->generate().urlencode($this->session));
             exit;
         } elseif ($this->session) {
             # Display the bills for a particular session
             $this_page = 'pbc_session';
             $DATA->set_page_metadata($this_page, 'title', "Session $this->session");
-            $args = array (
+            $args = array(
                 'session' => $this->session,
             );
             $data = array();
@@ -88,12 +88,12 @@ 
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'pbc' )
+            array('section' => 'pbc')
         );
     }
 
     protected function front_content() {
-        return $this->list->display( 'recent_pbc_debates', array( 'num' => 50 ), 'none' );
+        return $this->list->display('recent_pbc_debates', array('num' => 50), 'none');
     }
 
     protected function display_front() {

classes/SectionView/NiView.php

Spacing +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'ni' )
+            array('section' => 'ni')
         );
     }
 
@@ -52,23 +52,23 @@ 
 
         $debates = $DEBATELIST->display('recent_debates', array('days' => 30, 'num' => 6), 'none');
         $MOREURL = new \MySociety\TheyWorkForYou\Url('nidebatesfront');
-        $MOREURL->insert( array( 'more' => 1 ) );
+        $MOREURL->insert(array('more' => 1));
 
         // this makes sure that we don't repeat this debate in the list below
         $random_debate = NULL;
-        if ( isset($debates['data']) && count($debates['data']) ) {
+        if (isset($debates['data']) && count($debates['data'])) {
             $random_debate = $debates['data'][0];
         }
 
         $recent = array();
-        if ( isset($debates['data']) && count($debates['data']) ) {
+        if (isset($debates['data']) && count($debates['data'])) {
             // at the start of a session there may be less than 6
             // debates
             $max = 6;
-            if ( count($debates['data']) < 6 ) {
+            if (count($debates['data']) < 6) {
                 $max = count($debates['data']);
             }
-            for ( $i = 1; $i < $max; $i++ ) {
+            for ($i = 1; $i < $max; $i++) {
                 $debate = $debates['data'][$i];
                 $debate['desc'] = "Northern Ireland Assembly debates";
                 $debate['more_url'] = $MOREURL->generate();
@@ -77,7 +77,7 @@ 
         }
 
         $featured = array();
-        if ( $random_debate ) {
+        if ($random_debate) {
             $featured = $random_debate;
             $featured['more_url'] = $MOREURL->generate();
             $featured['desc'] = 'Northern Ireland Assembly debate';
@@ -86,7 +86,7 @@ 
         }
 
         $data['featured'] = $featured;
-        $data['debates'] = array( 'recent' => $recent);
+        $data['debates'] = array('recent' => $recent);
 
         $data['regional'] = $this->getMLAList();
         $data['template'] = 'ni/index';

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 +9 added lines, -9 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,30 +162,30 @@ 
      *                            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)) {
                 foreach ($var as $v) {
-                    $url_args[] = "$key=" . urlencode(stripslashes($v));
+                    $url_args[] = "$key=".urlencode(stripslashes($v));
                 }
             } elseif ($var != null)
-                $url_args[] = "$key=" . urlencode(stripslashes($var));
+                $url_args[] = "$key=".urlencode(stripslashes($var));
         }
 
-        $page_url = WEBPATH . $DATA->page_metadata($this->destinationpage, "url");
+        $page_url = WEBPATH.$DATA->page_metadata($this->destinationpage, "url");
 
         if (sizeof($url_args) == 0) {
             return $page_url;
         } else {
             if ($encode == "html") {
-                return $page_url . "?" . implode("&", $url_args);
+                return $page_url."?".implode("&", $url_args);
             } elseif ($encode == "none" || $encode == "url") {
-                return $page_url . "?" . implode("&", $url_args);
+                return $page_url."?".implode("&", $url_args);
             }
         }
     }