Merge pull request awesomemotive#9695 from awesomemotive/release/3.2.5

Release 3.2.5
jkudish · Nov 10, 2023 · 715373d · 715373d
2 parents 675bd93 + d977a24
commit 715373d
Show file tree

Hide file tree

Showing 185 changed files with 674 additions and 1,152 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -79,9 +79,6 @@ module.exports = function ( grunt ) {
 					'vendor/symfony/deprecation-contracts/**',
 					'vendor/symfony/polyfill-php80/**',
 					'vendor/symfony/polyfill-mbstring/**',
-					'vendor/symfony/service-contracts/**',
-					'vendor/symfony/translation/**',
-					'vendor/symfony/translation-contracts/**',
 				],
 				dest: 'build/<%= pkg.name %>-pro/',
 			},
@@ -118,9 +115,6 @@ module.exports = function ( grunt ) {
 					'vendor/symfony/deprecation-contracts/**',
 					'vendor/symfony/polyfill-php80/**',
 					'vendor/symfony/polyfill-mbstring/**',
-					'vendor/symfony/service-contracts/**',
-					'vendor/symfony/translation/**',
-					'vendor/symfony/translation-contracts/**',
 				],
 				dest: 'build/<%= pkg.name %>/',
 			},
@@ -149,9 +143,6 @@ module.exports = function ( grunt ) {
 					'vendor/symfony/deprecation-contracts/**',
 					'vendor/symfony/polyfill-php80/**',
 					'vendor/symfony/polyfill-mbstring/**',
-					'vendor/symfony/service-contracts/**',
-					'vendor/symfony/translation/**',
-					'vendor/symfony/translation-contracts/**',
 				],
 				dest: 'build/<%= pkg.name %>-public/',
 			}

diff --git a/composer.json b/composer.json
@@ -39,9 +39,13 @@
       "psr-4": {
         "EDD\\": "src/",
         "EDD\\Vendor\\Stripe\\": "libraries/Stripe/lib/",
-        "EDD\\Vendor\\Carbon\\": "libraries/Carbon/src/Carbon/"
+        "EDD\\Vendor\\Carbon\\": "libraries/Carbon/src/Carbon/",
+        "EDD\\Vendor\\Symfony\\Polyfill\\Mbstring\\": "libraries/Symfony/Polyfill/Mbstring/"
       },
-      "files": [ "src/Globals/Polyfills/PHP.php" ]
+      "files": [
+        "src/Globals/Polyfills/PHP.php",
+        "libraries/Symfony/Polyfill/Mbstring/bootstrap.php"
+      ]
     },
     "autoload-dev": {
       "classmap": ["src/", "tests/"]
@@ -60,10 +64,8 @@
           "nesbot/carbon"
         ],
         "excluded_packages": [
-          "symfony/polyfill-mbstring",
-          "symfony/polyfill-php80",
-          "symfony/translation-contracts",
-          "symfony/translation"
+          "symfony/deprecation-contracts",
+          "symfony/polyfill-php80"
         ],
         "delete_vendor_directories": true,
         "override_autoload": {

diff --git a/composer.lock b/composer.lock
diff --git a/easy-digital-downloads.php b/easy-digital-downloads.php
@@ -5,7 +5,7 @@
  * Description: The easiest way to sell digital products with WordPress.
  * Author: Easy Digital Downloads
  * Author URI: https://easydigitaldownloads.com
- * Version: 3.2.4
+ * Version: 3.2.5
  * Text Domain: easy-digital-downloads
  * Domain Path: /languages
  * Requires at least: 5.8
@@ -27,7 +27,7 @@
  * @package EDD
  * @category Core
  * @author Easy Digital Downloads
- * @version 3.2.4
+ * @version 3.2.5
  */
 
 // Exit if accessed directly.

diff --git a/includes/admin/import/class-batch-import.php b/includes/admin/import/class-batch-import.php
@@ -77,6 +77,14 @@ class EDD_Batch_Import {
 	 */
 	public $field_mapping = array();
 
+	/**
+	 * Is the import done?
+	 *
+	 * @since 2.6
+	 * @var bool
+	 */
+	public $done = false;
+
 	/**
 	 * Get things started
 	 *
@@ -86,7 +94,6 @@ class EDD_Batch_Import {
 	public function __construct( $_file = '', $_step = 1 ) {
 
 		$this->step = $_step;
-		$this->done = false;
 		if ( ! empty( $_file ) ) {
 			$this->set_up_csv( $_file );
 		}

diff --git a/includes/class-easy-digital-downloads.php b/includes/class-easy-digital-downloads.php
@@ -369,7 +369,7 @@ private function setup_constants() {
 
 		// Plugin version.
 		if ( ! defined( 'EDD_VERSION' ) ) {
-			define( 'EDD_VERSION', '3.2.4' );
+			define( 'EDD_VERSION', '3.2.5' );
 		}
 
 		// Make sure CAL_GREGORIAN is defined.

diff --git a/includes/orders/functions/orders.php b/includes/orders/functions/orders.php
@@ -708,7 +708,6 @@ function edd_build_order( $order_data = array() ) {
 	// Build order information based on data passed from the gateway.
 	$order_args = array(
 		'parent'       => ! empty( $order_data['parent'] ) ? absint( $order_data['parent'] ) : '',
-		'order_number' => '',
 		'status'       => ! empty( $order_data['status'] ) ? $order_data['status'] : 'pending',
 		'user_id'      => ! empty( $order_data['user_info']['id'] ) ? $order_data['user_info']['id'] : 0,
 		'email'        => $order_data['user_info']['email'],
@@ -799,6 +798,7 @@ function edd_build_order( $order_data = array() ) {
 	if ( empty( $order_id ) ) {
 		return false;
 	}
+	EDD()->session->set( 'edd_resume_payment', $order_id );
 
 	// Attach order to the customer record.
 	$customer->attach_payment( $order_id, false );

diff --git a/includes/process-purchase.php b/includes/process-purchase.php
@@ -134,9 +134,9 @@ function edd_process_purchase_form() {
 	$existing_payment = EDD()->session->get( 'edd_resume_payment' );
 
 	if ( ! empty( $existing_payment ) ) {
-		$payment = new EDD_Payment( $existing_payment );
-		if ( $payment->is_recoverable() && ! empty( $payment->key ) ) {
-			$purchase_key = $payment->key;
+		$order = edd_get_order( $existing_payment );
+		if ( $order->is_recoverable() && ! empty( $order->payment_key ) ) {
+			$purchase_key = $order->payment_key;
 		}
 	}