Merge branch 'develop' into release/3.2.0

mynetx · mynetx · commit a37147117e96 · 2017-10-17T04:02:10.000+02:00
diff --git a/README.md b/README.md
@@ -17,6 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/3cd81a521d334648b9958327621a3070)](https://www.codacy.com/app/jublonet/codebird-php?utm_source=github.com&utm_medium=referral&utm_content=jublonet/codebird-php&utm_campaign=badger)
 [![Coverage Status](https://img.shields.io/coveralls/jublonet/codebird-php/develop.svg)](https://coveralls.io/github/jublonet/codebird-php?branch=develop)
 [![Travis Status](https://img.shields.io/travis/jublonet/codebird-php/develop.svg)](https://travis-ci.org/jublonet/codebird-php/branches)
 
diff --git a/src/codebird.php b/src/codebird.php
@@ -430,6 +430,7 @@ class Codebird
       'statuses/update_with_media', // deprecated, use media/upload
       'ton/bucket/:bucket',
       'ton/bucket/:bucket?resumable=true',
+      'tweets/search/30day/:env',
       'users/lookup',
       'users/report_spam'
     ],
@@ -1930,11 +1931,11 @@ protected function _detectMedia($method) {
   /**
    * Detects if API call should use JSON body
    *
-   * @param string $method The API method to call
+   * @param string $method_template The API method to call
    *
    * @return bool Whether the method is defined as accepting JSON body
    */
-  protected function _detectJsonBody($method) {
+  protected function _detectJsonBody($method_template) {
     $json_bodies = [
       'ads/batch/accounts/:account_id/campaigns',
       'ads/batch/accounts/:account_id/line_items',
@@ -1943,9 +1944,10 @@ protected function _detectJsonBody($method) {
       'ads/sandbox/batch/accounts/:account_id/line_items',
       'ads/sandbox/batch/accounts/:account_id/targeting_criteria',
       'collections/entries/curate',
-      'media/metadata/create'
+      'media/metadata/create',
+      'tweets/search/30day/:env'
     ];
-    return in_array($method, $json_bodies);
+    return in_array($method_template, $json_bodies);
   }
 
   /**
@@ -2224,7 +2226,7 @@ protected function _callApiPreparationsPost(
       $multipart_boundary = substr($params, 2, $first_newline - 2);
       $request_headers[]  = 'Content-Type: multipart/form-data; boundary='
         . $multipart_boundary;
-    } elseif ($this->_detectJsonBody($method)) {
+    } elseif ($this->_detectJsonBody($method_template)) {
       $authorization = $this->_sign($httpmethod, $url, []);
       $params = json_encode($params);
       $request_headers[] = 'Content-Type: application/json';
