Merge branch 'release/2.1.10'

CHANGELOG.md

@@ -7,6 +7,10 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## [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.
+
 ## [2.1.9] - 2019-08-26
 - Updated packages.
 - Removed non-existing Gravity Forms payment status `Reversed`.
@@ -223,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

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",

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",

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.
@@ -475,9 +475,7 @@ public function get_field_input( $form, $value = '', $entry = null ) {
 
 			<?php
 
-			$input = ob_get_contents();
-
-			ob_clean();
+			$input = ob_get_clean();
 		}
 
 		if ( is_admin() ) {

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 {
@@ -658,7 +658,7 @@ public function get_subscription() {
 		}
 
 		// Frequency.
-		$frequency = '';
+		$frequency = null;
 
 		switch ( $this->feed->subscription_frequency_type ) {
 			case GravityForms::SUBSCRIPTION_FREQUENCY_FIELD:

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.
@@ -263,7 +263,6 @@ public function get_field_input( $form, $value = '', $entry = null ) {
 		$field_css_id = sprintf( '#field_%1$s_%2$s', $this->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 ) {
 
 			<?php
 
-			$input = ob_get_contents();
-
-			ob_clean();
+			$input = ob_get_clean();
 		}
 
 		if ( is_admin() ) {