Merge pull request #22 from davidbankes/payeezy-json-api

barryvdh · web-flow · commit addb59b381cb · 2019-01-27T21:05:45.000+01:00
payeezy updated to supported JSON api
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.3
   - 5.4
   - 5.5
   - 5.6
diff --git a/src/Message/PayeezyAbstractRequest.php b/src/Message/PayeezyAbstractRequest.php
@@ -209,7 +209,7 @@ protected function getHeaders()
     {
         return array(
             'Content-Type'  => self::CONTENT_TYPE,
-            'Accept'        => 'text/html'
+            'Accept'        => 'application/json'
         );
     }
 
diff --git a/src/Message/PayeezyResponse.php b/src/Message/PayeezyResponse.php
@@ -25,7 +25,7 @@ class PayeezyResponse extends AbstractResponse
     public function __construct(RequestInterface $request, $data)
     {
         $this->request = $request;
-        parse_str($data, $this->data);
+        $this->data = json_decode($data, true);
     }
 
     public function isSuccessful()
diff --git a/tests/Message/PayeezyPurchaseResponseTest.php b/tests/Message/PayeezyPurchaseResponseTest.php
@@ -9,7 +9,7 @@ class PayeezyPurchaseResponseTest extends TestCase
 {
     public function testPurchaseSuccess()
     {
-        $response = new PayeezyResponse($this->getMockRequest(), http_build_query(array(
+        $response = new PayeezyResponse($this->getMockRequest(), json_encode(array(
             'amount' => 1000,
             'exact_resp_code' => 00,
             'exact_message' => 'Transaction Normal',
@@ -26,7 +26,7 @@ public function testPurchaseSuccess()
 
     public function testPurchaseError()
     {
-        $response = new PayeezyResponse($this->getMockRequest(), http_build_query(array(
+        $response = new PayeezyResponse($this->getMockRequest(), json_encode(array(
             'amount' => 1000,
             'exact_resp_code' => 22,
             'exact_message' => 'Invalid Credit Card Number',
@@ -43,7 +43,7 @@ public function testPurchaseError()
 
     public function testBankError()
     {
-        $response = new PayeezyResponse($this->getMockRequest(), http_build_query(array(
+        $response = new PayeezyResponse($this->getMockRequest(), json_encode(array(
             'amount' => 1000,
             'exact_resp_code' => 00,
             'reference_no' => 'abc123',
@@ -55,5 +55,4 @@ public function testBankError()
         $this->assertEquals('::', $response->getTransactionReference());
         $this->assertEquals('00', $response->getCode());
     }
-
 }
diff --git a/tests/Mock/PurchaseSuccess.txt b/tests/Mock/PurchaseSuccess.txt
@@ -2,4 +2,4 @@ HTTP/1.1 201 OK
 Date: Tue, 11 Feb 2014 02:34:58 GMT
 Content-type: text/html; charset=utf-8
 
-account_number=&amount=13.0&amount_requested=&authorization=&authorization_num=ET181147&avs=1&bank_id=&bank_message=Approved&bank_resp_code=100&bank_resp_code_2=&card_cost=&cardholder_name=Example+User&cavv=&cavv_algorithm=&cavv_response=&cc_expiry=0318&cc_number=%23%23%23%23%23%23%23%23%23%23%23%231111&cc_verification_str1=123+Billing+St%7C12345%7CBillstown%7CCA%7CUS&cc_verification_str2=208&check_number=&check_type=&clerk_id=&client_email=&client_ip=104.36.244.246&correlation_id=&credit_card_type=Visa&ctr=%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D+TRANSACTION+RECORD+%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%0APriceWaiter+DEMO0243%0A426+Market+St%0AChattenooga%2C+TN+37402%0AUnited+States%0Ahttps%3A%2F%2Fwww.pricewaiter.com%2F%0A%0ATYPE%3A+Purchase%0A%0AACCT%3A+Visa++%24+13.00+USD%0A%0ACARDHOLDER+NAME+%3A+Example+User%0ACARD+NUMBER+++++%3A+%23%23%23%23%23%23%23%23%23%23%23%231111%0ADATE%2FTIME+++++++%3A+11+Aug+14+14%3A09%3A06%0AREFERENCE+%23+++++%3A++000056+M%0AAUTHOR.+%23+++++++%3A+ET181147%0ATRANS.+REF.+++++%3A+order2%0A%0A++++Approved+-+Thank+You+100%0A%0A%0APlease+retain+this+copy+for+your+records.%0A%0ACardholder+will+pay+above+amount+to+card%0Aissuer+pursuant+to+cardholder+agreement.%0A%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D%3D&currency_code=USD&current_balance=&customer_id_number=&customer_id_type=&customer_name=&customer_ref=&cvd_presence_ind=0&cvv2=N&date_of_birth=&device_id=&ean=&ecommerce_flag=&error_description=&error_number=&exact_message=Transaction+Normal&exact_resp_code=00&fraud_suspected=&gateway_id=AF8163-05&gift_card_amount=&gross_amount_currency_id=&language=&logon_message=&merchant_address=426+Market+St&merchant_city=Chattenooga&merchant_country=United+States&merchant_name=PriceWaiter+DEMO0243&merchant_postal=37402&merchant_province=Tennessee&merchant_url=https%3A%2F%2Fwww.pricewaiter.com%2F&message=&micr=&pan=&partial_redemption=0&password=&payer_id=&previous_balance=&reference_3=&reference_no=order2&registration_date=&registration_no=&release_type=&retrieval_ref_no=7775501&secure_auth_required=&secure_auth_result=&sequence_no=000056&success=&surcharge_amount=&tax1_amount=&tax1_number=&tax2_amount=&tax2_number=&timestamp=&track1=&track2=&transaction_approved=1&transaction_error=0&transaction_tag=28513493&transaction_type=00&transarmor_token=&user_name=&vip=&virtual_card=&xid=&zip_code=
+{"account_number":"","amount":"13.0","amount_requested":"","authorization":"","authorization_num":"ET181147","avs":"1","bank_id":"","bank_message":"Approved","bank_resp_code":"100","bank_resp_code_2":"","card_cost":"","cardholder_name":"Example User","cavv":"","cavv_algorithm":"","cavv_response":"","cc_expiry":"0318","cc_number":"############1111","cc_verification_str1":"123 Billing St|12345|Billstown|CA|US","cc_verification_str2":"208","check_number":"","check_type":"","clerk_id":"","client_email":"","client_ip":"104.36.244.246","correlation_id":"","credit_card_type":"Visa","ctr":"=========== TRANSACTION RECORD ==========\nPriceWaiter DEMO0243\n426 Market St\nChattenooga, TN 37402\nUnited States\nhttps:\/\/www.pricewaiter.com\/\n\nTYPE: Purchase\n\nACCT: Visa  $ 13.00 USD\n\nCARDHOLDER NAME : Example User\nCARD NUMBER     : ############1111\nDATE\/TIME       : 11 Aug 14 14:09:06\nREFERENCE #     :  000056 M\nAUTHOR. #       : ET181147\nTRANS. REF.     : order2\n\n    Approved - Thank You 100\n\n\nPlease retain this copy for your records.\n\nCardholder will pay above amount to card\nissuer pursuant to cardholder agreement.\n=========================================","currency_code":"USD","current_balance":"","customer_id_number":"","customer_id_type":"","customer_name":"","customer_ref":"","cvd_presence_ind":"0","cvv2":"N","date_of_birth":"","device_id":"","ean":"","ecommerce_flag":"","error_description":"","error_number":"","exact_message":"Transaction Normal","exact_resp_code":"00","fraud_suspected":"","gateway_id":"AF8163-05","gift_card_amount":"","gross_amount_currency_id":"","language":"","logon_message":"","merchant_address":"426 Market St","merchant_city":"Chattenooga","merchant_country":"United States","merchant_name":"PriceWaiter DEMO0243","merchant_postal":"37402","merchant_province":"Tennessee","merchant_url":"https:\/\/www.pricewaiter.com\/","message":"","micr":"","pan":"","partial_redemption":"0","password":"","payer_id":"","previous_balance":"","reference_3":"","reference_no":"order2","registration_date":"","registration_no":"","release_type":"","retrieval_ref_no":"7775501","secure_auth_required":"","secure_auth_result":"","sequence_no":"000056","success":"","surcharge_amount":"","tax1_amount":"","tax1_number":"","tax2_amount":"","tax2_number":"","timestamp":"","track1":"","track2":"","transaction_approved":"1","transaction_error":"0","transaction_tag":"28513493","transaction_type":"00","transarmor_token":"","user_name":"","vip":"","virtual_card":"","xid":"","zip_code":""}

-Original file line number
+Diff line change
@@ @@ -1,7 +1,6 @@ @@
 language: php
 php:
 -  - 5.3
   - 5.4
   - 5.5
   - 5.6
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ protected function getHeaders()`
`209`	`209`	`{`
`210`	`210`	`return array(`
`211`	`211`	`'Content-Type' => self::CONTENT_TYPE,`
`212`		`- 'Accept' => 'text/html'`
	`212`	`+ 'Accept' => 'application/json'`
`213`	`213`	`);`
`214`	`214`	`}`
`215`	`215`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class PayeezyResponse extends AbstractResponse`
`25`	`25`	`public function __construct(RequestInterface $request, $data)`
`26`	`26`	`{`
`27`	`27`	`$this->request = $request;`
`28`		`- parse_str($data, $this->data);`
	`28`	`+ $this->data = json_decode($data, true);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public function isSuccessful()`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class PayeezyPurchaseResponseTest extends TestCase`
`9`	`9`	`{`
`10`	`10`	`public function testPurchaseSuccess()`
`11`	`11`	`{`
`12`		`- $response = new PayeezyResponse($this->getMockRequest(), http_build_query(array(`
	`12`	`+ $response = new PayeezyResponse($this->getMockRequest(), json_encode(array(`
`13`	`13`	`'amount' => 1000,`
`14`	`14`	`'exact_resp_code' => 00,`
`15`	`15`	`'exact_message' => 'Transaction Normal',`
`@@ -26,7 +26,7 @@ public function testPurchaseSuccess()`
`26`	`26`
`27`	`27`	`public function testPurchaseError()`
`28`	`28`	`{`
`29`		`- $response = new PayeezyResponse($this->getMockRequest(), http_build_query(array(`
	`29`	`+ $response = new PayeezyResponse($this->getMockRequest(), json_encode(array(`
`30`	`30`	`'amount' => 1000,`
`31`	`31`	`'exact_resp_code' => 22,`
`32`	`32`	`'exact_message' => 'Invalid Credit Card Number',`
`@@ -43,7 +43,7 @@ public function testPurchaseError()`
`43`	`43`
`44`	`44`	`public function testBankError()`
`45`	`45`	`{`
`46`		`- $response = new PayeezyResponse($this->getMockRequest(), http_build_query(array(`
	`46`	`+ $response = new PayeezyResponse($this->getMockRequest(), json_encode(array(`
`47`	`47`	`'amount' => 1000,`
`48`	`48`	`'exact_resp_code' => 00,`
`49`	`49`	`'reference_no' => 'abc123',`
`@@ -55,5 +55,4 @@ public function testBankError()`
`55`	`55`	`$this->assertEquals('::', $response->getTransactionReference());`
`56`	`56`	`$this->assertEquals('00', $response->getCode());`
`57`	`57`	`}`
`58`		`-`
`59`	`58`	`}`