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

Fixed merge conflict

Browse Source
This commit is contained in:
Anthony Sterling
2018-02-27 09:45:51 +00:00
parent 730b0c97ee dc53414c2a
commit 3585dde8ea
40 changed files with 640 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/Adapter/GuzzleTest.php
View File

@@ -29,14 +29,14 @@ class GuzzleTest extends TestCase
$response = $this->client->get('https://httpbin.org/get');
$headers = $response->getHeaders();
$this->assertEquals("application/json", $headers["Content-Type"][0]);
$this->assertEquals('application/json', $headers['Content-Type'][0]);
$body = json_decode($response->getBody());
$this->assertEquals("Test", $body->headers->{"X-Testing"});
$this->assertEquals('Test', $body->headers->{'X-Testing'});
$response = $this->client->get('https://httpbin.org/get', [], ['X-Another-Test' => 'Test2']);
$body = json_decode($response->getBody());
$this->assertEquals("Test2", $body->headers->{"X-Another-Test"});
$this->assertEquals('Test2', $body->headers->{'X-Another-Test'});
}
public function testPost()
@@ -44,10 +44,10 @@ class GuzzleTest extends TestCase
$response = $this->client->post('https://httpbin.org/post', [], ['X-Post-Test' => 'Testing a POST request.']);
$headers = $response->getHeaders();
$this->assertEquals("application/json", $headers["Content-Type"][0]);
$this->assertEquals('application/json', $headers['Content-Type'][0]);
$body = json_decode($response->getBody());
$this->assertEquals("Testing a POST request.", $body->json->{"X-Post-Test"});
$this->assertEquals('Testing a POST request.', $body->json->{'X-Post-Test'});
}
public function testPut()
@@ -55,10 +55,10 @@ class GuzzleTest extends TestCase
$response = $this->client->put('https://httpbin.org/put', [], ['X-Put-Test' => 'Testing a PUT request.']);
$headers = $response->getHeaders();
$this->assertEquals("application/json", $headers["Content-Type"][0]);
$this->assertEquals('application/json', $headers['Content-Type'][0]);
$body = json_decode($response->getBody());
$this->assertEquals("Testing a PUT request.", $body->json->{"X-Put-Test"});
$this->assertEquals('Testing a PUT request.', $body->json->{'X-Put-Test'});
}
public function testPatch()
@@ -70,10 +70,10 @@ class GuzzleTest extends TestCase
);
$headers = $response->getHeaders();
$this->assertEquals("application/json", $headers["Content-Type"][0]);
$this->assertEquals('application/json', $headers['Content-Type'][0]);
$body = json_decode($response->getBody());
$this->assertEquals("Testing a PATCH request.", $body->json->{"X-Patch-Test"});
$this->assertEquals('Testing a PATCH request.', $body->json->{'X-Patch-Test'});
}
public function testDelete()
@@ -85,10 +85,10 @@ class GuzzleTest extends TestCase
);
$headers = $response->getHeaders();
$this->assertEquals("application/json", $headers["Content-Type"][0]);
$this->assertEquals('application/json', $headers['Content-Type'][0]);
$body = json_decode($response->getBody());
$this->assertEquals("Testing a DELETE request.", $body->json->{"X-Delete-Test"});
$this->assertEquals('Testing a DELETE request.', $body->json->{'X-Delete-Test'});
}
public function testErrors()

2
tests/Auth/APIKeyTest.php
View File

@@ -18,6 +18,6 @@ class APIKeyTest extends TestCase
$this->assertEquals('example@example.com', $headers['X-Auth-Email']);
$this->assertEquals('1234567893feefc5f0q5000bfo0c38d90bbeb', $headers['X-Auth-Key']);
$this->assertEquals(2, sizeof($headers));
$this->assertCount(2, $headers);
}
}

2
tests/Auth/NoneTest.php
View File

@@ -6,8 +6,6 @@
* Time: 20:08
*/
use Cloudflare\API\Auth\None;
class NoneTest extends TestCase
{
public function testGetHeaders()

4
tests/Auth/UserServiceKeyTest.php
View File

@@ -9,7 +9,7 @@ class UserServiceKeyTest extends TestCase
{
public function testGetHeaders()
{
$auth = new \Cloudflare\API\Auth\UserServiceKey("v1.0-e24fd090c02efcfecb4de8f4ff246fd5c75b48946fdf0ce26c59f91d0d90797b-cfa33fe60e8e34073c149323454383fc9005d25c9b4c502c2f063457ef65322eade065975001a0b4b4c591c5e1bd36a6e8f7e2d4fa8a9ec01c64c041e99530c2-07b9efe0acd78c82c8d9c690aacb8656d81c369246d7f996a205fe3c18e9254a");
$auth = new \Cloudflare\API\Auth\UserServiceKey('v1.0-e24fd090c02efcfecb4de8f4ff246fd5c75b48946fdf0ce26c59f91d0d90797b-cfa33fe60e8e34073c149323454383fc9005d25c9b4c502c2f063457ef65322eade065975001a0b4b4c591c5e1bd36a6e8f7e2d4fa8a9ec01c64c041e99530c2-07b9efe0acd78c82c8d9c690aacb8656d81c369246d7f996a205fe3c18e9254a');
$headers = $auth->getHeaders();
$this->assertArrayHasKey('X-Auth-User-Service-Key', $headers);
@@ -19,6 +19,6 @@ class UserServiceKeyTest extends TestCase
$headers['X-Auth-User-Service-Key']
);
$this->assertEquals(1, sizeof($headers));
$this->assertCount(1, $headers);
}
}

2
tests/Configurations/ConfigurationsUARulesTest.php
View File

@@ -14,7 +14,7 @@ class ConfigurationsUARulesTest extends TestCase
$configuration->addUA('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/603.2.4 (KHTML, like Gecko) Version/10.1.1 Safari/603.2.4');
$array = $configuration->getArray();
$this->assertEquals(1, sizeof($array));
$this->assertCount(1, $array);
$this->assertObjectHasAttribute('target', $array[0]);
$this->assertEquals('ua', $array[0]->target);

6
tests/Configurations/ZoneLockdownTest.php → tests/Configurations/ConfigurationsZoneLockdownTest.php
View File

@@ -6,7 +6,7 @@
* Date: 05/09/2017
* Time: 13:50
*/
class ConfigurationZoneLockdownTest extends TestCase
class ConfigurationsZoneLockdownTest extends TestCase
{
public function testGetArray()
{
@@ -14,7 +14,7 @@ class ConfigurationZoneLockdownTest extends TestCase
$configuration->addIP('1.2.3.4');
$array = $configuration->getArray();
$this->assertEquals(1, sizeof($array));
$this->assertCount(1, $array);
$this->assertObjectHasAttribute('target', $array[0]);
$this->assertEquals('ip', $array[0]->target);
@@ -24,7 +24,7 @@ class ConfigurationZoneLockdownTest extends TestCase
$configuration->addIPRange('1.2.3.4/24');
$array = $configuration->getArray();
$this->assertEquals(2, sizeof($array));
$this->assertCount(2, $array);
$this->assertObjectHasAttribute('target', $array[1]);
$this->assertEquals('ip_range', $array[1]->target);

6
tests/Configurations/PageRulesTargetTest.php
View File

@@ -15,8 +15,8 @@ class PageRulesTargetTest extends TestCase
$targets = new PageRulesTargets('junade.com/*');
$array = $targets->getArray();
$this->assertEquals(1, sizeof($array));
$this->assertEquals("junade.com/*", $array[0]->constraint->value);
$this->assertEquals("matches", $array[0]->constraint->operator);
$this->assertCount(1, $array);
$this->assertEquals('junade.com/*', $array[0]->constraint->value);
$this->assertEquals('matches', $array[0]->constraint->operator);
}
}

112
tests/Endpoints/AccessRulesTest.php Normal file
View File

@@ -0,0 +1,112 @@
<?php
class AccessRulesTest extends TestCase
{
public function testListRules()
{
$response = $this->getPsr7JsonResponseForFixture('Endpoints/listAccessRules.json');
$mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock();
$mock->method('get')->willReturn($response);
$mock->expects($this->once())
->method('get')
->with(
$this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/access_rules/rules'),
$this->equalTo([
'page' => 1,
'per_page' => 50,
'match' => 'all'
]),
$this->equalTo([])
);
$zones = new \Cloudflare\API\Endpoints\AccessRules($mock);
$result = $zones->listRules('023e105f4ecef8ad9ca31a8372d0c353');
$this->assertObjectHasAttribute('result', $result);
$this->assertObjectHasAttribute('result_info', $result);
$this->assertEquals('92f17202ed8bd63d69a66b86a49a8f6b', $result->result[0]->id);
$this->assertEquals(1, $result->result_info->page);
}
public function testCreateRule()
{
$config = new \Cloudflare\API\Configurations\AccessRules();
$config->setIP('1.2.3.4');
$response = $this->getPsr7JsonResponseForFixture('Endpoints/createAccessRule.json');
$mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock();
$mock->method('post')->willReturn($response);
$mock->expects($this->once())
->method('post')
->with(
$this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/access_rules/rules'),
$this->equalTo([]),
$this->equalTo([
'mode' => 'challenge',
'configuration' => (object) $config->getArray(),
'notes' => 'This rule is on because of an event that occured on date X',
])
);
$rules = new \Cloudflare\API\Endpoints\AccessRules($mock);
$rules->createRule(
'023e105f4ecef8ad9ca31a8372d0c353',
'challenge',
$config,
'This rule is on because of an event that occured on date X'
);
}
public function testUpdateRule()
{
$response = $this->getPsr7JsonResponseForFixture('Endpoints/updateAccessRule.json');
$mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock();
$mock->method('patch')->willReturn($response);
$mock->expects($this->once())
->method('patch')
->with(
$this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/access_rules/rules/92f17202ed8bd63d69a66b86a49a8f6b'),
$this->equalTo([]),
$this->equalTo([
'mode' => 'challenge',
'notes' => 'This rule is on because of an event that occured on date X',
])
);
$rules = new \Cloudflare\API\Endpoints\AccessRules($mock);
$rules->updateRule(
'023e105f4ecef8ad9ca31a8372d0c353',
'92f17202ed8bd63d69a66b86a49a8f6b',
'challenge',
'This rule is on because of an event that occured on date X'
);
}
public function testDeleteRule()
{
$response = $this->getPsr7JsonResponseForFixture('Endpoints/deleteAccessRule.json');
$mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock();
$mock->method('delete')->willReturn($response);
$mock->expects($this->once())
->method('delete')
->with(
$this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/access_rules/rules/92f17202ed8bd63d69a66b86a49a8f6b'),
$this->equalTo([]),
$this->equalTo([
'cascade' => 'none'
])
);
$rules = new \Cloudflare\API\Endpoints\AccessRules($mock);
$rules->deleteRule('023e105f4ecef8ad9ca31a8372d0c353', '92f17202ed8bd63d69a66b86a49a8f6b');
}
}

16
tests/Endpoints/DNSTest.php
View File

@@ -57,12 +57,12 @@ class DNSTest extends TestCase
);
$zones = new \Cloudflare\API\Endpoints\DNS($mock);
$result = $zones->listRecords("023e105f4ecef8ad9ca31a8372d0c353", "A", "example.com", "127.0.0.1", 1, 20, "type", "desc", "all");
$result = $zones->listRecords('023e105f4ecef8ad9ca31a8372d0c353', 'A', 'example.com', '127.0.0.1', 1, 20, 'type', 'desc');
$this->assertObjectHasAttribute('result', $result);
$this->assertObjectHasAttribute('result_info', $result);
$this->assertEquals("372e67954025e0ba6aaa6d586b9e0b59", $result->result[0]->id);
$this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $result->result[0]->id);
$this->assertEquals(1, $result->result_info->page);
}
@@ -81,9 +81,9 @@ class DNSTest extends TestCase
);
$dns = new \Cloudflare\API\Endpoints\DNS($mock);
$result = $dns->getRecordDetails("023e105f4ecef8ad9ca31a8372d0c353", "372e67954025e0ba6aaa6d586b9e0b59");
$result = $dns->getRecordDetails('023e105f4ecef8ad9ca31a8372d0c353', '372e67954025e0ba6aaa6d586b9e0b59');
$this->assertEquals("372e67954025e0ba6aaa6d586b9e0b59", $result->id);
$this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $result->id);
}
public function testUpdateDNSRecord()
@@ -95,8 +95,8 @@ class DNSTest extends TestCase
$details = [
'type' => 'A',
'name' => "example.com",
'content' => "1.2.3.4",
'name' => 'example.com',
'content' => '1.2.3.4',
'ttl' => 120,
'proxied' => false,
];
@@ -110,9 +110,9 @@ class DNSTest extends TestCase
);
$dns = new \Cloudflare\API\Endpoints\DNS($mock);
$result = $dns->updateRecordDetails("023e105f4ecef8ad9ca31a8372d0c353", "372e67954025e0ba6aaa6d586b9e0b59", $details);
$result = $dns->updateRecordDetails('023e105f4ecef8ad9ca31a8372d0c353', '372e67954025e0ba6aaa6d586b9e0b59', $details);
$this->assertEquals("372e67954025e0ba6aaa6d586b9e0b59", $result->result->id);
$this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $result->result->id);
foreach ($details as $property => $value) {
$this->assertEquals($result->result->{ $property }, $value);

6
tests/Endpoints/IPsTest.php
View File

@@ -6,8 +6,6 @@
* Time: 20:16
*/
use Cloudflare\API\Endpoints\IPs;
class IPsTest extends TestCase
{
public function testListIPs()
@@ -26,7 +24,7 @@ class IPsTest extends TestCase
$ips = new \Cloudflare\API\Endpoints\IPs($mock);
$ips = $ips->listIPs();
$this->assertObjectHasAttribute("ipv4_cidrs", $ips);
$this->assertObjectHasAttribute("ipv6_cidrs", $ips);
$this->assertObjectHasAttribute('ipv4_cidrs', $ips);
$this->assertObjectHasAttribute('ipv6_cidrs', $ips);
}
}

2
tests/Endpoints/PageRulesTest.php
View File

@@ -6,8 +6,6 @@
* Time: 19:25
*/
use Cloudflare\API\Adapter\PageRules;
class PageRulesTest extends TestCase
{
public function testCreatePageRule()

18
tests/Endpoints/RailgunTest.php
View File

@@ -6,14 +6,12 @@
* Time: 11:20
*/
use Cloudflare\API\Endpoints\Railgun;
class RailgunTest extends TestCase
{
public function testcreate()
{
$details = [
'name' => "My Railgun",
'name' => 'My Railgun',
];
$response = $this->getPsr7JsonResponseForFixture('Endpoints/createRailgun.json');
@@ -59,7 +57,7 @@ class RailgunTest extends TestCase
);
$railgun = new \Cloudflare\API\Endpoints\Railgun($mock);
$result = $railgun->list(1, 20, "desc");
$result = $railgun->list(1, 20, 'desc');
$this->assertObjectHasAttribute('result', $result);
$this->assertObjectHasAttribute('result_info', $result);
@@ -80,9 +78,9 @@ class RailgunTest extends TestCase
);
$railgun = new \Cloudflare\API\Endpoints\Railgun($mock);
$result = $railgun->get("e928d310693a83094309acf9ead50448");
$result = $railgun->get('e928d310693a83094309acf9ead50448');
$this->assertEquals("e928d310693a83094309acf9ead50448", $result->id);
$this->assertEquals('e928d310693a83094309acf9ead50448', $result->id);
}
public function testgetZones()
@@ -101,7 +99,7 @@ class RailgunTest extends TestCase
);
$railgun = new \Cloudflare\API\Endpoints\Railgun($mock);
$result = $railgun->getZones("e928d310693a83094309acf9ead50448");
$result = $railgun->getZones('e928d310693a83094309acf9ead50448');
$this->assertObjectHasAttribute('result', $result);
$this->assertObjectHasAttribute('result_info', $result);
@@ -127,9 +125,9 @@ class RailgunTest extends TestCase
);
$waf = new \Cloudflare\API\Endpoints\Railgun($mock);
$result = $waf->update("e928d310693a83094309acf9ead50448", true);
$result = $waf->update('e928d310693a83094309acf9ead50448', true);
$this->assertEquals("e928d310693a83094309acf9ead50448", $result->id);
$this->assertEquals('e928d310693a83094309acf9ead50448', $result->id);
}
public function testdelete()
@@ -148,6 +146,6 @@ class RailgunTest extends TestCase
);
$waf = new \Cloudflare\API\Endpoints\Railgun($mock);
$waf->delete("e928d310693a83094309acf9ead50448");
$waf->delete('e928d310693a83094309acf9ead50448');
}
}

8
tests/Endpoints/UARulesTest.php
View File

@@ -27,12 +27,12 @@ class UARulesTest extends TestCase
);
$zones = new \Cloudflare\API\Endpoints\UARules($mock);
$result = $zones->listRules("023e105f4ecef8ad9ca31a8372d0c353", 1, 20);
$result = $zones->listRules('023e105f4ecef8ad9ca31a8372d0c353');
$this->assertObjectHasAttribute('result', $result);
$this->assertObjectHasAttribute('result_info', $result);
$this->assertEquals("372e67954025e0ba6aaa6d586b9e0b59", $result->result[0]->id);
$this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $result->result[0]->id);
$this->assertEquals(1, $result->result_info->page);
}
@@ -84,9 +84,9 @@ class UARulesTest extends TestCase
);
$lockdown = new \Cloudflare\API\Endpoints\UARules($mock);
$result = $lockdown->getRuleDetails("023e105f4ecef8ad9ca31a8372d0c353", "372e67954025e0ba6aaa6d586b9e0b59");
$result = $lockdown->getRuleDetails('023e105f4ecef8ad9ca31a8372d0c353', '372e67954025e0ba6aaa6d586b9e0b59');
$this->assertEquals("372e67954025e0ba6aaa6d586b9e0b59", $result->id);
$this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $result->id);
}
public function testUpdateRule()

14
tests/Endpoints/UserTest.php
View File

@@ -17,10 +17,10 @@ class UserTest extends TestCase
$user = new \Cloudflare\API\Endpoints\User($mock);
$details = $user->getUserDetails();
$this->assertObjectHasAttribute("id", $details);
$this->assertEquals("7c5dae5552338874e5053f2534d2767a", $details->id);
$this->assertObjectHasAttribute("email", $details);
$this->assertEquals("user@example.com", $details->email);
$this->assertObjectHasAttribute('id', $details);
$this->assertEquals('7c5dae5552338874e5053f2534d2767a', $details->id);
$this->assertObjectHasAttribute('email', $details);
$this->assertEquals('user@example.com', $details->email);
}
public function testGetUserID()
@@ -31,7 +31,7 @@ class UserTest extends TestCase
$mock->method('get')->willReturn($response);
$user = new \Cloudflare\API\Endpoints\User($mock);
$this->assertEquals("7c5dae5552338874e5053f2534d2767a", $user->getUserID());
$this->assertEquals('7c5dae5552338874e5053f2534d2767a', $user->getUserID());
}
public function testGetUserEmail()
@@ -44,7 +44,7 @@ class UserTest extends TestCase
$mock->expects($this->once())->method('get');
$user = new \Cloudflare\API\Endpoints\User($mock);
$this->assertEquals("user@example.com", $user->getUserEmail());
$this->assertEquals('user@example.com', $user->getUserEmail());
}
public function testUpdateUserDetails()
@@ -59,6 +59,6 @@ class UserTest extends TestCase
->with($this->equalTo('user'), $this->equalTo([]), $this->equalTo(['email' => 'user2@example.com']));
$user = new \Cloudflare\API\Endpoints\User($mock);
$user->updateUserDetails(['email' => "user2@example.com"]);
$user->updateUserDetails(['email' => 'user2@example.com']);
}
}

38
tests/Endpoints/WAFTest.php
View File

@@ -6,8 +6,6 @@
* Time: 13:34
*/
use Cloudflare\API\Endpoints\WAF;
class WAFTest extends TestCase
{
public function testgetPackages()
@@ -32,12 +30,12 @@ class WAFTest extends TestCase
);
$waf = new \Cloudflare\API\Endpoints\WAF($mock);
$result = $waf->getPackages("023e105f4ecef8ad9ca31a8372d0c353", 1, 20, "status", "desc", "all");
$result = $waf->getPackages('023e105f4ecef8ad9ca31a8372d0c353', 1, 20, 'status', 'desc');
$this->assertObjectHasAttribute('result', $result);
$this->assertObjectHasAttribute('result_info', $result);
$this->assertEquals("a25a9a7e9c00afc1fb2e0245519d725b", $result->result[0]->id);
$this->assertEquals('a25a9a7e9c00afc1fb2e0245519d725b', $result->result[0]->id);
$this->assertEquals(1, $result->result_info->page);
}
@@ -56,9 +54,9 @@ class WAFTest extends TestCase
);
$waf = new \Cloudflare\API\Endpoints\WAF($mock);
$result = $waf->getPackageInfo("023e105f4ecef8ad9ca31a8372d0c353", "a25a9a7e9c00afc1fb2e0245519d725b");
$result = $waf->getPackageInfo('023e105f4ecef8ad9ca31a8372d0c353', 'a25a9a7e9c00afc1fb2e0245519d725b');
$this->assertEquals("a25a9a7e9c00afc1fb2e0245519d725b", $result->id);
$this->assertEquals('a25a9a7e9c00afc1fb2e0245519d725b', $result->id);
}
public function testgetRules()
@@ -83,12 +81,12 @@ class WAFTest extends TestCase
);
$waf = new \Cloudflare\API\Endpoints\WAF($mock);
$result = $waf->getRules("023e105f4ecef8ad9ca31a8372d0c353", "a25a9a7e9c00afc1fb2e0245519d725b", 1, 20, "status", "desc", "all");
$result = $waf->getRules('023e105f4ecef8ad9ca31a8372d0c353', 'a25a9a7e9c00afc1fb2e0245519d725b', 1, 20, 'status', 'desc');
$this->assertObjectHasAttribute('result', $result);
$this->assertObjectHasAttribute('result_info', $result);
$this->assertEquals("92f17202ed8bd63d69a66b86a49a8f6b", $result->result[0]->id);
$this->assertEquals('92f17202ed8bd63d69a66b86a49a8f6b', $result->result[0]->id);
$this->assertEquals(1, $result->result_info->page);
}
@@ -107,9 +105,9 @@ class WAFTest extends TestCase
);
$waf = new \Cloudflare\API\Endpoints\WAF($mock);
$result = $waf->getRuleInfo("023e105f4ecef8ad9ca31a8372d0c353", "a25a9a7e9c00afc1fb2e0245519d725b", "f939de3be84e66e757adcdcb87908023");
$result = $waf->getRuleInfo('023e105f4ecef8ad9ca31a8372d0c353', 'a25a9a7e9c00afc1fb2e0245519d725b', 'f939de3be84e66e757adcdcb87908023');
$this->assertEquals("f939de3be84e66e757adcdcb87908023", $result->id);
$this->assertEquals('f939de3be84e66e757adcdcb87908023', $result->id);
}
public function testupdateRule()
@@ -120,7 +118,7 @@ class WAFTest extends TestCase
$mock->method('patch')->willReturn($response);
$details = [
'mode' => "on",
'mode' => 'on',
];
$mock->expects($this->once())
@@ -132,9 +130,9 @@ class WAFTest extends TestCase
);
$waf = new \Cloudflare\API\Endpoints\WAF($mock);
$result = $waf->updateRule("023e105f4ecef8ad9ca31a8372d0c353", "a25a9a7e9c00afc1fb2e0245519d725b", "f939de3be84e66e757adcdcb87908023", "on");
$result = $waf->updateRule('023e105f4ecef8ad9ca31a8372d0c353', 'a25a9a7e9c00afc1fb2e0245519d725b', 'f939de3be84e66e757adcdcb87908023', 'on');
$this->assertEquals("f939de3be84e66e757adcdcb87908023", $result->id);
$this->assertEquals('f939de3be84e66e757adcdcb87908023', $result->id);
foreach ($details as $property => $value) {
$this->assertEquals($result->{ $property }, $value);
@@ -163,12 +161,12 @@ class WAFTest extends TestCase
);
$waf = new \Cloudflare\API\Endpoints\WAF($mock);
$result = $waf->getGroups("023e105f4ecef8ad9ca31a8372d0c353", "a25a9a7e9c00afc1fb2e0245519d725b", 1, 20, "status", "desc", "all");
$result = $waf->getGroups('023e105f4ecef8ad9ca31a8372d0c353', 'a25a9a7e9c00afc1fb2e0245519d725b', 1, 20, 'status', 'desc');
$this->assertObjectHasAttribute('result', $result);
$this->assertObjectHasAttribute('result_info', $result);
$this->assertEquals("de677e5818985db1285d0e80225f06e5", $result->result[0]->id);
$this->assertEquals('de677e5818985db1285d0e80225f06e5', $result->result[0]->id);
$this->assertEquals(1, $result->result_info->page);
}
@@ -187,9 +185,9 @@ class WAFTest extends TestCase
);
$waf = new \Cloudflare\API\Endpoints\WAF($mock);
$result = $waf->getGroupInfo("023e105f4ecef8ad9ca31a8372d0c353", "a25a9a7e9c00afc1fb2e0245519d725b", "de677e5818985db1285d0e80225f06e5");
$result = $waf->getGroupInfo('023e105f4ecef8ad9ca31a8372d0c353', 'a25a9a7e9c00afc1fb2e0245519d725b', 'de677e5818985db1285d0e80225f06e5');
$this->assertEquals("de677e5818985db1285d0e80225f06e5", $result->id);
$this->assertEquals('de677e5818985db1285d0e80225f06e5', $result->id);
}
public function testupdateGroup()
@@ -200,7 +198,7 @@ class WAFTest extends TestCase
$mock->method('patch')->willReturn($response);
$details = [
'mode' => "off",
'mode' => 'off',
];
$mock->expects($this->once())
@@ -212,9 +210,9 @@ class WAFTest extends TestCase
);
$waf = new \Cloudflare\API\Endpoints\WAF($mock);
$result = $waf->updateGroup("023e105f4ecef8ad9ca31a8372d0c353", "a25a9a7e9c00afc1fb2e0245519d725b", "de677e5818985db1285d0e80225f06e5", "off");
$result = $waf->updateGroup('023e105f4ecef8ad9ca31a8372d0c353', 'a25a9a7e9c00afc1fb2e0245519d725b', 'de677e5818985db1285d0e80225f06e5', 'off');
$this->assertEquals("de677e5818985db1285d0e80225f06e5", $result->id);
$this->assertEquals('de677e5818985db1285d0e80225f06e5', $result->id);
foreach ($details as $property => $value) {
$this->assertEquals($result->{ $property }, $value);

16
tests/Endpoints/ZoneLockdownTest.php
View File

@@ -27,12 +27,12 @@ class ZoneLockdownTest extends TestCase
);
$zones = new \Cloudflare\API\Endpoints\ZoneLockdown($mock);
$result = $zones->listLockdowns("023e105f4ecef8ad9ca31a8372d0c353", 1, 20);
$result = $zones->listLockdowns('023e105f4ecef8ad9ca31a8372d0c353');
$this->assertObjectHasAttribute('result', $result);
$this->assertObjectHasAttribute('result_info', $result);
$this->assertEquals("372e67954025e0ba6aaa6d586b9e0b59", $result->result[0]->id);
$this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $result->result[0]->id);
$this->assertEquals(1, $result->result_info->page);
}
@@ -52,7 +52,7 @@ class ZoneLockdownTest extends TestCase
$this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/lockdowns'),
$this->equalTo([]),
$this->equalTo([
'urls' => ["api.mysite.com/some/endpoint*"],
'urls' => ['api.mysite.com/some/endpoint*'],
'id' => '372e67954025e0ba6aaa6d586b9e0b59',
'description' => 'Restrict access to these endpoints to requests from a known IP address',
'configurations' => $config->getArray(),
@@ -62,7 +62,7 @@ class ZoneLockdownTest extends TestCase
$zoneLockdown = new \Cloudflare\API\Endpoints\ZoneLockdown($mock);
$zoneLockdown->createLockdown(
'023e105f4ecef8ad9ca31a8372d0c353',
["api.mysite.com/some/endpoint*"],
['api.mysite.com/some/endpoint*'],
$config,
'372e67954025e0ba6aaa6d586b9e0b59',
'Restrict access to these endpoints to requests from a known IP address'
@@ -84,9 +84,9 @@ class ZoneLockdownTest extends TestCase
);
$lockdown = new \Cloudflare\API\Endpoints\ZoneLockdown($mock);
$result = $lockdown->getLockdownDetails("023e105f4ecef8ad9ca31a8372d0c353", "372e67954025e0ba6aaa6d586b9e0b59");
$result = $lockdown->getLockdownDetails('023e105f4ecef8ad9ca31a8372d0c353', '372e67954025e0ba6aaa6d586b9e0b59');
$this->assertEquals("372e67954025e0ba6aaa6d586b9e0b59", $result->id);
$this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $result->id);
}
public function testUpdateLockdown()
@@ -105,7 +105,7 @@ class ZoneLockdownTest extends TestCase
$this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/lockdowns/372e67954025e0ba6aaa6d586b9e0b59'),
$this->equalTo([]),
$this->equalTo([
'urls' => ["api.mysite.com/some/endpoint*"],
'urls' => ['api.mysite.com/some/endpoint*'],
'id' => '372e67954025e0ba6aaa6d586b9e0b59',
'description' => 'Restrict access to these endpoints to requests from a known IP address',
'configurations' => $config->getArray(),
@@ -116,7 +116,7 @@ class ZoneLockdownTest extends TestCase
$zoneLockdown->updateLockdown(
'023e105f4ecef8ad9ca31a8372d0c353',
'372e67954025e0ba6aaa6d586b9e0b59',
["api.mysite.com/some/endpoint*"],
['api.mysite.com/some/endpoint*'],
$config,
'Restrict access to these endpoints to requests from a known IP address'
);

47
tests/Endpoints/ZonesTest.php
View File

@@ -20,33 +20,34 @@ class ZonesTest extends TestCase
->with(
$this->equalTo('zones'),
$this->equalTo([]),
$this->equalTo(['name' => 'example.com', 'jumpstart' => false])
$this->equalTo(['name' => 'example.com', 'jump_start' => false])
);
$zones = new \Cloudflare\API\Endpoints\Zones($mock);
$result = $zones->addZone("example.com");
$result = $zones->addZone('example.com');
$this->assertObjectHasAttribute("id", $result);
$this->assertEquals("023e105f4ecef8ad9ca31a8372d0c353", $result->id);
$this->assertObjectHasAttribute('id', $result);
$this->assertEquals('023e105f4ecef8ad9ca31a8372d0c353', $result->id);
$response = $this->getPsr7JsonResponseForFixture('Endpoints/createPageRule.json');
$mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock();
$mock->method('post')->willReturn($response);
$org = new stdClass();
$org->id = "01a7362d577a6c3019a474fd6f485823";
$mock->expects($this->once())
->method('post')
->with(
$this->equalTo('zones'),
$this->equalTo([]),
$this->equalTo(['name' => 'example.com', 'jumpstart' => true, 'organization' => $org])
$this->equalTo([
'name' => 'example.com',
'jump_start' => true,
'organization' => (object)['id' => '01a7362d577a6c3019a474fd6f485823']
])
);
$zones = new \Cloudflare\API\Endpoints\Zones($mock);
$zones->addZone("example.com", true, "01a7362d577a6c3019a474fd6f485823");
$zones->addZone('example.com', true, '01a7362d577a6c3019a474fd6f485823');
}
public function testActivationTest()
@@ -65,7 +66,7 @@ class ZonesTest extends TestCase
);
$zones = new \Cloudflare\API\Endpoints\Zones($mock);
$result = $zones->activationCheck("c2547eb745079dac9320b638f5e225cf483cc5cfdda41");
$result = $zones->activationCheck('c2547eb745079dac9320b638f5e225cf483cc5cfdda41');
$this->assertTrue($result);
}
@@ -94,12 +95,12 @@ class ZonesTest extends TestCase
);
$zones = new \Cloudflare\API\Endpoints\Zones($mock);
$result = $zones->listZones("example.com", "active", 1, 20, "status", "desc", "all");
$result = $zones->listZones('example.com', 'active', 1, 20, 'status', 'desc');
$this->assertObjectHasAttribute('result', $result);
$this->assertObjectHasAttribute('result_info', $result);
$this->assertEquals("023e105f4ecef8ad9ca31a8372d0c353", $result->result[0]->id);
$this->assertEquals('023e105f4ecef8ad9ca31a8372d0c353', $result->result[0]->id);
$this->assertEquals(1, $result->result_info->page);
}
@@ -124,9 +125,9 @@ class ZonesTest extends TestCase
);
$zones = new \Cloudflare\API\Endpoints\Zones($mock);
$result = $zones->getZoneID("example.com");
$result = $zones->getZoneID('example.com');
$this->assertEquals("023e105f4ecef8ad9ca31a8372d0c353", $result);
$this->assertEquals('023e105f4ecef8ad9ca31a8372d0c353', $result);
}
public function testGetAnalyticsDashboard()
@@ -140,15 +141,15 @@ class ZonesTest extends TestCase
->method('get')
->with(
$this->equalTo('zones/c2547eb745079dac9320b638f5e225cf483cc5cfdda41/analytics/dashboard'),
$this->equalTo([]),
$this->equalTo(["since" => "-10080", "until" => "0", "continuous" => true])
$this->equalTo(['since' => '-10080', 'until' => '0', 'continuous' => var_export(true, true)]),
$this->equalTo([])
);
$zones = new \Cloudflare\API\Endpoints\Zones($mock);
$analytics = $zones->getAnalyticsDashboard("c2547eb745079dac9320b638f5e225cf483cc5cfdda41");
$analytics = $zones->getAnalyticsDashboard('c2547eb745079dac9320b638f5e225cf483cc5cfdda41');
$this->assertObjectHasAttribute("since", $analytics->totals);
$this->assertObjectHasAttribute("since", $analytics->timeseries[0]);
$this->assertObjectHasAttribute('since', $analytics->totals);
$this->assertObjectHasAttribute('since', $analytics->timeseries[0]);
}
public function testChangeDevelopmentMode()
@@ -163,11 +164,11 @@ class ZonesTest extends TestCase
->with(
$this->equalTo('zones/c2547eb745079dac9320b638f5e225cf483cc5cfdda41/settings/development_mode'),
$this->equalTo([]),
$this->equalTo(["value" => "on"])
$this->equalTo(['value' => 'on'])
);
$zones = new \Cloudflare\API\Endpoints\Zones($mock);
$result = $zones->changeDevelopmentMode("c2547eb745079dac9320b638f5e225cf483cc5cfdda41", true);
$result = $zones->changeDevelopmentMode('c2547eb745079dac9320b638f5e225cf483cc5cfdda41', true);
$this->assertTrue($result);
}
@@ -184,11 +185,11 @@ class ZonesTest extends TestCase
->with(
$this->equalTo('zones/c2547eb745079dac9320b638f5e225cf483cc5cfdda41/purge_cache'),
$this->equalTo([]),
$this->equalTo(["purge_everything" => true])
$this->equalTo(['purge_everything' => true])
);
$zones = new \Cloudflare\API\Endpoints\Zones($mock);
$result = $zones->cachePurgeEverything("c2547eb745079dac9320b638f5e225cf483cc5cfdda41");
$result = $zones->cachePurgeEverything('c2547eb745079dac9320b638f5e225cf483cc5cfdda41');
$this->assertTrue($result);
}

30
tests/Fixtures/Endpoints/createAccessRule.json Normal file
View File

@@ -0,0 +1,30 @@
{
"success": true,
"errors": [
{}
],
"messages": [
{}
],
"result": {
"id": "92f17202ed8bd63d69a66b86a49a8f6b",
"notes": "This rule is on because of an event that occured on date X",
"allowed_modes": [
"whitelist",
"block",
"challenge"
],
"mode": "challenge",
"configuration": {
"target": "ip",
"value": "1.2.3.4"
},
"scope": {
"id": "7c5dae5552338874e5053f2534d2767a",
"email": "user@example.com",
"type": "user"
},
"created_on": "2014-01-01T05:20:00.12345Z",
"modified_on": "2014-01-01T05:20:00.12345Z"
}
}

12
tests/Fixtures/Endpoints/deleteAccessRule.json Normal file
View File

@@ -0,0 +1,12 @@
{
"success": true,
"errors": [
{}
],
"messages": [
{}
],
"result": {
"id": "92f17202ed8bd63d69a66b86a49a8f6b"
}
}

38
tests/Fixtures/Endpoints/listAccessRules.json Normal file
View File

@@ -0,0 +1,38 @@
{
"success": true,
"errors": [
{}
],
"messages": [
{}
],
"result": [
{
"id": "92f17202ed8bd63d69a66b86a49a8f6b",
"notes": "This rule is on because of an event that occured on date X",
"allowed_modes": [
"whitelist",
"block",
"challenge"
],
"mode": "challenge",
"configuration": {
"target": "ip",
"value": "1.2.3.4"
},
"scope": {
"id": "7c5dae5552338874e5053f2534d2767a",
"email": "user@example.com",
"type": "user"
},
"created_on": "2014-01-01T05:20:00.12345Z",
"modified_on": "2014-01-01T05:20:00.12345Z"
}
],
"result_info": {
"page": 1,
"per_page": 20,
"count": 1,
"total_count": 2000
}
}

30
tests/Fixtures/Endpoints/updateAccessRule.json Normal file
View File

@@ -0,0 +1,30 @@
{
"success": true,
"errors": [
{}
],
"messages": [
{}
],
"result": {
"id": "92f17202ed8bd63d69a66b86a49a8f6b",
"notes": "This rule is on because of an event that occured on date X",
"allowed_modes": [
"whitelist",
"block",
"challenge"
],
"mode": "challenge",
"configuration": {
"target": "ip",
"value": "1.2.3.4"
},
"scope": {
"id": "7c5dae5552338874e5053f2534d2767a",
"email": "user@example.com",
"type": "user"
},
"created_on": "2014-01-01T05:20:00.12345Z",
"modified_on": "2014-01-01T05:20:00.12345Z"
}
}

4
tests/TestCase.php
View File

@@ -11,7 +11,7 @@ abstract class TestCase extends PHPUnit_Framework_TestCase
* Returns a PSR7 Stream for a given fixture.
*
* @param string $fixture The fixture to create the stream for.
* @return Psr7Stream
* @return Psr7\Stream
*/
protected function getPsr7StreamForFixture($fixture): Psr7\Stream
{
@@ -31,7 +31,7 @@ abstract class TestCase extends PHPUnit_Framework_TestCase
*
* @param string $fixture The fixture to create the response for.
* @param integer $statusCode A HTTP Status Code for the response.
* @return Psr7Response
* @return Psr7\Response
*/
protected function getPsr7JsonResponseForFixture($fixture, $statusCode = 200): Psr7\Response
{