Skip to content

Commit 5c865c3

Browse files
zachborboazachborboa
authored
Merge pull request php-curl-class#689 from zachborboa/master
Remove data parameter from additional request types
2 parents 522c829 + 44bb1c6 commit 5c865c3

File tree

3 files changed

+191
-3
lines changed

3 files changed

+191
-3
lines changed

‎src/Curl/MultiCurl.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public function addPatch($url, $data = [])
247247
}
248248

249249
$this->queueHandle($curl);
250-
$this->setUrl($url, $data);
250+
$this->setUrl($url);
251251
$curl->setUrl($url);
252252
$curl->setOpt(CURLOPT_CUSTOMREQUEST, 'PATCH');
253253
$curl->setOpt(CURLOPT_POSTFIELDS, $curl->buildPostData($data));
@@ -315,7 +315,7 @@ public function addPut($url, $data = [])
315315

316316
$curl = new Curl($this->baseUrl);
317317
$this->queueHandle($curl);
318-
$this->setUrl($url, $data);
318+
$this->setUrl($url);
319319
$curl->setUrl($url);
320320
$curl->setOpt(CURLOPT_CUSTOMREQUEST, 'PUT');
321321
$put_data = $curl->buildPostData($data);
@@ -344,7 +344,7 @@ public function addSearch($url, $data = [])
344344

345345
$curl = new Curl($this->baseUrl);
346346
$this->queueHandle($curl);
347-
$this->setUrl($url, $data);
347+
$this->setUrl($url);
348348
$curl->setUrl($url);
349349
$curl->setOpt(CURLOPT_CUSTOMREQUEST, 'SEARCH');
350350
$put_data = $curl->buildPostData($data);

‎tests/PHPCurlClass/PHPCurlClassTest.php

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4193,4 +4193,83 @@ public function testPostDataString()
41934193
$this->assertEquals(Test::TEST_URL, $curl->effectiveUrl);
41944194
$this->assertEquals($data, $curl->response);
41954195
}
4196+
4197+
public function testPatchDataArray()
4198+
{
4199+
$data = ['key' => 'value'];
4200+
4201+
$curl = new Curl();
4202+
$curl->setHeader('X-DEBUG-TEST', 'patch');
4203+
$curl->patch(Test::TEST_URL, $data);
4204+
4205+
$this->assertEquals('PATCH / HTTP/1.1', $curl->requestHeaders['Request-Line']);
4206+
$this->assertEquals(Test::TEST_URL, $curl->url);
4207+
}
4208+
4209+
public function testPatchDataString()
4210+
{
4211+
$data = str_repeat('-', 100);
4212+
4213+
$curl = new Curl();
4214+
$curl->setHeader('X-DEBUG-TEST', 'patch');
4215+
$curl->patch(Test::TEST_URL, $data);
4216+
4217+
$this->assertEquals('PATCH / HTTP/1.1', $curl->requestHeaders['Request-Line']);
4218+
$this->assertEquals(Test::TEST_URL, $curl->url);
4219+
$this->assertEquals(Test::TEST_URL, $curl->effectiveUrl);
4220+
$this->assertEquals($data, $curl->response);
4221+
}
4222+
4223+
public function testPutDataArray()
4224+
{
4225+
$data = ['key' => 'value'];
4226+
4227+
$curl = new Curl();
4228+
$curl->setHeader('X-DEBUG-TEST', 'put');
4229+
$curl->put(Test::TEST_URL, $data);
4230+
4231+
$this->assertEquals('PUT / HTTP/1.1', $curl->requestHeaders['Request-Line']);
4232+
$this->assertEquals(Test::TEST_URL, $curl->url);
4233+
$this->assertEquals(Test::TEST_URL, $curl->effectiveUrl);
4234+
$this->assertEquals('key=value', $curl->response);
4235+
}
4236+
4237+
public function testPutDataString()
4238+
{
4239+
$data = str_repeat('-', 100);
4240+
4241+
$curl = new Curl();
4242+
$curl->setHeader('X-DEBUG-TEST', 'put');
4243+
$curl->put(Test::TEST_URL, $data);
4244+
4245+
$this->assertEquals('PUT / HTTP/1.1', $curl->requestHeaders['Request-Line']);
4246+
$this->assertEquals(Test::TEST_URL, $curl->url);
4247+
$this->assertEquals(Test::TEST_URL, $curl->effectiveUrl);
4248+
}
4249+
4250+
public function testSearchDataArray()
4251+
{
4252+
$data = ['key' => 'value'];
4253+
4254+
$curl = new Curl();
4255+
$curl->setHeader('X-DEBUG-TEST', 'search');
4256+
$curl->search(Test::TEST_URL, $data);
4257+
4258+
$this->assertEquals('SEARCH / HTTP/1.1', $curl->requestHeaders['Request-Line']);
4259+
$this->assertEquals(Test::TEST_URL, $curl->url);
4260+
$this->assertEquals(Test::TEST_URL, $curl->effectiveUrl);
4261+
}
4262+
4263+
public function testSearchDataString()
4264+
{
4265+
$data = str_repeat('-', 100);
4266+
4267+
$curl = new Curl();
4268+
$curl->setHeader('X-DEBUG-TEST', 'search');
4269+
$curl->search(Test::TEST_URL, $data);
4270+
4271+
$this->assertEquals('SEARCH / HTTP/1.1', $curl->requestHeaders['Request-Line']);
4272+
$this->assertEquals(Test::TEST_URL, $curl->url);
4273+
$this->assertEquals(Test::TEST_URL, $curl->effectiveUrl);
4274+
}
41964275
}

‎tests/PHPCurlClass/PHPMultiCurlClassTest.php

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4832,4 +4832,113 @@ public function testPostDataString()
48324832
});
48334833
$multi_curl->start();
48344834
}
4835+
4836+
public function testPatchDataArray()
4837+
{
4838+
$data = ['key' => 'value'];
4839+
4840+
$multi_curl = new MultiCurl();
4841+
$multi_curl->setHeader('X-DEBUG-TEST', 'patch');
4842+
$multi_curl->addPatch(Test::TEST_URL, $data);
4843+
$multi_curl->complete(function ($instance) {
4844+
\PHPUnit\Framework\Assert::assertEquals(
4845+
'PATCH / HTTP/1.1',
4846+
$instance->requestHeaders['Request-Line']
4847+
);
4848+
\PHPUnit\Framework\Assert::assertEquals(Test::TEST_URL, $instance->url);
4849+
\PHPUnit\Framework\Assert::assertEquals(Test::TEST_URL, $instance->effectiveUrl);
4850+
});
4851+
$multi_curl->start();
4852+
}
4853+
4854+
public function testPatchDataString()
4855+
{
4856+
$data = str_repeat('-', 100);
4857+
4858+
$multi_curl = new MultiCurl();
4859+
$multi_curl->setHeader('X-DEBUG-TEST', 'patch');
4860+
$multi_curl->addPatch(Test::TEST_URL, $data);
4861+
$multi_curl->complete(function ($instance) use ($data) {
4862+
\PHPUnit\Framework\Assert::assertEquals(
4863+
'PATCH / HTTP/1.1',
4864+
$instance->requestHeaders['Request-Line']
4865+
);
4866+
\PHPUnit\Framework\Assert::assertEquals(Test::TEST_URL, $instance->url);
4867+
\PHPUnit\Framework\Assert::assertEquals(Test::TEST_URL, $instance->effectiveUrl);
4868+
});
4869+
$multi_curl->start();
4870+
}
4871+
4872+
public function testPutDataArray()
4873+
{
4874+
$data = ['key' => 'value'];
4875+
4876+
$multi_curl = new MultiCurl();
4877+
$multi_curl->setHeader('X-DEBUG-TEST', 'put');
4878+
$multi_curl->addPut(Test::TEST_URL, $data);
4879+
$multi_curl->complete(function ($instance) {
4880+
\PHPUnit\Framework\Assert::assertEquals(
4881+
'PUT / HTTP/1.1',
4882+
$instance->requestHeaders['Request-Line']
4883+
);
4884+
\PHPUnit\Framework\Assert::assertEquals(Test::TEST_URL, $instance->url);
4885+
\PHPUnit\Framework\Assert::assertEquals(Test::TEST_URL, $instance->effectiveUrl);
4886+
\PHPUnit\Framework\Assert::assertEquals('key=value', $instance->response);
4887+
});
4888+
$multi_curl->start();
4889+
}
4890+
4891+
public function testPutDataString()
4892+
{
4893+
$data = str_repeat('-', 100);
4894+
4895+
$multi_curl = new MultiCurl();
4896+
$multi_curl->setHeader('X-DEBUG-TEST', 'put');
4897+
$multi_curl->addPut(Test::TEST_URL, $data);
4898+
$multi_curl->complete(function ($instance) use ($data) {
4899+
\PHPUnit\Framework\Assert::assertEquals(
4900+
'PUT / HTTP/1.1',
4901+
$instance->requestHeaders['Request-Line']
4902+
);
4903+
\PHPUnit\Framework\Assert::assertEquals(Test::TEST_URL, $instance->url);
4904+
\PHPUnit\Framework\Assert::assertEquals(Test::TEST_URL, $instance->effectiveUrl);
4905+
});
4906+
$multi_curl->start();
4907+
}
4908+
4909+
public function testSearchDataArray()
4910+
{
4911+
$data = ['key' => 'value'];
4912+
4913+
$multi_curl = new MultiCurl();
4914+
$multi_curl->setHeader('X-DEBUG-TEST', 'search');
4915+
$multi_curl->addSearch(Test::TEST_URL, $data);
4916+
$multi_curl->complete(function ($instance) {
4917+
\PHPUnit\Framework\Assert::assertEquals(
4918+
'SEARCH / HTTP/1.1',
4919+
$instance->requestHeaders['Request-Line']
4920+
);
4921+
\PHPUnit\Framework\Assert::assertEquals(Test::TEST_URL, $instance->url);
4922+
\PHPUnit\Framework\Assert::assertEquals(Test::TEST_URL, $instance->effectiveUrl);
4923+
});
4924+
$multi_curl->start();
4925+
}
4926+
4927+
public function testSearchDataString()
4928+
{
4929+
$data = str_repeat('-', 100);
4930+
4931+
$multi_curl = new MultiCurl();
4932+
$multi_curl->setHeader('X-DEBUG-TEST', 'search');
4933+
$multi_curl->addSearch(Test::TEST_URL, $data);
4934+
$multi_curl->complete(function ($instance) use ($data) {
4935+
\PHPUnit\Framework\Assert::assertEquals(
4936+
'SEARCH / HTTP/1.1',
4937+
$instance->requestHeaders['Request-Line']
4938+
);
4939+
\PHPUnit\Framework\Assert::assertEquals(Test::TEST_URL, $instance->url);
4940+
\PHPUnit\Framework\Assert::assertEquals(Test::TEST_URL, $instance->effectiveUrl);
4941+
});
4942+
$multi_curl->start();
4943+
}
48354944
}

0 commit comments

Comments
 (0)