Clean code

Author: vuongxuongminh

src/Message/AbstractResponse.php

@@ -10,6 +10,8 @@
 use Omnipay\Common\Message\AbstractResponse as BaseAbstractResponse;
 
 /**
+ * @method AbstractRequest getRequest()
+ *
  * @author Vuong Minh <vuongxuongminh@gmail.com>
  * @since 1.0.0
  */

src/Message/Concerns/RequestHash.php

@@ -24,7 +24,9 @@ trait RequestHash
     protected function generateHash(): string
     {
         $data = [];
-        $rsa = new RSAEncrypt($this->getParameter('publicKey'));
+        $rsa = new RSAEncrypt(
+            $this->getPublicKey()
+        );
         $parameters = $this->getParameters();
 
         foreach ($this->getHashParameters() as $pos => $parameter) {

src/Message/Concerns/RequestSignature.php

@@ -24,7 +24,9 @@ trait RequestSignature
     protected function generateSignature(): string
     {
         $data = [];
-        $signature = new Signature($this->getParameter('secretKey'));
+        $signature = new Signature(
+            $this->getSecretKey()
+        );
         $parameters = $this->getParameters();
 
         foreach ($this->getSignatureParameters() as $pos => $parameter) {

src/Message/Concerns/ResponseSignatureValidation.php

@@ -25,8 +25,9 @@ trait ResponseSignatureValidation
     protected function validateSignature(): void
     {
         $data = [];
-        $requestParameters = $this->getRequest()->getParameters();
-        $signature = new Signature($requestParameters['secretKey']);
+        $signature = new Signature(
+            $this->getRequest()->getSecretKey()
+        );
 
         foreach ($this->getSignatureParameters() as $pos => $parameter) {
             if (! is_string($pos)) {

tests/AllInOne/Message/PurchaseResponseTest.php

@@ -30,9 +30,7 @@ public function testPurchaseSuccess()
     {
         $httpResponse = $this->getMockHttpResponse('PurchaseSuccess.txt');
         $request = $this->getMockRequest();
-        $request->shouldReceive('getParameters')->once()->andReturn([
-            'secretKey' => 'fj00YKnJhmYqahaFWUgkg75saNTzMrbO',
-        ]);
+        $request->shouldReceive('getSecretKey')->once()->andReturn('fj00YKnJhmYqahaFWUgkg75saNTzMrbO');
         $response = new PurchaseResponse(
             $request,
             json_decode($httpResponse->getBody()->getContents(), true)

tests/AppInApp/Message/PurchaseResponseTest.php

@@ -30,9 +30,7 @@ public function testResponse()
     {
         $httpResponse = $this->getMockHttpResponse('PurchaseSuccess.txt');
         $request = $this->getMockRequest();
-        $request->shouldReceive('getParameters')->once()->andReturn([
-            'secretKey' => 'fj00YKnJhmYqahaFWUgkg75saNTzMrbO',
-        ]);
+        $request->shouldReceive('getSecretKey')->once()->andReturn('fj00YKnJhmYqahaFWUgkg75saNTzMrbO');
         $response = new PurchaseResponse(
             $request,
             json_decode($httpResponse->getBody()->getContents(), true)

tests/Message/PayConfirmResponseTest.php

@@ -30,9 +30,7 @@ public function testResponse()
     {
         $httpResponse = $this->getMockHttpResponse('PayConfirmResponse.txt');
         $request = $this->getMockRequest();
-        $request->shouldReceive('getParameters')->once()->andReturn([
-            'secretKey' => 'fj00YKnJhmYqahaFWUgkg75saNTzMrbO',
-        ]);
+        $request->shouldReceive('getSecretKey')->once()->andReturn('fj00YKnJhmYqahaFWUgkg75saNTzMrbO');
         $response = new PayConfirmResponse(
             $request,
             json_decode($httpResponse->getBody()->getContents(), true)

tests/QRCode/Message/NotificationResponseTest.php

@@ -29,9 +29,7 @@ public function testConstruct()
     public function testResponse()
     {
         $request = $this->getMockRequest();
-        $request->shouldReceive('getParameters')->once()->andReturn([
-            'secretKey' => 'fj00YKnJhmYqahaFWUgkg75saNTzMrbO',
-        ]);
+        $request->shouldReceive('getSecretKey')->once()->andReturn('fj00YKnJhmYqahaFWUgkg75saNTzMrbO');
         $response = new NotificationResponse(
             $request,
             [