Merge lp:~jlosito/wordpress/wp-plugin-yoast into lp:~canonical-sysadmins/wordpress/wp-plugin-yoast

[John Losito]

Upgraded to 12.4

closes #121349

[David Lawson (deej)]

+1

review: Approve

=== added file 'admin/admin-settings-changed-listener.php'
--- admin/admin-settings-changed-listener.php	1970-01-01 00:00:00 +0000
+++ admin/admin-settings-changed-listener.php	2019-11-08 16:06:28 +0000
@@ -0,0 +1,85 @@
+<?php
+/**
+ * WPSEO plugin file.
+ *
+ * @package WPSEO\Admin
+ */
+
+/**
+ * A WordPress integration that listens for whether the SEO changes have been saved successfully.
+ */
+class WPSEO_Admin_Settings_Changed_Listener implements WPSEO_WordPress_Integration {
+
+	/**
+	 * Have the Yoast SEO settings been saved.
+	 *
+	 * @var bool
+	 */
+	private static $settings_saved = false;
+
+	/**
+	 * Registers all hooks to WordPress.
+	 *
+	 * @return void
+	 */
+	public function register_hooks() {
+		add_action( 'admin_init', array( $this, 'intercept_save_update_notification' ) );
+	}
+
+	/**
+	 * Checks and overwrites the wp_settings_errors global to determine whether the Yoast SEO settings have been saved.
+	 */
+	public function intercept_save_update_notification() {
+		global $pagenow;
+
+		if ( $pagenow !== 'admin.php' || ! WPSEO_Utils::is_yoast_seo_page() ) {
+			return;
+		}
+
+		// Variable name is the same as the global that is set by get_settings_errors.
+		$wp_settings_errors = get_settings_errors();
+
+		foreach ( $wp_settings_errors as $key => $wp_settings_error ) {
+			if ( ! $this->is_settings_updated_notification( $wp_settings_error ) ) {
+				continue;
+			}
+
+			self::$settings_saved = true;
+			unset( $wp_settings_errors[ $key ] );
+			// Overwrite the global with the list excluding the Changed saved message.
+			$GLOBALS['wp_settings_errors'] = $wp_settings_errors;
+			break;
+		}
+	}
+
+	/**
+	 * Checks whether the settings notification is a settings_updated notification.
+	 *
+	 * @param array $wp_settings_error The settings object.
+	 *
+	 * @return bool Whether this is a settings updated settings notification.
+	 */
+	public function is_settings_updated_notification( $wp_settings_error ) {
+		return ! empty( $wp_settings_error['code'] ) && $wp_settings_error['code'] === 'settings_updated';
+	}
+
+	/**
+	 * Get whether the settings have successfully been saved
+	 *
+	 * @return bool Whether the settings have successfully been saved.
+	 */
+	public function have_settings_been_saved() {
+		return self::$settings_saved;
+	}
+
+	/**
+	 * Renders a success message if the Yoast SEO settings have been saved.
+	 */
+	public function show_success_message() {
+		if ( $this->have_settings_been_saved() ) {
+			echo '<p class="wpseo-message"><span class="dashicons dashicons-yes"></span>',
+				esc_html__( 'Settings saved.', 'wordpress-seo' ),
+				'</p>';
+		}
+	}
+}

=== modified file 'admin/ajax.php'
--- admin/ajax.php	2018-07-04 09:50:13 +0000
+++ admin/ajax.php	2019-11-08 16:06:28 +0000
@@ -12,16 +12,13 @@
 }
 
 /**
- * @todo this whole thing should probably be a proper class.
- */
-
-/**
- * Convenience function to JSON encode and echo results and then die
+ * Convenience function to JSON encode and echo results and then die.
  *
  * @param array $results Results array for encoding.
  */
 function wpseo_ajax_json_echo_die( $results ) {
-	echo wp_json_encode( $results );
+	// phpcs:ignore WordPress.Security.EscapeOutput -- Reason: WPSEO_Utils::format_json_encode is safe.
+	echo WPSEO_Utils::format_json_encode( $results );
 	die();
 }
 
@@ -87,25 +84,6 @@
 add_action( 'wp_ajax_wpseo_dismiss_tagline_notice', 'wpseo_dismiss_tagline_notice' );
 
 /**
- * Used in the editor to replace vars for the snippet preview
- */
-function wpseo_ajax_replace_vars() {
-	global $post;
-	check_ajax_referer( 'wpseo-replace-vars' );
-
-	$post = get_post( intval( filter_input( INPUT_POST, 'post_id' ) ) );
-	global $wp_query;
-	$wp_query->queried_object    = $post;
-	$wp_query->queried_object_id = $post->ID;
-
-	$omit = array( 'excerpt', 'excerpt_only', 'title' );
-	echo wpseo_replace_vars( stripslashes( filter_input( INPUT_POST, 'string' ) ), $post, $omit );
-	die;
-}
-
-add_action( 'wp_ajax_wpseo_replace_vars', 'wpseo_ajax_replace_vars' );
-
-/**
  * Save an individual SEO title from the Bulk Editor.
  */
 function wpseo_save_title() {
@@ -124,7 +102,7 @@
 add_action( 'wp_ajax_wpseo_save_metadesc', 'wpseo_save_description' );
 
 /**
- * Save titles & descriptions
+ * Save titles & descriptions.
  *
  * @param string $what Type of item to save (title, description).
  */
@@ -246,30 +224,31 @@
 add_action( 'wp_ajax_wpseo_save_all_descriptions', 'wpseo_save_all_descriptions' );
 
 /**
- * Utility function to save values
+ * Utility function to save values.
  *
  * @param string $what Type of item so save.
  */
 function wpseo_save_all( $what ) {
 	check_ajax_referer( 'wpseo-bulk-editor' );
 
-	// @todo the WPSEO Utils class can't filter arrays in POST yet.
-	$new_values      = $_POST['items'];
-	$original_values = $_POST['existing_items'];
-
 	$results = array();
-
-	if ( is_array( $new_values ) && $new_values !== array() ) {
-		foreach ( $new_values as $post_id => $new_value ) {
-			$original_value = $original_values[ $post_id ];
-			$results[]      = wpseo_upsert_new( $what, $post_id, $new_value, $original_value );
-		}
-	}
+	if ( ! isset( $_POST['items'], $_POST['existingItems'] ) ) {
+		wpseo_ajax_json_echo_die( $results );
+	}
+
+	$new_values      = array_map( array( 'WPSEO_Utils', 'sanitize_text_field' ), wp_unslash( (array) $_POST['items'] ) );
+	$original_values = array_map( array( 'WPSEO_Utils', 'sanitize_text_field' ), wp_unslash( (array) $_POST['existingItems'] ) );
+
+	foreach ( $new_values as $post_id => $new_value ) {
+		$original_value = $original_values[ $post_id ];
+		$results[]      = wpseo_upsert_new( $what, $post_id, $new_value, $original_value );
+	}
+
 	wpseo_ajax_json_echo_die( $results );
 }
 
 /**
- * Insert a new value
+ * Insert a new value.
  *
  * @param string $what     Item type (such as title).
  * @param int    $post_id  Post ID.
@@ -296,7 +275,8 @@
 	}
 
 	wp_die(
-		wp_json_encode( WPSEO_Meta::keyword_usage( $keyword, $post_id ) )
+		// phpcs:ignore WordPress.Security.EscapeOutput -- Reason: WPSEO_Utils::format_json_encode is safe.
+		WPSEO_Utils::format_json_encode( WPSEO_Meta::keyword_usage( $keyword, $post_id ) )
 	);
 }
 
@@ -326,12 +306,28 @@
 	$usage = $usage[ $keyword ];
 
 	wp_die(
-		wp_json_encode( $usage )
+		// phpcs:ignore WordPress.Security.EscapeOutput -- Reason: WPSEO_Utils::format_json_encode is safe.
+		WPSEO_Utils::format_json_encode( $usage )
 	);
 }
 
 add_action( 'wp_ajax_get_term_keyword_usage', 'ajax_get_term_keyword_usage' );
 
+/**
+ * Registers hooks for all AJAX integrations.
+ *
+ * @return void
+ */
+function wpseo_register_ajax_integrations() {
+	$integrations = array( new Yoast_Network_Admin() );
+
+	foreach ( $integrations as $integration ) {
+		$integration->register_ajax_hooks();
+	}
+}
+
+wpseo_register_ajax_integrations();
+
 // Crawl Issue Manager AJAX hooks.
 new WPSEO_GSC_Ajax();
 
@@ -347,11 +343,10 @@
 // Setting the notice for the recalculate the posts.
 new Yoast_Dismissable_Notice_Ajax( 'recalculate', Yoast_Dismissable_Notice_Ajax::FOR_SITE );
 
-/********************** DEPRECATED METHODS **********************/
-
+/* ********************* DEPRECATED FUNCTIONS ********************* */
 
 /**
- * Removes stopword from the sample permalink that is generated in an AJAX request
+ * Removes stopword from the sample permalink that is generated in an AJAX request.
  *
  * @deprecated 6.3
  * @codeCoverageIgnore
@@ -387,3 +382,25 @@
 	_deprecated_function( __FUNCTION__, 'WPSEO 7.0', 'This method is deprecated.' );
 	wpseo_ajax_json_echo_die( '' );
 }
+
+/**
+ * Used in the editor to replace vars for the snippet preview.
+ *
+ * @deprecated 11.9
+ * @codeCoverageIgnore
+ */
+function wpseo_ajax_replace_vars() {
+	_deprecated_function( __METHOD__, 'WPSEO 11.9' );
+
+	global $post;
+	check_ajax_referer( 'wpseo-replace-vars' );
+
+	$post = get_post( intval( filter_input( INPUT_POST, 'post_id' ) ) );
+	global $wp_query;
+	$wp_query->queried_object    = $post;
+	$wp_query->queried_object_id = $post->ID;
+
+	$omit = array( 'excerpt', 'excerpt_only', 'title' );
+	echo wpseo_replace_vars( stripslashes( filter_input( INPUT_POST, 'string' ) ), $post, $omit );
+	die;
+}

=== modified file 'admin/ajax/class-recalculate-scores-ajax.php'
--- admin/ajax/class-recalculate-scores-ajax.php	2018-07-04 09:50:13 +0000
+++ admin/ajax/class-recalculate-scores-ajax.php	2019-11-08 16:06:28 +0000
@@ -6,14 +6,14 @@
  */
 
 /**
- * Class WPSEO_Recalculate_Scores
+ * Class WPSEO_Recalculate_Scores.
  *
- * This class handles the SEO score recalculation for all posts with a filled focus keyword
+ * This class handles the SEO score recalculation for all posts with a filled focus keyword.
  */
 class WPSEO_Recalculate_Scores_Ajax {
 
 	/**
-	 * Initialize the AJAX hooks
+	 * Initialize the AJAX hooks.
 	 */
 	public function __construct() {
 		add_action( 'wp_ajax_wpseo_recalculate_scores', array( $this, 'recalculate_scores' ) );
@@ -28,7 +28,8 @@
 		check_ajax_referer( 'wpseo_recalculate', 'nonce' );
 
 		wp_die(
-			wp_json_encode(
+			// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Reason: WPSEO_Utils::format_json_encode is considered safe.
+			WPSEO_Utils::format_json_encode(
 				array(
 					'posts' => $this->calculate_posts(),
 					'terms' => $this->calculate_terms(),
@@ -38,7 +39,7 @@
 	}
 
 	/**
-	 * Start recalculation
+	 * Start recalculation.
 	 */
 	public function recalculate_scores() {
 		check_ajax_referer( 'wpseo_recalculate', 'nonce' );
@@ -49,7 +50,8 @@
 			$response = $fetch_object->get_items_to_recalculate( $paged );
 
 			if ( ! empty( $response ) ) {
-				wp_die( wp_json_encode( $response ) );
+				// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Reason: WPSEO_Utils::format_json_encode is considered safe.
+				wp_die( WPSEO_Utils::format_json_encode( $response ) );
 			}
 		}
 
@@ -57,7 +59,7 @@
 	}
 
 	/**
-	 * Saves the new linkdex score for given post
+	 * Saves the new linkdex score for given post.
 	 */
 	public function save_score() {
 		check_ajax_referer( 'wpseo_recalculate', 'nonce' );
@@ -88,7 +90,7 @@
 	}
 
 	/**
-	 * Gets the total number of posts
+	 * Gets the total number of posts.
 	 *
 	 * @return int
 	 */
@@ -106,7 +108,7 @@
 	}
 
 	/**
-	 * Get the total number of terms
+	 * Get the total number of terms.
 	 *
 	 * @return int
 	 */

=== modified file 'admin/ajax/class-shortcode-filter.php'
--- admin/ajax/class-shortcode-filter.php	2018-07-04 09:50:13 +0000
+++ admin/ajax/class-shortcode-filter.php	2019-11-08 16:06:28 +0000
@@ -6,21 +6,21 @@
  */
 
 /**
- * Class WPSEO_Shortcode_Filter
+ * Class WPSEO_Shortcode_Filter.
  *
- * Used for parsing WP shortcodes with AJAX
+ * Used for parsing WP shortcodes with AJAX.
  */
 class WPSEO_Shortcode_Filter {
 
 	/**
-	 * Initialize the AJAX hooks
+	 * Initialize the AJAX hooks.
 	 */
 	public function __construct() {
 		add_action( 'wp_ajax_wpseo_filter_shortcodes', array( $this, 'do_filter' ) );
 	}
 
 	/**
-	 * Parse the shortcodes
+	 * Parse the shortcodes.
 	 */
 	public function do_filter() {
 		check_ajax_referer( 'wpseo-filter-shortcodes', 'nonce' );
@@ -36,6 +36,7 @@
 			);
 		}
 
-		wp_die( wp_json_encode( $parsed_shortcodes ) );
+		// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Reason: WPSEO_Utils::format_json_encode is considered safe.
+		wp_die( WPSEO_Utils::format_json_encode( $parsed_shortcodes ) );
 	}
 }

=== modified file 'admin/ajax/class-yoast-dismissable-notice.php'
--- admin/ajax/class-yoast-dismissable-notice.php	2018-07-04 09:50:13 +0000
+++ admin/ajax/class-yoast-dismissable-notice.php	2019-11-08 16:06:28 +0000
@@ -6,39 +6,48 @@
  */
 
 /**
- * This class will catch the request to dismiss the target notice (set by notice_name) and will store the dismiss status as an user meta
- * in the database
+ * This class will catch the request to dismiss the target notice (set by notice_name)
+ * and will store the dismiss status as an user meta in the database.
  */
 class Yoast_Dismissable_Notice_Ajax {
 
 	/**
-	 * @var string Notice type toggle value for user notices.
+	 * Notice type toggle value for user notices.
+	 *
+	 * @var string
 	 */
 	const FOR_USER = 'user_meta';
 
 	/**
-	 * @var string Notice type toggle value for network notices.
+	 * Notice type toggle value for network notices.
+	 *
+	 * @var string
 	 */
 	const FOR_NETWORK = 'site_option';
 
 	/**
-	 * @var string Notice type toggle value for site notices.
+	 * Notice type toggle value for site notices.
+	 *
+	 * @var string
 	 */
 	const FOR_SITE = 'option';
 
-
 	/**
-	 * @var string Name of the notice that will be dismissed.
+	 * Name of the notice that will be dismissed.
+	 *
+	 * @var string
 	 */
 	private $notice_name;
 
 	/**
+	 * The type of the current notice.
+	 *
 	 * @var string
 	 */
 	private $notice_type;
 
 	/**
-	 * Initialize the hooks for the AJAX request
+	 * Initialize the hooks for the AJAX request.
 	 *
 	 * @param string $notice_name The name for the hook to catch the notice.
 	 * @param string $notice_type The notice type.
@@ -51,7 +60,7 @@
 	}
 
 	/**
-	 * Handles the dismiss notice request
+	 * Handles the dismiss notice request.
 	 */
 	public function dismiss_notice() {
 		check_ajax_referer( 'wpseo-dismiss-' . $this->notice_name );

=== modified file 'admin/ajax/class-yoast-onpage-ajax.php'
--- admin/ajax/class-yoast-onpage-ajax.php	2018-07-04 09:50:13 +0000
+++ admin/ajax/class-yoast-onpage-ajax.php	2019-11-08 16:06:28 +0000
@@ -6,7 +6,7 @@
  */
 
 /**
- * Class Yoast_OnPage_Ajax
+ * Class Yoast_OnPage_Ajax.
  *
  * This class will catch the request to dismiss the Ryte notice and will store
  * the dismiss status as an user meta in the database.
@@ -14,14 +14,14 @@
 class Yoast_OnPage_Ajax {
 
 	/**
-	 * Initialize the hooks for the AJAX request
+	 * Initialize the hooks for the AJAX request.
 	 */
 	public function __construct() {
 		add_action( 'wp_ajax_wpseo_dismiss_onpageorg', array( $this, 'dismiss_notice' ) );
 	}
 
 	/**
-	 * Handles the dismiss notice request
+	 * Handles the dismiss notice request.
 	 */
 	public function dismiss_notice() {
 		check_ajax_referer( 'wpseo-dismiss-onpageorg' );
@@ -32,7 +32,7 @@
 	}
 
 	/**
-	 * Storing the dismissed value as an user option in the database
+	 * Storing the dismissed value as an user option in the database.
 	 */
 	private function save_dismissed() {
 		update_user_meta( get_current_user_id(), WPSEO_OnPage::USER_META_KEY, 1 );

=== modified file 'admin/ajax/class-yoast-plugin-conflict-ajax.php'
--- admin/ajax/class-yoast-plugin-conflict-ajax.php	2018-07-04 09:50:13 +0000
+++ admin/ajax/class-yoast-plugin-conflict-ajax.php	2019-11-08 16:06:28 +0000
@@ -6,29 +6,33 @@
  */
 
 /**
- * Class Yoast_Plugin_Conflict_Ajax
+ * Class Yoast_Plugin_Conflict_Ajax.
  */
 class Yoast_Plugin_Conflict_Ajax {
 
 	/**
+	 * Option identifier where dismissed conflicts are stored.
+	 *
 	 * @var string
 	 */
 	private $option_name = 'wpseo_dismissed_conflicts';
 
 	/**
+	 * List of notification identifiers that have been dismissed.
+	 *
 	 * @var array
 	 */
 	private $dismissed_conflicts = array();
 
 	/**
-	 * Initialize the hooks for the AJAX request
+	 * Initialize the hooks for the AJAX request.
 	 */
 	public function __construct() {
 		add_action( 'wp_ajax_wpseo_dismiss_plugin_conflict', array( $this, 'dismiss_notice' ) );
 	}
 
 	/**
-	 * Handles the dismiss notice request
+	 * Handles the dismiss notice request.
 	 */
 	public function dismiss_notice() {
 		check_ajax_referer( 'dismiss-plugin-conflict' );
@@ -45,7 +49,7 @@
 	}
 
 	/**
-	 * Getting the user option from the database
+	 * Getting the user option from the database.
 	 *
 	 * @return bool|array
 	 */
@@ -71,7 +75,7 @@
 	}
 
 	/**
-	 * Storing the conflicting plugins as an user option in the database
+	 * Storing the conflicting plugins as an user option in the database.
 	 *
 	 * @param string $plugin_section Plugin conflict type (such as Open Graph or sitemap).
 	 */
@@ -84,7 +88,7 @@
 	}
 
 	/**
-	 * Loop through the plugins to compare them with the already stored dismissed plugin conflicts
+	 * Loop through the plugins to compare them with the already stored dismissed plugin conflicts.
 	 *
 	 * @param array $posted_plugins Plugin set to check.
 	 */
@@ -95,7 +99,7 @@
 	}
 
 	/**
-	 * Check if plugin is already dismissed, if not store it in the array that will be saved later
+	 * Check if plugin is already dismissed, if not store it in the array that will be saved later.
 	 *
 	 * @param string $posted_plugin Plugin to check against dismissed conflicts.
 	 */

=== removed directory 'admin/banner'
=== removed file 'admin/banner/class-admin-banner-renderer.php'
--- admin/banner/class-admin-banner-renderer.php	2018-07-04 09:50:13 +0000
+++ admin/banner/class-admin-banner-renderer.php	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-<?php
-/**
- * WPSEO plugin file.
- *
- * @package WPSEO\Admin\Banner
- */
-
-/**
- * Represents the render object for generating the html for the given banner.
- */
-class WPSEO_Admin_Banner_Renderer {
-
-	/** @var string */
-	protected $base_path = '';
-
-	/**
-	 * Renders the admin banner.
-	 *
-	 * @param WPSEO_Admin_Banner $banner The banner to render.
-	 *
-	 * @return string
-	 */
-	public function render( WPSEO_Admin_Banner $banner ) {
-		$output  = '<a class="wpseo-banner__link" target="_blank" href="' . esc_url( $banner->get_url() ) . '">';
-		$output .= '<img class="wpseo-banner__image" width="' . esc_attr( $banner->get_width() ) . '" height="' . esc_attr( $banner->get_height() ) . '" src="' . esc_attr( $this->get_image_path( $banner->get_image() ) ) . '" alt="' . esc_attr( $banner->get_alt() ) . '"/>';
-		$output .= '</a>';
-
-		return $output;
-	}
-
-	/**
-	 * Sets the base path, where the images are located.
-	 *
-	 * @param string $base_path The image location.
-	 */
-	public function set_base_path( $base_path ) {
-		$this->base_path = $base_path;
-	}
-
-	/**
-	 * Returns the full path for the image.
-	 *
-	 * @param string $image The image path.
-	 *
-	 * @return string
-	 */
-	protected function get_image_path( $image ) {
-		return rtrim( $this->base_path, '/' ) . '/' . ltrim( $image, '/' );
-	}
-}

=== removed file 'admin/banner/class-admin-banner-sidebar-renderer.php'
--- admin/banner/class-admin-banner-sidebar-renderer.php	2018-07-04 09:50:13 +0000
+++ admin/banner/class-admin-banner-sidebar-renderer.php	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-<?php
-/**
- * WPSEO plugin file.
- *
- * @package WPSEO\Admin\Banner
- */
-
-/**
- * Represents the render object for generating the html for the banner sidebar
- */
-class WPSEO_Admin_Banner_Sidebar_Renderer {
-
-	/** @var  WPSEO_Admin_Banner_Spot_Renderer */
-	protected $spot_renderer;
-
-	/**
-	 * Sets the spot renderer.
-	 *
-	 * @param WPSEO_Admin_Banner_Spot_Renderer $spot_renderer The spot renderer that has to be used.
-	 */
-	public function __construct( WPSEO_Admin_Banner_Spot_Renderer $spot_renderer ) {
-		$this->spot_renderer = $spot_renderer;
-	}
-
-	/**
-	 * Renders the admin banner sidebar.
-	 *
-	 * @param WPSEO_Admin_Banner_Sidebar $banner_sidebar The sidebar to render.
-	 *
-	 * @return string
-	 */
-	public function render( WPSEO_Admin_Banner_Sidebar $banner_sidebar ) {
-		return sprintf( '
-			<div class="wpseo_content_cell" id="sidebar-container">
-				<div id="sidebar">
-					<div class="wpseo_content_cell_title yoast-sidebar__title ">
-						%1$s
-					</div>
-					%2$s
-				</div>
-			</div>',
-			$banner_sidebar->get_title(),
-			$this->render_banner_spots( $banner_sidebar->get_banner_spots() )
-		);
-	}
-
-	/**
-	 * Renders the admin banner spots.
-	 *
-	 * @param WPSEO_Admin_Banner_Spot[] $banner_spots The banner spots to render.
-	 *
-	 * @return string
-	 */
-	protected function render_banner_spots( array $banner_spots ) {
-		$return = '';
-		foreach ( $banner_spots as $banner_spot ) {
-			$return .= $this->spot_renderer->render( $banner_spot );
-		}
-
-		return $return;
-	}
-}

=== removed file 'admin/banner/class-admin-banner-sidebar.php'
--- admin/banner/class-admin-banner-sidebar.php	2018-07-04 09:50:13 +0000
+++ admin/banner/class-admin-banner-sidebar.php	1970-01-01 00:00:00 +0000
@@ -1,358 +0,0 @@
-<?php
-/**
- * WPSEO plugin file.
- *
- * @package WPSEO\Admin\Banner
- */
-
-/**
- * Represents the render object for generating the html for the given banner.
- */
-class WPSEO_Admin_Banner_Sidebar {
-
-	/** @var string */
-	protected $title = '';
-
-	/** @var WPSEO_Admin_Banner_Spot[] */
-	protected $banner_spots = array();
-
-	/** @var  WPSEO_Admin_Banner_Renderer */
-	protected $banner_renderer;
-
-	/**
-	 * WPSEO_Admin_Banner_Sidebar constructor.
-	 *
-	 * @param string                      $title           The title for the sidebar.
-	 * @param WPSEO_Admin_Banner_Renderer $banner_renderer The render class for banners.
-	 */
-	public function __construct( $title, WPSEO_Admin_Banner_Renderer $banner_renderer ) {
-		$this->title           = $title;
-		$this->banner_renderer = $banner_renderer;
-	}
-
-	/**
-	 * Returns the set title.
-	 *
-	 * @return string
-	 */
-	public function get_title() {
-		return $this->title;
-	}
-
-	/**
-	 * Initializes the banner sidebar by setting its banner spots.
-	 *
-	 * @param WPSEO_Features $features Class regarding WPSEO Features.
-	 */
-	public function initialize( WPSEO_Features $features ) {
-		if ( $features->is_free() ) {
-			$this->add_banner_spot( $this->get_premium_spot() );
-		}
-
-		$this->add_banner_spot( $this->get_services_spot() );
-
-		$extensions_spot = $this->get_extensions_spot( $this->get_active_extensions() );
-		if ( $extensions_spot->has_banners() ) {
-			$this->add_banner_spot( $extensions_spot );
-		}
-
-		$this->add_banner_spot( $this->get_courses_spot() );
-		$this->add_banner_spot( $this->get_remove_banner_spot() );
-	}
-
-	/**
-	 * Returns array with bannerspots.
-	 *
-	 * @return WPSEO_Admin_Banner_Spot[]
-	 */
-	public function get_banner_spots() {
-		return $this->banner_spots;
-	}
-
-	/**
-	 * Adds a banner spot.
-	 *
-	 * @param WPSEO_Admin_Banner_Spot $spot The spot to add.
-	 */
-	protected function add_banner_spot( WPSEO_Admin_Banner_Spot $spot ) {
-		$this->banner_spots[] = $spot;
-	}
-
-	/**
-	 * Returns the premium banner spot.
-	 *
-	 * @return WPSEO_Admin_Banner_Spot
-	 */
-	protected function get_premium_spot() {
-		$premium_spot = new WPSEO_Admin_Banner_Spot( '', $this->banner_renderer );
-
-		$premium_uri = WPSEO_Shortlinker::get( 'https://yoa.st/jj' );
-
-		$premium_spot->set_extra(
-			/* translators: %1$s expands to the plugin name */
-			'<h2>' . sprintf( esc_html__( 'Upgrade to %1$s', 'wordpress-seo' ), 'Yoast SEO Premium' ) . '</h2>' .
-			'<ul>' .
-			'<li><strong>' . esc_html__( 'Rank for up to 5 focus keywords per page', 'wordpress-seo' ) . '</strong></li>' .
-			'<li><strong>' . esc_html__( 'Preview your page in Facebook and Twitter', 'wordpress-seo' ) . '</strong></li>' .
-			'<li><strong>' . esc_html__( 'Get real-time suggestions for internal links', 'wordpress-seo' ) . '</strong></li>' .
-			'<li><strong>' . esc_html__( 'No more dead links a.k.a. 404 pages', 'wordpress-seo' ) . '</strong></li>' .
-			'<li><strong>' . esc_html__( '24/7 email support', 'wordpress-seo' ) . '</strong></li>' .
-			'<li><strong>' . esc_html__( 'No ads', 'wordpress-seo' ) . '</strong></li>' .
-			'</ul>' .
-			/* translators: %s expands to Yoast SEO Premium */
-			'<a id="wpseo-premium-button" class="button button-primary" href="' . $premium_uri . '" target="_blank">' . sprintf( __( 'Get %s now', 'wordpress-seo' ), 'Yoast SEO Premium' ) . '</a><br/>'
-		);
-
-		return $premium_spot;
-	}
-
-	/**
-	 * Returns the services banner spot.
-	 *
-	 * @return WPSEO_Admin_Banner_Spot
-	 */
-	protected function get_services_spot() {
-		$service_spot = new WPSEO_Admin_Banner_Spot( __( 'Services', 'wordpress-seo' ), $this->banner_renderer );
-
-		$service_spot->set_description(
-			sprintf(
-				/* translators: %1$s expands to a link start tag to the Yoast Services page, %2$s to Yoast, %3$s is the link closing tag. */
-				__( 'Do you want to know how to improve your rankings? %1$sLet team %2$s help you!%3$s', 'wordpress-seo' ),
-				'<a target="_blank" href="' . WPSEO_Shortlinker::get( 'https://yoa.st/jk' ) . '">',
-				'Yoast',
-				'</a>'
-			)
-		);
-
-		$service_spot->add_banner(
-			new WPSEO_Admin_Banner(
-				WPSEO_Shortlinker::get( 'https://yoa.st/jm' ),
-				'configuration-service.png',
-				261,
-				152,
-				sprintf(
-				/* translators: %1$s expands to Yoast SEO Premium. */
-					__( 'Let our experts set up your %1$s plugin!', 'wordpress-seo' ),
-					'Yoast SEO Premium'
-				)
-			)
-		);
-
-		return $service_spot;
-	}
-
-	/**
-	 * Returns an array with the Yoast SEO extensions with the value true when they are active.
-	 *
-	 * @return array
-	 */
-	protected function get_active_extensions() {
-		return array(
-			'video'       => class_exists( 'wpseo_Video_Sitemap' ),
-			'woocommerce' => class_exists( 'Woocommerce' ) && class_exists( 'Yoast_WooCommerce_SEO' ),
-			'news'        => class_exists( 'WPSEO_News' ),
-			'local'       => defined( 'WPSEO_LOCAL_VERSION' ),
-		);
-	}
-
-	/**
-	 * Returns the extensions banner spot.
-	 *
-	 * @param array $active_extensions The active extensions.
-	 *
-	 * @return WPSEO_Admin_Banner_Spot
-	 */
-	protected function get_extensions_spot( array $active_extensions ) {
-		$extension_spot = new WPSEO_Admin_Banner_Spot( __( 'Extensions', 'wordpress-seo' ), $this->banner_renderer );
-
-		$extension_spot->set_description(
-			sprintf(
-				/* translators: %1$s expands to a link start tag to the Yoast plugin page, %2$s is the link closing tag. */
-				__( 'Take your SEO to the next level and outrank your competition with our %1$sSEO plugins%2$s.', 'wordpress-seo' ),
-				'<a target="_blank" href="' . WPSEO_Shortlinker::get( 'https://yoa.st/jn' ) . '">',
-				'</a>'
-			)
-		);
-
-		if ( empty( $active_extensions['video'] ) ) {
-			$extension_spot->add_banner(
-				new WPSEO_Admin_Banner(
-					WPSEO_Shortlinker::get( 'https://yoa.st/jo' ),
-					'video-seo.png',
-					261,
-					152,
-					sprintf(
-						/* translators: %1$s expands to Yoast Video SEO. */
-						__( 'Buy the %1$s plugin now and optimize your videos for video search results and social media!', 'wordpress-seo' ),
-						'Yoast Video SEO'
-					)
-				)
-			);
-		}
-
-		if ( empty( $active_extensions['woocommerce'] ) ) {
-			$extension_spot->add_banner(
-				new WPSEO_Admin_Banner(
-					WPSEO_Shortlinker::get( 'https://yoa.st/jp' ),
-					'woocommerce-seo.png',
-					261,
-					152,
-					sprintf(
-						/* translators: %1$s expands to Yoast WooCommerce SEO. */
-						__( 'Buy the %1$s plugin now and optimize your shop today to improve your product promotion!', 'wordpress-seo' ),
-						'Yoast WooCommerce SEO'
-					)
-				)
-			);
-		}
-
-		if ( empty( $active_extensions['local'] ) ) {
-			$extension_spot->add_banner(
-				new WPSEO_Admin_Banner(
-					WPSEO_Shortlinker::get( 'https://yoa.st/jq' ),
-					'local-seo.png', 261,
-					152,
-					sprintf(
-						/* translators: %1$s expands to Yoast Local SEO. */
-						__( 'Buy the %1$s plugin now to improve your site&#8217;s Local SEO and ranking in Google Maps!', 'wordpress-seo' ),
-						'Yoast Local SEO'
-					)
-				)
-			);
-		}
-
-		if ( empty( $active_extensions['news'] ) ) {
-			$extension_spot->add_banner(
-				new WPSEO_Admin_Banner(
-					WPSEO_Shortlinker::get( 'https://yoa.st/jr' ),
-					'news-seo.png',
-					261,
-					152,
-					sprintf(
-						/* translators: %1$s expands to Yoast News SEO. */
-						__( 'Buy the %1$s plugin now and start optimizing to get your site featured in Google News!', 'wordpress-seo' ),
-						'Yoast News SEO'
-					)
-				)
-			);
-		}
-
-		return $extension_spot;
-	}
-
-	/**
-	 * Returns the courses banner spot.
-	 *
-	 * @return WPSEO_Admin_Banner_Spot
-	 */
-	protected function get_courses_spot() {
-		$courses_spot = new WPSEO_Admin_Banner_Spot( __( 'Improve your SEO skills', 'wordpress-seo' ), $this->banner_renderer );
-
-		$courses_spot->set_description(
-			sprintf(
-				/* translators: %1$s expands to a link start tag to the Yoast Services page, %2$s is the link closing tag. */
-				__( 'We believe SEO should be for everyone. That’s why we develop courses on any topic related to SEO. %1$sDiscover our online SEO courses &raquo;%2$s', 'wordpress-seo' ),
-				'<a target="_blank" href="' . WPSEO_Shortlinker::get( 'https://yoa.st/jt' ) . '">',
-				'</a>'
-			)
-		);
-
-		$courses_spot->add_banner(
-			new WPSEO_Admin_Banner(
-				WPSEO_Shortlinker::get( 'https://yoa.st/ju' ),
-				'basic-seo-training.png',
-				261,
-				152,
-				__( 'Take the online Basic SEO Training course and learn the fundamentals of SEO!', 'wordpress-seo' )
-			)
-		);
-
-		$courses_spot->add_banner(
-			new WPSEO_Admin_Banner(
-				WPSEO_Shortlinker::get( 'https://yoa.st/jv' ),
-				'yoast-seo-for-wordpress-training-2018.png',
-				261,
-				152,
-				sprintf(
-					/* translators: %1$s expands to Yoast SEO for WordPress Training, %2$s to Yoast SEO for WordPress. */
-					__( 'Take the %1$s course and become a certified %2$s expert!', 'wordpress-seo' ),
-					'Yoast SEO for WordPress Training',
-					'Yoast SEO for WordPress'
-				)
-			)
-		);
-
-		$courses_spot->add_banner(
-			new WPSEO_Admin_Banner(
-				WPSEO_Shortlinker::get( 'https://yoa.st/jw' ),
-				'seo-copywriting-training.png',
-				261,
-				152,
-				__( 'Take the online SEO Copywriting Training course and learn how to write awesome copy that ranks!', 'wordpress-seo' )
-			)
-		);
-
-		$courses_spot->add_banner(
-			new WPSEO_Admin_Banner(
-				WPSEO_Shortlinker::get( 'https://yoa.st/qy' ),
-				'site-structure-training.png',
-				261,
-				152,
-				__( 'Take the online Site Structure Training course and learn how to structure your website!', 'wordpress-seo' )
-			)
-		);
-
-		$courses_spot->add_banner(
-			new WPSEO_Admin_Banner(
-				WPSEO_Shortlinker::get( 'https://yoa.st/jaa' ),
-				'technical-seo-training.png',
-				261,
-				152,
-				__( 'Take the online Technical SEO Training course and learn essential technical SEO-concepts!', 'wordpress-seo' )
-			)
-		);
-
-		$courses_spot->add_banner(
-			new WPSEO_Admin_Banner(
-				WPSEO_Shortlinker::get( 'https://yoa.st/15h' ),
-				'structured-data-course.png',
-				261,
-				152,
-				__( 'Take the online Structured Data Training course and learn how to create rich snippets!', 'wordpress-seo' )
-			)
-		);
-
-		$courses_spot->add_banner(
-			new WPSEO_Admin_Banner(
-				WPSEO_Shortlinker::get( 'https://yoa.st/2oi' ),
-				'seo-for-beginners-training.png',
-				261,
-				152,
-				__( 'Get the FREE SEO for beginners training course and learn the SEO basics to make your site rank higher.', 'wordpress-seo' )
-			)
-		);
-
-		return $courses_spot;
-	}
-
-	/**
-	 * Returns the remove banner spot.
-	 *
-	 * @return WPSEO_Admin_Banner_Spot
-	 */
-	protected function get_remove_banner_spot() {
-
-		$remove_banner_spot = new WPSEO_Admin_Banner_Spot(
-			__( 'Remove these ads?', 'wordpress-seo' )
-		);
-
-		$remove_banner_spot->set_description(
-			'<a target="_blank" href="' . WPSEO_Shortlinker::get( 'https://yoa.st/jy' ) . '">' .
-			/* translators: %1$s expands to Yoast SEO Premium */
-			sprintf( __( 'Upgrade to %1$s &raquo;', 'wordpress-seo' ), 'Yoast SEO Premium' ) .
-			'</a>'
-		);
-
-		return $remove_banner_spot;
-	}
-}

=== removed file 'admin/banner/class-admin-banner-spot-renderer.php'
--- admin/banner/class-admin-banner-spot-renderer.php	2018-07-04 09:50:13 +0000
+++ admin/banner/class-admin-banner-spot-renderer.php	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-<?php
-/**
- * WPSEO plugin file.
- *
- * @package WPSEO\Admin\Banner
- */
-
-/**
- * Represents the render object for generating the html for the given banner spot.
- */
-class WPSEO_Admin_Banner_Spot_Renderer {
-
-	/**
-	 * Renders the admin banner spot.
-	 *
-	 * @param WPSEO_Admin_Banner_Spot $banner_spot The spot to render.
-	 *
-	 * @return string
-	 */
-	public function render( WPSEO_Admin_Banner_Spot $banner_spot ) {
-		$output = '<div class="yoast-sidebar__spot">';
-		if ( $banner_spot->get_title() !== '' ) {
-			$output .= '<strong>' . $banner_spot->get_title() . '</strong>';
-		}
-
-		if ( $banner_spot->get_extra() !== '' ) {
-			$output .= $banner_spot->get_extra();
-		}
-
-		if ( $banner_spot->get_description() !== '' ) {
-			$output .= '<p>' . $banner_spot->get_description() . '</p>';
-		}
-
-		$output .= $banner_spot->render_banner();
-		$output .= '</div>';
-
-		return $output;
-	}
-}

=== removed file 'admin/banner/class-admin-banner-spot.php'
--- admin/banner/class-admin-banner-spot.php	2018-07-04 09:50:13 +0000
+++ admin/banner/class-admin-banner-spot.php	1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-<?php
-/**
- * WPSEO plugin file.
- *
- * @package WPSEO\Admin\Banner
- */
-
-/**
- * Represents the an admin banner spot.
- */
-class WPSEO_Admin_Banner_Spot {
-
-	/** @var string */
-	private $title;
-
-	/** @var string */
-	private $description = '';
-
-	/** @var string */
-	private $extra = '';
-
-	/** @var WPSEO_Admin_Banner[] */
-	private $banners = array();
-
-	/**
-	 * WPSEO_Admin_Banner_Spot constructor.
-	 *
-	 * @param string                      $title           The title for the spot.
-	 * @param WPSEO_Admin_Banner_Renderer $banner_renderer The renderer for the banner.
-	 */
-	public function __construct( $title, WPSEO_Admin_Banner_Renderer $banner_renderer = null ) {
-		$this->title           = $title;
-		$this->banner_renderer = ( is_null( $banner_renderer ) ? new WPSEO_Admin_Banner_Renderer() : $banner_renderer );
-	}
-
-	/**
-	 * Returns the title.
-	 *
-	 * @return string
-	 */
-	public function get_title() {
-		return $this->title;
-	}
-
-	/**
-	 * Returns the description.
-	 *
-	 * @return string
-	 */
-	public function get_description() {
-		return $this->description;
-	}
-
-	/**
-	 * Returns the extra content.
-	 *
-	 * @return string
-	 */
-	public function get_extra() {
-		return $this->extra;
-	}
-
-	/**
-	 * Sets the description
-	 *
-	 * @param string $description The description.
-	 */
-	public function set_description( $description ) {
-		$this->description = $description;
-	}
-
-	/**
-	 * Sets the "extra"
-	 *
-	 * @param string $extra The "extra".
-	 */
-	public function set_extra( $extra ) {
-		$this->extra = $extra;
-	}
-
-	/**
-	 * Adds an admin banner.
-	 *
-	 * @param WPSEO_Admin_Banner $banner The banner to add.
-	 */
-	public function add_banner( WPSEO_Admin_Banner $banner ) {
-		$this->banners[] = $banner;
-	}
-
-	/**
-	 * Renders the banner.
-	 *
-	 * @return string
-	 */
-	public function render_banner() {
-		if ( ! $this->has_banners() ) {
-			return '';
-		}
-
-		return $this->banner_renderer->render( $this->get_random_banner() );
-	}
-
-	/**
-	 * Checks if there are any banners set.
-	 *
-	 * @return bool
-	 */
-	public function has_banners() {
-		return ! empty( $this->banners );
-	}
-
-	/**
-	 * Returns a random banner.
-	 *
-	 * @return null|WPSEO_Admin_Banner
-	 */
-	protected function get_random_banner() {
-		return $this->banners[ array_rand( $this->banners, 1 ) ];
-	}
-}

=== removed file 'admin/banner/class-admin-banner.php'
--- admin/banner/class-admin-banner.php	2018-07-04 09:50:13 +0000
+++ admin/banner/class-admin-banner.php	1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
-<?php
-/**
- * WPSEO plugin file.
- *
- * @package WPSEO\Admin\Banner
- */
-
-/**
- * Represents an admin banner.
- */
-class WPSEO_Admin_Banner {
-
-	/** @var string */
-	private $url;
-
-	/** @var string */
-	private $image;
-
-	/** @var integer */
-	private $width;
-
-	/** @var integer */
-	private $height;
-
-	/** @var string */
-	private $alt;
-
-	/**
-	 * Sets the attributes for this object.
-	 *
-	 * @param string  $url    The URL where the banner links to.
-	 * @param string  $image  The image filename.
-	 * @param integer $width  The width of the image.
-	 * @param integer $height The height of the image.
-	 * @param string  $alt    The alt text for the image.
-	 */
-	public function __construct( $url, $image, $width, $height, $alt = '' ) {
-		$this->url    = $url;
-		$this->image  = $image;
-		$this->alt    = $alt;
-		$this->width  = $width;
-		$this->height = $height;
-	}
-
-	/**
-	 * Returns the set url.
-	 *
-	 * @return string
-	 */
-	public function get_url() {
-		return $this->url;
-	}
-
-	/**
-	 * Returns the image.
-	 *
-	 * @return string
-	 */
-	public function get_image() {
-		return $this->image;
-	}
-
-	/**
-	 * Returns the alt-text.
-	 *
-	 * @return string
-	 */
-	public function get_alt() {
-		return $this->alt;
-	}
-
-	/**
-	 * Returns the width.
-	 *
-	 * @return string
-	 */
-	public function get_width() {
-		return $this->width;
-	}
-
-	/**
-	 * Returns the height.
-	 *
-	 * @return string
-	 */
-	public function get_height() {
-		return $this->height;
-	}
-}

=== modified file 'admin/capabilities/class-abstract-capability-manager.php'
--- admin/capabilities/class-abstract-capability-manager.php	2018-07-04 09:50:13 +0000
+++ admin/capabilities/class-abstract-capability-manager.php	2019-11-08 16:06:28 +0000
@@ -9,7 +9,12 @@
  * Abstract Capability Manager shared code.
  */
 abstract class WPSEO_Abstract_Capability_Manager implements WPSEO_Capability_Manager {
-	/** @var array Registered capabilities */
+
+	/**
+	 * Registered capabilities.
+	 *
+	 * @var array
+	 */
 	protected $capabilities = array();
 
 	/**
@@ -17,7 +22,7 @@
 	 *
 	 * @param string $capability Capability to register.
 	 * @param array  $roles      Roles to add the capability to.
-	 * @param bool   $overwrite        Optional. Use add or overwrite as registration method.
+	 * @param bool   $overwrite  Optional. Use add or overwrite as registration method.
 	 */
 	public function register( $capability, array $roles, $overwrite = false ) {
 		if ( $overwrite || ! isset( $this->capabilities[ $capability ] ) ) {

=== modified file 'admin/capabilities/class-capability-manager-factory.php'
--- admin/capabilities/class-capability-manager-factory.php	2018-07-04 09:50:13 +0000
+++ admin/capabilities/class-capability-manager-factory.php	2019-11-08 16:06:28 +0000
@@ -9,6 +9,7 @@
  * Capability Manager Factory.
  */
 class WPSEO_Capability_Manager_Factory {
+
 	/**
 	 * Returns the Manager to use.
 	 *

=== modified file 'admin/capabilities/class-capability-manager-integration.php'
--- admin/capabilities/class-capability-manager-integration.php	2018-07-04 09:50:13 +0000
+++ admin/capabilities/class-capability-manager-integration.php	2019-11-08 16:06:28 +0000
@@ -13,7 +13,11 @@
  */
 class WPSEO_Capability_Manager_Integration implements WPSEO_WordPress_Integration {
 
-	/** @var WPSEO_Capability_Manager Capability manager to use. */
+	/**
+	 * Capability manager to use.
+	 *
+	 * @var WPSEO_Capability_Manager
+	 */
 	public $manager;
 
 	/**
@@ -56,29 +60,29 @@
 	/**
 	 * Add capabilities to its own group in the Members plugin.
 	 *
-	 * @see  members_register_cap_group()
+	 * @see members_register_cap_group()
 	 */
 	public function action_members_register_cap_group() {
 		if ( ! function_exists( 'members_register_cap_group' ) ) {
 			return;
 		}
+
 		// Register the yoast group.
-		members_register_cap_group( 'wordpress-seo',
-			array(
-				'label'      => esc_html__( 'Yoast SEO', 'wordpress-seo' ),
-				'caps'       => $this->get_capabilities(),
-				'icon'       => 'dashicons-admin-plugins',
-				'diff_added' => true,
-			)
+		$args = array(
+			'label'      => esc_html__( 'Yoast SEO', 'wordpress-seo' ),
+			'caps'       => $this->get_capabilities(),
+			'icon'       => 'dashicons-admin-plugins',
+			'diff_added' => true,
 		);
+		members_register_cap_group( 'wordpress-seo', $args );
 	}
 
 	/**
 	 * Adds Yoast SEO capability group in the User Role Editor plugin.
 	 *
-	 * @see    URE_Capabilities_Groups_Manager::get_groups_tree()
+	 * @see URE_Capabilities_Groups_Manager::get_groups_tree()
 	 *
-	 * @param  array $groups Current groups.
+	 * @param array $groups Current groups.
 	 *
 	 * @return array Filtered list of capabilty groups.
 	 */
@@ -97,10 +101,10 @@
 	/**
 	 * Adds capabilities to the Yoast SEO group in the User Role Editor plugin.
 	 *
-	 * @see    URE_Capabilities_Groups_Manager::get_cap_groups()
+	 * @see URE_Capabilities_Groups_Manager::get_cap_groups()
 	 *
-	 * @param  array  $groups Current capability groups.
-	 * @param  string $cap_id Capability identifier.
+	 * @param array  $groups Current capability groups.
+	 * @param string $cap_id Capability identifier.
 	 *
 	 * @return array List of filtered groups.
 	 */

=== modified file 'admin/capabilities/class-capability-manager-vip.php'
--- admin/capabilities/class-capability-manager-vip.php	2018-07-04 09:50:13 +0000
+++ admin/capabilities/class-capability-manager-vip.php	2019-11-08 16:06:28 +0000
@@ -9,6 +9,7 @@
  * VIP implementation of the Capability Manager.
  */
 final class WPSEO_Capability_Manager_VIP extends WPSEO_Abstract_Capability_Manager {
+
 	/**
 	 * Adds the registered capabilities to the system.
 	 *

=== modified file 'admin/capabilities/class-capability-manager-wp.php'
--- admin/capabilities/class-capability-manager-wp.php	2018-07-04 09:50:13 +0000
+++ admin/capabilities/class-capability-manager-wp.php	2019-11-08 16:06:28 +0000
@@ -9,6 +9,7 @@
  * Default WordPress capability manager implementation.
  */
 final class WPSEO_Capability_Manager_WP extends WPSEO_Abstract_Capability_Manager {
+
 	/**
 	 * Adds the capabilities to the roles.
 	 *

=== modified file 'admin/capabilities/class-capability-manager.php'
--- admin/capabilities/class-capability-manager.php	2018-07-04 09:50:13 +0000
+++ admin/capabilities/class-capability-manager.php	2019-11-08 16:06:28 +0000
@@ -9,6 +9,7 @@
  * Capability Manager interface.
  */
 interface WPSEO_Capability_Manager {
+
 	/**
 	 * Registers a capability.
 	 *

=== modified file 'admin/capabilities/class-capability-utils.php'
--- admin/capabilities/class-capability-utils.php	2018-07-04 09:50:13 +0000
+++ admin/capabilities/class-capability-utils.php	2019-11-08 16:06:28 +0000
@@ -9,6 +9,7 @@
  * Capability Utils collection.
  */
 class WPSEO_Capability_Utils {
+
 	/**
 	 * Checks if the user has the proper capabilities.
 	 *

=== modified file 'admin/capabilities/class-register-capabilities.php'
--- admin/capabilities/class-register-capabilities.php	2018-07-04 09:50:13 +0000
+++ admin/capabilities/class-register-capabilities.php	2019-11-08 16:06:28 +0000
@@ -9,6 +9,7 @@
  * Capabilities registration class.
  */
 class WPSEO_Register_Capabilities implements WPSEO_WordPress_Integration {
+
 	/**
 	 * Registers the hooks.
 	 *

=== modified file 'admin/class-add-keyword-modal.php'
--- admin/class-add-keyword-modal.php	2018-07-04 09:50:13 +0000
+++ admin/class-add-keyword-modal.php	2019-11-08 16:06:28 +0000
@@ -1,5 +1,7 @@
 <?php
 /**
+ * WPSEO plugin file.
+ *
  * @package WPSEO\Admin
  */
 
@@ -18,36 +20,38 @@
 	 */
 	public function get_translations() {
 		return array(
-			'title'                    => __( 'Want to add more than one keyword?', 'wordpress-seo' ),
+			'title'                    => __( 'Would you like to add more than one keyphrase?', 'wordpress-seo' ),
 			'intro'                    => sprintf(
-				/* translators: %1$s expands to a 'Yoast SEO Premium' text linked to the yoast.com website. */
-				__( 'Great news: you can, with %1$s!', 'wordpress-seo' ),
+				/* 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'
+				__( '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 now!', 'wordpress-seo' ), 'Yoast SEO Premium'
+				__( 'Get %s', 'wordpress-seo' ),
+				'Yoast SEO Premium'
 			),
-			'small'                    => __( '1 year free updates and upgrades included!', 'wordpress-seo' ),
+			'small'                    => __( '1 year free support and updates included!', 'wordpress-seo' ),
 			'a11yNotice.opensInNewTab' => __( '(Opens in a new browser tab)', 'wordpress-seo' ),
 		);
 	}
 
 	/**
-	 * Pass tanslations to JS for the Add Keyword modal component.
+	 * Passes translations to JS for the Add Keyword modal component.
 	 *
 	 * @return array Translated text strings for the Add Keyword modal component.
 	 */
 	public function get_translations_for_js() {
 		$translations = $this->get_translations();
 		return array(
-			'locale' => WPSEO_Utils::get_user_locale(),
+			'locale' => WPSEO_Language_Utils::get_user_locale(),
 			'intl'   => $translations,
 		);
 	}

=== added file 'admin/class-admin-asset-analysis-worker-location.php'
--- admin/class-admin-asset-analysis-worker-location.php	1970-01-01 00:00:00 +0000
+++ admin/class-admin-asset-analysis-worker-location.php	2019-11-08 16:06:28 +0000
@@ -0,0 +1,75 @@
+<?php
+/**
+ * WPSEO plugin file.
+ *
+ * @package WPSEO\Admin
+ */
+
+/**
+ * Represents a way to determine the analysis worker asset location.
+ */
+final class WPSEO_Admin_Asset_Analysis_Worker_Location implements WPSEO_Admin_Asset_Location {
+
+	/**
+	 * Holds the asset's location.
+	 *
+	 * @var WPSEO_Admin_Asset_Location $asset_location.
+	 */
+	private $asset_location;
+
+	/**
+	 * Holds the asset itself.
+	 *
+	 * @var WPSEO_Admin_Asset $asset.
+	 */
+	private $asset;
+
+	/**
+	 * Constructs the location of the analysis worker asset.
+	 *
+	 * @param string $flat_version The flat version of the asset.
+	 * @param string $name         The name of the analysis worker asset.
+	 */
+	public function __construct( $flat_version = '', $name = 'analysis-worker' ) {
+		if ( $flat_version === '' ) {
+			$asset_manager = new WPSEO_Admin_Asset_Manager();
+			$flat_version  = $asset_manager->flatten_version( WPSEO_VERSION );
+		}
+
+		$analysis_worker = 'wp-seo-' . $name . '-' . $flat_version;
+
+		$this->asset_location = WPSEO_Admin_Asset_Manager::create_default_location();
+		$this->asset          = new WPSEO_Admin_Asset(
+			array(
+				'name' => $name,
+				'src'  => $analysis_worker,
+			)
+		);
+	}
+
+	/**
+	 * Retrieves the analysis worker asset.
+	 *
+	 * @return WPSEO_Admin_Asset The analysis worker asset.
+	 */
+	public function get_asset() {
+		return $this->asset;
+	}
+
+	/**
+	 * Determines the URL of the asset on the dev server.
+	 *
+	 * @param WPSEO_Admin_Asset $asset The asset to determine the URL for.
+	 * @param string            $type  The type of asset. Usually JS or CSS.
+	 *
+	 * @return string The URL of the asset.
+	 */
+	public function get_url( WPSEO_Admin_Asset $asset, $type ) {
+		$scheme = wp_parse_url( $asset->get_src(), PHP_URL_SCHEME );
+		if ( in_array( $scheme, array( 'http', 'https' ), true ) ) {
+			return $asset->get_src();
+		}
+
+		return $this->asset_location->get_url( $asset, $type );
+	}
+}

=== modified file 'admin/class-admin-asset-dev-server-location.php'
--- admin/class-admin-asset-dev-server-location.php	2018-07-04 09:50:13 +0000
+++ admin/class-admin-asset-dev-server-location.php	2019-11-08 16:06:28 +0000
@@ -9,32 +9,24 @@
  * Changes the asset paths to dev server paths.
  */
 final class WPSEO_Admin_Asset_Dev_Server_Location implements WPSEO_Admin_Asset_Location {
+
+	/**
+	 * Holds the dev server's default URL.
+	 *
+	 * @var string
+	 */
 	const DEFAULT_URL = 'http://localhost:8080';
 
 	/**
-	 * @var array
-	 */
-	private static $dev_server_script = array(
-		'commons',
-		'configuration-wizard',
-		'search-appearance',
-		'wp-seo-dashboard-widget',
-		'wp-seo-help-center',
-		'wp-seo-metabox',
-		'wp-seo-modal',
-		'wp-seo-post-scraper',
-		'wp-seo-replacevar-plugin',
-		'wp-seo-term-scraper',
-		'wp-seo-modal',
-		'wp-seo-wp-globals-backport',
-	);
-
-	/**
+	 * Holds the url where the server is located.
+	 *
 	 * @var string
 	 */
 	private $url;
 
 	/**
+	 * Class constructor.
+	 *
 	 * @param string $url Where the dev server is located.
 	 */
 	public function __construct( $url = null ) {
@@ -62,7 +54,7 @@
 		$flat_version        = $asset_manager->flatten_version( WPSEO_VERSION );
 		$version_less_source = str_replace( '-' . $flat_version, '', $asset->get_src() );
 
-		if ( ! in_array( $version_less_source, self::$dev_server_script, true ) ) {
+		if ( false !== strpos( $version_less_source, 'select2' ) ) {
 			return $this->get_default_url( $asset, $type );
 		}
 

=== modified file 'admin/class-admin-asset-manager.php'
--- admin/class-admin-asset-manager.php	2018-07-04 09:50:13 +0000
+++ admin/class-admin-asset-manager.php	2019-11-08 16:06:28 +0000
@@ -6,22 +6,31 @@
  */
 
 /**
- * This class registers all the necessary styles and scripts. Also has methods for the enqueing of scripts and styles. It automatically adds a prefix to the handle.
+ * This class registers all the necessary styles and scripts.
+ *
+ * Also has methods for the enqueing of scripts and styles.
+ * It automatically adds a prefix to the handle.
  */
 class WPSEO_Admin_Asset_Manager {
 
 	/**
+	 * Class that manages the assets' location.
+	 *
 	 * @var WPSEO_Admin_Asset_Location
 	 */
 	protected $asset_location;
 
 	/**
-	 *  Prefix for naming the assets.
+	 * Prefix for naming the assets.
+	 *
+	 * @var string
 	 */
 	const PREFIX = 'yoast-seo-';
 
 	/**
-	 * @var string prefix for naming the assets.
+	 * Prefix for naming the assets.
+	 *
+	 * @var string
 	 */
 	private $prefix;
 
@@ -66,7 +75,7 @@
 	public function register_script( WPSEO_Admin_Asset $script ) {
 		wp_register_script(
 			$this->prefix . $script->get_name(),
-			$this->asset_location->get_url( $script, WPSEO_Admin_Asset::TYPE_JS ),
+			$this->get_url( $script, WPSEO_Admin_Asset::TYPE_JS ),
 			$script->get_deps(),
 			$script->get_version(),
 			$script->is_in_footer()
@@ -81,7 +90,7 @@
 	public function register_style( WPSEO_Admin_Asset $style ) {
 		wp_register_style(
 			$this->prefix . $style->get_name(),
-			$this->asset_location->get_url( $style, WPSEO_Admin_Asset::TYPE_CSS ),
+			$this->get_url( $style, WPSEO_Admin_Asset::TYPE_CSS ),
 			$style->get_deps(),
 			$style->get_version(),
 			$style->get_media()
@@ -109,9 +118,9 @@
 	}
 
 	/**
-	 * Registers all the styles it recieves.
+	 * Registers all the styles it receives.
 	 *
-	 * @param array $styles Styles that need to be registerd.
+	 * @param array $styles Styles that need to be registered.
 	 */
 	public function register_styles( $styles ) {
 		foreach ( $styles as $style ) {
@@ -127,17 +136,16 @@
 	 */
 	public function special_styles() {
 		$flat_version = $this->flatten_version( WPSEO_VERSION );
-
-		return array(
-			'inside-editor' => new WPSEO_Admin_Asset( array(
-				'name' => 'inside-editor',
-				'src'  => 'inside-editor-' . $flat_version,
-			) ),
+		$asset_args   = array(
+			'name' => 'inside-editor',
+			'src'  => 'inside-editor-' . $flat_version,
 		);
+
+		return array( 'inside-editor' => new WPSEO_Admin_Asset( $asset_args ) );
 	}
 
 	/**
-	 * Flattens a version number for use in a filename
+	 * Flattens a version number for use in a filename.
 	 *
 	 * @param string $version The original version number.
 	 *
@@ -169,17 +177,147 @@
 	}
 
 	/**
+	 * Registers the WordPress dependencies that exist in 5.0 in case they are not present.
+	 *
+	 * This function can be removed when WordPress 5.1 has been released, because from 5.0 wp-elements will be
+	 * registered earlier, which means we don't have to reregister things.
+	 *
+	 * @return void
+	 */
+	public function register_wp_assets() {
+
+		global $wp_scripts;
+
+		$script = $wp_scripts->query( 'react' );
+
+		// IE11 needs wp-polyfill to be registered before react.
+		if ( $script && ! in_array( 'wp-polyfill', $script->deps, true ) ) {
+			$script->deps[] = 'wp-polyfill';
+		}
+
+		$flat_version = $this->flatten_version( WPSEO_VERSION );
+
+		wp_register_script(
+			'react',
+			plugins_url( 'js/vendor/react.min.js', WPSEO_FILE ),
+			array(),
+			'v16.6.1',
+			true
+		);
+
+		wp_register_script(
+			'react-dom',
+			plugins_url( 'js/vendor/react-dom.min.js', WPSEO_FILE ),
+			array( 'react' ),
+			'v16.6.1',
+			true
+		);
+
+		wp_register_script(
+			'lodash-base',
+			plugins_url( 'js/vendor/lodash.min.js', WPSEO_FILE ),
+			array(),
+			'4.17.5',
+			true
+		);
+
+		wp_register_script(
+			'lodash',
+			plugins_url( 'js/vendor/lodash-noconflict.js', WPSEO_FILE ),
+			array( 'lodash-base' ),
+			WPSEO_VERSION,
+			true
+		);
+
+		wp_register_script(
+			'wp-polyfill',
+			plugins_url( 'js/dist/babel-polyfill-' . $flat_version . '.min.js', WPSEO_FILE ),
+			array(),
+			WPSEO_VERSION,
+			true
+		);
+
+		wp_register_script(
+			'wp-element',
+			plugins_url( 'js/dist/wp-element-' . $flat_version . '.min.js', WPSEO_FILE ),
+			array( 'lodash', 'wp-polyfill', 'react', 'react-dom' ),
+			WPSEO_VERSION,
+			true
+		);
+
+		wp_register_script(
+			'wp-api-fetch',
+			plugins_url( 'js/dist/wp-apiFetch-' . $flat_version . '.min.js', WPSEO_FILE ),
+			array( 'wp-i18n', 'wp-polyfill' ),
+			WPSEO_VERSION,
+			true
+		);
+
+		wp_register_script(
+			'wp-components',
+			plugins_url( 'js/dist/wp-components-' . $flat_version . '.min.js', WPSEO_FILE ),
+			array( 'lodash', 'wp-api-fetch', 'wp-i18n', 'wp-polyfill', 'wp-compose' ),
+			WPSEO_VERSION,
+			true
+		);
+
+		wp_register_script(
+			'wp-data',
+			plugins_url( 'js/dist/wp-data-' . $flat_version . '.min.js', WPSEO_FILE ),
+			array( 'lodash', 'wp-element', 'wp-polyfill', 'wp-compose' ),
+			WPSEO_VERSION,
+			true
+		);
+
+		wp_register_script(
+			'wp-i18n',
+			plugins_url( 'js/dist/wp-i18n-' . $flat_version . '.min.js', WPSEO_FILE ),
+			array( 'wp-polyfill' ),
+			WPSEO_VERSION,
+			true
+		);
+
+		wp_register_script(
+			'wp-rich-text',
+			plugins_url( 'js/dist/wp-rich-text-' . $flat_version . '.min.js', WPSEO_FILE ),
+			array( 'lodash', 'wp-polyfill', 'wp-data' ),
+			WPSEO_VERSION,
+			true
+		);
+
+		wp_register_script(
+			'wp-compose',
+			plugins_url( 'js/dist/wp-compose-' . $flat_version . '.min.js', WPSEO_FILE ),
+			array( 'lodash', 'wp-polyfill' ),
+			WPSEO_VERSION,
+			true
+		);
+
+		/*
+		 * wp-annotations only exists from Gutenberg 4.3 and onwards, so we register a no-op in earlier versions.
+		 * The no-op achieves that our scripts that depend on this are actually loaded. Because WordPress doesn't
+		 * load a script if any of the dependencies are missing.
+		 *
+		 * @phpcs:disable WordPress.WP.EnqueuedResourceParameters -- The no-op does not require these settings.
+		 */
+		wp_register_script(
+			'wp-annotations',
+			null
+		);
+		// phpcs:enable -- End of disable.
+	}
+
+	/**
 	 * Returns the scripts that need to be registered.
 	 *
 	 * @todo Data format is not self-documenting. Needs explanation inline. R.
 	 *
-	 * @return array scripts that need to be registered.
+	 * @return array The scripts that need to be registered.
 	 */
 	protected function scripts_to_be_registered() {
-
 		$select2_language = 'en';
-		$user_locale      = WPSEO_Utils::get_user_locale();
-		$language         = WPSEO_Utils::get_language( $user_locale );
+		$user_locale      = WPSEO_Language_Utils::get_user_locale();
+		$language         = WPSEO_Language_Utils::get_language( $user_locale );
 
 		if ( file_exists( WPSEO_PATH . "js/dist/select2/i18n/{$user_locale}.js" ) ) {
 			$select2_language = $user_locale; // Chinese and some others use full locale.
@@ -190,52 +328,33 @@
 
 		$flat_version = $this->flatten_version( WPSEO_VERSION );
 
-		$backport_wp_dependencies = array( self::PREFIX . 'react-dependencies' );
-
-		// If Gutenberg is present we can borrow their globals for our own.
-		if ( function_exists( 'gutenberg_register_scripts_and_styles' ) ) {
-			$backport_wp_dependencies[] = 'wp-element';
-			$backport_wp_dependencies[] = 'wp-data';
-
-			/*
-			 * The version of TinyMCE that Gutenberg uses is incompatible with
-			 * the one core uses. So we need to make sure that the core version
-			 * is used in the classic editor.
-			 *
-			 * $_GET is used here because as far as I am aware you cannot use
-			 * filter_input to check for the existence of a query variable.
-			 */
-			if ( wp_script_is( 'tinymce-latest', 'registered' ) && isset( $_GET['classic-editor'] ) ) {
-				wp_deregister_script( 'tinymce-latest' );
-				wp_register_script( 'tinymce-latest', includes_url( 'js/tinymce/' ) . 'wp-tinymce.php', array( 'jquery' ), false, true );
-			}
-		}
-
 		return array(
 			array(
-				'name' => 'react-dependencies',
+				'name' => 'commons',
 				// Load webpack-commons for bundle support.
 				'src'  => 'commons-' . $flat_version,
 				'deps' => array(
-					self::PREFIX . 'babel-polyfill',
+					'wp-polyfill',
 				),
 			),
 			array(
 				'name' => 'search-appearance',
-				'src' => 'search-appearance-' . $flat_version,
-				'deps' => 'react-dependencies',
-			),
-			array(
-				'name' => 'wp-globals-backport',
-				'src'  => 'wp-seo-wp-globals-backport-' . $flat_version,
-				'deps' => $backport_wp_dependencies,
+				'src'  => 'search-appearance-' . $flat_version,
+				'deps' => array(
+					'wp-api',
+					self::PREFIX . 'components',
+					self::PREFIX . 'commons',
+				),
 			),
 			array(
 				'name' => 'yoast-modal',
 				'src'  => 'wp-seo-modal-' . $flat_version,
 				'deps' => array(
 					'jquery',
-					self::PREFIX . 'wp-globals-backport',
+					'wp-element',
+					'wp-i18n',
+					self::PREFIX . 'components',
+					self::PREFIX . 'commons',
 				),
 			),
 			array(
@@ -243,19 +362,23 @@
 				'src'  => 'wp-seo-help-center-' . $flat_version,
 				'deps' => array(
 					'jquery',
-					self::PREFIX . 'wp-globals-backport',
+					'wp-element',
+					'wp-i18n',
+					self::PREFIX . 'components',
+					self::PREFIX . 'commons',
 				),
 			),
 			array(
 				'name' => 'admin-script',
 				'src'  => 'wp-seo-admin-' . $flat_version,
 				'deps' => array(
+					'lodash',
 					'jquery',
 					'jquery-ui-core',
 					'jquery-ui-progressbar',
 					self::PREFIX . 'select2',
 					self::PREFIX . 'select2-translations',
-					self::PREFIX . 'babel-polyfill',
+					self::PREFIX . 'commons',
 				),
 			),
 			array(
@@ -264,32 +387,45 @@
 				'deps' => array(
 					'jquery',
 					'jquery-ui-core',
-					self::PREFIX . 'babel-polyfill',
+					self::PREFIX . 'commons',
+				),
+			),
+			array(
+				'name' => 'network-admin-script',
+				'src'  => 'wp-seo-network-admin-' . $flat_version,
+				'deps' => array(
+					'jquery',
+					self::PREFIX . 'commons',
 				),
 			),
 			array(
 				'name' => 'bulk-editor',
 				'src'  => 'wp-seo-bulk-editor-' . $flat_version,
-				'deps' => array( 'jquery', self::PREFIX . 'babel-polyfill' ),
-			),
-			array(
-				'name' => 'dismissible',
-				'src'  => 'wp-seo-dismissible-' . $flat_version,
-				'deps' => array( 'jquery', self::PREFIX . 'babel-polyfill' ),
+				'deps' => array(
+					'jquery',
+					self::PREFIX . 'commons',
+				),
 			),
 			array(
 				'name' => 'admin-global-script',
 				'src'  => 'wp-seo-admin-global-' . $flat_version,
-				'deps' => array( 'jquery', self::PREFIX . 'babel-polyfill' ),
+				'deps' => array(
+					'jquery',
+					self::PREFIX . 'commons',
+				),
 			),
 			array(
 				'name'      => 'metabox',
 				'src'       => 'wp-seo-metabox-' . $flat_version,
 				'deps'      => array(
 					'jquery',
+					'wp-element',
+					'wp-i18n',
+					'wp-data',
+					'wp-components',
 					self::PREFIX . 'select2',
 					self::PREFIX . 'select2-translations',
-					self::PREFIX . 'wp-globals-backport',
+					self::PREFIX . 'commons',
 				),
 				'in_footer' => false,
 			),
@@ -298,45 +434,72 @@
 				'src'  => 'wp-seo-featured-image-' . $flat_version,
 				'deps' => array(
 					'jquery',
-					self::PREFIX . 'babel-polyfill',
+					self::PREFIX . 'commons',
 				),
 			),
 			array(
 				'name'      => 'admin-gsc',
 				'src'       => 'wp-seo-admin-gsc-' . $flat_version,
-				'deps'      => array( self::PREFIX . 'babel-polyfill' ),
+				'deps'      => array(
+					'wp-element',
+					'wp-i18n',
+					self::PREFIX . 'styled-components',
+					self::PREFIX . 'components',
+					self::PREFIX . 'commons',
+				),
 				'in_footer' => false,
 			),
 			array(
 				'name' => 'post-scraper',
 				'src'  => 'wp-seo-post-scraper-' . $flat_version,
 				'deps' => array(
+					'wp-util',
+					'wp-api',
+					'wp-sanitize',
+					'wp-element',
+					'wp-i18n',
+					'wp-data',
+					'wp-api-fetch',
+					'wp-annotations',
+					'wp-compose',
 					self::PREFIX . 'replacevar-plugin',
 					self::PREFIX . 'shortcode-plugin',
-					'wp-util',
-					self::PREFIX . 'wp-globals-backport',
+					self::PREFIX . 'analysis',
+					self::PREFIX . 'components',
+					self::PREFIX . 'commons',
 				),
 			),
 			array(
 				'name' => 'term-scraper',
 				'src'  => 'wp-seo-term-scraper-' . $flat_version,
 				'deps' => array(
+					'wp-sanitize',
+					'wp-element',
+					'wp-i18n',
+					'wp-data',
+					'wp-api-fetch',
+					'wp-compose',
 					self::PREFIX . 'replacevar-plugin',
-					self::PREFIX . 'wp-globals-backport',
+					self::PREFIX . 'analysis',
+					self::PREFIX . 'components',
+					self::PREFIX . 'commons',
 				),
 			),
 			array(
 				'name' => 'replacevar-plugin',
 				'src'  => 'wp-seo-replacevar-plugin-' . $flat_version,
 				'deps' => array(
-					self::PREFIX . 'babel-polyfill',
+					self::PREFIX . 'analysis',
+					self::PREFIX . 'components',
+					self::PREFIX . 'commons',
 				),
 			),
 			array(
 				'name' => 'shortcode-plugin',
 				'src'  => 'wp-seo-shortcode-plugin-' . $flat_version,
 				'deps' => array(
-					self::PREFIX . 'babel-polyfill',
+					self::PREFIX . 'analysis',
+					self::PREFIX . 'commons',
 				),
 			),
 			array(
@@ -346,7 +509,8 @@
 					'jquery',
 					'jquery-ui-core',
 					'jquery-ui-progressbar',
-					self::PREFIX . 'babel-polyfill',
+					self::PREFIX . 'analysis',
+					self::PREFIX . 'commons',
 				),
 			),
 			array(
@@ -355,7 +519,13 @@
 				'deps' => array(
 					'jquery',
 					'wp-util',
-					self::PREFIX . 'babel-polyfill',
+					'wp-element',
+					'wp-i18n',
+					'wp-components',
+					'wp-data',
+					self::PREFIX . 'analysis',
+					self::PREFIX . 'components',
+					self::PREFIX . 'commons',
 				),
 			),
 			array(
@@ -382,18 +552,13 @@
 				'src'  => 'configuration-wizard-' . $flat_version,
 				'deps' => array(
 					'jquery',
-					self::PREFIX . 'wp-globals-backport',
+					'wp-element',
+					'wp-i18n',
+					'wp-api',
+					self::PREFIX . 'components',
+					self::PREFIX . 'commons',
 				),
 			),
-			// Register for backwards-compatiblity.
-			array(
-				'name' => 'polyfill',
-				'src'  => 'wp-seo-babel-polyfill-' . $flat_version,
-			),
-			array(
-				'name' => 'babel-polyfill',
-				'src'  => 'wp-seo-babel-polyfill-' . $flat_version,
-			),
 			array(
 				'name' => 'reindex-links',
 				'src'  => 'wp-seo-reindex-links-' . $flat_version,
@@ -401,17 +566,24 @@
 					'jquery',
 					'jquery-ui-core',
 					'jquery-ui-progressbar',
+					self::PREFIX . 'commons',
 				),
 			),
 			array(
 				'name' => 'edit-page-script',
 				'src'  => 'wp-seo-edit-page-' . $flat_version,
-				'deps' => array( 'jquery' ),
+				'deps' => array(
+					'jquery',
+					self::PREFIX . 'commons',
+				),
 			),
 			array(
 				'name'      => 'quick-edit-handler',
 				'src'       => 'wp-seo-quick-edit-handler-' . $flat_version,
-				'deps'      => array( 'jquery' ),
+				'deps'      => array(
+					'jquery',
+					self::PREFIX . 'commons',
+				),
 				'in_footer' => true,
 			),
 			array(
@@ -420,6 +592,7 @@
 				'deps' => array(
 					'wp-api',
 					'jquery',
+					self::PREFIX . 'commons',
 				),
 			),
 			array(
@@ -428,13 +601,54 @@
 				'deps' => array(
 					self::PREFIX . 'api',
 					'jquery',
-					self::PREFIX . 'wp-globals-backport',
+					'wp-element',
+					'wp-i18n',
+					self::PREFIX . 'components',
+					self::PREFIX . 'commons',
 				),
 			),
 			array(
 				'name' => 'filter-explanation',
 				'src'  => 'wp-seo-filter-explanation-' . $flat_version,
-				'deps' => array( 'jquery' ),
+				'deps' => array(
+					'jquery',
+					self::PREFIX . 'commons',
+				),
+			),
+			array(
+				'name' => 'analysis',
+				'src'  => 'analysis-' . $flat_version,
+				'deps' => array(
+					'lodash',
+					self::PREFIX . 'commons',
+				),
+			),
+			array(
+				'name' => 'components',
+				'src'  => 'components-' . $flat_version,
+				'deps' => array(
+					self::PREFIX . 'analysis',
+					self::PREFIX . 'styled-components',
+					self::PREFIX . 'commons',
+				),
+			),
+			array(
+				'name' => 'structured-data-blocks',
+				'src'  => 'wp-seo-structured-data-blocks-' . $flat_version,
+				'deps' => array(
+					'wp-blocks',
+					'wp-i18n',
+					'wp-element',
+					self::PREFIX . 'styled-components',
+					self::PREFIX . 'commons',
+				),
+			),
+			array(
+				'name' => 'styled-components',
+				'src'  => 'styled-components-' . $flat_version,
+				'deps' => array(
+					'wp-element',
+				),
 			),
 		);
 	}
@@ -444,7 +658,7 @@
 	 *
 	 * @todo Data format is not self-documenting. Needs explanation inline. R.
 	 *
-	 * @return array styles that need to be registered.
+	 * @return array Styles that need to be registered.
 	 */
 	protected function styles_to_be_registered() {
 		$flat_version = $this->flatten_version( WPSEO_VERSION );
@@ -491,12 +705,11 @@
 				'src'  => 'yst_seo_score-' . $flat_version,
 			),
 			array(
-				'name' => 'snippet',
-				'src'  => 'snippet-' . $flat_version,
-			),
-			array(
 				'name' => 'adminbar',
 				'src'  => 'adminbar-' . $flat_version,
+				'deps' => array(
+					'admin-bar',
+				),
 			),
 			array(
 				'name' => 'primary-category',
@@ -527,8 +740,30 @@
 			),
 			array(
 				'name' => 'search-appearance',
-				'src' => 'search-appearance-' . $flat_version,
+				'src'  => 'search-appearance-' . $flat_version,
+			),
+			array(
+				'name' => 'structured-data-blocks',
+				'src'  => 'structured-data-blocks-' . $flat_version,
+				'deps' => array( 'wp-edit-blocks' ),
 			),
 		);
 	}
+
+	/**
+	 * Determines the URL of the asset.
+	 *
+	 * @param WPSEO_Admin_Asset $asset The asset to determine the URL for.
+	 * @param string            $type  The type of asset. Usually JS or CSS.
+	 *
+	 * @return string The URL of the asset.
+	 */
+	protected function get_url( WPSEO_Admin_Asset $asset, $type ) {
+		$scheme = wp_parse_url( $asset->get_src(), PHP_URL_SCHEME );
+		if ( in_array( $scheme, array( 'http', 'https' ), true ) ) {
+			return $asset->get_src();
+		}
+
+		return $this->asset_location->get_url( $asset, $type );
+	}
 }

=== modified file 'admin/class-admin-asset-seo-location.php'
--- admin/class-admin-asset-seo-location.php	2018-07-04 09:50:13 +0000
+++ admin/class-admin-asset-seo-location.php	2019-11-08 16:06:28 +0000
@@ -11,6 +11,8 @@
 final class WPSEO_Admin_Asset_SEO_Location implements WPSEO_Admin_Asset_Location {
 
 	/**
+	 * Path to the plugin file.
+	 *
 	 * @var string
 	 */
 	protected $plugin_file;

=== modified file 'admin/class-admin-asset-yoast-components-l10n.php'
--- admin/class-admin-asset-yoast-components-l10n.php	2018-07-04 09:50:13 +0000
+++ admin/class-admin-asset-yoast-components-l10n.php	2019-11-08 16:06:28 +0000
@@ -1,12 +1,15 @@
 <?php
 /**
+ * WPSEO plugin file.
+ *
  * @package WPSEO\Admin
  */
 
 /**
  * Localizes JavaScript files.
  */
-final class WPSEO_Admin_Asset_Yoast_Components_l10n {
+final class WPSEO_Admin_Asset_Yoast_Components_L10n {
+
 	/**
 	 * Localizes the given script with the JavaScript translations.
 	 *
@@ -15,10 +18,11 @@
 	 * @return void
 	 */
 	public function localize_script( $script_handle ) {
-		wp_localize_script( $script_handle, 'wpseoYoastJSL10n', array(
+		$translations = array(
 			'yoast-components' => $this->get_translations( 'yoast-components' ),
-			'wordpress-seo' => $this->get_translations( 'wordpress-seojs' ),
-		) );
+			'wordpress-seo'    => $this->get_translations( 'wordpress-seojs' ),
+		);
+		wp_localize_script( $script_handle, 'wpseoYoastJSL10n', $translations );
 	}
 
 	/**
@@ -28,7 +32,7 @@
 	 * @return object The translations in a Jed format for JS files.
 	 */
 	protected function get_translations( $component ) {
-		$locale = WPSEO_Utils::get_user_locale();
+		$locale = WPSEO_Language_Utils::get_user_locale();
 
 		$file = plugin_dir_path( WPSEO_FILE ) . 'languages/' . $component . '-' . $locale . '.json';
 		if ( file_exists( $file ) ) {

=== added file 'admin/class-admin-banner.php'
--- admin/class-admin-banner.php	1970-01-01 00:00:00 +0000
+++ admin/class-admin-banner.php	2019-11-08 16:06:28 +0000
@@ -0,0 +1,67 @@
+<?php
+/**
+ * WPSEO plugin file.
+ *
+ * @package WPSEO\Admin
+ */
+
+/**
+ * Class WPSEO_Admin_Banner.
+ */
+class WPSEO_Admin_Banner implements WPSEO_WordPress_Integration {
+	/**
+	 * Registers all hooks to WordPress.
+	 *
+	 * @return void
+	 */
+	public function register_hooks() {
+		add_action( 'admin_notices', array( $this, 'banner' ) );
+	}
+
+	/**
+	 * Renders the admin banner.
+	 */
+	public function banner() {
+		if ( isset( $_GET['yst_dismiss_bf'] ) ) {
+			WPSEO_Options::set( 'bf_banner_2019_dismissed', $_GET['yst_dismiss_bf'] === '1' );
+		}
+
+		if ( ! $this->should_run_banner() ) {
+			return;
+		}
+
+		$close_url = add_query_arg( array( 'yst_dismiss_bf' => 1 ) );
+
+		?>
+		<div class="yoast_bf_sale">
+			<a class="close" href="<?php echo esc_url( $close_url ); ?>" aria-label="Dismiss the Yoast Black Friday Banner">X</a>
+			<a class="target" href="<?php echo esc_url( WPSEO_Shortlinker::get( 'https://yoa.st/bf-sale-2019' ) ); ?>"></a>
+		</div>
+		<?php
+	}
+
+	/**
+	 * Determines whether the banner should be shown or not.
+	 *
+	 * @return bool True if it should be shown, false if not.
+	 */
+	private function should_run_banner() {
+		if ( WPSEO_Utils::is_yoast_seo_premium() ) {
+			return false;
+		}
+
+		if ( WPSEO_Options::get( 'bf_banner_2019_dismissed' ) ) {
+			return false;
+		}
+
+		$time = time();
+
+		// 1574938800 is November 28th 12:00 CET.
+		// 1575381600 is December 3rd 15:00 CET.
+		if ( $time >= 1574938800 && $time < 1575381600 ) {
+			return true;
+		}
+
+		return false;
+	}
+}

=== added file 'admin/class-admin-editor-specific-replace-vars.php'
--- admin/class-admin-editor-specific-replace-vars.php	1970-01-01 00:00:00 +0000
+++ admin/class-admin-editor-specific-replace-vars.php	2019-11-08 16:06:28 +0000
@@ -0,0 +1,227 @@
+<?php
+/**
+ * WPSEO plugin file.
+ *
+ * @package WPSEO\Admin
+ */
+
+/**
+ * Determines the editor specific replacement variables.
+ */
+class WPSEO_Admin_Editor_Specific_Replace_Vars {
+
+	/**
+	 * Holds the editor specific replacements variables.
+	 *
+	 * @var array The editor specific replacement variables.
+	 */
+	protected $replacement_variables = array(
+		// Posts types.
+		'page'                     => array( 'id', 'pt_single', 'pt_plural', 'parent_title' ),
+		'post'                     => array( 'id', 'term404', 'pt_single', 'pt_plural' ),
+		// Custom post type.
+		'custom_post_type'         => array( 'id', 'term404', 'pt_single', 'pt_plural', 'parent_title' ),
+		// Settings - archive pages.
+		'custom-post-type_archive' => array( 'pt_single', 'pt_plural' ),
+
+		// Taxonomies.
+		'category'                 => array( 'term_title', 'term_description', 'category_description', 'parent_title' ),
+		'post_tag'                 => array( 'term_title', 'term_description', 'tag_description' ),
+		'post_format'              => array(),
+		// Custom taxonomy.
+		'term-in-custom-taxonomy'  => array( 'term_title', 'term_description', 'category_description', 'parent_title' ),
+
+		// Settings - special pages.
+		'search'                   => array( 'searchphrase' ),
+	);
+
+	/**
+	 * WPSEO_Admin_Editor_Specific_Replace_Vars constructor.
+	 */
+	public function __construct() {
+		$this->add_for_page_types(
+			array( 'page', 'post', 'custom_post_type' ),
+			WPSEO_Custom_Fields::get_custom_fields()
+		);
+
+		$this->add_for_page_types(
+			array( 'post', 'term-in-custom-taxonomies' ),
+			WPSEO_Custom_Taxonomies::get_custom_taxonomies()
+		);
+	}
+
+	/**
+	 * Retrieves the editor specific replacement variables.
+	 *
+	 * @return array The editor specific replacement variables.
+	 */
+	public function get() {
+		/**
+		 * Filter: Adds the possibility to add extra editor specific replacement variables.
+		 *
+		 * @api array $replacement_variables Empty array to add the editor specific replace vars to.
+		 */
+		$replacement_variables = apply_filters(
+			'wpseo_editor_specific_replace_vars',
+			$this->replacement_variables
+		);
+
+		if ( ! is_array( $replacement_variables ) ) {
+			$replacement_variables = $this->replacement_variables;
+		}
+
+		return array_filter( $replacement_variables, 'is_array' );
+	}
+
+	/**
+	 * Retrieves the generic replacement variable names.
+	 *
+	 * Which are the replacement variables without the editor specific ones.
+	 *
+	 * @param array $replacement_variables Possibly generic replacement variables.
+	 *
+	 * @return array The generic replacement variable names.
+	 */
+	public function get_generic( $replacement_variables ) {
+		$shared_variables = array_diff(
+			$this->extract_names( $replacement_variables ),
+			$this->get_unique_replacement_variables()
+		);
+
+		return array_values( $shared_variables );
+	}
+
+	/**
+	 * Determines the page type of the current term.
+	 *
+	 * @param string $taxonomy The taxonomy name.
+	 *
+	 * @return string The page type.
+	 */
+	public function determine_for_term( $taxonomy ) {
+		$replacement_variables = $this->get();
+		if ( array_key_exists( $taxonomy, $replacement_variables ) ) {
+			return $taxonomy;
+		}
+
+		return 'term-in-custom-taxonomy';
+	}
+
+	/**
+	 * Determines the page type of the current post.
+	 *
+	 * @param WP_Post $post A WordPress post instance.
+	 *
+	 * @return string The page type.
+	 */
+	public function determine_for_post( $post ) {
+		if ( $post instanceof WP_Post === false ) {
+			return 'post';
+		}
+
+		$replacement_variables = $this->get();
+		if ( array_key_exists( $post->post_type, $replacement_variables ) ) {
+			return $post->post_type;
+		}
+
+		return 'custom_post_type';
+	}
+
+	/**
+	 * Determines the page type for a post type.
+	 *
+	 * @param string $post_type The name of the post_type.
+	 * @param string $fallback  The page type to fall back to.
+	 *
+	 * @return string The page type.
+	 */
+	public function determine_for_post_type( $post_type, $fallback = 'custom_post_type' ) {
+		if ( ! $this->has_for_page_type( $post_type ) ) {
+			return $fallback;
+		}
+
+		return $post_type;
+	}
+
+	/**
+	 * Determines the page type for an archive page.
+	 *
+	 * @param string $name     The name of the archive.
+	 * @param string $fallback The page type to fall back to.
+	 *
+	 * @return string The page type.
+	 */
+	public function determine_for_archive( $name, $fallback = 'custom-post-type_archive' ) {
+		$page_type = $name . '_archive';
+
+		if ( ! $this->has_for_page_type( $page_type ) ) {
+			return $fallback;
+		}
+
+		return $page_type;
+	}
+
+	/**
+	 * Adds the replavement variables for the given page types.
+	 *
+	 * @param array $page_types                   Page types to add variables for.
+	 * @param array $replacement_variables_to_add The variables to add.
+	 *
+	 * @return void
+	 */
+	protected function add_for_page_types( array $page_types, array $replacement_variables_to_add ) {
+		if ( empty( $replacement_variables_to_add ) ) {
+			return;
+		}
+
+		$replacement_variables_to_add = array_fill_keys( $page_types, $replacement_variables_to_add );
+		$replacement_variables        = $this->replacement_variables;
+
+		$this->replacement_variables = array_merge_recursive( $replacement_variables, $replacement_variables_to_add );
+	}
+
+	/**
+	 * Extracts the names from the given replacements variables.
+	 *
+	 * @param array $replacement_variables Replacement variables to extract the name from.
+	 *
+	 * @return array Extracted names.
+	 */
+	protected function extract_names( $replacement_variables ) {
+		$extracted_names = array();
+
+		foreach ( $replacement_variables as $replacement_variable ) {
+			if ( empty( $replacement_variable['name'] ) ) {
+				continue;
+			}
+
+			$extracted_names[] = $replacement_variable['name'];
+		}
+
+		return $extracted_names;
+	}
+
+	/**
+	 * Returns whether the given page type has editor specific replace vars.
+	 *
+	 * @param string $page_type The page type to check.
+	 *
+	 * @return bool True if there are associated editor specific replace vars.
+	 */
+	protected function has_for_page_type( $page_type ) {
+		$replacement_variables = $this->get();
+
+		return ( ! empty( $replacement_variables[ $page_type ] ) && is_array( $replacement_variables[ $page_type ] ) );
+	}
+
+	/**
+	 * Merges all editor specific replacement variables into one array and removes duplicates.
+	 *
+	 * @return array The list of unique editor specific replacement variables.
+	 */
+	protected function get_unique_replacement_variables() {
+		$merged_replacement_variables = call_user_func_array( 'array_merge', $this->get() );
+
+		return array_unique( $merged_replacement_variables );
+	}
+}

=== added file 'admin/class-admin-gutenberg-compatibility-notification.php'
--- admin/class-admin-gutenberg-compatibility-notification.php	1970-01-01 00:00:00 +0000
+++ admin/class-admin-gutenberg-compatibility-notification.php	2019-11-08 16:06:28 +0000
@@ -0,0 +1,93 @@
+<?php
+/**
+ * WPSEO plugin file.
+ *
+ * @package WPSEO\Admin
+ */
+
+/**
+ * Handles the Gutenberg Compatibility notification showing and hiding.
+ */
+class WPSEO_Admin_Gutenberg_Compatibility_Notification implements WPSEO_WordPress_Integration {
+
+	/**
+	 * Notification ID to use.
+	 *
+	 * @var string
+	 */
+	private $notification_id = 'wpseo-outdated-gutenberg-plugin';
+
+	/**
+	 * Instance of gutenberg compatibility checker.
+	 *
+	 * @var WPSEO_Gutenberg_Compatibility
+	 */
+	private $compatibility_checker;
+
+	/**
+	 * Instance of Yoast Notification Center.
+	 *
+	 * @var Yoast_Notification_Center
+	 */
+	private $notification_center;
+
+	/**
+	 * WPSEO_Admin_Gutenberg_Compatibility_Notification constructor.
+	 */
+	public function __construct() {
+		$this->compatibility_checker = new WPSEO_Gutenberg_Compatibility();
+		$this->notification_center   = Yoast_Notification_Center::get();
+	}
+
+	/**
+	 * Registers all hooks to WordPress.
+	 *
+	 * @return void
+	 */
+	public function register_hooks() {
+		add_action( 'admin_init', array( $this, 'manage_notification' ) );
+	}
+
+	/**
+	 * Manages if the notification should be shown or removed.
+	 *
+	 * @return void
+	 */
+	public function manage_notification() {
+		if ( ! $this->compatibility_checker->is_installed() || $this->compatibility_checker->is_fully_compatible() ) {
+			$this->notification_center->remove_notification_by_id( $this->notification_id );
+
+			return;
+		}
+
+		$this->add_notification();
+	}
+
+	/**
+	 * Adds the notification to the notificaton center.
+	 *
+	 * @return void
+	 */
+	private function add_notification() {
+		$level = $this->compatibility_checker->is_below_minimum() ? Yoast_Notification::ERROR : Yoast_Notification::WARNING;
+
+		$message = sprintf(
+			/* translators: %1$s expands to Yoast SEO, %2$s expands to the installed version, %3$s expands to Gutenberg */
+			__( '%1$s detected you are using version %2$s of %3$s, please update to the latest version to prevent compatibility issues.', 'wordpress-seo' ),
+			'Yoast SEO',
+			$this->compatibility_checker->get_installed_version(),
+			'Gutenberg'
+		);
+
+		$notification = new Yoast_Notification(
+			$message,
+			array(
+				'id'       => $this->notification_id,
+				'type'     => $level,
+				'priority' => 1,
+			)
+		);
+
+		$this->notification_center->add_notification( $notification );
+	}
+}

=== modified file 'admin/class-admin-help-panel.php'
--- admin/class-admin-help-panel.php	2018-07-04 09:50:13 +0000
+++ admin/class-admin-help-panel.php	2019-11-08 16:06:28 +0000
@@ -11,21 +11,29 @@
 class WPSEO_Admin_Help_Panel {
 
 	/**
+	 * Unique identifier of the element the inline help refers to, used as an identifier in the html.
+	 *
 	 * @var string
 	 */
 	private $id;
 
 	/**
+	 * The Help Button text. Needs a properly escaped string.
+	 *
 	 * @var string
 	 */
 	private $help_button_text;
 
 	/**
+	 * The Help Panel content. Needs a properly escaped string (might contain HTML).
+	 *
 	 * @var string
 	 */
 	private $help_content;
 
 	/**
+	 * Optional Whether to print out a container div element for the Help Panel, used for styling.
+	 *
 	 * @var string
 	 */
 	private $wrapper;

=== modified file 'admin/class-admin-init.php'
--- admin/class-admin-init.php	2018-07-04 09:50:13 +0000
+++ admin/class-admin-init.php	2019-11-08 16:06:28 +0000
@@ -25,7 +25,7 @@
 	private $asset_manager;
 
 	/**
-	 * Class constructor
+	 * Class constructor.
 	 */
 	public function __construct() {
 		$GLOBALS['wpseo_admin'] = new WPSEO_Admin();
@@ -40,13 +40,28 @@
 		add_action( 'admin_init', array( $this, 'permalink_notice' ), 15 );
 		add_action( 'admin_init', array( $this, 'page_comments_notice' ), 15 );
 		add_action( 'admin_init', array( $this, 'ga_compatibility_notice' ), 15 );
-		add_action( 'admin_init', array( $this, 'yoast_plugin_compatibility_notification' ), 15 );
 		add_action( 'admin_init', array( $this, 'yoast_plugin_suggestions_notification' ), 15 );
 		add_action( 'admin_init', array( $this, 'recalculate_notice' ), 15 );
 		add_action( 'admin_init', array( $this, 'unsupported_php_notice' ), 15 );
+		add_action( 'admin_init', array( $this, 'wordpress_upgrade_notice' ), 15 );
 		add_action( 'admin_init', array( $this->asset_manager, 'register_assets' ) );
 		add_action( 'admin_init', array( $this, 'show_hook_deprecation_warnings' ) );
 		add_action( 'admin_init', array( 'WPSEO_Plugin_Conflict', 'hook_check_for_plugin_conflicts' ) );
+		add_action( 'admin_init', array( $this, 'handle_notifications' ), 15 );
+		add_action( 'admin_notices', array( $this, 'permalink_settings_notice' ) );
+		add_action( 'admin_enqueue_scripts', array( $this->asset_manager, 'register_wp_assets' ), PHP_INT_MAX );
+
+		$listeners   = array();
+		$listeners[] = new WPSEO_Post_Type_Archive_Notification_Handler();
+
+		/**
+		 * Listener interface classes.
+		 *
+		 * @var WPSEO_Listener $listener
+		 */
+		foreach ( $listeners as $listener ) {
+			$listener->listen();
+		}
 
 		$this->load_meta_boxes();
 		$this->load_taxonomy_class();
@@ -57,6 +72,26 @@
 	}
 
 	/**
+	 * Handles the notifiers for the dashboard page.
+	 *
+	 * @return void
+	 */
+	public function handle_notifications() {
+		/**
+		 * Notification handlers.
+		 *
+		 * @var WPSEO_Notification_Handler[] $handlers
+		 */
+		$handlers   = array();
+		$handlers[] = new WPSEO_Post_Type_Archive_Notification_Handler();
+
+		$notification_center = Yoast_Notification_Center::get();
+		foreach ( $handlers as $handler ) {
+			$handler->handle( $notification_center );
+		}
+	}
+
+	/**
 	 * Enqueue our styling for dismissible yoast notifications.
 	 */
 	public function enqueue_dismissible() {
@@ -64,28 +99,13 @@
 	}
 
 	/**
-	 * Helper to verify if the current user has already seen the about page for the current version
-	 *
-	 * @return bool
-	 */
-	private function seen_about() {
-		$seen_about_version = substr( get_user_meta( get_current_user_id(), 'wpseo_seen_about_version', true ), 0, 3 );
-		$last_minor_version = substr( WPSEO_VERSION, 0, 3 );
-
-		return version_compare( $seen_about_version, $last_minor_version, '>=' );
-	}
-
-	/**
-	 * Notify about the default tagline if the user hasn't changed it
+	 * Notify about the default tagline if the user hasn't changed it.
 	 */
 	public function tagline_notice() {
-
-		$current_url   = ( is_ssl() ? 'https://' : 'http://' );
-		$current_url  .= sanitize_text_field( $_SERVER['SERVER_NAME'] ) . sanitize_text_field( $_SERVER['REQUEST_URI'] );
-		$customize_url = add_query_arg( array(
+		$query_args    = array(
 			'autofocus[control]' => 'blogdescription',
-			'url'                => urlencode( $current_url ),
-		), wp_customize_url() );
+		);
+		$customize_url = add_query_arg( $query_args, wp_customize_url() );
 
 		$info_message = sprintf(
 			/* translators: 1: link open tag; 2: link close tag. */
@@ -103,16 +123,11 @@
 		$tagline_notification = new Yoast_Notification( $info_message, $notification_options );
 
 		$notification_center = Yoast_Notification_Center::get();
-		if ( $this->has_default_tagline() ) {
-			$notification_center->add_notification( $tagline_notification );
-		}
-		else {
-			$notification_center->remove_notification( $tagline_notification );
-		}
+		$notification_center->remove_notification( $tagline_notification );
 	}
 
 	/**
-	 * Add an alert if the blog is not publicly visible
+	 * Add an alert if the blog is not publicly visible.
 	 */
 	public function blog_public_notice() {
 
@@ -143,7 +158,7 @@
 	}
 
 	/**
-	 * Display notice to disable comment pagination
+	 * Display notice to disable comment pagination.
 	 */
 	public function page_comments_notice() {
 
@@ -175,7 +190,7 @@
 	}
 
 	/**
-	 * Returns whether or not the site has the default tagline
+	 * Returns whether or not the site has the default tagline.
 	 *
 	 * @return bool
 	 */
@@ -185,13 +200,13 @@
 
 		// We are checking against the WordPress internal translation.
 		// @codingStandardsIgnoreLine
-		$translated_blog_description = __( 'Just another WordPress site' );
+		$translated_blog_description = __( 'Just another WordPress site', 'default' );
 
 		return $translated_blog_description === $blog_description || $default_blog_description === $blog_description;
 	}
 
 	/**
-	 * Show alert when the permalink doesn't contain %postname%
+	 * Show alert when the permalink doesn't contain %postname%.
 	 */
 	public function permalink_notice() {
 
@@ -223,7 +238,7 @@
 	}
 
 	/**
-	 * Are page comments enabled
+	 * Are page comments enabled.
 	 *
 	 * @return bool
 	 */
@@ -249,7 +264,7 @@
 	}
 
 	/**
-	 * Build compatibility problem notification
+	 * Build compatibility problem notification.
 	 *
 	 * @return Yoast_Notification
 	 */
@@ -325,56 +340,6 @@
 	}
 
 	/**
-	 * Add an alert if outdated versions of Yoast SEO plugins are running.
-	 */
-	public function yoast_plugin_compatibility_notification() {
-		$compatibility_checker = new WPSEO_Plugin_Compatibility( WPSEO_VERSION );
-		$plugins               = $compatibility_checker->get_installed_plugins_compatibility();
-
-		$notification_center = Yoast_Notification_Center::get();
-
-		foreach ( $plugins as $name => $plugin ) {
-			$type         = ( $plugin['active'] ) ? Yoast_Notification::ERROR : Yoast_Notification::WARNING;
-			$notification = $this->get_yoast_seo_compatibility_notification( $name, $plugin, $type );
-
-			if ( $plugin['compatible'] === false ) {
-				$notification_center->add_notification( $notification );
-
-				continue;
-			}
-
-			$notification_center->remove_notification( $notification );
-		}
-	}
-
-	/**
-	 * Build Yoast SEO compatibility problem notification
-	 *
-	 * @param string $name   The plugin name to use for the unique ID.
-	 * @param array  $plugin The plugin to retrieve the data from.
-	 * @param string $level  The severity level to use for the notification.
-	 *
-	 * @return Yoast_Notification
-	 */
-	private function get_yoast_seo_compatibility_notification( $name, $plugin, $level = Yoast_Notification::WARNING ) {
-		$info_message = sprintf(
-			/* translators: %1$s expands to Yoast SEO, %2$s expands to the plugin version, %3$s expands to the plugin name */
-			__( '%1$s detected you are using version %2$s of %3$s, please update to the latest version to prevent compatibility issues.', 'wordpress-seo' ),
-			'Yoast SEO',
-			$plugin['version'],
-			$plugin['title']
-		);
-
-		return new Yoast_Notification(
-			$info_message,
-			array(
-				'id'   => 'wpseo-outdated-yoast-seo-plugin-' . $name,
-				'type' => $level,
-			)
-		);
-	}
-
-	/**
 	 * Shows the notice for recalculating the post. the Notice will only be shown if the user hasn't dismissed it before.
 	 */
 	public function recalculate_notice() {
@@ -418,38 +383,108 @@
 	 * @return void
 	 */
 	public function unsupported_php_notice() {
-		$info_message = sprintf(
-			/* translators: 1: The strong opening tag; 2: The strong closing tag; 3: the Yoast SEO version that is dropping support; 4: The release date of the version of Yoast SEO that is dropping support; 5: The PHP version no longer being supported; */
-			__( '%1$sAction is needed%2$s: As of version %3$s, due to be released on %4$s, Yoast SEO will no longer work with PHP %5$s. Unfortunately, your site is running on PHP %5$s right now, so action is needed. Thankfully, you can update your PHP yourself.', 'wordpress-seo' ),
+		$notification_center = Yoast_Notification_Center::get();
+		$notification_center->remove_notification_by_id( 'wpseo-dismiss-unsupported-php' );
+	}
+
+	/**
+	 * Gets the latest released major WordPress version from the WordPress stable-check api.
+	 *
+	 * @return float The latest released major WordPress version. 0 The stable-check api doesn't respond.
+	 */
+	private function get_latest_major_wordpress_version() {
+		$core_updates = get_core_updates( array( 'dismissed' => true ) );
+
+		if ( $core_updates === false ) {
+			return 0;
+		}
+
+		$wp_version_latest = get_bloginfo( 'version' );
+		foreach ( $core_updates as $update ) {
+			if ( $update->response === 'upgrade' && version_compare( $update->version, $wp_version_latest, '>' ) ) {
+				$wp_version_latest = $update->version;
+			}
+		}
+
+		// Strip the patch version and convert to a float.
+		return (float) $wp_version_latest;
+	}
+
+	/**
+	 * Creates a WordPress upgrade notification in the notification center.
+	 *
+	 * @return void
+	 */
+	public function wordpress_upgrade_notice() {
+		global $wp_version;
+
+		$latest_major_wp_version = number_format( $this->get_latest_major_wordpress_version(), 1 );
+		$next_major_wp_version   = number_format( ( $latest_major_wp_version + 0.1 ), 1 );
+
+		$wp_less_than_50             = version_compare( $wp_version, '5.0', '<' );
+		$wp_less_than_latest_version = version_compare( $wp_version, $latest_major_wp_version, '<' );
+
+		$notification_center = Yoast_Notification_Center::get();
+
+		$message = sprintf(
+			/* translators: %1$s expands to an opening strong tag, %2$s expands to a closing strong tag, %3$s expands to a html break, %4$s expands to Yoast, %5$s expands to Yoast SEO, %6$s expands to the latest major released WP version, %7$s expands to the next major WP release version */
+			__(
+				'%1$sUpgrade WordPress to the most recent version%2$s%3$sWe’ve noticed that you’re not on the latest WordPress version, which might cause an issue soon. %4$s (for reasons of security and stability) only supports the current and previous version of WordPress. When the next version of WordPress comes out, that means that we will support WordPress %6$s and %7$s. This means you will not get any updates to %5$s until you update your WordPress, so please make sure to upgrade to the latest WordPress version soon!%3$s%3$s',
+				'wordpress-seo'
+			),
 			'<strong>',
 			'</strong>',
-			'7.7',
-			date_i18n( get_option( 'date_format' ), strtotime( '11-06-2018' ) ),
-			'5.2'
+			'<br/>',
+			'Yoast',
+			'Yoast SEO',
+			$latest_major_wp_version,
+			$next_major_wp_version
+		);
+		if ( $wp_less_than_50 ) {
+			$message .= sprintf(
+				/* translators: %1$s expands to Yoast SEO, %2$s expands to 5.0 */
+				__(
+					'If you’ve held off on updating to %2$s and higher because of the new Gutenberg editor, please install the Classic Editor plugin. It will give you the same editing experience you have now, but also the security of newer versions of WordPress and %1$s.',
+					'wordpress-seo'
+				),
+				'Yoast SEO',
+				'5.0'
+			);
+		}
+		$message .= '<br/><br/>';
+		$message .= sprintf(
+			/* translators: %1$s expands to an opening anchor tag, %2$s expands to a closing anchor tag */
+			__(
+				'Read %1$sthis post for more information about why we’re not supporting older versions.%2$s',
+				'wordpress-seo'
+			),
+			'<a href="' . WPSEO_Shortlinker::get( 'https://yoa.st/old-wp-support' ) . '" target="_blank" rel="nofollow">',
+			WPSEO_Admin_Utils::get_new_tab_message() . '</a>'
 		);
 
-		$unsupported_php_notification = new Yoast_Notification(
-			$info_message,
+		$notification = new Yoast_Notification(
+			$message,
 			array(
-				'type'         => Yoast_Notification::ERROR,
-				'id'           => 'wpseo-dismiss-unsupported-php',
-				'capabilities' => 'wpseo_manage_options',
+				'type' => Yoast_Notification::ERROR,
+				'id'   => 'wpseo-dismiss-wordpress-upgrade',
 			)
 		);
 
-		$notification_center = Yoast_Notification_Center::get();
-
-		if ( WPSEO_Admin_Utils::is_supported_php_version_installed() === false ) {
-			$notification_center->add_notification( $unsupported_php_notification );
-
+		if ( $wp_less_than_latest_version ) {
+			// If the latest WordPress version is not known, do not initiate the WordPress upgrade notice.
+			if ( $this->get_latest_major_wordpress_version() === 0 ) {
+				$notification_center->remove_notification( $notification );
+				return;
+			}
+
+			$notification_center->add_notification( $notification );
 			return;
 		}
-
-		$notification_center->remove_notification( $unsupported_php_notification );
+		$notification_center->remove_notification( $notification );
 	}
 
 	/**
-	 * Check if the user has dismissed the given notice (by $notice_name)
+	 * Check if the user has dismissed the given notice (by $notice_name).
 	 *
 	 * @param string $notice_name The name of the notice that might be dismissed.
 	 *
@@ -566,7 +601,8 @@
 				'textdomain'  => 'wordpress-seo',
 				'plugin_name' => 'Yoast SEO',
 				'hook'        => 'wpseo_admin_promo_footer',
-			), false
+			),
+			false
 		);
 
 		$message = $i18n_module->get_promo_message();
@@ -595,7 +631,7 @@
 	}
 
 	/**
-	 * See if we should start our XML Sitemaps Admin class
+	 * See if we should start our XML Sitemaps Admin class.
 	 */
 	private function load_xml_sitemaps_admin() {
 		if ( WPSEO_Options::get( 'enable_xml_sitemap', false ) ) {
@@ -604,7 +640,7 @@
 	}
 
 	/**
-	 * Check if the site is set to be publicly visible
+	 * Check if the site is set to be publicly visible.
 	 *
 	 * @return bool
 	 */
@@ -618,50 +654,14 @@
 	public function show_hook_deprecation_warnings() {
 		global $wp_filter;
 
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-			return false;
+		if ( wp_doing_ajax() ) {
+			return;
 		}
 
 		// WordPress hooks that have been deprecated since a Yoast SEO version.
 		$deprecated_filters = array(
-			'wpseo_metadesc_length'            => array(
-				'version'     => '3.0',
-				'alternative' => 'javascript',
-			),
-			'wpseo_metadesc_length_reason'     => array(
-				'version'     => '3.0',
-				'alternative' => 'javascript',
-			),
-			'wpseo_body_length_score'          => array(
-				'version'     => '3.0',
-				'alternative' => 'javascript',
-			),
-			'wpseo_linkdex_results'            => array(
-				'version'     => '3.0',
-				'alternative' => 'javascript',
-			),
-			'wpseo_snippet'                    => array(
-				'version'     => '3.0',
-				'alternative' => 'javascript',
-			),
-			'wp_seo_get_bc_title'              => array(
-				'version'     => '5.8',
-				'alternative' => 'wpseo_breadcrumb_single_link_info',
-			),
-			'wpseo_metakey'                    => array(
-				'version'     => '6.3',
-				'alternative' => null,
-			),
-			'wpseo_metakeywords'               => array(
-				'version'     => '6.3',
-				'alternative' => null,
-			),
-			'wpseo_stopwords'                  => array(
-				'version'     => '7.0',
-				'alternative' => null,
-			),
-			'wpseo_redirect_orphan_attachment' => array(
-				'version'     => '7.0',
+			'wpseo_genesis_force_adjacent_rel_home' => array(
+				'version'     => '9.4',
 				'alternative' => null,
 			),
 		);
@@ -675,31 +675,57 @@
 		// Show notice for each deprecated filter or action that has been registered.
 		foreach ( $deprecated_notices as $deprecated_filter ) {
 			$deprecation_info = $deprecated_filters[ $deprecated_filter ];
+			// phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped -- only uses the hardcoded values from above.
 			_deprecated_hook(
 				$deprecated_filter,
 				'WPSEO ' . $deprecation_info['version'],
 				$deprecation_info['alternative']
 			);
+			// phpcs:enable WordPress.Security.EscapeOutput.OutputNotEscaped.
 		}
 	}
 
 	/**
-	 * Check if there is a dismiss notice action.
-	 *
-	 * @param string $notice_name The name of the notice to dismiss.
-	 *
-	 * @return bool
-	 */
-	private function dismiss_notice( $notice_name ) {
-		return filter_input( INPUT_GET, $notice_name ) === '1' && wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), $notice_name );
-	}
-
-	/**
-	 * Check if the permalink uses %postname%
+	 * Check if the permalink uses %postname%.
 	 *
 	 * @return bool
 	 */
 	private function has_postname_in_permalink() {
 		return ( false !== strpos( get_option( 'permalink_structure' ), '%postname%' ) );
 	}
+
+	/**
+	 * Shows a notice on the permalink settings page.
+	 */
+	public function permalink_settings_notice() {
+		global $pagenow;
+
+		if ( $pagenow === 'options-permalink.php' ) {
+			printf(
+				'<div class="notice notice-warning"><p><strong>%1$s</strong><br>%2$s<br><a href="%3$s" target="_blank">%4$s</a></p></div>',
+				esc_html__( 'WARNING:', 'wordpress-seo' ),
+				sprintf(
+					/* translators: %1$s and %2$s expand to <em> items to emphasize the word in the middle. */
+					esc_html__( 'Changing your permalinks settings can seriously impact your search engine visibility. It should almost %1$s never %2$s be done on a live website.', 'wordpress-seo' ),
+					'<em>',
+					'</em>'
+				),
+				esc_url( WPSEO_Shortlinker::get( 'https://yoa.st/why-permalinks/' ) ),
+				// The link's content.
+				esc_html__( 'Learn about why permalinks are important for SEO.', 'wordpress-seo' )
+			);
+		}
+	}
+
+	/* ********************* DEPRECATED METHODS ********************* */
+
+	/**
+	 * Add an alert if outdated versions of Yoast SEO plugins are running.
+	 *
+	 * @deprecated 12.3
+	 * @codeCoverageIgnore
+	 */
+	public function yoast_plugin_compatibility_notification() {
+		_deprecated_function( __METHOD__, 'WPSEO 12.3' );
+	}
 }

=== modified file 'admin/class-admin-media-purge-notification.php'
--- admin/class-admin-media-purge-notification.php	2018-07-04 09:50:13 +0000
+++ admin/class-admin-media-purge-notification.php	2019-11-08 16:06:28 +0000
@@ -65,16 +65,17 @@
 	 */
 	private function get_notification() {
 		$content = sprintf(
-		/* translators: %1$s expands to the link to the article, %2$s closes the link tag. */
+			/* translators: %1$s expands to the link to the article, %2$s closes the link tag. */
 			__( 'Your site\'s settings currently allow attachment URLs on your site to exist. Please read %1$sthis post about a potential issue%2$s with attachment URLs and check whether you have the correct setting for your site.', 'wordpress-seo' ),
-			'<a href="' . esc_url( WPSEO_Shortlinker::get( 'https://yoa.st/2r8' ) ) . '" rel="nofollow noreferer" target="_blank">',
+			'<a href="' . esc_url( WPSEO_Shortlinker::get( 'https://yoa.st/2r8' ) ) . '" rel="noopener noreferrer" target="_blank">',
 			'</a>'
 		);
 
 		$content .= '<br><br>';
 		$content .= sprintf(
+			/* translators: %1$s dismiss link open tag, %2$s closes the link tag. */
 			__( 'If you know what this means and you do not want to see this message anymore, you can %1$sdismiss this message%2$s.', 'wordpress-seo' ),
-			'<a href="' . admin_url( 'admin.php?page=wpseo_dashboard&dismiss=' . $this->notification_id ) . '">',
+			'<a href="' . esc_url( admin_url( 'admin.php?page=wpseo_dashboard&dismiss=' . $this->notification_id ) ) . '">',
 			'</a>'
 		);
 

=== modified file 'admin/class-admin-recommended-replace-vars.php'
--- admin/class-admin-recommended-replace-vars.php	2018-07-04 09:50:13 +0000
+++ admin/class-admin-recommended-replace-vars.php	2019-11-08 16:06:28 +0000
@@ -11,24 +11,26 @@
 class WPSEO_Admin_Recommended_Replace_Vars {
 
 	/**
-	 * @var array The recommended replacement variables.
+	 * The recommended replacement variables.
+	 *
+	 * @var array
 	 */
 	protected $recommended_replace_vars = array(
 		// Posts types.
-		'page'                    => array( 'sitename', 'title', 'sep', 'primary_category' ),
-		'post'                    => array( 'sitename', 'title', 'sep', 'primary_category' ),
+		'page'                     => array( 'sitename', 'title', 'sep', 'primary_category' ),
+		'post'                     => array( 'sitename', 'title', 'sep', 'primary_category' ),
 		// Homepage.
-		'homepage'                => array( 'sitename', 'sitedesc', 'sep' ),
+		'homepage'                 => array( 'sitename', 'sitedesc', 'sep' ),
 		// Custom post type.
-		'custom_post_type'        => array( 'sitename', 'title', 'sep' ),
+		'custom_post_type'         => array( 'sitename', 'title', 'sep' ),
 
 		// Taxonomies.
-		'category'                => array( 'sitename', 'term_title', 'sep' ),
-		'post_tag'                => array( 'sitename', 'term_title', 'sep' ),
-		'post_format'             => array( 'sitename', 'term_title', 'sep', 'page' ),
+		'category'                 => array( 'sitename', 'term_title', 'sep' ),
+		'post_tag'                 => array( 'sitename', 'term_title', 'sep' ),
+		'post_format'              => array( 'sitename', 'term_title', 'sep', 'page' ),
 
 		// Custom taxonomy.
-		'term-in-custom-taxomomy' => array( 'sitename', 'term_title', 'sep' ),
+		'term-in-custom-taxomomy'  => array( 'sitename', 'term_title', 'sep' ),
 
 		// Settings - archive pages.
 		'author_archive'           => array( 'sitename', 'title', 'sep', 'page' ),
@@ -36,8 +38,8 @@
 		'custom-post-type_archive' => array( 'sitename', 'title', 'sep', 'page' ),
 
 		// Settings - special pages.
-		'search'                  => array( 'sitename', 'searchphrase', 'sep', 'page' ),
-		'404'                     => array( 'sitename', 'sep' ),
+		'search'                   => array( 'sitename', 'searchphrase', 'sep', 'page' ),
+		'404'                      => array( 'sitename', 'sep' ),
 	);
 
 	/**
@@ -59,7 +61,7 @@
 	/**
 	 * Determines the page type of the current post.
 	 *
-	 * @param WP_Post $post The WordPress global post object.
+	 * @param WP_Post $post A WordPress post instance.
 	 *
 	 * @return string The page type.
 	 */

=== modified file 'admin/class-admin-user-profile.php'
--- admin/class-admin-user-profile.php	2018-07-04 09:50:13 +0000
+++ admin/class-admin-user-profile.php	2019-11-08 16:06:28 +0000
@@ -10,6 +10,7 @@
  * Customizes user profile.
  */
 class WPSEO_Admin_User_Profile {
+
 	/**
 	 * Class constructor.
 	 */
@@ -27,9 +28,9 @@
 	 *
 	 * @since 3.1
 	 *
-	 * @param int    $meta_id The ID of the meta option changed.
+	 * @param int    $meta_id   The ID of the meta option changed.
 	 * @param int    $object_id The ID of the user.
-	 * @param string $meta_key The key of the meta field changed.
+	 * @param string $meta_key  The key of the meta field changed.
 	 */
 	public function clear_author_sitemap_cache( $meta_id, $object_id, $meta_key ) {
 		if ( '_yoast_wpseo_profile_updated' === $meta_key ) {

=== modified file 'admin/class-admin-utils.php'
--- admin/class-admin-utils.php	2018-07-04 09:50:13 +0000
+++ admin/class-admin-utils.php	2019-11-08 16:06:28 +0000
@@ -54,7 +54,7 @@
 	 * @return string The link to the plugin install. Returns the title if the plugin is deemed a Premium product.
 	 */
 	public static function get_install_link( $plugin ) {
-		$install_url = WPSEO_Admin_Utils::get_install_url( $plugin['slug'] );
+		$install_url = self::get_install_url( $plugin['slug'] );
 
 		if ( $install_url === '' || ( isset( $plugin['premium'] ) && $plugin['premium'] === true ) ) {
 			return $plugin['title'];
@@ -65,20 +65,32 @@
 			$install_url,
 			$plugin['title']
 		);
-
-	}
+	}
+
+	/**
+	 * Gets a visually hidden accessible message for links that open in a new browser tab.
+	 *
+	 * @return string The visually hidden accessible message.
+	 */
+	public static function get_new_tab_message() {
+		return sprintf(
+			'<span class="screen-reader-text">%s</span>',
+			esc_html__( '(Opens in a new browser tab)', 'wordpress-seo' )
+		);
+	}
+
+	/* ********************* DEPRECATED METHODS ********************* */
 
 	/**
 	 * Determines whether or not the user has an invalid version of PHP installed.
 	 *
+	 * @deprecated 8.1
+	 * @codeCoverageIgnore
+	 *
 	 * @return bool Whether or not PHP 5.2 or lower is installed.
 	 */
 	public static function is_supported_php_version_installed() {
-		$checker = new Whip_RequirementsChecker( array( 'php' => PHP_VERSION ) );
-
-		$checker->addRequirement( Whip_VersionRequirement::fromCompareString( 'php', '>=5.3' ) );
-		$checker->check();
-
-		return $checker->hasMessages() === false;
+		// Intentionally left blank.
+		return true;
 	}
 }

=== modified file 'admin/class-admin.php'
--- admin/class-admin.php	2018-07-04 09:50:13 +0000
+++ admin/class-admin.php	2019-11-08 16:06:28 +0000
@@ -10,7 +10,13 @@
  */
 class WPSEO_Admin {
 
-	/** The page identifier used in WordPress to register the admin page !DO NOT CHANGE THIS! */
+	/**
+	 * The page identifier used in WordPress to register the admin page.
+	 *
+	 * !DO NOT CHANGE THIS!
+	 *
+	 * @var string
+	 */
 	const PAGE_IDENTIFIER = 'wpseo_dashboard';
 
 	/**
@@ -41,14 +47,8 @@
 			add_action( 'delete_category', array( $this, 'schedule_rewrite_flush' ) );
 		}
 
-		$this->admin_features = array(
-			// Google Search Console.
-			'google_search_console' => new WPSEO_GSC(),
-			'dashboard_widget'      => new Yoast_Dashboard_Widget(),
-		);
-
-		if ( WPSEO_Metabox::is_post_overview( $pagenow ) || WPSEO_Metabox::is_post_edit( $pagenow ) ) {
-			$this->admin_features['primary_category'] = new WPSEO_Primary_Term_Admin();
+		if ( WPSEO_Options::get( 'disable-attachment' ) === true ) {
+			add_filter( 'wpseo_accessible_post_types', array( 'WPSEO_Post_Type', 'filter_attachment_post_type' ) );
 		}
 
 		if ( filter_input( INPUT_GET, 'page' ) === 'wpseo_tools' && filter_input( INPUT_GET, 'tool' ) === null ) {
@@ -71,8 +71,6 @@
 
 		add_action( 'admin_init', array( $this, 'map_manage_options_cap' ) );
 
-		add_action( 'admin_init', array( $this, 'check_php_version' ) );
-
 		WPSEO_Sitemaps_Cache::register_clear_on_option_update( 'wpseo' );
 		WPSEO_Sitemaps_Cache::register_clear_on_option_update( 'home' );
 
@@ -90,21 +88,43 @@
 
 		$this->initialize_cornerstone_content();
 
-		new Yoast_Modal();
+		if ( WPSEO_Utils::is_plugin_network_active() ) {
+			$integrations[] = new Yoast_Network_Admin();
+		}
+
+		$this->admin_features = array(
+			'google_search_console' => new WPSEO_GSC(),
+			'dashboard_widget'      => new Yoast_Dashboard_Widget(),
+		);
+
+		if ( WPSEO_Metabox::is_post_overview( $pagenow ) || WPSEO_Metabox::is_post_edit( $pagenow ) ) {
+			$this->admin_features['primary_category'] = new WPSEO_Primary_Term_Admin();
+		}
 
 		$integrations[] = new WPSEO_Yoast_Columns();
 		$integrations[] = new WPSEO_License_Page_Manager();
 		$integrations[] = new WPSEO_Statistic_Integration();
-		$integrations[] = new WPSEO_Slug_Change_Watcher();
 		$integrations[] = new WPSEO_Capability_Manager_Integration( WPSEO_Capability_Manager_Factory::get() );
 		$integrations[] = new WPSEO_Admin_Media_Purge_Notification();
-		$integrations   = array_merge( $integrations, $this->initialize_seo_links() );
-
-		/** @var WPSEO_WordPress_Integration $integration */
+		$integrations[] = new WPSEO_Admin_Gutenberg_Compatibility_Notification();
+		$integrations[] = new WPSEO_Expose_Shortlinks();
+		$integrations[] = new WPSEO_MyYoast_Proxy();
+		$integrations[] = new WPSEO_MyYoast_Route();
+		$integrations[] = new WPSEO_Schema_Person_Upgrade_Notification();
+		$integrations[] = new WPSEO_Tracking( 'https://tracking.yoast.com/stats', ( WEEK_IN_SECONDS * 2 ) );
+		$integrations[] = new WPSEO_Admin_Settings_Changed_Listener();
+		$integrations[] = new WPSEO_Admin_Banner();
+
+		$integrations = array_merge(
+			$integrations,
+			$this->get_admin_features(),
+			$this->initialize_seo_links(),
+			$this->initialize_cornerstone_content()
+		);
+
 		foreach ( $integrations as $integration ) {
 			$integration->register_hooks();
 		}
-
 	}
 
 	/**
@@ -205,21 +225,17 @@
 			array_unshift( $links, $settings_link );
 		}
 
-		if ( class_exists( 'WPSEO_Product_Premium' ) ) {
-			$product_premium   = new WPSEO_Product_Premium();
-			$extension_manager = new WPSEO_Extension_Manager();
-
-			if ( $extension_manager->is_activated( $product_premium->get_slug() ) ) {
-				return $links;
-			}
+		$addon_manager = new WPSEO_Addon_Manager();
+		if ( WPSEO_Utils::is_yoast_seo_premium() && $addon_manager->has_valid_subscription( WPSEO_Addon_Manager::PREMIUM_SLUG ) ) {
+			return $links;
 		}
 
 		// Add link to premium support landing page.
-		$premium_link = '<a href="' . esc_url( WPSEO_Shortlinker::get( 'https://yoa.st/1yb' ) ) . '">' . __( 'Premium Support', 'wordpress-seo' ) . '</a>';
+		$premium_link = '<a style="font-weight: bold;" href="' . esc_url( WPSEO_Shortlinker::get( 'https://yoa.st/1yb' ) ) . '" target="_blank">' . __( 'Premium Support', 'wordpress-seo' ) . '</a>';
 		array_unshift( $links, $premium_link );
 
 		// Add link to docs.
-		$faq_link = '<a href="' . esc_url( WPSEO_Shortlinker::get( 'https://yoa.st/1yc' ) ) . '">' . __( 'FAQ', 'wordpress-seo' ) . '</a>';
+		$faq_link = '<a href="' . esc_url( WPSEO_Shortlinker::get( 'https://yoa.st/1yc' ) ) . '" target="_blank">' . __( 'FAQ', 'wordpress-seo' ) . '</a>';
 		array_unshift( $links, $faq_link );
 
 		return $links;
@@ -244,21 +260,27 @@
 	}
 
 	/**
-	 * Filter the $contactmethods array and add Facebook, Google+ and Twitter.
+	 * Filter the $contactmethods array and add a set of social profiles.
 	 *
 	 * These are used with the Facebook author, rel="author" and Twitter cards implementation.
 	 *
+	 * @link https://developers.google.com/search/docs/data-types/social-profile
+	 *
 	 * @param array $contactmethods Currently set contactmethods.
 	 *
 	 * @return array $contactmethods with added contactmethods.
 	 */
 	public function update_contactmethods( $contactmethods ) {
-		// Add Google+.
-		$contactmethods['googleplus'] = __( 'Google+', 'wordpress-seo' );
-		// Add Twitter.
-		$contactmethods['twitter'] = __( 'Twitter username (without @)', 'wordpress-seo' );
-		// Add Facebook.
-		$contactmethods['facebook'] = __( 'Facebook profile URL', 'wordpress-seo' );
+		$contactmethods['facebook']   = __( 'Facebook profile URL', 'wordpress-seo' );
+		$contactmethods['instagram']  = __( 'Instagram profile URL', 'wordpress-seo' );
+		$contactmethods['linkedin']   = __( 'LinkedIn profile URL', 'wordpress-seo' );
+		$contactmethods['myspace']    = __( 'MySpace profile URL', 'wordpress-seo' );
+		$contactmethods['pinterest']  = __( 'Pinterest profile URL', 'wordpress-seo' );
+		$contactmethods['soundcloud'] = __( 'SoundCloud profile URL', 'wordpress-seo' );
+		$contactmethods['tumblr']     = __( 'Tumblr profile URL', 'wordpress-seo' );
+		$contactmethods['twitter']    = __( 'Twitter username (without @)', 'wordpress-seo' );
+		$contactmethods['youtube']    = __( 'YouTube profile URL', 'wordpress-seo' );
+		$contactmethods['wikipedia']  = __( 'Wikipedia page about you', 'wordpress-seo' ) . '<br/><small>' . __( '(if one exists)', 'wordpress-seo' ) . '</small>';
 
 		return $contactmethods;
 	}
@@ -286,7 +308,8 @@
 			'variable_warning'        => sprintf( __( 'Warning: the variable %s cannot be used in this template. See the help center for more info.', 'wordpress-seo' ), '<code>%s</code>' ),
 			'dismiss_about_url'       => $this->get_dismiss_url( 'wpseo-dismiss-about' ),
 			'dismiss_tagline_url'     => $this->get_dismiss_url( 'wpseo-dismiss-tagline-notice' ),
-			'help_video_iframe_title' => __( 'Yoast SEO video tutorial', 'wordpress-seo' ),
+			/* translators: %s: expends to Yoast SEO */
+			'help_video_iframe_title' => sprintf( __( '%s video tutorial', 'wordpress-seo' ), 'Yoast SEO' ),
 			'scrollable_table_hint'   => __( 'Scroll to see the table content.', 'wordpress-seo' ),
 		);
 	}
@@ -317,59 +340,6 @@
 	}
 
 	/**
-	 * Initializes Whip to show a notice for outdated PHP versions.
-	 *
-	 * @todo Deprecate this method when WordPress 5.1 is our currently minimal supported version.
-	 *
-	 * @return void
-	 */
-	public function check_php_version() {
-		// If the user isn't an admin, don't display anything.
-		if ( ! current_user_can( 'manage_options' ) ) {
-			return;
-		}
-
-		// Check if the user is running PHP 5.2.
-		if ( WPSEO_Admin_Utils::is_supported_php_version_installed() === false ) {
-			$this->show_unsupported_php_message();
-
-			return;
-		}
-
-		/*
-		 * The Whip message shouldn't be shown from WordPress 5.0.0 and higher because
-		 * that version introduces Serve Happy which is almost similar to Whip.
-		 */
-		$minimal_wp_version = '5.0.0';
-		if ( version_compare( $GLOBALS['wp_version'], $minimal_wp_version, '>=' ) ) {
-			return;
-		}
-
-		if ( ! $this->on_dashboard_page() ) {
-			return;
-		}
-
-		whip_wp_check_versions( array(
-			'php' => '>=5.4',
-		) );
-	}
-
-	/**
-	 * Creates a new message to display regarding the usage of PHP 5.2 (or lower).
-	 *
-	 * @return void
-	 */
-	protected function show_unsupported_php_message() {
-		$presenter = new Whip_WPMessagePresenter(
-			new WPSEO_Unsupported_PHP_Message(),
-			new Whip_MessageDismisser( time(), ( WEEK_IN_SECONDS * 4 ), new Whip_WPDismissOption() ),
-			__( 'Remind me again in 4 weeks.', 'wordpress-seo' )
-		);
-
-		$presenter->register_hooks();
-	}
-
-	/**
 	 * Whether we are on the admin dashboard page.
 	 *
 	 * @returns bool
@@ -380,17 +350,17 @@
 
 	/**
 	 * Loads the cornerstone filter.
+	 *
+	 * @return WPSEO_WordPress_Integration[] The integrations to initialize.
 	 */
 	protected function initialize_cornerstone_content() {
 		if ( ! WPSEO_Options::get( 'enable_cornerstone_content' ) ) {
-			return;
+			return array();
 		}
 
-		$cornerstone = new WPSEO_Cornerstone();
-		$cornerstone->register_hooks();
-
-		$cornerstone_filter = new WPSEO_Cornerstone_Filter();
-		$cornerstone_filter->register_hooks();
+		return array(
+			'cornerstone_filter' => new WPSEO_Cornerstone_Filter(),
+		);
 	}
 
 	/**
@@ -448,59 +418,13 @@
 		return $integrations;
 	}
 
-	/********************** DEPRECATED METHODS **********************/
-
-	// @codeCoverageIgnoreStart
-	/**
-	 * Register the menu item and its sub menu's.
-	 *
-	 * @deprecated 5.5
-	 */
-	public function register_settings_page() {
-		_deprecated_function( __METHOD__, 'WPSEO 5.5.0' );
-	}
-
-	/**
-	 * Register the settings page for the Network settings.
-	 *
-	 * @deprecated 5.5
-	 */
-	public function register_network_settings_page() {
-		_deprecated_function( __METHOD__, 'WPSEO 5.5.0' );
-	}
-
-	/**
-	 * Load the form for a WPSEO admin page.
-	 *
-	 * @deprecated 5.5
-	 */
-	public function load_page() {
-		_deprecated_function( __METHOD__, 'WPSEO 5.5.0' );
-	}
-
-	/**
-	 * Loads the form for the network configuration page.
-	 *
-	 * @deprecated 5.5
-	 */
-	public function network_config_page() {
-		_deprecated_function( __METHOD__, 'WPSEO 5.5.0' );
-	}
-
-	/**
-	 * Filters all advanced settings pages from the given pages.
-	 *
-	 * @deprecated 5.5
-	 * @param array $pages The pages to filter.
-	 */
-	public function filter_settings_pages( array $pages ) {
-		_deprecated_function( __METHOD__, 'WPSEO 5.5.0' );
-	}
+	/* ********************* DEPRECATED METHODS ********************* */
 
 	/**
 	 * Cleans stopwords out of the slug, if the slug hasn't been set yet.
 	 *
 	 * @deprecated 7.0
+	 * @codeCoverageIgnore
 	 *
 	 * @return void
 	 */
@@ -512,6 +436,7 @@
 	 * Filter the stopwords from the slug.
 	 *
 	 * @deprecated 7.0
+	 * @codeCoverageIgnore
 	 *
 	 * @return void
 	 */
@@ -520,51 +445,14 @@
 	}
 
 	/**
-	 * Adds contextual help to the titles & metas page.
-	 *
-	 * @deprecated 5.6.0
+	 * Initializes WHIP to show a notice for outdated PHP versions.
+	 *
+	 * @deprecated 8.1
+	 * @codeCoverageIgnore
+	 *
+	 * @return void
 	 */
-	public function title_metas_help_tab() {
-		_deprecated_function( __METHOD__, '5.6.0' );
-
-		$screen = get_current_screen();
-
-		$screen->set_help_sidebar( '
-			<p><strong>' . __( 'For more information:', 'wordpress-seo' ) . '</strong></p>
-			<p><a target="_blank" href="https://yoast.com/wordpress-seo/#titles">' . __( 'Title optimization', 'wordpress-seo' ) . '</a></p>
-			<p><a target="_blank" href="https://yoast.com/google-page-title/">' . __( 'Why Google won\'t display the right page title', 'wordpress-seo' ) . '</a></p>'
-		);
-
-		$screen->add_help_tab(
-			array(
-				'id'      => 'basic-help',
-				'title'   => __( 'Template explanation', 'wordpress-seo' ),
-				'content' => "\n\t\t<h2>" . __( 'Template explanation', 'wordpress-seo' ) . "</h2>\n\t\t" . '<p>' .
-					sprintf(
-						/* translators: %1$s expands to Yoast SEO. */
-						__( 'The title &amp; metas settings for %1$s are made up of variables that are replaced by specific values from the page when the page is displayed. The tabs on the left explain the available variables.', 'wordpress-seo' ),
-						'Yoast SEO'
-					) .
-					'</p><p>' . __( 'Note that not all variables can be used in every template.', 'wordpress-seo' ) . '</p>',
-			)
-		);
-
-		$screen->add_help_tab(
-			array(
-				'id'      => 'title-vars',
-				'title'   => __( 'Basic Variables', 'wordpress-seo' ),
-				'content' => "\n\t\t<h2>" . __( 'Basic Variables', 'wordpress-seo' ) . "</h2>\n\t\t" . WPSEO_Replace_Vars::get_basic_help_texts(),
-			)
-		);
-
-		$screen->add_help_tab(
-			array(
-				'id'      => 'title-vars-advanced',
-				'title'   => __( 'Advanced Variables', 'wordpress-seo' ),
-				'content' => "\n\t\t<h2>" . __( 'Advanced Variables', 'wordpress-seo' ) . "</h2>\n\t\t" . WPSEO_Replace_Vars::get_advanced_help_texts(),
-			)
-		);
+	public function check_php_version() {
+		// Intentionally left empty.
 	}
-
-	// @codeCoverageIgnoreEnd
 }

=== modified file 'admin/class-asset.php'
--- admin/class-asset.php	2018-07-04 09:50:13 +0000
+++ admin/class-asset.php	2019-11-08 16:06:28 +0000
@@ -10,62 +10,148 @@
  */
 class WPSEO_Admin_Asset {
 
+	/**
+	 * Constant used to identify file type as a JS file.
+	 *
+	 * @var string
+	 */
 	const TYPE_JS = 'js';
+
+	/**
+	 * Constant used to identify file type as a CSS file.
+	 *
+	 * @var string
+	 */
 	const TYPE_CSS = 'css';
 
+	/**
+	 * The name option identifier.
+	 *
+	 * @var string
+	 */
 	const NAME = 'name';
+
+	/**
+	 * The source option identifier.
+	 *
+	 * @var string
+	 */
 	const SRC = 'src';
+
+	/**
+	 * The dependencies option identifier.
+	 *
+	 * @var string
+	 */
 	const DEPS = 'deps';
+
+	/**
+	 * The version option identifier.
+	 *
+	 * @var string
+	 */
 	const VERSION = 'version';
 
-	// Style specific.
+	/* Style specific. */
+
+	/**
+	 * The media option identifier.
+	 *
+	 * @var string
+	 */
 	const MEDIA = 'media';
+
+	/**
+	 * The rtl option identifier.
+	 *
+	 * @var string
+	 */
 	const RTL = 'rtl';
 
-	// Script specific.
+	/* Script specific. */
+
+	/**
+	 * The "in footer" option identifier.
+	 *
+	 * @var string
+	 */
 	const IN_FOOTER = 'in_footer';
 
 	/**
+	 * Asset identifier.
+	 *
 	 * @var string
 	 */
 	protected $name;
 
 	/**
+	 * Path to the asset.
+	 *
 	 * @var string
 	 */
 	protected $src;
 
 	/**
+	 * Asset dependencies.
+	 *
 	 * @var string|array
 	 */
 	protected $deps;
 
 	/**
+	 * Asset version.
+	 *
 	 * @var string
 	 */
 	protected $version;
 
 	/**
+	 * For CSS Assets. The type of media for which this stylesheet has been defined.
+	 *
+	 * See https://www.w3.org/TR/CSS2/media.html#media-types.
+	 *
 	 * @var string
 	 */
 	protected $media;
 
 	/**
+	 * For JS Assets. Whether or not the script should be loaded in the footer.
+	 *
 	 * @var boolean
 	 */
 	protected $in_footer;
 
 	/**
+	 * For CSS Assets. Whether this stylesheet is a right-to-left stylesheet.
+	 *
 	 * @var boolean
 	 */
 	protected $rtl;
 
 	/**
+	 * File suffix.
+	 *
 	 * @var string
 	 */
 	protected $suffix;
 
 	/**
+	 * Default asset arguments.
+	 *
+	 * @var array
+	 */
+	private $defaults = array(
+		'deps'      => array(),
+		'version'   => WPSEO_VERSION,
+		'in_footer' => true,
+		'rtl'       => true,
+		'media'     => 'all',
+		'suffix'    => WPSEO_CSSJS_SUFFIX,
+	);
+
+	/**
+	 * Constructs an instance of the WPSEO_Admin_Asset class.
+	 *
 	 * @param array $args The arguments for this asset.
 	 *
 	 * @throws InvalidArgumentException Throws when no name or src has been provided.
@@ -79,14 +165,7 @@
 			throw new InvalidArgumentException( 'src is a required argument' );
 		}
 
-		$args = array_merge( array(
-			'deps'      => array(),
-			'version'   => WPSEO_VERSION,
-			'in_footer' => true,
-			'rtl'       => true,
-			'media'     => 'all',
-			'suffix'    => WPSEO_CSSJS_SUFFIX,
-		), $args );
+		$args = array_merge( $this->defaults, $args );
 
 		$this->name      = $args['name'];
 		$this->src       = $args['src'];
@@ -99,6 +178,8 @@
 	}
 
 	/**
+	 * Returns the asset identifier.
+	 *
 	 * @return string
 	 */
 	public function get_name() {
@@ -106,6 +187,8 @@
 	}
 
 	/**
+	 * Returns the path to the asset.
+	 *
 	 * @return string
 	 */
 	public function get_src() {
@@ -113,6 +196,8 @@
 	}
 
 	/**
+	 * Returns the asset dependencies.
+	 *
 	 * @return array|string
 	 */
 	public function get_deps() {
@@ -120,6 +205,8 @@
 	}
 
 	/**
+	 * Returns the asset version.
+	 *
 	 * @return string
 	 */
 	public function get_version() {
@@ -127,6 +214,8 @@
 	}
 
 	/**
+	 * Returns the media type for CSS assets.
+	 *
 	 * @return string
 	 */
 	public function get_media() {
@@ -134,6 +223,8 @@
 	}
 
 	/**
+	 * Returns whether a script asset should be loaded in the footer of the page.
+	 *
 	 * @return boolean
 	 */
 	public function is_in_footer() {
@@ -141,6 +232,8 @@
 	}
 
 	/**
+	 * Returns whether this CSS has a RTL counterpart.
+	 *
 	 * @return boolean
 	 */
 	public function has_rtl() {
@@ -148,6 +241,8 @@
 	}
 
 	/**
+	 * Returns the file suffix.
+	 *
 	 * @return string
 	 */
 	public function get_suffix() {
@@ -157,6 +252,9 @@
 	/**
 	 * Returns the full URL for this asset based on the path to the plugin file.
 	 *
+	 * @deprecated 6.2
+	 * @codeCoverageIgnore
+	 *
 	 * @param string $type        Type of asset.
 	 * @param string $plugin_file Absolute path to the plugin file.
 	 *

=== modified file 'admin/class-bulk-description-editor-list-table.php'
--- admin/class-bulk-description-editor-list-table.php	2018-07-04 09:50:13 +0000
+++ admin/class-bulk-description-editor-list-table.php	2019-11-08 16:06:28 +0000
@@ -19,7 +19,7 @@
 	protected $page_type = 'description';
 
 	/**
-	 * Settings with are used in __construct
+	 * Settings with are used in __construct.
 	 *
 	 * @var array
 	 */
@@ -37,7 +37,7 @@
 	protected $target_db_field = 'metadesc';
 
 	/**
-	 * The columns shown on the table
+	 * The columns shown on the table.
 	 *
 	 * @return array
 	 */
@@ -51,7 +51,7 @@
 	}
 
 	/**
-	 * Parse the metadescription
+	 * Parse the metadescription.
 	 *
 	 * @param string $column_name Column name.
 	 * @param object $record      Data object.
@@ -70,6 +70,9 @@
 
 			case 'col_existing_yoast_seo_metadesc':
 				// @todo Inconsistent return/echo behavior R.
+				// I traced the escaping of the attributes to WPSEO_Bulk_List_Table::column_attributes. Alexander.
+				// The output of WPSEO_Bulk_List_Table::parse_meta_data_field is properly escaped.
+				// phpcs:ignore WordPress.Security.EscapeOutput
 				echo $this->parse_meta_data_field( $record->ID, $attributes );
 				break;
 		}

=== modified file 'admin/class-bulk-editor-list-table.php'
--- admin/class-bulk-editor-list-table.php	2018-07-04 09:50:13 +0000
+++ admin/class-bulk-editor-list-table.php	2019-11-08 16:06:28 +0000
@@ -12,7 +12,7 @@
 class WPSEO_Bulk_List_Table extends WP_List_Table {
 
 	/**
-	 * The nonce that was passed with the request
+	 * The nonce that was passed with the request.
 	 *
 	 * @var string
 	 */
@@ -40,35 +40,35 @@
 	protected $meta_data = array();
 
 	/**
-	 * The current requested page_url
+	 * The current requested page_url.
 	 *
 	 * @var string
 	 */
-	private $request_url;
+	private $request_url = '';
 
 	/**
-	 * The current page (depending on $_GET['paged']) if current tab is for current page_type, else it will be 1
+	 * The current page (depending on $_GET['paged']) if current tab is for current page_type, else it will be 1.
 	 *
 	 * @var integer
 	 */
 	private $current_page;
 
 	/**
-	 * The current post filter, if is used (depending on $_GET['post_type_filter'])
+	 * The current post filter, if is used (depending on $_GET['post_type_filter']).
 	 *
 	 * @var string
 	 */
 	private $current_filter;
 
 	/**
-	 * The current post status, if is used (depending on $_GET['post_status'])
+	 * The current post status, if is used (depending on $_GET['post_status']).
 	 *
 	 * @var string
 	 */
 	private $current_status;
 
 	/**
-	 * The current sorting, if used (depending on $_GET['order'] and $_GET['orderby'])
+	 * The current sorting, if used (depending on $_GET['order'] and $_GET['orderby']).
 	 *
 	 * @var string
 	 */
@@ -83,7 +83,7 @@
 
 	/**
 	 * Based on the page_type ($this->page_type) there will be constructed an url part, for subpages and
-	 * navigation
+	 * navigation.
 	 *
 	 * @var string
 	 */
@@ -97,72 +97,52 @@
 	protected $settings;
 
 	/**
+	 * Holds the pagination config.
+	 *
 	 * @var array
 	 */
 	protected $pagination = array();
 
 	/**
-	 * Class constructor
-	 */
-	public function __construct() {
+	 * Holds the sanitized data from the user input.
+	 *
+	 * @var array
+	 */
+	protected $input_fields = array();
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param array $args The arguments.
+	 */
+	public function __construct( $args = array() ) {
 		parent::__construct( $this->settings );
 
-		$this->request_url    = $_SERVER['REQUEST_URI'];
-		$this->current_page   = ( ! empty( $_GET['paged'] ) ) ? $_GET['paged'] : 1;
-		$this->current_filter = ( ! empty( $_GET['post_type_filter'] ) ) ? $_GET['post_type_filter'] : 1;
-		$this->current_status = ( ! empty( $_GET['post_status'] ) ) ? $_GET['post_status'] : 1;
+		$args = wp_parse_args(
+			$args,
+			array(
+				'nonce'        => '',
+				'input_fields' => array(),
+			)
+		);
+
+		$this->input_fields = $args['input_fields'];
+		if ( isset( $_SERVER['REQUEST_URI'] ) ) {
+			$this->request_url = sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) );
+		}
+
+		$this->current_page   = ( ! empty( $this->input_fields['paged'] ) ) ? $this->input_fields['paged'] : 1;
+		$this->current_filter = ( ! empty( $this->input_fields['post_type_filter'] ) ) ? $this->input_fields['post_type_filter'] : 1;
+		$this->current_status = ( ! empty( $this->input_fields['post_status'] ) ) ? $this->input_fields['post_status'] : 1;
 		$this->current_order  = array(
-			'order'   => ( ! empty( $_GET['order'] ) ) ? $_GET['order'] : 'asc',
-			'orderby' => ( ! empty( $_GET['orderby'] ) ) ? $_GET['orderby'] : 'post_title',
+			'order'   => ( ! empty( $this->input_fields['order'] ) ) ? $this->input_fields['order'] : 'asc',
+			'orderby' => ( ! empty( $this->input_fields['orderby'] ) ) ? $this->input_fields['orderby'] : 'post_title',
 		);
 
-		$this->verify_nonce();
-
-		$this->nonce    = wp_create_nonce( 'bulk-editor-table' );
+		$this->nonce    = $args['nonce'];
 		$this->page_url = "&nonce={$this->nonce}&type={$this->page_type}#top#{$this->page_type}";
 
 		$this->populate_editable_post_types();
-
-	}
-
-	/**
-	 * Verifies nonce if additional parameters have been sent.
-	 *
-	 * Shows an error notification if the nonce check fails.
-	 */
-	private function verify_nonce() {
-		if ( $this->should_verify_nonce() && ! wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), 'bulk-editor-table' ) ) {
-			Yoast_Notification_Center::get()->add_notification(
-				new Yoast_Notification(
-					__( 'You are not allowed to access this page.', 'wordpress-seo' ),
-					array( 'type' => Yoast_Notification::ERROR )
-				)
-			);
-			Yoast_Notification_Center::get()->display_notifications();
-			die;
-		}
-	}
-
-	/**
-	 * Checks if additional parameters have been sent to determine if nonce should be checked or not.
-	 *
-	 * @return bool
-	 */
-	private function should_verify_nonce() {
-		$possible_params = array(
-			'type',
-			'paged',
-			'post_type_filter',
-			'post_status',
-			'order',
-			'orderby',
-		);
-
-		foreach ( $possible_params as $param_name ) {
-			if ( filter_input( INPUT_GET, $param_name ) ) {
-				return true;
-			}
-		}
 	}
 
 	/**
@@ -207,9 +187,8 @@
 		}
 	}
 
-
 	/**
-	 * Will shown the navigation for the table like pagenavigation and pagefilter;
+	 * Will show the navigation for the table like pagenavigation and pagefilter.
 	 *
 	 * @param string $which Table nav location (such as top).
 	 */
@@ -255,7 +234,8 @@
 	 * This function takes into account the post types in which the current user can
 	 * edit all posts, and the ones the current user can only edit his/her own.
 	 *
-	 * @return string $subquery The subquery, which should always be used in $wpdb->prepare(), passing the current user_id in as the first parameter.
+	 * @return string The subquery, which should always be used in $wpdb->prepare(),
+	 *                passing the current user_id in as the first parameter.
 	 */
 	public function get_base_subquery() {
 		global $wpdb;
@@ -278,9 +258,10 @@
 		return $subquery;
 	}
 
-
 	/**
-	 * @return array
+	 * Gets the views.
+	 *
+	 * @return array The views.
 	 */
 	public function get_views() {
 		global $wpdb;
@@ -301,15 +282,15 @@
 		);
 
 
-		$post_status    = filter_input( INPUT_GET, 'post_status' );
-		$class          = empty( $post_status ) ? ' class="current"' : '';
-		$localized_text = sprintf(
+		$post_status             = filter_input( INPUT_GET, 'post_status' );
+		$current_link_attributes = empty( $post_status ) ? ' class="current" aria-current="page"' : '';
+		$localized_text          = sprintf(
 			/* translators: %s expands to the number of posts in localized format. */
 			_nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts, 'posts', 'wordpress-seo' ),
 			number_format_i18n( $total_posts )
 		);
 
-		$status_links['all'] = '<a href="' . esc_url( admin_url( 'admin.php?page=wpseo_tools&tool=bulk-editor' . $this->page_url ) ) . '"' . $class . '>' . $localized_text . '</a>';
+		$status_links['all'] = '<a href="' . esc_url( admin_url( 'admin.php?page=wpseo_tools&tool=bulk-editor' . $this->page_url ) ) . '"' . $current_link_attributes . '>' . $localized_text . '</a>';
 
 		$post_stati = get_post_stati( array( 'show_in_admin_all_list' => true ), 'objects' );
 		if ( is_array( $post_stati ) && $post_stati !== array() ) {
@@ -331,15 +312,15 @@
 					continue;
 				}
 
-				$class = '';
+				$current_link_attributes = '';
 				if ( $status_name === $post_status ) {
-					$class = ' class="current"';
+					$current_link_attributes = ' class="current" aria-current="page"';
 				}
 
-				$status_links[ $status_name ] = '<a href="' . esc_url( add_query_arg( array( 'post_status' => $status_name ), admin_url( 'admin.php?page=wpseo_tools&tool=bulk-editor' . $this->page_url ) ) ) . '"' . $class . '>' . sprintf( translate_nooped_plural( $status->label_count, $total ), number_format_i18n( $total ) ) . '</a>';
+				$status_links[ $status_name ] = '<a href="' . esc_url( add_query_arg( array( 'post_status' => $status_name ), admin_url( 'admin.php?page=wpseo_tools&tool=bulk-editor' . $this->page_url ) ) ) . '"' . $current_link_attributes . '>' . sprintf( translate_nooped_plural( $status->label_count, $total ), number_format_i18n( $total ) ) . '</a>';
 			}
 		}
-		unset( $post_stati, $status, $status_name, $total, $class );
+		unset( $post_stati, $status, $status_name, $total, $current_link_attributes );
 
 		$trashed_posts = $wpdb->get_var(
 			"
@@ -348,9 +329,9 @@
 				"
 		);
 
-		$class = '';
+		$current_link_attributes = '';
 		if ( 'trash' === $post_status ) {
-			$class = 'class="current"';
+			$current_link_attributes = 'class="current" aria-current="page"';
 		}
 
 		$localized_text = sprintf(
@@ -359,13 +340,14 @@
 			number_format_i18n( $trashed_posts )
 		);
 
-		$status_links['trash'] = '<a href="' . esc_url( admin_url( 'admin.php?page=wpseo_tools&tool=bulk-editor&post_status=trash' . $this->page_url ) ) . '"' . $class . '>' . $localized_text . '</a>';
+		$status_links['trash'] = '<a href="' . esc_url( admin_url( 'admin.php?page=wpseo_tools&tool=bulk-editor&post_status=trash' . $this->page_url ) ) . '"' . $current_link_attributes . '>' . $localized_text . '</a>';
 
 		return $status_links;
 	}
 
-
 	/**
+	 * Outputs extra table navigation.
+	 *
 	 * @param string $which Table nav location (such as top).
 	 */
 	public function extra_tablenav( $which ) {
@@ -427,17 +409,21 @@
 				);
 				printf(
 					'<select name="post_type_filter" id="%2$s">%1$s</select>',
+					// phpcs:ignore WordPress.Security.EscapeOutput -- Reason: $options is properly escaped above.
 					$options,
 					esc_attr( 'post-type-filter-' . $instance_type )
 				);
 
-				submit_button( __( 'Filter', 'wordpress-seo' ), 'button', false, false, array( 'id' => 'post-query-submit' ) );
+				submit_button( esc_html__( 'Filter', 'wordpress-seo' ), 'button', false, false, array( 'id' => 'post-query-submit' ) );
 				echo '</div>';
 			}
 		}
 	}
 
 	/**
+	 * Gets a list of sortable columns.
+	 *
+	 * The format is: 'internal-name' => array( 'orderby', bool ).
 	 *
 	 * @return array
 	 */
@@ -450,7 +436,7 @@
 	}
 
 	/**
-	 * Sets the correct pagenumber and pageurl for the navigation
+	 * Sets the correct pagenumber and pageurl for the navigation.
 	 */
 	public function prepare_page_navigation() {
 
@@ -461,8 +447,11 @@
 		$current_status = $this->current_status;
 		$current_order  = $this->current_order;
 
-		// If current type doesn't compare with objects page_type, than we have to unset some vars in the requested url (which will be use for internal table urls).
-		if ( $_GET['type'] !== $this->page_type ) {
+		/*
+		 * If current type doesn't compare with objects page_type, then we have to unset
+		 * some vars in the requested url (which will be used for internal table urls).
+		 */
+		if ( isset( $this->input_fields['type'] ) && $this->input_fields['type'] !== $this->page_type ) {
 			$request_url = remove_query_arg( 'paged', $request_url ); // Page will be set with value 1 below.
 			$request_url = remove_query_arg( 'post_type_filter', $request_url );
 			$request_url = remove_query_arg( 'post_status', $request_url );
@@ -488,11 +477,10 @@
 		$_GET['post_status']          = $current_status;
 		$_GET['orderby']              = $current_order['orderby'];
 		$_GET['order']                = $current_order['order'];
-
 	}
 
 	/**
-	 * Preparing the requested pagerows and setting the needed variables
+	 * Preparing the requested pagerows and setting the needed variables.
 	 */
 	public function prepare_items() {
 
@@ -513,11 +501,10 @@
 
 		// Get the metadata for the current items ($this->items).
 		$this->get_meta_data();
-
 	}
 
 	/**
-	 * Getting the columns for first row
+	 * Getting the columns for first row.
 	 *
 	 * @return array
 	 */
@@ -526,7 +513,7 @@
 	}
 
 	/**
-	 * Setting the column headers
+	 * Setting the column headers.
 	 */
 	protected function set_column_headers() {
 		$columns               = $this->get_columns();
@@ -536,7 +523,7 @@
 	}
 
 	/**
-	 * Counting total items
+	 * Counting total items.
 	 *
 	 * @param string $subquery         SQL FROM part.
 	 * @param string $all_states       SQL IN part.
@@ -558,7 +545,7 @@
 	}
 
 	/**
-	 * Getting the post_type_clause filter
+	 * Getting the post_type_clause filter.
 	 *
 	 * @return string
 	 */
@@ -605,7 +592,6 @@
 			'per_page' => $per_page,
 			'offset'   => ( $paged - 1 ) * $per_page,
 		);
-
 	}
 
 	/**
@@ -645,7 +631,8 @@
 	}
 
 	/**
-	 * Heavily restricts the possible columns by which a user can order the table in the bulk editor, thereby preventing a possible CSRF vulnerability.
+	 * Heavily restricts the possible columns by which a user can order the table
+	 * in the bulk editor, thereby preventing a possible CSRF vulnerability.
 	 *
 	 * @param string $orderby The column by which we want to order.
 	 *
@@ -666,7 +653,8 @@
 	}
 
 	/**
-	 * Makes sure the order clause is always ASC or DESC for the bulk editor table, thereby preventing a possible CSRF vulnerability.
+	 * Makes sure the order clause is always ASC or DESC for the bulk editor table,
+	 * thereby preventing a possible CSRF vulnerability.
 	 *
 	 * @param string $order Whether we want to sort ascending or descending.
 	 *
@@ -706,8 +694,8 @@
 		$states          = get_post_stati( array( 'show_in_admin_all_list' => true ) );
 		$states['trash'] = 'trash';
 
-		if ( ! empty( $_GET['post_status'] ) ) {
-			$requested_state = sanitize_text_field( $_GET['post_status'] );
+		if ( ! empty( $this->input_fields['post_status'] ) ) {
+			$requested_state = $this->input_fields['post_status'];
 			if ( in_array( $requested_state, $states, true ) ) {
 				$states = array( $requested_state );
 			}
@@ -783,7 +771,7 @@
 		}
 
 		if ( ! empty( $class ) ) {
-			$attributes = 'class="' . implode( ' ', $class ) . '"';
+			$attributes = 'class="' . esc_attr( implode( ' ', $class ) ) . '"';
 		}
 
 		$attributes .= ' data-colname="' . esc_attr( $column_display_name ) . '"';
@@ -845,7 +833,6 @@
 		$return .= $this->row_actions( $actions );
 
 		return $return;
-
 	}
 
 	/**
@@ -924,7 +911,11 @@
 			$meta_value = $values[ $meta_value ];
 		}
 
-		return sprintf( '<td %2$s id="wpseo-existing-%4$s-%3$s">%1$s</td>', $meta_value, $attributes, $record_id, $this->target_db_field );
+		$id = "wpseo-existing-$record_id-$this->target_db_field";
+
+		// $attributes correctly escaped, verified by Alexander. See WPSEO_Bulk_Description_List_Table::parse_page_specific_column.
+		// phpcs:ignore WordPress.Security.EscapeOutput
+		return sprintf( '<td %2$s id="%3$s">%1$s</td>', esc_html( $meta_value ), $attributes, esc_attr( $id ) );
 	}
 
 	/**
@@ -942,7 +933,6 @@
 
 		// Little housekeeping.
 		unset( $post_ids, $meta_data );
-
 	}
 
 	/**
@@ -992,7 +982,6 @@
 		foreach ( $meta_data as $row ) {
 			$this->meta_data[ $row->post_id ][ $row->meta_key ] = $row->meta_value;
 		}
-
 	}
 
 	/**

=== modified file 'admin/class-bulk-title-editor-list-table.php'
--- admin/class-bulk-title-editor-list-table.php	2018-07-04 09:50:13 +0000
+++ admin/class-bulk-title-editor-list-table.php	2019-11-08 16:06:28 +0000
@@ -12,15 +12,14 @@
 class WPSEO_Bulk_Title_Editor_List_Table extends WPSEO_Bulk_List_Table {
 
 	/**
-	 * Current type for this class will be title
+	 * Current type for this class will be title.
 	 *
 	 * @var string
 	 */
 	protected $page_type = 'title';
 
-
 	/**
-	 * Settings with are used in __construct
+	 * Settings with are used in __construct.
 	 *
 	 * @var array
 	 */
@@ -38,7 +37,7 @@
 	protected $target_db_field = 'title';
 
 	/**
-	 * The columns shown on the table
+	 * The columns shown on the table.
 	 *
 	 * @return array
 	 */
@@ -55,7 +54,7 @@
 	}
 
 	/**
-	 * Parse the title columns
+	 * Parse the title columns.
 	 *
 	 * @param string $column_name Column name.
 	 * @param object $record      Data object.
@@ -70,7 +69,10 @@
 
 		switch ( $column_name ) {
 			case 'col_existing_yoast_seo_title':
-				// @todo Inconsistent echo/return behavior R.
+				// @todo Inconsistent return/echo behavior R.
+				// I traced the escaping of the attributes to WPSEO_Bulk_List_Table::column_attributes.
+				// The output of WPSEO_Bulk_List_Table::parse_meta_data_field is properly escaped.
+				// phpcs:ignore WordPress.Security.EscapeOutput
 				echo $this->parse_meta_data_field( $record->ID, $attributes );
 				break;
 

=== modified file 'admin/class-collector.php'
--- admin/class-collector.php	2018-07-04 09:50:13 +0000
+++ admin/class-collector.php	2019-11-08 16:06:28 +0000
@@ -10,7 +10,11 @@
  */
 class WPSEO_Collector {
 
-	/** @var WPSEO_Collection[] */
+	/**
+	 * Holds the collections.
+	 *
+	 * @var WPSEO_Collection[]
+	 */
 	protected $collections = array();
 
 	/**
@@ -43,6 +47,6 @@
 	 * @return false|string The encode string.
 	 */
 	public function get_as_json() {
-		return wp_json_encode( $this->collect() );
+		return WPSEO_Utils::format_json_encode( $this->collect() );
 	}
 }

=== modified file 'admin/class-config.php'
--- admin/class-config.php	2018-07-04 09:50:13 +0000
+++ admin/class-config.php	2019-11-08 16:06:28 +0000
@@ -6,14 +6,16 @@
  */
 
 /**
- * Class WPSEO_Admin_Pages
+ * Class WPSEO_Admin_Pages.
  *
  * Class with functionality for the Yoast SEO admin pages.
  */
 class WPSEO_Admin_Pages {
 
 	/**
-	 * @var string $currentoption The option in use for the current admin page.
+	 * The option in use for the current admin page.
+	 *
+	 * @var string
 	 */
 	public $currentoption = 'wpseo';
 
@@ -25,7 +27,7 @@
 	private $asset_manager;
 
 	/**
-	 * Class constructor, which basically only hooks the init function on the init hook
+	 * Class constructor, which basically only hooks the init function on the init hook.
 	 */
 	public function __construct() {
 		add_action( 'init', array( $this, 'init' ), 20 );
@@ -33,7 +35,7 @@
 	}
 
 	/**
-	 * Make sure the needed scripts are loaded for admin pages
+	 * Make sure the needed scripts are loaded for admin pages.
 	 */
 	public function init() {
 		if ( filter_input( INPUT_GET, 'wpseo_reset_defaults' ) && wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), 'wpseo_reset_defaults' ) && current_user_can( 'manage_options' ) ) {
@@ -41,26 +43,11 @@
 			wp_redirect( admin_url( 'admin.php?page=' . WPSEO_Configuration_Page::PAGE_IDENTIFIER ) );
 		}
 
-		add_action( 'admin_init', array( $this, 'admin_init' ) );
 		add_action( 'admin_enqueue_scripts', array( $this, 'config_page_scripts' ) );
 		add_action( 'admin_enqueue_scripts', array( $this, 'config_page_styles' ) );
 	}
 
 	/**
-	 * Run admin-specific actions.
-	 */
-	public function admin_init() {
-
-		$page         = filter_input( INPUT_GET, 'page' );
-		$tool         = filter_input( INPUT_GET, 'tool' );
-		$export_nonce = filter_input( INPUT_POST, WPSEO_Export::NONCE_NAME );
-
-		if ( 'wpseo_tools' === $page && 'import-export' === $tool && $export_nonce !== null ) {
-			$this->do_yoast_export();
-		}
-	}
-
-	/**
 	 * Loads the required styles for the config page.
 	 */
 	public function config_page_styles() {
@@ -84,7 +71,7 @@
 
 		if ( $page === 'wpseo_titles' ) {
 			wp_localize_script( WPSEO_Admin_Asset_Manager::PREFIX . 'search-appearance', 'wpseoReplaceVarsL10n', $this->localize_replace_vars_script() );
-			wp_localize_script( WPSEO_Admin_Asset_Manager::PREFIX . 'search-appearance', 'wpseoSearchAppearance', array( 'isRtl' => is_rtl() ) );
+			wp_localize_script( WPSEO_Admin_Asset_Manager::PREFIX . 'search-appearance', 'wpseoSearchAppearance', $this->localize_search_appearance_script() );
 			$this->asset_manager->enqueue_script( 'search-appearance' );
 			$this->asset_manager->enqueue_style( 'search-appearance' );
 			/**
@@ -93,14 +80,14 @@
 			 */
 			remove_action( 'admin_print_scripts', 'print_emoji_detection_script' );
 
-			$yoast_components_l10n = new WPSEO_Admin_Asset_Yoast_Components_l10n();
+			$yoast_components_l10n = new WPSEO_Admin_Asset_Yoast_Components_L10n();
 			$yoast_components_l10n->localize_script( 'search-appearance' );
 		}
 
 		wp_enqueue_script( 'dashboard' );
 		wp_enqueue_script( 'thickbox' );
 
-		wp_localize_script( WPSEO_Admin_Asset_Manager::PREFIX . 'admin-script', 'wpseoSelect2Locale', WPSEO_Utils::get_language( WPSEO_Utils::get_user_locale() ) );
+		wp_localize_script( WPSEO_Admin_Asset_Manager::PREFIX . 'admin-script', 'wpseoSelect2Locale', WPSEO_Language_Utils::get_language( WPSEO_Language_Utils::get_user_locale() ) );
 
 		if ( in_array( $page, array( 'wpseo_social', WPSEO_Admin::PAGE_IDENTIFIER, 'wpseo_titles' ), true ) ) {
 			wp_enqueue_media();
@@ -131,13 +118,52 @@
 	 * @return array The replacement and recommended replacement variables.
 	 */
 	public function localize_replace_vars_script() {
-		$replace_vars             = new WPSEO_Replace_Vars();
-		$recommended_replace_vars = new WPSEO_Admin_Recommended_Replace_Vars();
+		$replace_vars                 = new WPSEO_Replace_Vars();
+		$recommended_replace_vars     = new WPSEO_Admin_Recommended_Replace_Vars();
+		$editor_specific_replace_vars = new WPSEO_Admin_Editor_Specific_Replace_Vars();
+		$replace_vars_list            = $replace_vars->get_replacement_variables_list();
 
 		return array(
-			'replace_vars'             => $replace_vars->get_replacement_variables_list(),
-			'recommended_replace_vars' => $recommended_replace_vars->get_recommended_replacevars(),
-		);
+			'replace_vars'                 => $replace_vars_list,
+			'recommended_replace_vars'     => $recommended_replace_vars->get_recommended_replacevars(),
+			'editor_specific_replace_vars' => $editor_specific_replace_vars->get(),
+			'shared_replace_vars'          => $editor_specific_replace_vars->get_generic( $replace_vars_list ),
+		);
+	}
+
+	/**
+	 * Retrieves some variables that are needed for the search appearance in JS.
+	 *
+	 * @return array The search appearance variables.
+	 */
+	public function localize_search_appearance_script() {
+		$search_appearance_l10n = array(
+			'isRtl'                    => is_rtl(),
+			'userEditUrl'              => add_query_arg( 'user_id', '{user_id}', admin_url( 'user-edit.php' ) ),
+			'brushstrokeBackgroundURL' => plugins_url( 'images/brushstroke_background.svg', WPSEO_FILE ),
+			'showLocalSEOUpsell'       => $this->should_show_local_seo_upsell(),
+			'localSEOUpsellURL'        => WPSEO_Shortlinker::get( 'https://yoa.st/3mp' ),
+		);
+
+		$search_appearance_l10n['knowledgeGraphCompanyInfoMissing'] = WPSEO_Language_Utils::get_knowledge_graph_company_info_missing_l10n();
+
+		return $search_appearance_l10n;
+	}
+
+	/**
+	 * Determines whether the Local SEO upsell should be shown.
+	 *
+	 * The Local SEO upsell should:
+	 * - Only be shown in Free, not when Premium is active.
+	 * - Not be shown when Local SEO is active.
+	 *
+	 * @return bool Whether the Local SEO upsell should be shown.
+	 */
+	private function should_show_local_seo_upsell() {
+		$addon_manager = new WPSEO_Addon_Manager();
+
+		return ! WPSEO_Utils::is_yoast_seo_premium()
+			&& ! ( defined( 'WPSEO_LOCAL_FILE' ) );
 	}
 
 	/**
@@ -154,24 +180,4 @@
 			$this->asset_manager->enqueue_script( 'bulk-editor' );
 		}
 	}
-
-	/**
-	 * Runs the yoast exporter class to possibly init the file download.
-	 */
-	private function do_yoast_export() {
-		check_admin_referer( WPSEO_Export::NONCE_ACTION, WPSEO_Export::NONCE_NAME );
-
-		if ( ! WPSEO_Capability_Utils::current_user_can( 'wpseo_manage_options' ) ) {
-			return;
-		}
-
-		$wpseo_post       = filter_input( INPUT_POST, 'wpseo' );
-		$include_taxonomy = ! empty( $wpseo_post['include_taxonomy'] );
-		$export           = new WPSEO_Export( $include_taxonomy );
-
-		if ( $export->has_error() ) {
-			add_action( 'admin_notices', array( $export, 'set_error_hook' ) );
-
-		}
-	}
 } /* End of class */

=== removed file 'admin/class-cornerstone-field.php'
--- admin/class-cornerstone-field.php	2018-07-04 09:50:13 +0000
+++ admin/class-cornerstone-field.php	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-<?php
-/**
- * WPSEO plugin file.
- *
- * @package WPSEO\Admin
- */
-
-/**
- * Adds a checkbox to the focus keyword section.
- */
-class WPSEO_Cornerstone_Field {
-
-	/**
-	 * Returns a label with a checkbox in it. Make it possible to mark the page as cornerstone content.
-	 *
-	 * @param WP_POST $post The post object.
-	 *
-	 * @return string The HTML to show.
-	 */
-	public function get_html( $post ) {
-
-		$post_types = apply_filters( 'wpseo_cornerstone_post_types', WPSEO_Post_Type::get_accessible_post_types() );
-		if ( ! is_array( $post_types ) || ! isset( $post_types[ get_post_type( $post ) ] ) ) {
-			return '';
-		}
-
-		$return  = '';
-		$return .= sprintf(
-			'<input id="%1$s" class="wpseo-cornerstone-checkbox" type="checkbox" value="1" name="%1$s" %2$s/>',
-			WPSEO_Cornerstone::FIELD_NAME,
-			checked( $this->get_meta_value( $post->ID ), '1', false )
-		);
-
-		$return .= sprintf( '<label for="%1$s">', WPSEO_Cornerstone::FIELD_NAME );
-
-		$return .= sprintf(
-			/* translators: 1: link open tag; 2: link close tag. */
-			__( 'This article is %1$scornerstone content%2$s', 'wordpress-seo' ),
-			'<a href="' . WPSEO_Shortlinker::get( 'https://yoa.st/metabox-help-cornerstone' ) . '" target="_blank">',
-			'</a>'
-		);
-		$return .= '</label>';
-
-		return $return;
-	}
-
-	/**
-	 * Gets the meta value from the database.
-	 *
-	 * @param int $post_id The post id to get the meta value for.
-	 *
-	 * @return null|string The meta value from the database.
-	 */
-	protected function get_meta_value( $post_id ) {
-		return WPSEO_Meta::get_value( WPSEO_Cornerstone::META_NAME, $post_id );
-	}
-}

=== removed file 'admin/class-cornerstone.php'
--- admin/class-cornerstone.php	2018-07-04 09:50:13 +0000
+++ admin/class-cornerstone.php	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-<?php
-/**
- * WPSEO plugin file.
- *
- * @package WPSEO\Admin
- */
-
-/**
- * Represents the yoast cornerstone content.
- */
-class WPSEO_Cornerstone {
-
-	const META_NAME = 'is_cornerstone';
-
-	const FIELD_NAME = 'yoast_wpseo_is_cornerstone';
-
-	/**
-	 * Registers the hooks.
-	 *