From 717749944040c49e9a71331862b7b95fca43913b Mon Sep 17 00:00:00 2001 From: Remco Tolsma Date: Mon, 2 Nov 2015 15:58:31 +0100 Subject: [PATCH 1/9] Added an gateway settings class. --- CHANGELOG.md | 2 +- composer.json | 2 +- src/GatewaySettings.php | 42 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 src/GatewaySettings.php diff --git a/CHANGELOG.md b/CHANGELOG.md index eec8562..647585a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a CHANGELOG](http://keepachangelog.com/). ## [Unreleased][unreleased] -- +- Added an gateway settings class. ## [1.0.4] - 2015-10-21 - Fixed some issues on the TargetPay library. diff --git a/composer.json b/composer.json index 538feff..c4290e1 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ }, "require": { "php": ">=5.2.4", - "wp-pay/core": ">=1.2.1" + "wp-pay/core": "dev-develop" }, "require-dev": { "satooshi/php-coveralls": "dev-master" diff --git a/src/GatewaySettings.php b/src/GatewaySettings.php new file mode 100644 index 0000000..7ee87af --- /dev/null +++ b/src/GatewaySettings.php @@ -0,0 +1,42 @@ + __( 'TargetPay', 'pronamic_ideal' ), + 'methods' => array( 'targetpay' ), + ); + + // Return + return $sections; + } + + public function fields( array $fields ) { + // Layout Code + $fields[] = array( + 'section' => 'targetpay', + 'meta_key' => '_pronamic_gateway_targetpay_layoutcode', + 'title' => __( 'Layout Code', 'pronamic_ideal' ), + 'type' => 'text', + 'description' => __( 'De layoutcode waarop de betaling geboekt moet worden. Zie subaccounts.', 'pronamic_ideal' ), + ); + + // Return + return $fields; + } +} From 09ee45c012348e124bc8f4df92e0c359f5e60139 Mon Sep 17 00:00:00 2001 From: Remco Tolsma Date: Mon, 2 Nov 2015 16:38:42 +0100 Subject: [PATCH 2/9] Updated to 'Pronamic_WP_Pay_GatewaySettings'. --- README.md | 2 +- composer.lock | 100 ++++++++++++++++++---------------------- package.json | 2 +- src/GatewaySettings.php | 2 +- 4 files changed, 47 insertions(+), 59 deletions(-) diff --git a/README.md b/README.md index 0db1c2e..2e509f0 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ **TargetPay driver for the WordPress payment processing library.** [![Build Status](https://travis-ci.org/wp-pay-gateways/targetpay.svg?branch=develop)](https://travis-ci.org/wp-pay-gateways/targetpay) -[![Coverage Status](https://coveralls.io/repos/wp-pay-gateways/targetpay/badge.png?branch=develop)](https://coveralls.io/r/wp-pay-gateways/targetpay?branch=develop) +[![Coverage Status](https://coveralls.io/repos/wp-pay-gateways/targetpay/badge.svg?branch=master&service=github)](https://coveralls.io/github/wp-pay-gateways/targetpay?branch=master) [![Latest Stable Version](https://poser.pugx.org/wp-pay-gateways/targetpay/v/stable.svg)](https://packagist.org/packages/wp-pay-gateways/targetpay) [![Total Downloads](https://poser.pugx.org/wp-pay-gateways/targetpay/downloads.svg)](https://packagist.org/packages/wp-pay-gateways/targetpay) [![Latest Unstable Version](https://poser.pugx.org/wp-pay-gateways/targetpay/v/unstable.svg)](https://packagist.org/packages/wp-pay-gateways/targetpay) diff --git a/composer.lock b/composer.lock index 20db9a1..6cbf050 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "943455bdb7f7bd4f869f33cf659c5637", + "hash": "727255a32ccb9f3b447cbcc307a7e82c", + "content-hash": "b88a7c433489de9ed3847f308338ffce", "packages": [ { "name": "wp-pay/core", - "version": "1.2.1", + "version": "dev-develop", "source": { "type": "git", "url": "https://github.com/wp-pay/core.git", - "reference": "d40c40f742e5bddea6e10751b515c865fb56915f" + "reference": "575e40f2b441bb0565125492fe4248a13813f43b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-pay/core/zipball/d40c40f742e5bddea6e10751b515c865fb56915f", - "reference": "d40c40f742e5bddea6e10751b515c865fb56915f", + "url": "https://api.github.com/repos/wp-pay/core/zipball/575e40f2b441bb0565125492fe4248a13813f43b", + "reference": "575e40f2b441bb0565125492fe4248a13813f43b", "shasum": "" }, "require": { @@ -57,7 +58,7 @@ "wordpress", "wp" ], - "time": "2015-04-29 14:48:49" + "time": "2015-11-02 14:30:13" } ], "packages-dev": [ @@ -271,25 +272,22 @@ }, { "name": "symfony/config", - "version": "v2.7.3", + "version": "v2.7.6", "source": { "type": "git", - "url": "https://github.com/symfony/Config.git", - "reference": "6c905bbed1e728226de656e4c07d620dfe9e80d9" + "url": "https://github.com/symfony/config.git", + "reference": "831f88908b51b9ce945f5e6f402931d1ac544423" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Config/zipball/6c905bbed1e728226de656e4c07d620dfe9e80d9", - "reference": "6c905bbed1e728226de656e4c07d620dfe9e80d9", + "url": "https://api.github.com/repos/symfony/config/zipball/831f88908b51b9ce945f5e6f402931d1ac544423", + "reference": "831f88908b51b9ce945f5e6f402931d1ac544423", "shasum": "" }, "require": { "php": ">=5.3.9", "symfony/filesystem": "~2.3" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "type": "library", "extra": { "branch-alias": { @@ -317,20 +315,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2015-07-09 16:07:40" + "time": "2015-10-11 09:39:48" }, { "name": "symfony/console", - "version": "v2.7.3", + "version": "v2.7.6", "source": { "type": "git", - "url": "https://github.com/symfony/Console.git", - "reference": "d6cf02fe73634c96677e428f840704bfbcaec29e" + "url": "https://github.com/symfony/console.git", + "reference": "5efd632294c8320ea52492db22292ff853a43766" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/d6cf02fe73634c96677e428f840704bfbcaec29e", - "reference": "d6cf02fe73634c96677e428f840704bfbcaec29e", + "url": "https://api.github.com/repos/symfony/console/zipball/5efd632294c8320ea52492db22292ff853a43766", + "reference": "5efd632294c8320ea52492db22292ff853a43766", "shasum": "" }, "require": { @@ -339,7 +337,6 @@ "require-dev": { "psr/log": "~1.0", "symfony/event-dispatcher": "~2.1", - "symfony/phpunit-bridge": "~2.7", "symfony/process": "~2.1" }, "suggest": { @@ -374,20 +371,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2015-07-28 15:18:12" + "time": "2015-10-20 14:38:46" }, { "name": "symfony/event-dispatcher", - "version": "v2.7.3", + "version": "v2.7.6", "source": { "type": "git", - "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "9310b5f9a87ec2ea75d20fec0b0017c77c66dac3" + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/9310b5f9a87ec2ea75d20fec0b0017c77c66dac3", - "reference": "9310b5f9a87ec2ea75d20fec0b0017c77c66dac3", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/87a5db5ea887763fa3a31a5471b512ff1596d9b8", + "reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8", "shasum": "" }, "require": { @@ -398,7 +395,6 @@ "symfony/config": "~2.0,>=2.0.5", "symfony/dependency-injection": "~2.6", "symfony/expression-language": "~2.6", - "symfony/phpunit-bridge": "~2.7", "symfony/stopwatch": "~2.3" }, "suggest": { @@ -432,28 +428,25 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2015-06-18 19:21:56" + "time": "2015-10-11 09:39:48" }, { "name": "symfony/filesystem", - "version": "v2.7.3", + "version": "v2.7.6", "source": { "type": "git", - "url": "https://github.com/symfony/Filesystem.git", - "reference": "2d7b2ddaf3f548f4292df49a99d19c853d43f0b8" + "url": "https://github.com/symfony/filesystem.git", + "reference": "56fd6df73be859323ff97418d97edc1d756df6df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/2d7b2ddaf3f548f4292df49a99d19c853d43f0b8", - "reference": "2d7b2ddaf3f548f4292df49a99d19c853d43f0b8", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/56fd6df73be859323ff97418d97edc1d756df6df", + "reference": "56fd6df73be859323ff97418d97edc1d756df6df", "shasum": "" }, "require": { "php": ">=5.3.9" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "type": "library", "extra": { "branch-alias": { @@ -481,28 +474,25 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2015-07-09 16:07:40" + "time": "2015-10-18 20:23:18" }, { "name": "symfony/stopwatch", - "version": "v2.7.3", + "version": "v2.7.6", "source": { "type": "git", - "url": "https://github.com/symfony/Stopwatch.git", - "reference": "b07a866719bbac5294c67773340f97b871733310" + "url": "https://github.com/symfony/stopwatch.git", + "reference": "f8ab957c17e4b85a73c4df03bdf94ee597f2bd55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/b07a866719bbac5294c67773340f97b871733310", - "reference": "b07a866719bbac5294c67773340f97b871733310", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/f8ab957c17e4b85a73c4df03bdf94ee597f2bd55", + "reference": "f8ab957c17e4b85a73c4df03bdf94ee597f2bd55", "shasum": "" }, "require": { "php": ">=5.3.9" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "type": "library", "extra": { "branch-alias": { @@ -530,28 +520,25 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2015-07-01 18:23:16" + "time": "2015-10-12 12:42:24" }, { "name": "symfony/yaml", - "version": "v2.7.3", + "version": "v2.7.6", "source": { "type": "git", - "url": "https://github.com/symfony/Yaml.git", - "reference": "71340e996171474a53f3d29111d046be4ad8a0ff" + "url": "https://github.com/symfony/yaml.git", + "reference": "eca9019c88fbe250164affd107bc8057771f3f4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/71340e996171474a53f3d29111d046be4ad8a0ff", - "reference": "71340e996171474a53f3d29111d046be4ad8a0ff", + "url": "https://api.github.com/repos/symfony/yaml/zipball/eca9019c88fbe250164affd107bc8057771f3f4d", + "reference": "eca9019c88fbe250164affd107bc8057771f3f4d", "shasum": "" }, "require": { "php": ">=5.3.9" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "type": "library", "extra": { "branch-alias": { @@ -579,12 +566,13 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2015-07-28 14:07:07" + "time": "2015-10-11 09:39:48" } ], "aliases": [], "minimum-stability": "stable", "stability-flags": { + "wp-pay/core": 20, "satooshi/php-coveralls": 20 }, "prefer-stable": false, diff --git a/package.json b/package.json index 9dfe638..2c84c91 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "devDependencies": { "grunt": "~0.4.5", "grunt-contrib-jshint": "^0.11.3", - "grunt-phpcpd": "^0.1.4", + "grunt-phpcpd": "^0.2.0", "grunt-phpcs": "^0.4.0", "grunt-phplint": "0.0.5", "grunt-phpmd": "^0.1.1", diff --git a/src/GatewaySettings.php b/src/GatewaySettings.php index 7ee87af..94d787a 100644 --- a/src/GatewaySettings.php +++ b/src/GatewaySettings.php @@ -9,7 +9,7 @@ * @version 1.1.0 * @since 1.1.0 */ -class Pronamic_WP_Pay_Gateways_TargetPay_GatewaySettings extends Pronamic_WP_Pay_Admin_GatewaySettings { +class Pronamic_WP_Pay_Gateways_TargetPay_GatewaySettings extends Pronamic_WP_Pay_GatewaySettings { public function __construct() { add_filter( 'pronamic_pay_gateway_sections', array( $this, 'sections' ) ); add_filter( 'pronamic_pay_gateway_fields', array( $this, 'fields' ) ); From 75f76ca536a971a628a6a49214375b4ba500f0ee Mon Sep 17 00:00:00 2001 From: Remco Tolsma Date: Wed, 4 Nov 2015 14:56:17 +0100 Subject: [PATCH 3/9] Added filter value to the fields array. --- src/GatewaySettings.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/GatewaySettings.php b/src/GatewaySettings.php index 94d787a..80d1466 100644 --- a/src/GatewaySettings.php +++ b/src/GatewaySettings.php @@ -29,6 +29,7 @@ public function sections( array $sections ) { public function fields( array $fields ) { // Layout Code $fields[] = array( + 'filter' => FILTER_SANITIZE_STRING, 'section' => 'targetpay', 'meta_key' => '_pronamic_gateway_targetpay_layoutcode', 'title' => __( 'Layout Code', 'pronamic_ideal' ), From e25585eec23c610836addddbc35aeaf5255268da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= Date: Thu, 5 Nov 2015 11:34:06 +0100 Subject: [PATCH 4/9] Use return url with key from payment --- src/Gateway.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Gateway.php b/src/Gateway.php index 2574cd8..ab01e2f 100644 --- a/src/Gateway.php +++ b/src/Gateway.php @@ -81,8 +81,8 @@ public function start( Pronamic_Pay_PaymentDataInterface $data, Pronamic_Pay_Pay $parameters->bank = $data->get_issuer_id(); $parameters->description = $data->get_description(); $parameters->amount = $data->get_amount(); - $parameters->return_url = add_query_arg( 'payment', $payment->get_id(), home_url( '/' ) ); - $parameters->report_url = add_query_arg( 'payment', $payment->get_id(), home_url( '/' ) ); + $parameters->return_url = $payment->get_return_url(); + $parameters->report_url = $payment->get_return_url(); $parameters->cinfo_in_callback = 1; $result = $this->client->start_transaction( $parameters ); From bbdfa50dac90966cc9a30999734fcd08a704cef2 Mon Sep 17 00:00:00 2001 From: Remco Tolsma Date: Tue, 10 Nov 2015 15:41:49 +0100 Subject: [PATCH 5/9] Added an gateway integration class. --- src/GatewayIntegration.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/GatewayIntegration.php diff --git a/src/GatewayIntegration.php b/src/GatewayIntegration.php new file mode 100644 index 0000000..e30e453 --- /dev/null +++ b/src/GatewayIntegration.php @@ -0,0 +1,19 @@ +id = 'targetpay-ideal'; + } + + public function get_config_factory_class() { + return 'Pronamic_WP_Pay_Gateways_TargetPay_ConfigFactory'; + } + + public function get_config_class() { + return 'Pronamic_WP_Pay_Gateways_TargetPay_Config'; + } + + public function get_gateway_class() { + return 'Pronamic_WP_Pay_Gateways_TargetPay_Gateway'; + } +} From 41174050aed9f359562fe05574226ecf24e44c1b Mon Sep 17 00:00:00 2001 From: Remco Tolsma Date: Wed, 11 Nov 2015 20:49:24 +0100 Subject: [PATCH 6/9] Simplified integration class. --- src/{GatewayIntegration.php => Integration.php} | 11 +++++++++-- src/{GatewaySettings.php => Settings.php} | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) rename src/{GatewayIntegration.php => Integration.php} (50%) rename src/{GatewaySettings.php => Settings.php} (91%) diff --git a/src/GatewayIntegration.php b/src/Integration.php similarity index 50% rename from src/GatewayIntegration.php rename to src/Integration.php index e30e453..797ed5e 100644 --- a/src/GatewayIntegration.php +++ b/src/Integration.php @@ -1,8 +1,11 @@ id = 'targetpay-ideal'; + $this->id = 'targetpay-ideal'; + $this->name = 'TargetPay - iDEAL'; + $this->dashboard_url = 'https://www.targetpay.com/login'; + $this->provider = 'targetpay'; } public function get_config_factory_class() { @@ -13,6 +16,10 @@ public function get_config_class() { return 'Pronamic_WP_Pay_Gateways_TargetPay_Config'; } + public function get_settings_class() { + return 'Pronamic_WP_Pay_Gateways_TargetPay_Settings'; + } + public function get_gateway_class() { return 'Pronamic_WP_Pay_Gateways_TargetPay_Gateway'; } diff --git a/src/GatewaySettings.php b/src/Settings.php similarity index 91% rename from src/GatewaySettings.php rename to src/Settings.php index 80d1466..e337377 100644 --- a/src/GatewaySettings.php +++ b/src/Settings.php @@ -9,7 +9,7 @@ * @version 1.1.0 * @since 1.1.0 */ -class Pronamic_WP_Pay_Gateways_TargetPay_GatewaySettings extends Pronamic_WP_Pay_GatewaySettings { +class Pronamic_WP_Pay_Gateways_TargetPay_Settings extends Pronamic_WP_Pay_GatewaySettings { public function __construct() { add_filter( 'pronamic_pay_gateway_sections', array( $this, 'sections' ) ); add_filter( 'pronamic_pay_gateway_fields', array( $this, 'fields' ) ); From 918d4cfcd9594d085b922b8ffb259108b2b2aba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= Date: Thu, 12 Nov 2015 14:53:54 +0100 Subject: [PATCH 7/9] Add support for payment methods --- src/Gateway.php | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/src/Gateway.php b/src/Gateway.php index ab01e2f..91a6296 100644 --- a/src/Gateway.php +++ b/src/Gateway.php @@ -58,13 +58,39 @@ public function get_issuers() { ///////////////////////////////////////////////// public function get_issuer_field() { + if ( Pronamic_WP_Pay_PaymentMethods::IDEAL === $this->get_payment_method() ) { + return array ( + 'id' => 'pronamic_ideal_issuer_id', + 'name' => 'pronamic_ideal_issuer_id', + 'label' => __( 'Choose your bank', 'pronamic_ideal' ), + 'required' => true, + 'type' => 'select', + 'choices' => $this->get_transient_issuers(), + ); + } + } + + ///////////////////////////////////////////////// + + /** + * Get payment methods + * + * @return mixed an array or null + */ + public function get_payment_methods() { + return Pronamic_WP_Pay_PaymentMethods::IDEAL; + } + + ///////////////////////////////////////////////// + + /** + * Get supported payment methods + * + * @see Pronamic_WP_Pay_Gateway::get_supported_payment_methods() + */ + public function get_supported_payment_methods() { return array( - 'id' => 'pronamic_ideal_issuer_id', - 'name' => 'pronamic_ideal_issuer_id', - 'label' => __( 'Choose your bank', 'pronamic_ideal' ), - 'required' => true, - 'type' => 'select', - 'choices' => $this->get_transient_issuers(), + Pronamic_WP_Pay_PaymentMethods::IDEAL => Pronamic_WP_Pay_PaymentMethods::IDEAL, ); } From 76faa2e19efde48e8a360adbdb57baf928b5e663 Mon Sep 17 00:00:00 2001 From: Remco Tolsma Date: Thu, 19 Nov 2015 15:23:42 +0100 Subject: [PATCH 8/9] Extend from abstract integration class. --- composer.json | 3 +- composer.lock | 70 +++++++++++++++++++++++++++++++++++++++++---- src/Integration.php | 2 +- 3 files changed, 67 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index c4290e1..4e8ff1a 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,8 @@ }, "require": { "php": ">=5.2.4", - "wp-pay/core": "dev-develop" + "wp-pay/core": "dev-develop", + "wp-pay-gateways/common": "dev-develop" }, "require-dev": { "satooshi/php-coveralls": "dev-master" diff --git a/composer.lock b/composer.lock index 6cbf050..0f46a7a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,78 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "727255a32ccb9f3b447cbcc307a7e82c", - "content-hash": "b88a7c433489de9ed3847f308338ffce", + "hash": "d6679a41e8ad88581a9f19296a68a417", + "content-hash": "88f4254f1e4814d67986a993b2e07b98", "packages": [ + { + "name": "wp-pay-gateways/common", + "version": "dev-develop", + "source": { + "type": "git", + "url": "https://github.com/wp-pay-gateways/common.git", + "reference": "66a36014eaa96b657fd3ac3ade7f6c68c1b3c695" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wp-pay-gateways/common/zipball/66a36014eaa96b657fd3ac3ade7f6c68c1b3c695", + "reference": "66a36014eaa96b657fd3ac3ade7f6c68c1b3c695", + "shasum": "" + }, + "require": { + "php": ">=5.2.4", + "wp-pay/core": "dev-develop" + }, + "require-dev": { + "satooshi/php-coveralls": "dev-master" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-3.0+" + ], + "authors": [ + { + "name": "Remco Tolsma", + "email": "info@remcotolsma.nl", + "homepage": "http://www.remcotolsma.nl/", + "role": "Developer" + }, + { + "name": "Pronamic", + "email": "info@pronamic.eu", + "homepage": "http://www.pronamic.eu/", + "role": "Company" + } + ], + "description": "Common driver for the WordPress payment processing library.", + "homepage": "http://www.wp-pay.org/gateways/common/", + "keywords": [ + "common", + "gateway", + "pay", + "pronamic", + "wordpress", + "wp" + ], + "time": "2015-11-19 07:11:15" + }, { "name": "wp-pay/core", "version": "dev-develop", "source": { "type": "git", "url": "https://github.com/wp-pay/core.git", - "reference": "575e40f2b441bb0565125492fe4248a13813f43b" + "reference": "2359885cebc9329e46a6defac841117deda76fa6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-pay/core/zipball/575e40f2b441bb0565125492fe4248a13813f43b", - "reference": "575e40f2b441bb0565125492fe4248a13813f43b", + "url": "https://api.github.com/repos/wp-pay/core/zipball/2359885cebc9329e46a6defac841117deda76fa6", + "reference": "2359885cebc9329e46a6defac841117deda76fa6", "shasum": "" }, "require": { @@ -58,7 +115,7 @@ "wordpress", "wp" ], - "time": "2015-11-02 14:30:13" + "time": "2015-11-12 13:02:52" } ], "packages-dev": [ @@ -573,6 +630,7 @@ "minimum-stability": "stable", "stability-flags": { "wp-pay/core": 20, + "wp-pay-gateways/common": 20, "satooshi/php-coveralls": 20 }, "prefer-stable": false, diff --git a/src/Integration.php b/src/Integration.php index 797ed5e..3f703a4 100644 --- a/src/Integration.php +++ b/src/Integration.php @@ -1,6 +1,6 @@ id = 'targetpay-ideal'; $this->name = 'TargetPay - iDEAL'; From c67586142e12271307840076895d5c6f4b1a35ed Mon Sep 17 00:00:00 2001 From: Remco Tolsma Date: Mon, 1 Feb 2016 16:01:03 +0100 Subject: [PATCH 9/9] Getting ready for version 1.0.5. --- .gitignore | 1 + CHANGELOG.md | 7 +- composer.json | 4 +- composer.lock | 512 +++++++++++++++++++---------- package.json | 6 +- phpcs.ruleset.xml | 3 + src/Client.php | 3 +- src/Config.php | 3 +- src/ConfigFactory.php | 3 +- src/Error.php | 3 +- src/Gateway.php | 12 +- src/IDealStartParameters.php | 3 +- src/ResponseCodes.php | 3 +- src/Settings.php | 5 +- src/SofortClient.php | 3 +- src/SofortStartParameters.php | 3 +- src/StartParameters.php | 3 +- src/Status.php | 3 +- src/StatusStringParser.php | 3 +- tests/IDealStartParametersTest.php | 3 +- tests/RemoteGetTest.php | 3 +- tests/ResponseCodesTest.php | 3 +- tests/StatusStringParserTest.php | 3 +- 23 files changed, 398 insertions(+), 197 deletions(-) diff --git a/.gitignore b/.gitignore index eb77811..2438caf 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ # Node.js /node_modules/ +/npm-debug.log diff --git a/CHANGELOG.md b/CHANGELOG.md index 647585a..102de44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file. This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a CHANGELOG](http://keepachangelog.com/). ## [Unreleased][unreleased] +- + +## [1.0.5] - 2016-02-01 - Added an gateway settings class. ## [1.0.4] - 2015-10-21 @@ -23,7 +26,9 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C ## 1.0.0 - 2015-01-19 - First release. -[unreleased]: https://github.com/wp-pay-gateways/targetpay/compare/1.0.3...HEAD +[unreleased]: https://github.com/wp-pay-gateways/targetpay/compare/1.0.5...HEAD +[1.0.5]: https://github.com/wp-pay-gateways/targetpay/compare/1.0.4...1.0.5 +[1.0.4]: https://github.com/wp-pay-gateways/targetpay/compare/1.0.3...1.0.4 [1.0.3]: https://github.com/wp-pay-gateways/targetpay/compare/1.0.2...1.0.3 [1.0.2]: https://github.com/wp-pay-gateways/targetpay/compare/1.0.1...1.0.2 [1.0.1]: https://github.com/wp-pay-gateways/targetpay/compare/1.0.0...1.0.1 diff --git a/composer.json b/composer.json index 4e8ff1a..e984228 100644 --- a/composer.json +++ b/composer.json @@ -28,8 +28,8 @@ }, "require": { "php": ">=5.2.4", - "wp-pay/core": "dev-develop", - "wp-pay-gateways/common": "dev-develop" + "wp-pay/core": "^1.3.1", + "wp-pay-gateways/common": "^1.0.0" }, "require-dev": { "satooshi/php-coveralls": "dev-master" diff --git a/composer.lock b/composer.lock index 0f46a7a..548213a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,29 +4,34 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "d6679a41e8ad88581a9f19296a68a417", - "content-hash": "88f4254f1e4814d67986a993b2e07b98", + "hash": "50630d504e2ca72122b2f8893c07dca2", + "content-hash": "47e28970b83502f325ab10886897392a", "packages": [ { "name": "wp-pay-gateways/common", - "version": "dev-develop", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/wp-pay-gateways/common.git", - "reference": "66a36014eaa96b657fd3ac3ade7f6c68c1b3c695" + "reference": "4020ab38efaea0a8366458fd8c4835c53c624cb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-pay-gateways/common/zipball/66a36014eaa96b657fd3ac3ade7f6c68c1b3c695", - "reference": "66a36014eaa96b657fd3ac3ade7f6c68c1b3c695", + "url": "https://api.github.com/repos/wp-pay-gateways/common/zipball/4020ab38efaea0a8366458fd8c4835c53c624cb5", + "reference": "4020ab38efaea0a8366458fd8c4835c53c624cb5", "shasum": "" }, "require": { "php": ">=5.2.4", - "wp-pay/core": "dev-develop" + "wp-pay/core": ">=1.3.0", + "xrstf/composer-php52": "1.*" }, "require-dev": { - "satooshi/php-coveralls": "dev-master" + "phpmd/phpmd": "^2.2.3", + "satooshi/php-coveralls": "^0.7.1", + "squizlabs/php_codesniffer": "^2.2.0", + "wp-cli/wp-cli": "^0.21.1", + "wp-coding-standards/wpcs": "0.8.0" }, "type": "library", "autoload": { @@ -62,24 +67,32 @@ "wordpress", "wp" ], - "time": "2015-11-19 07:11:15" + "time": "2016-01-29 14:12:41" }, { "name": "wp-pay/core", - "version": "dev-develop", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/wp-pay/core.git", - "reference": "2359885cebc9329e46a6defac841117deda76fa6" + "reference": "ef03f9f16d54546915ef697e1bd91b7392d8c5df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-pay/core/zipball/2359885cebc9329e46a6defac841117deda76fa6", - "reference": "2359885cebc9329e46a6defac841117deda76fa6", + "url": "https://api.github.com/repos/wp-pay/core/zipball/ef03f9f16d54546915ef697e1bd91b7392d8c5df", + "reference": "ef03f9f16d54546915ef697e1bd91b7392d8c5df", "shasum": "" }, "require": { - "php": ">=5.2.4" + "php": ">=5.2.4", + "xrstf/composer-php52": "1.*" + }, + "require-dev": { + "phpmd/phpmd": "^2.2.3", + "satooshi/php-coveralls": "^0.7.1", + "squizlabs/php_codesniffer": "^2.2.0", + "wp-cli/wp-cli": "^0.21.1", + "wp-coding-standards/wpcs": "0.8.0" }, "type": "library", "autoload": { @@ -115,75 +128,78 @@ "wordpress", "wp" ], - "time": "2015-11-12 13:02:52" + "time": "2016-01-22 15:28:45" + }, + { + "name": "xrstf/composer-php52", + "version": "v1.0.19", + "source": { + "type": "hg", + "url": "https://bitbucket.org/xrstf/composer-php52", + "reference": "9a4a9c46d0347b39bf9159815301dc66fc25324e" + }, + "dist": { + "type": "zip", + "url": "https://bitbucket.org/xrstf/composer-php52/get/9a4a9c46d0347b39bf9159815301dc66fc25324e.zip", + "reference": "9a4a9c46d0347b39bf9159815301dc66fc25324e", + "shasum": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-default": "1.x-dev" + } + }, + "autoload": { + "psr-0": { + "xrstf\\Composer52": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "homepage": "http://www.xrstf.de/", + "time": "2015-10-01 14:11:58" } ], "packages-dev": [ { - "name": "guzzle/guzzle", - "version": "v3.9.3", + "name": "guzzlehttp/guzzle", + "version": "6.1.1", "source": { "type": "git", - "url": "https://github.com/guzzle/guzzle3.git", - "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9" + "url": "https://github.com/guzzle/guzzle.git", + "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9", - "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/c6851d6e48f63b69357cbfa55bca116448140e0c", + "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c", "shasum": "" }, "require": { - "ext-curl": "*", - "php": ">=5.3.3", - "symfony/event-dispatcher": "~2.1" - }, - "replace": { - "guzzle/batch": "self.version", - "guzzle/cache": "self.version", - "guzzle/common": "self.version", - "guzzle/http": "self.version", - "guzzle/inflection": "self.version", - "guzzle/iterator": "self.version", - "guzzle/log": "self.version", - "guzzle/parser": "self.version", - "guzzle/plugin": "self.version", - "guzzle/plugin-async": "self.version", - "guzzle/plugin-backoff": "self.version", - "guzzle/plugin-cache": "self.version", - "guzzle/plugin-cookie": "self.version", - "guzzle/plugin-curlauth": "self.version", - "guzzle/plugin-error-response": "self.version", - "guzzle/plugin-history": "self.version", - "guzzle/plugin-log": "self.version", - "guzzle/plugin-md5": "self.version", - "guzzle/plugin-mock": "self.version", - "guzzle/plugin-oauth": "self.version", - "guzzle/service": "self.version", - "guzzle/stream": "self.version" + "guzzlehttp/promises": "~1.0", + "guzzlehttp/psr7": "~1.1", + "php": ">=5.5.0" }, "require-dev": { - "doctrine/cache": "~1.3", - "monolog/monolog": "~1.0", - "phpunit/phpunit": "3.7.*", - "psr/log": "~1.0", - "symfony/class-loader": "~2.1", - "zendframework/zend-cache": "2.*,<2.3", - "zendframework/zend-log": "2.*,<2.3" - }, - "suggest": { - "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated." + "ext-curl": "*", + "phpunit/phpunit": "~4.0", + "psr/log": "~1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.9-dev" + "dev-master": "6.1-dev" } }, "autoload": { - "psr-0": { - "Guzzle": "src/", - "Guzzle\\Tests": "tests/" + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "GuzzleHttp\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -195,13 +211,9 @@ "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" - }, - { - "name": "Guzzle Community", - "homepage": "https://github.com/guzzle/guzzle/contributors" } ], - "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle", + "description": "Guzzle is a PHP HTTP client library", "homepage": "http://guzzlephp.org/", "keywords": [ "client", @@ -212,7 +224,165 @@ "rest", "web service" ], - "time": "2015-03-18 18:23:50" + "time": "2015-11-23 00:47:50" + }, + { + "name": "guzzlehttp/promises", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/guzzle/promises.git", + "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/promises/zipball/b1e1c0d55f8083c71eda2c28c12a228d708294ea", + "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea", + "shasum": "" + }, + "require": { + "php": ">=5.5.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Promise\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle promises library", + "keywords": [ + "promise" + ], + "time": "2015-10-15 22:28:00" + }, + { + "name": "guzzlehttp/psr7", + "version": "1.2.2", + "source": { + "type": "git", + "url": "https://github.com/guzzle/psr7.git", + "reference": "f5d04bdd2881ac89abde1fb78cc234bce24327bb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5d04bdd2881ac89abde1fb78cc234bce24327bb", + "reference": "f5d04bdd2881ac89abde1fb78cc234bce24327bb", + "shasum": "" + }, + "require": { + "php": ">=5.4.0", + "psr/http-message": "~1.0" + }, + "provide": { + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "PSR-7 message implementation", + "keywords": [ + "http", + "message", + "stream", + "uri" + ], + "time": "2016-01-23 01:23:02" + }, + { + "name": "psr/http-message", + "version": "1.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", + "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP messages", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "time": "2015-05-04 20:22:00" }, { "name": "psr/log", @@ -258,52 +428,40 @@ "source": { "type": "git", "url": "https://github.com/satooshi/php-coveralls.git", - "reference": "2fbf803803d179ab1082807308a67bbd5a760c70" + "reference": "50c60bb64054974f8ed7540ae6e75fd7981a5fd3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/2fbf803803d179ab1082807308a67bbd5a760c70", - "reference": "2fbf803803d179ab1082807308a67bbd5a760c70", + "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/50c60bb64054974f8ed7540ae6e75fd7981a5fd3", + "reference": "50c60bb64054974f8ed7540ae6e75fd7981a5fd3", "shasum": "" }, "require": { "ext-json": "*", "ext-simplexml": "*", - "guzzle/guzzle": ">=2.7", - "php": ">=5.3", - "psr/log": "1.0.0", - "symfony/config": ">=2.0", - "symfony/console": ">=2.0", - "symfony/stopwatch": ">=2.2", - "symfony/yaml": ">=2.0" - }, - "require-dev": { - "apigen/apigen": "2.8.*@stable", - "pdepend/pdepend": "dev-master as 2.0.0", - "phpmd/phpmd": "dev-master", - "phpunit/php-invoker": ">=1.1.0,<1.2.0", - "phpunit/phpunit": "3.7.*@stable", - "sebastian/finder-facade": "dev-master", - "sebastian/phpcpd": "1.4.*@stable", - "squizlabs/php_codesniffer": "1.4.*@stable", - "theseer/fdomdocument": "dev-master" + "guzzlehttp/guzzle": "^6.0", + "php": ">=5.5", + "psr/log": "^1.0", + "symfony/config": "^2.1|^3.0", + "symfony/console": "^2.1|^3.0", + "symfony/stopwatch": "^2.0|^3.0", + "symfony/yaml": "^2.0|^3.0" }, "suggest": { "symfony/http-kernel": "Allows Symfony integration" }, "bin": [ - "composer/bin/coveralls" + "bin/coveralls" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "0.7-dev" + "dev-master": "2.0-dev" } }, "autoload": { - "psr-0": { - "Satooshi\\Component": "src/", - "Satooshi\\Bundle": "src/" + "psr-4": { + "Satooshi\\": "src/Satooshi/" } }, "notification-url": "https://packagist.org/downloads/", @@ -325,36 +483,39 @@ "github", "test" ], - "time": "2014-11-11 15:35:34" + "time": "2016-01-20 17:44:41" }, { "name": "symfony/config", - "version": "v2.7.6", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "831f88908b51b9ce945f5e6f402931d1ac544423" + "reference": "58680a6516a457a6c65044fe33586c4a81fdff01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/831f88908b51b9ce945f5e6f402931d1ac544423", - "reference": "831f88908b51b9ce945f5e6f402931d1ac544423", + "url": "https://api.github.com/repos/symfony/config/zipball/58680a6516a457a6c65044fe33586c4a81fdff01", + "reference": "58680a6516a457a6c65044fe33586c4a81fdff01", "shasum": "" }, "require": { - "php": ">=5.3.9", - "symfony/filesystem": "~2.3" + "php": ">=5.5.9", + "symfony/filesystem": "~2.8|~3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Config\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -372,29 +533,30 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2015-10-11 09:39:48" + "time": "2015-12-26 13:39:53" }, { "name": "symfony/console", - "version": "v2.7.6", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "5efd632294c8320ea52492db22292ff853a43766" + "reference": "ebcdc507829df915f4ca23067bd59ee4ef61f6c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/5efd632294c8320ea52492db22292ff853a43766", - "reference": "5efd632294c8320ea52492db22292ff853a43766", + "url": "https://api.github.com/repos/symfony/console/zipball/ebcdc507829df915f4ca23067bd59ee4ef61f6c3", + "reference": "ebcdc507829df915f4ca23067bd59ee4ef61f6c3", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9", + "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.1", - "symfony/process": "~2.1" + "symfony/event-dispatcher": "~2.8|~3.0", + "symfony/process": "~2.8|~3.0" }, "suggest": { "psr/log": "For using the console logger", @@ -404,13 +566,16 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Console\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -428,46 +593,38 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2015-10-20 14:38:46" + "time": "2015-12-22 10:39:06" }, { - "name": "symfony/event-dispatcher", - "version": "v2.7.6", + "name": "symfony/filesystem", + "version": "v3.0.1", "source": { "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8" + "url": "https://github.com/symfony/filesystem.git", + "reference": "c2e59d11dccd135dc8f00ee97f34fe1de842e70c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/87a5db5ea887763fa3a31a5471b512ff1596d9b8", - "reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/c2e59d11dccd135dc8f00ee97f34fe1de842e70c", + "reference": "c2e59d11dccd135dc8f00ee97f34fe1de842e70c", "shasum": "" }, "require": { - "php": ">=5.3.9" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~2.0,>=2.0.5", - "symfony/dependency-injection": "~2.6", - "symfony/expression-language": "~2.6", - "symfony/stopwatch": "~2.3" - }, - "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { "psr-4": { - "Symfony\\Component\\EventDispatcher\\": "" - } + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -483,37 +640,43 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony EventDispatcher Component", + "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2015-10-11 09:39:48" + "time": "2015-12-22 10:39:06" }, { - "name": "symfony/filesystem", - "version": "v2.7.6", + "name": "symfony/polyfill-mbstring", + "version": "v1.1.0", "source": { "type": "git", - "url": "https://github.com/symfony/filesystem.git", - "reference": "56fd6df73be859323ff97418d97edc1d756df6df" + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "1289d16209491b584839022f29257ad859b8532d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/56fd6df73be859323ff97418d97edc1d756df6df", - "reference": "56fd6df73be859323ff97418d97edc1d756df6df", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d", + "reference": "1289d16209491b584839022f29257ad859b8532d", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.3" + }, + "suggest": { + "ext-mbstring": "For best performance" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "1.1-dev" } }, "autoload": { "psr-4": { - "Symfony\\Component\\Filesystem\\": "" - } + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -521,45 +684,55 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Filesystem Component", + "description": "Symfony polyfill for the Mbstring extension", "homepage": "https://symfony.com", - "time": "2015-10-18 20:23:18" + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "time": "2016-01-20 09:13:37" }, { "name": "symfony/stopwatch", - "version": "v2.7.6", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "f8ab957c17e4b85a73c4df03bdf94ee597f2bd55" + "reference": "6aeac8907e3e1340a0033b0a9ec075f8e6524800" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/f8ab957c17e4b85a73c4df03bdf94ee597f2bd55", - "reference": "f8ab957c17e4b85a73c4df03bdf94ee597f2bd55", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6aeac8907e3e1340a0033b0a9ec075f8e6524800", + "reference": "6aeac8907e3e1340a0033b0a9ec075f8e6524800", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Stopwatch\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -577,35 +750,38 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2015-10-12 12:42:24" + "time": "2015-10-30 23:35:59" }, { "name": "symfony/yaml", - "version": "v2.7.6", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "eca9019c88fbe250164affd107bc8057771f3f4d" + "reference": "3df409958a646dad2bc5046c3fb671ee24a1a691" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/eca9019c88fbe250164affd107bc8057771f3f4d", - "reference": "eca9019c88fbe250164affd107bc8057771f3f4d", + "url": "https://api.github.com/repos/symfony/yaml/zipball/3df409958a646dad2bc5046c3fb671ee24a1a691", + "reference": "3df409958a646dad2bc5046c3fb671ee24a1a691", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Yaml\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -623,14 +799,12 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2015-10-11 09:39:48" + "time": "2015-12-26 13:39:53" } ], "aliases": [], "minimum-stability": "stable", "stability-flags": { - "wp-pay/core": 20, - "wp-pay-gateways/common": 20, "satooshi/php-coveralls": 20 }, "prefer-stable": false, diff --git a/package.json b/package.json index 2c84c91..76e0eba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "targetpay", - "version": "1.0.4", + "version": "1.0.5", "description": "TargetPay driver for the WordPress payment processing library.", "repository": { "type": "git", @@ -33,10 +33,10 @@ "homepage": "http://www.wp-pay.org/gateways/targetpay/", "devDependencies": { "grunt": "~0.4.5", - "grunt-contrib-jshint": "^0.11.3", + "grunt-contrib-jshint": "^0.12.0", "grunt-phpcpd": "^0.2.0", "grunt-phpcs": "^0.4.0", - "grunt-phplint": "0.0.5", + "grunt-phplint": "0.0.8", "grunt-phpmd": "^0.1.1", "load-grunt-tasks": "^3.3.0" } diff --git a/phpcs.ruleset.xml b/phpcs.ruleset.xml index eaa7bf7..407875e 100644 --- a/phpcs.ruleset.xml +++ b/phpcs.ruleset.xml @@ -6,7 +6,10 @@ + + + diff --git a/src/Client.php b/src/Client.php index ab13aa9..8952402 100644 --- a/src/Client.php +++ b/src/Client.php @@ -3,8 +3,9 @@ /** * Title: TargetPay gateway * Description: - * Copyright: Copyright (c) 2005 - 2015 + * Copyright: Copyright (c) 2005 - 2016 * Company: Pronamic + * * @author Remco Tolsma * @version 1.0.0 */ diff --git a/src/Config.php b/src/Config.php index 7faf077..27c2148 100644 --- a/src/Config.php +++ b/src/Config.php @@ -3,8 +3,9 @@ /** * Title: TargetPay config * Description: - * Copyright: Copyright (c) 2005 - 2015 + * Copyright: Copyright (c) 2005 - 2016 * Company: Pronamic + * * @author Remco Tolsma * @version 1.0.0 */ diff --git a/src/ConfigFactory.php b/src/ConfigFactory.php index 7718aa6..f13579e 100644 --- a/src/ConfigFactory.php +++ b/src/ConfigFactory.php @@ -3,8 +3,9 @@ /** * Title: TargetPay config factory * Description: - * Copyright: Copyright (c) 2005 - 2015 + * Copyright: Copyright (c) 2005 - 2016 * Company: Pronamic + * * @author Remco Tolsma * @version 1.0.0 */ diff --git a/src/Error.php b/src/Error.php index f2ef8c8..e4e5967 100644 --- a/src/Error.php +++ b/src/Error.php @@ -3,8 +3,9 @@ /** * Title: TargetPay error * Description: - * Copyright: Copyright (c) 2005 - 2015 + * Copyright: Copyright (c) 2005 - 2016 * Company: Pronamic + * * @author Remco Tolsma * @version 1.0.0 */ diff --git a/src/Gateway.php b/src/Gateway.php index 91a6296..9a85f60 100644 --- a/src/Gateway.php +++ b/src/Gateway.php @@ -3,8 +3,9 @@ /** * Title: TargetPay gateway * Description: - * Copyright: Copyright (c) 2005 - 2015 + * Copyright: Copyright (c) 2005 - 2016 * Company: Pronamic + * * @author Remco Tolsma * @version 1.0.0 */ @@ -59,7 +60,7 @@ public function get_issuers() { public function get_issuer_field() { if ( Pronamic_WP_Pay_PaymentMethods::IDEAL === $this->get_payment_method() ) { - return array ( + return array( 'id' => 'pronamic_ideal_issuer_id', 'name' => 'pronamic_ideal_issuer_id', 'label' => __( 'Choose your bank', 'pronamic_ideal' ), @@ -120,8 +121,11 @@ public function start( Pronamic_Pay_PaymentDataInterface $data, Pronamic_Pay_Pay $this->set_error( $this->client->get_error() ); } - // Schedule transaction status request - // @since 1.0.3 + /* + * Schedule transaction status request + * + * @since 1.0.3 + */ $time = time(); wp_schedule_single_event( $time + 30, 'pronamic_ideal_check_transaction_status', array( 'payment_id' => $payment->get_id(), 'seconds' => 30 ) ); } diff --git a/src/IDealStartParameters.php b/src/IDealStartParameters.php index 5f83ed3..592d386 100644 --- a/src/IDealStartParameters.php +++ b/src/IDealStartParameters.php @@ -3,8 +3,9 @@ /** * Title: TargetPay iDEAL start parameters * Description: - * Copyright: Copyright (c) 2005 - 2015 + * Copyright: Copyright (c) 2005 - 2016 * Company: Pronamic + * * @author Remco Tolsma * @version 1.0.0 */ diff --git a/src/ResponseCodes.php b/src/ResponseCodes.php index ca110db..fcbeddc 100644 --- a/src/ResponseCodes.php +++ b/src/ResponseCodes.php @@ -3,8 +3,9 @@ /** * Title: TargetPay response codes * Description: - * Copyright: Copyright (c) 2005 - 2015 + * Copyright: Copyright (c) 2005 - 2016 * Company: Pronamic + * * @author Remco Tolsma * @version 1.0.0 */ diff --git a/src/Settings.php b/src/Settings.php index e337377..c94e1cb 100644 --- a/src/Settings.php +++ b/src/Settings.php @@ -3,8 +3,9 @@ /** * Title: TargetPay gateway settings * Description: - * Copyright: Copyright (c) 2005 - 2015 + * Copyright: Copyright (c) 2005 - 2016 * Company: Pronamic + * * @author Remco Tolsma * @version 1.1.0 * @since 1.1.0 @@ -22,7 +23,6 @@ public function sections( array $sections ) { 'methods' => array( 'targetpay' ), ); - // Return return $sections; } @@ -37,7 +37,6 @@ public function fields( array $fields ) { 'description' => __( 'De layoutcode waarop de betaling geboekt moet worden. Zie subaccounts.', 'pronamic_ideal' ), ); - // Return return $fields; } } diff --git a/src/SofortClient.php b/src/SofortClient.php index b9b6607..9c0a6c8 100644 --- a/src/SofortClient.php +++ b/src/SofortClient.php @@ -3,8 +3,9 @@ /** * Title: TargetPay SOFORT Banking client * Description: - * Copyright: Copyright (c) 2005 - 2015 + * Copyright: Copyright (c) 2005 - 2016 * Company: Pronamic + * * @author Remco Tolsma * @version 1.0.0 */ diff --git a/src/SofortStartParameters.php b/src/SofortStartParameters.php index 9572aa4..21fecc0 100644 --- a/src/SofortStartParameters.php +++ b/src/SofortStartParameters.php @@ -3,8 +3,9 @@ /** * Title: TargetPay SOFORT Banking start parameters * Description: - * Copyright: Copyright (c) 2005 - 2015 + * Copyright: Copyright (c) 2005 - 2016 * Company: Pronamic + * * @author Remco Tolsma * @version 1.0.0 */ diff --git a/src/StartParameters.php b/src/StartParameters.php index be0bd1e..874d9ad 100644 --- a/src/StartParameters.php +++ b/src/StartParameters.php @@ -3,8 +3,9 @@ /** * Title: TargetPay start parameters * Description: - * Copyright: Copyright (c) 2005 - 2015 + * Copyright: Copyright (c) 2005 - 2016 * Company: Pronamic + * * @author Remco Tolsma * @version 1.0.0 */ diff --git a/src/Status.php b/src/Status.php index 579c263..aaabede 100644 --- a/src/Status.php +++ b/src/Status.php @@ -3,8 +3,9 @@ /** * Title: TargetPay status * Description: - * Copyright: Copyright (c) 2005 - 2015 + * Copyright: Copyright (c) 2005 - 2016 * Company: Pronamic + * * @author Remco Tolsma * @version 1.0.0 */ diff --git a/src/StatusStringParser.php b/src/StatusStringParser.php index fa2d215..247283f 100644 --- a/src/StatusStringParser.php +++ b/src/StatusStringParser.php @@ -3,8 +3,9 @@ /** * Title: Status string parser * Description: - * Copyright: Copyright (c) 2005 - 2015 + * Copyright: Copyright (c) 2005 - 2016 * Company: Pronamic + * * @author Remco Tolsma * @version 1.0.0 */ diff --git a/tests/IDealStartParametersTest.php b/tests/IDealStartParametersTest.php index ec85efe..238168d 100644 --- a/tests/IDealStartParametersTest.php +++ b/tests/IDealStartParametersTest.php @@ -3,8 +3,9 @@ /** * Title: TargetPay iDEAL start parameters test * Description: - * Copyright: Copyright (c) 2005 - 2015 + * Copyright: Copyright (c) 2005 - 2016 * Company: Pronamic + * * @author Remco Tolsma * @version 1.0.0 */ diff --git a/tests/RemoteGetTest.php b/tests/RemoteGetTest.php index 5c7eaaf..859a1df 100644 --- a/tests/RemoteGetTest.php +++ b/tests/RemoteGetTest.php @@ -3,8 +3,9 @@ /** * Title: TargetPay remote get tests * Description: - * Copyright: Copyright (c) 2005 - 2015 + * Copyright: Copyright (c) 2005 - 2016 * Company: Pronamic + * * @author Remco Tolsma * @version 1.0.0 */ diff --git a/tests/ResponseCodesTest.php b/tests/ResponseCodesTest.php index bb90a3e..d7e952d 100644 --- a/tests/ResponseCodesTest.php +++ b/tests/ResponseCodesTest.php @@ -3,8 +3,9 @@ /** * Title: TargetPay response codes tests * Description: - * Copyright: Copyright (c) 2005 - 2015 + * Copyright: Copyright (c) 2005 - 2016 * Company: Pronamic + * * @author Remco Tolsma * @version 1.0.0 */ diff --git a/tests/StatusStringParserTest.php b/tests/StatusStringParserTest.php index 82c08d8..ecde35d 100644 --- a/tests/StatusStringParserTest.php +++ b/tests/StatusStringParserTest.php @@ -3,8 +3,9 @@ /** * Title: TargetPay status string parser test * Description: - * Copyright: Copyright (c) 2005 - 2015 + * Copyright: Copyright (c) 2005 - 2016 * Company: Pronamic + * * @author Remco Tolsma * @version 1.0.0 */