PatronBase / omnipay-redsys

src/Message/CompletePurchaseResponse.php

Doc Comments +1 added lines

@@ -90,6 +90,7 @@
     /**
      * Helper method to get a specific merchant parameter if available.
      *
+     * @param string $key
      * @return null|mixed
      */
     protected function getKey($key)

Indentation +108 added lines, -108 removed lines

@@ -10,123 +10,123 @@
  */
 class CompletePurchaseResponse extends AbstractResponse
 {
-    /** @var array */
-    protected $merchantParameters;
-    /** @var string */
-    protected $returnSignature;
-    /** @var boolean */
-    protected $usingUpcaseParameters = false;
-    /** @var boolean */
-    protected $usingUpcaseResponse   = false;
+	/** @var array */
+	protected $merchantParameters;
+	/** @var string */
+	protected $returnSignature;
+	/** @var boolean */
+	protected $usingUpcaseParameters = false;
+	/** @var boolean */
+	protected $usingUpcaseResponse   = false;
 
-    /**
-     * Constructor
-     *
-     * @param RequestInterface $request the initiating request.
-     * @param mixed $data
-     *
-     * @throws InvalidResponseException If order number is missing or signature does not match
-     */
-    public function __construct(RequestInterface $request, $data)
-    {
-        parent::__construct($request, $data);
+	/**
+	 * Constructor
+	 *
+	 * @param RequestInterface $request the initiating request.
+	 * @param mixed $data
+	 *
+	 * @throws InvalidResponseException If order number is missing or signature does not match
+	 */
+	public function __construct(RequestInterface $request, $data)
+	{
+		parent::__construct($request, $data);
 
-        if (!empty($data['Ds_MerchantParameters'])) {
-            $this->merchantParameters = $this->decodeMerchantParameters($data['Ds_MerchantParameters']);
-        } elseif (!empty($data['DS_MERCHANTPARAMETERS'])) {
-            $this->merchantParameters = $this->decodeMerchantParameters($data['DS_MERCHANTPARAMETERS']);
-            $this->usingUpcaseResponse = true;
-        } else {
-            throw new InvalidResponseException('Invalid response from payment gateway (no data)');
-        }
+		if (!empty($data['Ds_MerchantParameters'])) {
+			$this->merchantParameters = $this->decodeMerchantParameters($data['Ds_MerchantParameters']);
+		} elseif (!empty($data['DS_MERCHANTPARAMETERS'])) {
+			$this->merchantParameters = $this->decodeMerchantParameters($data['DS_MERCHANTPARAMETERS']);
+			$this->usingUpcaseResponse = true;
+		} else {
+			throw new InvalidResponseException('Invalid response from payment gateway (no data)');
+		}
 
-        if (!empty($this->merchantParameters['Ds_Order'])) {
-            $order = $this->merchantParameters['Ds_Order'];
-        } elseif (!empty($this->merchantParameters['DS_ORDER'])) {
-            $order = $this->merchantParameters['DS_ORDER'];
-            $this->usingUpcaseParameters = true;
-        } else {
-            throw new InvalidResponseException();
-        }
+		if (!empty($this->merchantParameters['Ds_Order'])) {
+			$order = $this->merchantParameters['Ds_Order'];
+		} elseif (!empty($this->merchantParameters['DS_ORDER'])) {
+			$order = $this->merchantParameters['DS_ORDER'];
+			$this->usingUpcaseParameters = true;
+		} else {
+			throw new InvalidResponseException();
+		}
 
-        $this->returnSignature = $this->createReturnSignature(
-            $data[$this->usingUpcaseResponse ? 'DS_MERCHANTPARAMETERS' : 'Ds_MerchantParameters'],
-            $order,
-            base64_decode($this->request->getHmacKey())
-        );
+		$this->returnSignature = $this->createReturnSignature(
+			$data[$this->usingUpcaseResponse ? 'DS_MERCHANTPARAMETERS' : 'Ds_MerchantParameters'],
+			$order,
+			base64_decode($this->request->getHmacKey())
+		);
 
-        if ($this->returnSignature != $data[$this->usingUpcaseResponse ? 'DS_SIGNATURE' : 'Ds_Signature']) {
-            throw new InvalidResponseException('Invalid response from payment gateway (signature mismatch)');
-        }
-    }
+		if ($this->returnSignature != $data[$this->usingUpcaseResponse ? 'DS_SIGNATURE' : 'Ds_Signature']) {
+			throw new InvalidResponseException('Invalid response from payment gateway (signature mismatch)');
+		}
+	}
 
-    /**
-     * Is the response successful?
-     *
-     * @return boolean
-     */
-    public function isSuccessful()
-    {
-        $key = $this->usingUpcaseParameters ? 'DS_RESPONSE' : 'Ds_Response';
-        return isset($this->merchantParameters[$key])
-            && is_numeric($this->merchantParameters[$key])
-            && 0 <= $this->merchantParameters[$key]
-            && 100 > $this->merchantParameters[$key];
-    }
+	/**
+	 * Is the response successful?
+	 *
+	 * @return boolean
+	 */
+	public function isSuccessful()
+	{
+		$key = $this->usingUpcaseParameters ? 'DS_RESPONSE' : 'Ds_Response';
+		return isset($this->merchantParameters[$key])
+			&& is_numeric($this->merchantParameters[$key])
+			&& 0 <= $this->merchantParameters[$key]
+			&& 100 > $this->merchantParameters[$key];
+	}
 
-    /**
-     * Get the response data, included the decoded merchant parameters if available.
-     *
-     * @return mixed
-     */
-    public function getData()
-    {
-        $data = parent::getData();
-        return is_array($data) && is_array($this->merchantParameters)
-            ? array_merge($data, $this->merchantParameters)
-            : $data;
-    }
+	/**
+	 * Get the response data, included the decoded merchant parameters if available.
+	 *
+	 * @return mixed
+	 */
+	public function getData()
+	{
+		$data = parent::getData();
+		return is_array($data) && is_array($this->merchantParameters)
+			? array_merge($data, $this->merchantParameters)
+			: $data;
+	}
 
-    /**
-     * Helper method to get a specific merchant parameter if available.
-     *
-     * @return null|mixed
-     */
-    protected function getKey($key)
-    {
-        if ($this->usingUpcaseParameters) {
-            $key = strtoupper($key);
-        }
-        return isset($this->merchantParameters[$key]) ? $this->merchantParameters[$key] : null;
-    }
+	/**
+	 * Helper method to get a specific merchant parameter if available.
+	 *
+	 * @return null|mixed
+	 */
+	protected function getKey($key)
+	{
+		if ($this->usingUpcaseParameters) {
+			$key = strtoupper($key);
+		}
+		return isset($this->merchantParameters[$key]) ? $this->merchantParameters[$key] : null;
+	}
 
-    /**
-     * Get the authorisation code if available.
-     *
-     * @return null|string
-     */
-    public function getTransactionReference()
-    {
-        return $this->getKey('Ds_AuthorisationCode');
-    }
+	/**
+	 * Get the authorisation code if available.
+	 *
+	 * @return null|string
+	 */
+	public function getTransactionReference()
+	{
+		return $this->getKey('Ds_AuthorisationCode');
+	}
 
-    /**
-     * Get the merchant response message if available.
-     *
-     * @return null|string
-     */
-    public function getMessage()
-    {
-        return $this->getKey('Ds_Response');
-    }
+	/**
+	 * Get the merchant response message if available.
+	 *
+	 * @return null|string
+	 */
+	public function getMessage()
+	{
+		return $this->getKey('Ds_Response');
+	}
 
-    /**
-     * Get the card type if available.
-     *
-     * @return null|string
-     */
-    public function getCardType()
-    {
-        return $this->getKey('Ds_Card_Type');
-    }
+	/**
+	 * Get the card type if available.
+	 *
+	 * @return null|string
+	 */
+	public function getCardType()
+	{
+		return $this->getKey('Ds_Card_Type');
+	}
 }

Braces +8 added lines, -16 removed lines

@@ -8,8 +8,7 @@ 
 /**
  * Redsys Complete Purchase Response
  */
-class CompletePurchaseResponse extends AbstractResponse
-{
+class CompletePurchaseResponse extends AbstractResponse {
     /** @var array */
     protected $merchantParameters;
     /** @var string */
@@ -27,8 +26,7 @@ 
      *
      * @throws InvalidResponseException If 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);
 
         if (!empty($data['Ds_MerchantParameters'])) {
@@ -65,8 +63,7 @@ 
      *
      * @return boolean
      */
-    public function isSuccessful()
-    {
+    public function isSuccessful() {
         $key = $this->usingUpcaseParameters ? 'DS_RESPONSE' : 'Ds_Response';
         return isset($this->merchantParameters[$key])
             && is_numeric($this->merchantParameters[$key])
@@ -79,8 +76,7 @@ 
      *
      * @return mixed
      */
-    public function getData()
-    {
+    public function getData() {
         $data = parent::getData();
         return is_array($data) && is_array($this->merchantParameters)
             ? array_merge($data, $this->merchantParameters)
@@ -92,8 +88,7 @@ 
      *
      * @return null|mixed
      */
-    protected function getKey($key)
-    {
+    protected function getKey($key) {
         if ($this->usingUpcaseParameters) {
             $key = strtoupper($key);
         }
@@ -105,8 +100,7 @@ 
      *
      * @return null|string
      */
-    public function getTransactionReference()
-    {
+    public function getTransactionReference() {
         return $this->getKey('Ds_AuthorisationCode');
     }
 
@@ -115,8 +109,7 @@ 
      *
      * @return null|string
      */
-    public function getMessage()
-    {
+    public function getMessage() {
         return $this->getKey('Ds_Response');
     }
 
@@ -125,8 +118,7 @@ 
      *
      * @return null|string
      */
-    public function getCardType()
-    {
+    public function getCardType() {
         return $this->getKey('Ds_Card_Type');
     }
 }

src/Gateway.php

Indentation +54 added lines, -54 removed lines

@@ -13,69 +13,69 @@
  */
 class Gateway extends AbstractGateway
 {
-    public function getName()
-    {
-        return 'Redsys';
-    }
+	public function getName()
+	{
+		return 'Redsys';
+	}
 
-    public function getDefaultParameters()
-    {
-        return array(
-            'merchantId' => '',
-            'merchantName' => '',
-            'terminalId' => '',
-            'hmacKey' => '',
-            'testMode' => false,
-        );
-    }
+	public function getDefaultParameters()
+	{
+		return array(
+			'merchantId' => '',
+			'merchantName' => '',
+			'terminalId' => '',
+			'hmacKey' => '',
+			'testMode' => false,
+		);
+	}
 
-    public function getMerchantId()
-    {
-        return $this->getParameter('merchantId');
-    }
+	public function getMerchantId()
+	{
+		return $this->getParameter('merchantId');
+	}
 
-    public function setMerchantId($value)
-    {
-        return $this->setParameter('merchantId', $value);
-    }
+	public function setMerchantId($value)
+	{
+		return $this->setParameter('merchantId', $value);
+	}
 
-    public function getMerchantName()
-    {
-        return $this->getParameter('merchantName');
-    }
+	public function getMerchantName()
+	{
+		return $this->getParameter('merchantName');
+	}
 
-    public function setMerchantName($value)
-    {
-        return $this->setParameter('merchantName', $value);
-    }
+	public function setMerchantName($value)
+	{
+		return $this->setParameter('merchantName', $value);
+	}
 
-    public function getTerminalId()
-    {
-        return $this->getParameter('terminalId');
-    }
+	public function getTerminalId()
+	{
+		return $this->getParameter('terminalId');
+	}
 
-    public function setTerminalId($value)
-    {
-        return $this->setParameter('terminalId', $value);
-    }
+	public function setTerminalId($value)
+	{
+		return $this->setParameter('terminalId', $value);
+	}
 
-    public function getHmacKey()
-    {
-        return $this->getParameter('hmacKey');
-    }
+	public function getHmacKey()
+	{
+		return $this->getParameter('hmacKey');
+	}
 
-    public function setHmacKey($value)
-    {
-        return $this->setParameter('hmacKey', $value);
-    }
+	public function setHmacKey($value)
+	{
+		return $this->setParameter('hmacKey', $value);
+	}
 
-    public function purchase(array $parameters = array())
-    {
-        return $this->createRequest('\Omnipay\Redsys\Message\PurchaseRequest', $parameters);
-    }
+	public function purchase(array $parameters = array())
+	{
+		return $this->createRequest('\Omnipay\Redsys\Message\PurchaseRequest', $parameters);
+	}
 
-    public function completePurchase(array $parameters = array())
-    {
-        return $this->createRequest('\Omnipay\Redsys\Message\CompletePurchaseRequest', $parameters);
-    }
+	public function completePurchase(array $parameters = array())
+	{
+		return $this->createRequest('\Omnipay\Redsys\Message\CompletePurchaseRequest', $parameters);
+	}
 }

Braces +13 added lines, -26 removed lines

@@ -11,15 +11,12 @@ 
  *
  * @link http://www.redsys.es/
  */
-class Gateway extends AbstractGateway
-{
-    public function getName()
-    {
+class Gateway extends AbstractGateway {
+    public function getName() {
         return 'Redsys';
     }
 
-    public function getDefaultParameters()
-    {
+    public function getDefaultParameters() {
         return array(
             'merchantId' => '',
             'merchantName' => '',
@@ -29,53 +26,43 @@ 
         );
     }
 
-    public function getMerchantId()
-    {
+    public function getMerchantId() {
         return $this->getParameter('merchantId');
     }
 
-    public function setMerchantId($value)
-    {
+    public function setMerchantId($value) {
         return $this->setParameter('merchantId', $value);
     }
 
-    public function getMerchantName()
-    {
+    public function getMerchantName() {
         return $this->getParameter('merchantName');
     }
 
-    public function setMerchantName($value)
-    {
+    public function setMerchantName($value) {
         return $this->setParameter('merchantName', $value);
     }
 
-    public function getTerminalId()
-    {
+    public function getTerminalId() {
         return $this->getParameter('terminalId');
     }
 
-    public function setTerminalId($value)
-    {
+    public function setTerminalId($value) {
         return $this->setParameter('terminalId', $value);
     }
 
-    public function getHmacKey()
-    {
+    public function getHmacKey() {
         return $this->getParameter('hmacKey');
     }
 
-    public function setHmacKey($value)
-    {
+    public function setHmacKey($value) {
         return $this->setParameter('hmacKey', $value);
     }
 
-    public function purchase(array $parameters = array())
-    {
+    public function purchase(array $parameters = array()) {
         return $this->createRequest('\Omnipay\Redsys\Message\PurchaseRequest', $parameters);
     }
 
-    public function completePurchase(array $parameters = array())
-    {
+    public function completePurchase(array $parameters = array()) {
         return $this->createRequest('\Omnipay\Redsys\Message\CompletePurchaseRequest', $parameters);
     }
 }

src/Message/AbstractResponse.php

Indentation +64 added lines, -64 removed lines

@@ -13,74 +13,74 @@
  */
 abstract class AbstractResponse extends BaseAbstractResponse
 {
-    /**
-     * Encode merchant parameters
-     *
-     * @param array $data  The parameters to encode
-     *
-     * @return string Encoded data
-     */
-    protected function encodeMerchantParameters($data)
-    {
-        return base64_encode(json_encode($data));
-    }
+	/**
+	 * Encode merchant parameters
+	 *
+	 * @param array $data  The parameters to encode
+	 *
+	 * @return string Encoded data
+	 */
+	protected function encodeMerchantParameters($data)
+	{
+		return base64_encode(json_encode($data));
+	}
 
-    /**
-     * Decode merchant parameters
-     *
-     * @param string $data  The encoded string of parameters
-     *
-     * @return array Decoded data
-     */
-    protected function decodeMerchantParameters($data)
-    {
-        return (array)json_decode(base64_decode(strtr($data, '-_', '+/')));
-    }
+	/**
+	 * Decode merchant parameters
+	 *
+	 * @param string $data  The encoded string of parameters
+	 *
+	 * @return array Decoded data
+	 */
+	protected function decodeMerchantParameters($data)
+	{
+		return (array)json_decode(base64_decode(strtr($data, '-_', '+/')));
+	}
 
-    /**
-     * Encrypt message with given key and default IV
-     *
-     * @todo function_exists() vs extension_loaded()?
-     *
-     * @param string $message  The message to encrypt
-     * @param string $key      The key used to encrypt the message
-     *
-     * @return string Encrypted message
-     *
-     * @throws RuntimeException
-     */
-    protected function encryptMessage($message, $key)
-    {
-        $iv = implode(array_map("chr", array(0, 0, 0, 0, 0, 0, 0, 0)));
+	/**
+	 * Encrypt message with given key and default IV
+	 *
+	 * @todo function_exists() vs extension_loaded()?
+	 *
+	 * @param string $message  The message to encrypt
+	 * @param string $key      The key used to encrypt the message
+	 *
+	 * @return string Encrypted message
+	 *
+	 * @throws RuntimeException
+	 */
+	protected function encryptMessage($message, $key)
+	{
+		$iv = implode(array_map("chr", array(0, 0, 0, 0, 0, 0, 0, 0)));
 
-        if (function_exists('mcrypt_encrypt')) {
-            $ciphertext = mcrypt_encrypt(MCRYPT_3DES, $key, $message, MCRYPT_MODE_CBC, $iv);
-        } else {
-            throw new RuntimeException('No valid encryption extension installed');
-        }
+		if (function_exists('mcrypt_encrypt')) {
+			$ciphertext = mcrypt_encrypt(MCRYPT_3DES, $key, $message, MCRYPT_MODE_CBC, $iv);
+		} else {
+			throw new RuntimeException('No valid encryption extension installed');
+		}
 
-        return $ciphertext;
-    }
+		return $ciphertext;
+	}
 
-    /**
-     * Create signature hash used to verify messages
-     *
-     * @todo Add if-check on algorithm to match against signature version as new param?
-     *
-     * @param string $message  The message to encrypt
-     * @param string $salt     Unique salt used to generate the ciphertext
-     * @param string $key      The key used to encrypt the message
-     *
-     * @return string Generated signature
-     */
-    protected function createSignature($message, $salt, $key)
-    {
-        $ciphertext = $this->encryptMessage($salt, $key);
-        return base64_encode(hash_hmac('sha256', $message, $ciphertext, true));
-    }
+	/**
+	 * Create signature hash used to verify messages
+	 *
+	 * @todo Add if-check on algorithm to match against signature version as new param?
+	 *
+	 * @param string $message  The message to encrypt
+	 * @param string $salt     Unique salt used to generate the ciphertext
+	 * @param string $key      The key used to encrypt the message
+	 *
+	 * @return string Generated signature
+	 */
+	protected function createSignature($message, $salt, $key)
+	{
+		$ciphertext = $this->encryptMessage($salt, $key);
+		return base64_encode(hash_hmac('sha256', $message, $ciphertext, true));
+	}
 
-    protected function createReturnSignature($message, $salt, $key)
-    {
-        return strtr($this->createSignature($message, $salt, $key), '+/', '-_');
-    }
+	protected function createReturnSignature($message, $salt, $key)
+	{
+		return strtr($this->createSignature($message, $salt, $key), '+/', '-_');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
      */
     protected function decodeMerchantParameters($data)
     {
-        return (array)json_decode(base64_decode(strtr($data, '-_', '+/')));
+        return (array) json_decode(base64_decode(strtr($data, '-_', '+/')));
     }
 
     /**

Braces +6 added lines, -12 removed lines

@@ -11,8 +11,7 @@ 
  * This abstract class extends the base Omnipay AbstractResponse in order
  * to provide some common encoding and decoding functions.
  */
-abstract class AbstractResponse extends BaseAbstractResponse
-{
+abstract class AbstractResponse extends BaseAbstractResponse {
     /**
      * Encode merchant parameters
      *
@@ -20,8 +19,7 @@ 
      *
      * @return string Encoded data
      */
-    protected function encodeMerchantParameters($data)
-    {
+    protected function encodeMerchantParameters($data) {
         return base64_encode(json_encode($data));
     }
 
@@ -32,8 +30,7 @@ 
      *
      * @return array Decoded data
      */
-    protected function decodeMerchantParameters($data)
-    {
+    protected function decodeMerchantParameters($data) {
         return (array)json_decode(base64_decode(strtr($data, '-_', '+/')));
     }
 
@@ -49,8 +46,7 @@ 
      *
      * @throws RuntimeException
      */
-    protected function encryptMessage($message, $key)
-    {
+    protected function encryptMessage($message, $key) {
         $iv = implode(array_map("chr", array(0, 0, 0, 0, 0, 0, 0, 0)));
 
         if (function_exists('mcrypt_encrypt')) {
@@ -73,14 +69,12 @@ 
      *
      * @return string Generated signature
      */
-    protected function createSignature($message, $salt, $key)
-    {
+    protected function createSignature($message, $salt, $key) {
         $ciphertext = $this->encryptMessage($salt, $key);
         return base64_encode(hash_hmac('sha256', $message, $ciphertext, true));
     }
 
-    protected function createReturnSignature($message, $salt, $key)
-    {
+    protected function createReturnSignature($message, $salt, $key) {
         return strtr($this->createSignature($message, $salt, $key), '+/', '-_');
     }
 }

src/Message/CompletePurchaseRequest.php

Indentation +8 added lines, -8 removed lines

@@ -7,13 +7,13 @@
  */
 class CompletePurchaseRequest extends PurchaseRequest
 {
-    public function getData()
-    {
-        return $this->httpRequest->request->all();
-    }
+	public function getData()
+	{
+		return $this->httpRequest->request->all();
+	}
 
-    public function sendData($data)
-    {
-        return $this->response = new CompletePurchaseResponse($this, $data);
-    }
+	public function sendData($data)
+	{
+		return $this->response = new CompletePurchaseResponse($this, $data);
+	}
 }

Braces +3 added lines, -6 removed lines

@@ -5,15 +5,12 @@
 /**
  * Redsys 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)
-    {
+    public function sendData($data) {
         return $this->response = new CompletePurchaseResponse($this, $data);
     }
 }

src/Message/PurchaseRequest.php

Indentation +155 added lines, -155 removed lines

@@ -9,159 +9,159 @@
  */
 class PurchaseRequest extends AbstractRequest
 {
-    protected $liveEndpoint = 'https://sis.redsys.es/sis/realizarPago';
-    protected $testEndpoint = 'https://sis-t.redsys.es:25443/sis/realizarPago';
-    protected static $consumerLanguages = array(
-        'es' => '001', // Spanish
-        'en' => '002', // English
-        'ca' => '003', // Catalan - same as Valencian (010)
-        'fr' => '004', // French
-        'de' => '005', // German
-        'nl' => '006', // Dutch
-        'it' => '007', // Italian
-        'sv' => '008', // Swedish
-        'pt' => '009', // Portuguese
-        'pl' => '011', // Polish
-        'gl' => '012', // Galician
-        'eu' => '013', // Basque
-    );
-
-    public function getCardholder()
-    {
-        return $this->getParameter('cardholder');
-    }
-
-    public function setCardholder($value)
-    {
-        return $this->setParameter('cardholder', $value);
-    }
-
-    public function getConsumerLanguage()
-    {
-        return $this->getParameter('consumerLanguage');
-    }
-
-    /**
-     * Set the language presented to the consumer
-     *
-     * @param string|int Either the ISO 639-1 code to be converted, or the gateway's own numeric language code
-     */
-    public function setConsumerLanguage($value)
-    {
-        if (is_int($value)) {
-            if ($value < 0 || $value > 13) {
-                $value = 1;
-            }
-            $value = str_pad($value, 3, '0', STR_PAD_LEFT);
-        } elseif (!is_numeric($value)) {
-            $value = isset(self::$consumerLanguages[$value]) ? self::$consumerLanguages[$value] : '001';
-        }
-
-        return $this->setParameter('consumerLanguage', $value);
-    }
-
-    public function getHmacKey()
-    {
-        return $this->getParameter('hmacKey');
-    }
-
-    public function setHmacKey($value)
-    {
-        return $this->setParameter('hmacKey', $value);
-    }
-
-    public function getMerchantData()
-    {
-        return $this->getParameter('merchantData');
-    }
-
-    public function setMerchantData($value)
-    {
-        return $this->setParameter('merchantData', $value);
-    }
-
-    public function getMerchantId()
-    {
-        return $this->getParameter('merchantId');
-    }
-
-    public function setMerchantId($value)
-    {
-        return $this->setParameter('merchantId', $value);
-    }
-
-    public function getMerchantName()
-    {
-        return $this->getParameter('merchantName');
-    }
-
-    public function setMerchantName($value)
-    {
-        return $this->setParameter('merchantName', $value);
-    }
-
-    public function getTerminalId()
-    {
-        return $this->getParameter('terminalId');
-    }
-
-    public function setTerminalId($value)
-    {
-        return $this->setParameter('terminalId', $value);
-    }
-
-    /**
-     * Override the abstract method to add requirement that it must start with 4 numeric characters
-     *
-     * @param string|int $value The transaction ID (merchant order) to set for the transaction
-     */
-    public function setTransactionId($value)
-    {
-        $start = substr($value, 0, 4);
-        $numerics = 0;
-        foreach (str_split($start) as $char) {
-            if (is_numeric($char)) {
-                $numerics++;
-            } else {
-                break;
-            }
-        }
-        $value = str_pad(substr($start, 0, $numerics), 4, 0, STR_PAD_LEFT).substr($value, $numerics);
-
-        parent::setTransactionId($value);
-    }
-
-    public function getData()
-    {
-        $this->validate('merchantId', 'terminalId', 'amount', 'currency');
-
-        return array(
-            // mandatory fields
-            'Ds_Merchant_MerchantCode'       => $this->getMerchantId(),
-            'Ds_Merchant_Terminal'           => $this->getTerminalId(),
-            'Ds_Merchant_TransactionType'    => '0',                          // Authorisation
-            'Ds_Merchant_Amount'             => $this->getAmountInteger(),
-            'Ds_Merchant_Currency'           => $this->getCurrencyNumeric(),  // uses ISO-4217 codes
-            'Ds_Merchant_Order'              => $this->getTransactionId(),
-            'Ds_Merchant_MerchantUrl'        => $this->getNotifyUrl(),
-            // optional fields
-            'Ds_Merchant_ProductDescription' => $this->getDescription(),
-            'Ds_Merchant_Cardholder'         => $this->getCardholder(),
-            'Ds_Merchant_UrlOK'              => $this->getReturnUrl(),
-            'Ds_Merchant_UrlKO'              => $this->getReturnUrl(),
-            'Ds_Merchant_MerchantName'       => $this->getMerchantName(),
-            'Ds_Merchant_ConsumerLanguage'   => $this->getConsumerLanguage(),
-            'Ds_Merchant_MerchantData'       => $this->getMerchantData(),
-        );
-    }
-
-    public function sendData($data)
-    {
-        return $this->response = new PurchaseResponse($this, $data);
-    }
-
-    public function getEndpoint()
-    {
-        return $this->getTestMode() ? $this->testEndpoint : $this->liveEndpoint;
-    }
+	protected $liveEndpoint = 'https://sis.redsys.es/sis/realizarPago';
+	protected $testEndpoint = 'https://sis-t.redsys.es:25443/sis/realizarPago';
+	protected static $consumerLanguages = array(
+		'es' => '001', // Spanish
+		'en' => '002', // English
+		'ca' => '003', // Catalan - same as Valencian (010)
+		'fr' => '004', // French
+		'de' => '005', // German
+		'nl' => '006', // Dutch
+		'it' => '007', // Italian
+		'sv' => '008', // Swedish
+		'pt' => '009', // Portuguese
+		'pl' => '011', // Polish
+		'gl' => '012', // Galician
+		'eu' => '013', // Basque
+	);
+
+	public function getCardholder()
+	{
+		return $this->getParameter('cardholder');
+	}
+
+	public function setCardholder($value)
+	{
+		return $this->setParameter('cardholder', $value);
+	}
+
+	public function getConsumerLanguage()
+	{
+		return $this->getParameter('consumerLanguage');
+	}
+
+	/**
+	 * Set the language presented to the consumer
+	 *
+	 * @param string|int Either the ISO 639-1 code to be converted, or the gateway's own numeric language code
+	 */
+	public function setConsumerLanguage($value)
+	{
+		if (is_int($value)) {
+			if ($value < 0 || $value > 13) {
+				$value = 1;
+			}
+			$value = str_pad($value, 3, '0', STR_PAD_LEFT);
+		} elseif (!is_numeric($value)) {
+			$value = isset(self::$consumerLanguages[$value]) ? self::$consumerLanguages[$value] : '001';
+		}
+
+		return $this->setParameter('consumerLanguage', $value);
+	}
+
+	public function getHmacKey()
+	{
+		return $this->getParameter('hmacKey');
+	}
+
+	public function setHmacKey($value)
+	{
+		return $this->setParameter('hmacKey', $value);
+	}
+
+	public function getMerchantData()
+	{
+		return $this->getParameter('merchantData');
+	}
+
+	public function setMerchantData($value)
+	{
+		return $this->setParameter('merchantData', $value);
+	}
+
+	public function getMerchantId()
+	{
+		return $this->getParameter('merchantId');
+	}
+
+	public function setMerchantId($value)
+	{
+		return $this->setParameter('merchantId', $value);
+	}
+
+	public function getMerchantName()
+	{
+		return $this->getParameter('merchantName');
+	}
+
+	public function setMerchantName($value)
+	{
+		return $this->setParameter('merchantName', $value);
+	}
+
+	public function getTerminalId()
+	{
+		return $this->getParameter('terminalId');
+	}
+
+	public function setTerminalId($value)
+	{
+		return $this->setParameter('terminalId', $value);
+	}
+
+	/**
+	 * Override the abstract method to add requirement that it must start with 4 numeric characters
+	 *
+	 * @param string|int $value The transaction ID (merchant order) to set for the transaction
+	 */
+	public function setTransactionId($value)
+	{
+		$start = substr($value, 0, 4);
+		$numerics = 0;
+		foreach (str_split($start) as $char) {
+			if (is_numeric($char)) {
+				$numerics++;
+			} else {
+				break;
+			}
+		}
+		$value = str_pad(substr($start, 0, $numerics), 4, 0, STR_PAD_LEFT).substr($value, $numerics);
+
+		parent::setTransactionId($value);
+	}
+
+	public function getData()
+	{
+		$this->validate('merchantId', 'terminalId', 'amount', 'currency');
+
+		return array(
+			// mandatory fields
+			'Ds_Merchant_MerchantCode'       => $this->getMerchantId(),
+			'Ds_Merchant_Terminal'           => $this->getTerminalId(),
+			'Ds_Merchant_TransactionType'    => '0',                          // Authorisation
+			'Ds_Merchant_Amount'             => $this->getAmountInteger(),
+			'Ds_Merchant_Currency'           => $this->getCurrencyNumeric(),  // uses ISO-4217 codes
+			'Ds_Merchant_Order'              => $this->getTransactionId(),
+			'Ds_Merchant_MerchantUrl'        => $this->getNotifyUrl(),
+			// optional fields
+			'Ds_Merchant_ProductDescription' => $this->getDescription(),
+			'Ds_Merchant_Cardholder'         => $this->getCardholder(),
+			'Ds_Merchant_UrlOK'              => $this->getReturnUrl(),
+			'Ds_Merchant_UrlKO'              => $this->getReturnUrl(),
+			'Ds_Merchant_MerchantName'       => $this->getMerchantName(),
+			'Ds_Merchant_ConsumerLanguage'   => $this->getConsumerLanguage(),
+			'Ds_Merchant_MerchantData'       => $this->getMerchantData(),
+		);
+	}
+
+	public function sendData($data)
+	{
+		return $this->response = new PurchaseResponse($this, $data);
+	}
+
+	public function getEndpoint()
+	{
+		return $this->getTestMode() ? $this->testEndpoint : $this->liveEndpoint;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -139,9 +139,9 @@
             // mandatory fields
             'Ds_Merchant_MerchantCode'       => $this->getMerchantId(),
             'Ds_Merchant_Terminal'           => $this->getTerminalId(),
-            'Ds_Merchant_TransactionType'    => '0',                          // Authorisation
+            'Ds_Merchant_TransactionType'    => '0', // Authorisation
             'Ds_Merchant_Amount'             => $this->getAmountInteger(),
-            'Ds_Merchant_Currency'           => $this->getCurrencyNumeric(),  // uses ISO-4217 codes
+            'Ds_Merchant_Currency'           => $this->getCurrencyNumeric(), // uses ISO-4217 codes
             'Ds_Merchant_Order'              => $this->getTransactionId(),
             'Ds_Merchant_MerchantUrl'        => $this->getNotifyUrl(),
             // optional fields

Braces +19 added lines, -38 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Redsys Purchase Request
  */
-class PurchaseRequest extends AbstractRequest
-{
+class PurchaseRequest extends AbstractRequest {
     protected $liveEndpoint = 'https://sis.redsys.es/sis/realizarPago';
     protected $testEndpoint = 'https://sis-t.redsys.es:25443/sis/realizarPago';
     protected static $consumerLanguages = array(
@@ -26,18 +25,15 @@ 
         'eu' => '013', // Basque
     );
 
-    public function getCardholder()
-    {
+    public function getCardholder() {
         return $this->getParameter('cardholder');
     }
 
-    public function setCardholder($value)
-    {
+    public function setCardholder($value) {
         return $this->setParameter('cardholder', $value);
     }
 
-    public function getConsumerLanguage()
-    {
+    public function getConsumerLanguage() {
         return $this->getParameter('consumerLanguage');
     }
 
@@ -46,8 +42,7 @@ 
      *
      * @param string|int Either the ISO 639-1 code to be converted, or the gateway's own numeric language code
      */
-    public function setConsumerLanguage($value)
-    {
+    public function setConsumerLanguage($value) {
         if (is_int($value)) {
             if ($value < 0 || $value > 13) {
                 $value = 1;
@@ -60,53 +55,43 @@ 
         return $this->setParameter('consumerLanguage', $value);
     }
 
-    public function getHmacKey()
-    {
+    public function getHmacKey() {
         return $this->getParameter('hmacKey');
     }
 
-    public function setHmacKey($value)
-    {
+    public function setHmacKey($value) {
         return $this->setParameter('hmacKey', $value);
     }
 
-    public function getMerchantData()
-    {
+    public function getMerchantData() {
         return $this->getParameter('merchantData');
     }
 
-    public function setMerchantData($value)
-    {
+    public function setMerchantData($value) {
         return $this->setParameter('merchantData', $value);
     }
 
-    public function getMerchantId()
-    {
+    public function getMerchantId() {
         return $this->getParameter('merchantId');
     }
 
-    public function setMerchantId($value)
-    {
+    public function setMerchantId($value) {
         return $this->setParameter('merchantId', $value);
     }
 
-    public function getMerchantName()
-    {
+    public function getMerchantName() {
         return $this->getParameter('merchantName');
     }
 
-    public function setMerchantName($value)
-    {
+    public function setMerchantName($value) {
         return $this->setParameter('merchantName', $value);
     }
 
-    public function getTerminalId()
-    {
+    public function getTerminalId() {
         return $this->getParameter('terminalId');
     }
 
-    public function setTerminalId($value)
-    {
+    public function setTerminalId($value) {
         return $this->setParameter('terminalId', $value);
     }
 
@@ -115,8 +100,7 @@ 
      *
      * @param string|int $value The transaction ID (merchant order) to set for the transaction
      */
-    public function setTransactionId($value)
-    {
+    public function setTransactionId($value) {
         $start = substr($value, 0, 4);
         $numerics = 0;
         foreach (str_split($start) as $char) {
@@ -131,8 +115,7 @@ 
         parent::setTransactionId($value);
     }
 
-    public function getData()
-    {
+    public function getData() {
         $this->validate('merchantId', 'terminalId', 'amount', 'currency');
 
         return array(
@@ -155,13 +138,11 @@ 
         );
     }
 
-    public function sendData($data)
-    {
+    public function sendData($data) {
         return $this->response = new PurchaseResponse($this, $data);
     }
 
-    public function getEndpoint()
-    {
+    public function getEndpoint() {
         return $this->getTestMode() ? $this->testEndpoint : $this->liveEndpoint;
     }
 }

src/Message/PurchaseResponse.php

Indentation +35 added lines, -35 removed lines

@@ -9,39 +9,39 @@
  */
 class PurchaseResponse extends AbstractResponse implements RedirectResponseInterface
 {
-    protected $version = 'HMAC_SHA256_V1';
-
-    public function isSuccessful()
-    {
-        return false;
-    }
-
-    public function isRedirect()
-    {
-        return true;
-    }
-
-    public function getRedirectUrl()
-    {
-        return $this->getRequest()->getEndpoint();
-    }
-
-    public function getRedirectMethod()
-    {
-        return 'POST';
-    }
-
-    public function getRedirectData()
-    {
-        $redirect_data = array();
-        $redirect_data['Ds_SignatureVersion'] = $this->version;
-        $redirect_data['Ds_MerchantParameters'] = $this->encodeMerchantParameters($this->data);
-        $redirect_data['Ds_Signature'] = $this->createSignature(
-            $redirect_data['Ds_MerchantParameters'],
-            $this->data['Ds_Merchant_Order'],
-            base64_decode($this->request->getHmacKey())
-        );
-
-        return $redirect_data;
-    }
+	protected $version = 'HMAC_SHA256_V1';
+
+	public function isSuccessful()
+	{
+		return false;
+	}
+
+	public function isRedirect()
+	{
+		return true;
+	}
+
+	public function getRedirectUrl()
+	{
+		return $this->getRequest()->getEndpoint();
+	}
+
+	public function getRedirectMethod()
+	{
+		return 'POST';
+	}
+
+	public function getRedirectData()
+	{
+		$redirect_data = array();
+		$redirect_data['Ds_SignatureVersion'] = $this->version;
+		$redirect_data['Ds_MerchantParameters'] = $this->encodeMerchantParameters($this->data);
+		$redirect_data['Ds_Signature'] = $this->createSignature(
+			$redirect_data['Ds_MerchantParameters'],
+			$this->data['Ds_Merchant_Order'],
+			base64_decode($this->request->getHmacKey())
+		);
+
+		return $redirect_data;
+	}
 }

Braces +6 added lines, -12 removed lines

@@ -7,32 +7,26 @@
 /**
  * Redsys Purchase Response
  */
-class PurchaseResponse extends AbstractResponse implements RedirectResponseInterface
-{
+class PurchaseResponse extends AbstractResponse implements RedirectResponseInterface {
     protected $version = 'HMAC_SHA256_V1';
 
-    public function isSuccessful()
-    {
+    public function isSuccessful() {
         return false;
     }
 
-    public function isRedirect()
-    {
+    public function isRedirect() {
         return true;
     }
 
-    public function getRedirectUrl()
-    {
+    public function getRedirectUrl() {
         return $this->getRequest()->getEndpoint();
     }
 
-    public function getRedirectMethod()
-    {
+    public function getRedirectMethod() {
         return 'POST';
     }
 
-    public function getRedirectData()
-    {
+    public function getRedirectData() {
         $redirect_data = array();
         $redirect_data['Ds_SignatureVersion'] = $this->version;
         $redirect_data['Ds_MerchantParameters'] = $this->encodeMerchantParameters($this->data);