Merge pull request #9751 from awesomemotive/release/3.3.2

Adding EDD 3.3.2

Gruntfile.js

@@ -37,6 +37,10 @@ module.exports = function ( grunt ) {
 					'**/*.php', // Include all files
 					'!node_modules/**', // Exclude node_modules/
 					'!build/**', // Exclude build/
+					'!vendor/**', // Exclude vendor/
+					'!tests/**', // Exclude tests/
+					'!includes/blocks/node_modules/**', // Exclude includes/blocks/node_modules/
+					'!includes/libraries/**', // Exclude includes/libraries/
 				],
 				expand: true,
 			},

assets/css/admin/settings/_subnav.scss

@@ -3,7 +3,11 @@
 	display: flex;
 	justify-content: flex-start;
 	gap: 4px;
-	overflow-x: auto;
+	flex-wrap: wrap;
+
+	@media screen and (max-width: $break-medium) {
+		justify-content: center;
+	}
 
 	&__wrapper {
 		margin: 16px 0;
@@ -19,6 +23,7 @@
 			display: block;
 			padding: 6px 14px;
 			text-decoration: none;
+			white-space: nowrap;
 
 			&:active,
 			&:focus {

assets/css/components/admin-nav.scss

@@ -2,27 +2,29 @@
 	&__wrapper {
 		background-color: $white;
 		box-shadow: inset 0 -3px $edd-very-light-gray;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
 		margin: 0 0 10px -20px;
 		padding: 0 20px;
 		position: sticky;
 		top: 32px;
 		z-index: 30;
 
 		@media screen and (max-width: $break-medium) {
-			top: 0;
+			top: auto;
+			position: relative;
 		}
 	}
 
 	&__tabs {
 		display: flex;
 		flex-direction: row;
 		justify-content: left;
+		flex-wrap: wrap;
 		margin: 0;
 		gap: 8px;
-		overflow-x: auto;
+
+		@media screen and (max-width: $break-medium) {
+			justify-content: center;
+		}
 
 		li {
 			display: flex;
@@ -51,6 +53,7 @@
 			font-weight: 600;
 			font-size: 16px;
 			text-align: center;
+			white-space: nowrap;
 		}
 	}
 }

composer.json

@@ -11,8 +11,7 @@
   "config": {
     "platform-check": false,
     "allow-plugins": {
-      "dealerdirect/phpcodesniffer-composer-installer": true,
-      "phpstan/extension-installer": true
+      "dealerdirect/phpcodesniffer-composer-installer": true
     }
   },
   "require": {
@@ -27,8 +26,6 @@
     "codedungeon/phpunit-result-printer": "dev-master",
     "coenjacobs/mozart": "dev-master",
     "wp-coding-standards/wpcs": "dev-develop",
-    "szepeviktor/phpstan-wordpress": "^1.3.0",
-    "phpstan/extension-installer": "^1.3.1",
     "squizlabs/php_codesniffer": "^3.7.2",
     "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
     "phpcompatibility/phpcompatibility-wp": "^2.1.4"

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.3.1
+ * Version: 3.3.2
  * Text Domain: easy-digital-downloads
  * Domain Path: /languages
  * Requires at least: 6.0
@@ -27,7 +27,7 @@
  * @package EDD
  * @category Core
  * @author Easy Digital Downloads
- * @version 3.3.1
+ * @version 3.3.2
  */
 
 // Exit if accessed directly.

includes/admin/settings/display-settings.php

@@ -70,7 +70,7 @@ function edd_license_settings_help_text() {
 				printf(
 					wp_kses_post(
 						/* translators: 1: opening anchor tag, 2: closing anchor tag */
-						__( 'Have a pass? You\'re ready to set up EDD (Pro). %1$sActivate Your Pass%2$s' )
+						__( 'Have a pass? You\'re ready to set up EDD (Pro). %1$sActivate Your Pass%2$s', 'easy-digital-downloads' )
 					),
 					'<a href="' . esc_url( $url ) . '" class="button button-primary">',
 					'</a>'

includes/blocks/views/forms/reset-password.php

@@ -17,18 +17,18 @@
 			<button type="button" class="button button-secondary wp-hide-pw edd-has-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password', 'easy-digital-downloads' ); ?>">
 				<span class="dashicons dashicons-hidden" aria-hidden="true"></span>
 			</button>
-			<div id="pass-strength-result" class="edd-has-js" aria-live="polite"><?php esc_html_e( 'Strength indicator' ); ?></div>
+			<div id="pass-strength-result" class="edd-has-js" aria-live="polite"><?php esc_html_e( 'Strength indicator', 'easy-digital-downloads' ); ?></div>
 		</div>
 	</div>
 	<div class="edd-blocks-form__group edd-blocks-form__group-pw-weak pw-weak">
 		<div class="edd-blocks-form__control">
 			<input type="checkbox" name="pw_weak" id="pw-weak" class="pw-checkbox" />
-			<label for="pw-weak"><?php esc_html_e( 'Confirm use of weak password' ); ?></label>
+			<label for="pw-weak"><?php esc_html_e( 'Confirm use of weak password', 'easy-digital-downloads' ); ?></label>
 		</div>
 	</div>
 
 	<div class="edd-blocks-form__group edd-blocks-form__group-pass2 user-pass2-wrap">
-		<label for="pass2"><?php esc_html_e( 'Confirm new password' ); ?></label>
+		<label for="pass2"><?php esc_html_e( 'Confirm new password', 'easy-digital-downloads' ); ?></label>
 		<div class="edd-blocks-form__control">
 			<input type="password" name="pass2" id="pass2" class="input" size="20" value="" autocomplete="new-password" />
 		</div>
@@ -40,7 +40,7 @@
 		<input type="hidden" name="edd_redirect" value="<?php echo esc_url( remove_query_arg( 'action', edd_get_current_page_url() ) ); ?>"/>
 		<input type="hidden" name="edd_resetpassword_nonce" value="<?php echo esc_attr( wp_create_nonce( 'edd-reset-password-nonce' ) ); ?>"/>
 		<input type="hidden" name="edd_action" value="user_reset_password"/>
-		<button type="button" class="button wp-generate-pw edd-has-js edd-button-secondary"><?php esc_html_e( 'Generate Password' ); ?></button>
-		<input type="submit" id="wp-submit" class="<?php echo esc_attr( implode( ' ', EDD\Blocks\Functions\get_button_classes() ) ); ?>" value="<?php esc_attr_e( 'Save Password' ); ?>" />
+		<button type="button" class="button wp-generate-pw edd-has-js edd-button-secondary"><?php esc_html_e( 'Generate Password', 'easy-digital-downloads' ); ?></button>
+		<input type="submit" id="wp-submit" class="<?php echo esc_attr( implode( ' ', EDD\Blocks\Functions\get_button_classes() ) ); ?>" value="<?php esc_attr_e( 'Save Password', 'easy-digital-downloads' ); ?>" />
 	</div>
 </form>

includes/blocks/views/orders/receipt-item.php

@@ -22,19 +22,20 @@
 		if ( edd_use_skus() ) :
 			?>
 			<div class="edd-blocks-receipt__item-sku">
-				<span class="edd-blocks__row-label"><?php esc_html_e( 'SKU:' ); ?></span>
+				<span class="edd-blocks__row-label"><?php esc_html_e( 'SKU:', 'easy-digital-downloads' ); ?></span>
 				<?php echo esc_html( edd_get_download_sku( $item->product_id ) ); ?>
 			</div>
 		<?php endif; ?>
 		<?php if ( edd_item_quantities_enabled() ) { ?>
 			<div class="edd-blocks-receipt__item-quantity">
-				<span class="edd-blocks__row-label"><?php esc_html_e( 'Quantity:' ); ?></span>
+				<span class="edd-blocks__row-label"><?php esc_html_e( 'Quantity:', 'easy-digital-downloads' ); ?></span>
 				<?php echo esc_html( $item->quantity ); ?>
 			</div>
 			<?php
 		}
 		/**
 		 * Allow extensions to extend the product cell.
+		 *
 		 * @since 3.0
 		 * @param \EDD\Orders\Order_Item $item The current order item.
 		 * @param \EDD\Orders\Order $order     The current order object.

includes/class-easy-digital-downloads.php

@@ -361,7 +361,7 @@ private function setup_constants() {
 
 		// Plugin version.
 		if ( ! defined( 'EDD_VERSION' ) ) {
-			define( 'EDD_VERSION', '3.3.1' );
+			define( 'EDD_VERSION', '3.3.2' );
 		}
 
 		// Make sure CAL_GREGORIAN is defined.