Merge branch 'feature/should-haves-for-inclusive-language' of github.com:Yoast/wordpress-seo into PC-965-yoast-markers-break-html-of-content

Author: iolse

README.md

@@ -65,6 +65,12 @@ Another JavaScript alternative is `grunt webpack:watch`, this command will keep
 
 This repository uses [the Yoast grunt tasks plugin](https://github.com/Yoast/plugin-grunt-tasks).
 
+## Testing packages
+
+To run tests for js packages, run the following command from `packages/js` folder:
+```bash
+yarn test
+```
 ## Support
 
 This is a developer's portal for Yoast SEO and should not be used for support. Please visit the

admin/ajax.php

@@ -317,20 +317,3 @@ function wpseo_register_ajax_integrations() {
 new WPSEO_Shortcode_Filter();
 
 new WPSEO_Taxonomy_Columns();
-
-/* ********************* DEPRECATED FUNCTIONS ********************* */
-
-/**
- * Hides the default tagline notice for a specific user.
- *
- * @deprecated 13.2
- * @codeCoverageIgnore
- */
-function wpseo_dismiss_tagline_notice() {
-	if ( ! current_user_can( 'manage_options' ) ) {
-		die( '-1' );
-	}
-
-	_deprecated_function( __FUNCTION__, 'WPSEO 13.2', 'This method is deprecated.' );
-	wpseo_ajax_json_echo_die( '' );
-}

admin/class-admin-init.php

@@ -320,68 +320,4 @@ public function add_publish_box_section( $post ) {
 			do_action( 'wpseo_publishbox_misc_actions', $post );
 		}
 	}
-
-	/* ********************* DEPRECATED METHODS ********************* */
-
-	/**
-	 * Notify about the default tagline if the user hasn't changed it.
-	 *
-	 * @deprecated 13.2
-	 * @codeCoverageIgnore
-	 */
-	public function tagline_notice() {
-		_deprecated_function( __METHOD__, 'WPSEO 13.2' );
-	}
-
-	/**
-	 * Returns whether or not the site has the default tagline.
-	 *
-	 * @deprecated 13.2
-	 * @codeCoverageIgnore
-	 *
-	 * @return bool
-	 */
-	public function has_default_tagline() {
-		_deprecated_function( __METHOD__, 'WPSEO 13.2' );
-
-		$blog_description         = get_bloginfo( 'description' );
-		$default_blog_description = 'Just another WordPress site';
-
-		// We are using the WordPress internal translation.
-		$translated_blog_description = __( 'Just another WordPress site', 'default' );
-
-		return $translated_blog_description === $blog_description || $default_blog_description === $blog_description;
-	}
-
-	/**
-	 * Shows an alert when the permalink doesn't contain %postname%.
-	 *
-	 * @deprecated 13.2
-	 * @codeCoverageIgnore
-	 */
-	public function permalink_notice() {
-		_deprecated_function( __METHOD__, 'WPSEO 13.2' );
-	}
-
-	/**
-	 * Add an alert if the blog is not publicly visible.
-	 *
-	 * @deprecated 14.1
-	 * @codeCoverageIgnore
-	 */
-	public function blog_public_notice() {
-		_deprecated_function( __METHOD__, 'WPSEO 14.1' );
-	}
-
-	/**
-	 * Handles the notifiers for the dashboard page.
-	 *
-	 * @deprecated 14.1
-	 * @codeCoverageIgnore
-	 *
-	 * @return void
-	 */
-	public function handle_notifications() {
-		_deprecated_function( __METHOD__, 'WPSEO 14.1' );
-	}
 }

admin/class-admin-user-profile.php

@@ -74,6 +74,7 @@ public function process_user_option_update( $user_id ) {
 		update_user_meta( $user_id, 'wpseo_noindex_author', $this->filter_input_post( 'wpseo_noindex_author' ) );
 		update_user_meta( $user_id, 'wpseo_content_analysis_disable', $this->filter_input_post( 'wpseo_content_analysis_disable' ) );
 		update_user_meta( $user_id, 'wpseo_keyword_analysis_disable', $this->filter_input_post( 'wpseo_keyword_analysis_disable' ) );
+		update_user_meta( $user_id, 'wpseo_inclusive_language_analysis_disable', $this->filter_input_post( 'wpseo_inclusive_language_analysis_disable' ) );
 	}
 
 	/**

admin/class-expose-shortlinks.php

@@ -28,7 +28,8 @@ class WPSEO_Expose_Shortlinks implements WPSEO_WordPress_Integration {
 		'shortlinks.nofollow_sponsored'                             => 'https://yoa.st/nofollow-sponsored',
 		'shortlinks.snippet_preview_info'                           => 'https://yoa.st/snippet-preview',
 		'shortlinks.cornerstone_content_info'                       => 'https://yoa.st/1i9',
-		'shortlinks.upsell.social_previews'                         => 'https://yoa.st/social-preview-cta',
+		'shortlinks.upsell.social_preview.facebook'                 => 'https://yoa.st/social-preview-facebook',
+		'shortlinks.upsell.social_preview.twitter'                  => 'https://yoa.st/social-preview-twitter',
 		'shortlinks.upsell.sidebar.news'                            => 'https://yoa.st/get-news-sidebar',
 		'shortlinks.upsell.sidebar.focus_keyword_synonyms_link'     => 'https://yoa.st/textlink-synonyms-popup-sidebar',
 		'shortlinks.upsell.sidebar.focus_keyword_synonyms_button'   => 'https://yoa.st/keyword-synonyms-popup-sidebar',
@@ -52,6 +53,7 @@ class WPSEO_Expose_Shortlinks implements WPSEO_WordPress_Integration {
 		'shortlinks.upsell.metabox.word_complexity'                 => 'https://yoa.st/word-complexity-metabox',
 		'shortlinks.upsell.gsc.create_redirect_button'              => 'https://yoa.st/redirects',
 		'shortlinks.readability_analysis_info'                      => 'https://yoa.st/readability-analysis',
+		'shortlinks.inclusive_language_analysis_info'               => 'https://yoa.st/inclusive-language-analysis',
 		'shortlinks.activate_premium_info'                          => 'https://yoa.st/activate-subscription',
 		'shortlinks.upsell.sidebar.morphology_upsell_metabox'       => 'https://yoa.st/morphology-upsell-metabox',
 		'shortlinks.upsell.sidebar.morphology_upsell_sidebar'       => 'https://yoa.st/morphology-upsell-sidebar',

admin/class-gutenberg-compatibility.php

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

admin/class-meta-columns.php

@@ -356,7 +356,7 @@ protected function get_keyword_filter( $keyword_filter ) {
 	 *
 	 * @param mixed $filter The filter to check against.
 	 *
-	 * @return bool Whether or not the filter is considered valid.
+	 * @return bool Whether the filter is considered valid.
 	 */
 	protected function is_valid_filter( $filter ) {
 		return ! empty( $filter ) && is_string( $filter );
@@ -453,37 +453,57 @@ protected function determine_score_filters( $score_filters ) {
 	/**
 	 * Retrieves the post type from the $_GET variable.
 	 *
-	 * @return string The current post type.
+	 * @return string|null The sanitized current post type or null when the variable is not set in $_GET.
 	 */
 	public function get_current_post_type() {
-		return filter_input( INPUT_GET, 'post_type' );
+		// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Reason: We are not processing form information.
+		if ( isset( $_GET['post_type'] ) && is_string( $_GET['post_type'] ) ) {
+			// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Reason: We are not processing form information.
+			return sanitize_text_field( wp_unslash( $_GET['post_type'] ) );
+		}
+		return null;
 	}
 
 	/**
 	 * Retrieves the SEO filter from the $_GET variable.
 	 *
-	 * @return string The current post type.
+	 * @return string|null The sanitized seo filter or null when the variable is not set in $_GET.
 	 */
 	public function get_current_seo_filter() {
-		return filter_input( INPUT_GET, 'seo_filter' );
+		// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Reason: We are not processing form information.
+		if ( isset( $_GET['seo_filter'] ) && is_string( $_GET['seo_filter'] ) ) {
+			// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Reason: We are not processing form information.
+			return sanitize_text_field( wp_unslash( $_GET['seo_filter'] ) );
+		}
+		return null;
 	}
 
 	/**
 	 * Retrieves the Readability filter from the $_GET variable.
 	 *
-	 * @return string The current post type.
+	 * @return string|null The sanitized readability filter or null when the variable is not set in $_GET.
 	 */
 	public function get_current_readability_filter() {
-		return filter_input( INPUT_GET, 'readability_filter' );
+		// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Reason: We are not processing form information.
+		if ( isset( $_GET['readability_filter'] ) && is_string( $_GET['readability_filter'] ) ) {
+			// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Reason: We are not processing form information.
+			return sanitize_text_field( wp_unslash( $_GET['readability_filter'] ) );
+		}
+		return null;
 	}
 
 	/**
 	 * Retrieves the keyword filter from the $_GET variable.
 	 *
-	 * @return string The current post type.
+	 * @return string|null The sanitized seo keyword filter or null when the variable is not set in $_GET.
 	 */
 	public function get_current_keyword_filter() {
-		return filter_input( INPUT_GET, 'seo_kw_filter' );
+		// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Reason: We are not processing form information.
+		if ( isset( $_GET['seo_kw_filter'] ) && is_string( $_GET['seo_kw_filter'] ) ) {
+			// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Reason: We are not processing form information.
+			return sanitize_text_field( wp_unslash( $_GET['seo_kw_filter'] ) );
+		}
+		return null;
 	}
 
 	/**
@@ -720,7 +740,7 @@ private function set_post_type_hooks() {
 	 * @return bool Whether or not the meta box (and associated columns etc) should be hidden.
 	 */
 	private function display_metabox( $post_type = null ) {
-		$current_post_type = sanitize_text_field( $this->get_current_post_type() );
+		$current_post_type = $this->get_current_post_type();
 
 		if ( ! isset( $post_type ) && ! empty( $current_post_type ) ) {
 			$post_type = $current_post_type;

admin/class-yoast-notifications.php

@@ -108,18 +108,6 @@ public function enqueue_assets() {
 		}
 	}
 
-	/**
-	 * Deprecated: Handle ajax request to dismiss a alert.
-	 * Renamed to ajax_dismiss_notification
-	 *
-	 * @deprecated 14.0
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public function ajax_dismiss_alert() {
-		_deprecated_function( __METHOD__, 'WPSEO 14.0' );
-	}
-
 	/**
 	 * Handle ajax request to dismiss a notification.
 	 */
@@ -136,19 +124,6 @@ public function ajax_dismiss_notification() {
 		wp_die();
 	}
 
-	/**
-	 * Deprecated: Handle ajax request to restore a notification.
-	 * Renamed to ajax_restore_notification
-	 *
-	 * @deprecated 14.0
-	 * @codeCoverageIgnore
-	 *
-	 * @return void
-	 */
-	public function ajax_restore_alert() {
-		_deprecated_function( __METHOD__, 'WPSEO 14.0' );
-	}
-
 	/**
 	 * Handle ajax request to restore a notification.
 	 */
@@ -277,20 +252,6 @@ public static function get_template_variables() {
 		];
 	}
 
-	/**
-	 * Deprecated: Get the number of active notifications.
-	 * Renamed to get_active_notification_count
-	 *
-	 * @deprecated 14.0
-	 * @codeCoverageIgnore
-	 *
-	 * @return int
-	 */
-	public function get_active_alert_count() {
-		_deprecated_function( __METHOD__, 'WPSEO 14.0' );
-		return 0;
-	}
-
 	/**
 	 * Get the number of active notifications.
 	 *
@@ -301,20 +262,6 @@ public static function get_active_notification_count() {
 		return ( count( self::$active_errors ) + count( self::$active_warnings ) );
 	}
 
-	/**
-	 * Deprecated: Filter out any non-errors. Renamed to filter_error_notifications
-	 *
-	 * @deprecated 14.0
-	 * @codeCoverageIgnore
-	 *
-	 * @param Yoast_Notification $notification Notification to test.
-	 * @return bool
-	 */
-	public function filter_error_alerts( Yoast_Notification $notification ) {
-		_deprecated_function( __METHOD__, 'WPSEO 14.0' );
-		return false;
-	}
-
 	/**
 	 * Filter out any non-errors.
 	 *
@@ -327,20 +274,6 @@ private static function filter_error_notifications( Yoast_Notification $notifica
 		return $notification->get_type() === 'error';
 	}
 
-	/**
-	 * Deprecated: Filter out any non-warnings. Renamed to filter_warning_notifications
-	 *
-	 * @deprecated 14.0
-	 * @codeCoverageIgnore
-	 *
-	 * @param Yoast_Notification $notification Notification to test.
-	 * @return bool
-	 */
-	public function filter_warning_alerts( Yoast_Notification $notification ) {
-		_deprecated_function( __METHOD__, 'WPSEO 14.0' );
-		return false;
-	}
-
 	/**
 	 * Filter out any non-warnings.
 	 *
@@ -353,20 +286,6 @@ private static function filter_warning_notifications( Yoast_Notification $notifi
 		return $notification->get_type() !== 'error';
 	}
 
-	/**
-	 * Deprecated: Filter out any dismissed notifications. Renamed to filter_dismissed_alerts.
-	 *
-	 * @deprecated 14.0
-	 * @codeCoverageIgnore
-	 *
-	 * @param Yoast_Notification $notification Notification to test.
-	 * @return bool
-	 */
-	public function filter_dismissed_alerts( Yoast_Notification $notification ) {
-		_deprecated_function( __METHOD__, 'WPSEO 14.0' );
-		return false;
-	}
-
 	/**
 	 * Filter out any dismissed notifications.
 	 *

admin/class-yoast-plugin-conflict.php

@@ -111,41 +111,6 @@ public function check_for_conflicts( $plugin_section ) {
 		return false;
 	}
 
-	/**
-	 * Getting all the conflicting plugins and return them as a string.
-	 *
-	 * This method will loop through all conflicting plugins to get the details of each plugin. The plugin name
-	 * will be taken from the details to parse a comma separated string, which can be use for by example a notice
-	 *
-	 * @deprecated 17.7 This method is unused and will be removed in the future
-	 * @codeCoverageIgnore
-	 *
-	 * @param string $plugin_section Plugin conflict type (such as Open Graph or sitemap).
-	 *
-	 * @return string
-	 */
-	public function get_conflicting_plugins_as_string( $plugin_section ) {
-		if ( ! \function_exists( 'get_plugin_data' ) ) {
-			require_once ABSPATH . 'wp-admin/includes/plugin.php';
-		}
-
-		// Getting the active plugins by given section.
-		$plugins = $this->active_conflicting_plugins[ $plugin_section ];
-
-		$plugin_names = [];
-		foreach ( $plugins as $plugin ) {
-			$name = $this->get_plugin_name( $plugin );
-			if ( ! empty( $name ) ) {
-				$plugin_names[] = '<em>' . $name . '</em>';
-			}
-		}
-		unset( $plugins, $plugin );
-
-		if ( ! empty( $plugin_names ) ) {
-			return \implode( ' &amp; ', $plugin_names );
-		}
-	}
-
 	/**
 	 * Checks for given $plugin_sections for conflicts.
 	 *