Skip to content

Commit

Permalink
Renamed namespace prefix from 'class Pronamic_WP_Pay_Buckaroo_' to 'P…
Browse files Browse the repository at this point in the history 
…ronamic_WP_Pay_Gateways_Buckaroo_'.
  • Loading branch information
@remcotolsma
remcotolsma committed Nov 2, 2015
1 parent 61bb4e7 commit 60fb25e
Show file tree
Hide file tree
Showing 19 changed files with 154 additions and 157 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Expand Up @@ -7,6 +7,9 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
## [Unreleased][unreleased]
-

## [1.2.0] - 2015-11-02
- Renamed namespace prefix from 'class Pronamic_WP_Pay_Buckaroo_' to 'Pronamic_WP_Pay_Gateways_Buckaroo_'.

## [1.1.2] - 2015-10-14
- Fix incorrect signature due to slashes in data.

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Expand Up @@ -3,7 +3,7 @@
**Buckaroo driver for the WordPress payment processing library.**

[![Build Status](https://travis-ci.org/wp-pay-gateways/buckaroo.svg?branch=develop)](https://travis-ci.org/wp-pay-gateways/buckaroo)
[![Coverage Status](https://coveralls.io/repos/wp-pay-gateways/buckaroo/badge.png?branch=develop)](https://coveralls.io/r/wp-pay-gateways/buckaroo?branch=develop)
[![Coverage Status](https://coveralls.io/repos/wp-pay-gateways/buckaroo/badge.svg?branch=master&service=github)](https://coveralls.io/github/wp-pay-gateways/buckaroo?branch=master)
[![Latest Stable Version](https://poser.pugx.org/wp-pay-gateways/buckaroo/v/stable.svg)](https://packagist.org/packages/wp-pay-gateways/buckaroo)
[![Total Downloads](https://poser.pugx.org/wp-pay-gateways/buckaroo/downloads.svg)](https://packagist.org/packages/wp-pay-gateways/buckaroo)
[![Latest Unstable Version](https://poser.pugx.org/wp-pay-gateways/buckaroo/v/unstable.svg)](https://packagist.org/packages/wp-pay-gateways/buckaroo)
Expand Down
84 changes: 35 additions & 49 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
@@ -1,6 +1,6 @@
{
"name": "buckaroo",
"version": "1.1.2",
"version": "1.2.0",
"description": "Buckaroo driver for the WordPress payment processing library.",
"repository": {
"type": "git",
Expand Down
62 changes: 31 additions & 31 deletions src/Client.php
View file
Expand Up @@ -9,7 +9,7 @@
* @version 1.1.1
* @since 1.0.0
*/
class Pronamic_WP_Pay_Buckaroo_Client {
class Pronamic_WP_Pay_Gateways_Buckaroo_Client {
/**
* Gateway URL
*
Expand Down Expand Up @@ -374,23 +374,23 @@ public function set_return_cancel_url( $url ) {
*/
public function get_fields() {
$data = array(
Pronamic_WP_Pay_Buckaroo_Parameters::WEBSITE_KEY => $this->get_website_key(),
Pronamic_WP_Pay_Buckaroo_Parameters::INVOICE_NUMBER => $this->get_invoice_number(),
Pronamic_WP_Pay_Buckaroo_Parameters::AMOUNT => number_format( $this->get_amount(), 2, '.', '' ),
Pronamic_WP_Pay_Buckaroo_Parameters::CURRENCY => $this->get_currency(),
Pronamic_WP_Pay_Buckaroo_Parameters::CULTURE => $this->get_culture(),
Pronamic_WP_Pay_Buckaroo_Parameters::DESCRIPTION => $this->get_description(),
Pronamic_WP_Pay_Buckaroo_Parameters::PAYMENT_METHOD => $this->get_payment_method(),
Pronamic_WP_Pay_Buckaroo_Parameters::RETURN_URL => $this->get_return_url(),
Pronamic_WP_Pay_Buckaroo_Parameters::RETURN_REJECT_URL => $this->get_return_reject_url(),
Pronamic_WP_Pay_Buckaroo_Parameters::RETURN_ERROR_URL => $this->get_return_error_url(),
Pronamic_WP_Pay_Buckaroo_Parameters::RETURN_CANCEL_URL => $this->get_return_cancel_url(),
Pronamic_WP_Pay_Buckaroo_Parameters::REQUESTED_SERVICES => implode( ',', $this->get_requested_services() ),
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::WEBSITE_KEY => $this->get_website_key(),
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::INVOICE_NUMBER => $this->get_invoice_number(),
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::AMOUNT => number_format( $this->get_amount(), 2, '.', '' ),
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::CURRENCY => $this->get_currency(),
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::CULTURE => $this->get_culture(),
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::DESCRIPTION => $this->get_description(),
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::PAYMENT_METHOD => $this->get_payment_method(),
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::RETURN_URL => $this->get_return_url(),
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::RETURN_REJECT_URL => $this->get_return_reject_url(),
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::RETURN_ERROR_URL => $this->get_return_error_url(),
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::RETURN_CANCEL_URL => $this->get_return_cancel_url(),
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::REQUESTED_SERVICES => implode( ',', $this->get_requested_services() ),
);

$signature = Pronamic_WP_Pay_Buckaroo_Security::create_signature( $data, $this->get_secret_key() );
$signature = Pronamic_WP_Pay_Gateways_Buckaroo_Security::create_signature( $data, $this->get_secret_key() );

$data[ Pronamic_WP_Pay_Buckaroo_Parameters::SIGNATURE ] = $signature;
$data[ Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::SIGNATURE ] = $signature;

return $data;
}
Expand All @@ -403,28 +403,28 @@ public function get_fields() {
public function verify_request( $data ) {
$result = false;

$signature = Pronamic_WP_Pay_Buckaroo_Security::get_signature( $data );
$signature = Pronamic_WP_Pay_Gateways_Buckaroo_Security::get_signature( $data );

$signature_check = Pronamic_WP_Pay_Buckaroo_Security::create_signature( $data, $this->get_secret_key() );
$signature_check = Pronamic_WP_Pay_Gateways_Buckaroo_Security::create_signature( $data, $this->get_secret_key() );

if ( 0 === strcasecmp( $signature, $signature_check ) ) {
$data = array_change_key_case( $data, CASE_LOWER );

$result = filter_var_array( $data, array(
Pronamic_WP_Pay_Buckaroo_Parameters::PAYMENT => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Buckaroo_Parameters::PAYMENT_METHOD => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Buckaroo_Parameters::STATUS_CODE => FILTER_VALIDATE_INT,
Pronamic_WP_Pay_Buckaroo_Parameters::STATUS_CODE_DETAIL => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Buckaroo_Parameters::STATUS_MESSAGE => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Buckaroo_Parameters::INVOICE_NUMBER => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Buckaroo_Parameters::AMOUNT => FILTER_VALIDATE_FLOAT,
Pronamic_WP_Pay_Buckaroo_Parameters::CURRENCY => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Buckaroo_Parameters::TIMESTAMP => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Buckaroo_Parameters::SERVICE_IDEAL_CONSUMER_ISSUER => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Buckaroo_Parameters::SERVICE_IDEAL_CONSUMER_NAME => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Buckaroo_Parameters::SERVICE_IDEAL_CONSUMER_IBAN => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Buckaroo_Parameters::SERVICE_IDEAL_CONSUMER_BIC => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Buckaroo_Parameters::TRANSACTIONS => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::PAYMENT => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::PAYMENT_METHOD => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::STATUS_CODE => FILTER_VALIDATE_INT,
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::STATUS_CODE_DETAIL => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::STATUS_MESSAGE => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::INVOICE_NUMBER => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::AMOUNT => FILTER_VALIDATE_FLOAT,
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::CURRENCY => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::TIMESTAMP => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::SERVICE_IDEAL_CONSUMER_ISSUER => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::SERVICE_IDEAL_CONSUMER_NAME => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::SERVICE_IDEAL_CONSUMER_IBAN => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::SERVICE_IDEAL_CONSUMER_BIC => FILTER_SANITIZE_STRING,
Pronamic_WP_Pay_Gateways_Buckaroo_Parameters::TRANSACTIONS => FILTER_SANITIZE_STRING,
) );
}

Expand Down
2 changes: 1 addition & 1 deletion src/Config.php
View file
Expand Up @@ -8,7 +8,7 @@
* @author Remco Tolsma
* @version 1.0.0
*/
class Pronamic_WP_Pay_Buckaroo_Config extends Pronamic_WP_Pay_GatewayConfig {
class Pronamic_WP_Pay_Gateways_Buckaroo_Config extends Pronamic_WP_Pay_GatewayConfig {
public $website_key;

public $secret_key;
Expand Down
4 changes: 2 additions & 2 deletions src/ConfigFactory.php
View file
Expand Up @@ -8,9 +8,9 @@
* @author Remco Tolsma
* @version 1.0.0
*/
class Pronamic_WP_Pay_Buckaroo_ConfigFactory extends Pronamic_WP_Pay_GatewayConfigFactory {
class Pronamic_WP_Pay_Gateways_Buckaroo_ConfigFactory extends Pronamic_WP_Pay_GatewayConfigFactory {
public function get_config( $post_id ) {
$config = new Pronamic_WP_Pay_Buckaroo_Config();
$config = new Pronamic_WP_Pay_Gateways_Buckaroo_Config();

$config->website_key = get_post_meta( $post_id, '_pronamic_gateway_buckaroo_website_key', true );
$config->secret_key = get_post_meta( $post_id, '_pronamic_gateway_buckaroo_secret_key', true );
Expand Down

0 comments on commit 60fb25e

Please sign in to comment.