Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

post request support multi-file upload #327

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

post request support multi-file upload #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
af9e25e
post request enhance
jianminLee Aug 3, 2018
13463b0
格式修复
jianminLee Aug 3, 2018
1604150
fix files object array
jianminLee Aug 3, 2018
aa103a1
fix httpBuildQuery function
jianminLee Aug 3, 2018
06773bf
test fix
jianminLee Aug 3, 2018
40fdfe4
Compatible with low version PHP
jianminLee Aug 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 43 additions & 5 deletions library/Requests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,15 +258,41 @@ public static function trace($url, $headers = array(), $options = array()) {
* @param string $url
* @param array $headers
* @param array $data
* @param array $files
* @param array $options
* @return Requests_Response
*/
/**
* Send a POST request
*/
public static function post($url, $headers = array(), $data = array(), $options = array()) {
return self::request($url, $headers, $data, self::POST, $options);
}
* Send a POST request/Support for multiple files, complex array parameters
*/
public static function post($url, $headers = [], $data = [], $files = [], $options = []){
if (count($files)) {
self::httpBuildQuery($data);
// replacing file paths with curlFile Object
array_walk($files, function ($filePath, $key) use (&$data) {
if (is_array($filePath)) {
array_walk($filePath, function ($subFilePath, $subKey) use (&$data, $key) {
$data["{$key}[{$subKey}]"] = new \CURLFile(realpath($subFilePath));
});
} else {
$data[ $key ] = new \CURLFile(realpath($filePath));
}
});

// starting to add a hook to attach file to request
$hooks = new \Requests_Hooks();
$hooks->register('curl.before_send', function ($fp) use ($data) {
curl_setopt($fp, CURLOPT_SAFE_UPLOAD, true);
curl_setopt($fp, CURLOPT_POSTFIELDS, $data);
});
$options = ['hooks' => $hooks];
// no need to set the body, it's taken care of by hooks
$data = [];
}

return self::request($url, $headers, $data, self::POST, $options);
}

/**
* Send a PUT request
*/
Expand Down Expand Up @@ -977,4 +1003,16 @@ public static function match_domain($host, $reference) {

return false;
}

protected static function httpBuildQuery(array &$data, $key = '', $value = null) {
foreach ($value ?? $data as $k => $v) {
$cur_key = $key ? "{$key}[{$k}]" : "{$k}";
if (is_array($v)) {
self::httpBuildQuery($data, "{$cur_key}", $v);
unset($data[$k]);
}else{
$data[$cur_key] = $v;
}
}
}
}
12 changes: 6 additions & 6 deletions tests/Transport/Base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public function testTRACE() {

public function testRawPOST() {
$data = 'test';
$request = Requests::post(httpbin('/post'), array(), $data, $this->getOptions());
$request = Requests::post(httpbin('/post'), array(), $data,['fiilename' => tempnam(sys_get_temp_dir(), 'RLT')], $this->getOptions());
$this->assertEquals(200, $request->status_code);

$result = json_decode($request->body, true);
Expand All @@ -169,7 +169,7 @@ public function testRawPOST() {

public function testFormPost() {
$data = 'test=true&test2=test';
$request = Requests::post(httpbin('/post'), array(), $data, $this->getOptions());
$request = Requests::post(httpbin('/post'), array(), $data,['fiilename' => tempnam(sys_get_temp_dir(), 'RLT')], $this->getOptions());
$this->assertEquals(200, $request->status_code);

$result = json_decode($request->body, true);
Expand All @@ -181,7 +181,7 @@ public function testPOSTWithArray() {
'test' => 'true',
'test2' => 'test',
);
$request = Requests::post(httpbin('/post'), array(), $data, $this->getOptions());
$request = Requests::post(httpbin('/post'), array(), $data,['fiilename' => tempnam(sys_get_temp_dir(), 'RLT')], $this->getOptions());
$this->assertEquals(200, $request->status_code);

$result = json_decode($request->body, true);
Expand All @@ -196,7 +196,7 @@ public function testPOSTWithNestedData() {
'test4' => 'test-too',
),
);
$request = Requests::post(httpbin('/post'), array(), $data, $this->getOptions());
$request = Requests::post(httpbin('/post'), array(), $data,['fiilename' => tempnam(sys_get_temp_dir(), 'RLT')], $this->getOptions());
$this->assertEquals(200, $request->status_code);

$result = json_decode($request->body, true);
Expand Down Expand Up @@ -828,7 +828,7 @@ public function testReusableTransport() {

public function testQueryDataFormat() {
$data = array('test' => 'true', 'test2' => 'test');
$request = Requests::post(httpbin('/post'), array(), $data, $this->getOptions(array('data_format' => 'query')));
$request = Requests::post(httpbin('/post'), array(), $data,['filename' => tempnam(sys_get_temp_dir(), 'RLT')], $this->getOptions(array('data_format' => 'query')));
$this->assertEquals(200, $request->status_code);

$result = json_decode($request->body, true);
Expand All @@ -838,7 +838,7 @@ public function testQueryDataFormat() {

public function testBodyDataFormat() {
$data = array('test' => 'true', 'test2' => 'test');
$request = Requests::post(httpbin('/post'), array(), $data, $this->getOptions(array('data_format' => 'body')));
$request = Requests::post(httpbin('/post'), array(), $data,['filename' => tempnam(sys_get_temp_dir(), 'RLT')], $this->getOptions(array('data_format' => 'body')));
$this->assertEquals(200, $request->status_code);

$result = json_decode($request->body, true);
Expand Down