Strikewood / omnipay-first-atlantic-commerce

src/Gateway.php

Braces +11 added lines, -22 removed lines

@@ -8,23 +8,20 @@ 
 /**
  * First Atlantic Commerce Payment Gateway 2 (XML POST Service)
  */
-class Gateway extends AbstractGateway
-{
+class Gateway extends AbstractGateway {
     use ParameterTrait;
 
     /**
      * @return string Gateway name.
      */
-    public function getName()
-    {
+    public function getName() {
         return 'First Atlantic Commerce Payment Gateway 2';
     }
 
     /**
      * @return array Default parameters.
      */
-    public function getDefaultParameters()
-    {
+    public function getDefaultParameters() {
         return [
             'merchantId'       => null,
             'merchantPassword' => null,
@@ -41,8 +38,7 @@ 
      *
      * @return \Omnipay\FirstAtlanticCommerce\Message\AuthorizeRequest
      */
-    public function authorize(array $parameters = [])
-    {
+    public function authorize(array $parameters = []) {
         return $this->createRequest('\Omnipay\FirstAtlanticCommerce\Message\AuthorizeRequest', $parameters);
     }
 
@@ -53,8 +49,7 @@ 
      *
      * @return \Omnipay\FirstAtlanticCommerce\Message\CaptureRequest
      */
-    public function capture(array $parameters = [])
-    {
+    public function capture(array $parameters = []) {
         return $this->createRequest('\Omnipay\FirstAtlanticCommerce\Message\CaptureRequest', $parameters);
     }
 
@@ -65,8 +60,7 @@ 
      *
      * @return \Omnipay\FirstAtlanticCommerce\Message\PurchaseRequest
      */
-    public function purchase(array $parameters = [])
-    {
+    public function purchase(array $parameters = []) {
         return $this->createRequest('\Omnipay\FirstAtlanticCommerce\Message\PurchaseRequest', $parameters);
     }
 
@@ -77,8 +71,7 @@ 
      *
      * @return \Omnipay\FirstAtlanticCommerce\Message\RefundRequest
      */
-    public function refund(array $parameters = [])
-    {
+    public function refund(array $parameters = []) {
         return $this->createRequest('\Omnipay\FirstAtlanticCommerce\Message\RefundRequest', $parameters);
     }
 
@@ -89,8 +82,7 @@ 
      *
      * @return \Omnipay\FirstAtlanticCommerce\Message\VoidRequest
      */
-    public function void(array $parameters = [])
-    {
+    public function void(array $parameters = []) {
         return $this->createRequest('\Omnipay\FirstAtlanticCommerce\Message\VoidRequest', $parameters);
     }
 
@@ -101,8 +93,7 @@ 
      *
      * @return \Omnipay\FirstAtlanticCommerce\Message\StatusRequest
      */
-    public function status(array $parameters = [])
-    {
+    public function status(array $parameters = []) {
         return $this->createRequest('\Omnipay\FirstAtlanticCommerce\Message\StatusRequest', $parameters);
     }
 
@@ -113,8 +104,7 @@ 
      *
      * @return \Omnipay\FirstAtlanticCommerce\Message\CreateCardRequest
      */
-    public function createCard(array $parameters = [])
-    {
+    public function createCard(array $parameters = []) {
         return $this->createRequest('\Omnipay\FirstAtlanticCommerce\Message\CreateCardRequest', $parameters);
     }
 
@@ -125,8 +115,7 @@ 
      *
      * @return \Omnipay\FirstAtlanticCommerce\Message\UpdateCardRequest
      */
-    public function updateCard(array $parameters = [])
-    {
+    public function updateCard(array $parameters = []) {
         return $this->createRequest('\Omnipay\FirstAtlanticCommerce\Message\UpdateCardRequest', $parameters);
     }
 }

src/CreditCard.php

Braces +12 added lines, -24 removed lines

@@ -5,8 +5,7 @@ 
 use Omnipay\Common\CreditCard as BaseCreditCard;
 use Omnipay\Common\Exception\InvalidCreditCardException;
 
-class CreditCard extends BaseCreditCard
-{
+class CreditCard extends BaseCreditCard {
     /**
      * Validate this credit card. If the card is invalid, InvalidCreditCardException is thrown.
      *
@@ -18,50 +17,39 @@ 
      * @param string ... Optional variable length list of required parameters
      * @throws InvalidCreditCardException
      */
-    public function validate()
-    {
+    public function validate() {
         $parameters = func_get_args();
 
-        if ( count($parameters) == 0 )
-        {
+        if ( count($parameters) == 0 ) {
             $parameters = ['number', 'cvv', 'expiryMonth', 'expiryYear'];
         }
 
-        foreach ($parameters as $key)
-        {
+        foreach ($parameters as $key) {
             $value = $this->parameters->get($key);
 
-            if ( empty($value) )
-            {
+            if ( empty($value) ) {
                 throw new InvalidCreditCardException("The $key parameter is required");
             }
         }
 
-        if ( isset($parameters['expiryMonth']) && isset($parameters['expiryYear']) )
-        {
-            if ( $this->getExpiryDate('Ym') < gmdate('Ym') )
-            {
+        if ( isset($parameters['expiryMonth']) && isset($parameters['expiryYear']) ) {
+            if ( $this->getExpiryDate('Ym') < gmdate('Ym') ) {
                 throw new InvalidCreditCardException('Card has expired');
             }
         }
 
-        if ( isset($parameters['number']) )
-        {
-            if ( !Helper::validateLuhn( $this->getNumber() ) )
-            {
+        if ( isset($parameters['number']) ) {
+            if ( !Helper::validateLuhn( $this->getNumber() ) ) {
                 throw new InvalidCreditCardException('Card number is invalid');
             }
 
-            if ( !is_null( $this->getNumber() ) && !preg_match( '/^\d{12,19}$/i', $this->getNumber() ) )
-            {
+            if ( !is_null( $this->getNumber() ) && !preg_match( '/^\d{12,19}$/i', $this->getNumber() ) ) {
                 throw new InvalidCreditCardException('Card number should have 12 to 19 digits');
             }
         }
 
-        if ( isset($parameters['cvv']) )
-        {
-            if ( !is_null( $this->getCvv() ) && !preg_match( '/^\d{3,4}$/i', $this->getCvv() ) )
-            {
+        if ( isset($parameters['cvv']) ) {
+            if ( !is_null( $this->getCvv() ) && !preg_match( '/^\d{3,4}$/i', $this->getCvv() ) ) {
                 throw new InvalidCreditCardException('Card CVV should have 3 to 4 digits');
             }
         }

src/Message/VoidRequest.php

Braces +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
 /**
  * FACPG2 Reversal Request
  */
-class VoidRequest extends TransactionModificationRequest
-{
+class VoidRequest extends TransactionModificationRequest {
     /**
      * Flag as a reversal
      *

src/Message/AuthorizeRequest.php

Braces +20 added lines, -43 removed lines

@@ -9,8 +9,7 @@ 
 /**
  * FACPG2 Authorize Request
  */
-class AuthorizeRequest extends AbstractRequest
-{
+class AuthorizeRequest extends AbstractRequest {
     /**
      * @var string;
      */
@@ -29,8 +28,7 @@ 
      * @return string base64 encoded sha1 hash of the merchantPassword, merchantId,
      *    acquirerId, transactionId, amount and currency code.
      */
-    protected function generateSignature()
-    {
+    protected function generateSignature() {
         $signature  = $this->getMerchantPassword();
         $signature .= $this->getMerchantId();
         $signature .= $this->getAcquirerId();
@@ -46,19 +44,16 @@ 
      *
      * @return array
      */
-    public function getData()
-    {
+    public function getData() {
         $this->validate('merchantId', 'merchantPassword', 'acquirerId', 'transactionId', 'amount', 'currency', 'card');
 
         // Check for AVS and require billingAddress1 and billingPostcode
-        if ( $this->getRequireAvsCheck() )
-        {
+        if ( $this->getRequireAvsCheck() ) {
             $this->getCard()->validate('billingAddress1', 'billingPostcode');
         }
 
         // Tokenized cards require the CVV and nothing else, token replaces the card number
-        if ( $this->getCardReference() )
-        {
+        if ( $this->getCardReference() ) {
             $this->validate('cardReference');
             $this->getCard()->validate('cvv', 'expiryMonth', 'expiryYear');
 
@@ -67,9 +62,7 @@ 
                 'CardExpiryDate' => $this->getCard()->getExpiryDate('my'),
                 'CardNumber'     => $this->getCardReference()
             ];
-        }
-        else
-        {
+        } else {
             $this->getCard()->validate();
 
             $cardDetails = [
@@ -81,8 +74,7 @@ 
         }
 
         // Only pass the StartDate if year/month are set otherwise it returns 1299
-        if ( $this->getCard()->getStartYear() && $this->getCard()->getStartMonth() )
-        {
+        if ( $this->getCard()->getStartYear() && $this->getCard()->getStartMonth() ) {
             $cardDetails['StartDate'] = $this->getCard()->getStartDate('my');
         }
 
@@ -112,8 +104,7 @@ 
         ];
 
         // FAC only accepts two digit state abbreviations from the USA
-        if ( $billingDetails['BillToCountry'] == 840 )
-        {
+        if ( $billingDetails['BillToCountry'] == 840 ) {
             $billingDetails['BillToState'] = $this->formatState();
         }
 
@@ -133,24 +124,17 @@ 
      *
      * @return int ISO 3166-1 numeric country
      */
-    protected function formatCountry()
-    {
+    protected function formatCountry() {
         $country = $this->getCard()->getCountry();
 
-        if ( !is_null($country) && !is_numeric($country) )
-        {
+        if ( !is_null($country) && !is_numeric($country) ) {
             $iso3166 = new ISO3166;
 
-            if ( strlen($country) == 2 )
-            {
+            if ( strlen($country) == 2 ) {
                 $country = $iso3166->getByAlpha2($country)['numeric'];
-            }
-            elseif ( strlen($country) == 3 )
-            {
+            } elseif ( strlen($country) == 3 ) {
                 $country = $iso3166->getByAlpha3($country)['numeric'];
-            }
-            else
-            {
+            } else {
                 throw new InvalidRequestException("The country parameter must be ISO 3166-1 numeric, aplha2 or alpha3.");
             }
         }
@@ -165,12 +149,10 @@ 
      *
      * @return string State abbreviation
      */
-    public function formatState()
-    {
+    public function formatState() {
         $state = $this->getCard()->getState();
 
-        if ( strlen($state) != 2 )
-        {
+        if ( strlen($state) != 2 ) {
             throw new InvalidRequestException("The state must be a two character abbreviation.");
         }
 
@@ -185,12 +167,10 @@ 
      *
      * @return string Postal code
      */
-    public function formatPostcode()
-    {
+    public function formatPostcode() {
         $postal = preg_replace( '/[\s\-]/', '', $this->getCard()->getPostcode() );
 
-        if ( preg_match('/[^a-z0-9]/i', $postal) )
-        {
+        if ( preg_match('/[^a-z0-9]/i', $postal) ) {
             throw new InvalidRequestException("The postal code must be alpha-numeric.");
         }
 
@@ -202,8 +182,7 @@ 
      *
      * @return string Endpoint URL
      */
-    protected function getEndpoint()
-    {
+    protected function getEndpoint() {
         return parent::getEndpoint() . 'Authorize';
     }
 
@@ -212,8 +191,7 @@ 
      *
      * @return int Transaction Code
      */
-    protected function getTransactionCode()
-    {
+    protected function getTransactionCode() {
         return $this->getRequireAvsCheck() ? $this->transactionCode + 1 : $this->transactionCode;
     }
 
@@ -224,8 +202,7 @@ 
      *
      * @return AuthorizeResponse
      */
-    protected function newResponse($xml)
-    {
+    protected function newResponse($xml) {
         return new AuthorizeResponse($this, $xml);
     }
 }

src/Message/CreateCardRequest.php

Braces +7 added lines, -14 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * FACPG2 Tokenize Request
  */
-class CreateCardRequest extends AbstractRequest
-{
+class CreateCardRequest extends AbstractRequest {
     /**
      * @var string;
      */
@@ -20,8 +19,7 @@ 
      * @return string base64 encoded sha1 hash of the merchantPassword, merchantId,
      *    and acquirerId.
      */
-    protected function generateSignature()
-    {
+    protected function generateSignature() {
         $signature  = $this->getMerchantPassword();
         $signature .= $this->getMerchantId();
         $signature .= $this->getAcquirerId();
@@ -34,8 +32,7 @@ 
      *
      * @return array
      */
-    public function getData()
-    {
+    public function getData() {
         $this->validate('merchantId', 'merchantPassword', 'acquirerId', 'customerReference', 'card');
         $this->getCard()->validate();
 
@@ -55,8 +52,7 @@ 
      *
      * @return string
      */
-    public function getCustomerReference()
-    {
+    public function getCustomerReference() {
         return $this->getParameter('customerReference');
     }
 
@@ -65,8 +61,7 @@ 
      *
      * @param string $value
      */
-    public function setCustomerReference($value)
-    {
+    public function setCustomerReference($value) {
         return $this->setParameter('customerReference', $value);
     }
 
@@ -75,8 +70,7 @@ 
      *
      * @return string Endpoint URL
      */
-    protected function getEndpoint()
-    {
+    protected function getEndpoint() {
         return parent::getEndpoint() . 'Tokenize';
     }
 
@@ -87,8 +81,7 @@ 
      *
      * @return CreateCardResponse
      */
-    protected function newResponse($xml)
-    {
+    protected function newResponse($xml) {
         return new CreateCardResponse($this, $xml);
     }
 

src/Message/TransactionModificationResponse.php

Braces +6 added lines, -12 removed lines

@@ -9,18 +9,15 @@ 
 /**
  * FACPG2 Transaction Modification Response
  */
-class TransactionModificationResponse extends AbstractResponse
-{
+class TransactionModificationResponse extends AbstractResponse {
     /**
      * Constructor
      *
      * @param RequestInterface $request
      * @param string $data
      */
-    public function __construct(RequestInterface $request, $data)
-    {
-        if ( empty($data) )
-        {
+    public function __construct(RequestInterface $request, $data) {
+        if ( empty($data) ) {
             throw new InvalidResponseException();
         }
 
@@ -33,8 +30,7 @@ 
      *
      * @return boolean
      */
-    public function isSuccessful()
-    {
+    public function isSuccessful() {
         return isset($this->data['ResponseCode']) && '1' === $this->data['ResponseCode'];
     }
 
@@ -43,8 +39,7 @@ 
      *
      * @return string
      */
-    public function getCode()
-    {
+    public function getCode() {
         return isset($this->data['ReasonCode']) ? $this->data['ReasonCode'] : null;
     }
 
@@ -53,8 +48,7 @@ 
      *
      * @return string
      */
-    public function getMessage()
-    {
+    public function getMessage() {
         return isset($this->data['ReasonCodeDescription']) ? $this->data['ReasonCodeDescription'] : null;
     }
 }

src/Message/AbstractResponse.php

Braces +5 added lines, -10 removed lines

@@ -5,8 +5,7 @@ 
 use Omnipay\Common\Message\AbstractResponse as BaseAbstractResponse;
 use SimpleXMLElement;
 
-abstract class AbstractResponse extends BaseAbstractResponse
-{
+abstract class AbstractResponse extends BaseAbstractResponse {
     /**
      * Seserializes XML to an array
      *
@@ -14,23 +13,19 @@ 
      *
      * @return array data
      */
-    protected function xmlDeserialize($xml)
-    {
+    protected function xmlDeserialize($xml) {
         $array = [];
 
-        if (!$xml instanceof SimpleXMLElement)
-        {
+        if (!$xml instanceof SimpleXMLElement) {
             $xml = new SimpleXMLElement($xml);
         }
 
-        foreach ($xml->children() as $key => $child)
-        {
+        foreach ($xml->children() as $key => $child) {
             $value = (string) $child;
             $_children = $this->xmlDeserialize($child);
             $_push = ( $_hasChild = ( count($_children) > 0 ) ) ? $_children : $value;
 
-            if ( $_hasChild && !empty($value) && $value !== '' )
-            {
+            if ( $_hasChild && !empty($value) && $value !== '' ) {
                 $_push[] = $value;
             }
 

src/Message/TransactionModificationRequest.php

Braces +5 added lines, -10 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * FACPG2 Transaction Modification Request
  */
-class TransactionModificationRequest extends AbstractRequest
-{
+class TransactionModificationRequest extends AbstractRequest {
     /**
      * @var string;
      */
@@ -26,8 +25,7 @@ 
      *
      * @return array
      */
-    public function getData()
-    {
+    public function getData() {
         $this->validate('merchantId', 'merchantPassword', 'acquirerId', 'transactionId', 'amount');
 
         $data = [
@@ -48,8 +46,7 @@ 
      *
      * @return string Endpoint URL
      */
-    protected function getEndpoint()
-    {
+    protected function getEndpoint() {
         return parent::getEndpoint() . 'TransactionModification';
     }
 
@@ -58,8 +55,7 @@ 
      *
      * @return int Modification Type
      */
-    protected function getModificationType()
-    {
+    protected function getModificationType() {
         return $this->modificationType;
     }
 
@@ -70,8 +66,7 @@ 
      *
      * @return ResponseInterface
      */
-    protected function newResponse($xml)
-    {
+    protected function newResponse($xml) {
         return new TransactionModificationResponse($this, $xml);
     }
 }

src/Message/AbstractRequest.php

Braces +12 added lines, -25 removed lines

@@ -7,8 +7,7 @@ 
 use Omnipay\FirstAtlanticCommerce\ParameterTrait;
 use SimpleXMLElement;
 
-abstract class AbstractRequest extends BaseAbstractRequest
-{
+abstract class AbstractRequest extends BaseAbstractRequest {
     use ParameterTrait;
 
     /**
@@ -44,8 +43,7 @@ 
      *
      * @return string The amount padded with zeros on the left to 12 digits and no decimal place.
      */
-    protected function formatAmount()
-    {
+    protected function formatAmount() {
         $amount = $this->getAmount();
 
         $amount = str_replace('.', '', $amount);
@@ -59,8 +57,7 @@ 
      *
      * @return string Endpoint URL
      */
-    protected function getEndpoint()
-    {
+    protected function getEndpoint() {
         return $this->getTestMode() ? $this->testEndpoint : $this->liveEndpoint;
     }
 
@@ -80,8 +77,7 @@ 
      *
      * @return ResponseInterface
      */
-    public function sendData($data)
-    {
+    public function sendData($data) {
         $httpResponse = $this->httpClient->post(
             $this->getEndpoint(),
             ['Content-Type' => 'text/xml; charset=utf-8'],
@@ -99,27 +95,20 @@ 
      *
      * @return string XML
      */
-    protected function xmlSerialize($data, $xml = null)
-    {
-        if ( !$xml instanceof SimpleXMLElement )
-        {
+    protected function xmlSerialize($data, $xml = null) {
+        if ( !$xml instanceof SimpleXMLElement ) {
             $xml = new SimpleXMLElement('<'. $this->requestName .' xmlns="'. $this->namespace .'" />');
         }
 
-        foreach ($data as $key => $value)
-        {
-            if ( !isset($value) )
-            {
+        foreach ($data as $key => $value) {
+            if ( !isset($value) ) {
                 continue;
             }
 
-            if ( is_array($value) )
-            {
+            if ( is_array($value) ) {
                 $node = $xml->addChild($key);
                 $this->xmlSerialize($value, $node);
-            }
-            else
-            {
+            } else {
                 $xml->addChild($key, $value);
             }
         }
@@ -134,10 +123,8 @@ 
      *
      * @return AbstractRequest Provides a fluent interface
      */
-    public function setCard($value)
-    {
-        if ($value && !$value instanceof CreditCard)
-        {
+    public function setCard($value) {
+        if ($value && !$value instanceof CreditCard) {
             $value = new CreditCard($value);
         }