Skip to content

chore: adding support for put #809

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

Merged
merged 2 commits into from
Jun 18, 2024
Merged

chore: adding support for put #809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2aa8e58
chore: adding support for put
tiwarishubham635 Jun 14, 2024
5ea05f6
chore: fixing put test
tiwarishubham635 Jun 14, 2024
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
24 changes: 12 additions & 12 deletions src/Twilio/Http/CurlClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,18 +131,18 @@ public function options(string $method, string $url,

break;
case 'put':
// TODO: PUT doesn't used anywhere and it has strange implementation. Must investigate later
$options[CURLOPT_PUT] = true;
if ($data) {
if ($buffer = \fopen('php://memory', 'w+')) {
$dataString = $this->buildQuery($data);
\fwrite($buffer, $dataString);
\fseek($buffer, 0);
$options[CURLOPT_INFILE] = $buffer;
$options[CURLOPT_INFILESIZE] = \strlen($dataString);
} else {
throw new EnvironmentException('Unable to open a temporary file');
}
$options[CURLOPT_CUSTOMREQUEST] = 'PUT';
if ($this->hasFile($data)) {
[$headers, $body] = $this->buildMultipartOptions($data);
$options[CURLOPT_POSTFIELDS] = $body;
$options[CURLOPT_HTTPHEADER] = \array_merge($options[CURLOPT_HTTPHEADER], $headers);
}
elseif (array_key_exists('Content-Type', $headers)) {
$options[CURLOPT_POSTFIELDS] = json_encode($data);
}
else {
$options[CURLOPT_POSTFIELDS] = $this->buildQuery($data);
$options[CURLOPT_HTTPHEADER][] = 'Content-Type: application/x-www-form-urlencoded';
}
break;
case 'head':
Expand Down
2 changes: 1 addition & 1 deletion src/Twilio/Http/GuzzleClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function request(string $method, string $url,
$options['query'] = Query::build($params, PHP_QUERY_RFC1738);
}

if ($method === 'POST') {
if ($method === 'POST' || $method === 'PUT') {
if ($this->hasFile($data)) {
$options['multipart'] = $this->buildMultipartParam($data);
} else {
Expand Down
24 changes: 19 additions & 5 deletions tests/Twilio/Unit/Http/CurlClientTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,12 +248,26 @@ public function postFieldsProvider(): array {
];
}

public function testPutFile(): void {
/**
* @param array|string $params Parameters to put
* @param array|string $data Data to put
* @param string $expectedContentType Excpected Content-Type header
* @param string $expectedBody Expected POSTFIELDS
* @dataProvider postFieldsProvider
* @throws \Twilio\Exceptions\EnvironmentException
*/
public function testPutFile($params, $data, string $expectedContentType, string $expectedBody): void {
$client = new CurlClient();
$actual = $client->options('PUT', 'url', [], ['a' => 1, 'b' => 2]);
$this->assertNotNull($actual[CURLOPT_INFILE]);
$this->assertEquals('a=1&b=2', \fread($actual[CURLOPT_INFILE], $actual[CURLOPT_INFILESIZE]));
$this->assertEquals(7, $actual[CURLOPT_INFILESIZE]);
$actual = $client->options('PUT', 'url', $params, $data);

foreach ($actual[CURLOPT_HTTPHEADER] as $header) {
if (strpos($header, 'Content-Type: ') === 0) {
$this->assertStringMatchesFormat($expectedContentType, substr($header, 14));
break;
}
}

$this->assertStringMatchesFormat($expectedBody, $actual[CURLOPT_POSTFIELDS]);
}

/**
Expand Down