apply code standards

Author: daneastmond

README.md

@@ -22,7 +22,7 @@ to your `composer.json` file:
 ```json
 {
     "require": {
-        "PatronBase/omnipay-smartpay": "~3.0"
+        "PatronBase/omnipay-windcave-hpp": "~1.0"
     }
 }
 ```
@@ -36,7 +36,7 @@ And run composer to update your dependencies:
 
 The following gateways are provided by this package:
 
-* SmartPay\Merchant Hosted Integration v1.0
+* Windcave REST API Hosted Payment Page (HPP)
 
 For general usage instructions, please see the main [Omnipay](https://github.com/thephpleague/omnipay)
 repository.
@@ -51,5 +51,5 @@ If you want to keep up to date with release anouncements, discuss ideas for the
 or ask more detailed questions, there is also a [mailing list](https://groups.google.com/forum/#!forum/omnipay) which
 you can subscribe to.
 
-If you believe you have found a bug, please report it using the [GitHub issue tracker](https://github.com/PatronBase/omnipay-smartpay/issues),
+If you believe you have found a bug, please report it using the [GitHub issue tracker](https://github.com/PatronBase/omnipay-windcave-hpp/issues),
 or better yet, fork the library and submit a pull request.

src/Gateway.php

@@ -10,15 +10,13 @@
 /**
  * Windcave HPP Payment Gateway
  */
-class Gateway extends AbstractGateway
-{
+class Gateway extends AbstractGateway {
     /**
      * Get name
      *
      * @return string
      */
-    public function getName()
-    {
+    public function getName() {
         return 'Windcave Hpp';
     }
 
@@ -27,28 +25,23 @@ public function getName()
      *
      * @return array
      */
-    public function getDefaultParameters()
-    {
+    public function getDefaultParameters() {
         return [];
     }
 
-    public function setApiUsername($value)
-    {
+    public function setApiUsername($value) {
         return $this->setParameter('apiUsername', $value);
     }
 
-    public function getApiUsername()
-    {
+    public function getApiUsername() {
         return $this->getParameter('apiUsername');
     }
 
-    public function setApiKey($value)
-    {
+    public function setApiKey($value) {
         return $this->setParameter('apiKey', $value);
     }
 
-    public function getApiKey()
-    {
+    public function getApiKey() {
         return $this->getParameter('apiKey');
     }
 
@@ -59,8 +52,7 @@ public function getApiKey()
      *
      * @return Omnipay\WindcaveHpp\Message\PurchaseRequest
      */
-    public function purchase(array $parameters = [])
-    {
+    public function purchase(array $parameters = []) {
         return $this->createRequest(
             PurchaseRequest::class,
             $parameters
@@ -74,16 +66,14 @@ public function purchase(array $parameters = [])
      *
      * @return Omnipay\WindcaveHpp\Message\CompletePurchaseRequest
      */
-    public function completePurchase(array $parameters = [])
-    {
+    public function completePurchase(array $parameters = []) {
         return $this->createRequest(
             CompletePurchaseRequest::class,
             $parameters
         );
     }
 
-    public function acceptNotification(array $parameters = [])
-    {
+    public function acceptNotification(array $parameters = []) {
         return $this->createRequest(
             AcceptNotification::class,
             $parameters

src/Message/AcceptNotification.php

@@ -8,20 +8,19 @@
 use Omnipay\Common\Message\NotificationInterface;
 use Symfony\Component\HttpFoundation\Request as HttpRequest;
 
-class AcceptNotification extends PurchaseRequest implements NotificationInterface{
+class AcceptNotification extends PurchaseRequest implements NotificationInterface {
     protected $data;
 
     protected $transaction;
 
-    public function getData()
-    {
+    public function getData() {
         return $this->data;
     }
-    public function sendData($data)
-    {
+
+    public function sendData($data) {
         $sessionId = $this->httpRequest->query->get('sessionId') ?? $this->httpRequest->request->get('sessionId') ?? '';
 
-        if ( empty($sessionId) ) {
+        if (empty($sessionId)) {
             throw new InvalidRequestException('Session id is required');
         }
 
@@ -33,7 +32,8 @@ public function sendData($data)
 
         try {
             $httpResponse = $this->httpClient->request('GET', $this->getEndpoint('sessions/' . $sessionId), $headers);
-        } catch (\Exception $exception) {
+        }
+        catch (\Exception $exception) {
             throw new InvalidRequestException($exception->getMessage());
         }
 
@@ -45,37 +45,31 @@ public function sendData($data)
         return $this;
     }
 
-    public function getTransaction()
-    {
+    public function getTransaction() {
         return $this->transaction;
     }
 
-    public function getTransactionReference()
-    {
+    public function getTransactionReference() {
         return $this->getTransaction()['id'] ?? '';
     }
 
-    public function getTransactionStatus()
-    {
-        if ( $this->getTransaction() && $this->getAuthorised() && $this->getResponseText() === 'APPROVED' )  {
+    public function getTransactionStatus() {
+        if ($this->getTransaction() && $this->getAuthorised() && $this->getResponseText() === 'APPROVED')  {
             return static::STATUS_COMPLETED;
         }
 
         return static::STATUS_FAILED;
     }
 
-    public function getAuthorised()
-    {
+    public function getAuthorised() {
         return $this->getTransaction()['authorised'] ?? false;
     }
 
-    public function getResponseText()
-    {
+    public function getResponseText() {
         return strtoupper($this->getTransaction()['responseText']) ?? '';
     }
 
-    public function getMessage()
-    {
+    public function getMessage() {
         return $this->getResponseText() ?? '';
     }
 }

src/Message/CompletePurchaseRequest.php

@@ -7,16 +7,14 @@
 /**
  * Windcave HPP Complete Purchase Request
  */
-class CompletePurchaseRequest extends PurchaseRequest
-{
-    public function getData()
-    {
+class CompletePurchaseRequest extends PurchaseRequest {
+    public function getData() {
         return $this->httpRequest->request->all();
 
     }
-    public function sendData($data)
-    {
-        if ( !$data['sessionId'] ) {
+
+    public function sendData($data) {
+        if (!$data['sessionId']) {
             throw new InvalidRequestException('Session id is required');
         }
 
@@ -30,7 +28,8 @@ public function sendData($data)
 
         try {
             $httpResponse = $this->httpClient->request('GET', $this->getEndpoint('sessions/' . $sessionId), $headers);
-        } catch (\Exception $exception) {
+        }
+        catch (\Exception $exception) {
             throw new InvalidRequestException($exception->getMessage());
         }
 

src/Message/CompletePurchaseResponse.php

@@ -9,8 +9,7 @@
 /**
  * Windcave HPP Complete Purchase Response
  */
-class CompletePurchaseResponse extends AbstractResponse
-{
+class CompletePurchaseResponse extends AbstractResponse {
     /**
      * Constructor
      *
@@ -19,81 +18,67 @@ class CompletePurchaseResponse extends AbstractResponse
      *
      * @throws InvalidResponseException If merchant data or order number is missing, or signature does not match
      */
-    public function __construct(RequestInterface $request, $data)
-    {
+    public function __construct(RequestInterface $request, $data) {
         parent::__construct($request, $data);
     }
 
-    public function isSuccessful()
-    {
+    public function isSuccessful() {
         $transaction = $this->getTransactionResult();
 
         return (
             $transaction &&
             ($transaction['authorised'] ?? false) &&
-            ( strtoupper($transaction['responseText'] ?? '') ) === 'APPROVED'
+            (strtoupper($transaction['responseText'] ?? '')) === 'APPROVED'
         ) ?? false;
     }
 
-    protected function getTransactionResult()
-    {
+    protected function getTransactionResult() {
         return $this->getData()['transactions'][0] ?? [];
     }
 
-    public function getTransactionId()
-    {
+    public function getTransactionId() {
         return $this->getTransactionResult()['merchantReference'] ?? '';
     }
 
-    public function getTransactionReference()
-    {
+    public function getTransactionReference() {
         return $this->getTransactionResult()['id'] ?? '';
     }
 
-    public function getTransactionType()
-    {
+    public function getTransactionType() {
         return $this->getTransactionResult()['type'] ?? '';
     }
 
-    public function getMessage()
-    {
+    public function getMessage() {
         return $this->getResponseText() ?? '';
     }
 
-    public function getResponseText()
-    {
+    public function getResponseText() {
         $transaction = $this->getTransactionResult();
 
         return $transaction['responseText'] ?? '';
     }
 
-    public function getSessionId()
-    {
+    public function getSessionId() {
         return $this->getTransactionResult()['sessionId'] ?? '';
     }
 
-    public function getCard()
-    {
+    public function getCard() {
         return $this->getTransactionResult()['card'] ?? '';
     }
 
-    public function getCardNumber()
-    {
+    public function getCardNumber() {
         return $this->getCard()['cardNumber'] ?? '';
     }
 
-    public function cardHolderName()
-    {
+    public function cardHolderName() {
         return $this->getCard()['cardHolderName'] ?? '';
     }
 
-    public function getCardExpiry()
-    {
+    public function getCardExpiry() {
         return ($this->getCard()['dateExpiryMonth'] ?? '') . '/' . ($this->getCard()['dateExpiryYear'] ?? '');
     }
 
-    public function getCardType()
-    {
+    public function getCardType() {
         return $this->getCard()['type'] ?? '';
     }
 }