Skip to content

Commit

Permalink
Updating version numbers for 3.4 RC1
Browse files Browse the repository at this point in the history
  • Loading branch information
dparker1005 committed Jan 31, 2025
1 parent ba1ef10 commit 998c99e
Show file tree
Hide file tree
Showing 44 changed files with 370 additions and 370 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
== Changelog ==
= 3.4 - TBD =
= 3.4 RC1 - 2024-01-31 =
* FEATURE: Now pulling localization files from https://translate.strangerstudios.com. #3211 (@andrewlimaza)
* FEATURE: Added a new Membership Account Message level setting to show a level-specific message to members on the Membership Account page. #3271 (@andrewlimaza, @kimcoleman)
* ENHANCEMENT: Email template variables shown when editing an email template will now be specific to the email template being edited. #3234 (@MaximilianoRicoTabo, @dparker1005)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
class PMPro_Member_Edit_Panel_User_Fields extends PMPro_Member_Edit_Panel {
/**
* @var PMPro_Field_Group The field group .
* @since TBD
* @since 3.4
*/
private $field_group;

Expand Down
20 changes: 10 additions & 10 deletions classes/class-pmpro-field-group.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function __get( $name ) {
/**
* Add a field group.
*
* @since TBD
* @since 3.4
*
* @param string $name The name of the field group.
* @param string|null $label The label for the field group. If NULL, a cleaned version of the name will be used.
Expand Down Expand Up @@ -95,7 +95,7 @@ public static function add( $name, $label = NULL, $description = '' ) {
/**
* Get all added field groups.
*
* @since TBD
* @since 3.4
*
* @return array An array of PMPro_Field_Group objects.
*/
Expand All @@ -112,7 +112,7 @@ public static function get_all() {
/**
* Get an added field group by name.
*
* @since TBD
* @since 3.4
*
* @param string $name The name of the field group.
* @return PMPro_Field_Group The field group object.
Expand All @@ -133,7 +133,7 @@ public static function get( $name ) {
/**
* Get the field group for a field.
*
* @since TBD
* @since 3.4
*
* @param PMPro_Field $field The field object.
* @return PMPro_Field_Group|null The field group object, or NULL if the field is not in a group.
Expand All @@ -160,7 +160,7 @@ public static function get_group_for_field( $field ) {
/**
* Get a field by name.
*
* @since TBD
* @since 3.4
*
* @param string $name The name of the field.
* @return PMPro_Field|null The field object, or NULL if the field is not in a group.
Expand All @@ -186,7 +186,7 @@ public static function get_field( $name ) {
/**
* Add a field to this field group.
*
* @since TBD
* @since 3.4
*
* @param PMPro_Field $field The field object to add.
* @return bool True if the field was added, otherwise false.
Expand Down Expand Up @@ -226,7 +226,7 @@ public function add_field( $field ) {
/**
* Get all fields in this field group.
*
* @since TBD
* @since 3.4
*
* @return array An array of PMPro_Field objects.
*/
Expand All @@ -246,7 +246,7 @@ public function get_fields() {
/**
* Get all fields to display in a specific context.
*
* @since TBD
* @since 3.4
*
* @param array $args The arguments for getting the fields.
*/
Expand Down Expand Up @@ -315,7 +315,7 @@ public function get_fields_to_display( $args = array() ) {
/**
* Display the field group.
*
* @since TBD
* @since 3.4
*
* @param array $args The arguments for displaying the fields.
*/
Expand Down Expand Up @@ -525,7 +525,7 @@ public function display( $args = array() ) {
/**
* Save fields in a specific context.
*
* @since TBD
* @since 3.4
*
* @param array $args The arguments for saving the fields.
* @return bool True if the fields were saved, otherwise false.
Expand Down
38 changes: 19 additions & 19 deletions classes/class-pmpro-field.php
Original file line number Diff line number Diff line change
Expand Up @@ -299,11 +299,11 @@ function __construct($name = NULL, $type = NULL, $attr = NULL) {
function __get( $name ) {
if ( isset( $this->$name ) ) {
if ( ! $this->is_valid_property( $name ) ) {
_doing_it_wrong( __FUNCTION__, sprintf( esc_html__( 'The property %s is not valid for the field type %s.', 'paid-memberships-pro' ), $name, $this->type ), 'TBD' );
_doing_it_wrong( __FUNCTION__, sprintf( esc_html__( 'The property %s is not valid for the field type %s.', 'paid-memberships-pro' ), $name, $this->type ), '3.4' );
}
return $this->$name;
} else {
_doing_it_wrong( __FUNCTION__, sprintf( esc_html__( 'The property %s does not exist.', 'paid-memberships-pro' ), $name ), 'TBD' );
_doing_it_wrong( __FUNCTION__, sprintf( esc_html__( 'The property %s does not exist.', 'paid-memberships-pro' ), $name ), '3.4' );
}

return null;
Expand All @@ -318,7 +318,7 @@ function __get( $name ) {
*/
function __set( $name, $value ) {
if ( 'type' === $name ) {
_doing_it_wrong( __FUNCTION__, esc_html__( 'PMPro_Field properties should not be modified directly and may break in a future version. Instead, create a new PMPro_Field object.', 'paid-memberships-pro' ), 'TBD' );
_doing_it_wrong( __FUNCTION__, esc_html__( 'PMPro_Field properties should not be modified directly and may break in a future version. Instead, create a new PMPro_Field object.', 'paid-memberships-pro' ), '3.4' );
}

$this->$name = $value;
Expand All @@ -341,19 +341,19 @@ function __isset( $name ) {
function __call( $name, $arguments ) {
switch( $name ) {
case 'set':
_doing_it_wrong( __FUNCTION__, sprintf( esc_html__( 'The method %s of PMPro_Field has become private and will not be available in a future version. Instead, use the $args property of the constructor when creating a new PMPro_Field object.', 'paid-memberships-pro' ), $name ), 'TBD' );
_doing_it_wrong( __FUNCTION__, sprintf( esc_html__( 'The method %s of PMPro_Field has become private and will not be available in a future version. Instead, use the $args property of the constructor when creating a new PMPro_Field object.', 'paid-memberships-pro' ), $name ), '3.4' );
break;
case 'saveUsersTable':
case 'saveTermRelationshipsTable':
case 'saveFile':
_doing_it_wrong( __FUNCTION__, sprintf( esc_html__( 'The method %s of PMPro_Field has become private and will not be available in a future version. Instead, use the save_field_for_user method of the PMPro_Field object.', 'paid-memberships-pro' ), $name ), 'TBD' );
_doing_it_wrong( __FUNCTION__, sprintf( esc_html__( 'The method %s of PMPro_Field has become private and will not be available in a future version. Instead, use the save_field_for_user method of the PMPro_Field object.', 'paid-memberships-pro' ), $name ), '3.4' );
break;
case 'getHTML':
case 'getDependenciesJS':
_doing_it_wrong( __FUNCTION__, sprintf( esc_html__( 'The method %s of PMPro_Field has become private and will not be available in a future version. Instead, use the display() method of the PMPro_Field object.', 'paid-memberships-pro' ), $name ), 'TBD' );
_doing_it_wrong( __FUNCTION__, sprintf( esc_html__( 'The method %s of PMPro_Field has become private and will not be available in a future version. Instead, use the display() method of the PMPro_Field object.', 'paid-memberships-pro' ), $name ), '3.4' );
break;
default:
_doing_it_wrong( __FUNCTION__, sprintf( esc_html__( 'The method %s of PMPro_Field has become private and will not be available in a future version.', 'paid-memberships-pro' ), $name ), 'TBD' );
_doing_it_wrong( __FUNCTION__, sprintf( esc_html__( 'The method %s of PMPro_Field has become private and will not be available in a future version.', 'paid-memberships-pro' ), $name ), '3.4' );
break;
}
return call_user_func( array( $this, $name ), $arguments );
Expand All @@ -362,7 +362,7 @@ function __call( $name, $arguments ) {
/**
* Check if a property should be present for the current field type.
*
* @since TBD
* @since 3.4
*
* @param string $property The property to check.
* return bool Whether the property is valid for the field type.
Expand Down Expand Up @@ -603,7 +603,7 @@ private function set($name, $type, $attr = array())
* Get the field value from $_REQEUST or $_SESSION.
* The value will be sanitized if the field has the sanitize property set to true.
*
* @since TBD
* @since 3.4
*
* @return mixed The value of the field or null if not found.
*/
Expand Down Expand Up @@ -654,7 +654,7 @@ function get_value_from_request() {
/**
* Save the field for a user.
*
* @since TBD
* @since 3.4
*
* @param int $user_id The user ID to save the field for.
*/
Expand Down Expand Up @@ -1477,11 +1477,11 @@ function pmpro_<?php echo esc_html( $this->id );?>_hideshow() {
/**
* Display the field at checkout.
*
* @deprecated TBD Use PMPro_Field_Group::display() instead.
* @deprecated 3.4 Use PMPro_Field_Group::display() instead.
*/
function displayAtCheckout()
{
_deprecated_function( __METHOD__, 'TBD', 'PMPro_Field_Group::display()' );
_deprecated_function( __METHOD__, '3.4', 'PMPro_Field_Group::display()' );
global $current_user;

if( null !== $this->get_value_from_request() ) {
Expand Down Expand Up @@ -1552,11 +1552,11 @@ function displayAtCheckout()
}

/**
* @deprecated TBD Use PMPro_Field_Group::display() instead.
* @deprecated 3.4 Use PMPro_Field_Group::display() instead.
*/
function displayInProfile($user_id, $edit = NULL)
{
_deprecated_function( __METHOD__, 'TBD', 'PMPro_Field_Group::display()' );
_deprecated_function( __METHOD__, '3.4', 'PMPro_Field_Group::display()' );
global $current_user;
if(metadata_exists("user", $user_id, $this->meta_key))
{
Expand Down Expand Up @@ -1612,7 +1612,7 @@ function displayValue( $value, $echo = true ) {
/**
* Filter whether links should be clickable, embedded, or shown as plain text.
*
* @since TBD
* @since 3.4
*
* @param string $link_display_type The type of link display. Accepts 'embedded', 'clickable_link', 'clickable_label', or 'text'.
* @param string $value The value to be shown.
Expand Down Expand Up @@ -1821,10 +1821,10 @@ private function is_assoc( $array ) {
}

/**
* @deprecated TBD Use PMPro_Field_Group::get_group_for_field() instead.
* @deprecated 3.4 Use PMPro_Field_Group::get_group_for_field() instead.
*/
static function get_checkout_box_name_for_field( $field_name ) {
_deprecated_function( __METHOD__, 'TBD', 'PMPro_Field_Group::get_group_for_field()' );
_deprecated_function( __METHOD__, '3.4', 'PMPro_Field_Group::get_group_for_field()' );
$field = PMPro_Field_Group::get_field( $field_name );
if ( empty( $field ) ) {
return '';
Expand All @@ -1835,10 +1835,10 @@ static function get_checkout_box_name_for_field( $field_name ) {
}

/**
* @deprecated TBD
* @deprecated 3.4
*/
function was_present_on_checkout_page() {
_deprecated_function( __METHOD__, 'TBD' );
_deprecated_function( __METHOD__, '3.4' );
// Check if checkout box that field is in is on page.
$checkout_box = PMPro_Field_Group::get_group_for_field( $this );
if ( empty( $checkout_box ) ) {
Expand Down
2 changes: 1 addition & 1 deletion classes/class.pmproemail.php
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ function sendPaymentActionRequiredAdminEmail($user = NULL, $order = NULL, $order
*
* @param object $user The WordPress user object.
* @return void
* @since TBD
* @since 3.4
*/
function send_recurring_payment_reminder( $subscription_obj = NULL ) {
// Bail if we don't have a subscription object.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class PMPro_Email_Template_Admin_Change_Admin extends PMPro_Email_Template {
/**
* Constructor.
*
* @since TBD
* @since 3.4
*
* @param WP_User $user The user object of the user to send the email to.
*/
Expand All @@ -23,7 +23,7 @@ public function __construct( WP_User $user ) {
/**
* Get the email template slug.
*
* @since TBD
* @since 3.4
*
* @return string The email template slug.
*/
Expand All @@ -34,7 +34,7 @@ public static function get_template_slug() {
/**
* Get the "nice name" of the email template.
*
* @since TBD
* @since 3.4
*
* @return string The "nice name" of the email template.
*/
Expand All @@ -45,7 +45,7 @@ public static function get_template_name() {
/**
* Get "help text" to display to the admin when editing the email template.
*
* @since TBD
* @since 3.4
*
* @return string The "help text" to display to the admin when editing the email template.
*/
Expand All @@ -56,7 +56,7 @@ public static function get_template_description() {
/**
* Get the default subject for the email.
*
* @since TBD
* @since 3.4
*
* @return string The default subject for the email.
*/
Expand All @@ -67,7 +67,7 @@ public static function get_default_subject() {
/**
* Get the default body content for the email.
*
* @since TBD
* @since 3.4
*
* @return string The default body content for the email.
*/
Expand All @@ -82,7 +82,7 @@ public static function get_default_body() {
/**
* Get the email template variables for the email.
*
* @since TBD
* @since 3.4
*
* @return array The email template variables for the email (key => value pairs).
*/
Expand All @@ -109,7 +109,7 @@ public function get_email_template_variables() {
/**
* Get the email template variables for the email paired with a description of the variable.
*
* @since TBD
* @since 3.4
*
* @return array The email template variables for the email (key => value pairs).
*/
Expand All @@ -127,7 +127,7 @@ public static function get_email_template_variables_with_description() {
/**
* Get the email address to send the email to.
*
* @since TBD
* @since 3.4
*
* @return string The email address to send the email to.
*/
Expand All @@ -138,7 +138,7 @@ public function get_recipient_email() {
/**
* Get the name of the email recipient.
*
* @since TBD
* @since 3.4
*
* @return string The name of the email recipient.
*/
Expand All @@ -152,7 +152,7 @@ public function get_recipient_name() {
/**
* Register the email template.
*
* @since TBD
* @since 3.4
*
* @param array $email_templates The email templates (template slug => email template class name)
* @return array The modified email templates array.
Expand Down
Loading

0 comments on commit 998c99e

Please sign in to comment.