mysociety / theyworkforyou

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/Search/ParseArgs.php

Spacing +1 added lines, -1 removed lines

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

Braces +14 added lines, -6 removed lines

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

classes/People.php

Spacing +12 added lines, -12 removed lines

@@ -7,7 +7,7 @@ 
 
 namespace MySociety\TheyWorkForYou;
 
-include_once( dirname(__FILE__) . '/../www/includes/easyparliament/people.php' );
+include_once(dirname(__FILE__) . '/../www/includes/easyparliament/people.php');
 
 /**
  * People
@@ -38,7 +38,7 @@ 
         $data = $this->display($this->type, $args, 'none');
 
         $user = new User();
-        if ( $reps = $this->getRegionalReps($user) ) {
+        if ($reps = $this->getRegionalReps($user)) {
             $data['reps'] = $reps;
         }
 
@@ -70,7 +70,7 @@ 
             $args['all'] = true;
         }
 
-        if ( $this->type == 'peers' ) {
+        if ($this->type == 'peers') {
             $args['order'] = 'name';
         }
 
@@ -136,8 +136,8 @@ 
 
     private function addImagesToData($data) {
         $new_data = array();
-        foreach ( $data as $pid => $details ) {
-            list($image, ) = Utility\Member::findMemberImage($pid, true, $this->subs_missing_image);
+        foreach ($data as $pid => $details) {
+            list($image,) = Utility\Member::findMemberImage($pid, true, $this->subs_missing_image);
             $details['image'] = $image;
             $new_data[$pid] = $details;
         }
@@ -154,21 +154,21 @@ 
 
         $urls['plain'] = $URL->generate();
 
-        $URL->insert(array( 'o' => 'n'));
+        $URL->insert(array('o' => 'n'));
         $urls['by_name'] = $URL->generate();
 
-        $URL->insert(array( 'o' => 'l'));
+        $URL->insert(array('o' => 'l'));
         $urls['by_last'] = $URL->generate();
 
-        $URL->insert(array( 'o' => 'f'));
+        $URL->insert(array('o' => 'f'));
         $urls['by_first'] = $URL->generate();
 
-        $URL->insert(array( 'o' => 'p'));
+        $URL->insert(array('o' => 'p'));
         $urls['by_party'] = $URL->generate();
 
-        $URL->insert(array( 'f' => 'csv'));
-        $URL->remove(array( 'o'));
-        if ( $date = get_http_var('date') ) {
+        $URL->insert(array('f' => 'csv'));
+        $URL->remove(array('o'));
+        if ($date = get_http_var('date')) {
             $URL->insert(array('date' => $date));
         }
         $urls['by_csv'] = $URL->generate();

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

tests/PeopleTest.php

Spacing +1 added lines, -1 removed lines

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