Finish 2.5.0

Author: mynetx

.gitattributes

@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto

.gitignore

@@ -0,0 +1,3 @@
+RELEASE_MESSAGE*
+test*
+*.jpg

CHANGELOG

@@ -1,7 +1,7 @@
 codebird-php - changelog
 ========================
 
-2.5.0 (not yet released)
+2.5.0 (2014-06-20)
 + Add section about cacert.pem to README
 + Option to set cURL timeout
 + #42 Allow to get the supported API methods as array
@@ -16,6 +16,7 @@ codebird-php - changelog
 + #61 Return rate limit details with each API call
 + #60 Support uploading multiple media
 - #63 Return rate-limiting info only if contained in response
+- #57 Don't require consumer key if bearer token is already known
 
 2.4.1 (2013-06-23)
 + #26 Stringify null and boolean parameters

README.md

@@ -108,7 +108,7 @@ If you already have your token, tell Codebird to use it:
 ```php
 \Codebird\Codebird::setBearerToken('YOURBEARERTOKEN');
 ```
-
+In this case, you don't need to set the consumer key and secret.
 For sending an API request with app-only auth, see the ‘Usage examples’ section.
 
 
@@ -130,8 +130,24 @@ Tweeting is as easy as this:
 $reply = $cb->statuses_update('status=Whohoo, I just tweeted!');
 ```
 
-For more complex parameters (see the [Twitter API documentation](https://dev.twitter.com/)),
-giving all parameters in an array is supported, too:
+:warning: *Make sure to urlencode any parameter values that contain
+query-reserved characters, like tweeting the `&` sign:*
+
+```php
+$reply = $cb->statuses_update('status=' . urlencode('Fish & chips'));
+// will result in this:
+$reply = $cb->statuses_update('status=Fish+%26+chips');
+```
+
+In most cases, giving all parameters in an array is easier,
+because no encoding is needed:
+
+```php
+$params = array(
+    'status' => 'Fish & chips'
+);
+$reply = $cb->statuses_update($params);
+```
 
 ```php
 $params = array(

bower.json

@@ -0,0 +1,25 @@
+{
+  "name": "codebird-php",
+  "version": "2.5.0",
+  "homepage": "http://www.jublo.net/projects/codebird/php",
+  "authors": [
+    "Joshua Atkins <joshua.atkins@jublo.net>",
+    "J.M. <jm@jublo.net>"
+  ],
+  "description": "A Twitter library in PHP.",
+  "main": "src/codebird.php",
+  "moduleType": [],
+  "keywords": [
+    "Twitter",
+    "API",
+    "networking"
+  ],
+  "license": "GPL-3.0+",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ]
+}

composer.json

@@ -1,16 +1,40 @@
 {
     "name": "jublonet/codebird-php",
     "description" : "A Twitter library in PHP.",
-    "version": "2.5.0-rc.2",
-    "autoload": {
-        "classmap": ["src/"]
-    },
+    "keywords": [
+        "Twitter",
+        "API",
+        "networking"
+    ],
+    "homepage": "http://www.jublo.net/projects/codebird/php",
     "license": "GPL-3.0",
+    "authors": [
+        {
+            "name": "Joshua Atkins",
+            "email": "joshua.atkins@jublo.net",
+            "homepage": "http://atkins.im/",
+            "role": "Developer"
+        },
+        {
+            "name": "J.M.",
+            "email": "jm@jublo.net",
+            "homepage": "http://mynetx.net/",
+            "role": "Developer"
+        }
+    ],
+    "support": {
+        "email": "support@jublo.net",
+        "issues": "https://github.com/jublonet/codebird-php/issues",
+        "source": "https://github.com/jublonet/codebird-php/releases"
+    },
     "require": {
         "ext-curl": "*",
         "ext-hash": "*",
         "ext-json": "*",
         "lib-openssl": "*",
         "lib-curl": "*"
+    },
+    "autoload": {
+        "classmap": ["src/"]
     }
 }

src/codebird.php

@@ -6,7 +6,7 @@
  * A Twitter library in PHP.
  *
  * @package codebird
- * @version 2.5.0-rc.2
+ * @version 2.5.0
  * @author Jublo Solutions <support@jublo.net>
  * @copyright 2010-2014 Jublo Solutions <support@jublo.net>
  *
@@ -117,7 +117,7 @@ class Codebird
     /**
      * The current Codebird version
      */
-    protected $_version = '2.5.0-rc.2';
+    protected $_version = '2.5.0';
 
     /**
      * Request timeout
@@ -1051,21 +1051,28 @@ protected function _callApi($httpmethod, $method, $params = array(), $multipart
             $params['application_id'] = 333903271;
         }
 
-        $url = $this->_getEndpoint($method);
+        $authorization = null;
+        $url           = $this->_getEndpoint($method);
         $request_headers = array();
         if ($httpmethod === 'GET') {
             $url_with_params = $url;
             if (json_encode($params) !== '{}') {
                 $url_with_params .= '?' . http_build_query($params);
             }
-            $authorization = $this->_sign($httpmethod, $url, $params);
+            if (! $app_only_auth) {
+                $authorization = $this->_sign($httpmethod, $url, $params);
+            }
             $ch = curl_init($url_with_params);
         } else {
             if ($multipart) {
-                $authorization = $this->_sign($httpmethod, $url, array());
-                $params        = $this->_buildMultipart($method, $params);
+                if (! $app_only_auth) {
+                    $authorization = $this->_sign($httpmethod, $url, array());
+                }
+                $params = $this->_buildMultipart($method, $params);
             } else {
-                $authorization = $this->_sign($httpmethod, $url, $params);
+                if (! $app_only_auth) {
+                    $authorization = $this->_sign($httpmethod, $url, $params);
+                }
                 $params        = http_build_query($params);
             }
             $ch = curl_init($url);
@@ -1079,8 +1086,10 @@ protected function _callApi($httpmethod, $method, $params = array(), $multipart
             curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
         }
         if ($app_only_auth) {
-            if (self::$_oauth_consumer_key === null) {
-                throw new \Exception('To make an app-only auth API request, the consumer key must be set.');
+            if (self::$_oauth_consumer_key === null
+                && self::$_oauth_bearer_token === null
+            ) {
+                throw new \Exception('To make an app-only auth API request, consumer key or bearer token must be set.');
             }
             // automatically fetch bearer token, if necessary
             if (self::$_oauth_bearer_token === null) {