Added output format (Object or Array) + Improvements in Exception Class and in the error messages

Author: ricardoper

TwitterOAuth/Exception/TwitterException.php

@@ -7,10 +7,13 @@
  * @author Dirk Luijk <dirk@luijkwebcreations.nl>
  * @copyright 2013
  */
- 
-namespace TwitterOAuth\Exception;
-
 
-class TwitterException extends \Exception {
+namespace TwitterOAuth\Exception;
 
+class TwitterException extends \Exception
+{
+    public function __toString()
+    {
+        return "Twitter API Response: [{$this->code}] {$this->message} (" . __CLASS__ . ") ";
+    }
 }

TwitterOAuth/TwitterOAuth.php

@@ -16,8 +16,6 @@ class TwitterOAuth
 {
     protected $url = 'https://api.twitter.com/1.1/';
 
-    protected $format = 'json';
-
     protected $config = array();
 
     protected $call = '';
@@ -28,6 +26,8 @@ class TwitterOAuth
 
     protected $postParams = array();
 
+    protected $arrayOutput = false;
+
 
     /**
      * Prepare a new conection with Twitter API via OAuth
@@ -55,20 +55,21 @@ public function __construct(array $config)
     /**
      * Send a GET call to Twitter API via OAuth
      *
-     * @params string $call Twitter resource string
-     * @params array $getParams GET parameters to send
-     * @params string $format Set the response format
+     * @param $call Twitter resource string
+     * @param array $getParams GET parameters to send
+     * @param bool $arrayOutput Output format (false = Object | true = Array)
+     * @return mixed Output with selected format
      */
-    public function get($call, array $getParams = null, $format = null)
+    public function get($call, array $getParams = null, $arrayOutput = false)
     {
         $this->call = $call;
 
         if ($getParams !== null && is_array($getParams)) {
             $this->getParams = $getParams;
         }
 
-        if ($format !== null) {
-            $this->format = $format;
+        if ($arrayOutput !== false) {
+            $this->arrayOutput = true;
         }
 
         return $this->sendRequest();
@@ -77,12 +78,13 @@ public function get($call, array $getParams = null, $format = null)
     /**
      * Send a POST call to Twitter API via OAuth
      *
-     * @params string $call Twitter resource string
-     * @params array $postParams POST parameters to send
-     * @params array $getParams GET parameters to send
-     * @params string $format Set the response format
+     * @param $call Twitter resource string
+     * @param array $postParams POST parameters to send
+     * @param array $getParams GET parameters to send
+     * @param bool $arrayOutput Output format (false = Object | true = Array)
+     * @return mixed Output with selected format
      */
-    public function post($call, array $postParams = null, array $getParams = null, $format = null)
+    public function post($call, array $postParams = null, array $getParams = null, $arrayOutput = false)
     {
         $this->call = $call;
 
@@ -96,8 +98,8 @@ public function post($call, array $postParams = null, array $getParams = null, $
             $this->getParams = $getParams;
         }
 
-        if ($format !== null) {
-            $this->format = $format;
+        if ($arrayOutput !== false) {
+            $this->arrayOutput = true;
         }
 
         return $this->sendRequest();
@@ -125,7 +127,7 @@ protected function getParams(array $params)
     }
 
     /**
-     * Getting full URL from a Twitter resource and format
+     * Getting full URL from a Twitter resource
      *
      * @param bool $withParams If true then parameters will be outputted
      * @return string Full URL
@@ -142,7 +144,7 @@ protected function getUrl($withParams = false)
             }
         }
 
-        return $this->url . $this->call . '.' . $this->format . $getParams;
+        return $this->url . $this->call . '.json' . $getParams;
     }
 
     /**
@@ -253,7 +255,7 @@ protected function buildRequestHeader()
      *  Send GET or POST requests to Twitter API
      *
      * @throws Exception\TwitterException
-     * @return mixed Response output with the selected format
+     * @return mixed Response output
      */
     protected function sendRequest()
     {
@@ -284,12 +286,20 @@ protected function sendRequest()
 
         unset($options, $c);
 
-        $response = json_decode($response);
+        if (!in_array($response[0], array('{', '['))) {
+            throw new TwitterException(str_replace(array("\n", "\r", "\t"), '', strip_tags($response)), 0);
+        }
 
-        if(isset($response->errors)) {
-            foreach($response->errors as $error) {
+        $response = json_decode($response, $this->arrayOutput);
+
+        if (!$this->arrayOutput && isset($response->errors)) {
+            foreach ($response->errors as $error) {
                 throw new TwitterException($error->message, $error->code);
             }
+        } elseif ($this->arrayOutput && isset($response['errors'])) {
+            foreach ($response['errors'] as $error) {
+                throw new TwitterException($error['message'], $error['code']);
+            }
         }
 
         return $response;