Merge branch 'trunk' into scores-in-sidebar

Yoast · Jun 8, 2020 · 797dea5 · 797dea5
2 parents 202cb3e + ee8c219
commit 797dea5
Show file tree

Hide file tree

Showing 20 changed files with 90 additions and 94 deletions.
diff --git a/admin/class-admin.php b/admin/class-admin.php
@@ -268,8 +268,6 @@ public function enqueue_global_style() {
 	 *
 	 * 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.

diff --git a/admin/class-gutenberg-compatibility.php b/admin/class-gutenberg-compatibility.php
@@ -15,14 +15,14 @@ class WPSEO_Gutenberg_Compatibility {
 	 *
 	 * @var string
 	 */
-	const CURRENT_RELEASE = '8.1.0';
+	const CURRENT_RELEASE = '8.2.1';
 
 	/**
 	 * The minimally supported version of Gutenberg by the plugin.
 	 *
 	 * @var string
 	 */
-	const MINIMUM_SUPPORTED = '8.1.0';
+	const MINIMUM_SUPPORTED = '8.2.1';
 
 	/**
 	 * Holds the current version.

diff --git a/css/src/admin-global.css b/css/src/admin-global.css
diff --git a/css/src/icons.css b/css/src/icons.css
diff --git a/css/src/metabox.css b/css/src/metabox.css
diff --git a/css/src/notifications.css b/css/src/notifications.css
diff --git a/css/src/yoast-extensions.css b/css/src/yoast-extensions.css
diff --git a/css/src/yst_plugin_tools.css b/css/src/yst_plugin_tools.css
diff --git a/deprecated/frontend/class-opengraph.php b/deprecated/frontend/class-opengraph.php
@@ -63,7 +63,7 @@ public function og_tag( $property, $content ) {
 	/**
 	 * Outputs the site owner.
 	 *
-	 * @link https://developers.facebook.com/docs/reference/opengraph/object-type/article/
+	 * @link https://ogp.me/#type_article
 	 *
 	 * @return void
 	 *
@@ -95,7 +95,7 @@ public function image_output( $image = false ) {
 	 * @deprecated 14.0
 	 * @codeCoverageIgnore
 	 *
-	 * @link https://developers.facebook.com/docs/reference/opengraph/object-type/article/
+	 * @link https://ogp.me/#type_article
 	 *
 	 * @return boolean
 	 */
@@ -111,7 +111,7 @@ public function url() {
 	 * @deprecated 14.0
 	 * @codeCoverageIgnore
 	 *
-	 * @link https://developers.facebook.com/docs/reference/opengraph/object-type/article/
+	 * @link https://ogp.me/#type_article
 	 *
 	 * @param bool $echo Whether or not to echo the output.
 	 *
@@ -146,7 +146,7 @@ public function description( $echo = true ) {
 	 * @codeCoverageIgnore
 	 *
 	 * @link https://developers.facebook.com/blog/post/2013/06/19/platform-updates--new-open-graph-tags-for-media-publishers-and-more/
-	 * @link https://developers.facebook.com/docs/reference/opengraph/object-type/article/
+	 * @link https://ogp.me/#type_article
 	 *
 	 * @return boolean
 	 */
@@ -163,7 +163,7 @@ public function article_author_facebook() {
 	 * @codeCoverageIgnore
 	 *
 	 * @link https://developers.facebook.com/blog/post/2013/06/19/platform-updates--new-open-graph-tags-for-media-publishers-and-more/
-	 * @link https://developers.facebook.com/docs/reference/opengraph/object-type/article/
+	 * @link https://ogp.me/#type_article
 	 *
 	 * @return boolean
 	 */
@@ -197,8 +197,8 @@ public function type( $echo = true ) {
 	 * @deprecated 14.0
 	 * @codeCoverageIgnore
 	 *
-	 * @link http://www.facebook.com/translations/FacebookLocales.xml for the list of supported locales.
-	 * @link https://developers.facebook.com/docs/reference/opengraph/object-type/article/
+	 * @link https://developers.facebook.com/docs/internationalization/#locales for the list of supported locales.
+	 * @link https://ogp.me/#type_article
 	 *
 	 * @param bool $echo Whether to echo or return the locale.
 	 *
@@ -244,7 +244,7 @@ public function site_name() {
 	 * @deprecated 14.0
 	 * @codeCoverageIgnore
 	 *
-	 * @link https://developers.facebook.com/docs/reference/opengraph/object-type/article/
+	 * @link https://ogp.me/#type_article
 	 *
 	 * @return boolean;
 	 */
@@ -286,7 +286,7 @@ public function app_id() {
 	 * @deprecated 14.0
 	 * @codeCoverageIgnore
 	 *
-	 * @link https://developers.facebook.com/docs/reference/opengraph/object-type/article/
+	 * @link https://ogp.me/#type_article
 	 *
 	 * @return boolean
 	 */
@@ -302,7 +302,7 @@ public function tags() {
 	 * @deprecated 14.0
 	 * @codeCoverageIgnore
 	 *
-	 * @link https://developers.facebook.com/docs/reference/opengraph/object-type/article/
+	 * @link https://ogp.me/#type_article
 	 *
 	 * @return boolean;
 	 */

diff --git a/inc/options/class-wpseo-option-social.php b/inc/options/class-wpseo-option-social.php
@@ -174,7 +174,6 @@ protected function validate_option( $dirty, $clean, $old ) {
 						 * with the exception of underscores.
 						 *
 						 * @link https://support.twitter.com/articles/101299-why-can-t-i-register-certain-usernames
-						 * @link https://dev.twitter.com/docs/platform-objects/users
 						 */
 						if ( preg_match( '`^[A-Za-z0-9_]{1,25}$`', $twitter_id ) ) {
 							$clean[ $key ] = $twitter_id;

diff --git a/package.json b/package.json
@@ -104,11 +104,11 @@
   },
   "dependencies": {
     "@babel/runtime": "7.0.0-beta.55",
-    "@yoast/analysis-report": "^1.4.0",
-    "@yoast/components": "^2.2.0",
-    "@yoast/configuration-wizard": "^2.4.0",
+    "@yoast/analysis-report": "^1.5.0-rc.0",
+    "@yoast/components": "^2.3.0-rc.0",
+    "@yoast/configuration-wizard": "^2.5.0-rc.0",
     "@yoast/helpers": "^0.12.1",
-    "@yoast/search-metadata-previews": "^2.5.0-rc.0",
+    "@yoast/search-metadata-previews": "^2.5.0-rc.1",
     "@yoast/style-guide": "^0.11.2",
     "a11y-speak": "git+https://github.com/Yoast/a11y-speak.git#master",
     "babel-polyfill": "^6.26.0",
@@ -131,13 +131,13 @@
     "redux-thunk": "^2.2.0",
     "select2": "^4.0.5",
     "styled-components": "^4.2.0",
-    "yoast-components": "^5.5.0-rc.0",
+    "yoast-components": "^5.5.0-rc.1",
     "yoastseo": "^1.76.0-rc.0"
   },
   "browserslist": [
     "extends @yoast/browserslist-config"
   ],
   "yoast": {
-    "pluginVersion": "14.3-RC1"
+    "pluginVersion": "14.3-RC2"
   }
 }
diff --git a/readme.txt b/readme.txt
@@ -214,7 +214,9 @@ Release Date: June 9th, 2020
 
 Bugfixes:
 
-* Fixes a bug where the filters `wpseo_metadesc` and `wpseo_title` weren't called with the right argument, which could lead to errors. [#15288](https://github.com/Yoast/wordpress-seo/pull/15288)
+* Fixes a bug where the FAQ schema list item's position would start at 0 instead of 1.
+* Fixes a bug where the filters `wpseo_metadesc` and `wpseo_title` weren't called with the right argument, which could lead to errors.
+* Fixes a bug where our global CSS variables could conflict with global CSS variables of themes.
 
 = 14.2 =
 Release Date: May 26th, 2020

diff --git a/src/generators/schema/faq.php b/src/generators/schema/faq.php
@@ -45,8 +45,9 @@ public function generate() {
 				if ( ! isset( $question['jsonAnswer'] ) || empty( $question['jsonAnswer'] ) ) {
 					continue;
 				}
-				$ids[]   = [ '@id' => $this->context->canonical . '#' . \esc_attr( $question['id'] ) ];
-				$graph[] = $this->generate_question_block( $question, $index );
+				$ids[] = [ '@id' => $this->context->canonical . '#' . \esc_attr( $question['id'] ) ];
+				// Index + 1 below so we start at 1 and count from there.
+				$graph[] = $this->generate_question_block( $question, ( $index + 1 ) );
 				++$number_of_items;
 			}
 		}

diff --git a/src/generators/schema/organization.php b/src/generators/schema/organization.php
@@ -45,8 +45,6 @@ public function generate() {
 	/**
 	 * Retrieve the social profiles to display in the organization schema.
 	 *
-	 * @link https://developers.google.com/webmasters/structured-data/customize/social-profiles
-	 *
 	 * @return array $profiles An array of social profiles.
 	 */
 	private function fetch_social_profiles() {

diff --git a/src/generators/schema/website.php b/src/generators/schema/website.php
@@ -27,8 +27,6 @@ public function is_needed() {
 	 * Outputs code to allow recognition of the internal search engine.
 	 *
 	 * @return array Website data blob.
-	 *
-	 * @link https://developers.google.com/structured-data/site-name
 	 */
 	public function generate() {
 		$data = [
@@ -69,7 +67,7 @@ private function add_alternate_name( $data ) {
 	/**
 	 * Adds the internal search JSON LD code to the homepage if it's not disabled.
 	 *
-	 * @link https://developers.google.com/structured-data/slsb-overview
+	 * @link https://developers.google.com/search/docs/data-types/sitelinks-searchbox
 	 *
 	 * @param array $data The website data array.
 	 *

diff --git a/tests/generators/schema-generator-test.php b/tests/generators/schema-generator-test.php
@@ -332,7 +332,7 @@ public function test_generate_with_block_not_having_generated_output() {
 					[
 						'@type'          => 'Question',
 						'@id'            => '#id-1',
-						'position'       => 0,
+						'position'       => 1,
 						'url'            => '#id-1',
 						'name'           => 'This is a question',
 						'answerCount'    => 1,
@@ -406,7 +406,7 @@ public function get_expected_schema() {
 				[
 					'@type'          => 'Question',
 					'@id'            => '#id-1',
-					'position'       => 0,
+					'position'       => 1,
 					'url'            => '#id-1',
 					'name'           => 'This is a question',
 					'answerCount'    => 1,

diff --git a/tests/generators/schema/faq-test.php b/tests/generators/schema/faq-test.php
@@ -124,7 +124,7 @@ public function test_generate() {
 			[
 				'@id'            => 'https://example.org/page/#id-1',
 				'@type'          => 'Question',
-				'position'       => 0,
+				'position'       => 1,
 				'url'            => 'https://example.org/page/#id-1',
 				'name'           => 'This is a question',
 				'answerCount'    => 1,
@@ -138,7 +138,7 @@ public function test_generate() {
 			[
 				'@id'            => 'https://example.org/page/#id-2',
 				'@type'          => 'Question',
-				'position'       => 1,
+				'position'       => 2,
 				'url'            => 'https://example.org/page/#id-2',
 				'name'           => 'This is the second question',
 				'answerCount'    => 1,
@@ -220,7 +220,7 @@ public function test_generate_does_not_output_questions_with_no_answer() {
 			[
 				'@id'            => 'https://example.org/page/#id-1',
 				'@type'          => 'Question',
-				'position'       => 0,
+				'position'       => 1,
 				'url'            => 'https://example.org/page/#id-1',
 				'name'           => 'This is a question',
 				'answerCount'    => 1,

diff --git a/wp-seo-main.php b/wp-seo-main.php
@@ -15,7 +15,7 @@
  * {@internal Nobody should be able to overrule the real version number as this can cause
  *            serious issues with the options, so no if ( ! defined() ).}}
  */
-define( 'WPSEO_VERSION', '14.3-RC1' );
+define( 'WPSEO_VERSION', '14.3-RC2' );
 
 
 if ( ! defined( 'WPSEO_PATH' ) ) {

diff --git a/wp-seo.php b/wp-seo.php
@@ -8,7 +8,7 @@
  *
  * @wordpress-plugin
  * Plugin Name: Yoast SEO
- * Version:     14.3-RC1
+ * Version:     14.3-RC2
  * Plugin URI:  https://yoa.st/1uj
  * Description: The first true all-in-one SEO solution for WordPress, including on-page content analysis, XML sitemaps and much more.
  * Author:      Team Yoast