Merge branch 'dev' of https://github.com/strangerstudios/paid-members…

…hips-pro into dev

.github/CONTRIBUTING.md

@@ -28,7 +28,7 @@ __Please Note:__ GitHub is for bug reports and contributions only. If you have a
 	* Use `git checkout -b nameofmybugfixorfeature` to create the new branch
 * Make the changes to your local repository.
 * Ensure you stick to the [WordPress Coding Standards](https://codex.wordpress.org/WordPress_Coding_Standards) (even though much of the PMPro code does not currently)
-* If you have an automatic beautifier in your IDE or dev environment, turn it off. Unrelated style changes in your pull requests will make them harder to process. Feel free to message the core development team to ask them to clean up a file you are working on if the inconsitent coding styles is bothering you.
+* If you have an automatic beautifier in your IDE or dev environment, turn it off. Unrelated style changes in your pull requests will make them harder to process. Feel free to message the core development team to ask them to clean up a file you are working on if the inconsistent coding styles is bothering you.
 * You can update the readme.txt to include a comment about your fix or feature in the changelog, but if you do not the core team will do it for you.
 * When committing, reference your issue (if present) and include a note about the fix in the commit message.
 * Push the changes to your fork.

.github/ISSUE_TEMPLATE.MD

@@ -11,7 +11,7 @@
 <!-- MARK COMPLETED ITEMS WITH AN [x] -->
 
 - [ ] I have searched for similar issues in both open and closed tickets and cannot find a duplicate.
-- [ ] The issue still exists against the latest `dev` branch of Paid Memberships Pro on Github (this is **not** the same version as on WordPress.org!)
+- [ ] The issue still exists against the latest `dev` branch of Paid Memberships Pro on GitHub (this is **not** the same version as on WordPress.org!)
 - [ ] I have attempted to find the simplest possible steps to reproduce the issue
 
 ## Steps to reproduce the issue

blocks/src/sidebar/index.js

@@ -151,7 +151,7 @@ register( pmproCustomStore() );
 	 */
 	function isSavingPost() {
 
-		// State data necessary to establish if a save is occuring.
+		// State data necessary to establish if a save is occurring.
 		const isSaving = wp.data.select('core/editor').isSavingPost() || wp.data.select('core/editor').isAutosavingPost();
 		const isSaveable = wp.data.select('core/editor').isEditedPostSaveable();
 		const isPostSavingLocked = wp.data.select('core/editor').isPostSavingLocked();

classes/class-pmpro-discount-code-list-table.php

@@ -562,7 +562,7 @@ public function column_levels( $item ) {
 	}
 
 	/**
-	 * Override single_row function to add error class if the discount code row need to be higlighted due miscounfiguration
+	 * Override single_row function to add error class if the discount code row need to be highlighted due miscounfiguration
 	 *
 	 * @param StdClass $item The current row item.
 	 * @return void

includes/content.php

@@ -157,7 +157,7 @@ function pmpro_search_filter_pmpro_pages( $query ) {
 		return $query;
 	}
 
-	// Ingore queries that aren't search related.
+	// Ignore queries that aren't search related.
 	if ( ! $query->is_search ) {
 		return $query;
 	}
@@ -244,7 +244,7 @@ function pmpro_search_filter( $query ) {
 
 	/**
 	 * No cache yet. Let's run the queries.
-	 * Some explaination of what we're doing.
+	 * Some explanation of what we're doing.
 	 * A = All posts hidden by level.
 	 * B = All posts hidden by category.
 	 * C = All posts the current user has access to by level.

js/pmpro-admin.js

@@ -946,7 +946,7 @@ window.addEventListener("DOMContentLoaded", () => {
 					// If we changed tabs, reset the inputChanged flag.
 					inputChanged = false;
 
-					// Hide tne PMPro message.
+					// Hide the PMPro message.
 					const pmproMessage = document.querySelector('#pmpro_message');
 					if ( pmproMessage ) {
 						pmproMessage.style.display = 'none';

js/updates.js

@@ -37,7 +37,7 @@ jQuery(document).ready(function() {
 							// Likely the case with a PHP error.
 							alert( error + '. Try refreshing. If this error occurs again, check your PHP error logs or seek help on the PMPro member forums.');
 						} else if ( status == 'error' ) {
-							// Likely the case if the user tries to nagivate away from the update page.
+							// Likely the case if the user tries to navigate away from the update page.
 							alert( 'This update could not complete. Try refreshing. If this error occurs again, seek help on the PMPro member forums.');
 						}
 					}

paid-memberships-pro.php

@@ -84,7 +84,7 @@
 require_once( PMPRO_DIR . '/includes/terms.php' );                  // allow restricting terms by membership level
 require_once( PMPRO_DIR . '/includes/page-templates.php' );         // page templates
 
-require_once( PMPRO_DIR . '/includes/content.php' );                // code to check for memebrship and protect content
+require_once( PMPRO_DIR . '/includes/content.php' );                // code to check for membership and protect content
 require_once( PMPRO_DIR . '/includes/compatibility.php' );          // code to support compatibility for popular page builders
 require_once( PMPRO_DIR . '/includes/email.php' );                  // code related to email
 require_once( PMPRO_DIR . '/includes/fields.php' );                  // user fields

preheaders/billing.php

@@ -272,7 +272,7 @@
             $pmproemail = new PMProEmail();
             $pmproemail->sendBillingAdminEmail($current_user, $pmpro_billing_order);
 
-            // Save billing info ect, as user meta.
+            // Save billing info etc, as user meta.
 			$meta_keys   = array();
 			$meta_values = array();
 

readme.txt

@@ -142,7 +142,7 @@ Are you comparing Paid Memberships Pro with another membership plugin or third-p
 * [Patreon](https://www.paidmembershipspro.com/paid-memberships-pro-vs-patreon/)
 * [Substack](https://www.paidmembershipspro.com/paid-memberships-pro-vs-substack/)
 
-...and more. You can [read all of these comparision guides here](https://www.paidmembershipspro.com/category/product-comparison/).
+...and more. You can [read all of these comparison guides here](https://www.paidmembershipspro.com/category/product-comparison/).
 
 == Installation ==
 

services/twocheckout-ins.php

@@ -490,7 +490,7 @@ function pmpro_insRecurringStopped( $morder ) {
 		global $pmpro_error;
 		//hook to do other stuff when payments stop		
 		do_action( 'pmpro_subscription_recurring_stopped', $morder );
-	do_action( 'pmpro_subscription_recuring_stopped', $morder );    // Keeping the mispelled version in case. Will deprecate.
+		do_action( 'pmpro_subscription_recuring_stopped', $morder );    // Keeping the misspelled version in case. Will deprecate.
 
 		$worked = pmpro_cancelMembershipLevel( $morder->membership_level->id, $morder->user->ID, 'inactive' );
 		if( $worked === true ) {

tests/_support/_generated/AcceptanceTesterActions.php

@@ -3489,7 +3489,7 @@ public function canSeePluginDeactivated($pluginSlug) {
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Assert a plugin is installed, no matter its activation status, in the plugin adminstration screen.
+     * Assert a plugin is installed, no matter its activation status, in the plugin administration screen.
      *
      * The method will **not** handle authentication and navigation to the plugin administration screen.
      *
@@ -3512,7 +3512,7 @@ public function seePluginInstalled($pluginSlug) {
      * [!] Method is generated. Documentation taken from corresponding module.
      *
      * [!] Conditional Assertion: Test won't be stopped on fail
-     * Assert a plugin is installed, no matter its activation status, in the plugin adminstration screen.
+     * Assert a plugin is installed, no matter its activation status, in the plugin administration screen.
      *
      * The method will **not** handle authentication and navigation to the plugin administration screen.
      *
@@ -4987,7 +4987,7 @@ public function cantSeeCommentInDatabase(array $criteria) {
      *
      * @example
      * ```php
-     * // Assert a specifid meta for a comment exists.
+     * // Assert a specified meta for a comment exists.
      * $I->seeCommentMetaInDatabase(['comment_ID' => $commentId, 'meta_key' => 'karma', 'meta_value' => 23]);
      * // Assert the comment has at least one meta set.
      * $I->seeCommentMetaInDatabase(['comment_ID' => $commentId]);
@@ -5010,7 +5010,7 @@ public function seeCommentMetaInDatabase(array $criteria) {
      *
      * @example
      * ```php
-     * // Assert a specifid meta for a comment exists.
+     * // Assert a specified meta for a comment exists.
      * $I->seeCommentMetaInDatabase(['comment_ID' => $commentId, 'meta_key' => 'karma', 'meta_value' => 23]);
      * // Assert the comment has at least one meta set.
      * $I->seeCommentMetaInDatabase(['comment_ID' => $commentId]);
@@ -5362,7 +5362,7 @@ public function haveTransientInDatabase($transient, $value) {
      *
      * @param  string $option_name The option name.
      * @param  mixed  $option_value The option value; if an array or object it will be serialized.
-     * @param string  $autoload Wether the option should be autoloaded by WordPress or not.
+     * @param string  $autoload Whether the option should be autoloaded by WordPress or not.
      *
      * @return int The inserted option `option_id`
      * @see \Codeception\Module\WPDb::haveOptionInDatabase()
@@ -5430,7 +5430,7 @@ public function dontHaveOptionInDatabase($key, $value = NULL) {
      * ```
      *
      * @param string $key The name of the option to insert.
-     * @param mixed  $value The value ot insert for the option.
+     * @param mixed  $value The value of insert for the option.
      *
      * @return int The inserted option `option_id`.
      * @see \Codeception\Module\WPDb::haveSiteOptionInDatabase()
@@ -6919,7 +6919,7 @@ public function getSiteDomain() {
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Removes one ore more blogs frome the database.
+     * Removes one ore more blogs from the database.
      *
      * @example
      * ```php
@@ -7543,7 +7543,7 @@ public function grabUserIdFromDatabase($userLogin) {
      *
      * @param int    $postId  The post ID.
      * @param string $metaKey The key of the meta to retrieve.
-     * @param bool   $single  Whether to return a single meta value or an arrya of all available meta values.
+     * @param bool   $single  Whether to return a single meta value or an array of all available meta values.
      *
      * @return mixed|array<string,mixed> Either a single meta value or an array of all the available meta values.
      * @see \Codeception\Module\WPDb::grabPostMetaFromDatabase()

tests/_support/_generated/WpunitTesterActions.php

@@ -1114,7 +1114,7 @@ public function cantSeeCommentInDatabase(array $criteria) {
      *
      * @example
      * ```php
-     * // Assert a specifid meta for a comment exists.
+     * // Assert a specified meta for a comment exists.
      * $I->seeCommentMetaInDatabase(['comment_ID' => $commentId, 'meta_key' => 'karma', 'meta_value' => 23]);
      * // Assert the comment has at least one meta set.
      * $I->seeCommentMetaInDatabase(['comment_ID' => $commentId]);
@@ -1137,7 +1137,7 @@ public function seeCommentMetaInDatabase(array $criteria) {
      *
      * @example
      * ```php
-     * // Assert a specifid meta for a comment exists.
+     * // Assert a specified meta for a comment exists.
      * $I->seeCommentMetaInDatabase(['comment_ID' => $commentId, 'meta_key' => 'karma', 'meta_value' => 23]);
      * // Assert the comment has at least one meta set.
      * $I->seeCommentMetaInDatabase(['comment_ID' => $commentId]);
@@ -1489,7 +1489,7 @@ public function haveTransientInDatabase($transient, $value) {
      *
      * @param  string $option_name The option name.
      * @param  mixed  $option_value The option value; if an array or object it will be serialized.
-     * @param string  $autoload Wether the option should be autoloaded by WordPress or not.
+     * @param string  $autoload Whether the option should be autoloaded by WordPress or not.
      *
      * @return int The inserted option `option_id`
      * @see \Codeception\Module\WPDb::haveOptionInDatabase()
@@ -1557,7 +1557,7 @@ public function dontHaveOptionInDatabase($key, $value = NULL) {
      * ```
      *
      * @param string $key The name of the option to insert.
-     * @param mixed  $value The value ot insert for the option.
+     * @param mixed  $value The value of insert for the option.
      *
      * @return int The inserted option `option_id`.
      * @see \Codeception\Module\WPDb::haveSiteOptionInDatabase()
@@ -3046,7 +3046,7 @@ public function getSiteDomain() {
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Removes one ore more blogs frome the database.
+     * Removes one ore more blogs from the database.
      *
      * @example
      * ```php
@@ -3670,7 +3670,7 @@ public function grabUserIdFromDatabase($userLogin) {
      *
      * @param int    $postId  The post ID.
      * @param string $metaKey The key of the meta to retrieve.
-     * @param bool   $single  Whether to return a single meta value or an arrya of all available meta values.
+     * @param bool   $single  Whether to return a single meta value or an array of all available meta values.
      *
      * @return mixed|array<string,mixed> Either a single meta value or an array of all the available meta values.
      * @see \Codeception\Module\WPDb::grabPostMetaFromDatabase()