Moved authentication dependencies out of construct & into authenticate()

Removed debugging output

Author: samtuke

TwitterSearch.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Oauth.php
  *
@@ -10,75 +11,67 @@
  * Permissions beyond the scope of this license may be available at http://www.jonhurlock.com/.
  */
 
-class twitterSearch
+class TwitterSearch
 {
     // url to send data to for authentication
     const AUTH_URL = 'https://api.twitter.com/oauth2/token';
     const SEARCH_URL = 'https://api.twitter.com/1.1/search/tweets.json';
     CONST INVALIDATE_AUTH_URL = 'https://api.twitter.com/oauth2/invalidate_token';
 
     /**
-     * @brief Set app authentication data
+     * @brief Authenticate a session with Twitter using OAuth
      * @param string $consumerKey Your personal key from Twitter
      * @param string $consumerSecret Your personal secret from Twitter
+     * @note https://dev.twitter.com/docs/auth/application-only-auth
      */
-    public function __construct( $consumerKey, $consumerSecret )
+    function authenticate( $consumerKey, $consumerSecret )
     {
-        // fill in your consumer key and consumer secret below
         $this->consumerKey = $consumerKey;
         $this->consumerSecret = $consumerSecret;
-    }
-    
-    /**
-     * @brief Authenticate a session with Twitter using OAuth
-     * @note https://dev.twitter.com/docs/auth/application-only-auth
-     */
-    function authenticate()
-    {
-            // Step 1
-            // step 1.1 - url encode the consumer_key and consumer_secret in accordance with RFC 1738
-            $encoded_consumer_key = urlencode($this->consumerKey);
-            $encoded_consumer_secret = urlencode($this->consumerSecret);
-            // step 1.2 - concatinate encoded consumer, a colon character and the encoded consumer secret
-            $bearer_token = $encoded_consumer_key.':'.$encoded_consumer_secret;
-            // step 1.3 - base64-encode bearer token
-            $base64_encoded_bearer_token = base64_encode($bearer_token);
-            // step 2 
-            $headers = array( 
-                    "POST /oauth2/token HTTP/1.1", 
-                    "Host: api.twitter.com", 
-                    "User-Agent: jonhurlock Twitter Application-only OAuth App v.1",
-                    "Authorization: Basic ".$base64_encoded_bearer_token."",
-                    "Content-Type: application/x-www-form-urlencoded;charset=UTF-8", 
-                    "Content-Length: 29"
-            ); 
+        // Step 1
+        // step 1.1 - url encode the consumer_key and consumer_secret in accordance with RFC 1738
+        $encoded_consumer_key = urlencode($this->consumerKey);
+        $encoded_consumer_secret = urlencode($this->consumerSecret);
+        // step 1.2 - concatinate encoded consumer, a colon character and the encoded consumer secret
+        $bearer_token = $encoded_consumer_key.':'.$encoded_consumer_secret;
+        // step 1.3 - base64-encode bearer token
+        $base64_encoded_bearer_token = base64_encode($bearer_token);
+        // step 2 
+        $headers = array( 
+                "POST /oauth2/token HTTP/1.1", 
+                "Host: api.twitter.com", 
+                "User-Agent: jonhurlock Twitter Application-only OAuth App v.1",
+                "Authorization: Basic ".$base64_encoded_bearer_token."",
+                "Content-Type: application/x-www-form-urlencoded;charset=UTF-8", 
+                "Content-Length: 29"
+        ); 
 
-            $ch = curl_init();  // setup a curl
-            curl_setopt($ch, CURLOPT_URL, SELF::AUTH_URL);  // set url to send to
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); // set custom headers
-            curl_setopt($ch, CURLOPT_POST, 1); // send as post
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // return output
-            curl_setopt($ch, CURLOPT_POSTFIELDS, "grant_type=client_credentials"); // post body/fields to be sent
-            $header = curl_setopt($ch, CURLOPT_HEADER, 1); // send custom headers
-            $httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-            $response = curl_exec ($ch); // execute the curl
-            curl_close($ch); // close the curl
-            $output = explode("\n", $response);var_dump($output);
-            $bearer_token = '';
-            
-            foreach ( $output as $line ) {
-                    if ( $line === false ) {
-                            // there was no bearer token
-                    } else {
-                            $bearer_token = $line;
-                    }
-            }
-            
-            // decode token
-            $bearer_token = json_decode( $bearer_token );
-            
-            // set token for reuse
-            $this->token = $bearer_token->{'access_token'};
+        $ch = curl_init();  // setup a curl
+        curl_setopt($ch, CURLOPT_URL, SELF::AUTH_URL);  // set url to send to
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); // set custom headers
+        curl_setopt($ch, CURLOPT_POST, 1); // send as post
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // return output
+        curl_setopt($ch, CURLOPT_POSTFIELDS, "grant_type=client_credentials"); // post body/fields to be sent
+        $header = curl_setopt($ch, CURLOPT_HEADER, 1); // send custom headers
+        $httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        $response = curl_exec ($ch); // execute the curl
+        curl_close($ch); // close the curl
+        $output = explode("\n", $response);
+        $bearer_token = '';
+        
+        foreach ( $output as $line ) {
+                if ( $line === false ) {
+                        // there was no bearer token
+                } else {
+                        $bearer_token = $line;
+                }
+        }
+        
+        // decode token
+        $bearer_token = json_decode( $bearer_token );
+        
+        // set token for reuse
+        $this->token = $bearer_token->{'access_token'};
     }
 
     /**

TwitterSearchTest.php

@@ -4,18 +4,15 @@
 
 class TestTwitter extends \PHPUnit_Framework_TestCase 
 {
-    /**
-     * 
-     */
     public function setUp() 
     {
-        $this->twitter = new twitterSearch( 'consumer-key', 'consumer-secret' );
+        $this->twitter = new twitterSearch();
     }
 
     public function testSearch()
     {    
         // authenticate using OAuth creds
-        $this->twitter->authenticate();
+        $this->twitter->authenticate( 'xlN7UWnd2FLWp4oxrtAA', 'nywpCALJ3ZXnlHnPwdGRmnu0jIqAbUBHhauPRCuPzMM' );
 
         //  search for the word 'test'
         $result = $this->twitter->search( "test" );