Merge remote-tracking branch 'origin/release/23.8' into trunk

inc/class-wpseo-admin-bar-menu.php

@@ -359,6 +359,7 @@ protected function add_root_menu( WP_Admin_Bar $wp_admin_bar ) {
 		$settings_url       = '';
 		$counter            = '';
 		$notification_popup = '';
+		$notification_count = 0;
 
 		$post = $this->get_singular_post();
 		if ( $post ) {
@@ -377,7 +378,10 @@ protected function add_root_menu( WP_Admin_Bar $wp_admin_bar ) {
 		}
 
 		if ( empty( $score ) && ! is_network_admin() && $can_manage_options ) {
-			$counter            = $this->get_notification_counter();
+			$notification_center = Yoast_Notification_Center::get();
+			$notification_count  = $notification_center->get_notification_count();
+
+			$counter            = $this->get_notification_counter( $notification_count );
 			$notification_popup = $this->get_notification_popup();
 		}
 
@@ -389,7 +393,7 @@ protected function add_root_menu( WP_Admin_Bar $wp_admin_bar ) {
 		];
 		$wp_admin_bar->add_menu( $admin_bar_menu_args );
 
-		if ( ! empty( $counter ) ) {
+		if ( $notification_count > 0 ) {
 			$admin_bar_menu_args = [
 				'parent' => self::MENU_IDENTIFIER,
 				'id'     => 'wpseo-notifications',
@@ -849,18 +853,17 @@ protected function get_settings_page_url() {
 	/**
 	 * Gets the notification counter if in a valid context.
 	 *
+	 * @param int $notification_count Number of notifications.
+	 *
 	 * @return string Notification counter markup, or empty string if not available.
 	 */
-	protected function get_notification_counter() {
-		$notification_center = Yoast_Notification_Center::get();
-		$notification_count  = $notification_center->get_notification_count();
-
+	protected function get_notification_counter( $notification_count ) {
 		/* translators: Hidden accessibility text; %s: number of notifications. */
 		$counter_screen_reader_text = sprintf( _n( '%s notification', '%s notifications', $notification_count, 'wordpress-seo' ), number_format_i18n( $notification_count ) );
 
 		return sprintf(
 			' <div class="wp-core-ui wp-ui-notification yoast-issue-counter%s"><span class="yoast-issues-count" aria-hidden="true">%d</span><span class="screen-reader-text">%s</span></div>',
-			( $notification_count ) ? '' : ' yst-hidden',
+			( $notification_count ) ? '' : ' wpseo-no-adminbar-notifications',
 			$notification_count,
 			$counter_screen_reader_text
 		);

package.json

@@ -76,7 +76,7 @@
     "webpack-bundle-analyzer": "^4.9.1"
   },
   "yoast": {
-    "pluginVersion": "23.8-RC5"
+    "pluginVersion": "23.8-RC6"
   },
   "version": "0.0.0"
 }

packages/js/src/shared-admin/helpers/notifications-count.js

@@ -34,7 +34,7 @@ export const updateNotificationsCount = ( total ) => {
 
 	const adminBarItems = document.querySelectorAll( "#wp-admin-bar-wpseo-menu .yoast-issue-counter" );
 	for ( const adminBar of adminBarItems ) {
-		adminBar.classList.toggle( "yst-hidden", total === 0 );
+		adminBar.classList.toggle( "wpseo-no-adminbar-notifications", total === 0 );
 		updateTextContentIfElementExists( adminBar, ".yoast-issues-count", String( total ) );
 		updateTextContentIfElementExists( adminBar, ".screen-reader-text", screenReaderText );
 	}

packages/js/tests/shared-admin/helpers/__snapshots__/notifications-count.test.js.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`updateNotificationsCount updates the total in the admin bar to 0 [yst-hidden class triggering hidden css] 1`] = `
+exports[`updateNotificationsCount updates the total in the admin bar to 0 [wpseo-no-adminbar-notifications class triggering hidden css] 1`] = `
 <div>
   <div
     class="no-js"
@@ -29,7 +29,7 @@ exports[`updateNotificationsCount updates the total in the admin bar to 0 [yst-h
             role="menuitem"
           >
             <div
-              class="wp-core-ui wp-ui-notification yoast-issue-counter yst-hidden"
+              class="wp-core-ui wp-ui-notification yoast-issue-counter wpseo-no-adminbar-notifications"
             >
               <span
                 aria-hidden="true"
@@ -63,7 +63,7 @@ exports[`updateNotificationsCount updates the total in the admin bar to 0 [yst-h
                 >
                   Notifications 
                   <div
-                    class="wp-core-ui wp-ui-notification yoast-issue-counter yst-hidden"
+                    class="wp-core-ui wp-ui-notification yoast-issue-counter wpseo-no-adminbar-notifications"
                   >
                     <span
                       aria-hidden="true"

packages/js/tests/shared-admin/helpers/notifications-count.test.js

@@ -47,7 +47,7 @@ const FakeAdminMenu = ( { total = 2 } ) => (
  * @returns {JSX.Element} The admin bar count.
  */
 const AdminBarCountHtml = ( { total } ) => (
-	<div className={ `wp-core-ui wp-ui-notification yoast-issue-counter${ total === 0 ? " yst-hidden" : "" }` }>
+	<div className={ `wp-core-ui wp-ui-notification yoast-issue-counter${ total === 0 ? " wpseo-no-adminbar-notifications" : "" }` }>
 		<span className="yoast-issues-count" aria-hidden="true">${ total }</span>
 		<span className="screen-reader-text">${ total } notifications</span>
 	</div>
@@ -113,7 +113,7 @@ describe( "updateNotificationsCount", () => {
 	test.each( [
 		[ 3, "screen-reader plural in English" ],
 		[ 1, "screen-reader singular in English" ],
-		[ 0, "yst-hidden class triggering hidden css" ],
+		[ 0, "wpseo-no-adminbar-notifications class triggering hidden css" ],
 	] )( "updates the total in the admin bar to %i [%s]", ( total ) => {
 		const { container } = render( <FakeAdminBar /> );
 		updateNotificationsCount( total );

wp-seo-main.php

@@ -15,7 +15,7 @@
  * {@internal Nobody should be able to overrule the real version number as this can cause
  *            serious issues with the options, so no if ( ! defined() ).}}
  */
-define( 'WPSEO_VERSION', '23.8-RC5' );
+define( 'WPSEO_VERSION', '23.8-RC6' );
 
 
 if ( ! defined( 'WPSEO_PATH' ) ) {

wp-seo.php

@@ -8,7 +8,7 @@
  *
  * @wordpress-plugin
  * Plugin Name: Yoast SEO
- * Version:     23.8-RC5
+ * Version:     23.8-RC6
  * Plugin URI:  https://yoa.st/1uj
  * Description: The first true all-in-one SEO solution for WordPress, including on-page content analysis, XML sitemaps and much more.
  * Author:      Team Yoast