Merge branch 'release/28.5' into trunk

Author: vraja-pro

admin/class-gutenberg-compatibility.php

@@ -15,14 +15,14 @@ class WPSEO_Gutenberg_Compatibility {
 	 *
 	 * @var string
 	 */
-	public const CURRENT_RELEASE = '23.8.0';
+	public const CURRENT_RELEASE = '23.9.0';
 
 	/**
 	 * The minimally supported version of Gutenberg by the plugin.
 	 *
 	 * @var string
 	 */
-	public const MINIMUM_SUPPORTED = '23.8.0';
+	public const MINIMUM_SUPPORTED = '23.9.0';
 
 	/**
 	 * Holds the current version.

package.json

@@ -77,7 +77,7 @@
     "webpack-bundle-analyzer": "^4.9.1"
   },
   "yoast": {
-    "pluginVersion": "28.5-RC1"
+    "pluginVersion": "28.5-RC2"
   },
   "version": "0.0.0"
 }

packages/js/src/components/modals/editorModals/SocialAppearanceModal.js

@@ -46,7 +46,7 @@ const SocialAppearanceModal = ( props ) => {
 			id="yoast-social-appearance-modal"
 			shouldCloseOnClickOutside={ false }
 			SuffixHeroIcon={ <StyledHeroIcon className="yst-text-slate-500" { ...svgAriaProps } /> }
-			titleHelpLink={ <SocialPreviewsHelpLink /> }
+			titleHelpLink={ useOpenGraphData ? <SocialPreviewsHelpLink /> : null }
 		>
 			{ useOpenGraphData &&
 				<Fragment>

packages/js/tests/components/modals/editorModals/SocialAppearanceModal.test.js

@@ -0,0 +1,59 @@
+import { render, screen } from "../../../test-utils";
+import EditorModal from "../../../../src/components/modals/editorModals/EditorModal";
+import SocialAppearanceModal from "../../../../src/components/modals/editorModals/SocialAppearanceModal";
+import { noop } from "lodash";
+
+/**
+ * Mocked EditorModal container.
+ *
+ * Renders the modal open, without the WP data store the container normally reads from.
+ *
+ * @param {Object} props The props.
+ *
+ * @returns {JSX.Element} The element.
+ */
+const EditorModalMock = props => (
+	<EditorModal { ...props } postTypeName="post" isOpen={ true } open={ noop } close={ noop } />
+);
+
+jest.mock( "../../../../src/containers/EditorModal", () => EditorModalMock );
+
+// The editors are Redux containers; this suite is about the modal chrome around them.
+jest.mock( "../../../../src/containers/FacebookEditor", () => ( {
+	__esModule: true,
+	"default": () => "Facebook editor",
+} ) );
+jest.mock( "../../../../src/containers/TwitterEditor", () => ( {
+	__esModule: true,
+	"default": () => "X editor",
+} ) );
+
+describe( "SocialAppearanceModal", () => {
+	beforeEach( () => {
+		global.wpseoAdminL10n = {
+			"shortlinks.social_previews_info": "https://example.com/social-previews",
+		};
+	} );
+
+	it( "links the modal title to the social previews page when Open Graph is enabled", () => {
+		render( <SocialAppearanceModal useOpenGraphData={ true } useTwitterData={ true } /> );
+
+		const link = screen.getByRole( "link", { name: /Learn more about social previews/ } );
+
+		expect( link ).toHaveAttribute( "href", "https://example.com/social-previews" );
+	} );
+
+	it( "still offers the help link when X appearance is disabled", () => {
+		render( <SocialAppearanceModal useOpenGraphData={ true } useTwitterData={ false } /> );
+
+		expect( screen.getByRole( "link", { name: /Learn more about social previews/ } ) ).toBeInTheDocument();
+	} );
+
+	it( "does not offer the help link when Open Graph is disabled", () => {
+		// Only the X appearance editor remains, matching the metabox, which has no link in that case either.
+		render( <SocialAppearanceModal useOpenGraphData={ false } useTwitterData={ true } /> );
+
+		expect( screen.getByText( "X editor" ) ).toBeInTheDocument();
+		expect( screen.queryByRole( "link", { name: /Learn more about social previews/ } ) ).toBeNull();
+	} );
+} );

packages/js/tests/components/social/SocialMetadata.test.js

@@ -50,4 +50,11 @@ describe( "SocialMetadata", () => {
 
 		expect( screen.getByRole( "link", { name: /Learn more about social previews/ } ) ).toBeInTheDocument();
 	} );
+
+	it( "does not offer the help link when Open Graph is disabled", () => {
+		// Only the X appearance section remains, and that one never carries the link.
+		render( <SocialMetadata useOpenGraphData={ false } useTwitterData={ true } /> );
+
+		expect( screen.queryByRole( "link", { name: /Learn more about social previews/ } ) ).toBeNull();
+	} );
 } );

src/myyoast-client/infrastructure/oidc/issuer-config.php

@@ -49,7 +49,7 @@ class Issuer_Config {
 	 *
 	 * @var string
 	 */
-	private const SOFTWARE_STATEMENT = 'eyJhbGciOiJFZERTQSIsInR5cCI6IkpXVCIsImtpZCI6IjMwNTI3ZTlhLWZhMWYtNDhkZS05ZjIzLWUyZGE5MzY0NDE3NiJ9.eyJzb2Z0d2FyZV9pZCI6InlvYXN0L3dvcmRwcmVzcy1zZW8iLCJjbGllbnRfbmFtZSI6IllvYXN0IFNFTyIsImxvZ29fdXJpIjoiaHR0cHM6Ly95b2FzdC5jb20vYXBwL3VwbG9hZHMvMjAyNS8wOS9mcmVlX2ljb24uc3ZnIiwiY2xpZW50X3VyaSI6Imh0dHBzOi8veW9hc3QuY29tL3Byb2R1Y3QveW9hc3Qtc2VvLXdvcmRwcmVzcy8iLCJ0b3NfdXJpIjoiaHR0cHM6Ly95b2FzdC5jb20vdGVybXMtb2Ytc2VydmljZS8iLCJwb2xpY3lfdXJpIjoiaHR0cHM6Ly95b2FzdC5jb20vcHJpdmFjeS1wb2xpY3kvIiwiY29udGFjdHMiOlsic3VwcG9ydEB5b2FzdC5jb20iXSwic29mdHdhcmVfdmVyc2lvbiI6IjI4LjUtUkMxIiwiY2xlYW51cF93aGVuX2luYWN0aXZlIjp0cnVlLCJ0b2tlbl9lbmRwb2ludF9hdXRoX21ldGhvZCI6InByaXZhdGVfa2V5X2p3dCIsImlzcyI6Imh0dHBzOi8vbXkueW9hc3QuY29tIiwiYXVkIjoiaHR0cHM6Ly9teS55b2FzdC5jb20iLCJqdGkiOiI3NjJlYTQ0Yi0wZGY2LTRkZjQtOWFhNS1kY2EzMjYyNGZjNDMiLCJpYXQiOjE3ODgyNTIzMDZ9.HDTr1LU9Xj7KK71n-E10yqYzMdGl6Fxz7uz9g3SXXSOYWiiF9zDs7obDNb26S_jLc2ui6O6bF-_xW9Tcw9_gDA';
+	private const SOFTWARE_STATEMENT = 'eyJhbGciOiJFZERTQSIsInR5cCI6IkpXVCIsImtpZCI6IjMwNTI3ZTlhLWZhMWYtNDhkZS05ZjIzLWUyZGE5MzY0NDE3NiJ9.eyJzb2Z0d2FyZV9pZCI6InlvYXN0L3dvcmRwcmVzcy1zZW8iLCJjbGllbnRfbmFtZSI6IllvYXN0IFNFTyIsImxvZ29fdXJpIjoiaHR0cHM6Ly95b2FzdC5jb20vYXBwL3VwbG9hZHMvMjAyNS8wOS9mcmVlX2ljb24uc3ZnIiwiY2xpZW50X3VyaSI6Imh0dHBzOi8veW9hc3QuY29tL3Byb2R1Y3QveW9hc3Qtc2VvLXdvcmRwcmVzcy8iLCJ0b3NfdXJpIjoiaHR0cHM6Ly95b2FzdC5jb20vdGVybXMtb2Ytc2VydmljZS8iLCJwb2xpY3lfdXJpIjoiaHR0cHM6Ly95b2FzdC5jb20vcHJpdmFjeS1wb2xpY3kvIiwiY29udGFjdHMiOlsic3VwcG9ydEB5b2FzdC5jb20iXSwic29mdHdhcmVfdmVyc2lvbiI6IjI4LjUtUkMyIiwiY2xlYW51cF93aGVuX2luYWN0aXZlIjp0cnVlLCJ0b2tlbl9lbmRwb2ludF9hdXRoX21ldGhvZCI6InByaXZhdGVfa2V5X2p3dCIsImlzcyI6Imh0dHBzOi8vbXkueW9hc3QuY29tIiwiYXVkIjoiaHR0cHM6Ly9teS55b2FzdC5jb20iLCJqdGkiOiJmNzljNmI3ZC1jZDllLTQxNjMtOWYxMC1lNzIzNGUwODVmNzEiLCJpYXQiOjE3ODg0NDAxNTR9.P_XvSeW7sTfaNdoxWQDSew2xnTWBTu934Mp0SW4bXtkqgiVnP9ulgbS0KJyvdcbaDO5YRUW3FR_bOddKta3GAw';
 
 	/**
 	 * Initial access token for Dynamic Client Registration.

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', '28.5-RC1' );
+define( 'WPSEO_VERSION', '28.5-RC2' );
 
 
 if ( ! defined( 'WPSEO_PATH' ) ) {

wp-seo.php

@@ -8,7 +8,7 @@
  *
  * @wordpress-plugin
  * Plugin Name: Yoast SEO
- * Version:     28.5-RC1
+ * Version:     28.5-RC2
  * 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