Merge branch 'trunk' of github.com:Yoast/wordpress-seo into feature/should-haves-for-inclusive-language

Author: iolse

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-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-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.
 	 *

admin/formatter/class-metabox-formatter.php

@@ -321,44 +321,4 @@ private function multilingual_plugin_active() {
 
 		return ( $wpml_active || $polylang_active || $translatepress_active );
 	}
-
-	/* ********************* DEPRECATED METHODS ********************* */
-
-	/**
-	 * Returns the translations for the Add Keyword modal.
-	 *
-	 * These strings are not escaped because they're meant to be used with React
-	 * which already takes care of that. If used in PHP, they should be escaped.
-	 *
-	 * @deprecated 15.5
-	 * @codeCoverageIgnore
-	 *
-	 * @return array Translated text strings for the Add Keyword modal.
-	 */
-	public function get_add_keyword_upsell_translations() {
-		_deprecated_function( __METHOD__, 'WPSEO 15.5' );
-
-		return [
-			'title'                    => __( 'Would you like to add more than one keyphrase?', 'wordpress-seo' ),
-			'intro'                    => sprintf(
-			/* translators: %s expands to a 'Yoast SEO Premium' text linked to the yoast.com website. */
-				__( 'Great news: you can, with %s!', 'wordpress-seo' ),
-				'{{link}}Yoast SEO Premium{{/link}}'
-			),
-			'link'                     => WPSEO_Shortlinker::get( 'https://yoa.st/pe-premium-page' ),
-			'other'                    => sprintf(
-			/* translators: %s expands to 'Yoast SEO Premium'. */
-				__( 'Other benefits of %s for you:', 'wordpress-seo' ),
-				'Yoast SEO Premium'
-			),
-			'buylink'                  => WPSEO_Shortlinker::get( 'https://yoa.st/add-keywords-popup' ),
-			'buy'                      => sprintf(
-			/* translators: %s expands to 'Yoast SEO Premium'. */
-				__( 'Get %s', 'wordpress-seo' ),
-				'Yoast SEO Premium'
-			),
-			'small'                    => __( '1 year free support and updates included!', 'wordpress-seo' ),
-			'a11yNotice.opensInNewTab' => __( '(Opens in a new browser tab)', 'wordpress-seo' ),
-		];
-	}
 }

admin/views/licenses.php

@@ -92,7 +92,8 @@
 $extensions['yoast-seo-plugin-subscription'] = [
 	'buyUrl'        => WPSEO_Shortlinker::get( 'https://yoa.st/premium-page-bundle-buy' ),
 	'infoUrl'       => WPSEO_Shortlinker::get( 'https://yoa.st/premium-page-bundle-info' ),
-	'title'         => 'all Yoast plugins',
+	/* translators: used in phrases such as "More information about all the Yoast plugins" */
+	'title'         => __( 'all the Yoast plugins', 'wordpress-seo' ),
 	'display_title' => __( 'Cover all your SEO bases', 'wordpress-seo' ),
 	'desc'          => '',
 	'image'         => plugins_url( 'images/plugin_subscription.svg?v=' . WPSEO_VERSION, WPSEO_FILE ),
@@ -104,7 +105,8 @@
 		__( 'Drive more traffic to your online store', 'wordpress-seo' ),
 
 	],
-	'buy_button'    => 'all Yoast plugins',
+	/* translators: used in phrases such as "Buy all the Yoast plugins" */
+	'buy_button'    => __( 'all the Yoast plugins', 'wordpress-seo' ),
 ];
 
 $addon_manager                  = new WPSEO_Addon_Manager();
@@ -310,7 +312,7 @@
 							<a target="_blank" class="yoast-button-upsell" href="<?php echo esc_url( $extension['buyUrl'] ); ?>">
 								<?php
 								printf(
-									/* translators: %s expands to the product name, e.g. "News SEO" or "all Yoast Plugins" */
+									/* translators: %s expands to the product name, e.g. "News SEO" or "all the Yoast Plugins" */
 									esc_html__( 'Buy %s', 'wordpress-seo' ),
 									// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Reason: The possible `get_buy_button` values are hardcoded (buy_button or title); only passed through the WPSEO_Extensions class.
 									( isset( $extension['buy_button'] ) ) ? $extension['buy_button'] : $extension['title']
@@ -324,7 +326,7 @@
 							<a target="_blank" class="yoast-link--more-info" href="<?php echo esc_url( $extension['infoUrl'] ); ?>">
 								<?php
 								printf(
-									/* translators: Text between 1: and 2: will only be shown to screen readers. 3: expands to the product name, e.g. "News SEO" or "all Yoast Plugins" */
+									/* translators: Text between 1: and 2: will only be shown to screen readers. 3: expands to the product name, e.g. "News SEO" or "all the Yoast Plugins" */
 									esc_html__( 'More information %1$sabout %3$s%2$s', 'wordpress-seo' ),
 									'<span class="screen-reader-text">',
 									'</span>',

admin/views/tabs/metas/paper-content/post-type-content.php

@@ -121,18 +121,3 @@
 		'This action is going away with no replacement. If you want to add settings that interact with Yoast SEO, please create your own settings page.'
 	);
 }
-
-/**
- * Allow adding a custom checkboxes to the admin meta page - Post Types tab.
- *
- * @deprecated 16.3 Use the {@see 'Yoast\WP\SEO\admin_post_types_beforearchive'} action instead.
- *
- * @param Yoast_Form $yform The Yoast_Form object.
- * @param string     $name  The post type name.
- */
-do_action_deprecated(
-	'wpseo_admin_page_meta_post_types',
-	[ $yform, $wpseo_post_type->name ],
-	'16.3',
-	'Yoast\WP\SEO\admin_post_types_beforearchive'
-);

admin/views/tabs/metas/paper-content/taxonomy-content.php

@@ -83,18 +83,3 @@
 	'',
 	'This action is going away with no replacement. If you want to add settings that interact with Yoast SEO, please create your own settings page.'
 );
-
-/**
- * Allow adding custom checkboxes to the admin meta page - Taxonomies tab.
- *
- * @deprecated 16.3 Use {@see 'Yoast\WP\SEO\admin_taxonomies_meta'} instead.
- *
- * @param Yoast_Form  $yform          The Yoast_Form object.
- * @param WP_Taxonomy $wpseo_taxonomy The taxonomy.
- */
-do_action_deprecated(
-	'wpseo_admin_page_meta_taxonomies',
-	[ $yform, $wpseo_taxonomy ],
-	'16.3',
-	'Yoast\WP\SEO\admin_taxonomies_meta'
-);