YueMi-Development/cloudflare-php
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Code cleanup / Quality of Life updates

Browse Source 
Adapter::get, post, put, patch and delete all had non-optional parameters for $headers and $query or $body. These have been made optional. I also re-ordered the parameters as $headers was never used while $query/$body were heavily used. I also condensed and removed some duplicate calls so that every call to Adapter::get/post sends that call to Adapter::request. It could use a magic method to do this but it might make it more difficult to test.
This commit is contained in:
Darin Randal
2018-04-12 23:11:04 -04:00
parent 35ce8eadf1
commit cca073c809
31 changed files with 169 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/Endpoints/PageRulesTest.php
View File

@@ -23,7 +23,6 @@ class PageRulesTest extends TestCase
->method('post')
->with(
$this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/pagerules'),
$this->equalTo([]),
$this->equalTo([
'targets' => $target->getArray(),
'actions' => $action->getArray(),
@@ -54,8 +53,7 @@ class PageRulesTest extends TestCase
'order' => 'status',
'direction' => 'desc',
'match' => 'all'
]),
$this->equalTo([])
])
);
$pageRules = new \Cloudflare\API\Endpoints\PageRules($mock);
@@ -72,8 +70,7 @@ class PageRulesTest extends TestCase
$mock->expects($this->once())
->method('get')
->with(
$this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/pagerules/9a7806061c88ada191ed06f989cc3dac'),
$this->equalTo([])
$this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/pagerules/9a7806061c88ada191ed06f989cc3dac')
);
$pageRules = new \Cloudflare\API\Endpoints\PageRules($mock);
@@ -95,7 +92,6 @@ class PageRulesTest extends TestCase
->method('patch')
->with(
$this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/pagerules'),
$this->equalTo([]),
$this->equalTo([
'targets' => $target->getArray(),
'actions' => $action->getArray(),
@@ -120,9 +116,7 @@ class PageRulesTest extends TestCase
$mock->expects($this->once())
->method('delete')
->with(
$this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/pagerules/9a7806061c88ada191ed06f989cc3dac'),
$this->equalTo([]),
$this->equalTo([])
$this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/pagerules/9a7806061c88ada191ed06f989cc3dac')
);
$pageRules = new \Cloudflare\API\Endpoints\PageRules($mock);