refactor: #10 class extends

Author: shaunthegeek

src/Base.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Coding;
+
+use Coding\Exceptions\ValidationException;
+use Coding\Handlers\Validator;
+
+abstract class Base
+{
+    protected Core $core;
+
+    public function __construct(string $token = '', Core $core = null)
+    {
+        $this->core = $core ?? new Core($token);
+    }
+
+    public function setToken(string $token)
+    {
+        $this->core->setToken($token);
+    }
+
+    protected function validate(array $data, array $rules)
+    {
+        $validator = Validator::getInstance()->make($data, $rules);
+        if ($validator->fails()) {
+            throw new ValidationException($validator->errors()->all()[0]);
+        }
+    }
+}

src/Iteration.php

@@ -2,38 +2,19 @@
 
 namespace Coding;
 
-use Coding\Exceptions\ValidationException;
-use Coding\Handlers\Validator;
-
-class Iteration
+class Iteration extends Base
 {
-    private Core $core;
-
-    public function __construct(string $token = '', Core $core = null)
-    {
-        $this->core = $core ?? new Core($token);
-    }
-
     public function create(array $data)
     {
-        $validator = Validator::getInstance()->make($data, [
+        $this->validate($data, [
             'ProjectName' => 'string|required',
             'Name' => 'string|required',
             'Goal' => 'nullable|string',
             'Assignee' => 'nullable|integer',
             'StartAt' => 'nullable|date_format:Y-m-d',
             'EndAt' => 'nullable|date_format:Y-m-d|after:StartAt',
         ]);
-        if ($validator->fails()) {
-            // TODO Laravel ValidationException no message
-            throw new ValidationException($validator->errors()->all()[0]);
-        }
         $response = $this->core->request('CreateIteration', $data);
         return $response['Iteration'];
     }
-
-    public function setToken(string $token)
-    {
-        $this->core->setToken($token);
-    }
 }

tests/CoreTest.php

@@ -4,10 +4,20 @@
 
 use Coding\Exceptions\ApiError;
 use Coding\Core;
+use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Response;
 
 class CoreTest extends TestCase
 {
+    private Client $clientMock;
+    protected bool $needCoreMock = false;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->clientMock = $this->getMockBuilder(Client::class)->getMock();
+    }
+
     public function testRequestSuccess()
     {
         $responseBody = file_get_contents($this->dataPath('CreateIterationResponse.json'));

tests/IterationTest.php

@@ -10,8 +10,6 @@ class IterationTest extends TestCase
 {
     public function testCreateSuccessWithOnlyRequiredParams()
     {
-        $coreMock = \Mockery::mock(Core::class, [])->makePartial();
-
         $response = json_decode(
             file_get_contents($this->dataPath('CreateIterationResponse.json')),
             true
@@ -20,20 +18,18 @@ public function testCreateSuccessWithOnlyRequiredParams()
             'ProjectName' => $this->projectName,
             'Name' => $this->faker->title,
         ];
-        $coreMock->shouldReceive('request')->times(1)->withArgs([
+        $this->coreMock->shouldReceive('request')->times(1)->withArgs([
             'CreateIteration',
             $data
         ])->andReturn($response);
 
-        $iteration = new Iteration($this->token, $coreMock);
+        $iteration = new Iteration($this->token, $this->coreMock);
         $result = $iteration->create($data);
         $this->assertEquals($response['Iteration'], $result);
     }
 
     public function testCreateSuccessWithRequiredParamsAndNull()
     {
-        $coreMock = \Mockery::mock(Core::class, [])->makePartial();
-
         $response = json_decode(
             file_get_contents($this->dataPath('CreateIterationResponse.json')),
             true
@@ -43,20 +39,18 @@ public function testCreateSuccessWithRequiredParamsAndNull()
             'Name' => $this->faker->title,
             'Goal' => null,
         ];
-        $coreMock->shouldReceive('request')->times(1)->withArgs([
+        $this->coreMock->shouldReceive('request')->times(1)->withArgs([
             'CreateIteration',
             $data
         ])->andReturn($response);
 
-        $iteration = new Iteration($this->token, $coreMock);
+        $iteration = new Iteration($this->token, $this->coreMock);
         $result = $iteration->create($data);
         $this->assertEquals($response['Iteration'], $result);
     }
 
     public function testCreateSuccessWithAllParams()
     {
-        $coreMock = \Mockery::mock(Core::class, [])->makePartial();
-
         $response = json_decode(
             file_get_contents($this->dataPath('CreateIterationResponse.json')),
             true
@@ -70,12 +64,12 @@ public function testCreateSuccessWithAllParams()
             'StartAt' => $startAt,
             'EndAt' => date('Y-m-d', strtotime($startAt) + $this->faker->randomDigitNotZero() * 86400),
         ];
-        $coreMock->shouldReceive('request')->times(1)->withArgs([
+        $this->coreMock->shouldReceive('request')->times(1)->withArgs([
             'CreateIteration',
             $data
         ])->andReturn($response);
 
-        $iteration = new Iteration('', $coreMock);
+        $iteration = new Iteration('', $this->coreMock);
         $iteration->setToken($this->token);
         $result = $iteration->create($data);
         $this->assertEquals($response['Iteration'], $result);

tests/TestCase.php

@@ -2,25 +2,29 @@
 
 namespace Coding\Tests;
 
+use Coding\Core;
 use Faker\Factory;
 use Faker\Generator;
-use GuzzleHttp\Client;
-use PHPUnit\Framework\TestCase as BaseTestBase;
+use Mockery\Mock;
+use PHPUnit\Framework\TestCase as PhpUnitTestBase;
 
-class TestCase extends BaseTestBase
+class TestCase extends PhpunitTestBase
 {
     protected Generator $faker;
-    protected Client $clientMock;
     protected string $token;
     protected string $projectName;
+    protected bool $needCoreMock = true;
+    protected $coreMock;
 
     protected function setUp(): void
     {
         parent::setUp();
         $this->faker = Factory::create();
-        $this->clientMock = $this->getMockBuilder(Client::class)->getMock();
         $this->token = $this->faker->md5;
         $this->projectName = $this->faker->slug;
+        if ($this->needCoreMock) {
+            $this->coreMock = \Mockery::mock(Core::class, [])->makePartial();
+        }
     }
 
     protected function dataPath($fileName): string