Merged in feature/314-dev-dev01 (pull request #24)

auto-patch  314-dev-dev01-2024-01-25T04_09_02

* auto-patch  314-dev-dev01-2024-01-25T04_09_02
This commit is contained in:
Tony Volpe
2024-01-25 04:11:47 +00:00
parent 6b67473553
commit 68dbe860e9
540 changed files with 3445 additions and 2131 deletions

View File

@@ -9,10 +9,10 @@ namespace Yoast\WP\SEO\Presenters;
*/
abstract class Abstract_Indexable_Tag_Presenter extends Abstract_Indexable_Presenter {
const META_PROPERTY_CONTENT = '<meta property="%2$s" content="%1$s"%3$s />';
const META_NAME_CONTENT = '<meta name="%2$s" content="%1$s"%3$s />';
const LINK_REL_HREF = '<link rel="%2$s" href="%1$s"%3$s />';
const DEFAULT_TAG_FORMAT = self::META_NAME_CONTENT;
public const META_PROPERTY_CONTENT = '<meta property="%2$s" content="%1$s"%3$s />';
public const META_NAME_CONTENT = '<meta name="%2$s" content="%1$s"%3$s />';
public const LINK_REL_HREF = '<link rel="%2$s" href="%1$s"%3$s />';
public const DEFAULT_TAG_FORMAT = self::META_NAME_CONTENT;
/**
* The tag format including placeholders.

View File

@@ -45,7 +45,7 @@ class Sidebar_Presenter extends Abstract_Presenter {
sizes="(min-width: 1321px) 75px">
</figure>
</figure>
<?php if ( YoastSEO()->classes->get( Promotion_Manager::class )->is( 'black-friday-2023-promotion' ) ) : ?>
<?php if ( \YoastSEO()->classes->get( Promotion_Manager::class )->is( 'black-friday-2023-promotion' ) ) : ?>
<div class="sidebar__sale_banner_container">
<div class="sidebar__sale_banner">
<span class="banner_text"><?php echo \esc_html( $title ); ?></span>
@@ -63,7 +63,7 @@ class Sidebar_Presenter extends Abstract_Presenter {
echo \esc_html__( 'Get AI to write SEO titles and meta descriptions faster. Reach a wider audience with multiple keywords. Get automatic internal linking suggestions. And much, much more!', 'wordpress-seo' );
?>
</p>
<?php if ( YoastSEO()->classes->get( Promotion_Manager::class )->is( 'black-friday-2023-promotion' ) ) : ?>
<?php if ( \YoastSEO()->classes->get( Promotion_Manager::class )->is( 'black-friday-2023-promotion' ) ) : ?>
<div class="sidebar__sale_text">
<p>
<?php
@@ -76,7 +76,7 @@ class Sidebar_Presenter extends Abstract_Presenter {
<p class="plugin-buy-button">
<a class="yoast-button-upsell" data-action="load-nfd-ctb" data-ctb-id="f6a84663-465f-4cb5-8ba5-f7a6d72224b2" target="_blank" href="<?php echo \esc_url( $buy_yoast_seo_shortlink ); ?>">
<?php
if ( YoastSEO()->classes->get( Promotion_Manager::class )->is( 'black-friday-2023-promotion' ) ) {
if ( \YoastSEO()->classes->get( Promotion_Manager::class )->is( 'black-friday-2023-promotion' ) ) {
echo \esc_html__( 'Claim your 30% off now!', 'wordpress-seo' );
}
else {

View File

@@ -101,9 +101,8 @@ class Breadcrumbs_Presenter extends Abstract_Indexable_Presenter {
/**
* Filter: 'wpseo_breadcrumb_output' - Allow changing the HTML output of the Yoast SEO breadcrumbs class.
*
* @param string $output The HTML output.
* @param Indexable_Presentation $presentation The presentation of an indexable.
*
* @api string $output The HTML output.
*/
return \apply_filters( 'wpseo_breadcrumb_output', $output, $this->presentation );
}
@@ -158,9 +157,8 @@ class Breadcrumbs_Presenter extends Abstract_Indexable_Presenter {
/**
* Filter: 'wpseo_breadcrumb_single_link' - Allow changing of each link being put out by the Yoast SEO breadcrumbs class.
*
* @param array $link The link array.
*
* @api string $link_output The output string.
* @param string $link_output The output string.
* @param array $link The breadcrumb link array.
*/
return \apply_filters( 'wpseo_breadcrumb_single_link', $link, $breadcrumb );
}
@@ -175,7 +173,7 @@ class Breadcrumbs_Presenter extends Abstract_Indexable_Presenter {
/**
* Filter: 'wpseo_breadcrumb_output_id' - Allow changing the HTML ID on the Yoast SEO breadcrumbs wrapper element.
*
* @api string $unsigned ID to add to the wrapper element.
* @param string $unsigned ID to add to the wrapper element.
*/
$this->id = \apply_filters( 'wpseo_breadcrumb_output_id', '' );
if ( ! \is_string( $this->id ) ) {
@@ -200,7 +198,7 @@ class Breadcrumbs_Presenter extends Abstract_Indexable_Presenter {
/**
* Filter: 'wpseo_breadcrumb_output_class' - Allow changing the HTML class on the Yoast SEO breadcrumbs wrapper element.
*
* @api string $unsigned Class to add to the wrapper element.
* @param string $unsigned Class to add to the wrapper element.
*/
$this->class = \apply_filters( 'wpseo_breadcrumb_output_class', '' );
if ( ! \is_string( $this->class ) ) {

View File

@@ -43,8 +43,7 @@ class Canonical_Presenter extends Abstract_Indexable_Tag_Presenter {
/**
* Filter: 'wpseo_canonical' - Allow filtering of the canonical URL put out by Yoast SEO.
*
* @api string $canonical The canonical URL.
*
* @param string $canonical The canonical URL.
* @param Indexable_Presentation $presentation The presentation of an indexable.
*/
return \urldecode( (string) \trim( \apply_filters( 'wpseo_canonical', $this->presentation->canonical, $this->presentation ) ) );

View File

@@ -18,7 +18,7 @@ final class Marker_Close_Presenter extends Abstract_Indexable_Presenter {
/**
* Filter: 'wpseo_debug_markers' - Allow disabling the debug markers.
*
* @api bool $show_markers True when the debug markers should be shown.
* @param bool $show_markers True when the debug markers should be shown.
*/
if ( ! \apply_filters( 'wpseo_debug_markers', true ) ) {
return '';

View File

@@ -18,7 +18,7 @@ final class Marker_Open_Presenter extends Abstract_Indexable_Presenter {
/**
* Filter: 'wpseo_debug_markers' - Allow disabling the debug markers.
*
* @api bool $show_markers True when the debug markers should be shown.
* @param bool $show_markers True when the debug markers should be shown.
*/
if ( ! \apply_filters( 'wpseo_debug_markers', true ) ) {
return '';
@@ -45,7 +45,7 @@ final class Marker_Open_Presenter extends Abstract_Indexable_Presenter {
/**
* Filter: 'wpseo_hide_version' - can be used to hide the Yoast SEO version in the debug marker (only available in Yoast SEO Premium).
*
* @api bool
* @param bool $hide_version
*/
if ( \apply_filters( 'wpseo_hide_version', false ) ) {
return '';

View File

@@ -29,14 +29,14 @@ class Meta_Description_Presenter extends Abstract_Indexable_Tag_Presenter {
}
if ( \current_user_can( 'wpseo_manage_options' ) ) {
return '<!-- ' .
\sprintf(
return '<!-- '
. \sprintf(
/* translators: %1$s resolves to Yoast SEO, %2$s resolves to the Settings submenu item. */
\esc_html__( 'Admin only notice: this page does not show a meta description because it does not have one, either write it for this page specifically or go into the [%1$s - %2$s] menu and set up a template.', 'wordpress-seo' ),
\esc_html__( 'Yoast SEO', 'wordpress-seo' ),
\esc_html__( 'Settings', 'wordpress-seo' )
) .
' -->';
)
. ' -->';
}
return '';
@@ -53,9 +53,8 @@ class Meta_Description_Presenter extends Abstract_Indexable_Tag_Presenter {
/**
* Filter: 'wpseo_metadesc' - Allow changing the Yoast SEO meta description sentence.
*
* @api string $meta_description The description sentence.
*
* @param Indexable_Presentation $presentation The presentation of an indexable.
* @param string $meta_description The description sentence.
* @param Indexable_Presentation $presentation The presentation of an indexable.
*/
$meta_description = \apply_filters( 'wpseo_metadesc', $meta_description, $this->presentation );
$meta_description = $this->helpers->string->strip_all_tags( \stripslashes( $meta_description ) );

View File

@@ -33,9 +33,8 @@ class Article_Author_Presenter extends Abstract_Indexable_Tag_Presenter {
/**
* Filter: 'wpseo_opengraph_author_facebook' - Allow developers to filter the article author's Facebook URL.
*
* @api bool|string $article_author The article author's Facebook URL, return false to disable.
*
* @param Indexable_Presentation $presentation The presentation of an indexable.
* @param bool|string $article_author The article author's Facebook URL, return false to disable.
* @param Indexable_Presentation $presentation The presentation of an indexable.
*/
return \trim( \apply_filters( 'wpseo_opengraph_author_facebook', $this->presentation->open_graph_article_author, $this->presentation ) );
}

View File

@@ -33,9 +33,8 @@ class Article_Publisher_Presenter extends Abstract_Indexable_Tag_Presenter {
/**
* Filter: 'wpseo_og_article_publisher' - Allow developers to filter the article publisher's Facebook URL.
*
* @api bool|string $article_publisher The article publisher's Facebook URL, return false to disable.
*
* @param Indexable_Presentation $presentation The presentation of an indexable.
* @param bool|string $article_publisher The article publisher's Facebook URL, return false to disable.
* @param Indexable_Presentation $presentation The presentation of an indexable.
*/
return \trim( \apply_filters( 'wpseo_og_article_publisher', $this->presentation->open_graph_article_publisher, $this->presentation ) );
}

View File

@@ -35,8 +35,7 @@ class Description_Presenter extends Abstract_Indexable_Tag_Presenter {
/**
* Filter: 'wpseo_opengraph_desc' - Allow changing the Yoast SEO generated Open Graph description.
*
* @api string The description.
*
* @param string $description The description.
* @param Indexable_Presentation $presentation The presentation of an indexable.
*/
$meta_og_description = \apply_filters( 'wpseo_opengraph_desc', $meta_og_description, $this->presentation );

View File

@@ -96,8 +96,7 @@ class Image_Presenter extends Abstract_Indexable_Presenter {
/**
* Filter: 'wpseo_opengraph_image' - Allow changing the Open Graph image.
*
* @api string - The URL of the Open Graph image.
*
* @param string $image_url The URL of the Open Graph image.
* @param Indexable_Presentation $presentation The presentation of an indexable.
*/
$image_url = \trim( \apply_filters( 'wpseo_opengraph_image', $image['url'], $this->presentation ) );

View File

@@ -33,8 +33,7 @@ final class Locale_Presenter extends Abstract_Indexable_Tag_Presenter {
/**
* Filter: 'wpseo_og_locale' - Allow changing the Yoast SEO Open Graph locale.
*
* @api string The locale string
*
* @param string $locale The locale string
* @param Indexable_Presentation $presentation The presentation of an indexable.
*/
return (string) \trim( \apply_filters( 'wpseo_og_locale', $this->presentation->open_graph_locale, $this->presentation ) );

View File

@@ -33,8 +33,7 @@ class Site_Name_Presenter extends Abstract_Indexable_Tag_Presenter {
/**
* Filter: 'wpseo_opengraph_site_name' - Allow changing the Yoast SEO generated Open Graph site name.
*
* @api string $site_name The site_name.
*
* @param string $site_name The site_name.
* @param Indexable_Presentation $presentation The presentation of an indexable.
*/
return (string) \trim( \apply_filters( 'wpseo_opengraph_site_name', $this->presentation->open_graph_site_name, $this->presentation ) );

View File

@@ -35,9 +35,8 @@ class Title_Presenter extends Abstract_Indexable_Tag_Presenter {
/**
* Filter: 'wpseo_opengraph_title' - Allow changing the Yoast SEO generated title.
*
* @param string $title The title.
* @param Indexable_Presentation $presentation The presentation of an indexable.
*
* @api string $title The title.
*/
$title = (string) \trim( \apply_filters( 'wpseo_opengraph_title', $title, $this->presentation ) );
return $this->helpers->string->strip_all_tags( $title );

View File

@@ -33,8 +33,7 @@ class Type_Presenter extends Abstract_Indexable_Tag_Presenter {
/**
* Filter: 'wpseo_opengraph_type' - Allow changing the opengraph type.
*
* @api string $type The type.
*
* @param string $type The type.
* @param Indexable_Presentation $presentation The presentation of an indexable.
*/
return (string) \apply_filters( 'wpseo_opengraph_type', $this->presentation->open_graph_type, $this->presentation );

View File

@@ -40,8 +40,7 @@ class Url_Presenter extends Abstract_Indexable_Tag_Presenter {
/**
* Filter: 'wpseo_opengraph_url' - Allow changing the Yoast SEO generated open graph URL.
*
* @api string $url The open graph URL.
*
* @param string $url The open graph URL.
* @param Indexable_Presentation $presentation The presentation of an indexable.
*/
return \urldecode( (string) \apply_filters( 'wpseo_opengraph_url', $this->presentation->open_graph_url, $this->presentation ) );

View File

@@ -42,7 +42,7 @@ class Rel_Next_Presenter extends Abstract_Indexable_Tag_Presenter {
/**
* Filter: 'wpseo_next_rel_link' - Allow changing link rel output by Yoast SEO.
*
* @api string $unsigned The full `<link` element.
* @param string $unsigned The full `<link` element.
*/
return \apply_filters( 'wpseo_next_rel_link', $output );
}
@@ -63,8 +63,7 @@ class Rel_Next_Presenter extends Abstract_Indexable_Tag_Presenter {
/**
* Filter: 'wpseo_adjacent_rel_url' - Allow filtering of the rel next URL put out by Yoast SEO.
*
* @api string $rel_next The rel next URL.
*
* @param string $rel_next The rel next URL.
* @param string $rel Link relationship, prev or next.
* @param Indexable_Presentation $presentation The presentation of an indexable.
*/

View File

@@ -42,7 +42,7 @@ class Rel_Prev_Presenter extends Abstract_Indexable_Tag_Presenter {
/**
* Filter: 'wpseo_prev_rel_link' - Allow changing link rel output by Yoast SEO.
*
* @api string $unsigned The full `<link` element.
* @param string $unsigned The full `<link` element.
*/
return \apply_filters( 'wpseo_prev_rel_link', $output );
}
@@ -63,9 +63,9 @@ class Rel_Prev_Presenter extends Abstract_Indexable_Tag_Presenter {
/**
* Filter: 'wpseo_adjacent_rel_url' - Allow filtering of the rel prev URL put out by Yoast SEO.
*
* @api string $canonical The rel prev URL.
*
* @param string $canonical The rel prev URL.
* @param string $rel Link relationship, prev or next.
* @param Indexable_Presentation $presentation The presentation of an indexable.
*/
return (string) \trim( \apply_filters( 'wpseo_adjacent_rel_url', $this->presentation->rel_prev, 'prev', $this->presentation ) );
}

View File

@@ -9,37 +9,37 @@ use Yoast\WP\SEO\Helpers\Robots_Txt_Helper;
*/
class Robots_Txt_Presenter extends Abstract_Presenter {
const YOAST_OUTPUT_BEFORE_COMMENT = '# START YOAST BLOCK' . \PHP_EOL . '# ---------------------------' . \PHP_EOL;
public const YOAST_OUTPUT_BEFORE_COMMENT = '# START YOAST BLOCK' . \PHP_EOL . '# ---------------------------' . \PHP_EOL;
const YOAST_OUTPUT_AFTER_COMMENT = '# ---------------------------' . \PHP_EOL . '# END YOAST BLOCK';
public const YOAST_OUTPUT_AFTER_COMMENT = '# ---------------------------' . \PHP_EOL . '# END YOAST BLOCK';
/**
* Text to be outputted for the allow directive.
*
* @var string
*/
const ALLOW_DIRECTIVE = 'Allow';
public const ALLOW_DIRECTIVE = 'Allow';
/**
* Text to be outputted for the disallow directive.
*
* @var string
*/
const DISALLOW_DIRECTIVE = 'Disallow';
public const DISALLOW_DIRECTIVE = 'Disallow';
/**
* Text to be outputted for the user-agent rule.
*
* @var string
*/
const USER_AGENT_FIELD = 'User-agent';
public const USER_AGENT_FIELD = 'User-agent';
/**
* Text to be outputted for the sitemap rule.
*
* @var string
*/
const SITEMAP_FIELD = 'Sitemap';
public const SITEMAP_FIELD = 'Sitemap';
/**
* Holds the Robots_Txt_Helper.

View File

@@ -29,7 +29,8 @@ class Schema_Presenter extends Abstract_Indexable_Presenter {
/**
* Filter: 'wpseo_json_ld_output' - Allows disabling Yoast's schema output entirely.
*
* @api mixed If false or an empty array is returned, disable our output.
* @param mixed $deprecated If false or an empty array is returned, disable our output.
* @param string $empty
*/
$return = \apply_filters( 'wpseo_json_ld_output', $deprecated_data, '' );
if ( $return === [] || $return === false ) {

View File

@@ -58,8 +58,7 @@ class Enhanced_Data_Presenter extends Abstract_Indexable_Presenter {
/**
* Filter: 'wpseo_enhanced_slack_data' - Allows filtering of the enhanced data for sharing on Slack.
*
* @api array $data The enhanced Slack sharing data.
*
* @param array $data The enhanced Slack sharing data.
* @param Indexable_Presentation $presentation The presentation of an indexable.
*/
return \apply_filters( 'wpseo_enhanced_slack_data', $data, $this->presentation );

View File

@@ -69,8 +69,7 @@ class Title_Presenter extends Abstract_Indexable_Tag_Presenter {
/**
* Filter: 'wpseo_title' - Allow changing the Yoast SEO generated title.
*
* @api string $title The title.
*
* @param string $title The title.
* @param Indexable_Presentation $presentation The presentation of an indexable.
*/
$title = \apply_filters( 'wpseo_title', $title, $this->presentation );

View File

@@ -26,9 +26,8 @@ class Description_Presenter extends Abstract_Indexable_Tag_Presenter {
/**
* Filter: 'wpseo_twitter_description' - Allow changing the Twitter description as output in the Twitter card by Yoast SEO.
*
* @api string $twitter_description The description string.
*
* @param Indexable_Presentation $presentation The presentation of an indexable.
* @param string $twitter_description The description string.
* @param Indexable_Presentation $presentation The presentation of an indexable.
*/
return \apply_filters( 'wpseo_twitter_description', $this->replace_vars( $this->presentation->twitter_description ), $this->presentation );
}

View File

@@ -33,9 +33,8 @@ class Image_Presenter extends Abstract_Indexable_Tag_Presenter {
/**
* Filter: 'wpseo_twitter_image' - Allow changing the Twitter Card image.
*
* @param Indexable_Presentation $presentation The presentation of an indexable.
*
* @api string $twitter_image Image URL string.
* @param string $twitter_image Image URL string.
* @param Indexable_Presentation $presentation The presentation of an indexable.
*/
return (string) \apply_filters( 'wpseo_twitter_image', $this->presentation->twitter_image, $this->presentation );
}

View File

@@ -26,8 +26,7 @@ class Site_Presenter extends Abstract_Indexable_Tag_Presenter {
/**
* Filter: 'wpseo_twitter_site' - Allow changing the Twitter site account as output in the Twitter card by Yoast SEO.
*
* @api string $twitter_site Twitter site account string.
*
* @param string $twitter_site Twitter site account string.
* @param Indexable_Presentation $presentation The presentation of an indexable.
*/
$twitter_site = \apply_filters( 'wpseo_twitter_site', $this->presentation->twitter_site, $this->presentation );

View File

@@ -26,9 +26,8 @@ class Title_Presenter extends Abstract_Indexable_Tag_Presenter {
/**
* Filter: 'wpseo_twitter_title' - Allow changing the Twitter title.
*
* @api string $twitter_title The Twitter title.
*
* @param Indexable_Presentation $presentation The presentation of an indexable.
* @param string $twitter_title The Twitter title.
* @param Indexable_Presentation $presentation The presentation of an indexable.
*/
return \trim( \apply_filters( 'wpseo_twitter_title', $this->replace_vars( $this->presentation->twitter_title ), $this->presentation ) );
}