PatronBase / omnipay-redsys

src/Message/CompletePurchaseResponse.php

Indentation +111 added lines, -111 removed lines

@@ -11,127 +11,127 @@
  */
 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 merchant data or 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 merchant data or order number is missing, or signature does not match
+	 */
+	public function __construct(RequestInterface $request, $data)
+	{
+		parent::__construct($request, $data);
 
-        $security = new Security;
+		$security = new Security;
 
-        if (!empty($data['Ds_MerchantParameters'])) {
-            $this->merchantParameters = $security->decodeMerchantParameters($data['Ds_MerchantParameters']);
-        } elseif (!empty($data['DS_MERCHANTPARAMETERS'])) {
-            $this->merchantParameters = $security->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 = $security->decodeMerchantParameters($data['Ds_MerchantParameters']);
+		} elseif (!empty($data['DS_MERCHANTPARAMETERS'])) {
+			$this->merchantParameters = $security->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 = $security->createReturnSignature(
-            $data[$this->usingUpcaseResponse ? 'DS_MERCHANTPARAMETERS' : 'Ds_MerchantParameters'],
-            $order,
-            base64_decode($this->request->getHmacKey())
-        );
+		$this->returnSignature = $security->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.
-     *
-     * @param string $key The key to look up
-     *
-     * @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.
+	 *
+	 * @param string $key The key to look up
+	 *
+	 * @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');
+	}
 }

src/Message/WebservicePurchaseRequest.php

Indentation +83 added lines, -83 removed lines

@@ -9,65 +9,65 @@ 
  */
 class WebservicePurchaseRequest extends PurchaseRequest
 {
-    /** @var string */
-    protected $liveWsdl = __DIR__ . "/redsys-webservice-live.wsdl";
-    /** @var string */
-    protected $testWsdl = __DIR__ . "/redsys-webservice-test.wsdl";
-    /** @var string */
-    protected $liveEndpoint = "https://sis.redsys.es/sis/services/SerClsWSEntrada";
-    /** @var string */
-    protected $testEndpoint = "https://sis-t.redsys.es:25443/sis/services/SerClsWSEntrada";
+	/** @var string */
+	protected $liveWsdl = __DIR__ . "/redsys-webservice-live.wsdl";
+	/** @var string */
+	protected $testWsdl = __DIR__ . "/redsys-webservice-test.wsdl";
+	/** @var string */
+	protected $liveEndpoint = "https://sis.redsys.es/sis/services/SerClsWSEntrada";
+	/** @var string */
+	protected $testEndpoint = "https://sis-t.redsys.es:25443/sis/services/SerClsWSEntrada";
  
-    public function getData()
-    {
-        $this->validate('merchantId', 'terminalId', 'amount', 'currency', 'card');
-        $card = $this->getCard();
-        // @todo given test card doesn't validate?
-        if (!$this->getTestMode()) {
-            $card->validate();
-        }
-
-        $data = array(
-            'DS_MERCHANT_AMOUNT'          => $this->getAmountInteger(),
-            'DS_MERCHANT_ORDER'           => $this->getTransactionId(),
-            'DS_MERCHANT_MERCHANTCODE'    => $this->getMerchantId(),
-            'DS_MERCHANT_CURRENCY'        => $this->getCurrencyNumeric(),  // uses ISO-4217 codes
-            'DS_MERCHANT_PAN'             => $card->getNumber(),
-            'DS_MERCHANT_CVV2'            => $card->getCvv(),
-            'DS_MERCHANT_TRANSACTIONTYPE' => 'A',                          // 'Traditional payment'
-            'DS_MERCHANT_TERMINAL'        => $this->getTerminalId(),
-            'DS_MERCHANT_EXPIRYDATE'      => $card->getExpiryDate('ym'),
-        );
-
-
-        $request = new SimpleXMLElement('<REQUEST/>');
-        $requestData = $request->addChild('DATOSENTRADA');
-        foreach ($data as $tag => $value) {
-            $requestData->addChild($tag, $value);
-        }
-
-        $security = new Security;
-
-        $request->addChild('DS_SIGNATUREVERSION', Security::VERSION);
-        $request->addChild('DS_SIGNATURE', $security->createSignature(
-            $requestData->asXML(),
-            $data['DS_MERCHANT_ORDER'],
-            base64_decode($this->getHmacKey())
-        ));
-
-        return $request;
-        // array(
-        //     'DATOSENTRADA'        => $data,
-        //     'DS_SIGNATUREVERSION' => $request->DS_SIGNATUREVERSION,
-        //     'DS_SIGNATURE'        => $request->DS_SIGNATURE,
-        // );
-    }
-
-    public function sendData($data)
-    {
-
-        // @todo either use SOAP client here, or wrap in soap yourself and just guzzle it
-        /*
+	public function getData()
+	{
+		$this->validate('merchantId', 'terminalId', 'amount', 'currency', 'card');
+		$card = $this->getCard();
+		// @todo given test card doesn't validate?
+		if (!$this->getTestMode()) {
+			$card->validate();
+		}
+
+		$data = array(
+			'DS_MERCHANT_AMOUNT'          => $this->getAmountInteger(),
+			'DS_MERCHANT_ORDER'           => $this->getTransactionId(),
+			'DS_MERCHANT_MERCHANTCODE'    => $this->getMerchantId(),
+			'DS_MERCHANT_CURRENCY'        => $this->getCurrencyNumeric(),  // uses ISO-4217 codes
+			'DS_MERCHANT_PAN'             => $card->getNumber(),
+			'DS_MERCHANT_CVV2'            => $card->getCvv(),
+			'DS_MERCHANT_TRANSACTIONTYPE' => 'A',                          // 'Traditional payment'
+			'DS_MERCHANT_TERMINAL'        => $this->getTerminalId(),
+			'DS_MERCHANT_EXPIRYDATE'      => $card->getExpiryDate('ym'),
+		);
+
+
+		$request = new SimpleXMLElement('<REQUEST/>');
+		$requestData = $request->addChild('DATOSENTRADA');
+		foreach ($data as $tag => $value) {
+			$requestData->addChild($tag, $value);
+		}
+
+		$security = new Security;
+
+		$request->addChild('DS_SIGNATUREVERSION', Security::VERSION);
+		$request->addChild('DS_SIGNATURE', $security->createSignature(
+			$requestData->asXML(),
+			$data['DS_MERCHANT_ORDER'],
+			base64_decode($this->getHmacKey())
+		));
+
+		return $request;
+		// array(
+		//     'DATOSENTRADA'        => $data,
+		//     'DS_SIGNATUREVERSION' => $request->DS_SIGNATUREVERSION,
+		//     'DS_SIGNATURE'        => $request->DS_SIGNATURE,
+		// );
+	}
+
+	public function sendData($data)
+	{
+
+		// @todo either use SOAP client here, or wrap in soap yourself and just guzzle it
+		/*
             use SoapClient;
             $s = new SoapClient($fs, array('trace' => $this->debug, 'exceptions' => true));
             $result = $s->trataPeticion(
@@ -76,8 +76,8 @@ 
 
         */
 
-        // DIY SOAP WRAPPER
-        $envelope = "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>
+		// DIY SOAP WRAPPER
+		$envelope = "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>
               <soapenv:Header/>
               <soapenv:Body>
                 <impl:trataPeticion xmlns:impl='http://webservice.sis.sermepa.es'>
@@ -88,27 +88,27 @@ 
               </soapenv:Body>
             </soapenv:Envelope>";
 
-        $httpResponse = $this->httpClient->post(
-            $this->getEndpoint(),
-            array('SOAPAction' => 'trataPeticion'),
-            $envelope
-        )->send();
-
-        // unwrap httpResponse into actual data as SimpleXMLElement tree
-        $envelope = $httpResponse->xml();
-        $response_data = new SimpleXMLElement(htmlspecialchars_decode(
-            $envelope->children("http://schemas.xmlsoap.org/soap/envelope/")
-            ->Body->children("http://webservice.sis.sermepa.es")
-            ->trataPeticionResponse
-            ->trataPeticionReturn
-        ));
-
-        // remove any reflected request data (this happens on error, including card number)
-        // if (isset($response_data->RECIBIDO)) {
-        //     unset($response_data->RECIBIDO);
-        // }
-
-
-        return $this->response = new WebservicePurchaseResponse($this, $response_data);
-    }
+		$httpResponse = $this->httpClient->post(
+			$this->getEndpoint(),
+			array('SOAPAction' => 'trataPeticion'),
+			$envelope
+		)->send();
+
+		// unwrap httpResponse into actual data as SimpleXMLElement tree
+		$envelope = $httpResponse->xml();
+		$response_data = new SimpleXMLElement(htmlspecialchars_decode(
+			$envelope->children("http://schemas.xmlsoap.org/soap/envelope/")
+			->Body->children("http://webservice.sis.sermepa.es")
+			->trataPeticionResponse
+			->trataPeticionReturn
+		));
+
+		// remove any reflected request data (this happens on error, including card number)
+		// if (isset($response_data->RECIBIDO)) {
+		//     unset($response_data->RECIBIDO);
+		// }
+
+
+		return $this->response = new WebservicePurchaseResponse($this, $response_data);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -10,9 +10,9 @@ 
 class WebservicePurchaseRequest extends PurchaseRequest
 {
     /** @var string */
-    protected $liveWsdl = __DIR__ . "/redsys-webservice-live.wsdl";
+    protected $liveWsdl = __DIR__."/redsys-webservice-live.wsdl";
     /** @var string */
-    protected $testWsdl = __DIR__ . "/redsys-webservice-test.wsdl";
+    protected $testWsdl = __DIR__."/redsys-webservice-test.wsdl";
     /** @var string */
     protected $liveEndpoint = "https://sis.redsys.es/sis/services/SerClsWSEntrada";
     /** @var string */
@@ -31,10 +31,10 @@ 
             'DS_MERCHANT_AMOUNT'          => $this->getAmountInteger(),
             'DS_MERCHANT_ORDER'           => $this->getTransactionId(),
             'DS_MERCHANT_MERCHANTCODE'    => $this->getMerchantId(),
-            'DS_MERCHANT_CURRENCY'        => $this->getCurrencyNumeric(),  // uses ISO-4217 codes
+            'DS_MERCHANT_CURRENCY'        => $this->getCurrencyNumeric(), // uses ISO-4217 codes
             'DS_MERCHANT_PAN'             => $card->getNumber(),
             'DS_MERCHANT_CVV2'            => $card->getCvv(),
-            'DS_MERCHANT_TRANSACTIONTYPE' => 'A',                          // 'Traditional payment'
+            'DS_MERCHANT_TRANSACTIONTYPE' => 'A', // 'Traditional payment'
             'DS_MERCHANT_TERMINAL'        => $this->getTerminalId(),
             'DS_MERCHANT_EXPIRYDATE'      => $card->getExpiryDate('ym'),
         );

Braces +3 added lines, -6 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Redsys Webservice Purchase Request
  */
-class WebservicePurchaseRequest extends PurchaseRequest
-{
+class WebservicePurchaseRequest extends PurchaseRequest {
     /** @var string */
     protected $liveWsdl = __DIR__ . "/redsys-webservice-live.wsdl";
     /** @var string */
@@ -18,8 +17,7 @@ 
     /** @var string */
     protected $testEndpoint = "https://sis-t.redsys.es:25443/sis/services/SerClsWSEntrada";
  
-    public function getData()
-    {
+    public function getData() {
         $this->validate('merchantId', 'terminalId', 'amount', 'currency', 'card');
         $card = $this->getCard();
         // @todo given test card doesn't validate?
@@ -63,8 +61,7 @@ 
         // );
     }
 
-    public function sendData($data)
-    {
+    public function sendData($data) {
 
         // @todo either use SOAP client here, or wrap in soap yourself and just guzzle it
         /*

src/Message/WebservicePurchaseResponse.php

Indentation +43 added lines, -43 removed lines

@@ -10,47 +10,47 @@
  */
 class WebservicePurchaseResponse extends AbstractResponse
 {
-    public function isSuccessful()
-    {
-        // check for field existence as well as value
-        return !empty($this->data->CODIGO)
-            && $this->data->CODIGO == '0'
-            && !empty($this->data->OPERACION->Ds_Response)
-            && $this->data->OPERACION->Ds_Response == '0000';
-        // @todo  && verify signature
-    }
-
-    // @todo Other methods required for abstract response
-    public function getTransactionReference()
-    {
-        return "WOOT";
-    }
-
-    // @todo Switch to just returning the error code (no message supplied in package)
-    public function getMessage()
-    {
-        if ($this->data instanceof SimpleXMLElement) {
-            $out = $this->data->asXML();
-        } else {
-            $out = json_encode($this->data);
-        }
-
-        return is_string($out) ? $out : 'nope';
-    }
-
-    // @todo Pull out signature methods for use in webservice request/response validation
-    // public function getRedirectData()
-    // {
-        // $security = new Security;
-        // $redirect_data = array();
-        // $redirect_data['Ds_SignatureVersion'] = Security::VERSION;
-        // $redirect_data['Ds_MerchantParameters'] = $security->encodeMerchantParameters($this->data);
-        // $redirect_data['Ds_Signature'] = $security->createSignature(
-        //     $redirect_data['Ds_MerchantParameters'],
-        //     $this->data['Ds_Merchant_Order'],
-        //     base64_decode($this->request->getHmacKey())
-        // );
-
-        // return $redirect_data;
-    // }
+	public function isSuccessful()
+	{
+		// check for field existence as well as value
+		return !empty($this->data->CODIGO)
+			&& $this->data->CODIGO == '0'
+			&& !empty($this->data->OPERACION->Ds_Response)
+			&& $this->data->OPERACION->Ds_Response == '0000';
+		// @todo  && verify signature
+	}
+
+	// @todo Other methods required for abstract response
+	public function getTransactionReference()
+	{
+		return "WOOT";
+	}
+
+	// @todo Switch to just returning the error code (no message supplied in package)
+	public function getMessage()
+	{
+		if ($this->data instanceof SimpleXMLElement) {
+			$out = $this->data->asXML();
+		} else {
+			$out = json_encode($this->data);
+		}
+
+		return is_string($out) ? $out : 'nope';
+	}
+
+	// @todo Pull out signature methods for use in webservice request/response validation
+	// public function getRedirectData()
+	// {
+		// $security = new Security;
+		// $redirect_data = array();
+		// $redirect_data['Ds_SignatureVersion'] = Security::VERSION;
+		// $redirect_data['Ds_MerchantParameters'] = $security->encodeMerchantParameters($this->data);
+		// $redirect_data['Ds_Signature'] = $security->createSignature(
+		//     $redirect_data['Ds_MerchantParameters'],
+		//     $this->data['Ds_Merchant_Order'],
+		//     base64_decode($this->request->getHmacKey())
+		// );
+
+		// return $redirect_data;
+	// }
 }

Braces +4 added lines, -8 removed lines

@@ -8,10 +8,8 @@ 
 /**
  * Redsys Purchase Response
  */
-class WebservicePurchaseResponse extends AbstractResponse
-{
-    public function isSuccessful()
-    {
+class WebservicePurchaseResponse extends AbstractResponse {
+    public function isSuccessful() {
         // check for field existence as well as value
         return !empty($this->data->CODIGO)
             && $this->data->CODIGO == '0'
@@ -21,14 +19,12 @@ 
     }
 
     // @todo Other methods required for abstract response
-    public function getTransactionReference()
-    {
+    public function getTransactionReference() {
         return "WOOT";
     }
 
     // @todo Switch to just returning the error code (no message supplied in package)
-    public function getMessage()
-    {
+    public function getMessage() {
         if ($this->data instanceof SimpleXMLElement) {
             $out = $this->data->asXML();
         } else {

src/Message/Security.php

Indentation +75 added lines, -75 removed lines

@@ -15,87 +15,87 @@
  */
 class Security
 {
-    /** @var string */
-    const VERSION = 'HMAC_SHA256_V1';
+	/** @var string */
+	const VERSION = 'HMAC_SHA256_V1';
 
-    /**
-     * Encode merchant parameters
-     *
-     * @param array $data  The parameters to encode
-     *
-     * @return string Encoded data
-     */
-    public function encodeMerchantParameters($data)
-    {
-        return base64_encode(json_encode($data));
-    }
+	/**
+	 * Encode merchant parameters
+	 *
+	 * @param array $data  The parameters to encode
+	 *
+	 * @return string Encoded data
+	 */
+	public function encodeMerchantParameters($data)
+	{
+		return base64_encode(json_encode($data));
+	}
 
-    /**
-     * Decode merchant parameters
-     *
-     * @param string $data  The encoded string of parameters
-     *
-     * @return array Decoded data
-     */
-    public 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
+	 */
+	public function decodeMerchantParameters($data)
+	{
+		return (array)json_decode(base64_decode(strtr($data, '-_', '+/')));
+	}
 
-    /**
-     * Encrypt message with given key and default IV
-     *
-     * @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
+	 *
+	 * @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 ($this->hasValidEncryptionMethod()) {
-            $ciphertext = mcrypt_encrypt(MCRYPT_3DES, $key, $message, MCRYPT_MODE_CBC, $iv);
-        } else {
-            throw new RuntimeException('No valid encryption extension installed');
-        }
+		if ($this->hasValidEncryptionMethod()) {
+			$ciphertext = mcrypt_encrypt(MCRYPT_3DES, $key, $message, MCRYPT_MODE_CBC, $iv);
+		} else {
+			throw new RuntimeException('No valid encryption extension installed');
+		}
 
-        return $ciphertext;
-    }
+		return $ciphertext;
+	}
 
-    /**
-     * Check if the system has a valid encryption method available
-     *
-     * @todo add or switch to extension_loaded()?
-     *
-     * @return bool
-     */
-    public function hasValidEncryptionMethod()
-    {
-        return function_exists('mcrypt_encrypt');
-    }
+	/**
+	 * Check if the system has a valid encryption method available
+	 *
+	 * @todo add or switch to extension_loaded()?
+	 *
+	 * @return bool
+	 */
+	public function hasValidEncryptionMethod()
+	{
+		return function_exists('mcrypt_encrypt');
+	}
 
-    /**
-     * 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
-     */
-    public 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
+	 */
+	public function createSignature($message, $salt, $key)
+	{
+		$ciphertext = $this->encryptMessage($salt, $key);
+		return base64_encode(hash_hmac('sha256', $message, $ciphertext, true));
+	}
 
-    public function createReturnSignature($message, $salt, $key)
-    {
-        return strtr($this->createSignature($message, $salt, $key), '+/', '-_');
-    }
+	public function createReturnSignature($message, $salt, $key)
+	{
+		return strtr($this->createSignature($message, $salt, $key), '+/', '-_');
+	}
 }

Braces +7 added lines, -14 removed lines

@@ -13,8 +13,7 @@ 
  * encryption methods are provided later, the VERSION const can be
  * switched to a constructor option (and validated against a whitelist).
  */
-class Security
-{
+class Security {
     /** @var string */
     const VERSION = 'HMAC_SHA256_V1';
 
@@ -25,8 +24,7 @@ 
      *
      * @return string Encoded data
      */
-    public function encodeMerchantParameters($data)
-    {
+    public function encodeMerchantParameters($data) {
         return base64_encode(json_encode($data));
     }
 
@@ -37,8 +35,7 @@ 
      *
      * @return array Decoded data
      */
-    public function decodeMerchantParameters($data)
-    {
+    public function decodeMerchantParameters($data) {
         return (array)json_decode(base64_decode(strtr($data, '-_', '+/')));
     }
 
@@ -52,8 +49,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 ($this->hasValidEncryptionMethod()) {
@@ -72,8 +68,7 @@ 
      *
      * @return bool
      */
-    public function hasValidEncryptionMethod()
-    {
+    public function hasValidEncryptionMethod() {
         return function_exists('mcrypt_encrypt');
     }
 
@@ -88,14 +83,12 @@ 
      *
      * @return string Generated signature
      */
-    public function createSignature($message, $salt, $key)
-    {
+    public function createSignature($message, $salt, $key) {
         $ciphertext = $this->encryptMessage($salt, $key);
         return base64_encode(hash_hmac('sha256', $message, $ciphertext, true));
     }
 
-    public function createReturnSignature($message, $salt, $key)
-    {
+    public function createReturnSignature($message, $salt, $key) {
         return strtr($this->createSignature($message, $salt, $key), '+/', '-_');
     }
 }

src/Message/PurchaseRequest.php

Indentation +172 added lines, -172 removed lines

@@ -9,176 +9,176 @@
  */
 class PurchaseRequest extends AbstractRequest
 {
-    /** @var string */
-    protected $liveEndpoint = 'https://sis.redsys.es/sis/realizarPago';
-    /** @var string */
-    protected $testEndpoint = 'https://sis-t.redsys.es:25443/sis/realizarPago';
-    /** @var array */
-    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)
-    {
-        $security = new Security;
-
-        $encoded_data = $security->encodeMerchantParameters($data);
-
-        $response_data = array(
-            'Ds_SignatureVersion'   => Security::VERSION,
-            'Ds_MerchantParameters' => $encoded_data,
-            'Ds_Signature'          => $security->createSignature(
-                $encoded_data,
-                $data['Ds_Merchant_Order'],
-                base64_decode($this->getHmacKey())
-            ),
-        );
-
-        return $this->response = new PurchaseResponse($this, $response_data);
-    }
-
-    public function getEndpoint()
-    {
-        return $this->getTestMode() ? $this->testEndpoint : $this->liveEndpoint;
-    }
+	/** @var string */
+	protected $liveEndpoint = 'https://sis.redsys.es/sis/realizarPago';
+	/** @var string */
+	protected $testEndpoint = 'https://sis-t.redsys.es:25443/sis/realizarPago';
+	/** @var array */
+	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)
+	{
+		$security = new Security;
+
+		$encoded_data = $security->encodeMerchantParameters($data);
+
+		$response_data = array(
+			'Ds_SignatureVersion'   => Security::VERSION,
+			'Ds_MerchantParameters' => $encoded_data,
+			'Ds_Signature'          => $security->createSignature(
+				$encoded_data,
+				$data['Ds_Merchant_Order'],
+				base64_decode($this->getHmacKey())
+			),
+		);
+
+		return $this->response = new PurchaseResponse($this, $response_data);
+	}
+
+	public function getEndpoint()
+	{
+		return $this->getTestMode() ? $this->testEndpoint : $this->liveEndpoint;
+	}
 }

src/Message/PurchaseResponse.php

Indentation +20 added lines, -20 removed lines

@@ -9,28 +9,28 @@
  */
 class PurchaseResponse extends AbstractResponse
 {
-    public function isSuccessful()
-    {
-        return false;
-    }
+	public function isSuccessful()
+	{
+		return false;
+	}
 
-    public function isRedirect()
-    {
-        return true;
-    }
+	public function isRedirect()
+	{
+		return true;
+	}
 
-    public function getRedirectUrl()
-    {
-        return $this->getRequest()->getEndpoint();
-    }
+	public function getRedirectUrl()
+	{
+		return $this->getRequest()->getEndpoint();
+	}
 
-    public function getRedirectMethod()
-    {
-        return 'POST';
-    }
+	public function getRedirectMethod()
+	{
+		return 'POST';
+	}
 
-    public function getRedirectData()
-    {
-        return $this->data;
-    }
+	public function getRedirectData()
+	{
+		return $this->data;
+	}
 }

Braces +6 added lines, -12 removed lines

@@ -7,30 +7,24 @@
 /**
  * Redsys Purchase Response
  */
-class PurchaseResponse extends AbstractResponse
-{
-    public function isSuccessful()
-    {
+class PurchaseResponse extends AbstractResponse {
+    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() {
         return $this->data;
     }
 }

src/RedirectGateway.php

Indentation +54 added lines, -54 removed lines

@@ -13,69 +13,69 @@
  */
 class RedirectGateway extends AbstractGateway
 {
-    public function getName()
-    {
-        return 'Redsys Redirect';
-    }
+	public function getName()
+	{
+		return 'Redsys Redirect';
+	}
 
-    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 RedirectGateway extends AbstractGateway
-{
-    public function getName()
-    {
+class RedirectGateway extends AbstractGateway {
+    public function getName() {
         return 'Redsys Redirect';
     }
 
-    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/WebserviceGateway.php

Indentation +8 added lines, -8 removed lines

@@ -13,13 +13,13 @@
  */
 class WebserviceGateway extends RedirectGateway
 {
-    public function getName()
-    {
-        return 'Redsys Webservice';
-    }
+	public function getName()
+	{
+		return 'Redsys Webservice';
+	}
 
-    public function purchase(array $parameters = array())
-    {
-        return $this->createRequest('\Omnipay\Redsys\Message\WebservicePurchaseRequest', $parameters);
-    }
+	public function purchase(array $parameters = array())
+	{
+		return $this->createRequest('\Omnipay\Redsys\Message\WebservicePurchaseRequest', $parameters);
+	}
 }

Braces +3 added lines, -6 removed lines

@@ -11,15 +11,12 @@
  *
  * @link http://www.redsys.es/
  */
-class WebserviceGateway extends RedirectGateway
-{
-    public function getName()
-    {
+class WebserviceGateway extends RedirectGateway {
+    public function getName() {
         return 'Redsys Webservice';
     }
 
-    public function purchase(array $parameters = array())
-    {
+    public function purchase(array $parameters = array()) {
         return $this->createRequest('\Omnipay\Redsys\Message\WebservicePurchaseRequest', $parameters);
     }
 }