merged

README.md

@@ -32,7 +32,11 @@ The result will be a redirect to the gateway or bank.
 ```php
 use Omnipay\Omnipay;
 
+<<<<<<< HEAD
 $gateway = Omnipay::create('APS');
+=======
+$gateway = Omnipay::create('Amazon Payment Service');
+>>>>>>> 24428a5b7399bc46a68f08187fb62fe42a45d455
 
 // Send purchase request (don't get so excited... params below are just fake :))
 $response = $gateway->purchase([

src/Gateway.php

@@ -46,8 +46,11 @@ public function getDefaultParameters(): array
 	{
 		return [
 			'testMode' => FALSE,
+<<<<<<< HEAD
 			'currency' => 'AED',
 			'language' => 'en',
+=======
+>>>>>>> 24428a5b7399bc46a68f08187fb62fe42a45d455
 		];
 	}
 
@@ -91,6 +94,7 @@ public function refund(array $options = [])
 		return $this->createRequest(RefundRequest::class, $options);
 	}
 
+<<<<<<< HEAD
 	public function setAccessCode($code)
 	{
 		return $this->setParameter('access_code', $code);
@@ -152,6 +156,8 @@ public function setFortId($fort_id)
 		return $this;
 	}
 
+=======
+>>>>>>> 24428a5b7399bc46a68f08187fb62fe42a45d455
 	/**
 	 * @param string $requestPhrase
 	 *

src/Message/Request/APSAbstractRequest.php

@@ -27,16 +27,23 @@ public function sendData($data): ResponseInterface
 				'POST',
 				$this->getEndpoint(),
 				[
+<<<<<<< HEAD
+=======
+					'Accept' => 'application/json',
+>>>>>>> 24428a5b7399bc46a68f08187fb62fe42a45d455
 					'Content-type' => 'application/json',
 				],
 				json_encode($data)
 			);
 
+<<<<<<< HEAD
 			if ($httpResponse->getStatusCode() != 200)
 			{
 				throw new \Exception($httpResponse->getReasonPhrase(), $httpResponse->getStatusCode());
 			}
 
+=======
+>>>>>>> 24428a5b7399bc46a68f08187fb62fe42a45d455
 			$json = $httpResponse->getBody()->getContents();
 
 			$data = !empty($json) ? json_decode($json, true) : [];
@@ -70,6 +77,7 @@ protected function getEndpoint(): string
 	 */
 	private function _createSignature(array $data): string
 	{
+<<<<<<< HEAD
 		unset($data['testMode']);
 		unset($data['Mode']);
 
@@ -83,12 +91,22 @@ private function _createSignature(array $data): string
 		{
 			if (empty($value)) continue;
 
+=======
+		$shaType = $this->hasParameter('sha_type') ? $this->hasParameter('sha_type') : self::DEFAULT_SHA_TYPE;
+
+		if ( ! $this->hasParameter('request_phrase'))
+			throw new RequestPhraseException('Request phrase is missing.');
+
+		foreach ($data as $key => $value)
+		{
+>>>>>>> 24428a5b7399bc46a68f08187fb62fe42a45d455
 			$shaString .= "$key=$value";
 		}
 
 		// "Glue" phrase to the both sides of the payload
 		$shaString = $this->getParameter('request_phrase') . $shaString . $this->getParameter('request_phrase');
 
+<<<<<<< HEAD
 		return hash_hmac($shaType, $shaString, $this->getParameter('request_phrase'));
 	}
 
@@ -160,5 +178,8 @@ public function setFortId($fort_id)
 	protected function _is_json_response($string) {
 		json_decode($string);
 		return json_last_error() === JSON_ERROR_NONE;
+=======
+		return hash($shaType, $shaString);
+>>>>>>> 24428a5b7399bc46a68f08187fb62fe42a45d455
 	}
 }

src/Message/Request/AbstractCheckoutRequest.php

@@ -2,12 +2,22 @@
 
 abstract class AbstractCheckoutRequest extends APSAbstractRequest
 {
+<<<<<<< HEAD
 	protected $test_endpoint = 'https://sbcheckout.payfort.com/FortAPI/paymentPage';
 
 	protected $live_endpoint = 'https://checkout.payfort.com/FortAPI/paymentPage';
 
 	public function validateData()
 	{
 		$this->validate('access_code', 'merchant_identifier', 'merchant_reference', 'amount', 'currency', 'language', 'customer_email');
+=======
+	private $test_endpoint = 'https://sbcheckout.payfort.com/FortAPI/paymentPage';
+
+	private $live_endpoint = 'https://checkout.payfort.com/FortAPI/paymentPage';
+
+	public function validateData()
+	{
+		$this->validate('access_code', 'merchant_identifier', 'merchant_reference', 'amount', 'currency', 'language', 'customer_email', 'signature');
+>>>>>>> 24428a5b7399bc46a68f08187fb62fe42a45d455
 	}
 }

src/Message/Request/AuthorizationRequest.php

@@ -14,6 +14,7 @@ public function getData(): array
 		$this->validateData();
 
 		return [
+<<<<<<< HEAD
 			'command'             => self::COMMAND,
 			'testMode'            => $this->getParameter('testMode'),
 			'access_code'         => $this->getParameter('access_code'),
@@ -24,6 +25,9 @@ public function getData(): array
 			'language'            => $this->getParameter('language'),
 			'customer_email'      => $this->getParameter('customer_email'),
 			'order_description'   => $this->getParameter('order_description'),
+=======
+			'command' => self::COMMAND,
+>>>>>>> 24428a5b7399bc46a68f08187fb62fe42a45d455
 		];
 	}
 

src/Message/Request/CaptureRequest.php

@@ -7,16 +7,23 @@ class CaptureRequest extends APSAbstractRequest
 {
 	const COMMAND = 'CAPTURE';
 
+<<<<<<< HEAD
 	protected $test_endpoint = 'https://sbpaymentservices.payfort.com/FortAPI/paymentApi';
 
 	protected $live_endpoint = 'https://paymentservices.payfort.com/FortAPI/paymentApi';
+=======
+	private $test_endpoint = 'https://sbpaymentservices.payfort.com/FortAPI/paymentApi';
+
+	private $live_endpoint = 'https://paymentservices.payfort.com/FortAPI/paymentApi';
+>>>>>>> 24428a5b7399bc46a68f08187fb62fe42a45d455
 
 	/**
 	 * @return mixed
 	 * @throws InvalidRequestException
 	 */
 	public function getData(): array
 	{
+<<<<<<< HEAD
 		$this->validate('access_code', 'merchant_identifier', 'merchant_reference', 'amount', 'currency', 'language');
 
 		return [
@@ -30,6 +37,12 @@ public function getData(): array
 			'language'            => $this->getParameter('language'),
 			'order_description'   => $this->getParameter('order_description'),
 			'fort_id'             => $this->getParameter('fort_id'),
+=======
+		$this->validate('access_code', 'merchant_identifier', 'merchant_reference', 'amount', 'currency', 'language', 'signature');
+
+		return [
+			'command' => self::COMMAND,
+>>>>>>> 24428a5b7399bc46a68f08187fb62fe42a45d455
 		];
 	}
 

src/Message/Request/PurchaseRequest.php

@@ -15,6 +15,7 @@ public function getData(): array
 
 		return [
 			'command' => self::COMMAND,
+<<<<<<< HEAD
 			'testMode' => $this->getParameter('testMode'),
 			'access_code' => $this->getParameter('access_code'),
 			'merchant_identifier' => $this->getParameter('merchant_identifier'),
@@ -24,17 +25,26 @@ public function getData(): array
 			'language' => $this->getParameter('language'),
 			'customer_email' => $this->getParameter('customer_email'),
 			'order_description' => $this->getParameter('order_description'),
+=======
+>>>>>>> 24428a5b7399bc46a68f08187fb62fe42a45d455
 		];
 	}
 
 	/**
 	 * @param array $data
+<<<<<<< HEAD
+=======
+	 *
+>>>>>>> 24428a5b7399bc46a68f08187fb62fe42a45d455
 	 * @return PurchaseResponse
 	 * @throws \Omnipay\Common\Exception\InvalidResponseException
 	 */
 	protected function createResponse(array $data): PurchaseResponse
 	{
 		return new PurchaseResponse($this, $data);
 	}
+<<<<<<< HEAD
 
+=======
+>>>>>>> 24428a5b7399bc46a68f08187fb62fe42a45d455
 }

src/Message/Request/RefundRequest.php

@@ -7,9 +7,15 @@ class RefundRequest extends APSAbstractRequest
 {
 	const COMMAND = 'REFUND';
 
+<<<<<<< HEAD
 	protected $test_endpoint = 'https://sbpaymentservices.payfort.com/FortAPI/paymentApi';
 
 	protected $live_endpoint = 'https://paymentservices.payfort.com/FortAPI/paymentApi';
+=======
+	private $test_endpoint = 'https://sbpaymentservices.payfort.com/FortAPI/paymentApi';
+
+	private $live_endpoint = 'https://paymentservices.payfort.com/FortAPI/paymentApi';
+>>>>>>> 24428a5b7399bc46a68f08187fb62fe42a45d455
 
 	/**
 	 * @return mixed
@@ -18,6 +24,7 @@ class RefundRequest extends APSAbstractRequest
 	 */
 	public function getData(): array
 	{
+<<<<<<< HEAD
 		$this->validate('access_code', 'merchant_identifier', 'merchant_reference', 'amount', 'currency', 'language');
 
 		return [
@@ -31,6 +38,12 @@ public function getData(): array
 			'language'            => $this->getParameter('language'),
 			'order_description'   => $this->getParameter('order_description'),
 			'fort_id'             => $this->getParameter('fort_id'),
+=======
+		$this->validate('access_code', 'merchant_identifier', 'merchant_reference', 'amount', 'currency', 'language', 'signature');
+
+		return [
+			'command' => self::COMMAND,
+>>>>>>> 24428a5b7399bc46a68f08187fb62fe42a45d455
 		];
 	}
 

tests/GatewayTest.php

@@ -33,6 +33,10 @@ protected function setUp()
 	        'currency' => 'AED',
 	        'language' => 'en',
 	        'customer_email' => '[email protected]',
+<<<<<<< HEAD
+=======
+	        'signature' => '7cad05f0212ed933c9a5d5dffa31661acf2c827a',
+>>>>>>> 24428a5b7399bc46a68f08187fb62fe42a45d455
 	        'order_description' => 'iPhone 6-S',
         ];
     }