Skip to content

Commit fa9e97e

Browse files
committed
fixed 5.3 json
1 parent 7e4c7f8 commit fa9e97e

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/Qiniu/Storage/ResumeUploader.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public function upload()
6565
fclose($this->inputStream);
6666
return array(null, new Error($this->currentUrl, $response));
6767
}
68-
var_dump($ret);
6968
array_push($this->contexts, $ret['ctx']);
7069
$uploaded += $blockSize;
7170
}

src/Qiniu/functions.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,12 @@ function base64_urlSafeDecode($str)
4343
* @param bool $assoc When true, returned objects will be converted
4444
* into associative arrays.
4545
* @param int $depth User specified recursion depth.
46-
* @param int $options Bitmask of JSON decode options.
4746
*
4847
* @return mixed
4948
* @throws \InvalidArgumentException if the JSON cannot be parsed.
5049
* @link http://www.php.net/manual/en/function.json-decode.php
5150
*/
52-
function json_decode($json, $assoc = false, $depth = 512, $options = 0)
51+
function json_decode($json, $assoc = false, $depth = 512)
5352
{
5453
static $jsonErrors = array(
5554
JSON_ERROR_DEPTH => 'JSON_ERROR_DEPTH - Maximum stack depth exceeded',
@@ -59,7 +58,7 @@ function json_decode($json, $assoc = false, $depth = 512, $options = 0)
5958
JSON_ERROR_UTF8 => 'JSON_ERROR_UTF8 - Malformed UTF-8 characters, possibly incorrectly encoded'
6059
);
6160

62-
$data = \json_decode($json, $assoc, $depth, $options);
61+
$data = \json_decode($json, $assoc, $depth);
6362

6463
if (JSON_ERROR_NONE !== json_last_error()) {
6564
$last = json_last_error();

0 commit comments

Comments
 (0)