From 1e2b630964074596f83b12ad3dba29dc92ee8eed Mon Sep 17 00:00:00 2001 From: "Benedict E. Pranata" Date: Tue, 23 Jul 2019 13:34:58 +0700 Subject: [PATCH 01/13] Add Delete Zone Method --- src/Endpoints/Zones.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/Endpoints/Zones.php b/src/Endpoints/Zones.php index 7330a27..c1338e4 100644 --- a/src/Endpoints/Zones.php +++ b/src/Endpoints/Zones.php @@ -233,4 +233,18 @@ class Zones implements API return false; } + + /** + * Delete Zone + */ + public function deleteZone(string $identifier): bool + { + $user = $this->adapter->delete('zones/' . $identifier); + $this->body = json_decode($user->getBody()); + if (isset($this->body->result->id)) { + return true; + } + + return false; + } } From 956174048407d87a394f7d8589eee68e4f86f7f2 Mon Sep 17 00:00:00 2001 From: "Benedict E. Pranata" Date: Tue, 23 Jul 2019 13:39:40 +0700 Subject: [PATCH 02/13] Create deleteTest.json For testing deleteZone method --- tests/Fixtures/Endpoints/deleteTest.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 tests/Fixtures/Endpoints/deleteTest.json diff --git a/tests/Fixtures/Endpoints/deleteTest.json b/tests/Fixtures/Endpoints/deleteTest.json new file mode 100644 index 0000000..2951fe4 --- /dev/null +++ b/tests/Fixtures/Endpoints/deleteTest.json @@ -0,0 +1,8 @@ +{ + "success": true, + "errors": [], + "messages": [], + "result": { + "id": "9a7806061c88ada191ed06f989cc3dac" + } +} From cb24d2c77fced76849778d29667d9ae7acb38e97 Mon Sep 17 00:00:00 2001 From: "Benedict E. Pranata" Date: Tue, 23 Jul 2019 13:42:06 +0700 Subject: [PATCH 03/13] Add deleteZone test --- tests/Endpoints/ZonesTest.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/Endpoints/ZonesTest.php b/tests/Endpoints/ZonesTest.php index f6b75fc..7db28ea 100644 --- a/tests/Endpoints/ZonesTest.php +++ b/tests/Endpoints/ZonesTest.php @@ -262,4 +262,24 @@ class ZonesTest extends TestCase $this->assertTrue($result); $this->assertEquals('023e105f4ecef8ad9ca31a8372d0c353', $zones->getBody()->result->id); } + + public function testDeleteTest() + { + $response = $this->getPsr7JsonResponseForFixture('Endpoints/deleteTest.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') + ); + + $zones = new \Cloudflare\API\Endpoints\Zones($mock); + $result = $zones->deleteZone('023e105f4ecef8ad9ca31a8372d0c353'); + + $this->assertTrue($result); + $this->assertEquals('9a7806061c88ada191ed06f989cc3dac', $zones->getBody()->result->id); + } } From 440492e41c8930c42eac648d4f4f7c1a3fbaa71b Mon Sep 17 00:00:00 2001 From: "Benedict E. Pranata" Date: Tue, 23 Jul 2019 15:07:16 +0700 Subject: [PATCH 04/13] Rename deleteTest.json to deleteZoneTest.json --- tests/Fixtures/Endpoints/{deleteTest.json => deleteZoneTest.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/Fixtures/Endpoints/{deleteTest.json => deleteZoneTest.json} (100%) diff --git a/tests/Fixtures/Endpoints/deleteTest.json b/tests/Fixtures/Endpoints/deleteZoneTest.json similarity index 100% rename from tests/Fixtures/Endpoints/deleteTest.json rename to tests/Fixtures/Endpoints/deleteZoneTest.json From 818e6e4505f5fec4b5d1c99a1812d85fc8f3ad84 Mon Sep 17 00:00:00 2001 From: "Benedict E. Pranata" Date: Tue, 23 Jul 2019 15:07:58 +0700 Subject: [PATCH 05/13] Update method testDeleteTest --- tests/Endpoints/ZonesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Endpoints/ZonesTest.php b/tests/Endpoints/ZonesTest.php index 7db28ea..6468d37 100644 --- a/tests/Endpoints/ZonesTest.php +++ b/tests/Endpoints/ZonesTest.php @@ -265,7 +265,7 @@ class ZonesTest extends TestCase public function testDeleteTest() { - $response = $this->getPsr7JsonResponseForFixture('Endpoints/deleteTest.json'); + $response = $this->getPsr7JsonResponseForFixture('Endpoints/deleteZoneTest.json'); $mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock(); $mock->method('delete')->willReturn($response); From c525cef45cbc0a72048709e37c93d540f9431643 Mon Sep 17 00:00:00 2001 From: "Benedict E. Pranata" Date: Wed, 24 Jul 2019 09:12:59 +0700 Subject: [PATCH 06/13] Refactor ZonesTest Refactoring ZonesTest to keep number of public methods under 10 --- tests/Endpoints/ZonesTest.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/Endpoints/ZonesTest.php b/tests/Endpoints/ZonesTest.php index 6468d37..6eee929 100644 --- a/tests/Endpoints/ZonesTest.php +++ b/tests/Endpoints/ZonesTest.php @@ -8,7 +8,7 @@ */ class ZonesTest extends TestCase { - public function testAddZone() + private function testAddZone() { $response = $this->getPsr7JsonResponseForFixture('Endpoints/addZone.json'); @@ -69,7 +69,7 @@ class ZonesTest extends TestCase $this->assertEquals('023e105f4ecef8ad9ca31a8372d0c353', $zones->getBody()->result->id); } - public function testListZones() + private function testListZones() { $response = $this->getPsr7JsonResponseForFixture('Endpoints/listZones.json'); @@ -263,9 +263,9 @@ class ZonesTest extends TestCase $this->assertEquals('023e105f4ecef8ad9ca31a8372d0c353', $zones->getBody()->result->id); } - public function testDeleteTest() + private function testDeleteTest() { - $response = $this->getPsr7JsonResponseForFixture('Endpoints/deleteZoneTest.json'); + $response = $this->getPsr7JsonResponseForFixture('Endpoints/deleteTest.json'); $mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock(); $mock->method('delete')->willReturn($response); @@ -282,4 +282,10 @@ class ZonesTest extends TestCase $this->assertTrue($result); $this->assertEquals('9a7806061c88ada191ed06f989cc3dac', $zones->getBody()->result->id); } + + public function testAddListDeleteZone(){ + $this->testAddZone(); + $this->testListZones(); + $this->testDeleteTest(); + } } From 4cb9eb228ef722aaa9356cf94ef158e5e38dd46d Mon Sep 17 00:00:00 2001 From: "Benedict E. Pranata" Date: Wed, 24 Jul 2019 09:21:06 +0700 Subject: [PATCH 07/13] Rollback ZonesTest.php --- tests/Endpoints/ZonesTest.php | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/tests/Endpoints/ZonesTest.php b/tests/Endpoints/ZonesTest.php index 6eee929..3342564 100644 --- a/tests/Endpoints/ZonesTest.php +++ b/tests/Endpoints/ZonesTest.php @@ -8,7 +8,7 @@ */ class ZonesTest extends TestCase { - private function testAddZone() + public function testAddZone() { $response = $this->getPsr7JsonResponseForFixture('Endpoints/addZone.json'); @@ -69,7 +69,7 @@ class ZonesTest extends TestCase $this->assertEquals('023e105f4ecef8ad9ca31a8372d0c353', $zones->getBody()->result->id); } - private function testListZones() + public function testListZones() { $response = $this->getPsr7JsonResponseForFixture('Endpoints/listZones.json'); @@ -262,30 +262,5 @@ class ZonesTest extends TestCase $this->assertTrue($result); $this->assertEquals('023e105f4ecef8ad9ca31a8372d0c353', $zones->getBody()->result->id); } - - private function testDeleteTest() - { - $response = $this->getPsr7JsonResponseForFixture('Endpoints/deleteTest.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') - ); - - $zones = new \Cloudflare\API\Endpoints\Zones($mock); - $result = $zones->deleteZone('023e105f4ecef8ad9ca31a8372d0c353'); - - $this->assertTrue($result); - $this->assertEquals('9a7806061c88ada191ed06f989cc3dac', $zones->getBody()->result->id); - } - - public function testAddListDeleteZone(){ - $this->testAddZone(); - $this->testListZones(); - $this->testDeleteTest(); - } + } From 274517553c4eaf4eca86b7592beb6f68bbfde845 Mon Sep 17 00:00:00 2001 From: "Benedict E. Pranata" Date: Wed, 24 Jul 2019 09:22:27 +0700 Subject: [PATCH 08/13] Create ZoneDeleteTest.php --- tests/Endpoints/ZoneDeleteTest.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 tests/Endpoints/ZoneDeleteTest.php diff --git a/tests/Endpoints/ZoneDeleteTest.php b/tests/Endpoints/ZoneDeleteTest.php new file mode 100644 index 0000000..aa0ff2f --- /dev/null +++ b/tests/Endpoints/ZoneDeleteTest.php @@ -0,0 +1,19 @@ +getPsr7JsonResponseForFixture('Endpoints/deleteTest.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') + ); + $zones = new \Cloudflare\API\Endpoints\Zones($mock); + $result = $zones->deleteZone('023e105f4ecef8ad9ca31a8372d0c353'); + $this->assertTrue($result); + $this->assertEquals('9a7806061c88ada191ed06f989cc3dac', $zones->getBody()->result->id); + } +} From 8e279f22173e54dbc820bb99dbb3dbbddb3d5fbd Mon Sep 17 00:00:00 2001 From: "Benedict E. Pranata" Date: Wed, 24 Jul 2019 09:27:07 +0700 Subject: [PATCH 09/13] Update ZoneDeleteTest.php --- tests/Endpoints/ZoneDeleteTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Endpoints/ZoneDeleteTest.php b/tests/Endpoints/ZoneDeleteTest.php index aa0ff2f..0495c43 100644 --- a/tests/Endpoints/ZoneDeleteTest.php +++ b/tests/Endpoints/ZoneDeleteTest.php @@ -3,7 +3,7 @@ class ZoneDeleteTest extends TestCase { public function testDeleteTest() { - $response = $this->getPsr7JsonResponseForFixture('Endpoints/deleteTest.json'); + $response = $this->getPsr7JsonResponseForFixture('Endpoints/deleteZoneTest.json'); $mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock(); $mock->method('delete')->willReturn($response); $mock->expects($this->once()) From fd17c57b6231bfc719376a20297896165d1580c0 Mon Sep 17 00:00:00 2001 From: "Benedict E. Pranata" Date: Thu, 12 Sep 2019 14:36:55 +0700 Subject: [PATCH 10/13] Remove tab character Line 249 --- src/Endpoints/Zones.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Endpoints/Zones.php b/src/Endpoints/Zones.php index c1338e4..03773c2 100644 --- a/src/Endpoints/Zones.php +++ b/src/Endpoints/Zones.php @@ -246,5 +246,5 @@ class Zones implements API } return false; - } + } } From 171c6689afc21787fb7ebe62eecf0688bec44143 Mon Sep 17 00:00:00 2001 From: "Benedict E. Pranata" Date: Thu, 12 Sep 2019 14:38:28 +0700 Subject: [PATCH 11/13] Remove trailing space line 20 From 469d66e92aa1304d272059fd4d5976e28fa2b884 Mon Sep 17 00:00:00 2001 From: "Benedict E. Pranata" Date: Thu, 12 Sep 2019 14:38:58 +0700 Subject: [PATCH 12/13] Remove trailing space line 18 --- tests/Endpoints/ZoneDeleteTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Endpoints/ZoneDeleteTest.php b/tests/Endpoints/ZoneDeleteTest.php index 0495c43..5ffd4e1 100644 --- a/tests/Endpoints/ZoneDeleteTest.php +++ b/tests/Endpoints/ZoneDeleteTest.php @@ -15,5 +15,5 @@ class ZoneDeleteTest extends TestCase $result = $zones->deleteZone('023e105f4ecef8ad9ca31a8372d0c353'); $this->assertTrue($result); $this->assertEquals('9a7806061c88ada191ed06f989cc3dac', $zones->getBody()->result->id); - } + } } From 56b760bb066d99d3ee86f2a0df1dee3f82409c0c Mon Sep 17 00:00:00 2001 From: "Benedict E. Pranata" Date: Thu, 12 Sep 2019 14:39:52 +0700 Subject: [PATCH 13/13] Remove new line line 265 --- tests/Endpoints/ZonesTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Endpoints/ZonesTest.php b/tests/Endpoints/ZonesTest.php index 3342564..f6b75fc 100644 --- a/tests/Endpoints/ZonesTest.php +++ b/tests/Endpoints/ZonesTest.php @@ -262,5 +262,4 @@ class ZonesTest extends TestCase $this->assertTrue($result); $this->assertEquals('023e105f4ecef8ad9ca31a8372d0c353', $zones->getBody()->result->id); } - }