Merge branch 'release/4.0.0'

Author: remcotolsma

.github/workflows/main.yaml

@@ -285,32 +285,3 @@ jobs:
         run: |
           composer run-script coveralls
           bash <(curl -s https://codecov.io/bash)
-
-  es-sass-linting:
-    name: Scripts and Styles
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      # https://github.com/actions/cache/blob/master/examples.md#macos-and-ubuntu
-      - uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-
-      - uses: actions/setup-node@v1
-        with:
-          node-version: '12'
-
-      - name: Install Node packages
-        run: npm install
-
-      - name: ESLint
-        run: npm run-script eslint
-
-      - name: Sass Lint
-        run: npm run-script sass-lint

.gitignore

@@ -19,3 +19,4 @@
 
 # WordPress
 /wordpress/
+/wp-content/

CHANGELOG.md

@@ -7,6 +7,13 @@ 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.
+
+### Fixed
+- Fix "Fatal error: Uncaught Exception: Could not JSON decode response, HTTP response: "400 Bad Request", HTTP body length: "67", JSON error: "Syntax error"." when getting issuers with invalid configuration.
+
 ## [3.0.2] - 2021-08-18
 - Fix "Fatal error: Uncaught Error: Undefined class constant 'V_PAY'".
 
@@ -104,7 +111,8 @@ 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/buckaroo/compare/3.0.2...HEAD
+[unreleased]: https://github.com/wp-pay-gateways/buckaroo/compare/4.0.0...HEAD
+[4.0.0]: https://github.com/wp-pay-gateways/buckaroo/compare/3.0.2...4.0.0
 [3.0.2]: https://github.com/wp-pay-gateways/buckaroo/compare/3.0.1...3.0.2
 [3.0.1]: https://github.com/wp-pay-gateways/buckaroo/compare/3.0.0...3.0.1
 [3.0.0]: https://github.com/wp-pay-gateways/buckaroo/compare/2.2.0...3.0.0

composer.json

@@ -33,8 +33,8 @@
 	},
 	"require": {
 		"php": ">=5.6.20",
-		"pronamic/wp-http": "^1.0",
-		"wp-pay/core": "^3.0"
+		"pronamic/wp-http": "^1.1",
+		"wp-pay/core": "^4.0"
 	},
 	"require-dev": {
 		"bamarni/composer-bin-plugin": "^1.4",
@@ -45,7 +45,8 @@
 		"pronamic/wp-coding-standards": "^1.0",
 		"roots/wordpress": "^5.8",
 		"wp-cli/wp-cli": "^2.3",
-		"wp-phpunit/wp-phpunit": "^5.8"
+		"wp-phpunit/wp-phpunit": "^5.8",
+		"yoast/phpunit-polyfills": "^1.0"
 	},
 	"scripts": {
 		"coveralls": "vendor/bin/php-coveralls -v",

docs/hooks.md

@@ -33,7 +33,7 @@ Argument | Type | Description
 -------- | ---- | -----------
 `$push_url` | `string` | Buckaroo push URL.
 
-Source: [src/Gateway.php](../src/Gateway.php), [line 116](../src/Gateway.php#L116-L125)
+Source: [src/Gateway.php](../src/Gateway.php), [line 137](../src/Gateway.php#L137-L146)
 
 
 <p align="center"><a href="https://github.com/pronamic/wp-documentor"><img src="https://cdn.jsdelivr.net/gh/pronamic/wp-documentor@main/logos/pronamic-wp-documentor.svgo-min.svg" alt="Pronamic WordPress Documentor" width="32" height="32"></a><br><em>Generated by <a href="https://github.com/pronamic/wp-documentor">Pronamic WordPress Documentor</a> <code>1.1.0</code></em><p>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "buckaroo",
-  "version": "3.0.2",
+  "version": "4.0.0",
   "description": "Buckaroo driver for the WordPress payment processing library.",
   "repository": {
     "type": "git",

src/CLI.php

@@ -3,7 +3,7 @@
  * CLI
  *
  * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2021 Pronamic
+ * @copyright 2005-2022 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Buckaroo
  */
@@ -13,7 +13,7 @@
 /**
  * Title: CLI
  * Description:
- * Copyright: 2005-2021 Pronamic
+ * Copyright: 2005-2022 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

src/Config.php

@@ -7,7 +7,7 @@
 /**
  * Title: Buckaroo config
  * Description:
- * Copyright: 2005-2021 Pronamic
+ * Copyright: 2005-2022 Pronamic
  * Company: Pronamic
  *
  * @author Remco Tolsma

src/Gateway.php

@@ -6,14 +6,14 @@
 use Pronamic\WordPress\Pay\Banks\BankAccountDetails;
 use Pronamic\WordPress\Pay\Core\Gateway as Core_Gateway;
 use Pronamic\WordPress\Pay\Core\PaymentMethods as Core_PaymentMethods;
-use Pronamic\WordPress\Pay\Core\Server;
 use Pronamic\WordPress\Pay\Payments\Payment;
 use Pronamic\WordPress\Pay\Payments\PaymentStatus;
+use WP_Error;
 
 /**
  * Title: Buckaroo gateway
  * Description:
- * Copyright: 2005-2021 Pronamic
+ * Copyright: 2005-2022 Pronamic
  * Company: Pronamic
  *
  * @author Remco Tolsma
@@ -50,22 +50,44 @@ public function __construct( Config $config ) {
 	public function get_issuers() {
 		$groups = array();
 
-		$object = $this->request( 'GET', 'Transaction/Specification/ideal?serviceVersion=2' );
+		// Check non-empty keys in configuration.
+		if ( empty( $this->config->website_key ) || empty( $this->config->secret_key ) ) {
+			return $groups;
+		}
+
+		// Get iDEAL issuers.
+		try {
+			$object = $this->request( 'GET', 'Transaction/Specification/ideal?serviceVersion=2' );
+		} catch ( \Exception $e ) {
+			$this->set_error( new WP_Error( 'buckaroo_error', $e->getMessage() ) );
+
+			return $groups;
+		}
+
+		if ( \property_exists( $object, 'Actions' ) ) {
+			foreach ( $object->Actions as $action ) {
+				// Check action name.
+				if ( 'Pay' !== $action->Name ) {
+					continue;
+				}
 
-		foreach ( $object->Actions as $action ) {
-			if ( 'Pay' === $action->Name ) {
 				foreach ( $action->RequestParameters as $request_parameter ) {
-					if ( 'issuer' === $request_parameter->Name ) {
-						foreach ( $request_parameter->ListItemDescriptions as $item ) {
-							if ( ! array_key_exists( $item->GroupName, $groups ) ) {
-								$groups[ $item->GroupName ] = array(
-									'name'    => $item->GroupName,
-									'options' => array(),
-								);
-							}
-
-							$groups[ $item->GroupName ]['options'][ $item->Value ] = $item->Description;
+					// Check request parameter name.
+					if ( 'issuer' !== $request_parameter->Name ) {
+						continue;
+					}
+
+					foreach ( $request_parameter->ListItemDescriptions as $item ) {
+						// Make sure to add group.
+						if ( ! array_key_exists( $item->GroupName, $groups ) ) {
+							$groups[ $item->GroupName ] = array(
+								'name'    => $item->GroupName,
+								'options' => array(),
+							);
 						}
+
+						// Add issuer to group.
+						$groups[ $item->GroupName ]['options'][ $item->Value ] = $item->Description;
 					}
 				}
 			}
@@ -270,11 +292,9 @@ public function start( Payment $payment ) {
 		 * @link https://testcheckout.buckaroo.nl/json/Docs/ResourceModel?modelName=ServicesRequest
 		 * @link https://testcheckout.buckaroo.nl/json/Docs/ResourceModel?modelName=ServiceRequest
 		 */
-		$payment_method = $payment->get_method();
-
-		switch ( $payment_method ) {
+		switch ( $payment->get_payment_method() ) {
 			/**
-			 * Paymet method American Express.
+			 * Payment method American Express.
 			 * 
 			 * @link 
 			 */
@@ -324,7 +344,7 @@ public function start( Payment $payment ) {
 					'Parameters' => array(
 						array(
 							'Name'  => 'issuer',
-							'Value' => $payment->get_issuer(),
+							'Value' => $payment->get_meta( 'issuer' ),
 						),
 					),
 				);
@@ -356,7 +376,7 @@ public function start( Payment $payment ) {
 
 				break;
 			/**
-			 * Paymet method Maestro.
+			 * Payment method Maestro.
 			 * 
 			 * @link 
 			 */
@@ -368,7 +388,7 @@ public function start( Payment $payment ) {
 
 				break;
 			/**
-			 * Paymet method Mastercard.
+			 * Payment method Mastercard.
 			 * 
 			 * @link 
 			 */
@@ -416,7 +436,7 @@ public function start( Payment $payment ) {
 
 				break;
 			/**
-			 * Paymet method V PAY.
+			 * Payment method V PAY.
 			 * 
 			 * @link https://dev.buckaroo.nl/PaymentMethods/Description/creditcards#top
 			 */
@@ -428,7 +448,7 @@ public function start( Payment $payment ) {
 
 				break;
 			/**
-			 * Paymet method Visa.
+			 * Payment method Visa.
 			 * 
 			 * @link https://dev.buckaroo.nl/PaymentMethods/Description/creditcards#top
 			 */
@@ -521,6 +541,7 @@ public function start( Payment $payment ) {
 	 * @param string      $method   HTTP request method.
 	 * @param string      $endpoint JSON API endpoint.
 	 * @param object|null $data     Data.
+	 * @return object
 	 */
 	public function request( $method, $endpoint, $data = null ) {
 		$host = 'checkout.buckaroo.nl';
@@ -582,7 +603,20 @@ public function request( $method, $endpoint, $data = null ) {
 			)
 		);
 
-		$object = $response->json();
+		try {
+			$object = $response->json();
+		} catch ( \Exception $e ) {
+			// JSON error.
+			$json_error = \json_last_error();
+
+			// Check authorization error.
+			if ( \JSON_ERROR_NONE !== $json_error && 400 === $response->status() ) {
+				throw new \Exception( $response->body() );
+			}
+
+			// Re-throw original response exception.
+			throw $e;
+		}
 
 		/**
 		 * OK.

src/Integration.php

@@ -7,7 +7,7 @@
 /**
  * Title: Buckaroo integration
  * Description:
- * Copyright: 2005-2021 Pronamic
+ * Copyright: 2005-2022 Pronamic
  * Company: Pronamic
  *
  * @author Reüel van der Steege