Merge branch 'trunk' into skip-page-builder-dip

Author: adamsilverstein

src/wp-includes/class-wp-block-patterns-registry.php

@@ -174,7 +174,9 @@ private function get_content( $pattern_name, $outside_init_only = false ) {
 			$patterns = &$this->registered_patterns;
 		}
 
-		$pattern_path = realpath( $patterns[ $pattern_name ]['filePath'] ?? '' );
+		$file_path    = $patterns[ $pattern_name ]['filePath'] ?? '';
+		$is_stringy   = is_string( $file_path ) || ( is_object( $file_path ) && method_exists( $file_path, '__toString' ) );
+		$pattern_path = $is_stringy ? realpath( (string) $file_path ) : null;
 		if (
 			! isset( $patterns[ $pattern_name ]['content'] ) &&
 			is_string( $pattern_path ) &&

src/wp-includes/template-loader.php

@@ -111,8 +111,9 @@
 	 *
 	 * @param string $template The path of the template to include.
 	 */
-	$template = apply_filters( 'template_include', $template );
-	$template = is_string( $template ) ? realpath( $template ) : null;
+	$template   = apply_filters( 'template_include', $template );
+	$is_stringy = is_string( $template ) || ( is_object( $template ) && method_exists( $template, '__toString' ) );
+	$template   = $is_stringy ? realpath( (string) $template ) : null;
 	if (
 		is_string( $template ) &&
 		( str_ends_with( $template, '.php' ) || str_ends_with( $template, '.html' ) ) &&

src/wp-includes/version.php

@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '7.0-beta3-61849-src';
+$wp_version = '7.0-beta4-src';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.