rebase code on oct-10-2023

wp/wp-content/plugins/wordpress-seo/inc/options/class-wpseo-option-ms.php

@@ -106,7 +106,6 @@ class WPSEO_Option_MS extends WPSEO_Option {
 			"{$allow_prefix}remove_feed_global_comments"        => true,
 			"{$allow_prefix}remove_feed_post_comments"          => true,
 			"{$allow_prefix}enable_index_now"                   => true,
-			"{$allow_prefix}enable_ai_generator"                => true,
 			"{$allow_prefix}remove_feed_authors"                => true,
 			"{$allow_prefix}remove_feed_categories"             => true,
 			"{$allow_prefix}remove_feed_tags"                   => true,

wp/wp-content/plugins/wordpress-seo/inc/options/class-wpseo-option-titles.php

@@ -964,11 +964,11 @@ class WPSEO_Option_Titles extends WPSEO_Option {
 				'label'  => __( 'Dash', 'wordpress-seo' ),
 			],
 			'sc-ndash'  => [
-				'option' => '–',
+				'option' => '–',
 				'label'  => __( 'En dash', 'wordpress-seo' ),
 			],
 			'sc-mdash'  => [
-				'option' => '—',
+				'option' => '—',
 				'label'  => __( 'Em dash', 'wordpress-seo' ),
 			],
 			'sc-colon'  => [
@@ -976,11 +976,11 @@ class WPSEO_Option_Titles extends WPSEO_Option {
 				'label'  => __( 'Colon', 'wordpress-seo' ),
 			],
 			'sc-middot' => [
-				'option' => '·',
+				'option' => '·',
 				'label'  => __( 'Middle dot', 'wordpress-seo' ),
 			],
 			'sc-bull'   => [
-				'option' => '•',
+				'option' => '•',
 				'label'  => __( 'Bullet', 'wordpress-seo' ),
 			],
 			'sc-star'   => [
@@ -1000,19 +1000,19 @@ class WPSEO_Option_Titles extends WPSEO_Option {
 				'label'  => __( 'Small tilde', 'wordpress-seo' ),
 			],
 			'sc-laquo'  => [
-				'option' => '«',
+				'option' => '«',
 				'label'  => __( 'Left angle quotation mark', 'wordpress-seo' ),
 			],
 			'sc-raquo'  => [
-				'option' => '»',
+				'option' => '»',
 				'label'  => __( 'Right angle quotation mark', 'wordpress-seo' ),
 			],
 			'sc-lt'     => [
-				'option' => '>',
+				'option' => '<',
 				'label'  => __( 'Less than sign', 'wordpress-seo' ),
 			],
 			'sc-gt'     => [
-				'option' => '<',
+				'option' => '>',
 				'label'  => __( 'Greater than sign', 'wordpress-seo' ),
 			],
 		];

wp/wp-content/plugins/wordpress-seo/inc/options/class-wpseo-option-wpseo.php

@@ -58,7 +58,6 @@ class WPSEO_Option_Wpseo extends WPSEO_Option {
 		'enable_xml_sitemap'                       => true,
 		'enable_text_link_counter'                 => true,
 		'enable_index_now'                         => true,
-		'enable_ai_generator'                      => false,
 		'show_onboarding_notice'                   => false,
 		'first_activated_on'                       => false,
 		'myyoast-oauth'                            => [
@@ -560,7 +559,6 @@ class WPSEO_Option_Wpseo extends WPSEO_Option {
 			'remove_feed_global_comments'        => false,
 			'remove_feed_post_comments'          => false,
 			'enable_index_now'                   => false,
-			'enable_ai_generator'                => false,
 			'remove_feed_authors'                => false,
 			'remove_feed_categories'             => false,
 			'remove_feed_tags'                   => false,

wp/wp-content/plugins/wordpress-seo/inc/sitemaps/class-sitemaps.php

@@ -540,6 +540,26 @@ class WPSEO_Sitemaps {
 		return YoastSEO()->helpers->date->format( self::get_last_modified_gmt( $post_types ) );
 	}
 
+	// phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.Found -- Argument is kept for documentation purposes.
+
+	/**
+	 * Notify search engines of the updated sitemap.
+	 *
+	 * @deprecated 19.2
+	 *
+	 * @codeCoverageIgnore
+	 *
+	 * @param string|null $url Optional URL to make the ping for.
+	 */
+	public static function ping_search_engines( $url = null ) {
+		_deprecated_function( __METHOD__, 'Yoast SEO 19.2', 'WPSEO_Sitemaps_Admin::ping_search_engines' );
+
+		$admin = new WPSEO_Sitemaps_Admin();
+		$admin->ping_search_engines();
+	}
+
+	// phpcs:enable
+
 	/**
 	 * Get the maximum number of entries per XML sitemap.
 	 *

wp/wp-content/plugins/wordpress-seo/inc/wpseo-functions-deprecated.php

@@ -5,3 +5,17 @@
  * @package WPSEO\Deprecated
  */
 
+if ( ! function_exists( 'wpseo_cli_init' ) ) {
+
+	/**
+	 * Initialize the WP-CLI integration.
+	 *
+	 * @deprecated 19.6.1
+	 * @codeCoverageIgnore
+	 *
+	 * @phpcs:disable WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedFunctionFound
+	 */
+	function wpseo_cli_init() {
+		_deprecated_function( __FUNCTION__, 'Yoast SEO 19.6.1' );
+	}
+}