From 0ea364d36fe6e496296748d03889a62e8ccb4ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= Date: Thu, 29 Aug 2019 10:12:00 +0200 Subject: [PATCH 1/3] Fix output buffering issue with GF Nested Forms. --- src/IssuersField.php | 4 +--- src/PaymentMethodsField.php | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/IssuersField.php b/src/IssuersField.php index 3bc5290..ead915d 100644 --- a/src/IssuersField.php +++ b/src/IssuersField.php @@ -475,9 +475,7 @@ public function get_field_input( $form, $value = '', $entry = null ) { formId, $this->id ); if ( ! is_admin() && 'icons' === substr( $this->pronamicPayDisplayMode, 0, 5 ) ) { - ob_start(); ?> @@ -521,9 +520,7 @@ public function get_field_input( $form, $value = '', $entry = null ) { Date: Thu, 29 Aug 2019 12:18:22 +0200 Subject: [PATCH 2/3] Fix possible error with subscriptions "Uncaught Exception: DatePeriod::__construct(): This constructor accepts either...". --- CHANGELOG.md | 3 ++- src/PaymentData.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63c55a5..f9ed42a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,8 @@ 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] -- +- Fix possible error with subscriptions "Uncaught Exception: DatePeriod::__construct(): This constructor accepts either...". +- Improve GF Nested Forms compatibility. ## [2.1.9] - 2019-08-26 - Updated packages. diff --git a/src/PaymentData.php b/src/PaymentData.php index 9de8f15..4bc0719 100644 --- a/src/PaymentData.php +++ b/src/PaymentData.php @@ -658,7 +658,7 @@ public function get_subscription() { } // Frequency. - $frequency = ''; + $frequency = null; switch ( $this->feed->subscription_frequency_type ) { case GravityForms::SUBSCRIPTION_FREQUENCY_FIELD: From 8eff2d372c4c36f18a0669bf4c0440cb4cada3b0 Mon Sep 17 00:00:00 2001 From: Remco Tolsma Date: Fri, 30 Aug 2019 09:13:26 +0200 Subject: [PATCH 3/3] 2.1.10 --- CHANGELOG.md | 6 +++++- composer.json | 8 ++++---- package.json | 2 +- src/IssuersField.php | 2 +- src/PaymentData.php | 2 +- src/PaymentMethodsField.php | 2 +- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9ed42a..5a5a8ff 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] +- + +## [2.1.10] - 2019-08-30 - Fix possible error with subscriptions "Uncaught Exception: DatePeriod::__construct(): This constructor accepts either...". - Improve GF Nested Forms compatibility. @@ -224,7 +227,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/wp-pay-extensions/gravityforms/compare/2.1.9...HEAD +[unreleased]: https://github.com/wp-pay-extensions/gravityforms/compare/2.1.10...HEAD +[2.1.10]: https://github.com/wp-pay-extensions/gravityforms/compare/2.1.9...2.1.10 [2.1.9]: https://github.com/wp-pay-extensions/gravityforms/compare/2.1.8...2.1.9 [2.1.8]: https://github.com/wp-pay-extensions/gravityforms/compare/2.1.7...2.1.8 [2.1.7]: https://github.com/wp-pay-extensions/gravityforms/compare/2.1.6...2.1.7 diff --git a/composer.json b/composer.json index ba09da5..914ad92 100644 --- a/composer.json +++ b/composer.json @@ -36,17 +36,17 @@ "wp-pay/core": "^2.2" }, "require-dev": { - "wp-premium/gravityforms": "^2.3", "dealerdirect/phpcodesniffer-composer-installer": "^0.5", "php-coveralls/php-coveralls": "^2.1", - "phpcompatibility/php-compatibility": "^9.1", - "phpcompatibility/phpcompatibility-wp": "^2.0", + "phpcompatibility/php-compatibility": "^9.3", + "phpcompatibility/phpcompatibility-wp": "^2.1", "phpmd/phpmd": "^2.7", "phpunit/phpunit": "^5.7 || ^6.0", "roots/wordpress": "^5.2", "squizlabs/php_codesniffer": "^3.4", "wp-coding-standards/wpcs": "^2.1", - "wp-phpunit/wp-phpunit": "^5.2" + "wp-phpunit/wp-phpunit": "^5.2", + "wp-premium/gravityforms": "^2.3" }, "scripts": { "coveralls": "vendor/bin/coveralls -v", diff --git a/package.json b/package.json index 481a776..628a0ca 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gravityforms", - "version": "2.1.9", + "version": "2.1.10", "description": "Gravity Forms driver for the WordPress payment processing library.", "repository": { "type": "git", diff --git a/src/IssuersField.php b/src/IssuersField.php index ead915d..dc89416 100644 --- a/src/IssuersField.php +++ b/src/IssuersField.php @@ -22,7 +22,7 @@ * Company: Pronamic * * @author Remco Tolsma - * @version 2.1.3 + * @version 2.1.10 * @since 1.4.7 * * @property int $pronamicPayConfigId Added by admin.js. diff --git a/src/PaymentData.php b/src/PaymentData.php index 4bc0719..4b054c2 100644 --- a/src/PaymentData.php +++ b/src/PaymentData.php @@ -30,7 +30,7 @@ * Company: Pronamic * * @author Remco Tolsma - * @version 2.1.5 + * @version 2.1.10 * @since 1.0.1 */ class PaymentData extends Pay_PaymentData { diff --git a/src/PaymentMethodsField.php b/src/PaymentMethodsField.php index 4890315..99accb3 100644 --- a/src/PaymentMethodsField.php +++ b/src/PaymentMethodsField.php @@ -22,7 +22,7 @@ * Company: Pronamic * * @author Remco Tolsma - * @version 2.1.3 + * @version 2.1.10 * @since 1.4.7 * * @property int $pronamicPayConfigId Added by admin.js.