Merge branch 'trunk' into ticket/64145

Author: adamsilverstein

src/wp-content/themes/twentynineteen/functions.php

@@ -242,9 +242,13 @@ function twentynineteen_excerpt_more( $link ) {
  * @global int $content_width Content width.
  */
 function twentynineteen_content_width() {
-	// This variable is intended to be overruled from themes.
-	// Open WPCS issue: {@link https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/issues/1043}.
-	// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedVariableFound
+	/**
+	 * Filters Twenty Nineteen content width of the theme.
+	 *
+	 * @since Twenty Nineteen 1.0
+	 *
+	 * @param int $content_width Content width in pixels.
+	 */
 	$GLOBALS['content_width'] = apply_filters( 'twentynineteen_content_width', 640 );
 }
 add_action( 'after_setup_theme', 'twentynineteen_content_width', 0 );

src/wp-content/themes/twentynineteen/inc/helper-functions.php

@@ -11,7 +11,16 @@
  * Determines if post thumbnail can be displayed.
  */
 function twentynineteen_can_show_post_thumbnail() {
-	return apply_filters( 'twentynineteen_can_show_post_thumbnail', ! post_password_required() && ! is_attachment() && has_post_thumbnail() );
+	$show_post_thumbnail = ! post_password_required() && ! is_attachment() && has_post_thumbnail();
+
+	/**
+	 * Filters whether to show post thumbnail.
+	 *
+	 * @since Twenty Nineteen 1.0
+	 *
+	 * @param bool $show_post_thumbnail Whether to show post thumbnail.
+	 */
+	return apply_filters( 'twentynineteen_can_show_post_thumbnail', $show_post_thumbnail );
 }
 
 /**

src/wp-content/themes/twentysixteen/functions.php

@@ -246,6 +246,13 @@ function twentysixteen_setup() {
  * @since Twenty Sixteen 1.0
  */
 function twentysixteen_content_width() {
+	/**
+	 * Filters Twenty Sixteen content width of the theme.
+	 *
+	 * @since Twenty Sixteen 1.0
+	 *
+	 * @param int $content_width Content width in pixels.
+	 */
 	$GLOBALS['content_width'] = apply_filters( 'twentysixteen_content_width', 840 );
 }
 add_action( 'after_setup_theme', 'twentysixteen_content_width', 0 );

src/wp-content/themes/twentysixteen/inc/template-tags.php

@@ -19,6 +19,13 @@
 	 */
 	function twentysixteen_entry_meta() {
 		if ( 'post' === get_post_type() ) {
+			/**
+			 * Filters the Twenty Sixteen entry meta avatar size.
+			 *
+			 * @since Twenty Sixteen 1.0
+			 *
+			 * @param int $size The avatar height and width size in pixels.
+			 */
 			$author_avatar_size = apply_filters( 'twentysixteen_author_avatar_size', 49 );
 			printf(
 				'<span class="byline">%1$s<span class="screen-reader-text">%2$s </span><span class="author vcard"><a class="url fn n" href="%3$s">%4$s</a></span></span>',

src/wp-content/themes/twentytwentyone/functions.php

@@ -375,9 +375,13 @@ function twenty_twenty_one_widgets_init() {
  * @return void
  */
 function twenty_twenty_one_content_width() {
-	// This variable is intended to be overruled from themes.
-	// Open WPCS issue: {@link https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/issues/1043}.
-	// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedVariableFound
+	/**
+	 * Filters Twenty Twenty-One content width of the theme.
+	 *
+	 * @since Twenty Twenty-One 1.0
+	 *
+	 * @param int $content_width Content width in pixels.
+	 */
 	$GLOBALS['content_width'] = apply_filters( 'twenty_twenty_one_content_width', 750 );
 }
 add_action( 'after_setup_theme', 'twenty_twenty_one_content_width', 0 );

src/wp-includes/abilities-api.php

@@ -121,8 +121,7 @@ public function register( string $name, array $args ): ?WP_Ability {
 
 		// Validate ability category exists if provided (will be validated as required in WP_Ability).
 		if ( isset( $args['category'] ) ) {
-			$category_registry = WP_Ability_Categories_Registry::get_instance();
-			if ( ! $category_registry->is_registered( $args['category'] ) ) {
+			if ( ! wp_has_ability_category( $args['category'] ) ) {
 				_doing_it_wrong(
 					__METHOD__,
 					sprintf(
@@ -237,14 +236,14 @@ public function is_registered( string $name ): bool {
 	 * @see wp_get_ability()
 	 *
 	 * @param string $name The name of the registered ability, with its namespace.
-	 * @return ?WP_Ability The registered ability instance, or null if it is not registered.
+	 * @return WP_Ability|null The registered ability instance, or null if it is not registered.
 	 */
 	public function get_registered( string $name ): ?WP_Ability {
 		if ( ! $this->is_registered( $name ) ) {
 			_doing_it_wrong(
 				__METHOD__,
 				/* translators: %s: Ability name. */
-				sprintf( esc_html__( 'Ability "%s" not found.' ), esc_attr( $name ) ),
+				sprintf( __( 'Ability "%s" not found.' ), esc_html( $name ) ),
 				'6.9.0'
 			);
 			return null;
@@ -266,7 +265,9 @@ public static function get_instance(): ?self {
 			_doing_it_wrong(
 				__METHOD__,
 				sprintf(
-					__( 'Ability API should not be initialized before the <code>init</code> action has fired' )
+					// translators: %s: init action.
+					__( 'Ability API should not be initialized before the %s action has fired.' ),
+					'<code>init</code>'
 				),
 				'6.9.0'
 			);
@@ -315,6 +316,6 @@ public function __wakeup(): void {
 	 *                        This is a security hardening measure to prevent serialization of the registry.
 	 */
 	public function __sleep(): array {
-		throw new LogicException( __CLASS__ . ' should never be serialized' );
+		throw new LogicException( __CLASS__ . ' should never be serialized.' );
 	}
 }

src/wp-includes/abilities-api/class-wp-abilities-registry.php

@@ -205,7 +205,9 @@ public static function get_instance(): ?self {
 			_doing_it_wrong(
 				__METHOD__,
 				sprintf(
-					__( 'Ability API should not be initialized before the <code>init</code> action has fired' )
+					// translators: %s: init action.
+					__( 'Ability API should not be initialized before the %s action has fired.' ),
+					'<code>init</code>'
 				),
 				'6.9.0'
 			);
@@ -249,6 +251,6 @@ public function __wakeup(): void {
 	 *                        This is a security hardening measure to prevent serialization of the registry.
 	 */
 	public function __sleep(): array {
-		throw new LogicException( __CLASS__ . ' should never be serialized' );
+		throw new LogicException( __CLASS__ . ' should never be serialized.' );
 	}
 }

src/wp-includes/abilities-api/class-wp-ability-categories-registry.php

@@ -75,7 +75,7 @@ final class WP_Ability_Category {
 	public function __construct( string $slug, array $args ) {
 		if ( empty( $slug ) ) {
 			throw new InvalidArgumentException(
-				esc_html__( 'The ability category slug cannot be empty.' )
+				__( 'The ability category slug cannot be empty.' )
 			);
 		}
 
@@ -211,6 +211,6 @@ public function __wakeup(): void {
 	 *                        This is a security hardening measure to prevent serialization of the ability category.
 	 */
 	public function __sleep(): array {
-		throw new LogicException( __CLASS__ . ' should never be serialized' );
+		throw new LogicException( __CLASS__ . ' should never be serialized.' );
 	}
 }

src/wp-includes/abilities-api/class-wp-ability-category.php

@@ -169,7 +169,7 @@ public function __construct( string $name, array $args ) {
 						__( 'Property "%1$s" is not a valid property for ability "%2$s". Please check the %3$s class for allowed properties.' ),
 						'<code>' . esc_html( $property_name ) . '</code>',
 						'<code>' . esc_html( $this->name ) . '</code>',
-						'<code>' . self::class . '</code>'
+						'<code>' . __CLASS__ . '</code>'
 					),
 					'6.9.0'
 				);
@@ -445,7 +445,7 @@ public function validate_input( $input = null ) {
 				sprintf(
 					/* translators: %s ability name. */
 					__( 'Ability "%s" does not define an input schema required to validate the provided input.' ),
-					$this->name
+					esc_html( $this->name )
 				)
 			);
 		}
@@ -457,7 +457,7 @@ public function validate_input( $input = null ) {
 				sprintf(
 					/* translators: %1$s ability name, %2$s error message. */
 					__( 'Ability "%1$s" has invalid input. Reason: %2$s' ),
-					$this->name,
+					esc_html( $this->name ),
 					$valid_input->get_error_message()
 				)
 			);
@@ -514,7 +514,7 @@ protected function do_execute( $input = null ) {
 			return new WP_Error(
 				'ability_invalid_execute_callback',
 				/* translators: %s ability name. */
-				sprintf( __( 'Ability "%s" does not have a valid execute callback.' ), $this->name )
+				sprintf( __( 'Ability "%s" does not have a valid execute callback.' ), esc_html( $this->name ) )
 			);
 		}
 
@@ -542,7 +542,7 @@ protected function validate_output( $output ) {
 				sprintf(
 					/* translators: %1$s ability name, %2$s error message. */
 					__( 'Ability "%1$s" has invalid output. Reason: %2$s' ),
-					$this->name,
+					esc_html( $this->name ),
 					$valid_output->get_error_message()
 				)
 			);
@@ -581,7 +581,7 @@ public function execute( $input = null ) {
 			return new WP_Error(
 				'ability_invalid_permissions',
 				/* translators: %s ability name. */
-				sprintf( __( 'Ability "%s" does not have necessary permission.' ), $this->name )
+				sprintf( __( 'Ability "%s" does not have necessary permission.' ), esc_html( $this->name ) )
 			);
 		}
 
@@ -638,6 +638,6 @@ public function __wakeup(): void {
 	 *                        This is a security hardening measure to prevent serialization of the ability.
 	 */
 	public function __sleep(): array {
-		throw new LogicException( __CLASS__ . ' should never be serialized' );
+		throw new LogicException( __CLASS__ . ' should never be serialized.' );
 	}
 }