Merge pull request #163 from longbai/config_uphost

fixed example file style

Author: longbai

.travis.yml

@@ -7,6 +7,7 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
 before_script:
   - export QINIU_TEST_ENV="travis"
   - travis_retry composer self-update

CHANGELOG.md

@@ -1,5 +1,11 @@
 #Changelog
 
+## 7.0.5 (2015-12-05)
+### 修正
+* php7.0 Json 对空字符串解析单元测试报错
+* 开启安全模式或者设置可操作目录树时，设置CURLOPT_FOLLOWLOCATION报错, by @twocabbages
+* fetch 支持不指定key, by @sinkcup
+
 ## 7.0.4 (2015-07-23)
 ### 修正
 * 一些地方的严格比较检查

README.md

@@ -21,7 +21,7 @@ $ composer require qiniu/php-sdk
 
 | Qiniu SDK版本 | PHP 版本 |
 |:--------------------:|:---------------------------:|
-|          7.x         |  cURL extension,   5.3 - 5.6 |
+|          7.x         |  cURL extension,   5.3 - 5.6,7.0 |
 |          6.x         |  cURL extension,   5.2 - 5.6 |
 
 ## 使用方法

examples/qetag.php

@@ -4,7 +4,7 @@
 
 list($etag, $err) = Etag::sum(__file__);
 if ($err == null) {
-	echo  "Etag: $etag";
+    echo("Etag: $etag");
 } else {
-	var_dump($err);
-}
+    var_dump($err);
+}

src/Qiniu/Http/Client.php

@@ -87,11 +87,10 @@ private static function sendRequest($request)
         );
 
         // Handle open_basedir & safe mode
-        if (!ini_get('safe_mode') && !ini_get('open_basedir'))
-        {
+        if (!ini_get('safe_mode') && !ini_get('open_basedir')) {
             $options[CURLOPT_FOLLOWLOCATION] = true;
         }
-        
+
         if (!empty($request->headers)) {
             $headers = array();
             foreach ($request->headers as $key => $val) {

src/Qiniu/functions.php

@@ -87,6 +87,9 @@ function json_decode($json, $assoc = false, $depth = 512)
             JSON_ERROR_UTF8 => 'JSON_ERROR_UTF8 - Malformed UTF-8 characters, possibly incorrectly encoded'
         );
 
+        if (empty($json)) {
+            return null;
+        }
         $data = \json_decode($json, $assoc, $depth);
 
         if (JSON_ERROR_NONE !== json_last_error()) {