Merge pull request #10 from tobz-nz/master

Omnipay v3 support.

Author: onlinesid

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false

.travis.yml

@@ -1,12 +1,19 @@
 language: php
 
 php:
- - 5.3
- - 5.4
- - 5.5
- - hhvm
+ - 5.6
+ - 7.0
+ - 7.1
+ - 7.2
+ - 7.3
+ - 7.4
 
-before_script:
+## Cache composer
+cache:
+ directories:
+ - $HOME/.composer/cache
+
+install:
  - composer install -n --dev --prefer-source
 
-script: vendor/bin/phpcs --standard=PSR2 src && vendor/bin/phpunit --coverage-text
+script: vendor/bin/phpcs --standard=PSR2 src && vendor/bin/phpunit --coverage-text

composer.json

@@ -30,18 +30,14 @@
  }
  },
  "require": {
- "omnipay/common": "~2.0"
+ "omnipay/common": "^3.0"
  },
  "require-dev": {
- "guzzle/plugin-mock": "~3.1",
- "mockery/mockery": "~0.7",
- "phpunit/phpunit": "~3.7.0",
- "squizlabs/php_codesniffer": "~1.4",
- "omnipay/tests": "~2.0"
+ "mockery/mockery": "^1.3",
+ "squizlabs/php_codesniffer": "^3.5",
+ "phpunit/phpunit": "~6",
+ "omnipay/tests": "^3.1"
  },
  "extra": {
- "branch-alias": {
- "dev-master": "2.0.x-dev"
- }
  }
-}
+}

src/Message/CompletePurchaseRequest.php

@@ -3,12 +3,12 @@
 namespace Omnipay\Poli\Message;
 
 use Omnipay\Common\Exception\InvalidRequestException;
-use SimpleXMLElement;
 use Omnipay\Common\Exception\InvalidResponseException;
+use SimpleXMLElement;
 
 /**
  * Poli Complete Purchase Request
- * 
+ *
  * @link http://www.polipaymentdeveloper.com/doku.php?id=gettransaction
  */
 class CompletePurchaseRequest extends PurchaseRequest
@@ -39,7 +39,7 @@ public function getData()
  }
  $data = array();
  $data['token'] = $token;
- 
+
  return $data;
  }
 
@@ -50,10 +50,14 @@ public function send()
 
  public function sendData($data)
  {
- $request = $this->httpClient->get($this->endpoint)
- ->setAuth($this->getMerchantCode(), $this->getAuthenticationCode());
- $request->getQuery()->replace($data);
- $httpResponse = $request->send();
+ $auth = base64_encode($this->getMerchantCode() . ':' . $this->getAuthenticationCode());
+ $headers = [
+ 'Content-Type' => 'application/json',
+ 'Authorization' => 'basic ' . $auth,
+ ];
+
+ $httpResponse = $this->httpClient
+ ->request('get', $this->endpoint, $headers, http_build_query($data));
 
  return $this->response = new CompletePurchaseResponse($this, $httpResponse->getBody());
  }

src/Message/FetchCheckoutRequest.php

@@ -53,14 +53,15 @@ public function sendData($data)
  $authenticationCode = $this->getAuthenticationCode();
  $auth = base64_encode($merchantCode.":".$authenticationCode); //'S61xxxxx:AuthCode123');
 
- $httpRequest = $this->httpClient->get(
+ $httpResponse = $this->httpClient->request(
+ 'get',
  $url,
  array(
  'Content-Type'=>'application/json',
  'Authorization' => 'Basic '.$auth,
  )
  );
- $httpResponse = $httpRequest->send();
+
  return $this->response = new FetchCheckoutResponse($this, $httpResponse->getBody(true));
 
  }

src/Message/PurchaseRequest.php

@@ -96,20 +96,21 @@ public function sendData($data)
  {
  $merchantCode = $this->getMerchantCode();
  $authenticationCode = $this->getAuthenticationCode();
- $auth = base64_encode($merchantCode.":".$authenticationCode); //'S61xxxxx:AuthCode123');
+ $auth = base64_encode($merchantCode . ":" . $authenticationCode); //'S61xxxxx:AuthCode123');
  unset($data['MerchantCode'], $data['AuthenticationCode']);
 
  //$postdata = $this->packageData($data);
  $postdata = json_encode($data);
- $httpRequest = $this->httpClient->post(
+ $httpResponse = $this->httpClient->request(
+ 'post',
  $this->endpoint,
  array(
- 'Content-Type'=>'application/json',
- 'Authorization' => 'Basic '.$auth,
+ 'Content-Type' => 'application/json',
+ 'Authorization' => 'Basic ' . $auth,
  ),
  $postdata
  );
- $httpResponse = $httpRequest->send();
+ 
  return $this->response = new PurchaseResponse($this, $httpResponse->getBody());
  }
 
@@ -119,18 +120,18 @@ protected function packageData($data)
  unset($data['AuthenticationCode']);
  $fields = "";
  foreach ($data as $field => $value) {
- $fields .= str_repeat(" ", 24)."<dco:$field>$value</dco:$field>\n";
+ $fields .= str_repeat(" ", 24) . "<dco:$field>$value</dco:$field>\n";
  }
  $namespace = "http://schemas.datacontract.org/2004/07/Centricom.POLi.Services.MerchantAPI.Contracts";
  $i_namespace = "http://www.w3.org/2001/XMLSchema-instance";
  $dco_namespace = "http://schemas.datacontract.org/2004/07/Centricom.POLi.Services.MerchantAPI.DCO";
 
  return '<?xml version="1.0" encoding="utf-8" ?>
- <InitiateTransactionRequest xmlns="'.$namespace.'" xmlns:i="'.$i_namespace.'">
- <AuthenticationCode>'. $authenticationcode.'</AuthenticationCode>
- <Transaction xmlns:dco="'.$dco_namespace.'">'
-  .$fields.
-  '</Transaction>
+ <InitiateTransactionRequest xmlns="' . $namespace . '" xmlns:i="' . $i_namespace . '">
+ <AuthenticationCode>' . $authenticationcode . '</AuthenticationCode>
+ <Transaction xmlns:dco="' . $dco_namespace . '">'
+ . $fields .
+ '</Transaction>
  </InitiateTransactionRequest>';
  }
 }

tests/GatewayTest.php

@@ -18,7 +18,7 @@ public function setUp()
  }
 
  public function testPurchaseSuccess()
- { 
+ {
  $this->setMockHttpResponse('PurchaseRequestSuccess.txt');
 
  $response = $this->gateway->purchase(array(
@@ -94,5 +94,4 @@ public function testNotifyCompletePurchaseSuccess()
  $this->assertNull($response->getMessage());
  $this->assertEquals("396414606841", $response->getTransactionReference());
  }
-
-}
+}

tests/Message/PurchaseRequestTest.php

@@ -45,8 +45,7 @@ public function testMerchantRef()
  unset($params['card']['firstName']);
  unset($params['card']['lastName']);
  $this->request->initialize($params);
- var_dump($params['card']);
+ // var_dump($params['card']);
  $this->assertEquals(123, $this->request->getCombinedMerchantRef());
  }
-
 }