Merge branch 'release/19.12' of github.com:Yoast/wordpress-seo into trunk

Author: leonidasmi

admin/class-gutenberg-compatibility.php

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

package.json

@@ -84,7 +84,7 @@
     "typescript": "^4.2.4"
   },
   "yoast": {
-    "pluginVersion": "19.12-RC9"
+    "pluginVersion": "19.12-RC10"
   },
   "version": "0.0.0"
 }

readme.txt

@@ -267,6 +267,7 @@ Release date: December 13th, 2022
 #### Bugfixes
 
 * Fixes a bug that would affect users managing the cron jobs with a plugin on PHP 8.1 after they have performed a core upgrade.
+* Fixes a bug where a fatal error would be thrown when trying to create breadcrumbs from unindexable items.
 * Fixes a bug where blocks with a NULL `blockName` would trigger deprecation errors with PHP 8.1 and cause performance issues. Props to [@dustyf](https://github.com/dustyf).
 * Fixes a bug where breadcrumbs markup would not validate due to improper nesting and closing of span tags. Props to [@michaelbourne](https://github.com/michaelbourne).
 * Fixes a bug where highlighting would not be removed from the text after the analysis is updated and the present highlighting has become irrelevant.

src/generators/breadcrumbs-generator.php

@@ -97,19 +97,22 @@ public function generate( Meta_Tags_Context $context ) {
 		if ( $breadcrumbs_home !== '' && ! \in_array( $this->current_page_helper->get_page_type(), [ 'Home_Page', 'Static_Home_Page' ], true ) ) {
 			$front_page_id = $this->current_page_helper->get_front_page_id();
 			if ( $front_page_id === 0 ) {
-				$static_ancestors[] = $this->repository->find_for_home_page();
+				$home_page_ancestor = $this->repository->find_for_home_page();
+				if ( \is_a( $home_page_ancestor, Indexable::class ) ) {
+					$static_ancestors[] = $home_page_ancestor;
+				}
 			}
 			else {
 				$static_ancestor = $this->repository->find_by_id_and_type( $front_page_id, 'post' );
-				if ( $static_ancestor->post_status !== 'unindexed' ) {
+				if ( \is_a( $static_ancestor, Indexable::class ) && $static_ancestor->post_status !== 'unindexed' ) {
 					$static_ancestors[] = $static_ancestor;
 				}
 			}
 		}
 		$page_for_posts = \get_option( 'page_for_posts' );
 		if ( $this->should_have_blog_crumb( $page_for_posts, $context ) ) {
 			$static_ancestor = $this->repository->find_by_id_and_type( $page_for_posts, 'post' );
-			if ( $static_ancestor->post_status !== 'unindexed' ) {
+			if ( \is_a( $static_ancestor, Indexable::class ) && $static_ancestor->post_status !== 'unindexed' ) {
 				$static_ancestors[] = $static_ancestor;
 			}
 		}
@@ -119,12 +122,18 @@ public function generate( Meta_Tags_Context $context ) {
 			&& $context->indexable->object_sub_type !== 'page'
 			&& $this->post_type_helper->has_archive( $context->indexable->object_sub_type )
 		) {
-			$static_ancestors[] = $this->repository->find_for_post_type_archive( $context->indexable->object_sub_type );
+			$static_ancestor = $this->repository->find_for_post_type_archive( $context->indexable->object_sub_type );
+			if ( \is_a( $static_ancestor, Indexable::class ) ) {
+				$static_ancestors[] = $static_ancestor;
+			}
 		}
 		if ( $context->indexable->object_type === 'term' ) {
 			$parent = $this->get_taxonomy_post_type_parent( $context->indexable->object_sub_type );
 			if ( $parent && $parent !== 'post' && $this->post_type_helper->has_archive( $parent ) ) {
-				$static_ancestors[] = $this->repository->find_for_post_type_archive( $parent );
+				$static_ancestor = $this->repository->find_for_post_type_archive( $parent );
+				if ( \is_a( $static_ancestor, Indexable::class ) ) {
+					$static_ancestors[] = $static_ancestor;
+				}
 			}
 		}
 
@@ -137,6 +146,13 @@ public function generate( Meta_Tags_Context $context ) {
 		}
 
 		$indexables = \apply_filters( 'wpseo_breadcrumb_indexables', $indexables, $context );
+		$indexables = \is_array( $indexables ) ? $indexables : [];
+		$indexables = \array_filter(
+			$indexables,
+			function ( $indexable ) {
+				return \is_a( $indexable, Indexable::class );
+			}
+		);
 
 		$callback = function ( Indexable $ancestor ) {
 			$crumb = [

src/integrations/third-party/woocommerce.php

@@ -178,7 +178,10 @@ public function add_shop_to_breadcrumbs( $indexables ) {
 
 		foreach ( $indexables as $index => $indexable ) {
 			if ( $indexable->object_type === 'post-type-archive' && $indexable->object_sub_type === 'product' ) {
-				$indexables[ $index ] = $this->repository->find_by_id_and_type( $shop_page_id, 'post' );
+				$shop_page_indexable = $this->repository->find_by_id_and_type( $shop_page_id, 'post' );
+				if ( \is_a( $shop_page_indexable, Indexable::class ) ) {
+					$indexables[ $index ] = $shop_page_indexable;
+				}
 			}
 		}
 

tests/unit/integrations/third-party/woocommerce-test.php

@@ -12,6 +12,7 @@
 use Yoast\WP\SEO\Helpers\Woocommerce_Helper;
 use Yoast\WP\SEO\Integrations\Third_Party\WooCommerce;
 use Yoast\WP\SEO\Memoizers\Meta_Tags_Context_Memoizer;
+use Yoast\WP\SEO\Models\Indexable;
 use Yoast\WP\SEO\Presentations\Indexable_Presentation;
 use Yoast\WP\SEO\Repositories\Indexable_Repository;
 use Yoast\WP\SEO\Tests\Unit\Doubles\Models\Indexable_Mock;
@@ -185,9 +186,33 @@ public function test_add_shop_to_breadcrumbs() {
 			->once()
 			->andReturn( 707 );
 
-		$this->repository->expects( 'find_by_id_and_type' )->once()->with( 707, 'post' )->andReturn( 'shop' );
+		$indexable_mock = Mockery::mock( Indexable::class );
 
-		$this->assertEquals( [ 'shop' ], $this->instance->add_shop_to_breadcrumbs( $indexables ) );
+		$this->repository->expects( 'find_by_id_and_type' )->once()->with( 707, 'post' )->andReturn( $indexable_mock );
+
+		$this->assertEquals( [ $indexable_mock ], $this->instance->add_shop_to_breadcrumbs( $indexables ) );
+	}
+
+	/**
+	 * Tests the add shop to breadcrumbs function when finding no indexable for the shop page.
+	 *
+	 * @covers ::add_shop_to_breadcrumbs
+	 */
+	public function test_add_shop_to_breadcrumbs_no_indexable_shop_page() {
+		$indexables = [
+			(object) [
+				'object_type'     => 'post-type-archive',
+				'object_sub_type' => 'product',
+			],
+		];
+
+		$this->woocommerce_helper->expects( 'get_shop_page_id' )
+			->once()
+			->andReturn( 707 );
+
+		$this->repository->expects( 'find_by_id_and_type' )->once()->with( 707, 'post' )->andReturn( false );
+
+		$this->assertEquals( $indexables, $this->instance->add_shop_to_breadcrumbs( $indexables ) );
 	}
 
 	/**

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', '19.12-RC9' );
+define( 'WPSEO_VERSION', '19.12-RC10' );
 
 
 if ( ! defined( 'WPSEO_PATH' ) ) {

wp-seo.php

@@ -8,7 +8,7 @@
  *
  * @wordpress-plugin
  * Plugin Name: Yoast SEO
- * Version:     19.12-RC9
+ * Version:     19.12-RC10
  * 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