Merge branch 'release/4.2.2'

Author: rvdsteege

CHANGELOG.md

@@ -7,6 +7,9 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## [Unreleased][unreleased]
 -
 
+## [4.2.2] - 2022-10-11
+- Fixed catching exceptions in issuer field (pronamic/wp-pronamic-pay-gravityforms#10).
+
 ## [4.2.1] - 2022-09-27
 - Update to `wp-pay/core` version `^4.4`.
 
@@ -352,7 +355,8 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## 1.0.0 - 2015-01-01
 - First release.
 
-[unreleased]: https://github.com/pronamic/wp-pronamic-pay-gravityforms/compare/4.2.1...HEAD
+[unreleased]: https://github.com/pronamic/wp-pronamic-pay-gravityforms/compare/4.2.2...HEAD
+[4.2.2]: https://github.com/pronamic/wp-pronamic-pay-gravityforms/compare/4.2.1...4.2.2
 [4.2.1]: https://github.com/pronamic/wp-pronamic-pay-gravityforms/compare/4.2.0...4.2.1
 [4.2.0]: https://github.com/pronamic/wp-pronamic-pay-gravityforms/compare/4.1.1...4.2.0
 [4.1.1]: https://github.com/pronamic/wp-pronamic-pay-gravityforms/compare/4.1.0...4.1.1

composer.json

@@ -50,10 +50,10 @@
 		"php-coveralls/php-coveralls": "^2.4",
 		"phpmd/phpmd": "^2.9",
 		"phpunit/phpunit": "^5.7 || ^6.0",
+		"pronamic/gravityforms": "^2.6",
 		"pronamic/wp-coding-standards": "^1.0",
 		"roots/wordpress": "^5.8",
 		"wp-phpunit/wp-phpunit": "^5.8",
-		"wp-premium/gravityforms": "^2.3",
 		"yoast/phpunit-polyfills": "^1.0"
 	},
 	"scripts": {
@@ -62,7 +62,7 @@
 		"phpcs": "XDEBUG_MODE=off vendor/bin/phpcs -s -v",
 		"phplint": "find src tests -name '*.php' | xargs -n 1 -P 4 php -l",
 		"phpmd": "vendor/bin/phpmd src,tests text phpmd.ruleset.xml --suffixes php",
-		"phpstan": "vendor/bin/phpstan analyse",
+		"phpstan": "vendor/bin/phpstan analyse --memory-limit=-1",
 		"phpunit": "vendor/bin/phpunit",
 		"post-install-cmd": "echo 'Optionally run: composer bin all install'",
 		"post-update-cmd": "echo 'Optionally run: composer bin all update'",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gravityforms",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "Gravity Forms driver for the WordPress payment processing library.",
   "repository": {
     "type": "git",

pronamic-pay-gravityforms.php

@@ -4,7 +4,7 @@
  * Plugin URI: https://www.pronamic.eu/plugins/pronamic-pay-gravityforms/
  * Description: Extend the Pronamic Pay plugin with Gravity Forms support to receive payments through a variety of payment providers.
  *
- * Version: 4.2.1
+ * Version: 4.2.2
  * Requires at least: 4.7
  *
  * Author: Pronamic

src/IssuersField.php

@@ -151,7 +151,19 @@ private function get_gateway() {
 					continue;
 				}
 
-				$options = $issuer_field->get_options();
+				/**
+				 * The iDEAL issuer field options can be requested from the
+				 * gateway and that can result in exceptions. In this case,
+				 * that's no problem and we'll move on to the next
+				 * feed/gateway.
+				 * 
+				 * @link https://github.com/pronamic/wp-pronamic-pay-gravityforms/issues/10
+				 */
+				try {
+					$options = $issuer_field->get_options();
+				} catch ( \Exception $e ) {
+					continue;
+				}
 
 				if ( 1 === count( $options ) ) {
 					continue;
@@ -191,17 +203,29 @@ private function set_choices( $form_id ) {
 		}
 
 		/**
-		 * Gravity Forms has no support for <optgroup>  elements.
-		 *
-		 * @link https://github.com/pronamic/wp-pronamic-pay/issues/154#issuecomment-1183309350
+		 * The iDEAL issuer field options can be requested from the
+		 * gateway and that can result in exceptions. In this case,
+		 * that's no problem and we'll move on to the next
+		 * feed/gateway.
+		 * 
+		 * @link https://github.com/pronamic/wp-pronamic-pay-gravityforms/issues/10
 		 */
-		$options = $issuer_field->get_flat_options();
-
-		foreach ( $options as $option ) {
-			$this->choices[] = [
-				'value' => $option->value,
-				'text'  => $option->label,
-			];
+		try {
+			/**
+			 * Gravity Forms has no support for <optgroup>  elements.
+			 *
+			 * @link https://github.com/pronamic/wp-pronamic-pay/issues/154#issuecomment-1183309350
+			 */
+			$options = $issuer_field->get_flat_options();
+
+			foreach ( $options as $option ) {
+				$this->choices[] = [
+					'value' => $option->value,
+					'text'  => $option->label,
+				];
+			}
+		} catch ( \Exception $e ) {
+			return;
 		}
 	}