mysociety / theyworkforyou

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

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

@@ -42,7 +42,7 @@ 
 
         $data = array();
 
-        $data['popular_searches'] = NULL;
+        $data['popular_searches'] = null;
 
 
         $data['urls'] = $this->getURLs($data);
@@ -54,7 +54,7 @@ 
         $MOREURL->insert( array( 'more' => 1 ) );
 
         // this makes sure that we don't repeat this debate in the list below
-        $random_debate = NULL;
+        $random_debate = null;
         if ( isset($debates['data']) && count($debates['data']) ) {
             $random_debate = $debates['data'][0];
         }

classes/GlossaryEditQueue.php

Braces +1 added lines, -2 removed lines

@@ -68,8 +68,7 @@
                             WHERE edit_id=" . $approval_id . ";");
             if (!$q->success()) {
                 break;
-            }
-            else {
+            } else {
                 // Scrub that one from the list of pending items
                 unset ($this->pending[$approval_id]);
             }

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
             // the new epobject id and approval details.
             $q = $this->db->query("UPDATE editqueue
                             SET
-                            glossary_id='" .  $this->current_epobject_id. "',
+                            glossary_id='" .  $this->current_epobject_id . "',
                             editor_id='" . addslashes($THEUSER->user_id()) . "',
                             approved='1',
                             decided='" . $timestamp . "'

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

classes/SectionView/DebatesView.php

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

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['adate'];
         $time = $vq['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 = '';

classes/FacebookLogin.php

Spacing +3 added lines, -3 removed lines

@@ -36,10 +36,10 @@ 
 
       try {
         $accessToken = $helper->getAccessToken();
-      } catch(\Facebook\Exceptions\FacebookResponseException $e) {
+      } catch (\Facebook\Exceptions\FacebookResponseException $e) {
         $data['error'] = 'Graph returned an error: ' . $e->getMessage();
         return $data;
-      } catch(\Facebook\Exceptions\FacebookSDKException $e) {
+      } catch (\Facebook\Exceptions\FacebookSDKException $e) {
         $data['error'] = 'Facebook SDK returned an error: ' . $e->getMessage();
         return $data;
       }
@@ -60,7 +60,7 @@ 
           return False;
       }
 
-      if (! $accessToken->isLongLived()) {
+      if (!$accessToken->isLongLived()) {
         $oAuth2Client = $this->getFacebookObject()->getOAuth2Client();
         try {
           $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);

Indentation +24 added lines, -24 removed lines

@@ -13,11 +13,11 @@ 
 
     public function getFacebookObject() {
         if (!isset($this->fb)) {
-          $this->fb = new \Facebook\Facebook([
+            $this->fb = new \Facebook\Facebook([
             'app_id' => FACEBOOK_APP_ID,
             'app_secret' => FACEBOOK_APP_SECRET,
             'default_graph_version' => 'v2.2',
-          ]);
+            ]);
         }
 
         return $this->fb;
@@ -30,46 +30,46 @@ 
     }
 
     public function handleFacebookRedirect() {
-      $helper = $this->getFacebookObject()->getRedirectLoginHelper();
+        $helper = $this->getFacebookObject()->getRedirectLoginHelper();
 
-      $data = array('login_url' => $this->getLoginURL());
+        $data = array('login_url' => $this->getLoginURL());
 
-      try {
+        try {
         $accessToken = $helper->getAccessToken();
-      } catch(\Facebook\Exceptions\FacebookResponseException $e) {
+        } catch(\Facebook\Exceptions\FacebookResponseException $e) {
         $data['error'] = 'Graph returned an error: ' . $e->getMessage();
         return $data;
-      } catch(\Facebook\Exceptions\FacebookSDKException $e) {
+        } catch(\Facebook\Exceptions\FacebookSDKException $e) {
         $data['error'] = 'Facebook SDK returned an error: ' . $e->getMessage();
         return $data;
-      }
+        }
 
-      $token = $this->checkAccessToken($accessToken);
+        $token = $this->checkAccessToken($accessToken);
 
-      if ($token) {
-          return array('token' => $token);
-      } else {
-          $data['error'] = 'Problem getting Facebook token';
-          return $data;
-      }
+        if ($token) {
+            return array('token' => $token);
+        } else {
+            $data['error'] = 'Problem getting Facebook token';
+            return $data;
+        }
     }
 
 
     private function checkAccessToken($accessToken) {
-      if (!isset($accessToken)) {
-          return False;
-      }
+        if (!isset($accessToken)) {
+            return False;
+        }
 
-      if (! $accessToken->isLongLived()) {
+        if (! $accessToken->isLongLived()) {
         $oAuth2Client = $this->getFacebookObject()->getOAuth2Client();
         try {
-          $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
+            $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
         } catch (\Facebook\Exceptions\FacebookSDKException $e) {
-          return False;
+            return False;
+        }
         }
-      }
 
-      return $accessToken;
+        return $accessToken;
     }
 
     public function loginUser($accessToken) {
@@ -156,7 +156,7 @@ 
             'url' => $THEUSER->url(),
             'optin' => $THEUSER->optin(),
             'password' => '',
-         );
+            );
 
         $THEUSER->update_self_no_confirm($details);
     }

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

@@ -57,7 +57,7 @@ 
 
     private function checkAccessToken($accessToken) {
       if (!isset($accessToken)) {
-          return False;
+          return false;
       }
 
       if (! $accessToken->isLongLived()) {
@@ -65,7 +65,7 @@ 
         try {
           $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
         } catch (\Facebook\Exceptions\FacebookSDKException $e) {
-          return False;
+          return false;
         }
       }
 
@@ -86,7 +86,7 @@ 
         $expires = intval($accessToken->getExpiresAt()->format('U'));
         twfy_debug("THEUSER", "Facebook access token expires at " . $expires);
 
-        $success = False;
+        $success = false;
         if ($user_id) {
             twfy_debug("THEUSER", "Faceook user exists in the database: " . $user_id);
             $success = $THEUSER->init($user_id);
@@ -112,7 +112,7 @@ 
             return $logged_in;
         }
 
-        return False;
+        return false;
     }
 
     public function createUser($accessToken, $user) {
@@ -128,8 +128,8 @@ 
             'url' => '',
             'status' => '',
             'password' => '',
-            'optin' => False,
-            'mp_alert' => False,
+            'optin' => false,
+            'mp_alert' => false,
             'facebook_id' => $user['id']
         );
         $added = $THEUSER->add($details, false);

classes/Utility/Calendar.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
         } else {
             $title = $e['title'];
             if ($pid = $e['person_id']) {
-                $MEMBER = new \MEMBER(array( 'person_id' => $pid ));
+                $MEMBER = new \MEMBER(array('person_id' => $pid));
                 $name = $MEMBER->full_name();
                 $title .= " &#8211; <a href='/mp/?p=$pid'>$name</a>";
             }

tests/TopicsTest.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/topics.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/topics.xml');
     }
 
     private function fetch_topics_page($vars)

tests/AlertsPageTest.php

Spacing +7 added lines, -7 removed lines

@@ -11,7 +11,7 @@ 
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/alertspage.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/alertspage.xml');
     }
 
     private function fetch_page($vars)
@@ -21,37 +21,37 @@ 
 
     public function testFetchPage()
     {
-        $page = $this->fetch_page( array() );
+        $page = $this->fetch_page(array());
         $this->assertContains('TheyWorkForYou Email Alerts', $page);
     }
 
     public function testKeywordOnly() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'elephant'));
         $this->assertContains('Receive alerts when [elephant] is mentioned', $page);
     }
 
     public function testPostCodeOnly() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'SE17 3HE') );
+        $page = $this->fetch_page(array('alertsearch' => 'SE17 3HE'));
         $this->assertContains('when Mrs Test Current-MP', $page);
     }
 
     public function testPostCodeWithKeyWord()
     {
-        $page = $this->fetch_page( array( 'alertsearch' => 'SE17 3HE elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'SE17 3HE elephant'));
         $this->assertContains('You have used a postcode and something else', $page);
         $this->assertContains('Mentions of [elephant] by Mrs Test Current-MP', $page);
         $this->assertNotContains('by your MSP', $page);
     }
 
     public function testScottishPostcodeWithKeyword() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'PH6 2DB elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'PH6 2DB elephant'));
         $this->assertContains('You have used a postcode and something else', $page);
         $this->assertContains('Mentions of [elephant] by your MP, Mr Test2 Current-MP', $page);
         $this->assertContains('Mentions of [elephant] by your MSP, Mrs Test Current-MSP', $page);
     }
 
     public function testPostcodeAndKeywordWithNoSittingMP() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'OX1 4LF elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'OX1 4LF elephant'));
         $this->assertContains('You have used a postcode and something else', $page);
         $this->assertNotContains('Did you mean to get alerts for when your MP', $page);
     }

tests/PartyTest.php

Spacing +8 added lines, -8 removed lines

@@ -11,7 +11,7 @@ 
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/party.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/party.xml');
     }
 
     private function fetch_page($vars)
@@ -23,12 +23,12 @@ 
         $party = new MySociety\TheyWorkForYou\Party('A Party');
 
         $this->assertNotNull($party);
-        $this->assertEquals( 'A Party', $party->name );
+        $this->assertEquals('A Party', $party->name);
     }
 
     public function testCountMembers() {
         $party = new MySociety\TheyWorkForYou\Party('A Party');
-        $this->assertEquals( $party->getCurrentMemberCount(HOUSE_TYPE_COMMONS), 2 );
+        $this->assertEquals($party->getCurrentMemberCount(HOUSE_TYPE_COMMONS), 2);
     }
 
     public function testGetPolicyPositions() {
@@ -115,7 +115,7 @@ 
         $this->assertEquals($expectedResults, $positions);
 
         $party = new MySociety\TheyWorkForYou\Party('Labour/Co-operative');
-        $party->cache_position( $positions['810'] );
+        $party->cache_position($positions['810']);
 
         $position = $party->policy_position(810);
         $expected = ('voted a mixture of for and against');
@@ -133,7 +133,7 @@ 
 
     public function testMPPartyPolicyTextWhenDiffers()
     {
-        $page = $this->fetch_page( array( 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency'));
         $this->assertContains('Test Current-MP', $page);
         $this->assertContains('is a A Party MP', $page);
         $this->assertContains('sometimes <b>differs</b> from their party', $page);
@@ -141,14 +141,14 @@ 
 
     public function testSingleMemberPartyPolicyText()
     {
-        $page = $this->fetch_page( array( 'pid' => 7, 'url' => '/mp/7/test_second-party-mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 7, 'url' => '/mp/7/test_second-party-mp/test_westminster_constituency'));
         $this->assertContains('Test Second-Party-MP', $page);
         $this->assertNotContains('is a A Second Party MP', $page);
     }
 
     public function testMPPartyPolicyWherePartyMissingPositions()
     {
-        $page = $this->fetch_page( array( 'pid' => 3, 'url' => '/mp/3/test_current-mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 3, 'url' => '/mp/3/test_current-mp/test_westminster_constituency'));
         $this->assertContains('Test Current-MP', $page);
         $this->assertContains('is a A Party MP', $page);
         $this->assertNotContains('while most A Party MPs voted', $page);
@@ -156,7 +156,7 @@ 
 
     public function testMPPartyPolicyTextWhenAgrees()
     {
-        $page = $this->fetch_page( array( 'pid' => 6, 'url' => '/mp/6/test_further-mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 6, 'url' => '/mp/6/test_further-mp/test_westminster_constituency'));
         $this->assertContains('Test Further-MP', $page);
         $this->assertContains('This is a selection of Miss Test Further-MP&rsquo;s votes', $page);
     }