From b5d57066d09ec19342f983da00cbafc5daea9b81 Mon Sep 17 00:00:00 2001 From: Jon Waldstein Date: Wed, 16 Oct 2024 15:34:31 -0400 Subject: [PATCH] chore: merge develop, update since tags and readme --- give.php | 2 +- readme.txt | 4 +++- .../Actions/ConvertDonationFormBlocksToFieldsApi.php | 2 +- .../js/app/components/dashboard-loading-spinner/index.tsx | 2 +- .../Contracts/Subscription/SubscriptionPausable.php | 8 ++++---- .../Contracts/SubscriptionModuleInterface.php | 2 +- src/Framework/PaymentGateways/PaymentGateway.php | 6 +++--- src/Framework/PaymentGateways/SubscriptionModule.php | 2 +- src/Subscriptions/Repositories/SubscriptionRepository.php | 2 +- src/Subscriptions/ValueObjects/SubscriptionStatus.php | 4 ++-- 10 files changed, 18 insertions(+), 16 deletions(-) diff --git a/give.php b/give.php index 991b2da106..80cfad3a21 100644 --- a/give.php +++ b/give.php @@ -190,7 +190,7 @@ final class Give private $container; /** - * @unreleased added Settings service provider + * @since 3.17.0 added Settings service provider * @since 2.25.0 added HttpServiceProvider * @since 2.19.6 added Donors, Donations, and Subscriptions * @since 2.8.0 diff --git a/readme.txt b/readme.txt index da1365a35a..f8dd416199 100644 --- a/readme.txt +++ b/readme.txt @@ -5,7 +5,7 @@ Tags: donation, donate, recurring donations, fundraising, crowdfunding Requires at least: 6.4 Tested up to: 6.6 Requires PHP: 7.2 -Stable tag: 3.16.5 +Stable tag: 3.17.0 License: GPLv3 License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -268,7 +268,9 @@ You can report security bugs through the Patchstack Vulnerability Disclosure Pro == Changelog == = 3.17.0: October 16th, 2024 = * New: Added new security tab with option to enable a honeypot field for visual builder forms +* Fix: Resolved an issue with the donor name prefix block not saving correctly * Dev: Resolved php 8.1 compatability conflict with MyCLabs\Enum\Enum::jsonSerialize() +* Dev: Added gateway api updates for pausing subscriptions = 3.16.5: October 15th, 2024 = * Fix: Resolved a PHP v8+ fatal error on option-based forms when the Tributes add-on was enabled diff --git a/src/DonationForms/Actions/ConvertDonationFormBlocksToFieldsApi.php b/src/DonationForms/Actions/ConvertDonationFormBlocksToFieldsApi.php index 4de295d50f..67a11112aa 100644 --- a/src/DonationForms/Actions/ConvertDonationFormBlocksToFieldsApi.php +++ b/src/DonationForms/Actions/ConvertDonationFormBlocksToFieldsApi.php @@ -261,7 +261,7 @@ protected function createNodeFromBlockWithUniqueAttributes(BlockModel $block, in } /** - * @unreleased updated honorific field with validation, global options, and user defaults + * @since 3.17.0 updated honorific field with validation, global options, and user defaults * * @since 3.0.0 */ diff --git a/src/DonorDashboards/resources/js/app/components/dashboard-loading-spinner/index.tsx b/src/DonorDashboards/resources/js/app/components/dashboard-loading-spinner/index.tsx index b0b80ffe44..f85bc162e8 100644 --- a/src/DonorDashboards/resources/js/app/components/dashboard-loading-spinner/index.tsx +++ b/src/DonorDashboards/resources/js/app/components/dashboard-loading-spinner/index.tsx @@ -3,7 +3,7 @@ import React from 'react'; import "./style.scss"; /** - * @unreleased reference givewp/src/DonorDashboards/resources/views/donordashboardloader.php + * @since 3.17.0 reference givewp/src/DonorDashboards/resources/views/donordashboardloader.php */ export default function DashboardLoadingSpinner() { diff --git a/src/Framework/PaymentGateways/Contracts/Subscription/SubscriptionPausable.php b/src/Framework/PaymentGateways/Contracts/Subscription/SubscriptionPausable.php index 2e3ee129dd..827a9ada86 100644 --- a/src/Framework/PaymentGateways/Contracts/Subscription/SubscriptionPausable.php +++ b/src/Framework/PaymentGateways/Contracts/Subscription/SubscriptionPausable.php @@ -5,28 +5,28 @@ use Give\Subscriptions\Models\Subscription; /** - * @unreleased + * @since 3.17.0 */ interface SubscriptionPausable { /** * Pause subscription. * - * @unreleased + * @since 3.17.0 */ public function pauseSubscription(Subscription $subscription, array $data): void; /** * Resume subscription. * - * @unreleased + * @since 3.17.0 */ public function resumeSubscription(Subscription $subscription): void; /** * Check if subscription can be paused. * - * @unreleased + * @since 3.17.0 */ public function canPauseSubscription(): bool; } diff --git a/src/Framework/PaymentGateways/Contracts/SubscriptionModuleInterface.php b/src/Framework/PaymentGateways/Contracts/SubscriptionModuleInterface.php index c26e97e079..f70d33d5d1 100644 --- a/src/Framework/PaymentGateways/Contracts/SubscriptionModuleInterface.php +++ b/src/Framework/PaymentGateways/Contracts/SubscriptionModuleInterface.php @@ -33,7 +33,7 @@ public function cancelSubscription(Subscription $subscription); /** * Whether the gateway supports pausing subscriptions. * - * @unreleased + * @since 3.17.0 */ public function canPauseSubscription(): bool; diff --git a/src/Framework/PaymentGateways/PaymentGateway.php b/src/Framework/PaymentGateways/PaymentGateway.php index f464c99a24..47eed6d65e 100644 --- a/src/Framework/PaymentGateways/PaymentGateway.php +++ b/src/Framework/PaymentGateways/PaymentGateway.php @@ -142,7 +142,7 @@ public function cancelSubscription(Subscription $subscription) /** * @inheritDoc * - * @unreleased + * @since 3.17.0 */ public function pauseSubscription(Subscription $subscription, array $data = []): void { @@ -158,7 +158,7 @@ public function pauseSubscription(Subscription $subscription, array $data = []): /** * @inheritDoc * - * @unreleased + * @since 3.17.0 */ public function resumeSubscription(Subscription $subscription): void { @@ -174,7 +174,7 @@ public function resumeSubscription(Subscription $subscription): void /** * @inheritDoc * - * @unreleased + * @since 3.17.0 */ public function canPauseSubscription(): bool { diff --git a/src/Framework/PaymentGateways/SubscriptionModule.php b/src/Framework/PaymentGateways/SubscriptionModule.php index 7e17dc2b04..9fb4314d1a 100644 --- a/src/Framework/PaymentGateways/SubscriptionModule.php +++ b/src/Framework/PaymentGateways/SubscriptionModule.php @@ -34,7 +34,7 @@ public function setGateway(PaymentGateway $gateway) } /** - * @unreleased + * @since 3.17.0 */ public function canPauseSubscription(): bool { diff --git a/src/Subscriptions/Repositories/SubscriptionRepository.php b/src/Subscriptions/Repositories/SubscriptionRepository.php index d5f18a8b62..0c99851181 100644 --- a/src/Subscriptions/Repositories/SubscriptionRepository.php +++ b/src/Subscriptions/Repositories/SubscriptionRepository.php @@ -186,7 +186,7 @@ public function insert(Subscription $subscription) } /** - * @unreleased add expiration column to update + * @since 3.17.0 add expiration column to update * @since 2.24.0 add payment_mode column to update * @since 2.21.0 replace actions with givewp_subscription_updating and givewp_subscription_updated * @since 2.19.6 diff --git a/src/Subscriptions/ValueObjects/SubscriptionStatus.php b/src/Subscriptions/ValueObjects/SubscriptionStatus.php index 9f72b21cd6..8ead12566d 100644 --- a/src/Subscriptions/ValueObjects/SubscriptionStatus.php +++ b/src/Subscriptions/ValueObjects/SubscriptionStatus.php @@ -5,7 +5,7 @@ use Give\Framework\Support\ValueObjects\Enum; /** - * @unreleased Added a new "paused" status + * @since 3.17.0 Added a new "paused" status * @since 2.19.6 * * @method static SubscriptionStatus PENDING() @@ -42,7 +42,7 @@ class SubscriptionStatus extends Enum { const PAUSED = 'paused'; /** - * @unreleased Added a new "paused" status + * @since 3.17.0 Added a new "paused" status * @since 2.24.0 * * @return array