Merge branch 'release/4.0.0'

pronamic · Jan 11, 2022 · d74d583 · d74d583
2 parents 4f3f770 + 9bc8ea9
commit d74d583
Show file tree

Hide file tree

Showing 20 changed files with 277 additions and 184 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,4 @@
 
 # WordPress
 /wordpress/
+/wp-content/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## [Unreleased][unreleased]
 -
 
+## [4.0.0] - 2022-01-11
+### Changed
+- Updated to https://github.com/pronamic/wp-pay-core/releases/tag/4.0.0.
+
 ## [3.0.1] - 2021-08-24
 - Fixed "Fatal error: Uncaught Error: Call to undefined method Pronamic\WordPress\Money\Money::get_including_tax()".
 
@@ -93,7 +97,8 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## 1.0.0 - 2014-12-15
 - First release.
 
-[unreleased]: https://github.com/wp-pay-gateways/pay-nl/compare/3.0.1...HEAD
+[unreleased]: https://github.com/wp-pay-gateways/pay-nl/compare/4.0.0...HEAD
+[4.0.0]: https://github.com/wp-pay-gateways/pay-nl/compare/3.0.1...4.0.0
 [3.0.1]: https://github.com/wp-pay-gateways/pay-nl/compare/3.0.0...3.0.1
 [3.0.0]: https://github.com/wp-pay-gateways/pay-nl/compare/2.1.2...3.0.0
 [2.1.2]: https://github.com/wp-pay-gateways/pay-nl/compare/2.1.1...2.1.2

diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
 	},
 	"require": {
 		"php": ">=5.6.20",
-		"wp-pay/core": "^3.0"
+		"wp-pay/core": "^4.0"
 	},
 	"require-dev": {
 		"bamarni/composer-bin-plugin": "^1.4",
@@ -43,7 +43,8 @@
 		"phpunit/phpunit": "^5.7 || ^6.0",
 		"pronamic/wp-coding-standards": "^1.0",
 		"roots/wordpress": "^5.8",
-		"wp-phpunit/wp-phpunit": "^5.8"
+		"wp-phpunit/wp-phpunit": "^5.8",
+		"yoast/phpunit-polyfills": "^1.0"
 	},
 	"scripts": {
 		"coveralls": "vendor/bin/php-coveralls -v",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pay-nl",
-  "version": "3.0.1",
+  "version": "4.0.0",
   "description": "Pay.nl driver for the WordPress payment processing library.",
   "repository": {
     "type": "git",

diff --git a/src/Client.php b/src/Client.php
@@ -9,7 +9,7 @@
 /**
  * Title: Pay.nl client
  * Description:
- * Copyright: 2005-2021 Pronamic
+ * Copyright: 2005-2022 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/Config.php b/src/Config.php
@@ -7,7 +7,7 @@
 /**
  * Title: Pay.nl config
  * Description:
- * Copyright: 2005-2021 Pronamic
+ * Copyright: 2005-2022 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/Error.php b/src/Error.php
@@ -5,7 +5,7 @@
 /**
  * Title: Pay.nl error
  * Description:
- * Copyright: 2005-2021 Pronamic
+ * Copyright: 2005-2022 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/Gateway.php b/src/Gateway.php
@@ -9,7 +9,7 @@
 /**
  * Title: Pay.nl gateway
  * Description:
- * Copyright: 2005-2021 Pronamic
+ * Copyright: 2005-2022 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma
@@ -75,7 +75,7 @@ public function get_issuers() {
 	 */
 	public function get_supported_payment_methods() {
 		return array(
-			PaymentMethods::AFTERPAY,
+			PaymentMethods::AFTERPAY_NL,
 			PaymentMethods::BANCONTACT,
 			PaymentMethods::BANK_TRANSFER,
 			PaymentMethods::CREDIT_CARD,
@@ -99,7 +99,7 @@ public function get_supported_payment_methods() {
 	 * @param Payment $payment Payment.
 	 */
 	public function start( Payment $payment ) {
-		$payment_method = $payment->get_method();
+		$payment_method = $payment->get_payment_method();
 
 		$customer = $payment->get_customer();
 
@@ -234,15 +234,9 @@ public function start( Payment $payment ) {
 			$request['paymentOptionId'] = $method;
 		}
 
-		// Check payment method.
-		if ( null === $request['paymentOptionId'] && ! empty( $payment_method ) ) {
-			// Leap of faith if the WordPress payment method could not transform to a Pay.nl method?
-			$request['paymentOptionId'] = $payment_method;
-		}
-
 		// Set payment method specific parameters.
 		if ( PaymentMethods::IDEAL === $payment_method ) {
-			$request['paymentOptionSubId'] = $payment->get_issuer();
+			$request['paymentOptionSubId'] = $payment->get_meta( 'issuer' );
 		}
 
 		// Start transaction.

diff --git a/src/Integration.php b/src/Integration.php
@@ -7,7 +7,7 @@
 /**
  * Title: Pay.nl integration
  * Description:
- * Copyright: 2005-2021 Pronamic
+ * Copyright: 2005-2022 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/Methods.php b/src/Methods.php
@@ -7,7 +7,7 @@
 /**
  * Title: Pay.nl payment methods
  * Description:
- * Copyright: 2005-2021 Pronamic
+ * Copyright: 2005-2022 Pronamic
  * Company: Pronamic
  *
  * @author  Reüel van der Steege
@@ -24,8 +24,9 @@ class Methods {
 	 * 1921 = AfterPay NL B2B
 	 * 1918 = AfterPay NL B2C
 	 *
-	 * @link https://admin.pay.nl/data/payment_profiles
+	 * Note: this is for AfterPay (afterpay.nl) and not for Afterpay (afterpay.com)
 	 *
+	 * @link https://admin.pay.nl/data/payment_profiles
 	 * @var string
 	 */
 	const AFTERPAY = '739';
@@ -155,7 +156,7 @@ class Methods {
 	 * @var array
 	 */
 	private static $map = array(
-		PaymentMethods::AFTERPAY         => self::AFTERPAY,
+		PaymentMethods::AFTERPAY_NL      => self::AFTERPAY,
 		PaymentMethods::BANCONTACT       => self::BANCONTACT,
 		PaymentMethods::BANK_TRANSFER    => self::BANKTRANSFER,
 		PaymentMethods::CREDIT_CARD      => self::CREDITCARD,

diff --git a/src/OutputOptions.php b/src/OutputOptions.php
@@ -5,7 +5,7 @@
 /**
  * Title: Pay.nl output options
  * Description:
- * Copyright: 2005-2021 Pronamic
+ * Copyright: 2005-2022 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/Statuses.php b/src/Statuses.php
@@ -7,7 +7,7 @@
 /**
  * Title: Pay.nl statuses
  * Description:
- * Copyright: 2005-2021 Pronamic
+ * Copyright: 2005-2022 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/Util.php b/src/Util.php
@@ -7,7 +7,7 @@
 /**
  * Title: Pay.nl utility class
  * Description:
- * Copyright: 2005-2021 Pronamic
+ * Copyright: 2005-2022 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -3,7 +3,7 @@
  * Bootstrap tests
  *
  * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2021 Pronamic
+ * @copyright 2005-2022 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Gateways\PayNL
  */

diff --git a/tests/phpstan/bootstrap.php b/tests/phpstan/bootstrap.php
@@ -3,7 +3,7 @@
  * Definitions for PHPStan.
  *
  * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2021 Pronamic
+ * @copyright 2005-2022 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay
  */

diff --git a/tests/src/ClientTest.php b/tests/src/ClientTest.php
@@ -8,7 +8,7 @@
 /**
  * Title: Pay.nl client test
  * Description:
- * Copyright: 2005-2021 Pronamic
+ * Copyright: 2005-2022 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/tests/src/ErrorTest.php b/tests/src/ErrorTest.php
@@ -7,7 +7,7 @@
 /**
  * Title: Pay.nl error tests
  * Description:
- * Copyright: 2005-2021 Pronamic
+ * Copyright: 2005-2022 Pronamic
  * Company: Pronamic
  *
  * @author Remco Tolsma

diff --git a/tests/src/StatusesTest.php b/tests/src/StatusesTest.php
@@ -8,7 +8,7 @@
 /**
  * Title: Pay.nl states constants tests
  * Description:
- * Copyright: 2005-2021 Pronamic
+ * Copyright: 2005-2022 Pronamic
  * Company: Pronamic
  *
  * @author Remco Tolsma

diff --git a/vendor-bin/phpstan/composer.lock b/vendor-bin/phpstan/composer.lock