From 18bda14e1e78eba29b2df570583a8b6320d26a58 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 16 Aug 2021 20:16:13 +0000
Subject: [PATCH 001/257] Code Modernization: Check the return type of
 `parse_url()` in `WP::parse_request()`.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As per the PHP manual:
> If the `component` parameter is omitted, an associative array is returned.
> If the `component` parameter is specified, `parse_url()` returns a string (or an int, in the case of `PHP_URL_PORT`) instead of an array. If the requested component doesn't exist within the given URL, `null` will be returned.

Reference: [https://www.php.net/manual/en/function.parse-url.php#refsect1-function.parse-url-returnvalues PHP Manual: parse_url(): Return Values]

In this case, `parse_url()` is called with the `PHP_URL_PATH` as `$component`. This will return `null` in the majority of cases, as – exсept for subdirectory-based sites – `home_url()` returns a URL without the trailing slash, like `http://example.org`.

The return value of `parse_url()` was subsequently passed to `trim()`, leading to a `trim(): Passing null to parameter #1 ($string) of type string is deprecated` notice on PHP 8.1.

Fixed by adjusting the logic flow to:
* Only pass the return value of `parse_url()` to follow-on functions if it makes sense, i.e. if it isn't `null`, nor an empty string.
* Preventing calls to `preg_replace()` and `trim()` further down in the function logic flow, when `preg_replace()`/`trim()` would have nothing to do anyhow.

Follow-up to [25617].

Props jrf, hellofromTonya, SergeyBiryukov.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51622 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp.php            | 24 +++++++++-----
 tests/phpunit/tests/wp/parseRequest.php | 42 +++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 8 deletions(-)
 create mode 100644 tests/phpunit/tests/wp/parseRequest.php

diff --git a/src/wp-includes/class-wp.php b/src/wp-includes/class-wp.php
index 8c7c48b3b24c3..770df083e70ea 100644
--- a/src/wp-includes/class-wp.php
+++ b/src/wp-includes/class-wp.php
@@ -170,8 +170,13 @@ public function parse_request( $extra_query_vars = '' ) {
 
 			list( $req_uri ) = explode( '?', $_SERVER['REQUEST_URI'] );
 			$self            = $_SERVER['PHP_SELF'];
-			$home_path       = trim( parse_url( home_url(), PHP_URL_PATH ), '/' );
-			$home_path_regex = sprintf( '|^%s|i', preg_quote( $home_path, '|' ) );
+
+			$home_path       = parse_url( home_url(), PHP_URL_PATH );
+			$home_path_regex = '';
+			if ( is_string( $home_path ) && '' !== $home_path ) {
+				$home_path       = trim( $home_path, '/' );
+				$home_path_regex = sprintf( '|^%s|i', preg_quote( $home_path, '|' ) );
+			}
 
 			/*
 			 * Trim path info from the end and the leading home path from the front.
@@ -180,14 +185,17 @@ public function parse_request( $extra_query_vars = '' ) {
 			 */
 			$req_uri  = str_replace( $pathinfo, '', $req_uri );
 			$req_uri  = trim( $req_uri, '/' );
-			$req_uri  = preg_replace( $home_path_regex, '', $req_uri );
-			$req_uri  = trim( $req_uri, '/' );
-			$pathinfo = trim( $pathinfo, '/' );
-			$pathinfo = preg_replace( $home_path_regex, '', $pathinfo );
 			$pathinfo = trim( $pathinfo, '/' );
 			$self     = trim( $self, '/' );
-			$self     = preg_replace( $home_path_regex, '', $self );
-			$self     = trim( $self, '/' );
+
+			if ( ! empty( $home_path_regex ) ) {
+				$req_uri  = preg_replace( $home_path_regex, '', $req_uri );
+				$req_uri  = trim( $req_uri, '/' );
+				$pathinfo = preg_replace( $home_path_regex, '', $pathinfo );
+				$pathinfo = trim( $pathinfo, '/' );
+				$self     = preg_replace( $home_path_regex, '', $self );
+				$self     = trim( $self, '/' );
+			}
 
 			// The requested permalink is in $pathinfo for path info requests and
 			// $req_uri for other requests.
diff --git a/tests/phpunit/tests/wp/parseRequest.php b/tests/phpunit/tests/wp/parseRequest.php
new file mode 100644
index 0000000000000..2f022d7d2dd3a
--- /dev/null
+++ b/tests/phpunit/tests/wp/parseRequest.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @group wp
+ * @covers WP::parse_request
+ */
+class Tests_WP_ParseRequest extends WP_UnitTestCase {
+	/**
+	 * @var WP
+	 */
+	protected $wp;
+
+	public function set_up() {
+		parent::set_up();
+		$this->wp = new WP();
+	}
+
+	/**
+	 * Test that PHP 8.1 "passing null to non-nullable" deprecation notice
+	 * is not thrown when the home URL has no path/trailing slash (default setup).
+	 *
+	 * Note: This does not test the actual functioning of the parse_request() method.
+	 * It just and only tests for/against the deprecation notice.
+	 *
+	 * @ticket 53635
+	 */
+	public function test_no_deprecation_notice_when_home_url_has_no_path() {
+		// Make sure rewrite rules are not empty.
+		$this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
+
+		// Make sure the test will function independently of whatever the test user set in wp-tests-config.php.
+		add_filter(
+			'home_url',
+			static function ( $url ) {
+				return 'http://example.org';
+			}
+		);
+
+		$this->wp->parse_request();
+		$this->assertSame( '', $this->wp->request );
+	}
+}

From 4d2762ed93d9d7a8801a05f764de6fe6ded9b87c Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 16 Aug 2021 21:33:54 +0000
Subject: [PATCH 002/257] Tests: Rename classes in `phpunit/tests/formatting/`
 per the naming conventions.

https://make.wordpress.org/core/handbook/testing/automated-testing/writing-phpunit-tests/#naming-and-organization

Follow-up to [47780], [48911], [49327], [50291], [50292], [50342], [50452], [50453], [50456], [50967], [50968], [50969], [51491], [51492], [51493].

See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51623 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../formatting/{CapitalPDangit.php => capitalPDangit.php}     | 0
 tests/phpunit/tests/formatting/{CleanPre.php => cleanPre.php} | 0
 .../{ConvertInvalidEntries.php => convertInvalidEntries.php}  | 0
 .../tests/formatting/{Smilies.php => convertSmilies.php}      | 2 +-
 tests/phpunit/tests/formatting/{Emoji.php => emoji.php}       | 0
 tests/phpunit/tests/formatting/ent2ncr.php                    | 2 +-
 tests/phpunit/tests/formatting/{EscAttr.php => escAttr.php}   | 0
 tests/phpunit/tests/formatting/{EscHtml.php => escHtml.php}   | 0
 tests/phpunit/tests/formatting/{JSEscape.php => escJs.php}    | 2 +-
 .../tests/formatting/{EscTextarea.php => escTextarea.php}     | 0
 tests/phpunit/tests/formatting/{EscUrl.php => escUrl.php}     | 0
 tests/phpunit/tests/formatting/{EscXml.php => escXml.php}     | 0
 .../{ExcerptRemoveBlocks.php => excerptRemoveBlocks.php}      | 0
 .../tests/formatting/{BlogInfo.php => getBloginfo.php}        | 2 +-
 .../formatting/{GetUrlInContent.php => getUrlInContent.php}   | 0
 .../tests/formatting/{HumanTimeDiff.php => humanTimeDiff.php} | 0
 tests/phpunit/tests/formatting/{IsEmail.php => isEmail.php}   | 0
 .../tests/formatting/{LikeEscape.php => likeEscape.php}       | 0
 .../formatting/{LinksAddTarget.php => linksAddTarget.php}     | 0
 .../tests/formatting/{MakeClickable.php => makeClickable.php} | 0
 tests/phpunit/tests/formatting/{MapDeep.php => mapDeep.php}   | 0
 .../{NormalizeWhitespace.php => normalizeWhitespace.php}      | 0
 .../tests/formatting/{RemoveAccents.php => removeAccents.php} | 0
 .../formatting/{SanitizeFileName.php => sanitizeFileName.php} | 0
 .../formatting/{SanitizeMimeType.php => sanitizeMimeType.php} | 0
 .../formatting/{SanitizeOrderby.php => sanitizeOrderby.php}   | 0
 .../tests/formatting/{SanitizePost.php => sanitizePost.php}   | 0
 .../{SanitizeTextField.php => sanitizeTextField.php}          | 0
 .../tests/formatting/{SanitizeTitle.php => sanitizeTitle.php} | 0
 ...anitizeTitleWithDashes.php => sanitizeTitleWithDashes.php} | 0
 .../{SanitizeTrackbackUrls.php => sanitizeTrackbackUrls.php}  | 0
 .../tests/formatting/{SanitizeUser.php => sanitizeUser.php}   | 0
 .../phpunit/tests/formatting/{SeemsUtf8.php => seemsUtf8.php} | 0
 tests/phpunit/tests/formatting/{Slashit.php => slashit.php}   | 0
 .../formatting/{StripSlashesDeep.php => stripslashesDeep.php} | 2 +-
 .../tests/formatting/{URLShorten.php => urlShorten.php}       | 4 ++--
 .../tests/formatting/{UrlencodeDeep.php => urlencodeDeep.php} | 0
 .../tests/formatting/{Utf8UriEncode.php => utf8UriEncode.php} | 0
 tests/phpunit/tests/formatting/{Autop.php => wpAutop.php}     | 2 +-
 .../tests/formatting/{WPBasename.php => wpBasename.php}       | 2 +-
 .../tests/formatting/{HtmlExcerpt.php => wpHtmlExcerpt.php}   | 2 +-
 .../tests/formatting/{WpHtmlSplit.php => wpHtmlSplit.php}     | 2 +-
 .../tests/formatting/{WpHtmlEditPre.php => wpHtmleditPre.php} | 2 +-
 .../formatting/{isoDescrambler.php => wpIsoDescrambler.php}   | 2 +-
 .../{WPMakeLinkRelative.php => wpMakeLinkRelative.php}        | 2 +-
 .../tests/formatting/{WPRelNoFollow.php => wpRelNofollow.php} | 2 +-
 tests/phpunit/tests/formatting/{WPRelUgc.php => wpRelUgc.php} | 2 +-
 .../{WpReplaceInHtmlTags.php => wpReplaceInHtmlTags.php}      | 2 +-
 .../tests/formatting/{WpRichEditPre.php => wpRicheditPre.php} | 2 +-
 tests/phpunit/tests/formatting/{WPSlash.php => wpSlash.php}   | 2 +-
 .../formatting/{WPSpecialchars.php => wpSpecialchars.php}     | 2 +-
 .../formatting/{WPStripAllTags.php => wpStripAllTags.php}     | 2 +-
 .../{WPTargetedLinkRel.php => wpTargetedLinkRel.php}          | 2 +-
 .../tests/formatting/{WPTexturize.php => wpTexturize.php}     | 2 +-
 .../tests/formatting/{WpTrimExcerpt.php => wpTrimExcerpt.php} | 2 +-
 .../tests/formatting/{WPTrimWords.php => wpTrimWords.php}     | 2 +-
 tests/phpunit/tests/formatting/{Zeroise.php => zeroise.php}   | 0
 57 files changed, 25 insertions(+), 25 deletions(-)
 rename tests/phpunit/tests/formatting/{CapitalPDangit.php => capitalPDangit.php} (100%)
 rename tests/phpunit/tests/formatting/{CleanPre.php => cleanPre.php} (100%)
 rename tests/phpunit/tests/formatting/{ConvertInvalidEntries.php => convertInvalidEntries.php} (100%)
 rename tests/phpunit/tests/formatting/{Smilies.php => convertSmilies.php} (99%)
 rename tests/phpunit/tests/formatting/{Emoji.php => emoji.php} (100%)
 rename tests/phpunit/tests/formatting/{EscAttr.php => escAttr.php} (100%)
 rename tests/phpunit/tests/formatting/{EscHtml.php => escHtml.php} (100%)
 rename tests/phpunit/tests/formatting/{JSEscape.php => escJs.php} (95%)
 rename tests/phpunit/tests/formatting/{EscTextarea.php => escTextarea.php} (100%)
 rename tests/phpunit/tests/formatting/{EscUrl.php => escUrl.php} (100%)
 rename tests/phpunit/tests/formatting/{EscXml.php => escXml.php} (100%)
 rename tests/phpunit/tests/formatting/{ExcerptRemoveBlocks.php => excerptRemoveBlocks.php} (100%)
 rename tests/phpunit/tests/formatting/{BlogInfo.php => getBloginfo.php} (96%)
 rename tests/phpunit/tests/formatting/{GetUrlInContent.php => getUrlInContent.php} (100%)
 rename tests/phpunit/tests/formatting/{HumanTimeDiff.php => humanTimeDiff.php} (100%)
 rename tests/phpunit/tests/formatting/{IsEmail.php => isEmail.php} (100%)
 rename tests/phpunit/tests/formatting/{LikeEscape.php => likeEscape.php} (100%)
 rename tests/phpunit/tests/formatting/{LinksAddTarget.php => linksAddTarget.php} (100%)
 rename tests/phpunit/tests/formatting/{MakeClickable.php => makeClickable.php} (100%)
 rename tests/phpunit/tests/formatting/{MapDeep.php => mapDeep.php} (100%)
 rename tests/phpunit/tests/formatting/{NormalizeWhitespace.php => normalizeWhitespace.php} (100%)
 rename tests/phpunit/tests/formatting/{RemoveAccents.php => removeAccents.php} (100%)
 rename tests/phpunit/tests/formatting/{SanitizeFileName.php => sanitizeFileName.php} (100%)
 rename tests/phpunit/tests/formatting/{SanitizeMimeType.php => sanitizeMimeType.php} (100%)
 rename tests/phpunit/tests/formatting/{SanitizeOrderby.php => sanitizeOrderby.php} (100%)
 rename tests/phpunit/tests/formatting/{SanitizePost.php => sanitizePost.php} (100%)
 rename tests/phpunit/tests/formatting/{SanitizeTextField.php => sanitizeTextField.php} (100%)
 rename tests/phpunit/tests/formatting/{SanitizeTitle.php => sanitizeTitle.php} (100%)
 rename tests/phpunit/tests/formatting/{SanitizeTitleWithDashes.php => sanitizeTitleWithDashes.php} (100%)
 rename tests/phpunit/tests/formatting/{SanitizeTrackbackUrls.php => sanitizeTrackbackUrls.php} (100%)
 rename tests/phpunit/tests/formatting/{SanitizeUser.php => sanitizeUser.php} (100%)
 rename tests/phpunit/tests/formatting/{SeemsUtf8.php => seemsUtf8.php} (100%)
 rename tests/phpunit/tests/formatting/{Slashit.php => slashit.php} (100%)
 rename tests/phpunit/tests/formatting/{StripSlashesDeep.php => stripslashesDeep.php} (96%)
 rename tests/phpunit/tests/formatting/{URLShorten.php => urlShorten.php} (91%)
 rename tests/phpunit/tests/formatting/{UrlencodeDeep.php => urlencodeDeep.php} (100%)
 rename tests/phpunit/tests/formatting/{Utf8UriEncode.php => utf8UriEncode.php} (100%)
 rename tests/phpunit/tests/formatting/{Autop.php => wpAutop.php} (99%)
 rename tests/phpunit/tests/formatting/{WPBasename.php => wpBasename.php} (91%)
 rename tests/phpunit/tests/formatting/{HtmlExcerpt.php => wpHtmlExcerpt.php} (90%)
 rename tests/phpunit/tests/formatting/{WpHtmlSplit.php => wpHtmlSplit.php} (94%)
 rename tests/phpunit/tests/formatting/{WpHtmlEditPre.php => wpHtmleditPre.php} (93%)
 rename tests/phpunit/tests/formatting/{isoDescrambler.php => wpIsoDescrambler.php} (82%)
 rename tests/phpunit/tests/formatting/{WPMakeLinkRelative.php => wpMakeLinkRelative.php} (95%)
 rename tests/phpunit/tests/formatting/{WPRelNoFollow.php => wpRelNofollow.php} (97%)
 rename tests/phpunit/tests/formatting/{WPRelUgc.php => wpRelUgc.php} (97%)
 rename tests/phpunit/tests/formatting/{WpReplaceInHtmlTags.php => wpReplaceInHtmlTags.php} (90%)
 rename tests/phpunit/tests/formatting/{WpRichEditPre.php => wpRicheditPre.php} (94%)
 rename tests/phpunit/tests/formatting/{WPSlash.php => wpSlash.php} (97%)
 rename tests/phpunit/tests/formatting/{WPSpecialchars.php => wpSpecialchars.php} (98%)
 rename tests/phpunit/tests/formatting/{WPStripAllTags.php => wpStripAllTags.php} (93%)
 rename tests/phpunit/tests/formatting/{WPTargetedLinkRel.php => wpTargetedLinkRel.php} (98%)
 rename tests/phpunit/tests/formatting/{WPTexturize.php => wpTexturize.php} (99%)
 rename tests/phpunit/tests/formatting/{WpTrimExcerpt.php => wpTrimExcerpt.php} (96%)
 rename tests/phpunit/tests/formatting/{WPTrimWords.php => wpTrimWords.php} (98%)
 rename tests/phpunit/tests/formatting/{Zeroise.php => zeroise.php} (100%)

diff --git a/tests/phpunit/tests/formatting/CapitalPDangit.php b/tests/phpunit/tests/formatting/capitalPDangit.php
similarity index 100%
rename from tests/phpunit/tests/formatting/CapitalPDangit.php
rename to tests/phpunit/tests/formatting/capitalPDangit.php
diff --git a/tests/phpunit/tests/formatting/CleanPre.php b/tests/phpunit/tests/formatting/cleanPre.php
similarity index 100%
rename from tests/phpunit/tests/formatting/CleanPre.php
rename to tests/phpunit/tests/formatting/cleanPre.php
diff --git a/tests/phpunit/tests/formatting/ConvertInvalidEntries.php b/tests/phpunit/tests/formatting/convertInvalidEntries.php
similarity index 100%
rename from tests/phpunit/tests/formatting/ConvertInvalidEntries.php
rename to tests/phpunit/tests/formatting/convertInvalidEntries.php
diff --git a/tests/phpunit/tests/formatting/Smilies.php b/tests/phpunit/tests/formatting/convertSmilies.php
similarity index 99%
rename from tests/phpunit/tests/formatting/Smilies.php
rename to tests/phpunit/tests/formatting/convertSmilies.php
index f5394d4268e67..63d95aa07169b 100644
--- a/tests/phpunit/tests/formatting/Smilies.php
+++ b/tests/phpunit/tests/formatting/convertSmilies.php
@@ -4,7 +4,7 @@
  * @group formatting
  * @group emoji
  */
-class Tests_Formatting_Smilies extends WP_UnitTestCase {
+class Tests_Formatting_ConvertSmilies extends WP_UnitTestCase {
 
 	/**
 	 * Basic Test Content DataProvider
diff --git a/tests/phpunit/tests/formatting/Emoji.php b/tests/phpunit/tests/formatting/emoji.php
similarity index 100%
rename from tests/phpunit/tests/formatting/Emoji.php
rename to tests/phpunit/tests/formatting/emoji.php
diff --git a/tests/phpunit/tests/formatting/ent2ncr.php b/tests/phpunit/tests/formatting/ent2ncr.php
index ba84e6d2e0692..64571580e4d94 100644
--- a/tests/phpunit/tests/formatting/ent2ncr.php
+++ b/tests/phpunit/tests/formatting/ent2ncr.php
@@ -3,7 +3,7 @@
 /**
  * @group formatting
  */
-class Tests_Formatting_Ent2NCR extends WP_UnitTestCase {
+class Tests_Formatting_Ent2ncr extends WP_UnitTestCase {
 	/**
 	 * @dataProvider entities
 	 */
diff --git a/tests/phpunit/tests/formatting/EscAttr.php b/tests/phpunit/tests/formatting/escAttr.php
similarity index 100%
rename from tests/phpunit/tests/formatting/EscAttr.php
rename to tests/phpunit/tests/formatting/escAttr.php
diff --git a/tests/phpunit/tests/formatting/EscHtml.php b/tests/phpunit/tests/formatting/escHtml.php
similarity index 100%
rename from tests/phpunit/tests/formatting/EscHtml.php
rename to tests/phpunit/tests/formatting/escHtml.php
diff --git a/tests/phpunit/tests/formatting/JSEscape.php b/tests/phpunit/tests/formatting/escJs.php
similarity index 95%
rename from tests/phpunit/tests/formatting/JSEscape.php
rename to tests/phpunit/tests/formatting/escJs.php
index 4dcb06481940f..bd6407518b3bd 100644
--- a/tests/phpunit/tests/formatting/JSEscape.php
+++ b/tests/phpunit/tests/formatting/escJs.php
@@ -3,7 +3,7 @@
 /**
  * @group formatting
  */
-class Tests_Formatting_JSEscape extends WP_UnitTestCase {
+class Tests_Formatting_EscJs extends WP_UnitTestCase {
 	function test_js_escape_simple() {
 		$out = esc_js( 'foo bar baz();' );
 		$this->assertSame( 'foo bar baz();', $out );
diff --git a/tests/phpunit/tests/formatting/EscTextarea.php b/tests/phpunit/tests/formatting/escTextarea.php
similarity index 100%
rename from tests/phpunit/tests/formatting/EscTextarea.php
rename to tests/phpunit/tests/formatting/escTextarea.php
diff --git a/tests/phpunit/tests/formatting/EscUrl.php b/tests/phpunit/tests/formatting/escUrl.php
similarity index 100%
rename from tests/phpunit/tests/formatting/EscUrl.php
rename to tests/phpunit/tests/formatting/escUrl.php
diff --git a/tests/phpunit/tests/formatting/EscXml.php b/tests/phpunit/tests/formatting/escXml.php
similarity index 100%
rename from tests/phpunit/tests/formatting/EscXml.php
rename to tests/phpunit/tests/formatting/escXml.php
diff --git a/tests/phpunit/tests/formatting/ExcerptRemoveBlocks.php b/tests/phpunit/tests/formatting/excerptRemoveBlocks.php
similarity index 100%
rename from tests/phpunit/tests/formatting/ExcerptRemoveBlocks.php
rename to tests/phpunit/tests/formatting/excerptRemoveBlocks.php
diff --git a/tests/phpunit/tests/formatting/BlogInfo.php b/tests/phpunit/tests/formatting/getBloginfo.php
similarity index 96%
rename from tests/phpunit/tests/formatting/BlogInfo.php
rename to tests/phpunit/tests/formatting/getBloginfo.php
index 37ce3450facae..b1f87a0d16e9a 100644
--- a/tests/phpunit/tests/formatting/BlogInfo.php
+++ b/tests/phpunit/tests/formatting/getBloginfo.php
@@ -3,7 +3,7 @@
 /**
  * @group formatting
  */
-class Tests_Formatting_BlogInfo extends WP_UnitTestCase {
+class Tests_Formatting_GetBloginfo extends WP_UnitTestCase {
 
 	/**
 	 * @dataProvider locales
diff --git a/tests/phpunit/tests/formatting/GetUrlInContent.php b/tests/phpunit/tests/formatting/getUrlInContent.php
similarity index 100%
rename from tests/phpunit/tests/formatting/GetUrlInContent.php
rename to tests/phpunit/tests/formatting/getUrlInContent.php
diff --git a/tests/phpunit/tests/formatting/HumanTimeDiff.php b/tests/phpunit/tests/formatting/humanTimeDiff.php
similarity index 100%
rename from tests/phpunit/tests/formatting/HumanTimeDiff.php
rename to tests/phpunit/tests/formatting/humanTimeDiff.php
diff --git a/tests/phpunit/tests/formatting/IsEmail.php b/tests/phpunit/tests/formatting/isEmail.php
similarity index 100%
rename from tests/phpunit/tests/formatting/IsEmail.php
rename to tests/phpunit/tests/formatting/isEmail.php
diff --git a/tests/phpunit/tests/formatting/LikeEscape.php b/tests/phpunit/tests/formatting/likeEscape.php
similarity index 100%
rename from tests/phpunit/tests/formatting/LikeEscape.php
rename to tests/phpunit/tests/formatting/likeEscape.php
diff --git a/tests/phpunit/tests/formatting/LinksAddTarget.php b/tests/phpunit/tests/formatting/linksAddTarget.php
similarity index 100%
rename from tests/phpunit/tests/formatting/LinksAddTarget.php
rename to tests/phpunit/tests/formatting/linksAddTarget.php
diff --git a/tests/phpunit/tests/formatting/MakeClickable.php b/tests/phpunit/tests/formatting/makeClickable.php
similarity index 100%
rename from tests/phpunit/tests/formatting/MakeClickable.php
rename to tests/phpunit/tests/formatting/makeClickable.php
diff --git a/tests/phpunit/tests/formatting/MapDeep.php b/tests/phpunit/tests/formatting/mapDeep.php
similarity index 100%
rename from tests/phpunit/tests/formatting/MapDeep.php
rename to tests/phpunit/tests/formatting/mapDeep.php
diff --git a/tests/phpunit/tests/formatting/NormalizeWhitespace.php b/tests/phpunit/tests/formatting/normalizeWhitespace.php
similarity index 100%
rename from tests/phpunit/tests/formatting/NormalizeWhitespace.php
rename to tests/phpunit/tests/formatting/normalizeWhitespace.php
diff --git a/tests/phpunit/tests/formatting/RemoveAccents.php b/tests/phpunit/tests/formatting/removeAccents.php
similarity index 100%
rename from tests/phpunit/tests/formatting/RemoveAccents.php
rename to tests/phpunit/tests/formatting/removeAccents.php
diff --git a/tests/phpunit/tests/formatting/SanitizeFileName.php b/tests/phpunit/tests/formatting/sanitizeFileName.php
similarity index 100%
rename from tests/phpunit/tests/formatting/SanitizeFileName.php
rename to tests/phpunit/tests/formatting/sanitizeFileName.php
diff --git a/tests/phpunit/tests/formatting/SanitizeMimeType.php b/tests/phpunit/tests/formatting/sanitizeMimeType.php
similarity index 100%
rename from tests/phpunit/tests/formatting/SanitizeMimeType.php
rename to tests/phpunit/tests/formatting/sanitizeMimeType.php
diff --git a/tests/phpunit/tests/formatting/SanitizeOrderby.php b/tests/phpunit/tests/formatting/sanitizeOrderby.php
similarity index 100%
rename from tests/phpunit/tests/formatting/SanitizeOrderby.php
rename to tests/phpunit/tests/formatting/sanitizeOrderby.php
diff --git a/tests/phpunit/tests/formatting/SanitizePost.php b/tests/phpunit/tests/formatting/sanitizePost.php
similarity index 100%
rename from tests/phpunit/tests/formatting/SanitizePost.php
rename to tests/phpunit/tests/formatting/sanitizePost.php
diff --git a/tests/phpunit/tests/formatting/SanitizeTextField.php b/tests/phpunit/tests/formatting/sanitizeTextField.php
similarity index 100%
rename from tests/phpunit/tests/formatting/SanitizeTextField.php
rename to tests/phpunit/tests/formatting/sanitizeTextField.php
diff --git a/tests/phpunit/tests/formatting/SanitizeTitle.php b/tests/phpunit/tests/formatting/sanitizeTitle.php
similarity index 100%
rename from tests/phpunit/tests/formatting/SanitizeTitle.php
rename to tests/phpunit/tests/formatting/sanitizeTitle.php
diff --git a/tests/phpunit/tests/formatting/SanitizeTitleWithDashes.php b/tests/phpunit/tests/formatting/sanitizeTitleWithDashes.php
similarity index 100%
rename from tests/phpunit/tests/formatting/SanitizeTitleWithDashes.php
rename to tests/phpunit/tests/formatting/sanitizeTitleWithDashes.php
diff --git a/tests/phpunit/tests/formatting/SanitizeTrackbackUrls.php b/tests/phpunit/tests/formatting/sanitizeTrackbackUrls.php
similarity index 100%
rename from tests/phpunit/tests/formatting/SanitizeTrackbackUrls.php
rename to tests/phpunit/tests/formatting/sanitizeTrackbackUrls.php
diff --git a/tests/phpunit/tests/formatting/SanitizeUser.php b/tests/phpunit/tests/formatting/sanitizeUser.php
similarity index 100%
rename from tests/phpunit/tests/formatting/SanitizeUser.php
rename to tests/phpunit/tests/formatting/sanitizeUser.php
diff --git a/tests/phpunit/tests/formatting/SeemsUtf8.php b/tests/phpunit/tests/formatting/seemsUtf8.php
similarity index 100%
rename from tests/phpunit/tests/formatting/SeemsUtf8.php
rename to tests/phpunit/tests/formatting/seemsUtf8.php
diff --git a/tests/phpunit/tests/formatting/Slashit.php b/tests/phpunit/tests/formatting/slashit.php
similarity index 100%
rename from tests/phpunit/tests/formatting/Slashit.php
rename to tests/phpunit/tests/formatting/slashit.php
diff --git a/tests/phpunit/tests/formatting/StripSlashesDeep.php b/tests/phpunit/tests/formatting/stripslashesDeep.php
similarity index 96%
rename from tests/phpunit/tests/formatting/StripSlashesDeep.php
rename to tests/phpunit/tests/formatting/stripslashesDeep.php
index a401a99f792c3..a475f9402afdb 100644
--- a/tests/phpunit/tests/formatting/StripSlashesDeep.php
+++ b/tests/phpunit/tests/formatting/stripslashesDeep.php
@@ -4,7 +4,7 @@
  * @group formatting
  * @group slashes
  */
-class Tests_Formatting_StripSlashesDeep extends WP_UnitTestCase {
+class Tests_Formatting_StripslashesDeep extends WP_UnitTestCase {
 	/**
 	 * @ticket 18026
 	 */
diff --git a/tests/phpunit/tests/formatting/URLShorten.php b/tests/phpunit/tests/formatting/urlShorten.php
similarity index 91%
rename from tests/phpunit/tests/formatting/URLShorten.php
rename to tests/phpunit/tests/formatting/urlShorten.php
index a1f1942809871..94e2728e6b5ae 100644
--- a/tests/phpunit/tests/formatting/URLShorten.php
+++ b/tests/phpunit/tests/formatting/urlShorten.php
@@ -3,8 +3,8 @@
 /**
  * @group formatting
  */
-class Tests_Formatting_URLShorten extends WP_UnitTestCase {
-	function test_shorten_url() {
+class Tests_Formatting_UrlShorten extends WP_UnitTestCase {
+	function test_url_shorten() {
 		$tests = array(
 			'wordpress\.org/about/philosophy'            => 'wordpress\.org/about/philosophy', // No longer strips slashes.
 			'wordpress.org/about/philosophy'             => 'wordpress.org/about/philosophy',
diff --git a/tests/phpunit/tests/formatting/UrlencodeDeep.php b/tests/phpunit/tests/formatting/urlencodeDeep.php
similarity index 100%
rename from tests/phpunit/tests/formatting/UrlencodeDeep.php
rename to tests/phpunit/tests/formatting/urlencodeDeep.php
diff --git a/tests/phpunit/tests/formatting/Utf8UriEncode.php b/tests/phpunit/tests/formatting/utf8UriEncode.php
similarity index 100%
rename from tests/phpunit/tests/formatting/Utf8UriEncode.php
rename to tests/phpunit/tests/formatting/utf8UriEncode.php
diff --git a/tests/phpunit/tests/formatting/Autop.php b/tests/phpunit/tests/formatting/wpAutop.php
similarity index 99%
rename from tests/phpunit/tests/formatting/Autop.php
rename to tests/phpunit/tests/formatting/wpAutop.php
index 8a77c6879ead6..ccb6721073534 100644
--- a/tests/phpunit/tests/formatting/Autop.php
+++ b/tests/phpunit/tests/formatting/wpAutop.php
@@ -3,7 +3,7 @@
 /**
  * @group formatting
  */
-class Tests_Formatting_Autop extends WP_UnitTestCase {
+class Tests_Formatting_wpAutop extends WP_UnitTestCase {
 
 	/**
 	 * @ticket 11008
diff --git a/tests/phpunit/tests/formatting/WPBasename.php b/tests/phpunit/tests/formatting/wpBasename.php
similarity index 91%
rename from tests/phpunit/tests/formatting/WPBasename.php
rename to tests/phpunit/tests/formatting/wpBasename.php
index a664e399c00b4..341a4c8a66e4f 100644
--- a/tests/phpunit/tests/formatting/WPBasename.php
+++ b/tests/phpunit/tests/formatting/wpBasename.php
@@ -3,7 +3,7 @@
 /**
  * @group formatting
  */
-class Tests_Formatting_WP_Basename extends WP_UnitTestCase {
+class Tests_Formatting_wpBasename extends WP_UnitTestCase {
 
 	function test_wp_basename_unix() {
 		$this->assertSame(
diff --git a/tests/phpunit/tests/formatting/HtmlExcerpt.php b/tests/phpunit/tests/formatting/wpHtmlExcerpt.php
similarity index 90%
rename from tests/phpunit/tests/formatting/HtmlExcerpt.php
rename to tests/phpunit/tests/formatting/wpHtmlExcerpt.php
index 36315fc541880..bbe89106b3697 100644
--- a/tests/phpunit/tests/formatting/HtmlExcerpt.php
+++ b/tests/phpunit/tests/formatting/wpHtmlExcerpt.php
@@ -3,7 +3,7 @@
 /**
  * @group formatting
  */
-class Tests_Formatting_HtmlExcerpt extends WP_UnitTestCase {
+class Tests_Formatting_wpHtmlExcerpt extends WP_UnitTestCase {
 	function test_simple() {
 		$this->assertSame( 'Baba', wp_html_excerpt( 'Baba told me not to come', 4 ) );
 	}
diff --git a/tests/phpunit/tests/formatting/WpHtmlSplit.php b/tests/phpunit/tests/formatting/wpHtmlSplit.php
similarity index 94%
rename from tests/phpunit/tests/formatting/WpHtmlSplit.php
rename to tests/phpunit/tests/formatting/wpHtmlSplit.php
index a9baa7cb8c1a8..50ebdd70511c8 100644
--- a/tests/phpunit/tests/formatting/WpHtmlSplit.php
+++ b/tests/phpunit/tests/formatting/wpHtmlSplit.php
@@ -3,7 +3,7 @@
 /**
  * @group formatting
  */
-class Tests_Formatting_WpHtmlSplit extends WP_UnitTestCase {
+class Tests_Formatting_wpHtmlSplit extends WP_UnitTestCase {
 
 	/**
 	 * Basic functionality goes here.
diff --git a/tests/phpunit/tests/formatting/WpHtmlEditPre.php b/tests/phpunit/tests/formatting/wpHtmleditPre.php
similarity index 93%
rename from tests/phpunit/tests/formatting/WpHtmlEditPre.php
rename to tests/phpunit/tests/formatting/wpHtmleditPre.php
index fceabbe8db3b7..f00e917f2ce3e 100644
--- a/tests/phpunit/tests/formatting/WpHtmlEditPre.php
+++ b/tests/phpunit/tests/formatting/wpHtmleditPre.php
@@ -4,7 +4,7 @@
  * @group formatting
  * @expectedDeprecated wp_htmledit_pre
  */
-class Tests_Formatting_WpHtmlEditPre extends WP_UnitTestCase {
+class Tests_Formatting_wpHtmleditPre extends WP_UnitTestCase {
 
 	function _charset_iso_8859_1() {
 		return 'iso-8859-1';
diff --git a/tests/phpunit/tests/formatting/isoDescrambler.php b/tests/phpunit/tests/formatting/wpIsoDescrambler.php
similarity index 82%
rename from tests/phpunit/tests/formatting/isoDescrambler.php
rename to tests/phpunit/tests/formatting/wpIsoDescrambler.php
index c1133c4bcf896..bb2be63514f71 100644
--- a/tests/phpunit/tests/formatting/isoDescrambler.php
+++ b/tests/phpunit/tests/formatting/wpIsoDescrambler.php
@@ -3,7 +3,7 @@
 /**
  * @group formatting
  */
-class Test_WP_ISO_Descrambler extends WP_UnitTestCase {
+class Tests_Formatting_wpIsoDescrambler extends WP_UnitTestCase {
 	/*
 	 * Decodes text in RFC2047 "Q"-encoding, e.g.
 	 * =?iso-8859-1?q?this=20is=20some=20text?=
diff --git a/tests/phpunit/tests/formatting/WPMakeLinkRelative.php b/tests/phpunit/tests/formatting/wpMakeLinkRelative.php
similarity index 95%
rename from tests/phpunit/tests/formatting/WPMakeLinkRelative.php
rename to tests/phpunit/tests/formatting/wpMakeLinkRelative.php
index da6099302b056..2592c2a2d0ac2 100644
--- a/tests/phpunit/tests/formatting/WPMakeLinkRelative.php
+++ b/tests/phpunit/tests/formatting/wpMakeLinkRelative.php
@@ -3,7 +3,7 @@
 /**
  * @group formatting
  */
-class Tests_Formatting_WPMakeLinkRelative extends WP_UnitTestCase {
+class Tests_Formatting_wpMakeLinkRelative extends WP_UnitTestCase {
 
 	public function test_wp_make_link_relative_with_http_scheme() {
 		$link          = 'http://example.com/this-is-a-test-http-url/';
diff --git a/tests/phpunit/tests/formatting/WPRelNoFollow.php b/tests/phpunit/tests/formatting/wpRelNofollow.php
similarity index 97%
rename from tests/phpunit/tests/formatting/WPRelNoFollow.php
rename to tests/phpunit/tests/formatting/wpRelNofollow.php
index 10385cade78bd..f66da5db5ed6c 100644
--- a/tests/phpunit/tests/formatting/WPRelNoFollow.php
+++ b/tests/phpunit/tests/formatting/wpRelNofollow.php
@@ -3,7 +3,7 @@
 /**
  * @group formatting
  */
-class Tests_Rel_No_Follow extends WP_UnitTestCase {
+class Tests_Formatting_wpRelNofollow extends WP_UnitTestCase {
 
 	/**
 	 * @ticket 9959
diff --git a/tests/phpunit/tests/formatting/WPRelUgc.php b/tests/phpunit/tests/formatting/wpRelUgc.php
similarity index 97%
rename from tests/phpunit/tests/formatting/WPRelUgc.php
rename to tests/phpunit/tests/formatting/wpRelUgc.php
index 85470155a1d67..ea0d4dda65adc 100644
--- a/tests/phpunit/tests/formatting/WPRelUgc.php
+++ b/tests/phpunit/tests/formatting/wpRelUgc.php
@@ -3,7 +3,7 @@
 /**
  * @group formatting
  */
-class Tests_Rel_Ugc extends WP_UnitTestCase {
+class Tests_Formatting_wpRelUgc extends WP_UnitTestCase {
 
 	/**
 	 * @ticket 48022
diff --git a/tests/phpunit/tests/formatting/WpReplaceInHtmlTags.php b/tests/phpunit/tests/formatting/wpReplaceInHtmlTags.php
similarity index 90%
rename from tests/phpunit/tests/formatting/WpReplaceInHtmlTags.php
rename to tests/phpunit/tests/formatting/wpReplaceInHtmlTags.php
index 764a0cc178441..70b6c94e734cc 100644
--- a/tests/phpunit/tests/formatting/WpReplaceInHtmlTags.php
+++ b/tests/phpunit/tests/formatting/wpReplaceInHtmlTags.php
@@ -3,7 +3,7 @@
 /**
  * @group formatting
  */
-class Tests_Formatting_WpReplaceInTags extends WP_UnitTestCase {
+class Tests_Formatting_wpReplaceInHtmlTags extends WP_UnitTestCase {
 	/**
 	 * Check for expected behavior of new function wp_replace_in_html_tags().
 	 *
diff --git a/tests/phpunit/tests/formatting/WpRichEditPre.php b/tests/phpunit/tests/formatting/wpRicheditPre.php
similarity index 94%
rename from tests/phpunit/tests/formatting/WpRichEditPre.php
rename to tests/phpunit/tests/formatting/wpRicheditPre.php
index 79ed8b1bc6d18..553e42049c850 100644
--- a/tests/phpunit/tests/formatting/WpRichEditPre.php
+++ b/tests/phpunit/tests/formatting/wpRicheditPre.php
@@ -4,7 +4,7 @@
  * @group formatting
  * @expectedDeprecated wp_richedit_pre
  */
-class Tests_Formatting_WpRichEditPre extends WP_UnitTestCase {
+class Tests_Formatting_wpRicheditPre extends WP_UnitTestCase {
 
 	function _charset_iso_8859_1() {
 		return 'iso-8859-1';
diff --git a/tests/phpunit/tests/formatting/WPSlash.php b/tests/phpunit/tests/formatting/wpSlash.php
similarity index 97%
rename from tests/phpunit/tests/formatting/WPSlash.php
rename to tests/phpunit/tests/formatting/wpSlash.php
index 4b0d206c06866..bc31a93987149 100644
--- a/tests/phpunit/tests/formatting/WPSlash.php
+++ b/tests/phpunit/tests/formatting/wpSlash.php
@@ -3,7 +3,7 @@
 /**
  * @group formatting
  */
-class Tests_Formatting_WPSlash extends WP_UnitTestCase {
+class Tests_Formatting_wpSlash extends WP_UnitTestCase {
 
 	/**
 	 * @ticket 42195
diff --git a/tests/phpunit/tests/formatting/WPSpecialchars.php b/tests/phpunit/tests/formatting/wpSpecialchars.php
similarity index 98%
rename from tests/phpunit/tests/formatting/WPSpecialchars.php
rename to tests/phpunit/tests/formatting/wpSpecialchars.php
index 7cc131da04ea5..59169cd574ec3 100644
--- a/tests/phpunit/tests/formatting/WPSpecialchars.php
+++ b/tests/phpunit/tests/formatting/wpSpecialchars.php
@@ -3,7 +3,7 @@
 /**
  * @group formatting
  */
-class Tests_Formatting_WPSpecialchars extends WP_UnitTestCase {
+class Tests_Formatting_wpSpecialchars extends WP_UnitTestCase {
 	function test_wp_specialchars_basics() {
 		$html = '&amp;&lt;hello world&gt;';
 		$this->assertSame( $html, _wp_specialchars( $html ) );
diff --git a/tests/phpunit/tests/formatting/WPStripAllTags.php b/tests/phpunit/tests/formatting/wpStripAllTags.php
similarity index 93%
rename from tests/phpunit/tests/formatting/WPStripAllTags.php
rename to tests/phpunit/tests/formatting/wpStripAllTags.php
index 8656af26957df..cbeb3214a7202 100644
--- a/tests/phpunit/tests/formatting/WPStripAllTags.php
+++ b/tests/phpunit/tests/formatting/wpStripAllTags.php
@@ -4,7 +4,7 @@
  *
  * @group formatting
  */
-class Tests_Formatting_WPStripAllTags extends WP_UnitTestCase {
+class Tests_Formatting_wpStripAllTags extends WP_UnitTestCase {
 
 	function test_wp_strip_all_tags() {
 
diff --git a/tests/phpunit/tests/formatting/WPTargetedLinkRel.php b/tests/phpunit/tests/formatting/wpTargetedLinkRel.php
similarity index 98%
rename from tests/phpunit/tests/formatting/WPTargetedLinkRel.php
rename to tests/phpunit/tests/formatting/wpTargetedLinkRel.php
index 932100c1cdae2..b58f4188b58cb 100644
--- a/tests/phpunit/tests/formatting/WPTargetedLinkRel.php
+++ b/tests/phpunit/tests/formatting/wpTargetedLinkRel.php
@@ -4,7 +4,7 @@
  * @group formatting
  * @ticket 43187
  */
-class Tests_Targeted_Link_Rel extends WP_UnitTestCase {
+class Tests_Formatting_wpTargetedLinkRel extends WP_UnitTestCase {
 
 	public function test_add_to_links_with_target_blank() {
 		$content  = '<p>Links: <a href="/" target="_blank">No rel</a></p>';
diff --git a/tests/phpunit/tests/formatting/WPTexturize.php b/tests/phpunit/tests/formatting/wpTexturize.php
similarity index 99%
rename from tests/phpunit/tests/formatting/WPTexturize.php
rename to tests/phpunit/tests/formatting/wpTexturize.php
index fda1fa9730c57..bfad5c707ad13 100644
--- a/tests/phpunit/tests/formatting/WPTexturize.php
+++ b/tests/phpunit/tests/formatting/wpTexturize.php
@@ -3,7 +3,7 @@
 /**
  * @group formatting
  */
-class Tests_Formatting_WPTexturize extends WP_UnitTestCase {
+class Tests_Formatting_wpTexturize extends WP_UnitTestCase {
 	function test_dashes() {
 		$this->assertSame( 'Hey &#8212; boo?', wptexturize( 'Hey -- boo?' ) );
 		$this->assertSame( '<a href="http://xx--xx">Hey &#8212; boo?</a>', wptexturize( '<a href="http://xx--xx">Hey -- boo?</a>' ) );
diff --git a/tests/phpunit/tests/formatting/WpTrimExcerpt.php b/tests/phpunit/tests/formatting/wpTrimExcerpt.php
similarity index 96%
rename from tests/phpunit/tests/formatting/WpTrimExcerpt.php
rename to tests/phpunit/tests/formatting/wpTrimExcerpt.php
index 01353c8e22ac9..f05e21fb2a613 100644
--- a/tests/phpunit/tests/formatting/WpTrimExcerpt.php
+++ b/tests/phpunit/tests/formatting/wpTrimExcerpt.php
@@ -4,7 +4,7 @@
  * @group formatting
  * @covers ::wp_trim_excerpt
  */
-class Tests_Formatting_WpTrimExcerpt extends WP_UnitTestCase {
+class Tests_Formatting_wpTrimExcerpt extends WP_UnitTestCase {
 	/**
 	 * @ticket 25349
 	 */
diff --git a/tests/phpunit/tests/formatting/WPTrimWords.php b/tests/phpunit/tests/formatting/wpTrimWords.php
similarity index 98%
rename from tests/phpunit/tests/formatting/WPTrimWords.php
rename to tests/phpunit/tests/formatting/wpTrimWords.php
index b7ec436df0f1b..3f18d782a6137 100644
--- a/tests/phpunit/tests/formatting/WPTrimWords.php
+++ b/tests/phpunit/tests/formatting/wpTrimWords.php
@@ -3,7 +3,7 @@
 /**
  * @group formatting
  */
-class Tests_Formatting_WPTrimWords extends WP_UnitTestCase {
+class Tests_Formatting_wpTrimWords extends WP_UnitTestCase {
 
 	/**
 	 * Long Dummy Text.
diff --git a/tests/phpunit/tests/formatting/Zeroise.php b/tests/phpunit/tests/formatting/zeroise.php
similarity index 100%
rename from tests/phpunit/tests/formatting/Zeroise.php
rename to tests/phpunit/tests/formatting/zeroise.php

From d93f76dca87687d72951bc0be18bd56f4b23bb4d Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 16 Aug 2021 22:16:32 +0000
Subject: [PATCH 003/257] Code Modernization: Correct handling of `null` in
 `wp_parse_str()`.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fixes `parse_str(): Passing null to parameter #1 ($string) of type string is deprecated` notices on PHP 8.1, without change in behaviour.

Impact: 311 of the pre-existing tests are affected by this issue.

The PHP native `parse_str()` function expects a string, however, based on the failing tests, it is clear there are functions in WordPress which passes a non-string – including `null` – value to the `wp_parse_str()` function, which would subsequently pass it onto the PHP native function without further input validation.

Most notable offender is the `wp_parse_args()` function which special cases arrays and objects, but passes everything else off to `wp_parse_str()`.

Several ways to fix this issue have been explored, including checking the received value with `is_string()` or `is_scalar()` before passing it off to the PHP native `parse_str()` function.

In the end it was decided against these in favor of a string cast as:
* `is_string()` would significantly change the behavior for anything non-string.
* `is_scalar()` up to a point as well, as it does not take objects with a `__toString()` method into account.

Executing a string cast on the received value before passing it on maintains the pre-existing behavior while still preventing the deprecation notice coming from PHP 8.1.

Reference: [https://www.php.net/manual/en/function.parse-str.php PHP Manual: parse_str()]

Follow-up to [5709].

Props jrf, hellofromTonya, lucatume, SergeyBiryukov.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51624 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/formatting.php                |   2 +-
 tests/phpunit/tests/formatting/wpParseStr.php | 144 ++++++++++++++++++
 2 files changed, 145 insertions(+), 1 deletion(-)
 create mode 100644 tests/phpunit/tests/formatting/wpParseStr.php

diff --git a/src/wp-includes/formatting.php b/src/wp-includes/formatting.php
index edfdd1e416755..b80c40cdda601 100644
--- a/src/wp-includes/formatting.php
+++ b/src/wp-includes/formatting.php
@@ -4964,7 +4964,7 @@ function map_deep( $value, $callback ) {
  * @param array  $array  Variables will be stored in this array.
  */
 function wp_parse_str( $string, &$array ) {
-	parse_str( $string, $array );
+	parse_str( (string) $string, $array );
 
 	/**
 	 * Filters the array of variables derived from a parsed string.
diff --git a/tests/phpunit/tests/formatting/wpParseStr.php b/tests/phpunit/tests/formatting/wpParseStr.php
new file mode 100644
index 0000000000000..b8c3d063d2423
--- /dev/null
+++ b/tests/phpunit/tests/formatting/wpParseStr.php
@@ -0,0 +1,144 @@
+<?php
+
+/**
+ * @group formatting
+ * @covers ::wp_parse_str
+ */
+class Tests_Formatting_wpParseStr extends WP_UnitTestCase {
+
+	/**
+	 * Tests parsing of a string into variables.
+	 *
+	 * Note: While the function under test does not contain any significant logic,
+	 * these tests document the behavior and safeguard PHP cross-version compatibility.
+	 *
+	 * @dataProvider data_wp_parse_str
+	 *
+	 * @param mixed $input    Value to parse.
+	 * @param array $expected Expected function output.
+	 */
+	public function test_wp_parse_str( $input, $expected ) {
+		wp_parse_str( $input, $output );
+		$this->assertSame( $expected, $output );
+	}
+
+	/**
+	 * Data Provider.
+	 *
+	 * @return array
+	 */
+	public function data_wp_parse_str() {
+		return array(
+			'null'              => array(
+				'input'    => null,
+				'expected' => array(),
+			),
+			'boolean false'     => array(
+				'input'    => false,
+				'expected' => array(),
+			),
+			'boolean true'      => array(
+				'input'    => true,
+				'expected' => array(
+					1 => '',
+				),
+			),
+			'integer 0'         => array(
+				'input'    => 0,
+				'expected' => array(
+					0 => '',
+				),
+			),
+			'integer 456'       => array(
+				'input'    => 456,
+				'expected' => array(
+					456 => '',
+				),
+			),
+			'float 12.53'       => array(
+				'input'    => 12.53,
+				'expected' => array(
+					'12_53' => '',
+				),
+			),
+			'plain string'      => array(
+				'input'    => 'foobar',
+				'expected' => array(
+					'foobar' => '',
+				),
+			),
+			'query string'      => array(
+				'input'    => 'x=5&_baba=dudu&',
+				'expected' => array(
+					'x'     => '5',
+					'_baba' => 'dudu',
+				),
+			),
+			'stringable object' => array(
+				'input'    => new Fixture_Formatting_wpParseStr(),
+				'expected' => array(
+					'foobar' => '',
+				),
+			),
+		);
+	}
+
+	/**
+	 * Tests that the result array only contains the result of the string parsing
+	 * when provided with different types of input for the `$output` parameter.
+	 *
+	 * @dataProvider data_wp_parse_str_result_array_is_always_overwritten
+	 *
+	 * @param array|null $output   Value for the `$output` parameter.
+	 * @param array      $expected Expected function output.
+	 */
+	public function test_wp_parse_str_result_array_is_always_overwritten( $output, $expected ) {
+		wp_parse_str( 'key=25&thing=text', $output );
+		$this->assertSame( $expected, $output );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_wp_parse_str_result_array_is_always_overwritten() {
+		// Standard value for expected output.
+		$expected = array(
+			'key'   => '25',
+			'thing' => 'text',
+		);
+
+		return array(
+			'output null'                                 => array(
+				'output'   => null,
+				'expected' => $expected,
+			),
+			'output empty array'                          => array(
+				'output'   => array(),
+				'expected' => $expected,
+			),
+			'output non empty array, no conflicting keys' => array(
+				'output'   => array(
+					'foo' => 'bar',
+				),
+				'expected' => $expected,
+			),
+			'output non empty array, conflicting keys'    => array(
+				'output'   => array(
+					'key' => 'value',
+				),
+				'expected' => $expected,
+			),
+		);
+	}
+}
+
+/**
+ * Fixture for use in the tests.
+ */
+class Fixture_Formatting_wpParseStr {
+	public function __toString() {
+		return 'foobar';
+	}
+}

From d7c22d29cfb6c813bf2318006f2cf399bccf1a2d Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 16 Aug 2021 22:51:47 +0000
Subject: [PATCH 004/257] Code Modernization: Check the input type in
 `validate_file()`.

This fixes a `preg_match_all(): Passing null to parameter #2 ($subject) of type string is deprecated` notice on PHP 8.1.

The behavior for `null` and `string` input is covered by the existing `Tests_Functions::test_validate_file()` test.

Effect: Errors down by 238, assertions up by 1920, failures down by 1.

Props jrf, hellofromTonya, SergeyBiryukov.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51625 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/functions.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index 33344f31532d3..7b01568ad42c0 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -5709,6 +5709,10 @@ function iis7_supports_permalinks() {
  * @return int 0 means nothing is wrong, greater than 0 means something was wrong.
  */
 function validate_file( $file, $allowed_files = array() ) {
+	if ( ! is_scalar( $file ) || '' === $file ) {
+		return 0;
+	}
+
 	// `../` on its own is not allowed:
 	if ( '../' === $file ) {
 		return 1;

From 5f5895bf61dfe62890e296ad7acd81aad9bde88b Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 17 Aug 2021 00:14:20 +0000
Subject: [PATCH 005/257] Code Modernization: Check the return type of
 `parse_url()` in `download_url()`.

As per the PHP manual:
> If the `component` parameter is omitted, an associative array is returned.
> If the `component` parameter is specified, `parse_url()` returns a string (or an int, in the case of `PHP_URL_PORT`) instead of an array. If the requested component doesn't exist within the given URL, `null` will be returned.

Reference: [https://www.php.net/manual/en/function.parse-url.php#refsect1-function.parse-url-returnvalues PHP Manual: parse_url(): Return Values]

This commit adds three unit tests for `download_url()`:

* The first test is "girl-scouting" to make sure that the code up to the point where the error is expected is tested.
* The second test exposed a PHP 8.1 `basename(): Passing null to parameter #1 ($path) of type string is deprecated` error due to the call to `parse_url()` returning `null` when the component requested does not exist in the passed URL.
* The output of the call to `parse_url()` stored in the `$url_path` variable is used in more places in the function logic. The third test exposes a second PHP 8.1 deprecation notice, this time for `substr(): Passing null to parameter #1 ($string) of type string is deprecated`.

This commit also removes duplicate `parse_url()` calls. Neither `$url` nor `$url_filename` are changed between when they are first received/defined and when they are re-used, so there is no need to repeat the function calls.

Follow-up to [51606], [51622].

Props jrf, hellofromTonya, SergeyBiryukov.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51626 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/file.php             | 11 ++--
 tests/phpunit/tests/admin/includesFile.php | 74 ++++++++++++++++++++++
 2 files changed, 81 insertions(+), 4 deletions(-)

diff --git a/src/wp-admin/includes/file.php b/src/wp-admin/includes/file.php
index 052c235e15724..8c4797d11398d 100644
--- a/src/wp-admin/includes/file.php
+++ b/src/wp-admin/includes/file.php
@@ -1126,7 +1126,11 @@ function download_url( $url, $timeout = 300, $signature_verification = false ) {
 		return new WP_Error( 'http_no_url', __( 'Invalid URL Provided.' ) );
 	}
 
-	$url_filename = basename( parse_url( $url, PHP_URL_PATH ) );
+	$url_path     = parse_url( $url, PHP_URL_PATH );
+	$url_filename = '';
+	if ( is_string( $url_path ) && '' !== $url_path ) {
+		$url_filename = basename( $url_path );
+	}
 
 	$tmpfname = wp_tempnam( $url_filename );
 	if ( ! $tmpfname ) {
@@ -1212,9 +1216,8 @@ function download_url( $url, $timeout = 300, $signature_verification = false ) {
 			// WordPress.org stores signatures at $package_url.sig.
 
 			$signature_url = false;
-			$url_path      = parse_url( $url, PHP_URL_PATH );
 
-			if ( '.zip' === substr( $url_path, -4 ) || '.tar.gz' === substr( $url_path, -7 ) ) {
+			if ( is_string( $url_path ) && ( '.zip' === substr( $url_path, -4 ) || '.tar.gz' === substr( $url_path, -7 ) ) ) {
 				$signature_url = str_replace( $url_path, $url_path . '.sig', $url );
 			}
 
@@ -1243,7 +1246,7 @@ function download_url( $url, $timeout = 300, $signature_verification = false ) {
 		}
 
 		// Perform the checks.
-		$signature_verification = verify_file_signature( $tmpfname, $signature, basename( parse_url( $url, PHP_URL_PATH ) ) );
+		$signature_verification = verify_file_signature( $tmpfname, $signature, $url_filename );
 	}
 
 	if ( is_wp_error( $signature_verification ) ) {
diff --git a/tests/phpunit/tests/admin/includesFile.php b/tests/phpunit/tests/admin/includesFile.php
index a3af5da2d1c9c..5c58cbfcd4023 100644
--- a/tests/phpunit/tests/admin/includesFile.php
+++ b/tests/phpunit/tests/admin/includesFile.php
@@ -77,4 +77,78 @@ public function _fake_download_url_non_200_response_code( $response, $args, $url
 	public function __return_5() {
 		return 5;
 	}
+
+	/**
+	 * Verify that a WP_Error object is returned when invalid input is passed as the `$url` parameter.
+	 *
+	 * @covers ::download_url
+	 * @dataProvider data_download_url_empty_url
+	 *
+	 * @param mixed $url Input URL.
+	 */
+	public function test_download_url_empty_url( $url ) {
+		$error = download_url( $url );
+		$this->assertWPError( $error );
+		$this->assertSame( 'http_no_url', $error->get_error_code() );
+		$this->assertSame( 'Invalid URL Provided.', $error->get_error_message() );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_download_url_empty_url() {
+		return array(
+			'null'         => array( null ),
+			'false'        => array( false ),
+			'integer 0'    => array( 0 ),
+			'empty string' => array( '' ),
+			'string 0'     => array( '0' ),
+		);
+	}
+
+	/**
+	 * Test that PHP 8.1 "passing null to non-nullable" deprecation notice
+	 * is not thrown when the `$url` does not have a path component.
+	 *
+	 * @ticket 53635
+	 * @covers ::download_url
+	 */
+	public function test_download_url_no_warning_for_url_without_path() {
+		$result = download_url( 'https://example.com' );
+
+		$this->assertIsString( $result );
+		$this->assertNotEmpty( $result ); // File path will be generated, but will never be empty.
+	}
+
+	/**
+	 * Test that PHP 8.1 "passing null to non-nullable" deprecation notice
+	 * is not thrown when the `$url` does not have a path component,
+	 * and signature verification via a local file is requested.
+	 *
+	 * @ticket 53635
+	 * @covers ::download_url
+	 */
+	public function test_download_url_no_warning_for_url_without_path_with_signature_verification() {
+		add_filter(
+			'wp_signature_hosts',
+			static function( $urls ) {
+				$urls[] = 'example.com';
+				return $urls;
+			}
+		);
+		$error = download_url( 'https://example.com', 300, true );
+
+		/*
+		 * Note: This test is not testing the signature verification itself.
+		 * There is no signature available for the domain used in the test,
+		 * which is why an error is expected and that's fine.
+		 * The point of the test is to verify that the call to `verify_file_signature()`
+		 * is actually reached and that no PHP deprecation notice is thrown
+		 * before this point.
+		 */
+		$this->assertWPError( $error );
+		$this->assertSame( 'signature_verification_no_signature', $error->get_error_code() );
+	}
 }

From 6d574d7cabfaf6cc9797d2119ba1a10d9cd78fa3 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 17 Aug 2021 00:27:38 +0000
Subject: [PATCH 006/257] Tests: Use a better return type check for
 `parse_url()` in `do_enclose()` tests.

Since the `pathinfo()` function accepts a string, checking for that specifically is more consistent with similar checks elsewhere in core.

Follow-up to [51606], [51622], [51626].

See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51627 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/functions/doEnclose.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/phpunit/tests/functions/doEnclose.php b/tests/phpunit/tests/functions/doEnclose.php
index 30a8e73dac0c2..5c8a42089fba7 100644
--- a/tests/phpunit/tests/functions/doEnclose.php
+++ b/tests/phpunit/tests/functions/doEnclose.php
@@ -280,7 +280,7 @@ public function fake_http_request( $false, $arguments, $url ) {
 
 		$path = parse_url( $url, PHP_URL_PATH );
 
-		if ( null !== $path ) {
+		if ( is_string( $path ) ) {
 			$extension = pathinfo( $path, PATHINFO_EXTENSION );
 			if ( isset( $fake_headers[ $extension ] ) ) {
 				return $fake_headers[ $extension ];

From 16b448416bcfc7ea9757ade3bfc9603a6b886a11 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 17 Aug 2021 20:01:15 +0000
Subject: [PATCH 007/257] Tests: Move loading the `PO` class to
 `set_up_before_class()`.

This ensures that the class is loaded once before the first test of the test case class is run, and `require_once()` is not unnecessarily called for each test method individually.

Follow-up to [1106/tests].

See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51628 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/pomo/po.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/phpunit/tests/pomo/po.php b/tests/phpunit/tests/pomo/po.php
index c79b37033f77a..9a37b4dd4eabd 100644
--- a/tests/phpunit/tests/pomo/po.php
+++ b/tests/phpunit/tests/pomo/po.php
@@ -4,9 +4,16 @@
  * @group pomo
  */
 class Tests_POMO_PO extends WP_UnitTestCase {
-	function set_up() {
-		parent::set_up();
+
+	public static function set_up_before_class() {
+		parent::set_up_before_class();
+
 		require_once ABSPATH . '/wp-includes/pomo/po.php';
+	}
+
+	public function set_up() {
+		parent::set_up();
+
 		// Not so random wordpress.pot string -- multiple lines.
 		$this->mail    = 'Your new WordPress blog has been successfully set up at:
 

From 0f51a986022931dbe8b945ef5d2bb0814c314af3 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 17 Aug 2021 21:55:22 +0000
Subject: [PATCH 008/257] Code Modernization: Check the return type of
 `parse_url()` on Plugin/Theme Editor screens.

As per the PHP manual:
> If the `component` parameter is omitted, an associative array is returned.
> If the `component` parameter is specified, `parse_url()` returns a string (or an int, in the case of `PHP_URL_PORT`) instead of an array. If the requested component doesn't exist within the given URL, `null` will be returned.

Reference: [https://www.php.net/manual/en/function.parse-url.php#refsect1-function.parse-url-returnvalues PHP Manual: parse_url(): Return Values]

While it is probably unlikely that someone would have a direct link to the plugin/theme editor on their home page or even on someone else's homepage, it is entirely possible for the referrer URL to not have a "path" component.

In PHP 8.1, this would lead to a `basename(): Passing null to parameter #1 ($string) of type string is deprecated` notice.

Changing the logic around and adding validation for the return type value of `parse_url()` prevents that.

Follow-up to [51606], [51622], [51626].

Props jrf, hellofromTonya, SergeyBiryukov.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51629 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/plugin-editor.php | 10 ++++++----
 src/wp-admin/theme-editor.php  | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/wp-admin/plugin-editor.php b/src/wp-admin/plugin-editor.php
index 36dce7795d9d5..800e468f3f9f8 100644
--- a/src/wp-admin/plugin-editor.php
+++ b/src/wp-admin/plugin-editor.php
@@ -312,10 +312,12 @@
 
 	$excluded_referer_basenames = array( 'plugin-editor.php', 'wp-login.php' );
 
-	if ( $referer && ! in_array( basename( parse_url( $referer, PHP_URL_PATH ) ), $excluded_referer_basenames, true ) ) {
-		$return_url = $referer;
-	} else {
-		$return_url = admin_url( '/' );
+	$return_url = admin_url( '/' );
+	if ( $referer ) {
+		$referer_path = parse_url( $referer, PHP_URL_PATH );
+		if ( is_string( $referer_path ) && ! in_array( basename( $referer_path ), $excluded_referer_basenames, true ) ) {
+			$return_url = $referer;
+		}
 	}
 	?>
 	<div id="file-editor-warning" class="notification-dialog-wrap file-editor-warning hide-if-no-js hidden">
diff --git a/src/wp-admin/theme-editor.php b/src/wp-admin/theme-editor.php
index 572a2d82c4631..46926df87ce3b 100644
--- a/src/wp-admin/theme-editor.php
+++ b/src/wp-admin/theme-editor.php
@@ -343,10 +343,12 @@
 
 	$excluded_referer_basenames = array( 'theme-editor.php', 'wp-login.php' );
 
-	if ( $referer && ! in_array( basename( parse_url( $referer, PHP_URL_PATH ) ), $excluded_referer_basenames, true ) ) {
-		$return_url = $referer;
-	} else {
-		$return_url = admin_url( '/' );
+	$return_url = admin_url( '/' );
+	if ( $referer ) {
+		$referer_path = parse_url( $referer, PHP_URL_PATH );
+		if ( is_string( $referer_path ) && ! in_array( basename( $referer_path ), $excluded_referer_basenames, true ) ) {
+			$return_url = $referer;
+		}
 	}
 	?>
 	<div id="file-editor-warning" class="notification-dialog-wrap file-editor-warning hide-if-no-js hidden">

From 6ec2594d74fb25140917d8caf41c259498fa43c4 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 17 Aug 2021 22:07:55 +0000
Subject: [PATCH 009/257] Code Modernization: Check the return type of
 `parse_url()` in `ms_cookie_constants()`.

As per the PHP manual:
> If the `component` parameter is omitted, an associative array is returned.
> If the `component` parameter is specified, `parse_url()` returns a string (or an int, in the case of `PHP_URL_PORT`) instead of an array. If the requested component doesn't exist within the given URL, `null` will be returned.

Reference: [https://www.php.net/manual/en/function.parse-url.php#refsect1-function.parse-url-returnvalues PHP Manual: parse_url(): Return Values]

It is entirely possible for the `siteurl` option to not have a "path" component.

In PHP 8.1, this would lead to a `trim(): Passing null to parameter #1 ($string) of type string is deprecated` notice.

Changing the logic around and adding validation for the return type value of `parse_url()` prevents that.

As this function is declaring global constants, adding tests for this change is not really an option without potentially affecting other tests.

Follow-up to [51606], [51622], [51626], [51629].

Props jrf, hellofromTonya, SergeyBiryukov.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51630 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/ms-default-constants.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/wp-includes/ms-default-constants.php b/src/wp-includes/ms-default-constants.php
index 7d794e32e6523..016ed437b7146 100644
--- a/src/wp-includes/ms-default-constants.php
+++ b/src/wp-includes/ms-default-constants.php
@@ -68,7 +68,8 @@ function ms_cookie_constants() {
 	 * @since 2.6.0
 	 */
 	if ( ! defined( 'ADMIN_COOKIE_PATH' ) ) {
-		if ( ! is_subdomain_install() || trim( parse_url( get_option( 'siteurl' ), PHP_URL_PATH ), '/' ) ) {
+		$site_path = parse_url( get_option( 'siteurl' ), PHP_URL_PATH );
+		if ( ! is_subdomain_install() || is_string( $site_path ) && trim( $site_path, '/' ) ) {
 			define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH );
 		} else {
 			define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' );

From acfe40f335fd763ebcea6873cd65e6ea110ecf53 Mon Sep 17 00:00:00 2001
From: Peter Wilson <peterwilsoncc@git.wordpress.org>
Date: Wed, 18 Aug 2021 05:37:01 +0000
Subject: [PATCH 010/257] Media: Fix layout of media library modal on narrow
 screens.

Reduces the right margin of the media library modal on small and medium width screens to remove excess white-space. On very narrow screens this was preventing the media icons from displaying.

Props andraganescu, desrosj, joedolson, moch11, mukesh27, sabernhardt, SergeyBiryukov, zieladam.
Fixes #53679.


git-svn-id: https://develop.svn.wordpress.org/trunk@51631 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/css/media-views.css | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/css/media-views.css b/src/wp-includes/css/media-views.css
index 784903db6d745..b3dca00ea1d47 100644
--- a/src/wp-includes/css/media-views.css
+++ b/src/wp-includes/css/media-views.css
@@ -2617,7 +2617,9 @@
 
 	.attachments-browser .attachments,
 	.attachments-browser .uploader-inline,
-	.attachments-browser .media-toolbar {
+	.attachments-browser .media-toolbar,
+	.attachments-browser .attachments-wrapper,
+	.attachments-browser.has-load-more .attachments-wrapper {
 		right: 262px;
 	}
 
@@ -2884,10 +2886,15 @@
 
 	.attachments-browser .attachments,
 	.attachments-browser .uploader-inline,
-	.attachments-browser .media-toolbar {
+	.attachments-browser .media-toolbar,
+	.media-frame-content .attachments-browser .attachments-wrapper {
 		right: 0;
 	}
 
+	.attachments-browser .attachments-wrapper {
+		padding-top: 12px;
+	}
+
 	.image-details .media-frame-title {
 		display: block;
 		top: 0;

From cd616cf406d77a5eb653aa97cc5b6e2dc3e669a6 Mon Sep 17 00:00:00 2001
From: Peter Wilson <peterwilsoncc@git.wordpress.org>
Date: Wed, 18 Aug 2021 05:59:28 +0000
Subject: [PATCH 011/257] Media: Increase number of media items displayed per
 page.

Increase the number of media items displayed per page from 40 to 80 to improve the experience for users navigating the library on sites with a large quantity of media in the library.

Props AlGala, antpb, hellofromTonya, joedolson, SergeyBiryukov, wb1234.
Fixes #53827.



git-svn-id: https://develop.svn.wordpress.org/trunk@51632 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/js/media/models/query.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/media/models/query.js b/src/js/media/models/query.js
index 1d56fed624694..b3f62018f5cd4 100644
--- a/src/js/media/models/query.js
+++ b/src/js/media/models/query.js
@@ -171,7 +171,7 @@ Query = Attachments.extend(/** @lends wp.media.model.Query.prototype */{
 	 * @readonly
 	 */
 	defaultArgs: {
-		posts_per_page: 40
+		posts_per_page: 80
 	},
 	/**
 	 * @readonly

From 27a2a804a33a3d414c33d7d543743455325e22fb Mon Sep 17 00:00:00 2001
From: SergeyBiryukov <SergeyBiryukov@602fd350-edb4-49c9-b593-d223f7449a82>
Date: Wed, 18 Aug 2021 13:22:02 +0000
Subject: [PATCH 012/257] Code Modernization: Only set
 `auto_detect_line_endings` in PHP < 8.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since PHP 8.1, the `auto_detect_line_endings` setting is deprecated:

> The `auto_detect_line_endings` ini setting modifies the behavior of `file()` and `fgets()` to support an isolated `\r` (as opposed to `\n` or `\r\n`) as a newline character. These newlines were used by “Classic” Mac OS, a system which has been discontinued in 2001, nearly two decades ago. Interoperability with such systems is no longer relevant.

Reference: [https://wiki.php.net/rfc/deprecations_php_8_1#auto_detect_line_endings_ini_setting PHP RFC: Deprecations for PHP 8.1: auto_detect_line_endings ini setting]

> The `auto_detect_line_endings` ini setting has been deprecated. If necessary, handle `\r` line breaks manually instead.

Reference: [https://github.com/php/php-src/blob/1cf4fb739f7a4fa8404a4c0958f13d04eae519d4/UPGRADING#L456-L457 PHP 8.1 Upgrade Notes].

This commit fixes the warning when running tests for the `PO` class:
{{{
Deprecated: auto_detect_line_endings is deprecated in /var/www/src/wp-includes/pomo/po.php on line 16
}}}

Follow-up to [10584], [51628].

See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51633 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/pomo/po.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/wp-includes/pomo/po.php b/src/wp-includes/pomo/po.php
index 99bb6891b1040..22b94c11bf972 100644
--- a/src/wp-includes/pomo/po.php
+++ b/src/wp-includes/pomo/po.php
@@ -13,7 +13,10 @@
 	define( 'PO_MAX_LINE_LEN', 79 );
 }
 
-ini_set( 'auto_detect_line_endings', 1 );
+// This setting has been deprecated in PHP 8.1.
+if ( PHP_VERSION_ID < 80100 ) {
+	ini_set( 'auto_detect_line_endings', 1 );
+}
 
 /**
  * Routines for working with PO files

From 9aa15898070935370fc9ca3b7aaa1682ba63e818 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 18 Aug 2021 13:52:16 +0000
Subject: [PATCH 013/257] External Libraries: Upgrade PHPMailer to version
 6.5.1.

The latest release includes preliminary PHP 8.1 support, as well as some small bug fixes.

Release notes: https://github.com/PHPMailer/PHPMailer/releases/tag/v6.5.1

For a full list of changes in this update, see the PHPMailer GitHub:
https://github.com/PHPMailer/PHPMailer/compare/v6.5.0...v6.5.1

Follow-up to [50628], [50799], [51169].

Props jrf.
Fixes #53953.

git-svn-id: https://develop.svn.wordpress.org/trunk@51634 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/PHPMailer/Exception.php |   2 +-
 src/wp-includes/PHPMailer/PHPMailer.php | 135 +++++++++++++++++-------
 src/wp-includes/PHPMailer/SMTP.php      |   2 +-
 3 files changed, 98 insertions(+), 41 deletions(-)

diff --git a/src/wp-includes/PHPMailer/Exception.php b/src/wp-includes/PHPMailer/Exception.php
index a50a8991f7a1d..52eaf95158a37 100644
--- a/src/wp-includes/PHPMailer/Exception.php
+++ b/src/wp-includes/PHPMailer/Exception.php
@@ -35,6 +35,6 @@ class Exception extends \Exception
      */
     public function errorMessage()
     {
-        return '<strong>' . htmlspecialchars($this->getMessage()) . "</strong><br />\n";
+        return '<strong>' . htmlspecialchars($this->getMessage(), ENT_COMPAT | ENT_HTML401) . "</strong><br />\n";
     }
 }
diff --git a/src/wp-includes/PHPMailer/PHPMailer.php b/src/wp-includes/PHPMailer/PHPMailer.php
index 5618251950c95..5b6dcfad6da95 100644
--- a/src/wp-includes/PHPMailer/PHPMailer.php
+++ b/src/wp-includes/PHPMailer/PHPMailer.php
@@ -103,14 +103,14 @@ class PHPMailer
      *
      * @var string
      */
-    public $From = 'root@localhost';
+    public $From = '';
 
     /**
      * The From name of the message.
      *
      * @var string
      */
-    public $FromName = 'Root User';
+    public $FromName = '';
 
     /**
      * The envelope sender of the message.
@@ -689,7 +689,7 @@ class PHPMailer
     protected $boundary = [];
 
     /**
-     * The array of available languages.
+     * The array of available text strings for the current language.
      *
      * @var array
      */
@@ -750,7 +750,7 @@ class PHPMailer
      *
      * @var string
      */
-    const VERSION = '6.5.0';
+    const VERSION = '6.5.1';
 
     /**
      * Error severity: message only, continue processing.
@@ -858,7 +858,7 @@ public function __destruct()
     private function mailPassthru($to, $subject, $body, $header, $params)
     {
         //Check overloading of mail function to avoid double-encoding
-        if (ini_get('mbstring.func_overload') & 1) { // phpcs:ignore PHPCompatibility.IniDirectives.RemovedIniDirectives.mbstring_func_overloadDeprecated
+        if (ini_get('mbstring.func_overload') & 1) {
             $subject = $this->secureHeader($subject);
         } else {
             $subject = $this->encodeHeader($this->secureHeader($subject));
@@ -1188,25 +1188,33 @@ protected function addAnAddress($kind, $address, $name = '')
      *
      * @return array
      */
-    public static function parseAddresses($addrstr, $useimap = true)
+    public static function parseAddresses($addrstr, $useimap = true, $charset = self::CHARSET_ISO88591)
     {
         $addresses = [];
         if ($useimap && function_exists('imap_rfc822_parse_adrlist')) {
             //Use this built-in parser if it's available
             $list = imap_rfc822_parse_adrlist($addrstr, '');
+            // Clear any potential IMAP errors to get rid of notices being thrown at end of script.
+            imap_errors();
             foreach ($list as $address) {
                 if (
-                    ('.SYNTAX-ERROR.' !== $address->host) && static::validateAddress(
-                        $address->mailbox . '@' . $address->host
-                    )
+                    '.SYNTAX-ERROR.' !== $address->host &&
+                    static::validateAddress($address->mailbox . '@' . $address->host)
                 ) {
                     //Decode the name part if it's present and encoded
                     if (
                         property_exists($address, 'personal') &&
-                        extension_loaded('mbstring') &&
-                        preg_match('/^=\?.*\?=$/', $address->personal)
+                        //Check for a Mbstring constant rather than using extension_loaded, which is sometimes disabled
+                        defined('MB_CASE_UPPER') &&
+                        preg_match('/^=\?.*\?=$/s', $address->personal)
                     ) {
+                        $origCharset = mb_internal_encoding();
+                        mb_internal_encoding($charset);
+                        //Undo any RFC2047-encoded spaces-as-underscores
+                        $address->personal = str_replace('_', '=20', $address->personal);
+                        //Decode the name
                         $address->personal = mb_decode_mimeheader($address->personal);
+                        mb_internal_encoding($origCharset);
                     }
 
                     $addresses[] = [
@@ -1234,9 +1242,16 @@ public static function parseAddresses($addrstr, $useimap = true)
                     $email = trim(str_replace('>', '', $email));
                     $name = trim($name);
                     if (static::validateAddress($email)) {
+                        //Check for a Mbstring constant rather than using extension_loaded, which is sometimes disabled
                         //If this name is encoded, decode it
-                        if (preg_match('/^=\?.*\?=$/', $name)) {
+                        if (defined('MB_CASE_UPPER') && preg_match('/^=\?.*\?=$/s', $name)) {
+                            $origCharset = mb_internal_encoding();
+                            mb_internal_encoding($charset);
+                            //Undo any RFC2047-encoded spaces-as-underscores
+                            $name = str_replace('_', '=20', $name);
+                            //Decode the name
                             $name = mb_decode_mimeheader($name);
+                            mb_internal_encoding($origCharset);
                         }
                         $addresses[] = [
                             //Remove any surrounding quotes and spaces from the name
@@ -1439,11 +1454,9 @@ public function punyencodeAddress($address)
                     $punycode = idn_to_ascii($domain, $errorcode, \INTL_IDNA_VARIANT_UTS46);
                 } elseif (defined('INTL_IDNA_VARIANT_2003')) {
                     //Fall back to this old, deprecated/removed encoding
-                    // phpcs:ignore PHPCompatibility.Constants.RemovedConstants.intl_idna_variant_2003Deprecated
                     $punycode = idn_to_ascii($domain, $errorcode, \INTL_IDNA_VARIANT_2003);
                 } else {
                     //Fall back to a default we don't know about
-                    // phpcs:ignore PHPCompatibility.ParameterValues.NewIDNVariantDefault.NotSet
                     $punycode = idn_to_ascii($domain, $errorcode);
                 }
                 if (false !== $punycode) {
@@ -1510,12 +1523,7 @@ public function preSend()
             && ini_get('mail.add_x_header') === '1'
             && stripos(PHP_OS, 'WIN') === 0
         ) {
-            trigger_error(
-                'Your version of PHP is affected by a bug that may result in corrupted messages.' .
-                ' To fix it, switch to sending using SMTP, disable the mail.add_x_header option in' .
-                ' your php.ini, switch to MacOS or Linux, or upgrade your PHP to version 7.0.17+ or 7.1.3+.',
-                E_USER_WARNING
-            );
+            trigger_error($this->lang('buggy_php'), E_USER_WARNING);
         }
 
         try {
@@ -1726,7 +1734,7 @@ protected function sendmailSend($header, $body)
                 fwrite($mail, $header);
                 fwrite($mail, $body);
                 $result = pclose($mail);
-                $addrinfo = static::parseAddresses($toAddr);
+                $addrinfo = static::parseAddresses($toAddr, true, $this->charSet);
                 $this->doCallback(
                     ($result === 0),
                     [[$addrinfo['address'], $addrinfo['name']]],
@@ -1886,7 +1894,7 @@ protected function mailSend($header, $body)
         if ($this->SingleTo && count($toArr) > 1) {
             foreach ($toArr as $toAddr) {
                 $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params);
-                $addrinfo = static::parseAddresses($toAddr);
+                $addrinfo = static::parseAddresses($toAddr, true, $this->charSet);
                 $this->doCallback(
                     $result,
                     [[$addrinfo['address'], $addrinfo['name']]],
@@ -2183,14 +2191,15 @@ public function smtpClose()
 
     /**
      * Set the language for error messages.
-     * Returns false if it cannot load the language file.
      * The default language is English.
      *
      * @param string $langcode  ISO 639-1 2-character language code (e.g. French is "fr")
+     *                          Optionally, the language code can be enhanced with a 4-character
+     *                          script annotation and/or a 2-character country annotation.
      * @param string $lang_path Path to the language file directory, with trailing separator (slash).D
      *                          Do not set this from user input!
      *
-     * @return bool
+     * @return bool Returns true if the requested language was loaded, false otherwise.
      */
     public function setLanguage($langcode = 'en', $lang_path = '')
     {
@@ -2213,44 +2222,77 @@ public function setLanguage($langcode = 'en', $lang_path = '')
         //Define full set of translatable strings in English
         $PHPMAILER_LANG = [
             'authenticate' => 'SMTP Error: Could not authenticate.',
+            'buggy_php' => 'Your version of PHP is affected by a bug that may result in corrupted messages.' .
+                ' To fix it, switch to sending using SMTP, disable the mail.add_x_header option in' .
+                ' your php.ini, switch to MacOS or Linux, or upgrade your PHP to version 7.0.17+ or 7.1.3+.',
             'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
             'data_not_accepted' => 'SMTP Error: data not accepted.',
             'empty_message' => 'Message body empty',
             'encoding' => 'Unknown encoding: ',
             'execute' => 'Could not execute: ',
+            'extension_missing' => 'Extension missing: ',
             'file_access' => 'Could not access file: ',
             'file_open' => 'File Error: Could not open file: ',
             'from_failed' => 'The following From address failed: ',
             'instantiate' => 'Could not instantiate mail function.',
             'invalid_address' => 'Invalid address: ',
+            'invalid_header' => 'Invalid header name or value',
             'invalid_hostentry' => 'Invalid hostentry: ',
             'invalid_host' => 'Invalid host: ',
             'mailer_not_supported' => ' mailer is not supported.',
             'provide_address' => 'You must provide at least one recipient email address.',
             'recipients_failed' => 'SMTP Error: The following recipients failed: ',
             'signing' => 'Signing Error: ',
+            'smtp_code' => 'SMTP code: ',
+            'smtp_code_ex' => 'Additional SMTP info: ',
             'smtp_connect_failed' => 'SMTP connect() failed.',
+            'smtp_detail' => 'Detail: ',
             'smtp_error' => 'SMTP server error: ',
             'variable_set' => 'Cannot set or reset variable: ',
-            'extension_missing' => 'Extension missing: ',
         ];
         if (empty($lang_path)) {
             //Calculate an absolute path so it can work if CWD is not here
             $lang_path = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'language' . DIRECTORY_SEPARATOR;
         }
+
         //Validate $langcode
-        if (!preg_match('/^[a-z]{2}(?:_[a-zA-Z]{2})?$/', $langcode)) {
+        $foundlang = true;
+        $langcode  = strtolower($langcode);
+        if (
+            !preg_match('/^(?P<lang>[a-z]{2})(?P<script>_[a-z]{4})?(?P<country>_[a-z]{2})?$/', $langcode, $matches)
+            && $langcode !== 'en'
+        ) {
+            $foundlang = false;
             $langcode = 'en';
         }
-        $foundlang = true;
-        $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
+
         //There is no English translation file
         if ('en' !== $langcode) {
-            //Make sure language file path is readable
-            if (!static::fileIsAccessible($lang_file)) {
+            $langcodes = [];
+            if (!empty($matches['script']) && !empty($matches['country'])) {
+                $langcodes[] = $matches['lang'] . $matches['script'] . $matches['country'];
+            }
+            if (!empty($matches['country'])) {
+                $langcodes[] = $matches['lang'] . $matches['country'];
+            }
+            if (!empty($matches['script'])) {
+                $langcodes[] = $matches['lang'] . $matches['script'];
+            }
+            $langcodes[] = $matches['lang'];
+
+            //Try and find a readable language file for the requested language.
+            $foundFile = false;
+            foreach ($langcodes as $code) {
+                $lang_file = $lang_path . 'phpmailer.lang-' . $code . '.php';
+                if (static::fileIsAccessible($lang_file)) {
+                    $foundFile = true;
+                    break;
+                }
+            }
+
+            if ($foundFile === false) {
                 $foundlang = false;
             } else {
-                //$foundlang = include $lang_file;
                 $lines = file($lang_file);
                 foreach ($lines as $line) {
                     //Translation file lines look like this:
@@ -2285,6 +2327,10 @@ public function setLanguage($langcode = 'en', $lang_path = '')
      */
     public function getTranslations()
     {
+        if (empty($this->language)) {
+            $this->setLanguage(); // Set the default language.
+        }
+
         return $this->language;
     }
 
@@ -2553,7 +2599,17 @@ public function createHeader()
 
         //Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4
         //https://tools.ietf.org/html/rfc5322#section-3.6.4
-        if ('' !== $this->MessageID && preg_match('/^<.*@.*>$/', $this->MessageID)) {
+        if (
+            '' !== $this->MessageID &&
+            preg_match(
+                '/^<((([a-z\d!#$%&\'*+\/=?^_`{|}~-]+(\.[a-z\d!#$%&\'*+\/=?^_`{|}~-]+)*)' .
+                '|("(([\x01-\x08\x0B\x0C\x0E-\x1F\x7F]|[\x21\x23-\x5B\x5D-\x7E])' .
+                '|(\\[\x01-\x09\x0B\x0C\x0E-\x7F]))*"))@(([a-z\d!#$%&\'*+\/=?^_`{|}~-]+' .
+                '(\.[a-z\d!#$%&\'*+\/=?^_`{|}~-]+)*)|(\[(([\x01-\x08\x0B\x0C\x0E-\x1F\x7F]' .
+                '|[\x21-\x5A\x5E-\x7E])|(\\[\x01-\x09\x0B\x0C\x0E-\x7F]))*\])))>$/Di',
+                $this->MessageID
+            )
+        ) {
             $this->lastMessageID = $this->MessageID;
         } else {
             $this->lastMessageID = sprintf('<%s@%s>', $this->uniqueid, $this->serverHostname());
@@ -3937,13 +3993,13 @@ protected function setError($msg)
             if (!empty($lasterror['error'])) {
                 $msg .= $this->lang('smtp_error') . $lasterror['error'];
                 if (!empty($lasterror['detail'])) {
-                    $msg .= ' Detail: ' . $lasterror['detail'];
+                    $msg .= ' ' . $this->lang('smtp_detail') . $lasterror['detail'];
                 }
                 if (!empty($lasterror['smtp_code'])) {
-                    $msg .= ' SMTP code: ' . $lasterror['smtp_code'];
+                    $msg .= ' ' . $this->lang('smtp_code') . $lasterror['smtp_code'];
                 }
                 if (!empty($lasterror['smtp_code_ex'])) {
-                    $msg .= ' Additional SMTP info: ' . $lasterror['smtp_code_ex'];
+                    $msg .= ' ' . $this->lang('smtp_code_ex') . $lasterror['smtp_code_ex'];
                 }
             }
         }
@@ -4004,7 +4060,7 @@ public static function isValidHost($host)
             empty($host)
             || !is_string($host)
             || strlen($host) > 256
-            || !preg_match('/^([a-zA-Z\d.-]*|\[[a-fA-F\d:]+])$/', $host)
+            || !preg_match('/^([a-zA-Z\d.-]*|\[[a-fA-F\d:]+\])$/', $host)
         ) {
             return false;
         }
@@ -4081,11 +4137,11 @@ public function addCustomHeader($name, $value = null)
             list($name, $value) = explode(':', $name, 2);
         }
         $name = trim($name);
-        $value = trim($value);
+        $value = (null === $value) ? '' : trim($value);
         //Ensure name is not empty, and that neither name nor value contain line breaks
         if (empty($name) || strpbrk($name . $value, "\r\n") !== false) {
             if ($this->exceptions) {
-                throw new Exception('Invalid header name or value');
+                throw new Exception($this->lang('invalid_header'));
             }
 
             return false;
@@ -4239,7 +4295,8 @@ public function msgHTML($message, $basedir = '', $advanced = false)
      *
      * @param string        $html     The HTML text to convert
      * @param bool|callable $advanced Any boolean value to use the internal converter,
-     *                                or provide your own callable for custom conversion
+     *                                or provide your own callable for custom conversion.
+     *                                *Never* pass user-supplied data into this parameter
      *
      * @return string
      */
diff --git a/src/wp-includes/PHPMailer/SMTP.php b/src/wp-includes/PHPMailer/SMTP.php
index a4a91ed0dc4b1..0cea1e8640d25 100644
--- a/src/wp-includes/PHPMailer/SMTP.php
+++ b/src/wp-includes/PHPMailer/SMTP.php
@@ -35,7 +35,7 @@ class SMTP
      *
      * @var string
      */
-    const VERSION = '6.5.0';
+    const VERSION = '6.5.1';
 
     /**
      * SMTP line break constant.

From 7d88c013f46b07f87dc04ccf9a6fdfcee2cb71b6 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 18 Aug 2021 14:07:17 +0000
Subject: [PATCH 014/257] External Libraries: Restore the `phpcs:ignore`
 statements in PHPMailer.

These are necessary for a passing PHP Compatibility scan.

Follow-up to [48045], [51634].

See #53953.

git-svn-id: https://develop.svn.wordpress.org/trunk@51635 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/PHPMailer/PHPMailer.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/wp-includes/PHPMailer/PHPMailer.php b/src/wp-includes/PHPMailer/PHPMailer.php
index 5b6dcfad6da95..5228ef015961f 100644
--- a/src/wp-includes/PHPMailer/PHPMailer.php
+++ b/src/wp-includes/PHPMailer/PHPMailer.php
@@ -858,7 +858,7 @@ public function __destruct()
     private function mailPassthru($to, $subject, $body, $header, $params)
     {
         //Check overloading of mail function to avoid double-encoding
-        if (ini_get('mbstring.func_overload') & 1) {
+        if (ini_get('mbstring.func_overload') & 1) { // phpcs:ignore PHPCompatibility.IniDirectives.RemovedIniDirectives.mbstring_func_overloadDeprecated
             $subject = $this->secureHeader($subject);
         } else {
             $subject = $this->encodeHeader($this->secureHeader($subject));
@@ -1454,9 +1454,11 @@ public function punyencodeAddress($address)
                     $punycode = idn_to_ascii($domain, $errorcode, \INTL_IDNA_VARIANT_UTS46);
                 } elseif (defined('INTL_IDNA_VARIANT_2003')) {
                     //Fall back to this old, deprecated/removed encoding
+                    // phpcs:ignore PHPCompatibility.Constants.RemovedConstants.intl_idna_variant_2003Deprecated
                     $punycode = idn_to_ascii($domain, $errorcode, \INTL_IDNA_VARIANT_2003);
                 } else {
                     //Fall back to a default we don't know about
+                    // phpcs:ignore PHPCompatibility.ParameterValues.NewIDNVariantDefault.NotSet
                     $punycode = idn_to_ascii($domain, $errorcode);
                 }
                 if (false !== $punycode) {

From 66cb5e36892b74047b5e9f3a5c2e1e7de2c2cb18 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 18 Aug 2021 21:57:21 +0000
Subject: [PATCH 015/257] Code Modernization: Silence the deprecation warning
 for `auto_detect_line_endings`.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since PHP 8.1, the `auto_detect_line_endings` setting is deprecated:

> The `auto_detect_line_endings` ini setting modifies the behavior of `file()` and `fgets()` to support an isolated `\r` (as opposed to `\n` or `\r\n`) as a newline character. These newlines were used by “Classic” Mac OS, a system which has been discontinued in 2001, nearly two decades ago. Interoperability with such systems is no longer relevant.

Reference: [https://wiki.php.net/rfc/deprecations_php_8_1#auto_detect_line_endings_ini_setting PHP RFC: Deprecations for PHP 8.1: auto_detect_line_endings ini setting]

> The `auto_detect_line_endings` ini setting has been deprecated. If necessary, handle `\r` line breaks manually instead.

Reference: [https://github.com/php/php-src/blob/1cf4fb739f7a4fa8404a4c0958f13d04eae519d4/UPGRADING#L456-L457 PHP 8.1 Upgrade Notes].

This commit fixes the warning when running tests for the `PO` class:
{{{
Deprecated: auto_detect_line_endings is deprecated in /var/www/src/wp-includes/pomo/po.php on line 16
}}}

While deprecated, the actual `auto_detect_line_endings` functionality has not been removed from PHP (yet) and will still work until PHP 9.0.

For now, we're silencing the deprecation notice as there may still be translation files around which haven't been updated in a long time and which still use the old MacOS standalone `\r` as a line ending.

This should be revisited when PHP 9.0 is in alpha/beta.

Follow-up to [51633].

Props jrf.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51636 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/pomo/po.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/wp-includes/pomo/po.php b/src/wp-includes/pomo/po.php
index 22b94c11bf972..e4e5849d20019 100644
--- a/src/wp-includes/pomo/po.php
+++ b/src/wp-includes/pomo/po.php
@@ -13,10 +13,15 @@
 	define( 'PO_MAX_LINE_LEN', 79 );
 }
 
-// This setting has been deprecated in PHP 8.1.
-if ( PHP_VERSION_ID < 80100 ) {
-	ini_set( 'auto_detect_line_endings', 1 );
-}
+/*
+ * The `auto_detect_line_endings` setting has been deprecated in PHP 8.1,
+ * but will continue to work until PHP 9.0.
+ * For now, we're silencing the deprecation notice as there may still be
+ * translation files around which haven't been updated in a long time and
+ * which still use the old MacOS standalone `\r` as a line ending.
+ * This fix should be revisited when PHP 9.0 is in alpha/beta.
+ */
+@ini_set( 'auto_detect_line_endings', 1 ); // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
 
 /**
  * Routines for working with PO files

From 0222625c373b725a1a7852a0266423a06a2f307b Mon Sep 17 00:00:00 2001
From: Peter Wilson <peterwilsoncc@git.wordpress.org>
Date: Thu, 19 Aug 2021 02:06:06 +0000
Subject: [PATCH 016/257] Customize: Hide native control on background position
 field.

Hide the browser's native radio button on the custom background position selector in the Customizer and the legacy background screen. This fixes an issue causing both to display.

Props mukesh27, ravipatel, sabernhardt, walbo.
Fixes #53803.


git-svn-id: https://develop.svn.wordpress.org/trunk@51637 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-custom-background.php               | 2 +-
 .../class-wp-customize-background-position-control.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/includes/class-custom-background.php b/src/wp-admin/includes/class-custom-background.php
index 5c65c6b282bcd..a4ca32f4df836 100644
--- a/src/wp-admin/includes/class-custom-background.php
+++ b/src/wp-admin/includes/class-custom-background.php
@@ -418,7 +418,7 @@ public function admin_page() {
 	<div class="button-group">
 				<?php foreach ( $group as $value => $input ) : ?>
 		<label>
-			<input class="screen-reader-text" name="background-position" type="radio" value="<?php echo esc_attr( $value ); ?>"<?php checked( $value, $background_position ); ?>>
+			<input class="ui-helper-hidden-accessible" name="background-position" type="radio" value="<?php echo esc_attr( $value ); ?>"<?php checked( $value, $background_position ); ?>>
 			<span class="button display-options position"><span class="<?php echo esc_attr( $input['icon'] ); ?>" aria-hidden="true"></span></span>
 			<span class="screen-reader-text"><?php echo $input['label']; ?></span>
 		</label>
diff --git a/src/wp-includes/customize/class-wp-customize-background-position-control.php b/src/wp-includes/customize/class-wp-customize-background-position-control.php
index bb35b052d0c2c..410a0bf59782b 100644
--- a/src/wp-includes/customize/class-wp-customize-background-position-control.php
+++ b/src/wp-includes/customize/class-wp-customize-background-position-control.php
@@ -96,7 +96,7 @@ public function content_template() {
 					<div class="button-group">
 					<?php foreach ( $group as $value => $input ) : ?>
 						<label>
-							<input class="screen-reader-text" name="background-position" type="radio" value="<?php echo esc_attr( $value ); ?>">
+							<input class="ui-helper-hidden-accessible" name="background-position" type="radio" value="<?php echo esc_attr( $value ); ?>">
 							<span class="button display-options position"><span class="<?php echo esc_attr( $input['icon'] ); ?>" aria-hidden="true"></span></span>
 							<span class="screen-reader-text"><?php echo $input['label']; ?></span>
 						</label>

From 05f28947e767d3a5b312ee840e70538f1fadb9be Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Thu, 19 Aug 2021 12:43:03 +0000
Subject: [PATCH 017/257] Media: Check the return type of `_get_cron_array()`
 in `WP_Media_List_Table::prepare_items()`.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The following warnings could, in very select circumstances, be shown:
{{{
// PHP 8.0 and higher:
Warning: foreach() argument must be of type array|object, bool given

// PHP 5.6 – 7.4
Warning: Invalid argument supplied for foreach()
}}}

In `WP_Media_List_Table::prepare_items()`, the cron info array is retrieved via a call to `_get_cron_array()`, but as the documentation (correctly) states, the return type of that function is `array|false`, where `false` is returned for a virgin site, with no cron jobs scheduled yet.

However, no type check is done on the return value, and the method just blindly continues by using it in a `foreach`.

Fixed by adding validation for the returned value from `_get_cron_array()` and only running the `foreach` when the returned value is an array.

Reference: [https://developer.wordpress.org/reference/functions/_get_cron_array/ WordPress Developer Resources: _get_cron_array()]

Follow-up to [48417].

Props jrf, hellofromTonya, mukesh27.
Fixes #53949.

git-svn-id: https://develop.svn.wordpress.org/trunk@51638 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../includes/class-wp-media-list-table.php    | 14 ++++--
 .../tests/admin/includesMediaListTable.php    | 50 +++++++++++++++++++
 2 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 tests/phpunit/tests/admin/includesMediaListTable.php

diff --git a/src/wp-admin/includes/class-wp-media-list-table.php b/src/wp-admin/includes/class-wp-media-list-table.php
index b3eb0b32ccd00..275d07caca7e8 100644
--- a/src/wp-admin/includes/class-wp-media-list-table.php
+++ b/src/wp-admin/includes/class-wp-media-list-table.php
@@ -78,12 +78,16 @@ public function prepare_items() {
 		 */
 		$not_in = array();
 
-		foreach ( _get_cron_array() as $cron ) {
-			if ( isset( $cron['upgrader_scheduled_cleanup'] ) ) {
-				$details = reset( $cron['upgrader_scheduled_cleanup'] );
+		$crons = _get_cron_array();
 
-				if ( ! empty( $details['args'][0] ) ) {
-					$not_in[] = (int) $details['args'][0];
+		if ( is_array( $crons ) ) {
+			foreach ( $crons as $cron ) {
+				if ( isset( $cron['upgrader_scheduled_cleanup'] ) ) {
+					$details = reset( $cron['upgrader_scheduled_cleanup'] );
+
+					if ( ! empty( $details['args'][0] ) ) {
+						$not_in[] = (int) $details['args'][0];
+					}
 				}
 			}
 		}
diff --git a/tests/phpunit/tests/admin/includesMediaListTable.php b/tests/phpunit/tests/admin/includesMediaListTable.php
new file mode 100644
index 0000000000000..da0aef19f2b10
--- /dev/null
+++ b/tests/phpunit/tests/admin/includesMediaListTable.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @group admin
+ */
+class Tests_Admin_includesMediaListTable extends WP_UnitTestCase {
+
+	public static function set_up_before_class() {
+		parent::set_up_before_class();
+
+		require_once ABSPATH . 'wp-admin/includes/class-wp-media-list-table.php';
+	}
+
+	/**
+	 * Tests that a call to WP_Media_List_Table::prepare_items() on a site without any scheduled events
+	 * does not result in a PHP warning.
+	 *
+	 * The warning that we should not see:
+	 * PHP 5.6 - 7.4: `Invalid argument supplied for foreach()`.
+	 * PHP 8.0 and higher: `Warning: foreach() argument must be of type array|object, bool given`.
+	 *
+	 * Note: This does not test the actual functioning of the WP_Media_List_Table::prepare_items() method.
+	 * It just and only tests for/against the PHP warning.
+	 *
+	 * @ticket 53949
+	 * @covers WP_Media_List_Table::prepare_items
+	 */
+	public function test_prepare_items_without_cron_option_does_not_throw_warning() {
+		global $wp_query;
+
+		// Note: setMethods() is deprecated in PHPUnit 9, but still supported.
+		$mock = $this->getMockBuilder( WP_Media_List_Table::class )
+			->disableOriginalConstructor()
+			->disallowMockingUnknownTypes()
+			->setMethods( array( 'set_pagination_args' ) )
+			->getMock();
+
+		$mock->expects( $this->once() )
+			->method( 'set_pagination_args' );
+
+		$wp_query->query_vars['posts_per_page'] = 10;
+		delete_option( 'cron' );
+
+		// Verify that the cause of the error is in place.
+		$this->assertFalse( _get_cron_array(), '_get_cron_array() does not return false' );
+
+		// If this test does not error out due to the PHP warning, we're good.
+		$mock->prepare_items();
+	}
+}

From e20beacb6ee25f43358f5f3d71034114efd11968 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Thu, 19 Aug 2021 13:08:43 +0000
Subject: [PATCH 018/257] Tests: Rename classes in `phpunit/tests/admin/` per
 the naming conventions.

https://make.wordpress.org/core/handbook/testing/automated-testing/writing-phpunit-tests/#naming-and-organization

Follow-up to [47780], [48911], [49327], [50291], [50292], [50342], [50452], [50453], [50456], [50967], [50968], [50969], [51491], [51492], [51493], [51623].

See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51639 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/admin/includesFile.php                    | 2 +-
 tests/phpunit/tests/admin/includesListTable.php               | 2 +-
 tests/phpunit/tests/admin/includesMisc.php                    | 2 +-
 tests/phpunit/tests/admin/includesPlugin.php                  | 2 +-
 tests/phpunit/tests/admin/includesPost.php                    | 2 +-
 tests/phpunit/tests/admin/includesSchema.php                  | 2 +-
 tests/phpunit/tests/admin/includesScreen.php                  | 2 +-
 tests/phpunit/tests/admin/includesTemplate.php                | 2 +-
 tests/phpunit/tests/admin/includesTheme.php                   | 2 +-
 .../{includesCommunityEvents.php => wpCommunityEvents.php}    | 4 ++--
 .../{includesMediaListTable.php => wpMediaListTable.php}      | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)
 rename tests/phpunit/tests/admin/{includesCommunityEvents.php => wpCommunityEvents.php} (99%)
 rename tests/phpunit/tests/admin/{includesMediaListTable.php => wpMediaListTable.php} (95%)

diff --git a/tests/phpunit/tests/admin/includesFile.php b/tests/phpunit/tests/admin/includesFile.php
index 5c58cbfcd4023..59299409550fd 100644
--- a/tests/phpunit/tests/admin/includesFile.php
+++ b/tests/phpunit/tests/admin/includesFile.php
@@ -4,7 +4,7 @@
  * @group file
  * @group admin
  */
-class Tests_Admin_includesFile extends WP_UnitTestCase {
+class Tests_Admin_IncludesFile extends WP_UnitTestCase {
 
 	/**
 	 * @ticket 20449
diff --git a/tests/phpunit/tests/admin/includesListTable.php b/tests/phpunit/tests/admin/includesListTable.php
index b15d6d5c153e9..014475b282551 100644
--- a/tests/phpunit/tests/admin/includesListTable.php
+++ b/tests/phpunit/tests/admin/includesListTable.php
@@ -3,7 +3,7 @@
 /**
  * @group admin
  */
-class Tests_Admin_includesListTable extends WP_UnitTestCase {
+class Tests_Admin_IncludesListTable extends WP_UnitTestCase {
 	protected static $top           = array();
 	protected static $children      = array();
 	protected static $grandchildren = array();
diff --git a/tests/phpunit/tests/admin/includesMisc.php b/tests/phpunit/tests/admin/includesMisc.php
index 93951af4e5205..6b267335c42a6 100644
--- a/tests/phpunit/tests/admin/includesMisc.php
+++ b/tests/phpunit/tests/admin/includesMisc.php
@@ -3,7 +3,7 @@
 /**
  * @group admin
  */
-class Tests_Admin_includesMisc extends WP_UnitTestCase {
+class Tests_Admin_IncludesMisc extends WP_UnitTestCase {
 	function test_shorten_url() {
 		$tests = array(
 			'wordpress\.org/about/philosophy'
diff --git a/tests/phpunit/tests/admin/includesPlugin.php b/tests/phpunit/tests/admin/includesPlugin.php
index ebba733f23b9e..6ba4cb33e0e1c 100644
--- a/tests/phpunit/tests/admin/includesPlugin.php
+++ b/tests/phpunit/tests/admin/includesPlugin.php
@@ -3,7 +3,7 @@
  * @group plugins
  * @group admin
  */
-class Tests_Admin_includesPlugin extends WP_UnitTestCase {
+class Tests_Admin_IncludesPlugin extends WP_UnitTestCase {
 	public static function wpSetUpBeforeClass( $factory ) {
 		self::_back_up_mu_plugins();
 	}
diff --git a/tests/phpunit/tests/admin/includesPost.php b/tests/phpunit/tests/admin/includesPost.php
index 1b33aff87cd63..8c5013279ed84 100644
--- a/tests/phpunit/tests/admin/includesPost.php
+++ b/tests/phpunit/tests/admin/includesPost.php
@@ -3,7 +3,7 @@
 /**
  * @group admin
  */
-class Tests_Admin_Includes_Post extends WP_UnitTestCase {
+class Tests_Admin_IncludesPost extends WP_UnitTestCase {
 	protected static $contributor_id;
 	protected static $author_ids;
 	protected static $editor_id;
diff --git a/tests/phpunit/tests/admin/includesSchema.php b/tests/phpunit/tests/admin/includesSchema.php
index 1ce0a95b2e537..fb19c716b495e 100644
--- a/tests/phpunit/tests/admin/includesSchema.php
+++ b/tests/phpunit/tests/admin/includesSchema.php
@@ -3,7 +3,7 @@
 /**
  * @group admin
  */
-class Tests_Admin_Includes_Schema extends WP_UnitTestCase {
+class Tests_Admin_IncludesSchema extends WP_UnitTestCase {
 
 	private static $options;
 	private static $blogmeta;
diff --git a/tests/phpunit/tests/admin/includesScreen.php b/tests/phpunit/tests/admin/includesScreen.php
index a93803e57ea87..c52e6f1597536 100644
--- a/tests/phpunit/tests/admin/includesScreen.php
+++ b/tests/phpunit/tests/admin/includesScreen.php
@@ -4,7 +4,7 @@
  * @group admin
  * @group adminScreen
  */
-class Tests_Admin_includesScreen extends WP_UnitTestCase {
+class Tests_Admin_IncludesScreen extends WP_UnitTestCase {
 	public $core_screens = array(
 		'index.php'                            => array(
 			'base'            => 'dashboard',
diff --git a/tests/phpunit/tests/admin/includesTemplate.php b/tests/phpunit/tests/admin/includesTemplate.php
index 7a7b5ccd405d9..6e345514cedbd 100644
--- a/tests/phpunit/tests/admin/includesTemplate.php
+++ b/tests/phpunit/tests/admin/includesTemplate.php
@@ -2,7 +2,7 @@
 /**
  * @group admin
  */
-class Tests_Admin_includesTemplate extends WP_UnitTestCase {
+class Tests_Admin_IncludesTemplate extends WP_UnitTestCase {
 
 	/**
 	 * @ticket 51147
diff --git a/tests/phpunit/tests/admin/includesTheme.php b/tests/phpunit/tests/admin/includesTheme.php
index 58b7ff5391ab6..1cb39e6832082 100644
--- a/tests/phpunit/tests/admin/includesTheme.php
+++ b/tests/phpunit/tests/admin/includesTheme.php
@@ -2,7 +2,7 @@
 /**
  * @group themes
  */
-class Tests_Admin_includesTheme extends WP_UnitTestCase {
+class Tests_Admin_IncludesTheme extends WP_UnitTestCase {
 
 	function set_up() {
 		parent::set_up();
diff --git a/tests/phpunit/tests/admin/includesCommunityEvents.php b/tests/phpunit/tests/admin/wpCommunityEvents.php
similarity index 99%
rename from tests/phpunit/tests/admin/includesCommunityEvents.php
rename to tests/phpunit/tests/admin/wpCommunityEvents.php
index 4ca5a64360fba..8e7b8af6a3e23 100644
--- a/tests/phpunit/tests/admin/includesCommunityEvents.php
+++ b/tests/phpunit/tests/admin/wpCommunityEvents.php
@@ -8,14 +8,14 @@
  */
 
 /**
- * Class Test_WP_Community_Events.
+ * Class Tests_Admin_wpCommunityEvents.
  *
  * @group admin
  * @group community-events
  *
  * @since 4.8.0
  */
-class Test_WP_Community_Events extends WP_UnitTestCase {
+class Tests_Admin_wpCommunityEvents extends WP_UnitTestCase {
 	/**
 	 * An instance of the class to test.
 	 *
diff --git a/tests/phpunit/tests/admin/includesMediaListTable.php b/tests/phpunit/tests/admin/wpMediaListTable.php
similarity index 95%
rename from tests/phpunit/tests/admin/includesMediaListTable.php
rename to tests/phpunit/tests/admin/wpMediaListTable.php
index da0aef19f2b10..6a2b2d64fa8a7 100644
--- a/tests/phpunit/tests/admin/includesMediaListTable.php
+++ b/tests/phpunit/tests/admin/wpMediaListTable.php
@@ -3,7 +3,7 @@
 /**
  * @group admin
  */
-class Tests_Admin_includesMediaListTable extends WP_UnitTestCase {
+class Tests_Admin_wpMediaListTable extends WP_UnitTestCase {
 
 	public static function set_up_before_class() {
 		parent::set_up_before_class();

From 0778740cb4cc705da95f9c79d8cad87a089ee01a Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Thu, 19 Aug 2021 13:59:36 +0000
Subject: [PATCH 019/257] Tests: Move loading the `WP_Community_Events` class
 to `set_up_before_class()`.

This ensures that the class is loaded once before the first test of the test case class is run, and `require_once()` is not unnecessarily called for each test method individually.

Follow-up to [40607], [51628].

See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51641 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/admin/wpCommunityEvents.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tests/phpunit/tests/admin/wpCommunityEvents.php b/tests/phpunit/tests/admin/wpCommunityEvents.php
index 8e7b8af6a3e23..493ad7b68c8f6 100644
--- a/tests/phpunit/tests/admin/wpCommunityEvents.php
+++ b/tests/phpunit/tests/admin/wpCommunityEvents.php
@@ -26,6 +26,17 @@ class Tests_Admin_wpCommunityEvents extends WP_UnitTestCase {
 	 */
 	private $instance;
 
+	/**
+	 * Performs setup tasks before the first test is run.
+	 *
+	 * @since 5.9.0
+	 */
+	public static function set_up_before_class() {
+		parent::set_up_before_class();
+
+		require_once ABSPATH . 'wp-admin/includes/class-wp-community-events.php';
+	}
+
 	/**
 	 * Performs setup tasks for every test.
 	 *
@@ -34,8 +45,6 @@ class Tests_Admin_wpCommunityEvents extends WP_UnitTestCase {
 	public function set_up() {
 		parent::set_up();
 
-		require_once ABSPATH . 'wp-admin/includes/class-wp-community-events.php';
-
 		$this->instance = new WP_Community_Events( 1, $this->get_user_location() );
 	}
 

From 4583801bc6282e9eacbf00fe68aba886c78cd4bc Mon Sep 17 00:00:00 2001
From: Kelly Choyce-Dwan <ryelle@git.wordpress.org>
Date: Thu, 19 Aug 2021 17:23:23 +0000
Subject: [PATCH 020/257] Toolbar: Limit the icon transition style to color
 only.

When transition is `all`, it also applies to the icon size, which can cause a bug in Safari where icons get stuck in the wrong size when resizing the browser window. The only expected animation is on the color property, so the transition can be limited to just `color`.

Props johnjamesjacoby, sabernhardt, SergeyBiryukov, audrasjb.
Fixes #43423.



git-svn-id: https://develop.svn.wordpress.org/trunk@51644 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/css/admin-bar.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/css/admin-bar.css b/src/wp-includes/css/admin-bar.css
index cfbf442a9d8a4..3788753e8c937 100644
--- a/src/wp-includes/css/admin-bar.css
+++ b/src/wp-includes/css/admin-bar.css
@@ -248,7 +248,7 @@ html:lang(he-il) .rtl #wpadminbar * {
 #wpadminbar .ab-item:before,
 #wpadminbar #adminbarsearch:before {
 	position: relative;
-	transition: all .1s ease-in-out;
+	transition: color .1s ease-in-out;
 }
 
 #wpadminbar .ab-label {

From 220a6cc80510b1f0e6e09520c5ac999208f13d27 Mon Sep 17 00:00:00 2001
From: Kelly Choyce-Dwan <ryelle@git.wordpress.org>
Date: Thu, 19 Aug 2021 20:57:24 +0000
Subject: [PATCH 021/257] Privacy: Add space below page selector.

Sometimes the submit button wraps to a new line, either because the button label translation is long, or there are long page names. When it wraps, there should be space between the select dropdown and the button.

Props audrasjb, mukesh27, guillaumeturpin.
Fixes #53782.



git-svn-id: https://develop.svn.wordpress.org/trunk@51645 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/forms.css | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/css/forms.css b/src/wp-admin/css/forms.css
index 28575cfd12c9d..56c78b5c488d2 100644
--- a/src/wp-admin/css/forms.css
+++ b/src/wp-admin/css/forms.css
@@ -1236,11 +1236,14 @@ table.form-table td .updated p {
 	margin-bottom: 1.3em;
 }
 
-.tools-privacy-policy-page input.button,
-.tools-privacy-policy-page select {
+.tools-privacy-policy-page input.button {
 	margin: 0 1px 0 6px;
 }
 
+.tools-privacy-policy-page select {
+	margin: 0 1px 0.5em 6px;
+}
+
 .tools-privacy-edit {
 	margin: 1.5em 0;
 }

From ee81f71ac611c5a39c0bafb829518cb7824501bc Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Fri, 20 Aug 2021 16:11:04 +0000
Subject: [PATCH 022/257] Tests: Rename classes in `phpunit/tests/editor/` per
 the naming conventions.

https://make.wordpress.org/core/handbook/testing/automated-testing/writing-phpunit-tests/#naming-and-organization

Follow-up to [47780], [48911], [49327], [50291], [50292], [50342], [50452], [50453], [50456], [50967], [50968], [50969], [51491], [51492], [51493], [51623], [51639].

See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51646 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/editor/wpEditors.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/phpunit/tests/editor/wpEditors.php b/tests/phpunit/tests/editor/wpEditors.php
index 2370b34a93fc1..c4e9e50515fda 100644
--- a/tests/phpunit/tests/editor/wpEditors.php
+++ b/tests/phpunit/tests/editor/wpEditors.php
@@ -9,7 +9,7 @@
  *
  * @coversDefaultClass _WP_Editors
  */
-class Tests_WP_Editors extends WP_UnitTestCase {
+class Tests_Editor_wpEditors extends WP_UnitTestCase {
 
 	/**
 	 * @covers ::wp_link_query

From 40506e7e64965abf9dc7357f5c1c0b20f7f31f01 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Fri, 20 Aug 2021 18:58:18 +0000
Subject: [PATCH 023/257] Build/Test Tools: Include the commit short summary in
 Slack messages.

This gives more context to GitHub Action related Slack messages without the need to click the workflow URL, or unfurl the links (which shows lots of unnecessary information, such as the repository description and image).

Props earnjam.
See #52644.

git-svn-id: https://develop.svn.wordpress.org/trunk@51647 602fd350-edb4-49c9-b593-d223f7449a82
---
 .github/workflows/slack-notifications.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/slack-notifications.yml b/.github/workflows/slack-notifications.yml
index 8639425cd12d0..5d4981b901df0 100644
--- a/.github/workflows/slack-notifications.yml
+++ b/.github/workflows/slack-notifications.yml
@@ -60,9 +60,18 @@ jobs:
         id: previous-conclusion
         run: echo "::set-output name=previous_conclusion::${{ steps.previous-result.outputs.result }}"
 
+      - name: Prepare commit message.
+        id: commit-message
+        run: |
+          COMMIT_MESSAGE=$(cat <<'EOF' | awk 'NR==1' | sed 's/\"/\\"/g'
+          ${{ github.event.workflow_run.head_commit.message }}
+          EOF
+          )
+          echo "::set-output name=commit_message_escaped::${COMMIT_MESSAGE}"
+
       - name: Construct payload and store as an output
         id: create-payload
-        run: echo "::set-output name=payload::{\"workflow_name\":\"${{ github.event.workflow_run.name }}\",\"ref_name\":\"${{ github.event.workflow_run.head_branch }}\",\"run_url\":\"${{ github.event.workflow_run.html_url }}\"}"
+        run: echo "::set-output name=payload::{\"workflow_name\":\"${{ github.event.workflow_run.name }}\",\"ref_name\":\"${{ github.event.workflow_run.head_branch }}\",\"run_url\":\"${{ github.event.workflow_run.html_url }}\",\"commit_message\":\"${{ steps.commit-message.outputs.commit_message_escaped }}\"}"
 
   # Posts notifications when a workflow fails.
   failure:

From fe3d9534373ac048db315dfa27ace7372d40795b Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Fri, 20 Aug 2021 23:43:21 +0000
Subject: [PATCH 024/257] REST API: Remove trailing slashes when preloading
 requests and add unit tests for it.

Props antonvlasenko.
Fixes #51636.

git-svn-id: https://develop.svn.wordpress.org/trunk@51648 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/rest-api.php     |  5 +++++
 tests/phpunit/tests/rest-api.php | 25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/wp-includes/rest-api.php b/src/wp-includes/rest-api.php
index 7480fd5c648aa..675c545ce18e6 100644
--- a/src/wp-includes/rest-api.php
+++ b/src/wp-includes/rest-api.php
@@ -2818,6 +2818,11 @@ function rest_preload_api_request( $memo, $path ) {
 		}
 	}
 
+	$path = untrailingslashit( $path );
+	if ( empty( $path ) ) {
+		$path = '/';
+	}
+
 	$path_parts = parse_url( $path );
 	if ( false === $path_parts ) {
 		return $memo;
diff --git a/tests/phpunit/tests/rest-api.php b/tests/phpunit/tests/rest-api.php
index 288c7140e8b8d..4ec818013bda6 100644
--- a/tests/phpunit/tests/rest-api.php
+++ b/tests/phpunit/tests/rest-api.php
@@ -954,6 +954,31 @@ function test_rest_preload_api_request_with_method() {
 		$GLOBALS['wp_rest_server'] = $rest_server;
 	}
 
+	/**
+	 * @ticket 51636
+	 */
+	function test_rest_preload_api_request_removes_trailing_slashes() {
+		$rest_server               = $GLOBALS['wp_rest_server'];
+		$GLOBALS['wp_rest_server'] = null;
+
+		$preload_paths = array(
+			'/wp/v2/types//',
+			array( '/wp/v2/media///', 'OPTIONS' ),
+			'////',
+		);
+
+		$preload_data = array_reduce(
+			$preload_paths,
+			'rest_preload_api_request',
+			array()
+		);
+
+		$this->assertSame( array_keys( $preload_data ), array( '/wp/v2/types', 'OPTIONS', '/' ) );
+		$this->assertArrayHasKey( '/wp/v2/media', $preload_data['OPTIONS'] );
+
+		$GLOBALS['wp_rest_server'] = $rest_server;
+	}
+
 	/**
 	 * @ticket 40614
 	 */

From a2c0ccd117cc0307516dbdbf041f93b751e29be0 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Sat, 21 Aug 2021 00:18:25 +0000
Subject: [PATCH 025/257] Editor: Replace the remaining references to
 `wp.editor` with `wp.oldEditor`.

Props zieladam.
Fixes #53762.

git-svn-id: https://develop.svn.wordpress.org/trunk@51649 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/js/_enqueues/lib/quicktags.js             |  6 +++---
 .../tinymce/plugins/wordpress/plugin.js       |  6 +++---
 src/js/_enqueues/wp/editor/base.js            | 20 +++++++++----------
 src/js/_enqueues/wp/editor/dfw.js             |  6 +++---
 src/wp-includes/class-wp-editor.php           |  4 ++--
 src/wp-includes/general-template.php          |  2 +-
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/js/_enqueues/lib/quicktags.js b/src/js/_enqueues/lib/quicktags.js
index 4b1a80fa28c94..0e69fa6843015 100644
--- a/src/js/_enqueues/lib/quicktags.js
+++ b/src/js/_enqueues/lib/quicktags.js
@@ -435,7 +435,7 @@ window.edToolbar = function(){};
 			ariaLabel = this.attr && this.attr.ariaLabel ? ' aria-label="' + _escape( this.attr.ariaLabel ) + '"' : '',
 			val = this.display ? ' value="' + _escape( this.display ) + '"' : '',
 			id = this.id ? ' id="' + _escape( idPrefix + this.id ) + '"' : '',
-			dfw = ( wp = window.wp ) && wp.editor && wp.editor.dfw;
+			dfw = ( wp = window.wp ) && wp.oldEditor && wp.oldEditor.dfw;
 
 		if ( this.id === 'fullscreen' ) {
 			return '<button type="button"' + id + ' class="ed_button qt-dfw qt-fullscreen"' + title + ariaLabel + '></button>';
@@ -681,11 +681,11 @@ window.edToolbar = function(){};
 	qt.DFWButton.prototype.callback = function() {
 		var wp;
 
-		if ( ! ( wp = window.wp ) || ! wp.editor || ! wp.editor.dfw ) {
+		if ( ! ( wp = window.wp ) || ! wp.oldEditor || ! wp.oldEditor.dfw ) {
 			return;
 		}
 
-		window.wp.editor.dfw.toggle();
+		window.wp.oldEditor.dfw.toggle();
 	};
 
 	qt.TextDirectionButton = function() {
diff --git a/src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js b/src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js
index 3f9544826654f..9fcf03b780c23 100644
--- a/src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js
+++ b/src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js
@@ -12,7 +12,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 		__ = editor.editorManager.i18n.translate,
 		$ = window.jQuery,
 		wp = window.wp,
-		hasWpautop = ( wp && wp.editor && wp.editor.autop && editor.getParam( 'wpautop', true ) ),
+		hasWpautop = ( wp && wp.oldEditor && wp.oldEditor.autop && editor.getParam( 'wpautop', true ) ),
 		wpTooltips = false;
 
 	if ( $ ) {
@@ -130,7 +130,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 
 			if ( event.load && event.format !== 'raw' ) {
 				if ( hasWpautop ) {
-					event.content = wp.editor.autop( event.content );
+					event.content = wp.oldEditor.autop( event.content );
 				} else {
 					// Prevent creation of paragraphs out of multiple HTML comments.
 					event.content = event.content.replace( /-->\s+<!--/g, '--><!--' );
@@ -601,7 +601,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 		event.content = event.content.replace( /<p>(?:<br ?\/?>|\u00a0|\uFEFF| )*<\/p>/g, '<p>&nbsp;</p>' );
 
 		if ( hasWpautop ) {
-			event.content = wp.editor.removep( event.content );
+			event.content = wp.oldEditor.removep( event.content );
 		} else {
 			// Restore formatting of block boundaries.
 			event.content = event.content.replace( /-->\s*<!-- wp:/g, '-->\n\n<!-- wp:' );
diff --git a/src/js/_enqueues/wp/editor/base.js b/src/js/_enqueues/wp/editor/base.js
index d5fe958c19395..e420a68fefe84 100644
--- a/src/js/_enqueues/wp/editor/base.js
+++ b/src/js/_enqueues/wp/editor/base.js
@@ -5,7 +5,7 @@
 window.wp = window.wp || {};
 
 ( function( $, wp ) {
-	wp.editor = wp.editor || {};
+	wp.editor = wp.oldEditor = wp.oldEditor || {};
 
 	/**
 	 * Utility functions for the editor.
@@ -1191,8 +1191,8 @@ window.wp = window.wp || {};
 			} );
 		}
 
-		wp.editor.autop = wpautop;
-		wp.editor.removep = pre_wpautop;
+		wp.oldEditor.autop = wpautop;
+		wp.oldEditor.removep = pre_wpautop;
 
 		exports = {
 			go: switchEditor,
@@ -1241,15 +1241,15 @@ window.wp = window.wp || {};
 	 *    }
 	 * }
 	 */
-	wp.editor.initialize = function( id, settings ) {
+	wp.oldEditor.initialize = function( id, settings ) {
 		var init;
 		var defaults;
 
-		if ( ! $ || ! id || ! wp.editor.getDefaultSettings ) {
+		if ( ! $ || ! id || ! wp.oldEditor.getDefaultSettings ) {
 			return;
 		}
 
-		defaults = wp.editor.getDefaultSettings();
+		defaults = wp.oldEditor.getDefaultSettings();
 
 		// Initialize TinyMCE by default.
 		if ( ! settings ) {
@@ -1349,13 +1349,13 @@ window.wp = window.wp || {};
 	/**
 	 * Remove one editor instance.
 	 *
-	 * Intended for use with editors that were initialized with wp.editor.initialize().
+	 * Intended for use with editors that were initialized with wp.oldEditor.initialize().
 	 *
 	 * @since 4.8.0
 	 *
 	 * @param {string} id The HTML id of the editor textarea.
 	 */
-	wp.editor.remove = function( id ) {
+	wp.oldEditor.remove = function( id ) {
 		var mceInstance, qtInstance,
 			$wrap = $( '#wp-' + id + '-wrap' );
 
@@ -1388,14 +1388,14 @@ window.wp = window.wp || {};
 	/**
 	 * Get the editor content.
 	 *
-	 * Intended for use with editors that were initialized with wp.editor.initialize().
+	 * Intended for use with editors that were initialized with wp.oldEditor.initialize().
 	 *
 	 * @since 4.8.0
 	 *
 	 * @param {string} id The HTML id of the editor textarea.
 	 * @return The editor content.
 	 */
-	wp.editor.getContent = function( id ) {
+	wp.oldEditor.getContent = function( id ) {
 		var editor;
 
 		if ( ! $ || ! id ) {
diff --git a/src/js/_enqueues/wp/editor/dfw.js b/src/js/_enqueues/wp/editor/dfw.js
index a47c548dc9a8f..d1a646ca85456 100644
--- a/src/js/_enqueues/wp/editor/dfw.js
+++ b/src/js/_enqueues/wp/editor/dfw.js
@@ -33,7 +33,7 @@
 			$sideSortables = $( '#side-sortables' ),
 			$postboxContainer = $( '#postbox-container-1' ),
 			$postBody = $('#post-body'),
-			fullscreen = window.wp.editor && window.wp.editor.fullscreen,
+			fullscreen = window.wp.oldEditor && window.wp.oldEditor.fullscreen,
 			mceEditor,
 			mceBind = function(){},
 			mceUnbind = function(){},
@@ -1603,8 +1603,8 @@
 		}
 
 		window.wp = window.wp || {};
-		window.wp.editor = window.wp.editor || {};
-		window.wp.editor.dfw = {
+		window.wp.oldEditor = window.wp.oldEditor || {};
+		window.wp.oldEditor.dfw = {
 			activate: activate,
 			deactivate: deactivate,
 			isActive: isActive,
diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php
index 61cda16585feb..9ec353c90799c 100644
--- a/src/wp-includes/class-wp-editor.php
+++ b/src/wp-includes/class-wp-editor.php
@@ -969,8 +969,8 @@ public static function print_default_editor_scripts() {
 		?>
 		<script type="text/javascript">
 		window.wp = window.wp || {};
-		window.wp.editor = window.wp.editor || {};
-		window.wp.editor.getDefaultSettings = function() {
+		window.wp.editor = window.wp.oldEditor = window.wp.oldEditor || {};
+		window.wp.oldEditor.getDefaultSettings = function() {
 			return {
 				tinymce: <?php echo $settings; ?>,
 				quicktags: {
diff --git a/src/wp-includes/general-template.php b/src/wp-includes/general-template.php
index 41b0a174c03fa..a9540c937876d 100644
--- a/src/wp-includes/general-template.php
+++ b/src/wp-includes/general-template.php
@@ -3524,7 +3524,7 @@ function wp_editor( $content, $editor_id, $settings = array() ) {
  * Outputs the editor scripts, stylesheets, and default settings.
  *
  * The editor can be initialized when needed after page load.
- * See wp.editor.initialize() in wp-admin/js/editor.js for initialization options.
+ * See wp.oldEditor.initialize() in wp-admin/js/editor.js for initialization options.
  *
  * @uses _WP_Editors
  * @since 4.8.0

From 43a8715ded74b7920bd87f4bb6a93f04775305e7 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sat, 21 Aug 2021 15:32:53 +0000
Subject: [PATCH 026/257] Tests: Rename classes in
 `phpunit/tests/error-protection/` per the naming conventions.

https://make.wordpress.org/core/handbook/testing/automated-testing/writing-phpunit-tests/#naming-and-organization

Follow-up to [47780], [48911], [49327], [50291], [50292], [50342], [50452], [50453], [50456], [50967], [50968], [50969], [51491], [51492], [51493], [51623], [51639], [51646].

See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51650 602fd350-edb4-49c9-b593-d223f7449a82
---
 ...-mode-cookie-service.php => wpRecoveryModeCookieService.php} | 2 +-
 ...covery-mode-key-service.php => wpRecoveryModeKeyService.php} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename tests/phpunit/tests/error-protection/{recovery-mode-cookie-service.php => wpRecoveryModeCookieService.php} (97%)
 rename tests/phpunit/tests/error-protection/{recovery-mode-key-service.php => wpRecoveryModeKeyService.php} (98%)

diff --git a/tests/phpunit/tests/error-protection/recovery-mode-cookie-service.php b/tests/phpunit/tests/error-protection/wpRecoveryModeCookieService.php
similarity index 97%
rename from tests/phpunit/tests/error-protection/recovery-mode-cookie-service.php
rename to tests/phpunit/tests/error-protection/wpRecoveryModeCookieService.php
index e261645d0aa06..122a9193f2883 100644
--- a/tests/phpunit/tests/error-protection/recovery-mode-cookie-service.php
+++ b/tests/phpunit/tests/error-protection/wpRecoveryModeCookieService.php
@@ -3,7 +3,7 @@
 /**
  * @group error-protection
  */
-class Tests_Recovery_Mode_Cookie_Service extends WP_UnitTestCase {
+class Tests_Error_Protection_wpRecoveryModeCookieService extends WP_UnitTestCase {
 
 	/**
 	 * @ticket 46130
diff --git a/tests/phpunit/tests/error-protection/recovery-mode-key-service.php b/tests/phpunit/tests/error-protection/wpRecoveryModeKeyService.php
similarity index 98%
rename from tests/phpunit/tests/error-protection/recovery-mode-key-service.php
rename to tests/phpunit/tests/error-protection/wpRecoveryModeKeyService.php
index 66f15e6c1ecc4..316655d7a36c7 100644
--- a/tests/phpunit/tests/error-protection/recovery-mode-key-service.php
+++ b/tests/phpunit/tests/error-protection/wpRecoveryModeKeyService.php
@@ -3,7 +3,7 @@
 /**
  * @group error-protection
  */
-class Tests_Recovery_Mode_Key_Service extends WP_UnitTestCase {
+class Tests_Error_Protection_wpRecoveryModeKeyService extends WP_UnitTestCase {
 
 	/**
 	 * @ticket 46130

From 402e2e636b5124898cb82cba6a1c845526327688 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sun, 22 Aug 2021 10:07:17 +0000
Subject: [PATCH 027/257] Tests: Rename classes in `phpunit/tests/feed/` per
 the naming conventions.

https://make.wordpress.org/core/handbook/testing/automated-testing/writing-phpunit-tests/#naming-and-organization

Follow-up to [47780], [48911], [49327], [50291], [50292], [50342], [50452], [50453], [50456], [50967], [50968], [50969], [51491], [51492], [51493], [51623], [51639], [51646], [51650].

See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51651 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/feed/atom.php                               | 2 +-
 tests/phpunit/tests/feed/rss2.php                               | 2 +-
 .../tests/feed/{wp-simplepie-file.php => wpSimplePieFile.php}   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename tests/phpunit/tests/feed/{wp-simplepie-file.php => wpSimplePieFile.php} (98%)

diff --git a/tests/phpunit/tests/feed/atom.php b/tests/phpunit/tests/feed/atom.php
index b54c3ae8f4209..3b2c82774965f 100644
--- a/tests/phpunit/tests/feed/atom.php
+++ b/tests/phpunit/tests/feed/atom.php
@@ -8,7 +8,7 @@
  *
  * @group feed
  */
-class Tests_Feeds_Atom extends WP_UnitTestCase {
+class Tests_Feed_Atom extends WP_UnitTestCase {
 	public static $user_id;
 	public static $posts;
 	public static $category;
diff --git a/tests/phpunit/tests/feed/rss2.php b/tests/phpunit/tests/feed/rss2.php
index d2eea6bc6296e..50138cf255f39 100644
--- a/tests/phpunit/tests/feed/rss2.php
+++ b/tests/phpunit/tests/feed/rss2.php
@@ -8,7 +8,7 @@
  *
  * @group feed
  */
-class Tests_Feeds_RSS2 extends WP_UnitTestCase {
+class Tests_Feed_RSS2 extends WP_UnitTestCase {
 	public static $user_id;
 	public static $posts;
 	public static $category;
diff --git a/tests/phpunit/tests/feed/wp-simplepie-file.php b/tests/phpunit/tests/feed/wpSimplePieFile.php
similarity index 98%
rename from tests/phpunit/tests/feed/wp-simplepie-file.php
rename to tests/phpunit/tests/feed/wpSimplePieFile.php
index ada28f6451836..f9748e3a7bcac 100644
--- a/tests/phpunit/tests/feed/wp-simplepie-file.php
+++ b/tests/phpunit/tests/feed/wpSimplePieFile.php
@@ -15,7 +15,7 @@
  *
  * @since 5.6.1
  */
-class Tests_WP_SimplePie_File extends WP_UnitTestCase {
+class Tests_Feed_wpSimplePieFile extends WP_UnitTestCase {
 	public static function set_up_before_class() {
 		parent::set_up_before_class();
 

From d4abd5ca4a500f7b704c59d7a03ac1c583fde6a3 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 23 Aug 2021 11:42:58 +0000
Subject: [PATCH 028/257] Code Modernization: Pass correct default value to
 `http_build_query()` in `WP_Sitemaps_Provider::get_sitemap_url()`.

The `WP_Sitemaps_Provider::get_sitemap_url()` method calls the PHP native `http_build_query()` function, the second parameter of which is the ''optional'' `$numeric_prefix` parameter which expects a `string`.

A parameter being optional, however, does not automatically make it nullable.

As of PHP 8.1, passing `null` to a non-nullable PHP native function will generate a deprecation notice.

In this case, this function call yielded a `http_build_query(): Passing null to parameter #2 ($numeric_prefix) of type string is deprecated` notice.

Changing the `null` to an empty string fixes this without a backward compatibility break.

This change is already covered by tests as 14 of the existing tests failed on these function calls when running the tests on PHP 8.1.

References:
* [https://www.php.net/manual/en/function.http-build-query.php PHP Manual: http_build_query()]
* [https://wiki.php.net/rfc/deprecate_null_to_scalar_internal_arg PHP RFC: Deprecate passing null to non-nullable arguments of internal functions]

Follow-up to [48470].

Props jrf.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51652 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/sitemaps/class-wp-sitemaps-provider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/sitemaps/class-wp-sitemaps-provider.php b/src/wp-includes/sitemaps/class-wp-sitemaps-provider.php
index 3440f62b34a4c..e77681d7215d3 100644
--- a/src/wp-includes/sitemaps/class-wp-sitemaps-provider.php
+++ b/src/wp-includes/sitemaps/class-wp-sitemaps-provider.php
@@ -160,7 +160,7 @@ public function get_sitemap_url( $name, $page ) {
 		);
 
 		if ( ! $wp_rewrite->using_permalinks() ) {
-			$basename = '/?' . http_build_query( $params, null, '&' );
+			$basename = '/?' . http_build_query( $params, '', '&' );
 		}
 
 		return home_url( $basename );

From 67f87024772added12682ef123368932125e0788 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Tue, 24 Aug 2021 20:50:21 +0000
Subject: [PATCH 029/257] Media: Fix `wp_unique_filename()` to check for name
 collisions with all alternate file names when an image may be converted after
 uploading. This includes possible collinions with pre-existing images whose
 sub-sizes/thumbnails are regenerated.

Props ianmjones, azaozz.
Fixes #53668.

git-svn-id: https://develop.svn.wordpress.org/trunk@51653 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-image-editor.php     |   6 +-
 src/wp-includes/functions.php                 | 190 +++++++++++++++---
 .../data/images/test-image-1-100x100.jpg      | Bin 0 -> 2028 bytes
 tests/phpunit/data/images/test-image-2.gif    | Bin 0 -> 524 bytes
 tests/phpunit/data/images/test-image-3.jpg    | Bin 0 -> 2028 bytes
 tests/phpunit/data/images/test-image-4.png    | Bin 0 -> 1011 bytes
 tests/phpunit/tests/functions.php             | 110 +++++++++-
 7 files changed, 268 insertions(+), 38 deletions(-)
 create mode 100644 tests/phpunit/data/images/test-image-1-100x100.jpg
 create mode 100644 tests/phpunit/data/images/test-image-2.gif
 create mode 100644 tests/phpunit/data/images/test-image-3.jpg
 create mode 100644 tests/phpunit/data/images/test-image-4.png

diff --git a/src/wp-includes/class-wp-image-editor.php b/src/wp-includes/class-wp-image-editor.php
index 11210180b229d..0bc7ee6aeed18 100644
--- a/src/wp-includes/class-wp-image-editor.php
+++ b/src/wp-includes/class-wp-image-editor.php
@@ -591,13 +591,11 @@ protected static function get_mime_type( $extension = null ) {
 	 * @return string|false
 	 */
 	protected static function get_extension( $mime_type = null ) {
-		$extensions = explode( '|', array_search( $mime_type, wp_get_mime_types(), true ) );
-
-		if ( empty( $extensions[0] ) ) {
+		if ( empty( $mime_type ) ) {
 			return false;
 		}
 
-		return $extensions[0];
+		return wp_get_default_extension_for_mime_type( $mime_type );
 	}
 }
 
diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index 7b01568ad42c0..02d74e1b70f54 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -2488,6 +2488,10 @@ function wp_unique_filename( $dir, $filename, $unique_filename_callback = null )
 	$filename = sanitize_file_name( $filename );
 	$ext2     = null;
 
+	// Initialize vars used in the wp_unique_filename filter.
+	$number        = '';
+	$alt_filenames = array();
+
 	// Separate the filename into a name and extension.
 	$ext  = pathinfo( $filename, PATHINFO_EXTENSION );
 	$name = pathinfo( $filename, PATHINFO_BASENAME );
@@ -2508,8 +2512,7 @@ function wp_unique_filename( $dir, $filename, $unique_filename_callback = null )
 	if ( $unique_filename_callback && is_callable( $unique_filename_callback ) ) {
 		$filename = call_user_func( $unique_filename_callback, $dir, $name, $ext );
 	} else {
-		$number = '';
-		$fname  = pathinfo( $filename, PATHINFO_FILENAME );
+		$fname = pathinfo( $filename, PATHINFO_FILENAME );
 
 		// Always append a number to file names that can potentially match image sub-size file names.
 		if ( $fname && preg_match( '/-(?:\d+x\d+|scaled|rotated)$/', $fname ) ) {
@@ -2519,37 +2522,54 @@ function wp_unique_filename( $dir, $filename, $unique_filename_callback = null )
 			$filename = str_replace( "{$fname}{$ext}", "{$fname}-{$number}{$ext}", $filename );
 		}
 
-		// Change '.ext' to lower case.
-		if ( $ext && strtolower( $ext ) != $ext ) {
-			$ext2      = strtolower( $ext );
-			$filename2 = preg_replace( '|' . preg_quote( $ext ) . '$|', $ext2, $filename );
+		// Get the mime type. Uploaded files were already checked with wp_check_filetype_and_ext()
+		// in _wp_handle_upload(). Using wp_check_filetype() would be sufficient here.
+		$file_type = wp_check_filetype( $filename );
+		$mime_type = $file_type['type'];
 
-			// Check for both lower and upper case extension or image sub-sizes may be overwritten.
-			while ( file_exists( $dir . "/{$filename}" ) || file_exists( $dir . "/{$filename2}" ) ) {
-				$new_number = (int) $number + 1;
-				$filename   = str_replace( array( "-{$number}{$ext}", "{$number}{$ext}" ), "-{$new_number}{$ext}", $filename );
-				$filename2  = str_replace( array( "-{$number}{$ext2}", "{$number}{$ext2}" ), "-{$new_number}{$ext2}", $filename2 );
-				$number     = $new_number;
-			}
+		$is_image    = ( ! empty( $mime_type ) && 0 === strpos( $mime_type, 'image/' ) );
+		$upload_dir  = wp_get_upload_dir();
+		$lc_filename = null;
 
-			$filename = $filename2;
-		} else {
-			while ( file_exists( $dir . "/{$filename}" ) ) {
-				$new_number = (int) $number + 1;
+		$lc_ext = strtolower( $ext );
+		$_dir   = trailingslashit( $dir );
 
-				if ( '' === "{$number}{$ext}" ) {
-					$filename = "{$filename}-{$new_number}";
-				} else {
-					$filename = str_replace( array( "-{$number}{$ext}", "{$number}{$ext}" ), "-{$new_number}{$ext}", $filename );
-				}
+		// If the extension is uppercase add an alternate file name with lowercase extension. Both need to be tested
+		// for uniqueness as the extension will be changed to lowercase for better compatibility with different filesystems.
+		// Fixes an inconsistency in WP < 2.9 where uppercase extensions were allowed but image sub-sizes were created with
+		// lowercase extensions.
+		if ( $ext && $lc_ext !== $ext ) {
+			$lc_filename = preg_replace( '|' . preg_quote( $ext ) . '$|', $lc_ext, $filename );
+		}
+
+		// Increment the number added to the file name if there are any files in $dir whose names match one of the
+		// possible name variations.
+		while ( file_exists( $_dir . $filename ) || ( $lc_filename && file_exists( $_dir . $lc_filename ) ) ) {
+			$new_number = (int) $number + 1;
 
-				$number = $new_number;
+			if ( $lc_filename ) {
+				$lc_filename = str_replace( array( "-{$number}{$lc_ext}", "{$number}{$lc_ext}" ), "-{$new_number}{$lc_ext}", $lc_filename );
 			}
+
+			if ( '' === "{$number}{$ext}" ) {
+				$filename = "{$filename}-{$new_number}";
+			} else {
+				$filename = str_replace( array( "-{$number}{$ext}", "{$number}{$ext}" ), "-{$new_number}{$ext}", $filename );
+			}
+
+			$number = $new_number;
+		}
+
+		// Change the extension to lowercase if needed.
+		if ( $lc_filename ) {
+			$filename = $lc_filename;
 		}
 
 		// Prevent collisions with existing file names that contain dimension-like strings
 		// (whether they are subsizes or originals uploaded prior to #42437).
-		$upload_dir = wp_get_upload_dir();
+
+		$files = array();
+		$count = 10000;
 
 		// The (resized) image files would have name and extension, and will be in the uploads dir.
 		if ( $name && $ext && @is_dir( $dir ) && false !== strpos( $dir, $upload_dir['basedir'] ) ) {
@@ -2579,18 +2599,77 @@ function wp_unique_filename( $dir, $filename, $unique_filename_callback = null )
 			}
 
 			if ( ! empty( $files ) ) {
-				// The extension case may have changed above.
-				$new_ext = ! empty( $ext2 ) ? $ext2 : $ext;
+				$count = count( $files );
 
 				// Ensure this never goes into infinite loop
 				// as it uses pathinfo() and regex in the check, but string replacement for the changes.
-				$count = count( $files );
-				$i     = 0;
+				$i = 0;
 
 				while ( $i <= $count && _wp_check_existing_file_names( $filename, $files ) ) {
 					$new_number = (int) $number + 1;
-					$filename   = str_replace( array( "-{$number}{$new_ext}", "{$number}{$new_ext}" ), "-{$new_number}{$new_ext}", $filename );
-					$number     = $new_number;
+
+					// If $ext is uppercase it was replaced with the lowercase version after the previous loop.
+					$filename = str_replace( array( "-{$number}{$lc_ext}", "{$number}{$lc_ext}" ), "-{$new_number}{$lc_ext}", $filename );
+
+					$number = $new_number;
+					$i++;
+				}
+			}
+		}
+
+		// Check if an image will be converted after uploading or some existing images sub-sizes file names may conflict
+		// when regenerated. If yes, ensure the new file name will be unique and will produce unique sub-sizes.
+		if ( $is_image ) {
+			$output_formats = apply_filters( 'image_editor_output_format', array(), $_dir . $filename, $mime_type );
+			$alt_types      = array();
+
+			if ( ! empty( $output_formats[ $mime_type ] ) ) {
+				// The image will be converted to this format/mime type.
+				$alt_mime_type = $output_formats[ $mime_type ];
+
+				// Other types of images whose names may conflict if their sub-sizes are regenerated.
+				$alt_types = array_keys( array_intersect( $output_formats, array( $mime_type, $alt_mime_type ) ) );
+				$alt_types[] = $alt_mime_type;
+			} elseif ( ! empty( $output_formats ) ) {
+				$alt_types = array_keys( array_intersect( $output_formats, array( $mime_type ) ) );
+			}
+
+			// Remove duplicates and the original mime type. It will be added later if needed.
+			$alt_types = array_unique( array_diff( $alt_types, array( $mime_type ) ) );
+
+			foreach ( $alt_types as $alt_type ) {
+				$alt_ext = wp_get_default_extension_for_mime_type( $alt_type );
+
+				if ( ! $alt_ext ) {
+					continue;
+				}
+
+				$alt_ext      = ".{$alt_ext}";
+				$alt_filename = preg_replace( '|' . preg_quote( $lc_ext ) . '$|', $alt_ext, $filename );
+
+				$alt_filenames[ $alt_ext ] = $alt_filename;
+			}
+
+			if ( ! empty( $alt_filenames ) ) {
+				// Add the original filename. It needs to be checked again together with the alternate filenames
+				// when $number is incremented.
+				$alt_filenames[ $lc_ext ] = $filename;
+
+				// Ensure no infinite loop.
+				$i = 0;
+
+				while ( $i <= $count && _wp_check_alternate_file_names( $alt_filenames, $_dir, $files ) ) {
+					$new_number = (int) $number + 1;
+
+					foreach ( $alt_filenames as $alt_ext => $alt_filename ) {
+						$alt_filenames[ $alt_ext ] = str_replace( array( "-{$number}{$alt_ext}", "{$number}{$alt_ext}" ), "-{$new_number}{$alt_ext}", $alt_filename );
+					}
+
+					// Also update the $number in (the output) $filename.
+					// If the extension was uppercase it was already replaced with the lowercase version.
+					$filename = str_replace( array( "-{$number}{$lc_ext}", "{$number}{$lc_ext}" ), "-{$new_number}{$lc_ext}", $filename );
+
+					$number = $new_number;
 					$i++;
 				}
 			}
@@ -2601,13 +2680,42 @@ function wp_unique_filename( $dir, $filename, $unique_filename_callback = null )
 	 * Filters the result when generating a unique file name.
 	 *
 	 * @since 4.5.0
+	 * @since 5.8.1 The `$alt_filenames` and `$number` parameters were added.
 	 *
 	 * @param string        $filename                 Unique file name.
 	 * @param string        $ext                      File extension, eg. ".png".
 	 * @param string        $dir                      Directory path.
 	 * @param callable|null $unique_filename_callback Callback function that generates the unique file name.
+	 * @param string[]      $alt_filenames            Array of alternate file names that were checked for collisions.
+	 * @param int|string    $number                   The highest number that was used to make the file name unique
+	 *                                                or an empty string if unused.
 	 */
-	return apply_filters( 'wp_unique_filename', $filename, $ext, $dir, $unique_filename_callback );
+	return apply_filters( 'wp_unique_filename', $filename, $ext, $dir, $unique_filename_callback, $alt_filenames, $number );
+}
+
+/**
+ * Helper function to test if each of an array of file names could conflict with existing files.
+ *
+ * @since 5.8.1
+ * @access private
+ *
+ * @param string[] $filenames Array of file names to check.
+ * @param string   $dir       The directory containing the files.
+ * @param array    $files     An array of existing files in the directory. May be empty.
+ * @return bool True if the tested file name could match an existing file, false otherwise.
+ */
+function _wp_check_alternate_file_names( $filenames, $dir, $files ) {
+	foreach ( $filenames as $filename ) {
+		if ( file_exists( $dir . $filename ) ) {
+			return true;
+		}
+
+		if ( ! empty( $files ) && _wp_check_existing_file_names( $filename, $files ) ) {
+			return true;
+		}
+	}
+
+	return false;
 }
 
 /**
@@ -2793,6 +2901,26 @@ function wp_ext2type( $ext ) {
 	}
 }
 
+/**
+ * Returns first matched extension for the mime-type,
+ * as mapped from wp_get_mime_types().
+ *
+ * @since 5.8.1
+ *
+ * @param string $mime_type
+ *
+ * @return string|false
+ */
+function wp_get_default_extension_for_mime_type( $mime_type ) {
+	$extensions = explode( '|', array_search( $mime_type, wp_get_mime_types(), true ) );
+
+	if ( empty( $extensions[0] ) ) {
+		return false;
+	}
+
+	return $extensions[0];
+}
+
 /**
  * Retrieve the file type from the file name.
  *
diff --git a/tests/phpunit/data/images/test-image-1-100x100.jpg b/tests/phpunit/data/images/test-image-1-100x100.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..534aac1d6bf494f7e83c96b32cfe29271e8aac5a
GIT binary patch
literal 2028
zcmbu9dr(t%7RP@#A%s9M1_M#3O~Dt1TBd+Rgp##vMX-pVB9KCg6dQ;vBM%J{Kmmyu
zlp-oER04)V-4!WI0zQD41VL?4UdqEok{}O7<whjjl2;Sgp|dml$IkZrX6`vN_j}Hq
z&pG#Z4MPSwSRS-3a2tRi2y8bVU{HW#pR*GV01zAuTmS$T00Y?ov@wE=2SD}!^EL(`
z2y$48!yxB(8WaHB1Yq_~6J_*9qj(!1$x9wpg<4X$SE2uiO<Kca;BV^ZPnoI6pDJKV
zHrxV43*Zji(GU@!h!C0x89D&PI0VeUYn$3N8H7TcVa%}>I7=&|K(rj7AT%0fhQ?sb
zjDvu(jPHRN5o6={$yW0fp|Mz}LnQa(CDj&dK5LZNhV{a0J@%*M;w<gRD_7aCTff2i
zLl@6YUewLrTm1j}`L=-VfkC_X><!-+5g8Ttb^L*Em<frgY3YZLurrS4<)0|vo-90d
zw)EWj3uWJZUw%nY^J8t@PnZAx&nBU$x#imR8&X-v?ar<{cklJ}4?KJ{I5a$>P>w&H
zn4Fq^_FVOP?#;Y<0r_pw#03HL(#ZZRmvIOX%FGOHhBa|Ps3RtDq8Y~V6LXubq1f0%
zE1cYqTaZ30scw|u)_8=$w)<0hE$!BND%Pn?Xm82>H?Z9Qi);z(53Uh_M?=Qtp^1P7
z^m=Ddg*xUEF*fx4@ZHSXCnJe=DZag3N8(bgM}=qUA?rlawXkoAha?sMXwEsMH-uEO
zIg)q|(2ZG^z?e+9Pe5D)UY2EQaM_Za)qdVc_^NaoZ{g@BzVyNHxXkPD*ob}0DKXQH
zM{Y#cD8kEXrWG;KDOuExEy8Tqfizw^m0XT3m_NZ=R&|Up`B;xv7(nhZ7K7-woReh?
z*_`M{^WN?2IB1oZNF`95ZYjL_aYYA}v8**md4Q`Fb0-RP?ITTW2c^2E-SJ`No2=$&
zf92E0yCtz76rnZDrB<gh)%g|r_pJ>8)2X{ii@)iwYtZ=RNH(-m>hvRgA<0#vbJ(l9
z>bHJ)hd_T%Z}G4vgJ<3bYov1wZCuZW$Mzvf84U>w_^(fSRuLxtp|=dJouR>78OUY>
zP)xmSkk@-@cIqyQnaQ>dUBRp``Zi8z%zu<Kc;tobWx6XI3`Xd<(JlQnh0&(Mb}+1&
zcY&~HQbmvzuHkhz=I(;@=j@l=6tL_3ds~AQ-C<pHc;Te*qEB>BdcC{Sr<=O3SCqLq
z-P&zW|0~5e1<$*7HD1eo)u&v~oXU-u*yeKUTkFKPOCjq7*}iOoIvT;Miq$-%I!nig
z4M5J96_YtZsy%m9^#hBHd?CFpCfFl5GBSKB@=<&<Z+q`Yd%hQ0$1L9K99>(f^!$qO
zv_g*yyleoHL+vE33sSEMMW}k57{-p13yt*z4BG};5`m-*LrOJYKBHK-#{PsHQD*b%
z5*hebQYF4rcJ%yIftDiA!Hq%+YpY#1sO9m^ZJe|8p(~eT6QS1&+V`k%oZfO)lcK-f
ztM%8_h~*W0lpkT5-}pqJq?|70gd@?KaHiN+%c|CXTJe`GsxtdzCEft?lfSq&;JYa!
zfu$H*iJZxF5Z>&+1Y;@%&Ga3tJMlmlV*q&};$#CrSPzi(Ps-p8om&Rg#kUP$h!@tM
zZT-A)^vjHq3j#QGx2Sa>+nm++Vcf*<vk}{Z>#+3xCWm|qe*F3mWo`SuMK9*R{fhLC
zH2G6E#Pz`oo{Dvw*2LA?3`%M5YpGYXA0v61-CAb`;@s7d1I^g5+E*iVc(;T?O0&u#
za=Zu9X9-r1>9Z>$XY3ZaMcVipW*IrEEB^qJRLfla0he?2mpFh`2f_hLuEec~hWB+H
z=MN7m39^vFG3?bBJI~9<>^L8&0t&RTu%1OB1TDUIBm6`?J7{57PxCa{&SttLD!u+z
zmeZ@wB=<=x7BBLvBD9Y>AK_|fS`Wm3JUUZdty+*i;8M`@8=YpPF+M76XEK@1k}wE=
z6E=_~Zrn-u)%AL$DYWm+e&4{=+Hz0(gDv~B!s(51EYjSsB|l?-+nytFpvkMnIOFz9
zDR2a3)r>u@!>8CLTUP0f<f#JGX{zEgFO>ss2j>~b=h(03{cN-c_1$N%Z5La;vo0Y!
zI;s8swf|z}Ny>|h(z@NdXGN(=&e+9YI4(#NEFQ0u&EmBYh?|Na;oG*aMDE|uGyoi8
zykHB3o_sRfzr*W7%V1RWiyJ$|)uT_IwbaV?{w(ejt*pM5Ak>9RHNkCXtY&<^a{_Pd
PO?Tnlf9gLS!7%(gr&MST

literal 0
HcmV?d00001

diff --git a/tests/phpunit/data/images/test-image-2.gif b/tests/phpunit/data/images/test-image-2.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8fad364479d96df7f659438ba45ef2dcc76d12ae
GIT binary patch
literal 524
zcmZ?wbhEHbG-5DfxXJ(mTwGitA|f&}GRn%zT3TAh#>O@_HqOq@zP`S}!ND;xF^P$Z
z85tQRB_-9>)y>V#ot>Q%Cr+F_d-jqgOIEE~wPnkeojZ3PIdbI8nKPF!U%q$m-s8uQ
zU%h(u>C>lw|Nen(pdq37lZBIkL4iRBWCzGk3~c`o^cQ&ONcEpsQgkxMYW{^4C0=Wz
z*56q3ZP&@1)m)9wwVyID2p3%`)LSuM?x18rrMY@B!=ZB~PZ*_YJS7;ID|wncxEO>u
ziy37*UDFul#480Rx$rY|$g>nP&vGt`lNYKKSuDc9?kvYx%(l30l{0Up#3V@uCReFS
zu1VYs{BG=((oM4IGH#-kd`$ujoE~lIQ)}A9JgyWAm0e)*Oe=npe}YT&&D(c%#dlK<
z)PMb2ox;Pw#`E{z|G!Vp7%pAvtkdLaaW?XU>Y;sV&z`wlO49HZPAcw6ZCtjNbD`zF
zO+P+9S>hnq9j3=P;rWq=GUnkE7$rWp+?&G{_F>M#mnx4WHJNM{7W^o4Yc%Tk^-sp(
jhD+*R2A}STj@0#MSFDcMoOSoq*45Y7CkV4LGFSru!Q!!l

literal 0
HcmV?d00001

diff --git a/tests/phpunit/data/images/test-image-3.jpg b/tests/phpunit/data/images/test-image-3.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..534aac1d6bf494f7e83c96b32cfe29271e8aac5a
GIT binary patch
literal 2028
zcmbu9dr(t%7RP@#A%s9M1_M#3O~Dt1TBd+Rgp##vMX-pVB9KCg6dQ;vBM%J{Kmmyu
zlp-oER04)V-4!WI0zQD41VL?4UdqEok{}O7<whjjl2;Sgp|dml$IkZrX6`vN_j}Hq
z&pG#Z4MPSwSRS-3a2tRi2y8bVU{HW#pR*GV01zAuTmS$T00Y?ov@wE=2SD}!^EL(`
z2y$48!yxB(8WaHB1Yq_~6J_*9qj(!1$x9wpg<4X$SE2uiO<Kca;BV^ZPnoI6pDJKV
zHrxV43*Zji(GU@!h!C0x89D&PI0VeUYn$3N8H7TcVa%}>I7=&|K(rj7AT%0fhQ?sb
zjDvu(jPHRN5o6={$yW0fp|Mz}LnQa(CDj&dK5LZNhV{a0J@%*M;w<gRD_7aCTff2i
zLl@6YUewLrTm1j}`L=-VfkC_X><!-+5g8Ttb^L*Em<frgY3YZLurrS4<)0|vo-90d
zw)EWj3uWJZUw%nY^J8t@PnZAx&nBU$x#imR8&X-v?ar<{cklJ}4?KJ{I5a$>P>w&H
zn4Fq^_FVOP?#;Y<0r_pw#03HL(#ZZRmvIOX%FGOHhBa|Ps3RtDq8Y~V6LXubq1f0%
zE1cYqTaZ30scw|u)_8=$w)<0hE$!BND%Pn?Xm82>H?Z9Qi);z(53Uh_M?=Qtp^1P7
z^m=Ddg*xUEF*fx4@ZHSXCnJe=DZag3N8(bgM}=qUA?rlawXkoAha?sMXwEsMH-uEO
zIg)q|(2ZG^z?e+9Pe5D)UY2EQaM_Za)qdVc_^NaoZ{g@BzVyNHxXkPD*ob}0DKXQH
zM{Y#cD8kEXrWG;KDOuExEy8Tqfizw^m0XT3m_NZ=R&|Up`B;xv7(nhZ7K7-woReh?
z*_`M{^WN?2IB1oZNF`95ZYjL_aYYA}v8**md4Q`Fb0-RP?ITTW2c^2E-SJ`No2=$&
zf92E0yCtz76rnZDrB<gh)%g|r_pJ>8)2X{ii@)iwYtZ=RNH(-m>hvRgA<0#vbJ(l9
z>bHJ)hd_T%Z}G4vgJ<3bYov1wZCuZW$Mzvf84U>w_^(fSRuLxtp|=dJouR>78OUY>
zP)xmSkk@-@cIqyQnaQ>dUBRp``Zi8z%zu<Kc;tobWx6XI3`Xd<(JlQnh0&(Mb}+1&
zcY&~HQbmvzuHkhz=I(;@=j@l=6tL_3ds~AQ-C<pHc;Te*qEB>BdcC{Sr<=O3SCqLq
z-P&zW|0~5e1<$*7HD1eo)u&v~oXU-u*yeKUTkFKPOCjq7*}iOoIvT;Miq$-%I!nig
z4M5J96_YtZsy%m9^#hBHd?CFpCfFl5GBSKB@=<&<Z+q`Yd%hQ0$1L9K99>(f^!$qO
zv_g*yyleoHL+vE33sSEMMW}k57{-p13yt*z4BG};5`m-*LrOJYKBHK-#{PsHQD*b%
z5*hebQYF4rcJ%yIftDiA!Hq%+YpY#1sO9m^ZJe|8p(~eT6QS1&+V`k%oZfO)lcK-f
ztM%8_h~*W0lpkT5-}pqJq?|70gd@?KaHiN+%c|CXTJe`GsxtdzCEft?lfSq&;JYa!
zfu$H*iJZxF5Z>&+1Y;@%&Ga3tJMlmlV*q&};$#CrSPzi(Ps-p8om&Rg#kUP$h!@tM
zZT-A)^vjHq3j#QGx2Sa>+nm++Vcf*<vk}{Z>#+3xCWm|qe*F3mWo`SuMK9*R{fhLC
zH2G6E#Pz`oo{Dvw*2LA?3`%M5YpGYXA0v61-CAb`;@s7d1I^g5+E*iVc(;T?O0&u#
za=Zu9X9-r1>9Z>$XY3ZaMcVipW*IrEEB^qJRLfla0he?2mpFh`2f_hLuEec~hWB+H
z=MN7m39^vFG3?bBJI~9<>^L8&0t&RTu%1OB1TDUIBm6`?J7{57PxCa{&SttLD!u+z
zmeZ@wB=<=x7BBLvBD9Y>AK_|fS`Wm3JUUZdty+*i;8M`@8=YpPF+M76XEK@1k}wE=
z6E=_~Zrn-u)%AL$DYWm+e&4{=+Hz0(gDv~B!s(51EYjSsB|l?-+nytFpvkMnIOFz9
zDR2a3)r>u@!>8CLTUP0f<f#JGX{zEgFO>ss2j>~b=h(03{cN-c_1$N%Z5La;vo0Y!
zI;s8swf|z}Ny>|h(z@NdXGN(=&e+9YI4(#NEFQ0u&EmBYh?|Na;oG*aMDE|uGyoi8
zykHB3o_sRfzr*W7%V1RWiyJ$|)uT_IwbaV?{w(ejt*pM5Ak>9RHNkCXtY&<^a{_Pd
PO?Tnlf9gLS!7%(gr&MST

literal 0
HcmV?d00001

diff --git a/tests/phpunit/data/images/test-image-4.png b/tests/phpunit/data/images/test-image-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..642ce92975eae50f9cf63bbf2d863edf3381b8bb
GIT binary patch
literal 1011
zcmV<P0}T9$P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00009a7bBm000XU
z000XU0RWnu7ytkRrAb6VRA_<ina?Y9Q5?p<b7wTByRewB7?enA(#&E+O8f&RrLbZ)
z%GydvBq=s#Scrwyh{$3}(b!lZEVw8unOkTmri+>|W}bKT&fD$s&i!$2@ANiL-Nilk
zob!A?_c_x!-LU`w{RiUybpfnY0LeEMK=Mrm5VeZMVsw0bY_<&%Ojc)SC!9_vlF6j0
zKBj_*q6n+i3L?Vd;-Z;WFm-7yEG$quohBlpU@%B9^AKUy8%idVa5|kJqU^P^vtyQ>
zd5Ns9uF~`Kv#f1)cGfIA^AhoTy|Ofj2o{S4S65f2_?eQ(!NCCuf<Tp(mBev>EC5h2
z7&ODuoJ4whdO$=7g+lQA{jyXX4hNo|o|t<w2f4q$hs|aK&-0KZ3DIa&vBajPrdZpu
z2N@k51rcFjU;qG+$z)JhS0@8;xm@`C{AB9O6y)RM1LfuAAR?Tdon_lYp^ze#m6a8i
z)@(t-;V_5@EiEmwc1e=J^SlhCv9Xb*HCvFTrX~;(!r`#u+2G)yB9;C9eP-UwKu%6h
zKtw1lEyer$yW;uf<)s3otE-EZJv)%TzCI8UhKGlL?9<lPCIhirt%${9O#GREJU%|c
zZnuNuIEbS7W511!4Mi$LLqjY|U;{EaISC>{M@PqB`=wGTxLht7NJ&Wv-rn8}*I*bV
zl}e$aq5?#O?d|QH{U;_S6sgS3%^5AjILPniQd3idOeT}Fe>@&XQBjc$q_(ye>2%sq
z9X6w9wfXsZA|mp5JhZvFscMYd?IuAGviH~5*R-{@MSj0ue<4QR!uk2RVwvc@+S}Xz
zT_V5J@cDey(9oc1Y$Ot)L?V&B-`m?GK@iC6_3A4|?;A)Y5^y*iigT4(jf{*aQt9vS
z*ISPMAN$PAjG;5r-Q68*Hk%B@Znxv%;X&7Yx<J0ZzED+FW%x5sZ*Q+6m9eogU32LI
zSzliV5rOA<yuQBbG6sOd!$So~Sy|b)XSH0?1>*DhKtu=x0(yqa<neeEFw4u!n&;6B
zvb(#RHB_^c=hF1_v;w5QzFzYNsTriXxjFl3N0KD1!xg%?xcGKoSzBAvG>;~brKP2;
z5yx>%Ktxge7Nokm8ZR#|s^?J!5|76*K0XeP<78&t-QBpkxzP=AdwYvOAn@aE-`d)W
zqoX5L%Pc2IG#Z7)V)^Uwg6Daho}Q`(h(sbNE-qGmd~v(oIp?$hh5y;}N(GR7QvoF3
hQ~=306+rS$zW`mu!rH;U*1`Y)002ovPDHLkV1kDN<p%%&

literal 0
HcmV?d00001

diff --git a/tests/phpunit/tests/functions.php b/tests/phpunit/tests/functions.php
index 4ef24d22a1991..cdeb2361a8148 100644
--- a/tests/phpunit/tests/functions.php
+++ b/tests/phpunit/tests/functions.php
@@ -168,13 +168,21 @@ function test_wp_unique_filename() {
 		$testdir = DIR_TESTDATA . '/images/';
 
 		// Sanity check.
-		$this->assertSame( 'abcdefg.png', wp_unique_filename( $testdir, 'abcdefg.png' ), 'Sanitiy check failed' );
+		$this->assertSame( 'abcdefg.png', wp_unique_filename( $testdir, 'abcdefg.png' ), 'Test non-existing file, file name should be unchanged.' );
 
-		// Check number is appended for file already exists.
+		// Ensure correct images exist.
 		$this->assertFileExists( $testdir . 'test-image.png', 'Test image does not exist' );
-		$this->assertSame( 'test-image-1.png', wp_unique_filename( $testdir, 'test-image.png' ), 'Number not appended correctly' );
 		$this->assertFileDoesNotExist( $testdir . 'test-image-1.png' );
 
+		// Check number is appended if file already exists.
+		$this->assertSame( 'test-image-1.png', wp_unique_filename( $testdir, 'test-image.png' ), 'File name not unique, number not appended.' );
+
+		// Check file with uppercase extension.
+		$this->assertSame( 'test-image-1.png', wp_unique_filename( $testdir, 'test-image.PNG' ), 'File name with uppercase extension not unique, number not appended.' );
+
+		// Check file name with already added number.
+		$this->assertSame( 'test-image-2-1.gif', wp_unique_filename( $testdir, 'test-image-2.gif' ), 'File name not unique, number not appended correctly.' );
+
 		// Check special chars.
 		$this->assertSame( 'testtest-image.png', wp_unique_filename( $testdir, 'testtést-imagé.png' ), 'Filename with special chars failed' );
 
@@ -221,6 +229,88 @@ function upload_dir_patch_basedir( $upload_dir ) {
 		return $upload_dir;
 	}
 
+	/**
+	 * @ticket 53668
+	 */
+	function test_wp_unique_filename_with_additional_image_extension() {
+		$testdir = DIR_TESTDATA . '/images/';
+
+		add_filter( 'upload_dir', array( $this, 'upload_dir_patch_basedir' ) );
+
+		// Set conversions for uploaded images.
+		add_filter( 'image_editor_output_format', array( $this, 'image_editor_output_format_handler' ) );
+
+		// Ensure the test images exist.
+		$this->assertFileExists( $testdir . 'test-image-1-100x100.jpg', 'test-image-1-100x100.jpg does not exist' );
+		$this->assertFileExists( $testdir . 'test-image-2.gif', 'test-image-2.gif does not exist' );
+		$this->assertFileExists( $testdir . 'test-image-3.jpg', 'test-image-3.jpg does not exist' );
+		$this->assertFileExists( $testdir . 'test-image-4.png', 'test-image-4.png does not exist' );
+
+		// Standard test: file does not exist and there are no possible intersections with other files.
+		$this->assertSame(
+			'abcdef.png',
+			wp_unique_filename( $testdir, 'abcdef.png' ),
+			'The abcdef.png, abcdef.gif, and abcdef.jpg images do not exist. The file name should not be changed.'
+		);
+
+		// Actual clash recognized.
+		$this->assertSame(
+			'canola-1.jpg',
+			wp_unique_filename( $testdir, 'canola.jpg' ),
+			'The canola.jpg image exists. The file name should be unique.'
+		);
+
+		// Same name with different extension and the image will be converted.
+		$this->assertSame(
+			'canola-1.png',
+			wp_unique_filename( $testdir, 'canola.png' ),
+			'The canola.jpg image exists. Uploading canola.png that will be converted to canola.jpg should produce unique file name.'
+		);
+
+		// Same name with different uppercase extension and the image will be converted.
+		$this->assertSame(
+			'canola-1.png',
+			wp_unique_filename( $testdir, 'canola.PNG' ),
+			'The canola.jpg image exists. Uploading canola.PNG that will be converted to canola.jpg should produce unique file name.'
+		);
+
+		// Actual clash with several images with different extensions.
+		$this->assertSame(
+			'test-image-5.png',
+			wp_unique_filename( $testdir, 'test-image.png' ),
+			'The test-image.png, test-image-1-100x100.jpg, test-image-2.gif, test-image-3.jpg, and test-image-4.png images exist.' .
+			'All of them may clash when creating sub-sizes or regenerating thumbnails in the future. The filename should be unique.'
+		);
+
+		// Possible clash with regenerated thumbnails in the future.
+		$this->assertSame(
+			'codeispoetry-1.jpg',
+			wp_unique_filename( $testdir, 'codeispoetry.jpg' ),
+			'The codeispoetry.png image exists. When regenerating thumbnails for it they will be converted to JPG.' .
+			'The name of the newly uploaded codeispoetry.jpg should be made unique.'
+		);
+
+		remove_filter( 'image_editor_output_format', array( $this, 'image_editor_output_format_handler' ) );
+		remove_filter( 'upload_dir', array( $this, 'upload_dir_patch_basedir' ) );
+	}
+
+	/**
+	 * Changes the output format when editing images. When uploading a PNG file
+	 * it will be converted to JPEG, GIF to JPEG, and PICT to BMP
+	 * (if the image editor in PHP supports it).
+	 *
+	 * @param array $formats
+	 *
+	 * @return array
+	 */
+	public function image_editor_output_format_handler( $formats ) {
+		$formats['image/png'] = 'image/jpeg';
+		$formats['image/gif'] = 'image/jpeg';
+		$formats['image/pct'] = 'image/bmp';
+
+		return $formats;
+	}
+
 	/**
 	 * @dataProvider data_is_not_serialized
 	 */
@@ -1946,4 +2036,18 @@ public function data_test_wp_is_json_media_type() {
 			array( 'application/activity+json, application/nojson', true ),
 		);
 	}
+
+	/**
+	 * @ticket 53668
+	 */
+	public function test_wp_get_default_extension_for_mime_type() {
+		$this->assertEquals( 'jpg', wp_get_default_extension_for_mime_type( 'image/jpeg' ), 'jpg not returned as default extension for "image/jpeg"' );
+		$this->assertNotEquals( 'jpeg', wp_get_default_extension_for_mime_type( 'image/jpeg' ), 'jpeg should not be returned as default extension for "image/jpeg"' );
+		$this->assertEquals( 'png', wp_get_default_extension_for_mime_type( 'image/png' ), 'png not returned as default extension for "image/png"' );
+		$this->assertFalse( wp_get_default_extension_for_mime_type( 'wibble/wobble' ), 'false not returned for unrecognized mime type' );
+		$this->assertFalse( wp_get_default_extension_for_mime_type( '' ), 'false not returned when empty string as mime type supplied' );
+		$this->assertFalse( wp_get_default_extension_for_mime_type( '   ' ), 'false not returned when empty string as mime type supplied' );
+		$this->assertFalse( wp_get_default_extension_for_mime_type( 123 ), 'false not returned when int as mime type supplied' );
+		$this->assertFalse( wp_get_default_extension_for_mime_type( null ), 'false not returned when null as mime type supplied' );
+	}
 }

From efc83a98d9796064c3c3f8c249f6cdfc3ca6032f Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 24 Aug 2021 23:08:11 +0000
Subject: [PATCH 030/257] Docs: Clarify a comment in `WP_Upgrader::run()`.

This matches the `WP_Upgrader::download_package()` documentation more closely.

Follow-up to [11005], [30758], [33685].

See #53399.

git-svn-id: https://develop.svn.wordpress.org/trunk@51654 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-upgrader.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-upgrader.php b/src/wp-admin/includes/class-wp-upgrader.php
index 4cd0d9c5b1a95..7ef1e5352af71 100644
--- a/src/wp-admin/includes/class-wp-upgrader.php
+++ b/src/wp-admin/includes/class-wp-upgrader.php
@@ -378,7 +378,7 @@ protected function flatten_dirlist( $nested_files, $path = '' ) {
 	 *
 	 * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
 	 *
-	 * @param string $remote_destination The location on the remote filesystem to be cleared
+	 * @param string $remote_destination The location on the remote filesystem to be cleared.
 	 * @return bool|WP_Error True upon success, WP_Error on failure.
 	 */
 	public function clear_destination( $remote_destination ) {
@@ -563,7 +563,8 @@ public function install_package( $args = array() ) {
 			 *
 			 * @since 2.8.0
 			 *
-			 * @param true|WP_Error $removed            Whether the destination was cleared. true upon success, WP_Error on failure.
+			 * @param true|WP_Error $removed            Whether the destination was cleared.
+			 *                                          True upon success, WP_Error on failure.
 			 * @param string        $local_destination  The local package destination.
 			 * @param string        $remote_destination The remote package destination.
 			 * @param array         $hook_extra         Extra arguments passed to hooked filters.
@@ -736,8 +737,8 @@ public function run( $options ) {
 		}
 
 		/*
-		 * Download the package (Note, This just returns the filename
-		 * of the file if the package is a local file)
+		 * Download the package. Note: If the package is the full path
+		 * to an existing local file, it will be returned untouched.
 		 */
 		$download = $this->download_package( $options['package'], true, $options['hook_extra'] );
 
@@ -868,7 +869,7 @@ public function run( $options ) {
 	 *
 	 * @since 2.8.0
 	 *
-	 * @global WP_Filesystem_Base $wp_filesystem Subclass
+	 * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
 	 *
 	 * @param bool $enable True to enable maintenance mode, false to disable.
 	 */

From d87fa561ab761974a29c8fe7558fa5e22d5f4b1d Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 25 Aug 2021 14:38:12 +0000
Subject: [PATCH 031/257] Docs: Add missing `@since` tag for the
 `$check_signatures` parameter of `WP_Upgrader::run()`.

This matches the `WP_Upgrader::download_package()` documentation more closely.

Follow-up to [44954], [45262].

See #53399.

git-svn-id: https://develop.svn.wordpress.org/trunk@51655 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-upgrader.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/wp-admin/includes/class-wp-upgrader.php b/src/wp-admin/includes/class-wp-upgrader.php
index 7ef1e5352af71..72424cf407543 100644
--- a/src/wp-admin/includes/class-wp-upgrader.php
+++ b/src/wp-admin/includes/class-wp-upgrader.php
@@ -244,6 +244,7 @@ public function fs_connect( $directories = array(), $allow_relaxed_file_ownershi
 	 * Download a package.
 	 *
 	 * @since 2.8.0
+	 * @since 5.2.0 Added the `$check_signatures` parameter.
 	 * @since 5.5.0 Added the `$hook_extra` parameter.
 	 *
 	 * @param string $package          The URI of the package. If this is the full path to an

From e83a341cc082864edf69257fded43d70d8a27685 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 26 Aug 2021 12:57:08 +0000
Subject: [PATCH 032/257] Coding Standards: Use static closures when not using
 `$this`.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When a closure does not use `$this`, it can be made `static` for improved performance.

Static closures are supported in PHP since PHP 5.4. ​

Props jrf, hellofromTonya, swissspidy, SergeyBiryukov.
See #53359.

git-svn-id: https://develop.svn.wordpress.org/trunk@51657 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/edit-form-blocks.php                    |  2 +-
 src/wp-admin/includes/class-wp-community-events.php  |  2 +-
 .../includes/class-wp-site-health-auto-updates.php   |  2 +-
 src/wp-admin/includes/update-core.php                |  2 +-
 src/wp-admin/options-privacy.php                     |  2 +-
 src/wp-admin/privacy-policy-guide.php                |  2 +-
 .../classes/class-twentytwenty-customize.php         |  2 +-
 .../classes/class-twenty-twenty-one-customize.php    |  2 +-
 .../classes/class-twenty-twenty-one-dark-mode.php    |  6 +++---
 src/wp-includes/block-supports/duotone.php           |  2 +-
 src/wp-includes/block-supports/layout.php            |  2 +-
 src/wp-includes/block-template.php                   |  2 +-
 src/wp-includes/class-wp-theme-json.php              |  2 +-
 src/wp-includes/formatting.php                       |  4 ++--
 src/wp-includes/rest-api.php                         |  2 +-
 .../rest-api/endpoints/class-wp-rest-controller.php  |  2 +-
 .../endpoints/class-wp-rest-plugins-controller.php   |  4 ++--
 .../class-wp-rest-widget-types-controller.php        |  2 +-
 .../endpoints/class-wp-rest-widgets-controller.php   |  2 +-
 src/wp-includes/script-loader.php                    |  2 +-
 src/wp-includes/update.php                           |  2 +-
 src/wp-includes/user.php                             |  2 +-
 tests/phpunit/includes/abstract-testcase.php         |  4 ++--
 tests/phpunit/includes/plural-form-function.php      |  2 +-
 tests/phpunit/tests/actions/closures.php             |  4 ++--
 tests/phpunit/tests/admin/includesListTable.php      |  2 +-
 tests/phpunit/tests/block-template-utils.php         |  2 +-
 tests/phpunit/tests/blocks/context.php               |  8 ++++----
 tests/phpunit/tests/blocks/register.php              |  6 +++---
 tests/phpunit/tests/blocks/supportedStyles.php       |  2 +-
 tests/phpunit/tests/blocks/wpBlock.php               | 10 +++++-----
 tests/phpunit/tests/canonical.php                    |  2 +-
 tests/phpunit/tests/category/walkerCategory.php      |  2 +-
 tests/phpunit/tests/comment/commentsTemplate.php     |  4 ++--
 tests/phpunit/tests/cron.php                         |  8 ++++----
 .../phpunit/tests/dependencies/wpInlineScriptTag.php |  2 +-
 tests/phpunit/tests/dependencies/wpScriptTag.php     |  2 +-
 tests/phpunit/tests/https-detection.php              |  6 +++---
 tests/phpunit/tests/https-migration.php              |  4 ++--
 tests/phpunit/tests/image/intermediateSize.php       |  2 +-
 tests/phpunit/tests/l10n/loadScriptTextdomain.php    | 12 ++++++------
 tests/phpunit/tests/menu/walker-nav-menu.php         |  2 +-
 tests/phpunit/tests/post/revisions.php               |  6 +++---
 tests/phpunit/tests/post/walkerPage.php              |  2 +-
 .../rest-application-passwords-controller.php        |  2 +-
 .../rest-api/rest-block-renderer-controller.php      |  2 +-
 .../rest-api/rest-pattern-directory-controller.php   |  4 ++--
 .../phpunit/tests/rest-api/rest-post-meta-fields.php |  2 +-
 .../phpunit/tests/rest-api/rest-posts-controller.php |  4 ++--
 tests/phpunit/tests/rest-api/rest-request.php        |  8 ++++----
 tests/phpunit/tests/rest-api/rest-server.php         | 10 +++++-----
 .../tests/rest-api/rest-widget-types-controller.php  |  6 +++---
 .../tests/rest-api/rest-widgets-controller.php       |  4 ++--
 tests/phpunit/tests/robots.php                       |  2 +-
 54 files changed, 95 insertions(+), 95 deletions(-)

diff --git a/src/wp-admin/edit-form-blocks.php b/src/wp-admin/edit-form-blocks.php
index fa4b8a9dd17e6..7e335fa49b9cb 100644
--- a/src/wp-admin/edit-form-blocks.php
+++ b/src/wp-admin/edit-form-blocks.php
@@ -31,7 +31,7 @@
 // Default to is-fullscreen-mode to avoid jumps in the UI.
 add_filter(
 	'admin_body_class',
-	function( $classes ) {
+	static function( $classes ) {
 		return "$classes is-fullscreen-mode";
 	}
 );
diff --git a/src/wp-admin/includes/class-wp-community-events.php b/src/wp-admin/includes/class-wp-community-events.php
index 8ccf490e29a19..cf995eeac861b 100644
--- a/src/wp-admin/includes/class-wp-community-events.php
+++ b/src/wp-admin/includes/class-wp-community-events.php
@@ -474,7 +474,7 @@ protected function trim_events( array $events ) {
 
 		$future_wordcamps = array_filter(
 			$future_events,
-			function( $wordcamp ) {
+			static function( $wordcamp ) {
 				return 'wordcamp' === $wordcamp['type'];
 			}
 		);
diff --git a/src/wp-admin/includes/class-wp-site-health-auto-updates.php b/src/wp-admin/includes/class-wp-site-health-auto-updates.php
index d1c133524d6e2..4afaeac1c48b1 100644
--- a/src/wp-admin/includes/class-wp-site-health-auto-updates.php
+++ b/src/wp-admin/includes/class-wp-site-health-auto-updates.php
@@ -41,7 +41,7 @@ public function run_tests() {
 
 		$tests = array_filter( $tests );
 		$tests = array_map(
-			function( $test ) {
+			static function( $test ) {
 				$test = (object) $test;
 
 				if ( empty( $test->severity ) ) {
diff --git a/src/wp-admin/includes/update-core.php b/src/wp-admin/includes/update-core.php
index 77ede74c779fc..32664bf6ff306 100644
--- a/src/wp-admin/includes/update-core.php
+++ b/src/wp-admin/includes/update-core.php
@@ -1658,7 +1658,7 @@ function _upgrade_422_find_genericons_files_in_folder( $directory ) {
 	$dirs = glob( $directory . '*', GLOB_ONLYDIR );
 	$dirs = array_filter(
 		$dirs,
-		function( $dir ) {
+		static function( $dir ) {
 			// Skip any node_modules directories.
 			return false === strpos( $dir, 'node_modules' );
 		}
diff --git a/src/wp-admin/options-privacy.php b/src/wp-admin/options-privacy.php
index 3e4902daf4bf0..0b0ca77ee9e2f 100644
--- a/src/wp-admin/options-privacy.php
+++ b/src/wp-admin/options-privacy.php
@@ -20,7 +20,7 @@
 
 add_filter(
 	'admin_body_class',
-	function( $body_class ) {
+	static function( $body_class ) {
 		$body_class .= ' privacy-settings ';
 
 		return $body_class;
diff --git a/src/wp-admin/privacy-policy-guide.php b/src/wp-admin/privacy-policy-guide.php
index e5d558e639af2..6581bb412a621 100644
--- a/src/wp-admin/privacy-policy-guide.php
+++ b/src/wp-admin/privacy-policy-guide.php
@@ -19,7 +19,7 @@
 
 add_filter(
 	'admin_body_class',
-	function( $body_class ) {
+	static function( $body_class ) {
 		$body_class .= ' privacy-settings ';
 
 		return $body_class;
diff --git a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-customize.php b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-customize.php
index d41b494584a73..ca666df11d382 100644
--- a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-customize.php
+++ b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-customize.php
@@ -186,7 +186,7 @@ public static function register( $wp_customize ) {
 						'settings'        => 'accent_hue',
 						'description'     => __( 'Apply a custom color for links, buttons, featured images.', 'twentytwenty' ),
 						'mode'            => 'hue',
-						'active_callback' => function() use ( $wp_customize ) {
+						'active_callback' => static function() use ( $wp_customize ) {
 							return ( 'custom' === $wp_customize->get_setting( 'accent_hue_active' )->value() );
 						},
 					)
diff --git a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-customize.php b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-customize.php
index b880a03afbe32..4a0fe6f7af502 100644
--- a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-customize.php
+++ b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-customize.php
@@ -92,7 +92,7 @@ public function register( $wp_customize ) {
 				array(
 					'capability'        => 'edit_theme_options',
 					'default'           => 'excerpt',
-					'sanitize_callback' => function( $value ) {
+					'sanitize_callback' => static function( $value ) {
 						return 'excerpt' === $value || 'full' === $value ? $value : 'excerpt';
 					},
 				)
diff --git a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php
index 4034eaae25db4..4de201c1b92a6 100644
--- a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php
+++ b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php
@@ -153,7 +153,7 @@ public function customizer_controls( $wp_customize ) {
 				array(
 					'section'         => 'colors',
 					'priority'        => 100,
-					'active_callback' => function() {
+					'active_callback' => static function() {
 						return 127 >= Twenty_Twenty_One_Custom_Colors::get_relative_luminance_from_hex( get_theme_mod( 'background_color', 'D1E4DD' ) );
 					},
 				)
@@ -165,7 +165,7 @@ public function customizer_controls( $wp_customize ) {
 			array(
 				'capability'        => 'edit_theme_options',
 				'default'           => false,
-				'sanitize_callback' => function( $value ) {
+				'sanitize_callback' => static function( $value ) {
 					return (bool) $value;
 				},
 			)
@@ -188,7 +188,7 @@ public function customizer_controls( $wp_customize ) {
 				'label'           => esc_html__( 'Dark Mode support', 'twentytwentyone' ),
 				'priority'        => 110,
 				'description'     => $description,
-				'active_callback' => function( $value ) {
+				'active_callback' => static function( $value ) {
 					return 127 < Twenty_Twenty_One_Custom_Colors::get_relative_luminance_from_hex( get_theme_mod( 'background_color', 'D1E4DD' ) );
 				},
 			)
diff --git a/src/wp-includes/block-supports/duotone.php b/src/wp-includes/block-supports/duotone.php
index 3e81c33e07137..04aac0ef1e65a 100644
--- a/src/wp-includes/block-supports/duotone.php
+++ b/src/wp-includes/block-supports/duotone.php
@@ -361,7 +361,7 @@ function wp_render_duotone_support( $block_content, $block ) {
 
 	$selectors        = explode( ',', $duotone_support );
 	$selectors_scoped = array_map(
-		function ( $selector ) use ( $duotone_id ) {
+		static function ( $selector ) use ( $duotone_id ) {
 			return '.' . $duotone_id . ' ' . trim( $selector );
 		},
 		$selectors
diff --git a/src/wp-includes/block-supports/layout.php b/src/wp-includes/block-supports/layout.php
index 16e070a7d3d1c..be1da09899da3 100644
--- a/src/wp-includes/block-supports/layout.php
+++ b/src/wp-includes/block-supports/layout.php
@@ -131,7 +131,7 @@ function wp_restore_group_inner_container( $block_content, $block ) {
 	$replace_regex   = '/(^\s*<div\b[^>]*wp-block-group[^>]*>)(.*)(<\/div>\s*$)/ms';
 	$updated_content = preg_replace_callback(
 		$replace_regex,
-		function( $matches ) {
+		static function( $matches ) {
 			return $matches[1] . '<div class="wp-block-group__inner-container">' . $matches[2] . '</div>' . $matches[3];
 		},
 		$block_content
diff --git a/src/wp-includes/block-template.php b/src/wp-includes/block-template.php
index d745c0536a112..945b96b027422 100644
--- a/src/wp-includes/block-template.php
+++ b/src/wp-includes/block-template.php
@@ -124,7 +124,7 @@ function resolve_block_template( $template_type, $template_hierarchy ) {
 
 	usort(
 		$templates,
-		function ( $template_a, $template_b ) use ( $slug_priorities ) {
+		static function ( $template_a, $template_b ) use ( $slug_priorities ) {
 			return $slug_priorities[ $template_a->slug ] - $slug_priorities[ $template_b->slug ];
 		}
 	);
diff --git a/src/wp-includes/class-wp-theme-json.php b/src/wp-includes/class-wp-theme-json.php
index a35ee1b7958ad..d394bd3301cad 100644
--- a/src/wp-includes/class-wp-theme-json.php
+++ b/src/wp-includes/class-wp-theme-json.php
@@ -636,7 +636,7 @@ private static function to_ruleset( $selector, $declarations ) {
 
 		$declaration_block = array_reduce(
 			$declarations,
-			function ( $carry, $element ) {
+			static function ( $carry, $element ) {
 				return $carry .= $element['name'] . ': ' . $element['value'] . ';'; },
 			''
 		);
diff --git a/src/wp-includes/formatting.php b/src/wp-includes/formatting.php
index b80c40cdda601..4f01c511b03a6 100644
--- a/src/wp-includes/formatting.php
+++ b/src/wp-includes/formatting.php
@@ -3113,7 +3113,7 @@ function wp_rel_nofollow( $text ) {
 	$text = stripslashes( $text );
 	$text = preg_replace_callback(
 		'|<a (.+?)>|i',
-		function( $matches ) {
+		static function( $matches ) {
 			return wp_rel_callback( $matches, 'nofollow' );
 		},
 		$text
@@ -3147,7 +3147,7 @@ function wp_rel_ugc( $text ) {
 	$text = stripslashes( $text );
 	$text = preg_replace_callback(
 		'|<a (.+?)>|i',
-		function( $matches ) {
+		static function( $matches ) {
 			return wp_rel_callback( $matches, 'nofollow ugc' );
 		},
 		$text
diff --git a/src/wp-includes/rest-api.php b/src/wp-includes/rest-api.php
index 675c545ce18e6..fb83e38f4cb18 100644
--- a/src/wp-includes/rest-api.php
+++ b/src/wp-includes/rest-api.php
@@ -3227,7 +3227,7 @@ function rest_get_endpoint_args_for_schema( $schema, $method = WP_REST_Server::C
 function rest_convert_error_to_response( $error ) {
 	$status = array_reduce(
 		$error->get_all_error_data(),
-		function ( $status, $error_data ) {
+		static function ( $status, $error_data ) {
 			return is_array( $error_data ) && isset( $error_data['status'] ) ? $error_data['status'] : $status;
 		},
 		500
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php
index b1cb4be457456..b3f41c6a6a039 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php
@@ -597,7 +597,7 @@ public function get_fields_for_response( $request ) {
 		// Return the list of all requested fields which appear in the schema.
 		return array_reduce(
 			$requested_fields,
-			function( $response_fields, $field ) use ( $fields ) {
+			static function( $response_fields, $field ) use ( $fields ) {
 				if ( in_array( $field, $fields, true ) ) {
 					$response_fields[] = $field;
 					return $response_fields;
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-plugins-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-plugins-controller.php
index 3a7bf0ff95b32..4da8e7aa18d9a 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-plugins-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-plugins-controller.php
@@ -381,7 +381,7 @@ public function create_item( $request ) {
 		$installed_locales = apply_filters( 'plugins_update_check_locales', $installed_locales );
 
 		$language_packs = array_map(
-			function( $item ) {
+			static function( $item ) {
 				return (object) $item;
 			},
 			$api->language_packs
@@ -389,7 +389,7 @@ function( $item ) {
 
 		$language_packs = array_filter(
 			$language_packs,
-			function( $pack ) use ( $installed_locales ) {
+			static function( $pack ) use ( $installed_locales ) {
 				return in_array( $pack->language, $installed_locales, true );
 			}
 		);
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php
index db88950faa481..c137302f31aee 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php
@@ -85,7 +85,7 @@ public function register_routes() {
 					'form_data' => array(
 						'description'       => __( 'Serialized widget form data to encode into instance settings.' ),
 						'type'              => 'string',
-						'sanitize_callback' => function( $string ) {
+						'sanitize_callback' => static function( $string ) {
 							$array = array();
 							wp_parse_str( $string, $array );
 							return $array;
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-widgets-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-widgets-controller.php
index 3b425a6b8b640..4c54620f509fa 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-widgets-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-widgets-controller.php
@@ -792,7 +792,7 @@ public function get_item_schema() {
 					'type'        => 'string',
 					'context'     => array(),
 					'arg_options' => array(
-						'sanitize_callback' => function( $string ) {
+						'sanitize_callback' => static function( $string ) {
 							$array = array();
 							wp_parse_str( $string, $array );
 							return $array;
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index 1e2f1d5faeaa7..608e7936e3650 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -2692,7 +2692,7 @@ function wp_maybe_inline_styles() {
 		// Reorder styles array based on size.
 		usort(
 			$styles,
-			function( $a, $b ) {
+			static function( $a, $b ) {
 				return ( $a['size'] <= $b['size'] ) ? -1 : 1;
 			}
 		);
diff --git a/src/wp-includes/update.php b/src/wp-includes/update.php
index 79e3b3ea33d5b..85d0d4c9a86d0 100644
--- a/src/wp-includes/update.php
+++ b/src/wp-includes/update.php
@@ -517,7 +517,7 @@ function wp_update_plugins( $extra_stats = array() ) {
 		}
 	}
 
-	$sanitize_plugin_update_payload = function( &$item ) {
+	$sanitize_plugin_update_payload = static function( &$item ) {
 		$item = (object) $item;
 
 		unset( $item->translations, $item->compatibility );
diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php
index 7c1c2c1f5534c..94598e84935a3 100644
--- a/src/wp-includes/user.php
+++ b/src/wp-includes/user.php
@@ -3459,7 +3459,7 @@ function wp_user_personal_data_exporter( $email_address ) {
 		// Remove items that use reserved names.
 		$extra_data = array_filter(
 			$_extra_data,
-			function( $item ) use ( $reserved_names ) {
+			static function( $item ) use ( $reserved_names ) {
 				return ! in_array( $item['name'], $reserved_names, true );
 			}
 		);
diff --git a/tests/phpunit/includes/abstract-testcase.php b/tests/phpunit/includes/abstract-testcase.php
index be836f67075d0..744e3670e061e 100644
--- a/tests/phpunit/includes/abstract-testcase.php
+++ b/tests/phpunit/includes/abstract-testcase.php
@@ -719,14 +719,14 @@ public function assertDiscardWhitespace( $expected, $actual, $message = '' ) {
 	public function assertSameIgnoreEOL( $expected, $actual, $message = '' ) {
 		$expected = map_deep(
 			$expected,
-			function ( $value ) {
+			static function ( $value ) {
 				return str_replace( "\r\n", "\n", $value );
 			}
 		);
 
 		$actual = map_deep(
 			$actual,
-			function ( $value ) {
+			static function ( $value ) {
 				return str_replace( "\r\n", "\n", $value );
 			}
 		);
diff --git a/tests/phpunit/includes/plural-form-function.php b/tests/phpunit/includes/plural-form-function.php
index 714381339d15d..a5cdf703e3b91 100644
--- a/tests/phpunit/includes/plural-form-function.php
+++ b/tests/phpunit/includes/plural-form-function.php
@@ -7,7 +7,7 @@
  * @param string $expression
  */
 function tests_make_plural_form_function( $nplurals, $expression ) {
-	$closure = function ( $n ) use ( $nplurals, $expression ) {
+	$closure = static function ( $n ) use ( $nplurals, $expression ) {
 		$expression = str_replace( 'n', $n, $expression );
 
 		// phpcs:ignore Squiz.PHP.Eval -- This is test code, not production.
diff --git a/tests/phpunit/tests/actions/closures.php b/tests/phpunit/tests/actions/closures.php
index d1a458e273005..bd8b88d97fa14 100644
--- a/tests/phpunit/tests/actions/closures.php
+++ b/tests/phpunit/tests/actions/closures.php
@@ -12,7 +12,7 @@ class Tests_Actions_Closures extends WP_UnitTestCase {
 	 */
 	function test_action_closure() {
 		$tag     = 'test_action_closure';
-		$closure = function( $a, $b ) {
+		$closure = static function( $a, $b ) {
 			$GLOBALS[ $a ] = $b;
 		};
 		add_action( $tag, $closure, 10, 2 );
@@ -25,7 +25,7 @@ function test_action_closure() {
 		$this->assertSame( $GLOBALS[ $context[0] ], $context[1] );
 
 		$tag2     = 'test_action_closure_2';
-		$closure2 = function() {
+		$closure2 = static function() {
 			$GLOBALS['closure_no_args'] = true;
 		};
 		add_action( $tag2, $closure2 );
diff --git a/tests/phpunit/tests/admin/includesListTable.php b/tests/phpunit/tests/admin/includesListTable.php
index 014475b282551..ac2e153e2fb1c 100644
--- a/tests/phpunit/tests/admin/includesListTable.php
+++ b/tests/phpunit/tests/admin/includesListTable.php
@@ -360,7 +360,7 @@ public function test_bulk_action_menu_supports_options_and_optgroups() {
 
 		add_filter(
 			'bulk_actions-edit-comments',
-			function() {
+			static function() {
 				return array(
 					'delete'       => 'Delete',
 					'Change State' => array(
diff --git a/tests/phpunit/tests/block-template-utils.php b/tests/phpunit/tests/block-template-utils.php
index b528067dc4adc..c52c25a99fe78 100644
--- a/tests/phpunit/tests/block-template-utils.php
+++ b/tests/phpunit/tests/block-template-utils.php
@@ -70,7 +70,7 @@ function test_get_block_template_from_post() {
 	function test_get_block_templates() {
 		function get_template_ids( $templates ) {
 			return array_map(
-				function( $template ) {
+				static function( $template ) {
 					return $template->id;
 				},
 				$templates
diff --git a/tests/phpunit/tests/blocks/context.php b/tests/phpunit/tests/blocks/context.php
index b23b8da3ae66a..f39b378c65aa9 100644
--- a/tests/phpunit/tests/blocks/context.php
+++ b/tests/phpunit/tests/blocks/context.php
@@ -115,7 +115,7 @@ function test_provides_block_context() {
 					'gutenberg/contextWithAssigned',
 					'gutenberg/contextWithoutDefault',
 				),
-				'render_callback' => function( $attributes, $content, $block ) use ( &$provided_context ) {
+				'render_callback' => static function( $attributes, $content, $block ) use ( &$provided_context ) {
 					$provided_context[] = $block->context;
 
 					return '';
@@ -155,7 +155,7 @@ function test_provides_default_context() {
 			'gutenberg/test-context-consumer',
 			array(
 				'uses_context'    => array( 'postId', 'postType' ),
-				'render_callback' => function( $attributes, $content, $block ) use ( &$provided_context ) {
+				'render_callback' => static function( $attributes, $content, $block ) use ( &$provided_context ) {
 					$provided_context[] = $block->context;
 
 					return '';
@@ -188,7 +188,7 @@ function test_default_context_is_filterable() {
 			'gutenberg/test-context-consumer',
 			array(
 				'uses_context'    => array( 'example' ),
-				'render_callback' => function( $attributes, $content, $block ) use ( &$provided_context ) {
+				'render_callback' => static function( $attributes, $content, $block ) use ( &$provided_context ) {
 					$provided_context[] = $block->context;
 
 					return '';
@@ -196,7 +196,7 @@ function test_default_context_is_filterable() {
 			)
 		);
 
-		$filter_block_context = function( $context ) {
+		$filter_block_context = static function( $context ) {
 			$context['example'] = 'ok';
 			return $context;
 		};
diff --git a/tests/phpunit/tests/blocks/register.php b/tests/phpunit/tests/blocks/register.php
index 1f3104d09b3a6..ee98bca81b727 100644
--- a/tests/phpunit/tests/blocks/register.php
+++ b/tests/phpunit/tests/blocks/register.php
@@ -510,7 +510,7 @@ function test_has_blocks() {
 	 * @ticket 49615
 	 */
 	public function test_filter_block_registration() {
-		$filter_registration = function( $args, $name ) {
+		$filter_registration = static function( $args, $name ) {
 			$args['attributes'] = array( $name => array( 'type' => 'boolean' ) );
 			return $args;
 		};
@@ -528,7 +528,7 @@ public function test_filter_block_registration() {
 	 * @ticket 52138
 	 */
 	public function test_filter_block_registration_metadata() {
-		$filter_metadata_registration = function( $metadata ) {
+		$filter_metadata_registration = static function( $metadata ) {
 			$metadata['apiVersion'] = 3;
 			return $metadata;
 		};
@@ -546,7 +546,7 @@ public function test_filter_block_registration_metadata() {
 	 * @ticket 52138
 	 */
 	public function test_filter_block_registration_metadata_settings() {
-		$filter_metadata_registration = function( $settings, $metadata ) {
+		$filter_metadata_registration = static function( $settings, $metadata ) {
 			$settings['api_version'] = $metadata['apiVersion'] + 1;
 			return $settings;
 		};
diff --git a/tests/phpunit/tests/blocks/supportedStyles.php b/tests/phpunit/tests/blocks/supportedStyles.php
index b3e50800dd6c3..bdbf91aa2eb13 100644
--- a/tests/phpunit/tests/blocks/supportedStyles.php
+++ b/tests/phpunit/tests/blocks/supportedStyles.php
@@ -712,7 +712,7 @@ public function test_render_block_suppresses_warnings_without_at_suppression() {
 		// Custom error handler's see Warnings even if they are suppressed by the @ symbol.
 		$errors = array();
 		set_error_handler(
-			function ( $errno = 0, $errstr = '' ) use ( &$errors ) {
+			static function ( $errno = 0, $errstr = '' ) use ( &$errors ) {
 				$errors[] = $errstr;
 				return false;
 			}
diff --git a/tests/phpunit/tests/blocks/wpBlock.php b/tests/phpunit/tests/blocks/wpBlock.php
index a50fc7e878f94..e44a96d8b0ba7 100644
--- a/tests/phpunit/tests/blocks/wpBlock.php
+++ b/tests/phpunit/tests/blocks/wpBlock.php
@@ -275,7 +275,7 @@ function test_render_static_block_type_returns_own_content() {
 		$this->registry->register(
 			'core/dynamic',
 			array(
-				'render_callback' => function() {
+				'render_callback' => static function() {
 					return 'b';
 				},
 			)
@@ -296,7 +296,7 @@ function test_render_passes_block_for_render_callback() {
 		$this->registry->register(
 			'core/greeting',
 			array(
-				'render_callback' => function( $attributes, $content, $block ) {
+				'render_callback' => static function( $attributes, $content, $block ) {
 					return sprintf( 'Hello from %s', $block->name );
 				},
 			)
@@ -366,7 +366,7 @@ function test_passes_attributes_to_render_callback() {
 						'default' => '!',
 					),
 				),
-				'render_callback' => function( $block_attributes ) {
+				'render_callback' => static function( $block_attributes ) {
 					return sprintf(
 						'Hello %s%s',
 						$block_attributes['toWhom'],
@@ -391,7 +391,7 @@ function test_passes_content_to_render_callback() {
 		$this->registry->register(
 			'core/outer',
 			array(
-				'render_callback' => function( $block_attributes, $content ) {
+				'render_callback' => static function( $block_attributes, $content ) {
 					return $content;
 				},
 			)
@@ -399,7 +399,7 @@ function test_passes_content_to_render_callback() {
 		$this->registry->register(
 			'core/inner',
 			array(
-				'render_callback' => function() {
+				'render_callback' => static function() {
 					return 'b';
 				},
 			)
diff --git a/tests/phpunit/tests/canonical.php b/tests/phpunit/tests/canonical.php
index 3069ba840027d..d5198ee558d42 100644
--- a/tests/phpunit/tests/canonical.php
+++ b/tests/phpunit/tests/canonical.php
@@ -247,7 +247,7 @@ public function test_pre_redirect_guess_404_permalink() {
 		// Test short-circuit filter.
 		add_filter(
 			'pre_redirect_guess_404_permalink',
-			function() {
+			static function() {
 				return 'wp';
 			}
 		);
diff --git a/tests/phpunit/tests/category/walkerCategory.php b/tests/phpunit/tests/category/walkerCategory.php
index ac49a30216431..92d5c3f309136 100644
--- a/tests/phpunit/tests/category/walkerCategory.php
+++ b/tests/phpunit/tests/category/walkerCategory.php
@@ -38,7 +38,7 @@ public function test_start_el_with_empty_attributes( $value, $expected ) {
 
 		add_filter(
 			'category_list_link_attributes',
-			function( $atts ) use ( $value ) {
+			static function( $atts ) use ( $value ) {
 				$atts['data-test'] = $value;
 				return $atts;
 			}
diff --git a/tests/phpunit/tests/comment/commentsTemplate.php b/tests/phpunit/tests/comment/commentsTemplate.php
index c0cee5dc743db..7135118485a8a 100644
--- a/tests/phpunit/tests/comment/commentsTemplate.php
+++ b/tests/phpunit/tests/comment/commentsTemplate.php
@@ -993,7 +993,7 @@ public function test_comments_template_top_level_query_args( $expected, $query_a
 
 		add_filter(
 			'comments_template_query_args',
-			function ( $args ) use ( &$offset, $query_args ) {
+			static function ( $args ) use ( &$offset, $query_args ) {
 				$offset = $args['offset'];
 
 				return array_merge( $args, $query_args );
@@ -1003,7 +1003,7 @@ function ( $args ) use ( &$offset, $query_args ) {
 		if ( ! empty( $top_level_query_args ) ) {
 			add_filter(
 				'comments_template_top_level_query_args',
-				function ( $args ) use ( $top_level_query_args ) {
+				static function ( $args ) use ( $top_level_query_args ) {
 					return array_merge( $args, $top_level_query_args );
 				}
 			);
diff --git a/tests/phpunit/tests/cron.php b/tests/phpunit/tests/cron.php
index 9b9c475954caf..26453c01111d4 100644
--- a/tests/phpunit/tests/cron.php
+++ b/tests/phpunit/tests/cron.php
@@ -1055,7 +1055,7 @@ public function test_cron_array_error_is_returned_when_scheduling_single_event()
 		// Force update_option() to fail by setting the new value to match the existing:
 		add_filter(
 			'pre_update_option_cron',
-			function() {
+			static function() {
 				return get_option( 'cron' );
 			}
 		);
@@ -1075,7 +1075,7 @@ public function test_cron_array_error_is_returned_when_scheduling_event() {
 		// Force update_option() to fail by setting the new value to match the existing:
 		add_filter(
 			'pre_update_option_cron',
-			function() {
+			static function() {
 				return get_option( 'cron' );
 			}
 		);
@@ -1098,7 +1098,7 @@ public function test_cron_array_error_is_returned_when_unscheduling_hook() {
 		// Force update_option() to fail by setting the new value to match the existing:
 		add_filter(
 			'pre_update_option_cron',
-			function() {
+			static function() {
 				return get_option( 'cron' );
 			}
 		);
@@ -1122,7 +1122,7 @@ public function test_cron_array_error_is_returned_when_unscheduling_event() {
 		// Force update_option() to fail by setting the new value to match the existing:
 		add_filter(
 			'pre_update_option_cron',
-			function() {
+			static function() {
 				return get_option( 'cron' );
 			}
 		);
diff --git a/tests/phpunit/tests/dependencies/wpInlineScriptTag.php b/tests/phpunit/tests/dependencies/wpInlineScriptTag.php
index d2c2185d48470..1e517b637ddaf 100644
--- a/tests/phpunit/tests/dependencies/wpInlineScriptTag.php
+++ b/tests/phpunit/tests/dependencies/wpInlineScriptTag.php
@@ -80,7 +80,7 @@ public function test_get_inline_script_tag_unescaped_src() {
 	public function test_print_script_tag_prints_get_inline_script_tag() {
 		add_filter(
 			'wp_inline_script_attributes',
-			function ( $attributes ) {
+			static function ( $attributes ) {
 				if ( isset( $attributes['id'] ) && 'utils-js-extra' === $attributes['id'] ) {
 					$attributes['async'] = true;
 				}
diff --git a/tests/phpunit/tests/dependencies/wpScriptTag.php b/tests/phpunit/tests/dependencies/wpScriptTag.php
index ba80c8cabfbbc..f009bb5790c55 100644
--- a/tests/phpunit/tests/dependencies/wpScriptTag.php
+++ b/tests/phpunit/tests/dependencies/wpScriptTag.php
@@ -64,7 +64,7 @@ function test_get_script_tag_type_not_set() {
 	function test_print_script_tag_prints_get_script_tag() {
 		add_filter(
 			'wp_script_attributes',
-			function ( $attributes ) {
+			static function ( $attributes ) {
 				if ( isset( $attributes['id'] ) && 'utils-js-extra' === $attributes['id'] ) {
 					$attributes['async'] = true;
 				}
diff --git a/tests/phpunit/tests/https-detection.php b/tests/phpunit/tests/https-detection.php
index 6ed466af6a191..1ae5af13091e1 100644
--- a/tests/phpunit/tests/https-detection.php
+++ b/tests/phpunit/tests/https-detection.php
@@ -117,7 +117,7 @@ public function test_pre_wp_update_https_detection_errors() {
 		// Override to enforce no errors being detected.
 		add_filter(
 			'pre_wp_update_https_detection_errors',
-			function() {
+			static function() {
 				return new WP_Error();
 			}
 		);
@@ -127,7 +127,7 @@ function() {
 		// Override to enforce an error being detected.
 		add_filter(
 			'pre_wp_update_https_detection_errors',
-			function() {
+			static function() {
 				return new WP_Error(
 					'ssl_verification_failed',
 					'Bad SSL certificate.'
@@ -345,7 +345,7 @@ private function get_sample_html_string( $head_tag = '' ) {
 	 * @return callable Filter callback.
 	 */
 	private function filter_set_url_scheme( $scheme ) {
-		return function( $url ) use ( $scheme ) {
+		return static function( $url ) use ( $scheme ) {
 			return set_url_scheme( $url, $scheme );
 		};
 	}
diff --git a/tests/phpunit/tests/https-migration.php b/tests/phpunit/tests/https-migration.php
index dccf40b602855..d06e1f0fba053 100644
--- a/tests/phpunit/tests/https-migration.php
+++ b/tests/phpunit/tests/https-migration.php
@@ -161,7 +161,7 @@ public function test_wp_should_replace_insecure_home_url_integration() {
 	private function force_wp_is_using_https( $enabled ) {
 		$scheme = $enabled ? 'https' : 'http';
 
-		$replace_scheme = function( $url ) use ( $scheme ) {
+		$replace_scheme = static function( $url ) use ( $scheme ) {
 			return str_replace( array( 'http://', 'https://' ), $scheme . '://', $url );
 		};
 
@@ -172,7 +172,7 @@ private function force_wp_is_using_https( $enabled ) {
 	private function force_option( $option, $value ) {
 		add_filter(
 			"option_$option",
-			function() use ( $value ) {
+			static function() use ( $value ) {
 				return $value;
 			}
 		);
diff --git a/tests/phpunit/tests/image/intermediateSize.php b/tests/phpunit/tests/image/intermediateSize.php
index d2098c49e12bb..cf5b3888fed93 100644
--- a/tests/phpunit/tests/image/intermediateSize.php
+++ b/tests/phpunit/tests/image/intermediateSize.php
@@ -69,7 +69,7 @@ function test_make_intermediate_size_successful() {
 	function test_image_editor_output_format_filter() {
 		add_filter(
 			'image_editor_output_format',
-			function() {
+			static function() {
 				return array( 'image/jpeg' => 'image/webp' );
 			}
 		);
diff --git a/tests/phpunit/tests/l10n/loadScriptTextdomain.php b/tests/phpunit/tests/l10n/loadScriptTextdomain.php
index b9b6ef0c3f705..0cce2a1f2e02c 100644
--- a/tests/phpunit/tests/l10n/loadScriptTextdomain.php
+++ b/tests/phpunit/tests/l10n/loadScriptTextdomain.php
@@ -49,7 +49,7 @@ public function data_test_resolve_relative_path() {
 				'default',
 				array(
 					'site_url',
-					function ( $site_url ) {
+					static function ( $site_url ) {
 						return $site_url . '/wp';
 					},
 				),
@@ -62,7 +62,7 @@ function ( $site_url ) {
 				'internationalized-plugin',
 				array(
 					'plugins_url',
-					function () {
+					static function () {
 						return 'https://plugins.example.com';
 					},
 				),
@@ -75,7 +75,7 @@ function () {
 				'internationalized-plugin',
 				array(
 					'content_url',
-					function () {
+					static function () {
 						return 'https://content.example.com';
 					},
 				),
@@ -88,7 +88,7 @@ function () {
 				'internationalized-plugin',
 				array(
 					'content_url',
-					function () {
+					static function () {
 						return '/';
 					},
 				),
@@ -101,7 +101,7 @@ function () {
 				'internationalized-plugin',
 				array(
 					'plugins_url',
-					function () {
+					static function () {
 						return '/';
 					},
 				),
@@ -114,7 +114,7 @@ function () {
 				'default',
 				array(
 					'site_url',
-					function () {
+					static function () {
 						return '/wp';
 					},
 				),
diff --git a/tests/phpunit/tests/menu/walker-nav-menu.php b/tests/phpunit/tests/menu/walker-nav-menu.php
index 83523644e5371..1811284b50b7e 100644
--- a/tests/phpunit/tests/menu/walker-nav-menu.php
+++ b/tests/phpunit/tests/menu/walker-nav-menu.php
@@ -94,7 +94,7 @@ public function test_start_el_with_empty_attributes( $value, $expected ) {
 
 		add_filter(
 			'nav_menu_link_attributes',
-			function( $atts ) use ( $value ) {
+			static function( $atts ) use ( $value ) {
 				$atts['data-test'] = $value;
 				return $atts;
 			}
diff --git a/tests/phpunit/tests/post/revisions.php b/tests/phpunit/tests/post/revisions.php
index 3e0899ca999d1..840597c4a9abb 100644
--- a/tests/phpunit/tests/post/revisions.php
+++ b/tests/phpunit/tests/post/revisions.php
@@ -594,7 +594,7 @@ public function test_wp_revisions_to_keep_filter() {
 
 		add_filter(
 			'wp_revisions_to_keep',
-			function () use ( $expected ) {
+			static function () use ( $expected ) {
 				return $expected;
 			}
 		);
@@ -619,7 +619,7 @@ public function test_wp_post_type_revisions_to_keep_filter() {
 
 		add_filter(
 			'wp_revisions_to_keep',
-			function () use ( $generic ) {
+			static function () use ( $generic ) {
 				return $generic;
 			}
 		);
@@ -630,7 +630,7 @@ function () use ( $generic ) {
 
 		add_filter(
 			"wp_{$post->post_type}_revisions_to_keep",
-			function () use ( $expected ) {
+			static function () use ( $expected ) {
 				return $expected;
 			}
 		);
diff --git a/tests/phpunit/tests/post/walkerPage.php b/tests/phpunit/tests/post/walkerPage.php
index f0ad198d78998..6b71bb021667b 100644
--- a/tests/phpunit/tests/post/walkerPage.php
+++ b/tests/phpunit/tests/post/walkerPage.php
@@ -33,7 +33,7 @@ public function test_start_el_with_empty_attributes( $value, $expected ) {
 
 		add_filter(
 			'page_menu_link_attributes',
-			function( $atts ) use ( $value ) {
+			static function( $atts ) use ( $value ) {
 				$atts['data-test'] = $value;
 				return $atts;
 			}
diff --git a/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php b/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php
index ac07737b4d796..cbfe965fa1a3e 100644
--- a/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php
@@ -937,7 +937,7 @@ public function test_introspect_item_password_invalid() {
 		$this->setup_app_password_authenticated_request();
 		add_action(
 			'application_password_did_authenticate',
-			function() {
+			static function() {
 				$GLOBALS['wp_rest_application_password_uuid'] = 'invalid_uuid';
 			}
 		);
diff --git a/tests/phpunit/tests/rest-api/rest-block-renderer-controller.php b/tests/phpunit/tests/rest-api/rest-block-renderer-controller.php
index 6d76a2f5d69ba..454bc6da35e13 100644
--- a/tests/phpunit/tests/rest-api/rest-block-renderer-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-block-renderer-controller.php
@@ -435,7 +435,7 @@ public function test_get_item() {
 	public function test_get_item_with_pre_render_block_filter() {
 		wp_set_current_user( self::$user_id );
 
-		$pre_render_filter = function( $output, $block ) {
+		$pre_render_filter = static function( $output, $block ) {
 			if ( $block['blockName'] === self::$block_name ) {
 				return '<p>Alternate content.</p>';
 			}
diff --git a/tests/phpunit/tests/rest-api/rest-pattern-directory-controller.php b/tests/phpunit/tests/rest-api/rest-pattern-directory-controller.php
index c21ba712f6310..4a12e663b5392 100644
--- a/tests/phpunit/tests/rest-api/rest-pattern-directory-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-pattern-directory-controller.php
@@ -272,7 +272,7 @@ public function test_get_items_prepare_filter() {
 		// Test that filter changes uncached values.
 		add_filter(
 			'rest_prepare_block_pattern',
-			function( $response ) {
+			static function( $response ) {
 				return 'initial value';
 			}
 		);
@@ -286,7 +286,7 @@ function( $response ) {
 		// Test that filter changes cached values (the previous request primed the cache).
 		add_filter(
 			'rest_prepare_block_pattern',
-			function( $response ) {
+			static function( $response ) {
 				return 'modified the cache';
 			},
 			11
diff --git a/tests/phpunit/tests/rest-api/rest-post-meta-fields.php b/tests/phpunit/tests/rest-api/rest-post-meta-fields.php
index 1e506c282aaef..85671eff54981 100644
--- a/tests/phpunit/tests/rest-api/rest-post-meta-fields.php
+++ b/tests/phpunit/tests/rest-api/rest-post-meta-fields.php
@@ -2708,7 +2708,7 @@ public function test_boolean_meta_update_to_false_stores_0() {
 				'single'            => true,
 				'type'              => 'boolean',
 				'show_in_rest'      => true,
-				'sanitize_callback' => function( $value ) {
+				'sanitize_callback' => static function( $value ) {
 					return $value ? '1' : '0';
 				},
 			)
diff --git a/tests/phpunit/tests/rest-api/rest-posts-controller.php b/tests/phpunit/tests/rest-api/rest-posts-controller.php
index ba6dc53c0b2d3..b35921a73db19 100644
--- a/tests/phpunit/tests/rest-api/rest-posts-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-posts-controller.php
@@ -2137,7 +2137,7 @@ public function test_prepare_item_limit_fields() {
 	 */
 	public function test_prepare_item_filters_content_when_needed() {
 		$filter_count   = 0;
-		$filter_content = function() use ( &$filter_count ) {
+		$filter_content = static function() use ( &$filter_count ) {
 			$filter_count++;
 			return '<p>Filtered content.</p>';
 		};
@@ -2173,7 +2173,7 @@ public function test_prepare_item_filters_content_when_needed() {
 	 */
 	public function test_prepare_item_skips_content_filter_if_not_needed() {
 		$filter_count   = 0;
-		$filter_content = function() use ( &$filter_count ) {
+		$filter_content = static function() use ( &$filter_count ) {
 			$filter_count++;
 			return '<p>Filtered content.</p>';
 		};
diff --git a/tests/phpunit/tests/rest-api/rest-request.php b/tests/phpunit/tests/rest-api/rest-request.php
index 55b3b188d017c..836cb6159dbfe 100644
--- a/tests/phpunit/tests/rest-api/rest-request.php
+++ b/tests/phpunit/tests/rest-api/rest-request.php
@@ -475,7 +475,7 @@ public function test_sanitize_params_error_multiple_messages() {
 			array(
 				'args' => array(
 					'failparam' => array(
-						'sanitize_callback' => function () {
+						'sanitize_callback' => static function () {
 							$error = new WP_Error( 'invalid', 'Invalid.' );
 							$error->add( 'invalid', 'Super Invalid.' );
 							$error->add( 'broken', 'Broken.' );
@@ -510,7 +510,7 @@ public function test_sanitize_params_provides_detailed_errors() {
 			array(
 				'args' => array(
 					'failparam' => array(
-						'sanitize_callback' => function () {
+						'sanitize_callback' => static function () {
 							return new WP_Error( 'invalid', 'Invalid.', 'mydata' );
 						},
 					),
@@ -738,7 +738,7 @@ public function test_invalid_params_error_multiple_messages() {
 			array(
 				'args' => array(
 					'failparam' => array(
-						'validate_callback' => function () {
+						'validate_callback' => static function () {
 							$error = new WP_Error( 'invalid', 'Invalid.' );
 							$error->add( 'invalid', 'Super Invalid.' );
 							$error->add( 'broken', 'Broken.' );
@@ -773,7 +773,7 @@ public function test_invalid_params_provides_detailed_errors() {
 			array(
 				'args' => array(
 					'failparam' => array(
-						'validate_callback' => function () {
+						'validate_callback' => static function () {
 							return new WP_Error( 'invalid', 'Invalid.', 'mydata' );
 						},
 					),
diff --git a/tests/phpunit/tests/rest-api/rest-server.php b/tests/phpunit/tests/rest-api/rest-server.php
index 3c1e4107edb92..03d1cf21faf19 100644
--- a/tests/phpunit/tests/rest-api/rest-server.php
+++ b/tests/phpunit/tests/rest-api/rest-server.php
@@ -1392,7 +1392,7 @@ public function test_does_not_echo_body_for_null_responses() {
 			'/test',
 			array(
 				'methods'             => array( 'GET' ),
-				'callback'            => function () {
+				'callback'            => static function () {
 					return new WP_REST_Response();
 				},
 				'permission_callback' => '__return_true',
@@ -1414,7 +1414,7 @@ public function test_does_not_echo_body_for_responses_with_204_status() {
 			'/test',
 			array(
 				'methods'             => array( 'GET' ),
-				'callback'            => function () {
+				'callback'            => static function () {
 					return new WP_REST_Response( 'data', 204 );
 				},
 				'permission_callback' => '__return_true',
@@ -1505,7 +1505,7 @@ public function test_get_routes_no_namespace_overriding() {
 			'/test',
 			array(
 				'methods'             => array( 'GET' ),
-				'callback'            => function() {
+				'callback'            => static function() {
 					return new WP_REST_Response( 'data', 204 );
 				},
 				'permission_callback' => '__return_true',
@@ -1516,7 +1516,7 @@ public function test_get_routes_no_namespace_overriding() {
 			'/test',
 			array(
 				'methods'             => array( 'GET' ),
-				'callback'            => function() {
+				'callback'            => static function() {
 					return new WP_REST_Response( 'data', 204 );
 				},
 				'permission_callback' => '__return_true',
@@ -1928,7 +1928,7 @@ static function() {
 			'/test/(?P<id>[\d+])',
 			array(
 				'methods'             => array( 'POST', 'DELETE' ),
-				'callback'            => function ( WP_REST_Request $request ) {
+				'callback'            => static function ( WP_REST_Request $request ) {
 					return new WP_REST_Response( 'test' );
 				},
 				'permission_callback' => '__return_true',
diff --git a/tests/phpunit/tests/rest-api/rest-widget-types-controller.php b/tests/phpunit/tests/rest-api/rest-widget-types-controller.php
index cd84b91c488bf..fd0b3007ec3b5 100644
--- a/tests/phpunit/tests/rest-api/rest-widget-types-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-widget-types-controller.php
@@ -149,7 +149,7 @@ public function test_get_items_removes_duplicates() {
 		$data         = $response->get_data();
 		$text_widgets = array_filter(
 			$data,
-			function( $widget ) {
+			static function( $widget ) {
 				return 'text' === $widget['id'];
 			}
 		);
@@ -177,7 +177,7 @@ public function test_get_widget_legacy() {
 		wp_register_sidebar_widget(
 			$widget_id,
 			'WP legacy widget',
-			function() {}
+			static function() {}
 		);
 		wp_set_current_user( self::$admin_id );
 		$request     = new WP_REST_Request( 'GET', '/wp/v2/widget-types/' . $widget_id );
@@ -208,7 +208,7 @@ public function test_get_widgets_decodes_html_entities() {
 		wp_register_sidebar_widget(
 			$widget_id,
 			'&#8216;Legacy &#8209; Archive &#8209; Widget&#8217;',
-			function() {},
+			static function() {},
 			array(
 				'description' => '&#8220;A great &amp; interesting archive of your site&#8217;s posts!&#8221;',
 			)
diff --git a/tests/phpunit/tests/rest-api/rest-widgets-controller.php b/tests/phpunit/tests/rest-api/rest-widgets-controller.php
index 66f14739b92f3..a44512cf5ab94 100644
--- a/tests/phpunit/tests/rest-api/rest-widgets-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-widgets-controller.php
@@ -108,7 +108,7 @@ public function set_up() {
 		wp_register_widget_control(
 			'testwidget',
 			'WP test widget',
-			function () {
+			static function () {
 				$settings = get_option( 'widget_testwidget' );
 
 				// check if anything's been sent.
@@ -127,7 +127,7 @@ function () {
 		wp_register_sidebar_widget(
 			'testwidget',
 			'WP test widget',
-			function () {
+			static function () {
 				$settings = wp_parse_args(
 					get_option( 'widget_testwidget' ),
 					array(
diff --git a/tests/phpunit/tests/robots.php b/tests/phpunit/tests/robots.php
index 9d71480af2265..60da725e75e66 100644
--- a/tests/phpunit/tests/robots.php
+++ b/tests/phpunit/tests/robots.php
@@ -43,7 +43,7 @@ public function test_wp_robots_renders_when_relevant() {
 	public function test_wp_robots_parses_directives_correctly() {
 		add_filter(
 			'wp_robots',
-			function( array $robots ) {
+			static function( array $robots ) {
 				// Directives that should have values must use strings.
 				$robots['directive-with-value']         = 'yes';
 				$robots['directive-with-numeric-value'] = '1';

From 4e682f09107c3a5a57777ed2bfe37103c709d987 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 26 Aug 2021 13:19:17 +0000
Subject: [PATCH 033/257] Coding Standards: Update the config for
 `WordPress.PHP.NoSilencedErrors` in PHPCS ruleset.

Follow-up to [45611].

Props jrf, hellofromTonya.
See #53359.

git-svn-id: https://develop.svn.wordpress.org/trunk@51658 602fd350-edb4-49c9-b593-d223f7449a82
---
 phpcs.xml.dist | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index a5b2efb9e8278..7ec2dc48ff920 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -286,6 +286,7 @@
 				<element value="gzinflate"/>
 				<element value="gzuncompress"/>
 				<element value="gzdecode"/>
+				<element value="imagecreatefromwebp"/>
 			</property>
 		</properties>
 	</rule>

From e5e2b86a6a0b24603a5870b707e8477a6ac7d7d4 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 26 Aug 2021 13:35:16 +0000
Subject: [PATCH 034/257] Coding Standards: Update the config for
 `WordPress.PHP.FileName` in PHPCS ruleset.

The WPCS sniff already takes the test classes in the `tests/phpunit/includes` directory into account.

Only the test cases outside of that directory, i.e. in the `tests/phpunit/tests` directory need to be listed here.

Includes alphabetizing the list.

Follow-up to [42346], [45607].

Props jrf, hellofromTonya, SergeyBiryukov.
See #53359.

git-svn-id: https://develop.svn.wordpress.org/trunk@51659 602fd350-edb4-49c9-b593-d223f7449a82
---
 phpcs.xml.dist | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 7ec2dc48ff920..dedf053d632aa 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -231,23 +231,18 @@
 	<rule ref="WordPress.Files.FileName">
 		<properties>
 			<property name="custom_test_class_whitelist" type="array">
-				<!-- Test case parent classes. -->
+				<!-- Test case parent classes in the "includes" folder, not yet accounted for in WPCS. -->
 				<element value="PHPUnit_Adapter_TestCase"/>
-				<element value="WP_UnitTestCase"/>
-				<element value="WP_Ajax_UnitTestCase"/>
-				<element value="WP_Canonical_UnitTestCase"/>
-				<element value="WP_Test_REST_TestCase"/>
-				<element value="WP_Test_REST_Controller_Testcase"/>
-				<element value="WP_Test_REST_Post_Type_Controller_Testcase"/>
-				<element value="WP_XMLRPC_UnitTestCase"/>
+				<element value="WP_Test_XML_TestCase"/>
+
+				<!-- Test case parent classes outside of the "includes" folder. -->
+				<element value="Tests_Query_Conditionals"/>
 				<element value="WP_Filesystem_UnitTestCase"/>
-				<element value="WP_Image_UnitTestCase"/>
 				<element value="WP_HTTP_UnitTestCase"/>
-				<element value="WP_Tests_Image_Resize_UnitTestCase"/>
+				<element value="WP_Image_UnitTestCase"/>
 				<element value="WP_Import_UnitTestCase"/>
-				<element value="Tests_Query_Conditionals"/>
-				<element value="WP_Test_XML_TestCase"/>
 				<element value="WP_Test_Adjacent_Image_Link_TestCase"/>
+				<element value="WP_Tests_Image_Resize_UnitTestCase"/>
 
 				<!-- Mock classes. -->
 				<element value="Spy_REST_Server"/>

From ab0e915f4031873458de6cbb6d4cff23401c588d Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 26 Aug 2021 13:49:30 +0000
Subject: [PATCH 035/257] Coding Standards: Remove redundant ignore annotation
 in `populate_options()`.

Follow-up to [43627], [43628].

Props jrf, hellofromTonya.
See #53359.

git-svn-id: https://develop.svn.wordpress.org/trunk@51660 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/schema.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-admin/includes/schema.php b/src/wp-admin/includes/schema.php
index 8b1e56f3af9e6..1bb2c27c45362 100644
--- a/src/wp-admin/includes/schema.php
+++ b/src/wp-admin/includes/schema.php
@@ -390,7 +390,7 @@ function populate_options( array $options = array() ) {
 	 * or a valid timezone string (America/New_York). See https://www.php.net/manual/en/timezones.php
 	 * for all timezone strings supported by PHP.
 	 */
-	$offset_or_tz = _x( '0', 'default GMT offset or timezone string' ); // phpcs:ignore WordPress.WP.I18n.NoEmptyStrings
+	$offset_or_tz = _x( '0', 'default GMT offset or timezone string' );
 	if ( is_numeric( $offset_or_tz ) ) {
 		$gmt_offset = $offset_or_tz;
 	} elseif ( $offset_or_tz && in_array( $offset_or_tz, timezone_identifiers_list(), true ) ) {

From a653725b56e7847394a397c8c2f5b6c4b125ea13 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 26 Aug 2021 13:58:32 +0000
Subject: [PATCH 036/257] Coding Standards: Make `ignore` annotation more
 specific in `WP_Site_Health_Auto_Updates::test_vcs_abspath()`.

Follow-up to [44986].

Props jrf, hellofromTonya.
See #53359.

git-svn-id: https://develop.svn.wordpress.org/trunk@51661 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-site-health-auto-updates.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-admin/includes/class-wp-site-health-auto-updates.php b/src/wp-admin/includes/class-wp-site-health-auto-updates.php
index 4afaeac1c48b1..fefdd6f229236 100644
--- a/src/wp-admin/includes/class-wp-site-health-auto-updates.php
+++ b/src/wp-admin/includes/class-wp-site-health-auto-updates.php
@@ -226,7 +226,7 @@ public function test_vcs_abspath() {
 		// Search all directories we've found for evidence of version control.
 		foreach ( $vcs_dirs as $vcs_dir ) {
 			foreach ( $check_dirs as $check_dir ) {
-				// phpcs:ignore
+				// phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition,Squiz.PHP.DisallowMultipleAssignments
 				if ( $checkout = @is_dir( rtrim( $check_dir, '\\/' ) . "/$vcs_dir" ) ) {
 					break 2;
 				}

From 29c57941ff80d7bce059ce28dd5c81d89af4b593 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 26 Aug 2021 14:04:55 +0000
Subject: [PATCH 037/257] Coding Standards: Fix indentation and remove `ignore`
 annotation in `wp_privacy_send_personal_data_export_email()`.

Follow-up to [51129], [51410].

Props jrf, hellofromTonya.
See #53359.

git-svn-id: https://develop.svn.wordpress.org/trunk@51662 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/privacy-tools.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/wp-admin/includes/privacy-tools.php b/src/wp-admin/includes/privacy-tools.php
index ec2caa8aefc62..8b78752a85faa 100644
--- a/src/wp-admin/includes/privacy-tools.php
+++ b/src/wp-admin/includes/privacy-tools.php
@@ -662,8 +662,7 @@ function wp_privacy_send_personal_data_export_email( $request_id ) {
 
 	/* translators: Do not translate EXPIRATION, LINK, SITENAME, SITEURL: those are placeholders. */
 	$email_text = __(
-// phpcs:ignore Generic.WhiteSpace.ScopeIndent.Incorrect, PEAR.Functions.FunctionCallSignature.Indent
-'Howdy,
+		'Howdy,
 
 Your request for an export of personal data has been completed. You may
 download your personal data by clicking on the link below. For privacy

From 927bc80b92d8e4980e3b4defab638a488329d908 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Thu, 26 Aug 2021 15:54:29 +0000
Subject: [PATCH 038/257] Tests: Move `wp_list_pluck()` tests to their own
 file.

The tests were partially duplicated in two separate files.

Follow-up to [431/tests], [28900], [38928], [42527].

See #53363, #53987.

git-svn-id: https://develop.svn.wordpress.org/trunk@51663 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../phpunit/tests/functions/wpListFilter.php  | 154 +-------
 tests/phpunit/tests/functions/wpListPluck.php | 353 ++++++++++++++++++
 2 files changed, 354 insertions(+), 153 deletions(-)
 create mode 100644 tests/phpunit/tests/functions/wpListPluck.php

diff --git a/tests/phpunit/tests/functions/wpListFilter.php b/tests/phpunit/tests/functions/wpListFilter.php
index b79837bf162bb..5a689ef47c75d 100644
--- a/tests/phpunit/tests/functions/wpListFilter.php
+++ b/tests/phpunit/tests/functions/wpListFilter.php
@@ -1,11 +1,10 @@
 <?php
 
 /**
- * Test wp_filter_object_list(), wp_list_filter(), wp_list_pluck().
+ * Test wp_filter_object_list().
  *
  * @group functions.php
  * @covers ::wp_filter_object_list
- * @covers ::wp_list_pluck
  */
 class Tests_Functions_wpListFilter extends WP_UnitTestCase {
 	public $object_list = array();
@@ -135,157 +134,6 @@ function test_filter_object_list_not_field() {
 		$this->assertSame( array( 'baz' => 'baz' ), $list );
 	}
 
-	function test_wp_list_pluck() {
-		$list = wp_list_pluck( $this->object_list, 'name' );
-		$this->assertSame(
-			array(
-				'foo' => 'foo',
-				'bar' => 'bar',
-				'baz' => 'baz',
-			),
-			$list
-		);
-
-		$list = wp_list_pluck( $this->array_list, 'name' );
-		$this->assertSame(
-			array(
-				'foo' => 'foo',
-				'bar' => 'bar',
-				'baz' => 'baz',
-			),
-			$list
-		);
-	}
-
-	/**
-	 * @ticket 28666
-	 */
-	function test_wp_list_pluck_index_key() {
-		$list = wp_list_pluck( $this->array_list, 'name', 'id' );
-		$this->assertSame(
-			array(
-				'f' => 'foo',
-				'b' => 'bar',
-				'z' => 'baz',
-			),
-			$list
-		);
-	}
-
-	/**
-	 * @ticket 28666
-	 */
-	function test_wp_list_pluck_object_index_key() {
-		$list = wp_list_pluck( $this->object_list, 'name', 'id' );
-		$this->assertSame(
-			array(
-				'f' => 'foo',
-				'b' => 'bar',
-				'z' => 'baz',
-			),
-			$list
-		);
-	}
-
-	/**
-	 * @ticket 28666
-	 */
-	function test_wp_list_pluck_missing_index_key() {
-		$list = wp_list_pluck( $this->array_list, 'name', 'nonexistent' );
-		$this->assertSame(
-			array(
-				0 => 'foo',
-				1 => 'bar',
-				2 => 'baz',
-			),
-			$list
-		);
-	}
-
-	/**
-	 * @ticket 28666
-	 */
-	function test_wp_list_pluck_partial_missing_index_key() {
-		$array_list = $this->array_list;
-		unset( $array_list['bar']['id'] );
-		$list = wp_list_pluck( $array_list, 'name', 'id' );
-		$this->assertSame(
-			array(
-				'f' => 'foo',
-				0   => 'bar',
-				'z' => 'baz',
-			),
-			$list
-		);
-	}
-
-	/**
-	 * @ticket 28666
-	 */
-	function test_wp_list_pluck_mixed_index_key() {
-		$mixed_list        = $this->array_list;
-		$mixed_list['bar'] = (object) $mixed_list['bar'];
-		$list              = wp_list_pluck( $mixed_list, 'name', 'id' );
-		$this->assertSame(
-			array(
-				'f' => 'foo',
-				'b' => 'bar',
-				'z' => 'baz',
-			),
-			$list
-		);
-	}
-
-	/**
-	 * @ticket 16895
-	 */
-	function test_wp_list_pluck_containing_references() {
-		$ref_list = array(
-			& $this->object_list['foo'],
-			& $this->object_list['bar'],
-		);
-
-		$this->assertInstanceOf( 'stdClass', $ref_list[0] );
-		$this->assertInstanceOf( 'stdClass', $ref_list[1] );
-
-		$list = wp_list_pluck( $ref_list, 'name' );
-		$this->assertSame(
-			array(
-				'foo',
-				'bar',
-			),
-			$list
-		);
-
-		$this->assertInstanceOf( 'stdClass', $ref_list[0] );
-		$this->assertInstanceOf( 'stdClass', $ref_list[1] );
-	}
-
-	/**
-	 * @ticket 16895
-	 */
-	function test_wp_list_pluck_containing_references_keys() {
-		$ref_list = array(
-			& $this->object_list['foo'],
-			& $this->object_list['bar'],
-		);
-
-		$this->assertInstanceOf( 'stdClass', $ref_list[0] );
-		$this->assertInstanceOf( 'stdClass', $ref_list[1] );
-
-		$list = wp_list_pluck( $ref_list, 'name', 'id' );
-		$this->assertSame(
-			array(
-				'f' => 'foo',
-				'b' => 'bar',
-			),
-			$list
-		);
-
-		$this->assertInstanceOf( 'stdClass', $ref_list[0] );
-		$this->assertInstanceOf( 'stdClass', $ref_list[1] );
-	}
-
 	function test_filter_object_list_nested_array_and() {
 		$list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'blue' ) ), 'AND' );
 		$this->assertCount( 1, $list );
diff --git a/tests/phpunit/tests/functions/wpListPluck.php b/tests/phpunit/tests/functions/wpListPluck.php
new file mode 100644
index 0000000000000..a2ac97b7adad2
--- /dev/null
+++ b/tests/phpunit/tests/functions/wpListPluck.php
@@ -0,0 +1,353 @@
+<?php
+
+/**
+ * Test wp_list_pluck().
+ *
+ * @group functions.php
+ * @covers ::wp_list_pluck
+ */
+class Tests_Functions_wpListPluck extends WP_UnitTestCase {
+	public $object_list = array();
+	public $array_list  = array();
+
+	function set_up() {
+		parent::set_up();
+		$this->array_list['foo'] = array(
+			'name'   => 'foo',
+			'id'     => 'f',
+			'field1' => true,
+			'field2' => true,
+			'field3' => true,
+			'field4' => array( 'red' ),
+		);
+		$this->array_list['bar'] = array(
+			'name'   => 'bar',
+			'id'     => 'b',
+			'field1' => true,
+			'field2' => true,
+			'field3' => false,
+			'field4' => array( 'green' ),
+		);
+		$this->array_list['baz'] = array(
+			'name'   => 'baz',
+			'id'     => 'z',
+			'field1' => true,
+			'field2' => false,
+			'field3' => false,
+			'field4' => array( 'blue' ),
+		);
+		foreach ( $this->array_list as $key => $value ) {
+			$this->object_list[ $key ] = (object) $value;
+		}
+	}
+
+	function test_wp_list_pluck_array_and_object() {
+		$list = wp_list_pluck( $this->object_list, 'name' );
+		$this->assertSame(
+			array(
+				'foo' => 'foo',
+				'bar' => 'bar',
+				'baz' => 'baz',
+			),
+			$list
+		);
+
+		$list = wp_list_pluck( $this->array_list, 'name' );
+		$this->assertSame(
+			array(
+				'foo' => 'foo',
+				'bar' => 'bar',
+				'baz' => 'baz',
+			),
+			$list
+		);
+	}
+
+	/**
+	 * @ticket 28666
+	 */
+	function test_wp_list_pluck_index_key() {
+		$list = wp_list_pluck( $this->array_list, 'name', 'id' );
+		$this->assertSame(
+			array(
+				'f' => 'foo',
+				'b' => 'bar',
+				'z' => 'baz',
+			),
+			$list
+		);
+	}
+
+	/**
+	 * @ticket 28666
+	 */
+	function test_wp_list_pluck_object_index_key() {
+		$list = wp_list_pluck( $this->object_list, 'name', 'id' );
+		$this->assertSame(
+			array(
+				'f' => 'foo',
+				'b' => 'bar',
+				'z' => 'baz',
+			),
+			$list
+		);
+	}
+
+	/**
+	 * @ticket 28666
+	 */
+	function test_wp_list_pluck_missing_index_key() {
+		$list = wp_list_pluck( $this->array_list, 'name', 'nonexistent' );
+		$this->assertSame(
+			array(
+				0 => 'foo',
+				1 => 'bar',
+				2 => 'baz',
+			),
+			$list
+		);
+	}
+
+	/**
+	 * @ticket 28666
+	 */
+	function test_wp_list_pluck_partial_missing_index_key() {
+		$array_list = $this->array_list;
+		unset( $array_list['bar']['id'] );
+		$list = wp_list_pluck( $array_list, 'name', 'id' );
+		$this->assertSame(
+			array(
+				'f' => 'foo',
+				0   => 'bar',
+				'z' => 'baz',
+			),
+			$list
+		);
+	}
+
+	/**
+	 * @ticket 28666
+	 */
+	function test_wp_list_pluck_mixed_index_key() {
+		$mixed_list        = $this->array_list;
+		$mixed_list['bar'] = (object) $mixed_list['bar'];
+		$list              = wp_list_pluck( $mixed_list, 'name', 'id' );
+		$this->assertSame(
+			array(
+				'f' => 'foo',
+				'b' => 'bar',
+				'z' => 'baz',
+			),
+			$list
+		);
+	}
+
+	/**
+	 * @ticket 16895
+	 */
+	function test_wp_list_pluck_containing_references() {
+		$ref_list = array(
+			& $this->object_list['foo'],
+			& $this->object_list['bar'],
+		);
+
+		$this->assertInstanceOf( 'stdClass', $ref_list[0] );
+		$this->assertInstanceOf( 'stdClass', $ref_list[1] );
+
+		$list = wp_list_pluck( $ref_list, 'name' );
+		$this->assertSame(
+			array(
+				'foo',
+				'bar',
+			),
+			$list
+		);
+
+		$this->assertInstanceOf( 'stdClass', $ref_list[0] );
+		$this->assertInstanceOf( 'stdClass', $ref_list[1] );
+	}
+
+	/**
+	 * @ticket 16895
+	 */
+	function test_wp_list_pluck_containing_references_keys() {
+		$ref_list = array(
+			& $this->object_list['foo'],
+			& $this->object_list['bar'],
+		);
+
+		$this->assertInstanceOf( 'stdClass', $ref_list[0] );
+		$this->assertInstanceOf( 'stdClass', $ref_list[1] );
+
+		$list = wp_list_pluck( $ref_list, 'name', 'id' );
+		$this->assertSame(
+			array(
+				'f' => 'foo',
+				'b' => 'bar',
+			),
+			$list
+		);
+
+		$this->assertInstanceOf( 'stdClass', $ref_list[0] );
+		$this->assertInstanceOf( 'stdClass', $ref_list[1] );
+	}
+
+	/**
+	 * @dataProvider data_test_wp_list_pluck
+	 *
+	 * @param array      $list      List of objects or arrays.
+	 * @param int|string $field     Field from the object to place instead of the entire object
+	 * @param int|string $index_key Field from the object to use as keys for the new array.
+	 * @param array      $expected  Expected result.
+	 */
+	public function test_wp_list_pluck( $list, $field, $index_key, $expected ) {
+		$this->assertSameSetsWithIndex( $expected, wp_list_pluck( $list, $field, $index_key ) );
+	}
+
+	public function data_test_wp_list_pluck() {
+		return array(
+			'arrays'                         => array(
+				array(
+					array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'abc' => 'xyz',
+					),
+					array(
+						'foo'   => 'foo',
+						'123'   => '456',
+						'lorem' => 'ipsum',
+					),
+					array( 'foo' => 'baz' ),
+				),
+				'foo',
+				null,
+				array( 'bar', 'foo', 'baz' ),
+			),
+			'arrays with index key'          => array(
+				array(
+					array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'abc' => 'xyz',
+						'key' => 'foo',
+					),
+					array(
+						'foo'   => 'foo',
+						'123'   => '456',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+				),
+				'foo',
+				'key',
+				array(
+					'foo'   => 'bar',
+					'bar'   => 'foo',
+					'value' => 'baz',
+				),
+			),
+			'arrays with index key missing'  => array(
+				array(
+					array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'abc' => 'xyz',
+					),
+					array(
+						'foo'   => 'foo',
+						'123'   => '456',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+				),
+				'foo',
+				'key',
+				array(
+					'bar',
+					'bar'   => 'foo',
+					'value' => 'baz',
+				),
+			),
+			'objects'                        => array(
+				array(
+					(object) array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'abc' => 'xyz',
+					),
+					(object) array(
+						'foo'   => 'foo',
+						'123'   => '456',
+						'lorem' => 'ipsum',
+					),
+					(object) array( 'foo' => 'baz' ),
+				),
+				'foo',
+				null,
+				array( 'bar', 'foo', 'baz' ),
+			),
+			'objects with index key'         => array(
+				array(
+					(object) array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'abc' => 'xyz',
+						'key' => 'foo',
+					),
+					(object) array(
+						'foo'   => 'foo',
+						'123'   => '456',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					(object) array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+				),
+				'foo',
+				'key',
+				array(
+					'foo'   => 'bar',
+					'bar'   => 'foo',
+					'value' => 'baz',
+				),
+			),
+			'objects with index key missing' => array(
+				array(
+					(object) array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'abc' => 'xyz',
+					),
+					(object) array(
+						'foo'   => 'foo',
+						'123'   => '456',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					(object) array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+				),
+				'foo',
+				'key',
+				array(
+					'bar',
+					'bar'   => 'foo',
+					'value' => 'baz',
+				),
+			),
+		);
+	}
+}

From a90e7eb5ff2405adc68a741522fbab7436074a61 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Thu, 26 Aug 2021 16:02:13 +0000
Subject: [PATCH 039/257] Tests: Remove duplicate `wp_list_pluck()` tests.

The tests were partially duplicated in two separate files, and are now located in their own file.

Follow-up to [431/tests], [28900], [38928], [42527], [51663].

See #53363, #53987.

git-svn-id: https://develop.svn.wordpress.org/trunk@51664 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/functions/wpListUtil.php | 161 -------------------
 1 file changed, 161 deletions(-)

diff --git a/tests/phpunit/tests/functions/wpListUtil.php b/tests/phpunit/tests/functions/wpListUtil.php
index 69b32d95f42b8..65bff58a821be 100644
--- a/tests/phpunit/tests/functions/wpListUtil.php
+++ b/tests/phpunit/tests/functions/wpListUtil.php
@@ -5,167 +5,6 @@
  */
 class Tests_Functions_wpListUtil extends WP_UnitTestCase {
 
-	public function data_test_wp_list_pluck() {
-		return array(
-			'arrays'                         => array(
-				array(
-					array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'abc' => 'xyz',
-					),
-					array(
-						'foo'   => 'foo',
-						'123'   => '456',
-						'lorem' => 'ipsum',
-					),
-					array( 'foo' => 'baz' ),
-				),
-				'foo',
-				null,
-				array( 'bar', 'foo', 'baz' ),
-			),
-			'arrays with index key'          => array(
-				array(
-					array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'abc' => 'xyz',
-						'key' => 'foo',
-					),
-					array(
-						'foo'   => 'foo',
-						'123'   => '456',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-				),
-				'foo',
-				'key',
-				array(
-					'foo'   => 'bar',
-					'bar'   => 'foo',
-					'value' => 'baz',
-				),
-			),
-			'arrays with index key missing'  => array(
-				array(
-					array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'abc' => 'xyz',
-					),
-					array(
-						'foo'   => 'foo',
-						'123'   => '456',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-				),
-				'foo',
-				'key',
-				array(
-					'bar',
-					'bar'   => 'foo',
-					'value' => 'baz',
-				),
-			),
-			'objects'                        => array(
-				array(
-					(object) array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'abc' => 'xyz',
-					),
-					(object) array(
-						'foo'   => 'foo',
-						'123'   => '456',
-						'lorem' => 'ipsum',
-					),
-					(object) array( 'foo' => 'baz' ),
-				),
-				'foo',
-				null,
-				array( 'bar', 'foo', 'baz' ),
-			),
-			'objects with index key'         => array(
-				array(
-					(object) array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'abc' => 'xyz',
-						'key' => 'foo',
-					),
-					(object) array(
-						'foo'   => 'foo',
-						'123'   => '456',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					(object) array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-				),
-				'foo',
-				'key',
-				array(
-					'foo'   => 'bar',
-					'bar'   => 'foo',
-					'value' => 'baz',
-				),
-			),
-			'objects with index key missing' => array(
-				array(
-					(object) array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'abc' => 'xyz',
-					),
-					(object) array(
-						'foo'   => 'foo',
-						'123'   => '456',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					(object) array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-				),
-				'foo',
-				'key',
-				array(
-					'bar',
-					'bar'   => 'foo',
-					'value' => 'baz',
-				),
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_test_wp_list_pluck
-	 *
-	 * @covers ::wp_list_pluck
-	 *
-	 * @param array      $list      List of objects or arrays.
-	 * @param int|string $field     Field from the object to place instead of the entire object
-	 * @param int|string $index_key Field from the object to use as keys for the new array.
-	 * @param array      $expected  Expected result.
-	 */
-	public function test_wp_list_pluck( $list, $field, $index_key, $expected ) {
-		$this->assertSameSetsWithIndex( $expected, wp_list_pluck( $list, $field, $index_key ) );
-	}
-
 	public function data_test_wp_list_filter() {
 		return array(
 			'string instead of array'  => array(

From b683b830abe600661a04cb80df0b587cb41a8822 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Thu, 26 Aug 2021 16:08:48 +0000
Subject: [PATCH 040/257] Tests: Rename the test file and class for
 `wp_filter_object_list()` tests.

This matches the name of the function being tested.

Follow-up to [410/tests], [51663], [51664].

See #53363, #53987.

git-svn-id: https://develop.svn.wordpress.org/trunk@51665 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../functions/{wpListFilter.php => wpFilterObjectList.php}      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename tests/phpunit/tests/functions/{wpListFilter.php => wpFilterObjectList.php} (98%)

diff --git a/tests/phpunit/tests/functions/wpListFilter.php b/tests/phpunit/tests/functions/wpFilterObjectList.php
similarity index 98%
rename from tests/phpunit/tests/functions/wpListFilter.php
rename to tests/phpunit/tests/functions/wpFilterObjectList.php
index 5a689ef47c75d..0dc0e39d892ee 100644
--- a/tests/phpunit/tests/functions/wpListFilter.php
+++ b/tests/phpunit/tests/functions/wpFilterObjectList.php
@@ -6,7 +6,7 @@
  * @group functions.php
  * @covers ::wp_filter_object_list
  */
-class Tests_Functions_wpListFilter extends WP_UnitTestCase {
+class Tests_Functions_wpFilterObjectList extends WP_UnitTestCase {
 	public $object_list = array();
 	public $array_list  = array();
 

From cd1f879ced797256bcdc0e3ac6f2bbf66f4bd058 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Thu, 26 Aug 2021 16:20:57 +0000
Subject: [PATCH 041/257] Tests: Move `wp_list_filter()` tests to their own
 file.

This matches the name of the function being tested.

Follow-up to [38928], [51663-51665].

See #53363, #53987.

git-svn-id: https://develop.svn.wordpress.org/trunk@51666 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../phpunit/tests/functions/wpListFilter.php  | 215 ++++++++++++++++++
 tests/phpunit/tests/functions/wpListUtil.php  | 207 -----------------
 2 files changed, 215 insertions(+), 207 deletions(-)
 create mode 100644 tests/phpunit/tests/functions/wpListFilter.php

diff --git a/tests/phpunit/tests/functions/wpListFilter.php b/tests/phpunit/tests/functions/wpListFilter.php
new file mode 100644
index 0000000000000..45ea4f9601f6e
--- /dev/null
+++ b/tests/phpunit/tests/functions/wpListFilter.php
@@ -0,0 +1,215 @@
+<?php
+
+/**
+ * Test wp_list_filter().
+ *
+ * @group functions.php
+ * @covers ::wp_list_filter
+ */
+class Tests_Functions_wpListFilter extends WP_UnitTestCase {
+
+	/**
+	 * @dataProvider data_test_wp_list_filter
+	 *
+	 * @param array  $list     An array of objects to filter.
+	 * @param array  $args     An array of key => value arguments to match
+	 *                         against each object.
+	 * @param string $operator The logical operation to perform.
+	 * @param array  $expected Expected result.
+	 */
+	public function test_wp_list_filter( $list, $args, $operator, $expected ) {
+		$this->assertEqualSetsWithIndex( $expected, wp_list_filter( $list, $args, $operator ) );
+	}
+
+	public function data_test_wp_list_filter() {
+		return array(
+			'string instead of array'  => array(
+				'foo',
+				array(),
+				'AND',
+				array(),
+			),
+			'object instead of array'  => array(
+				(object) array( 'foo' ),
+				array(),
+				'AND',
+				array(),
+			),
+			'empty args'               => array(
+				array( 'foo', 'bar' ),
+				array(),
+				'AND',
+				array( 'foo', 'bar' ),
+			),
+			'invalid operator'         => array(
+				array(
+					(object) array( 'foo' => 'bar' ),
+					(object) array( 'foo' => 'baz' ),
+				),
+				array( 'foo' => 'bar' ),
+				'XOR',
+				array(),
+			),
+			'single argument to match' => array(
+				array(
+					(object) array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'abc' => 'xyz',
+						'key' => 'foo',
+					),
+					(object) array(
+						'foo'   => 'foo',
+						'123'   => '456',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					(object) array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+					(object) array(
+						'foo' => 'bar',
+						'key' => 'value',
+					),
+				),
+				array( 'foo' => 'bar' ),
+				'AND',
+				array(
+					0 => (object) array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'abc' => 'xyz',
+						'key' => 'foo',
+					),
+					3 => (object) array(
+						'foo' => 'bar',
+						'key' => 'value',
+					),
+				),
+			),
+			'all must match'           => array(
+				array(
+					(object) array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'abc' => 'xyz',
+						'key' => 'foo',
+					),
+					(object) array(
+						'foo'   => 'foo',
+						'123'   => '456',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					(object) array(
+						'foo' => 'baz',
+						'key' => 'value',
+						'bar' => 'baz',
+					),
+					(object) array(
+						'foo' => 'bar',
+						'key' => 'value',
+					),
+				),
+				array(
+					'foo' => 'bar',
+					'bar' => 'baz',
+				),
+				'AND',
+				array(
+					0 => (object) array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'abc' => 'xyz',
+						'key' => 'foo',
+					),
+				),
+			),
+			'any must match'           => array(
+				array(
+					(object) array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'abc' => 'xyz',
+						'key' => 'foo',
+					),
+					(object) array(
+						'foo'   => 'foo',
+						'123'   => '456',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					(object) array(
+						'foo' => 'baz',
+						'key' => 'value',
+						'bar' => 'baz',
+					),
+					(object) array(
+						'foo' => 'bar',
+						'key' => 'value',
+					),
+				),
+				array(
+					'key' => 'value',
+					'bar' => 'baz',
+				),
+				'OR',
+				array(
+					0 => (object) array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'abc' => 'xyz',
+						'key' => 'foo',
+					),
+					2 => (object) array(
+						'foo' => 'baz',
+						'key' => 'value',
+						'bar' => 'baz',
+					),
+					3 => (object) array(
+						'foo' => 'bar',
+						'key' => 'value',
+					),
+				),
+			),
+			'none must match'          => array(
+				array(
+					(object) array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'abc' => 'xyz',
+						'key' => 'foo',
+					),
+					(object) array(
+						'foo'   => 'foo',
+						'123'   => '456',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					(object) array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+					(object) array(
+						'foo' => 'bar',
+						'key' => 'value',
+					),
+				),
+				array(
+					'key' => 'value',
+					'bar' => 'baz',
+				),
+				'NOT',
+				array(
+					1 => (object) array(
+						'foo'   => 'foo',
+						'123'   => '456',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+				),
+			),
+		);
+	}
+}
diff --git a/tests/phpunit/tests/functions/wpListUtil.php b/tests/phpunit/tests/functions/wpListUtil.php
index 65bff58a821be..186643e72c96a 100644
--- a/tests/phpunit/tests/functions/wpListUtil.php
+++ b/tests/phpunit/tests/functions/wpListUtil.php
@@ -5,213 +5,6 @@
  */
 class Tests_Functions_wpListUtil extends WP_UnitTestCase {
 
-	public function data_test_wp_list_filter() {
-		return array(
-			'string instead of array'  => array(
-				'foo',
-				array(),
-				'AND',
-				array(),
-			),
-			'object instead of array'  => array(
-				(object) array( 'foo' ),
-				array(),
-				'AND',
-				array(),
-			),
-			'empty args'               => array(
-				array( 'foo', 'bar' ),
-				array(),
-				'AND',
-				array( 'foo', 'bar' ),
-			),
-			'invalid operator'         => array(
-				array(
-					(object) array( 'foo' => 'bar' ),
-					(object) array( 'foo' => 'baz' ),
-				),
-				array( 'foo' => 'bar' ),
-				'XOR',
-				array(),
-			),
-			'single argument to match' => array(
-				array(
-					(object) array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'abc' => 'xyz',
-						'key' => 'foo',
-					),
-					(object) array(
-						'foo'   => 'foo',
-						'123'   => '456',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					(object) array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-					(object) array(
-						'foo' => 'bar',
-						'key' => 'value',
-					),
-				),
-				array( 'foo' => 'bar' ),
-				'AND',
-				array(
-					0 => (object) array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'abc' => 'xyz',
-						'key' => 'foo',
-					),
-					3 => (object) array(
-						'foo' => 'bar',
-						'key' => 'value',
-					),
-				),
-			),
-			'all must match'           => array(
-				array(
-					(object) array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'abc' => 'xyz',
-						'key' => 'foo',
-					),
-					(object) array(
-						'foo'   => 'foo',
-						'123'   => '456',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					(object) array(
-						'foo' => 'baz',
-						'key' => 'value',
-						'bar' => 'baz',
-					),
-					(object) array(
-						'foo' => 'bar',
-						'key' => 'value',
-					),
-				),
-				array(
-					'foo' => 'bar',
-					'bar' => 'baz',
-				),
-				'AND',
-				array(
-					0 => (object) array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'abc' => 'xyz',
-						'key' => 'foo',
-					),
-				),
-			),
-			'any must match'           => array(
-				array(
-					(object) array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'abc' => 'xyz',
-						'key' => 'foo',
-					),
-					(object) array(
-						'foo'   => 'foo',
-						'123'   => '456',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					(object) array(
-						'foo' => 'baz',
-						'key' => 'value',
-						'bar' => 'baz',
-					),
-					(object) array(
-						'foo' => 'bar',
-						'key' => 'value',
-					),
-				),
-				array(
-					'key' => 'value',
-					'bar' => 'baz',
-				),
-				'OR',
-				array(
-					0 => (object) array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'abc' => 'xyz',
-						'key' => 'foo',
-					),
-					2 => (object) array(
-						'foo' => 'baz',
-						'key' => 'value',
-						'bar' => 'baz',
-					),
-					3 => (object) array(
-						'foo' => 'bar',
-						'key' => 'value',
-					),
-				),
-			),
-			'none must match'          => array(
-				array(
-					(object) array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'abc' => 'xyz',
-						'key' => 'foo',
-					),
-					(object) array(
-						'foo'   => 'foo',
-						'123'   => '456',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					(object) array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-					(object) array(
-						'foo' => 'bar',
-						'key' => 'value',
-					),
-				),
-				array(
-					'key' => 'value',
-					'bar' => 'baz',
-				),
-				'NOT',
-				array(
-					1 => (object) array(
-						'foo'   => 'foo',
-						'123'   => '456',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-				),
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_test_wp_list_filter
-	 *
-	 * @covers ::wp_list_filter
-	 *
-	 * @param array  $list     An array of objects to filter.
-	 * @param array  $args     An array of key => value arguments to match
-	 *                         against each object.
-	 * @param string $operator The logical operation to perform.
-	 * @param array  $expected Expected result.
-	 */
-	public function test_wp_list_filter( $list, $args, $operator, $expected ) {
-		$this->assertEqualSetsWithIndex( $expected, wp_list_filter( $list, $args, $operator ) );
-	}
-
 	public function data_test_wp_list_sort() {
 		return array(
 			'single orderby ascending'        => array(

From 72de4966b8f6810c599047e2c1e313b7e1a29e64 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Thu, 26 Aug 2021 16:29:37 +0000
Subject: [PATCH 042/257] Tests: Move `wp_list_sort()` tests to their own file.

This matches the name of the function being tested.

Follow-up to [38928], [51663-51666].

See #53363, #53987.

git-svn-id: https://develop.svn.wordpress.org/trunk@51667 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/functions/wpListSort.php | 660 +++++++++++++++++++
 tests/phpunit/tests/functions/wpListUtil.php | 656 +-----------------
 2 files changed, 662 insertions(+), 654 deletions(-)
 create mode 100644 tests/phpunit/tests/functions/wpListSort.php

diff --git a/tests/phpunit/tests/functions/wpListSort.php b/tests/phpunit/tests/functions/wpListSort.php
new file mode 100644
index 0000000000000..7159af4937687
--- /dev/null
+++ b/tests/phpunit/tests/functions/wpListSort.php
@@ -0,0 +1,660 @@
+<?php
+
+/**
+ * Test wp_list_sort().
+ *
+ * @group functions.php
+ * @covers ::wp_list_sort
+ */
+class Tests_Functions_wpListSort extends WP_UnitTestCase {
+
+	/**
+	 * @dataProvider data_test_wp_list_sort
+	 *
+	 * @param string|array $orderby Either the field name to order by or an array
+	 *                              of multiple orderby fields as $orderby => $order.
+	 * @param string       $order   Either 'ASC' or 'DESC'.
+	 */
+	public function test_wp_list_sort( $list, $orderby, $order, $expected ) {
+		$this->assertSame( $expected, wp_list_sort( $list, $orderby, $order ) );
+	}
+
+	public function data_test_wp_list_sort() {
+		return array(
+			'single orderby ascending'        => array(
+				array(
+					array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+				),
+				'foo',
+				'ASC',
+				array(
+					array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+					array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+				),
+			),
+			'single orderby descending'       => array(
+				array(
+					array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+				),
+				'foo',
+				'DESC',
+				array(
+					array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+					array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+				),
+			),
+			'single orderby array ascending'  => array(
+				array(
+					array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+				),
+				array( 'foo' => 'ASC' ),
+				'IGNORED',
+				array(
+					array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+					array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+				),
+			),
+			'single orderby array descending' => array(
+				array(
+					array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+				),
+				array( 'foo' => 'DESC' ),
+				'IGNORED',
+				array(
+					array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+					array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+				),
+			),
+			'multiple orderby ascending'      => array(
+				array(
+					array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					array(
+						'foo' => 'foo',
+						'key' => 'key',
+					),
+					array(
+						'foo' => 'baz',
+						'key' => 'key',
+					),
+					array(
+						'foo' => 'bar',
+						'key' => 'value',
+					),
+				),
+				array(
+					'key' => 'ASC',
+					'foo' => 'ASC',
+				),
+				'IGNORED',
+				array(
+					array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					array(
+						'foo' => 'baz',
+						'key' => 'key',
+					),
+					array(
+						'foo' => 'foo',
+						'key' => 'key',
+					),
+					array(
+						'foo' => 'bar',
+						'key' => 'value',
+					),
+				),
+			),
+			'multiple orderby descending'     => array(
+				array(
+					array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					array(
+						'foo' => 'foo',
+						'key' => 'key',
+					),
+					array(
+						'foo' => 'baz',
+						'key' => 'key',
+					),
+					array(
+						'foo' => 'bar',
+						'key' => 'value',
+					),
+				),
+				array(
+					'key' => 'DESC',
+					'foo' => 'DESC',
+				),
+				'IGNORED',
+				array(
+					array(
+						'foo' => 'bar',
+						'key' => 'value',
+					),
+					array(
+						'foo' => 'foo',
+						'key' => 'key',
+					),
+					array(
+						'foo' => 'baz',
+						'key' => 'key',
+					),
+					array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+				),
+			),
+			'multiple orderby mixed'          => array(
+				array(
+					array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					array(
+						'foo' => 'foo',
+						'key' => 'key',
+					),
+					array(
+						'foo' => 'baz',
+						'key' => 'key',
+					),
+					array(
+						'foo' => 'bar',
+						'key' => 'value',
+					),
+				),
+				array(
+					'key' => 'DESC',
+					'foo' => 'ASC',
+				),
+				'IGNORED',
+				array(
+					array(
+						'foo' => 'bar',
+						'key' => 'value',
+					),
+					array(
+						'foo' => 'baz',
+						'key' => 'key',
+					),
+					array(
+						'foo' => 'foo',
+						'key' => 'key',
+					),
+					array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider data_test_wp_list_sort_preserve_keys
+	 *
+	 * @param string|array $orderby Either the field name to order by or an array
+	 *                              of multiple orderby fields as $orderby => $order.
+	 * @param string       $order   Either 'ASC' or 'DESC'.
+	 */
+	public function test_wp_list_sort_preserve_keys( $list, $orderby, $order, $expected ) {
+		$this->assertSame( $expected, wp_list_sort( $list, $orderby, $order, true ) );
+	}
+
+	public function data_test_wp_list_sort_preserve_keys() {
+		return array(
+			'single orderby ascending'        => array(
+				array(
+					'foobar' => array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					'foofoo' => array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					'foobaz' => array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+				),
+				'foo',
+				'ASC',
+				array(
+					'foobar' => array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					'foobaz' => array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+					'foofoo' => array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+				),
+			),
+			'single orderby descending'       => array(
+				array(
+					'foobar' => array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					'foofoo' => array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					'foobaz' => array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+				),
+				'foo',
+				'DESC',
+				array(
+					'foofoo' => array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					'foobaz' => array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+					'foobar' => array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+				),
+			),
+			'single orderby array ascending'  => array(
+				array(
+					'foobar' => array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					'foofoo' => array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					'foobaz' => array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+				),
+				array( 'foo' => 'ASC' ),
+				'IGNORED',
+				array(
+					'foobar' => array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					'foobaz' => array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+					'foofoo' => array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+				),
+			),
+			'single orderby array descending' => array(
+				array(
+					'foobar' => array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					'foofoo' => array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					'foobaz' => array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+				),
+				array( 'foo' => 'DESC' ),
+				'IGNORED',
+				array(
+					'foofoo' => array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					'foobaz' => array(
+						'foo' => 'baz',
+						'key' => 'value',
+					),
+					'foobar' => array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+				),
+			),
+			'multiple orderby ascending'      => array(
+				array(
+					'foobarfoo'   => array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					'foofoobar'   => array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					'foofookey'   => array(
+						'foo' => 'foo',
+						'key' => 'key',
+					),
+					'foobazkey'   => array(
+						'foo' => 'baz',
+						'key' => 'key',
+					),
+					'foobarvalue' => array(
+						'foo' => 'bar',
+						'key' => 'value',
+					),
+				),
+				array(
+					'key' => 'ASC',
+					'foo' => 'ASC',
+				),
+				'IGNORED',
+				array(
+					'foofoobar'   => array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					'foobarfoo'   => array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					'foobazkey'   => array(
+						'foo' => 'baz',
+						'key' => 'key',
+					),
+					'foofookey'   => array(
+						'foo' => 'foo',
+						'key' => 'key',
+					),
+					'foobarvalue' => array(
+						'foo' => 'bar',
+						'key' => 'value',
+					),
+				),
+			),
+			'multiple orderby descending'     => array(
+				array(
+					'foobarfoo'   => array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					'foofoobar'   => array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					'foofookey'   => array(
+						'foo' => 'foo',
+						'key' => 'key',
+					),
+					'foobazkey'   => array(
+						'foo' => 'baz',
+						'key' => 'key',
+					),
+					'foobarvalue' => array(
+						'foo' => 'bar',
+						'key' => 'value',
+					),
+				),
+				array(
+					'key' => 'DESC',
+					'foo' => 'DESC',
+				),
+				'IGNORED',
+				array(
+					'foobarvalue' => array(
+						'foo' => 'bar',
+						'key' => 'value',
+					),
+					'foofookey'   => array(
+						'foo' => 'foo',
+						'key' => 'key',
+					),
+					'foobazkey'   => array(
+						'foo' => 'baz',
+						'key' => 'key',
+					),
+					'foobarfoo'   => array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					'foofoobar'   => array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+				),
+			),
+			'multiple orderby mixed'          => array(
+				array(
+					'foobarfoo'   => array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					'foofoobar'   => array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+					'foofookey'   => array(
+						'foo' => 'foo',
+						'key' => 'key',
+					),
+					'foobazkey'   => array(
+						'foo' => 'baz',
+						'key' => 'key',
+					),
+					'foobarvalue' => array(
+						'foo' => 'bar',
+						'key' => 'value',
+					),
+				),
+				array(
+					'key' => 'DESC',
+					'foo' => 'ASC',
+				),
+				'IGNORED',
+				array(
+					'foobarvalue' => array(
+						'foo' => 'bar',
+						'key' => 'value',
+					),
+					'foobazkey'   => array(
+						'foo' => 'baz',
+						'key' => 'key',
+					),
+					'foofookey'   => array(
+						'foo' => 'foo',
+						'key' => 'key',
+					),
+					'foobarfoo'   => array(
+						'foo' => 'bar',
+						'bar' => 'baz',
+						'key' => 'foo',
+					),
+					'foofoobar'   => array(
+						'foo'   => 'foo',
+						'lorem' => 'ipsum',
+						'key'   => 'bar',
+					),
+				),
+			),
+		);
+	}
+}
diff --git a/tests/phpunit/tests/functions/wpListUtil.php b/tests/phpunit/tests/functions/wpListUtil.php
index 186643e72c96a..45cad6627aa38 100644
--- a/tests/phpunit/tests/functions/wpListUtil.php
+++ b/tests/phpunit/tests/functions/wpListUtil.php
@@ -1,664 +1,12 @@
 <?php
 
 /**
+ * Test WP_List_Util class.
+ *
  * @group functions.php
  */
 class Tests_Functions_wpListUtil extends WP_UnitTestCase {
 
-	public function data_test_wp_list_sort() {
-		return array(
-			'single orderby ascending'        => array(
-				array(
-					array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-				),
-				'foo',
-				'ASC',
-				array(
-					array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-					array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-				),
-			),
-			'single orderby descending'       => array(
-				array(
-					array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-				),
-				'foo',
-				'DESC',
-				array(
-					array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-					array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-				),
-			),
-			'single orderby array ascending'  => array(
-				array(
-					array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-				),
-				array( 'foo' => 'ASC' ),
-				'IGNORED',
-				array(
-					array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-					array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-				),
-			),
-			'single orderby array descending' => array(
-				array(
-					array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-				),
-				array( 'foo' => 'DESC' ),
-				'IGNORED',
-				array(
-					array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-					array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-				),
-			),
-			'multiple orderby ascending'      => array(
-				array(
-					array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					array(
-						'foo' => 'foo',
-						'key' => 'key',
-					),
-					array(
-						'foo' => 'baz',
-						'key' => 'key',
-					),
-					array(
-						'foo' => 'bar',
-						'key' => 'value',
-					),
-				),
-				array(
-					'key' => 'ASC',
-					'foo' => 'ASC',
-				),
-				'IGNORED',
-				array(
-					array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					array(
-						'foo' => 'baz',
-						'key' => 'key',
-					),
-					array(
-						'foo' => 'foo',
-						'key' => 'key',
-					),
-					array(
-						'foo' => 'bar',
-						'key' => 'value',
-					),
-				),
-			),
-			'multiple orderby descending'     => array(
-				array(
-					array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					array(
-						'foo' => 'foo',
-						'key' => 'key',
-					),
-					array(
-						'foo' => 'baz',
-						'key' => 'key',
-					),
-					array(
-						'foo' => 'bar',
-						'key' => 'value',
-					),
-				),
-				array(
-					'key' => 'DESC',
-					'foo' => 'DESC',
-				),
-				'IGNORED',
-				array(
-					array(
-						'foo' => 'bar',
-						'key' => 'value',
-					),
-					array(
-						'foo' => 'foo',
-						'key' => 'key',
-					),
-					array(
-						'foo' => 'baz',
-						'key' => 'key',
-					),
-					array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-				),
-			),
-			'multiple orderby mixed'          => array(
-				array(
-					array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					array(
-						'foo' => 'foo',
-						'key' => 'key',
-					),
-					array(
-						'foo' => 'baz',
-						'key' => 'key',
-					),
-					array(
-						'foo' => 'bar',
-						'key' => 'value',
-					),
-				),
-				array(
-					'key' => 'DESC',
-					'foo' => 'ASC',
-				),
-				'IGNORED',
-				array(
-					array(
-						'foo' => 'bar',
-						'key' => 'value',
-					),
-					array(
-						'foo' => 'baz',
-						'key' => 'key',
-					),
-					array(
-						'foo' => 'foo',
-						'key' => 'key',
-					),
-					array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-				),
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_test_wp_list_sort
-	 *
-	 * @covers ::wp_list_sort
-	 *
-	 * @param string|array $orderby Either the field name to order by or an array
-	 *                              of multiple orderby fields as $orderby => $order.
-	 * @param string       $order   Either 'ASC' or 'DESC'.
-	 */
-	public function test_wp_list_sort( $list, $orderby, $order, $expected ) {
-		$this->assertSame( $expected, wp_list_sort( $list, $orderby, $order ) );
-	}
-
-	public function data_test_wp_list_sort_preserve_keys() {
-		return array(
-			'single orderby ascending'        => array(
-				array(
-					'foobar' => array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					'foofoo' => array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					'foobaz' => array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-				),
-				'foo',
-				'ASC',
-				array(
-					'foobar' => array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					'foobaz' => array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-					'foofoo' => array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-				),
-			),
-			'single orderby descending'       => array(
-				array(
-					'foobar' => array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					'foofoo' => array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					'foobaz' => array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-				),
-				'foo',
-				'DESC',
-				array(
-					'foofoo' => array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					'foobaz' => array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-					'foobar' => array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-				),
-			),
-			'single orderby array ascending'  => array(
-				array(
-					'foobar' => array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					'foofoo' => array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					'foobaz' => array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-				),
-				array( 'foo' => 'ASC' ),
-				'IGNORED',
-				array(
-					'foobar' => array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					'foobaz' => array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-					'foofoo' => array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-				),
-			),
-			'single orderby array descending' => array(
-				array(
-					'foobar' => array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					'foofoo' => array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					'foobaz' => array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-				),
-				array( 'foo' => 'DESC' ),
-				'IGNORED',
-				array(
-					'foofoo' => array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					'foobaz' => array(
-						'foo' => 'baz',
-						'key' => 'value',
-					),
-					'foobar' => array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-				),
-			),
-			'multiple orderby ascending'      => array(
-				array(
-					'foobarfoo'   => array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					'foofoobar'   => array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					'foofookey'   => array(
-						'foo' => 'foo',
-						'key' => 'key',
-					),
-					'foobazkey'   => array(
-						'foo' => 'baz',
-						'key' => 'key',
-					),
-					'foobarvalue' => array(
-						'foo' => 'bar',
-						'key' => 'value',
-					),
-				),
-				array(
-					'key' => 'ASC',
-					'foo' => 'ASC',
-				),
-				'IGNORED',
-				array(
-					'foofoobar'   => array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					'foobarfoo'   => array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					'foobazkey'   => array(
-						'foo' => 'baz',
-						'key' => 'key',
-					),
-					'foofookey'   => array(
-						'foo' => 'foo',
-						'key' => 'key',
-					),
-					'foobarvalue' => array(
-						'foo' => 'bar',
-						'key' => 'value',
-					),
-				),
-			),
-			'multiple orderby descending'     => array(
-				array(
-					'foobarfoo'   => array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					'foofoobar'   => array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					'foofookey'   => array(
-						'foo' => 'foo',
-						'key' => 'key',
-					),
-					'foobazkey'   => array(
-						'foo' => 'baz',
-						'key' => 'key',
-					),
-					'foobarvalue' => array(
-						'foo' => 'bar',
-						'key' => 'value',
-					),
-				),
-				array(
-					'key' => 'DESC',
-					'foo' => 'DESC',
-				),
-				'IGNORED',
-				array(
-					'foobarvalue' => array(
-						'foo' => 'bar',
-						'key' => 'value',
-					),
-					'foofookey'   => array(
-						'foo' => 'foo',
-						'key' => 'key',
-					),
-					'foobazkey'   => array(
-						'foo' => 'baz',
-						'key' => 'key',
-					),
-					'foobarfoo'   => array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					'foofoobar'   => array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-				),
-			),
-			'multiple orderby mixed'          => array(
-				array(
-					'foobarfoo'   => array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					'foofoobar'   => array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-					'foofookey'   => array(
-						'foo' => 'foo',
-						'key' => 'key',
-					),
-					'foobazkey'   => array(
-						'foo' => 'baz',
-						'key' => 'key',
-					),
-					'foobarvalue' => array(
-						'foo' => 'bar',
-						'key' => 'value',
-					),
-				),
-				array(
-					'key' => 'DESC',
-					'foo' => 'ASC',
-				),
-				'IGNORED',
-				array(
-					'foobarvalue' => array(
-						'foo' => 'bar',
-						'key' => 'value',
-					),
-					'foobazkey'   => array(
-						'foo' => 'baz',
-						'key' => 'key',
-					),
-					'foofookey'   => array(
-						'foo' => 'foo',
-						'key' => 'key',
-					),
-					'foobarfoo'   => array(
-						'foo' => 'bar',
-						'bar' => 'baz',
-						'key' => 'foo',
-					),
-					'foofoobar'   => array(
-						'foo'   => 'foo',
-						'lorem' => 'ipsum',
-						'key'   => 'bar',
-					),
-				),
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_test_wp_list_sort_preserve_keys
-	 *
-	 * @covers ::wp_list_sort
-	 *
-	 * @param string|array $orderby Either the field name to order by or an array
-	 *                              of multiple orderby fields as $orderby => $order.
-	 * @param string       $order   Either 'ASC' or 'DESC'.
-	 */
-	public function test_wp_list_sort_preserve_keys( $list, $orderby, $order, $expected ) {
-		$this->assertSame( $expected, wp_list_sort( $list, $orderby, $order, true ) );
-	}
-
 	/**
 	 * @covers WP_List_Util::get_input
 	 */

From d616b931e0554a09014e8819886b680fa18fb840 Mon Sep 17 00:00:00 2001
From: SergeyBiryukov <SergeyBiryukov@602fd350-edb4-49c9-b593-d223f7449a82>
Date: Thu, 26 Aug 2021 16:50:02 +0000
Subject: [PATCH 043/257] Coding Standards: Add missing visibility keywords for
 `wp_filter_object_list()` and `wp_list_pluck()` tests.

Follow-up to [51663-51667].

Props pbearne.
See #53363, #53987.

git-svn-id: https://develop.svn.wordpress.org/trunk@51668 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../tests/functions/wpFilterObjectList.php    | 28 +++++++++----------
 tests/phpunit/tests/functions/wpListPluck.php | 18 ++++++------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/tests/phpunit/tests/functions/wpFilterObjectList.php b/tests/phpunit/tests/functions/wpFilterObjectList.php
index 0dc0e39d892ee..b0c9edc4eda47 100644
--- a/tests/phpunit/tests/functions/wpFilterObjectList.php
+++ b/tests/phpunit/tests/functions/wpFilterObjectList.php
@@ -10,7 +10,7 @@ class Tests_Functions_wpFilterObjectList extends WP_UnitTestCase {
 	public $object_list = array();
 	public $array_list  = array();
 
-	function set_up() {
+	public function set_up() {
 		parent::set_up();
 		$this->array_list['foo'] = array(
 			'name'   => 'foo',
@@ -41,7 +41,7 @@ function set_up() {
 		}
 	}
 
-	function test_filter_object_list_and() {
+	public function test_filter_object_list_and() {
 		$list = wp_filter_object_list(
 			$this->object_list,
 			array(
@@ -55,7 +55,7 @@ function test_filter_object_list_and() {
 		$this->assertArrayHasKey( 'bar', $list );
 	}
 
-	function test_filter_object_list_or() {
+	public function test_filter_object_list_or() {
 		$list = wp_filter_object_list(
 			$this->object_list,
 			array(
@@ -70,7 +70,7 @@ function test_filter_object_list_or() {
 		$this->assertArrayHasKey( 'baz', $list );
 	}
 
-	function test_filter_object_list_not() {
+	public function test_filter_object_list_not() {
 		$list = wp_filter_object_list(
 			$this->object_list,
 			array(
@@ -83,7 +83,7 @@ function test_filter_object_list_not() {
 		$this->assertArrayHasKey( 'baz', $list );
 	}
 
-	function test_filter_object_list_and_field() {
+	public function test_filter_object_list_and_field() {
 		$list = wp_filter_object_list(
 			$this->object_list,
 			array(
@@ -102,7 +102,7 @@ function test_filter_object_list_and_field() {
 		);
 	}
 
-	function test_filter_object_list_or_field() {
+	public function test_filter_object_list_or_field() {
 		$list = wp_filter_object_list(
 			$this->object_list,
 			array(
@@ -121,7 +121,7 @@ function test_filter_object_list_or_field() {
 		);
 	}
 
-	function test_filter_object_list_not_field() {
+	public function test_filter_object_list_not_field() {
 		$list = wp_filter_object_list(
 			$this->object_list,
 			array(
@@ -134,20 +134,20 @@ function test_filter_object_list_not_field() {
 		$this->assertSame( array( 'baz' => 'baz' ), $list );
 	}
 
-	function test_filter_object_list_nested_array_and() {
+	public function test_filter_object_list_nested_array_and() {
 		$list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'blue' ) ), 'AND' );
 		$this->assertCount( 1, $list );
 		$this->assertArrayHasKey( 'baz', $list );
 	}
 
-	function test_filter_object_list_nested_array_not() {
+	public function test_filter_object_list_nested_array_not() {
 		$list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'red' ) ), 'NOT' );
 		$this->assertCount( 2, $list );
 		$this->assertArrayHasKey( 'bar', $list );
 		$this->assertArrayHasKey( 'baz', $list );
 	}
 
-	function test_filter_object_list_nested_array_or() {
+	public function test_filter_object_list_nested_array_or() {
 		$list = wp_filter_object_list(
 			$this->object_list,
 			array(
@@ -161,18 +161,18 @@ function test_filter_object_list_nested_array_or() {
 		$this->assertArrayHasKey( 'baz', $list );
 	}
 
-	function test_filter_object_list_nested_array_or_singular() {
+	public function test_filter_object_list_nested_array_or_singular() {
 		$list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'blue' ) ), 'OR' );
 		$this->assertCount( 1, $list );
 		$this->assertArrayHasKey( 'baz', $list );
 	}
 
-	function test_filter_object_list_nested_array_and_field() {
+	public function test_filter_object_list_nested_array_and_field() {
 		$list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'blue' ) ), 'AND', 'name' );
 		$this->assertSame( array( 'baz' => 'baz' ), $list );
 	}
 
-	function test_filter_object_list_nested_array_not_field() {
+	public function test_filter_object_list_nested_array_not_field() {
 		$list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'green' ) ), 'NOT', 'name' );
 		$this->assertSame(
 			array(
@@ -183,7 +183,7 @@ function test_filter_object_list_nested_array_not_field() {
 		);
 	}
 
-	function test_filter_object_list_nested_array_or_field() {
+	public function test_filter_object_list_nested_array_or_field() {
 		$list = wp_filter_object_list(
 			$this->object_list,
 			array(
diff --git a/tests/phpunit/tests/functions/wpListPluck.php b/tests/phpunit/tests/functions/wpListPluck.php
index a2ac97b7adad2..10c78ed9bd3ff 100644
--- a/tests/phpunit/tests/functions/wpListPluck.php
+++ b/tests/phpunit/tests/functions/wpListPluck.php
@@ -10,7 +10,7 @@ class Tests_Functions_wpListPluck extends WP_UnitTestCase {
 	public $object_list = array();
 	public $array_list  = array();
 
-	function set_up() {
+	public function set_up() {
 		parent::set_up();
 		$this->array_list['foo'] = array(
 			'name'   => 'foo',
@@ -41,7 +41,7 @@ function set_up() {
 		}
 	}
 
-	function test_wp_list_pluck_array_and_object() {
+	public function test_wp_list_pluck_array_and_object() {
 		$list = wp_list_pluck( $this->object_list, 'name' );
 		$this->assertSame(
 			array(
@@ -66,7 +66,7 @@ function test_wp_list_pluck_array_and_object() {
 	/**
 	 * @ticket 28666
 	 */
-	function test_wp_list_pluck_index_key() {
+	public function test_wp_list_pluck_index_key() {
 		$list = wp_list_pluck( $this->array_list, 'name', 'id' );
 		$this->assertSame(
 			array(
@@ -81,7 +81,7 @@ function test_wp_list_pluck_index_key() {
 	/**
 	 * @ticket 28666
 	 */
-	function test_wp_list_pluck_object_index_key() {
+	public function test_wp_list_pluck_object_index_key() {
 		$list = wp_list_pluck( $this->object_list, 'name', 'id' );
 		$this->assertSame(
 			array(
@@ -96,7 +96,7 @@ function test_wp_list_pluck_object_index_key() {
 	/**
 	 * @ticket 28666
 	 */
-	function test_wp_list_pluck_missing_index_key() {
+	public function test_wp_list_pluck_missing_index_key() {
 		$list = wp_list_pluck( $this->array_list, 'name', 'nonexistent' );
 		$this->assertSame(
 			array(
@@ -111,7 +111,7 @@ function test_wp_list_pluck_missing_index_key() {
 	/**
 	 * @ticket 28666
 	 */
-	function test_wp_list_pluck_partial_missing_index_key() {
+	public function test_wp_list_pluck_partial_missing_index_key() {
 		$array_list = $this->array_list;
 		unset( $array_list['bar']['id'] );
 		$list = wp_list_pluck( $array_list, 'name', 'id' );
@@ -128,7 +128,7 @@ function test_wp_list_pluck_partial_missing_index_key() {
 	/**
 	 * @ticket 28666
 	 */
-	function test_wp_list_pluck_mixed_index_key() {
+	public function test_wp_list_pluck_mixed_index_key() {
 		$mixed_list        = $this->array_list;
 		$mixed_list['bar'] = (object) $mixed_list['bar'];
 		$list              = wp_list_pluck( $mixed_list, 'name', 'id' );
@@ -145,7 +145,7 @@ function test_wp_list_pluck_mixed_index_key() {
 	/**
 	 * @ticket 16895
 	 */
-	function test_wp_list_pluck_containing_references() {
+	public function test_wp_list_pluck_containing_references() {
 		$ref_list = array(
 			& $this->object_list['foo'],
 			& $this->object_list['bar'],
@@ -170,7 +170,7 @@ function test_wp_list_pluck_containing_references() {
 	/**
 	 * @ticket 16895
 	 */
-	function test_wp_list_pluck_containing_references_keys() {
+	public function test_wp_list_pluck_containing_references_keys() {
 		$ref_list = array(
 			& $this->object_list['foo'],
 			& $this->object_list['bar'],

From 6201d437e8571fc1418ce26e60fc6f810ae159f7 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 26 Aug 2021 17:55:02 +0000
Subject: [PATCH 044/257] Tests: Improve bootstrap error message for when
 `ABSPATH` folder does not exist.

The PHPUnit tests are/should generally be run on the `src` directory, so changes just made can be tested. While testing via the `build` directory is also still supported, this is not the default.

This was last changed in [50441], but that commit did not remove/update the error message thrown by the test bootstrap file.

This last change also did not take into account that that change meant that people had to update their own `wp`tests-config.php` file to match the change made in Core and would otherwise still get the outdated error message.

This commit changes the messaging in the test bootstrap file to be more in line with the current reality, while still accounting for the fact that tests can be run from both `src` as well as `build`.

Follow-up to [49569], [50441], [51581].
Props jrf, hellofromTonya.

git-svn-id: https://develop.svn.wordpress.org/trunk@51669 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/includes/bootstrap.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tests/phpunit/includes/bootstrap.php b/tests/phpunit/includes/bootstrap.php
index 9a4e5fc160748..dfb858c8c939b 100644
--- a/tests/phpunit/includes/bootstrap.php
+++ b/tests/phpunit/includes/bootstrap.php
@@ -31,8 +31,18 @@
 require_once __DIR__ . '/functions.php';
 
 if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS && ! is_dir( ABSPATH ) ) {
-	echo 'Error: The /build/ directory is missing! Please run `npm run build` prior to running PHPUnit.' . PHP_EOL;
-	exit( 1 );
+	if ( substr( ABSPATH, -7 ) !== '/build/' ) {
+		printf(
+			'Error: The ABSPATH constant in the `wp-tests-config.php` file is set to a non-existent path "%s". Please verify.' . PHP_EOL,
+			ABSPATH
+		);
+		exit( 1 );
+	} else {
+		echo 'Error: The PHPUnit tests should be run on the /src/ directory, not the /build/ directory.'
+			. ' Please update the ABSPATH constant in your `wp-tests-config.php` file to `dirname( __FILE__ ) . \'/src/\'`'
+			. ' or run `npm run build` prior to running PHPUnit.' . PHP_EOL;
+		exit( 1 );
+	}
 }
 
 $phpunit_version = tests_get_phpunit_version();

From 5d6e9971b30cd1c8f6de23b1ad2e9f49ce2c7cc3 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Thu, 26 Aug 2021 18:20:34 +0000
Subject: [PATCH 045/257] Build/Test Tools: Remove `shell: bash` from PHPUnit
 test workflow.

bash is the default shell for all non-Windows GitHub Action runners, so this is not necessary.

See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51670 602fd350-edb4-49c9-b593-d223f7449a82
---
 .github/workflows/phpunit-tests.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
index 641965103f47d..c855f0cd31348 100644
--- a/.github/workflows/phpunit-tests.yml
+++ b/.github/workflows/phpunit-tests.yml
@@ -127,7 +127,6 @@ jobs:
       - name: "Get last Monday's date"
         id: get-date
         run: echo "::set-output name=date::$(/bin/date -u --date='last Mon' "+%F")"
-        shell: bash
 
       - name: Get Composer cache directory
         id: composer-cache

From 80b24ab3f332883ba30a5ffe9642d956347a08bf Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Thu, 26 Aug 2021 18:21:49 +0000
Subject: [PATCH 046/257] Build/Test Tools: Remove `shell: bash` from code
 coverage workflow.

bash is the default shell for all non-Windows GitHub Action runners, so this is not necessary.

Follow up to [51670].
See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51671 602fd350-edb4-49c9-b593-d223f7449a82
---
 .github/workflows/test-coverage.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml
index 3c804c5ca6459..6df3d5189a3f0 100644
--- a/.github/workflows/test-coverage.yml
+++ b/.github/workflows/test-coverage.yml
@@ -90,7 +90,6 @@ jobs:
       - name: "Get last Monday's date"
         id: get-date
         run: echo "::set-output name=date::$(/bin/date -u --date='last Mon' "+%F")"
-        shell: bash
 
       - name: Get Composer cache directory
         id: composer-cache

From ebe147cb133bf2c54d1de171dbaee5079836629e Mon Sep 17 00:00:00 2001
From: Kelly Choyce-Dwan <ryelle@git.wordpress.org>
Date: Thu, 26 Aug 2021 18:23:49 +0000
Subject: [PATCH 047/257] Toolbar: Provide a CSS custom property for the admin
 bar height.

This new custom property, `--wp-admin--admin-bar--height`, reflects the admin bar's height and adjusts responsively on smaller screens. It can be used to offset content to avoid overlapping the admin bar, without needing to copy the media query.

This also removes a workaround only needed for Internet Explorer 6 and below.

Props nico23, sabernhardt.
Fixes #52623.



git-svn-id: https://develop.svn.wordpress.org/trunk@51672 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/admin-bar.php     | 2 --
 src/wp-includes/css/admin-bar.css | 8 ++++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/admin-bar.php b/src/wp-includes/admin-bar.php
index d36487ee561f5..b35a49fe1a8cd 100644
--- a/src/wp-includes/admin-bar.php
+++ b/src/wp-includes/admin-bar.php
@@ -1167,10 +1167,8 @@ function _admin_bar_bump_cb() {
 	?>
 <style<?php echo $type_attr; ?> media="screen">
 	html { margin-top: 32px !important; }
-	* html body { margin-top: 32px !important; }
 	@media screen and ( max-width: 782px ) {
 		html { margin-top: 46px !important; }
-		* html body { margin-top: 46px !important; }
 	}
 </style>
 	<?php
diff --git a/src/wp-includes/css/admin-bar.css b/src/wp-includes/css/admin-bar.css
index 3788753e8c937..5720af7b415a8 100644
--- a/src/wp-includes/css/admin-bar.css
+++ b/src/wp-includes/css/admin-bar.css
@@ -1,3 +1,7 @@
+html {
+	--wp-admin--admin-bar--height: 32px;
+}
+
 #wpadminbar * {
 	height: auto;
 	width: auto;
@@ -729,6 +733,10 @@ html:lang(he-il) .rtl #wpadminbar * {
 }
 
 @media screen and (max-width: 782px) {
+	html {
+		--wp-admin--admin-bar--height: 46px;
+	}
+
 	/* Toolbar Touchification*/
 	html #wpadminbar {
 		height: 46px;

From 62e8d8f1153152e2c3e9f55098b2668db8afcb19 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Thu, 26 Aug 2021 18:40:15 +0000
Subject: [PATCH 048/257] Build/Test Tools: Use list format when defining
 `environment` variables in Docker compose file.

This is the correct formatting detailed in the Docker `compose` documentation examples and helps to avoid ambiguities in the yaml parser when values that may cause warnings.

Props pbrearne, ocean90, johnbillion, desrosj.
Fixes #53820.

git-svn-id: https://develop.svn.wordpress.org/trunk@51673 602fd350-edb4-49c9-b593-d223f7449a82
---
 docker-compose.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 12f7772607e35..a77a309d7e1ab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,10 +37,10 @@ services:
       - wpdevnet
 
     environment:
-      LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
-      LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
-      PHP_FPM_UID: ${PHP_FPM_UID-1000}
-      PHP_FPM_GID: ${PHP_FPM_GID-1000}
+      - LOCAL_PHP_XDEBUG=${LOCAL_PHP_XDEBUG-false}
+      - LOCAL_PHP_MEMCACHED=${LOCAL_PHP_MEMCACHED-false}
+      - PHP_FPM_UID=${PHP_FPM_UID-1000}
+      - PHP_FPM_GID=${PHP_FPM_GID-1000}
 
     volumes:
       - ./tools/local-env/php-config.ini:/usr/local/etc/php/conf.d/php-config.ini
@@ -81,10 +81,10 @@ services:
       - wpdevnet
 
     environment:
-      LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
-      LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
-      PHP_FPM_UID: ${PHP_FPM_UID-1000}
-      PHP_FPM_GID: ${PHP_FPM_GID-1000}
+      - LOCAL_PHP_XDEBUG=${LOCAL_PHP_XDEBUG-false}
+      - LOCAL_PHP_MEMCACHED=${LOCAL_PHP_MEMCACHED-false}
+      - PHP_FPM_UID=${PHP_FPM_UID-1000}
+      - PHP_FPM_GID=${PHP_FPM_GID-1000}
 
     volumes:
       - ./:/var/www
@@ -102,14 +102,14 @@ services:
       - wpdevnet
 
     environment:
-      LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
-      LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
-      LOCAL_DIR: ${LOCAL_DIR-src}
-      WP_MULTISITE: ${WP_MULTISITE-false}
-      PHP_FPM_UID: ${PHP_FPM_UID-1000}
-      PHP_FPM_GID: ${PHP_FPM_GID-1000}
-      GITHUB_REF: ${GITHUB_REF-false}
-      GITHUB_EVENT_NAME: ${GITHUB_EVENT_NAME-false}
+      - LOCAL_PHP_XDEBUG=${LOCAL_PHP_XDEBUG-false}
+      - LOCAL_PHP_MEMCACHED=${LOCAL_PHP_MEMCACHED-false}
+      - PHP_FPM_UID=${PHP_FPM_UID-1000}
+      - PHP_FPM_GID=${PHP_FPM_GID-1000}
+      - LOCAL_DIR=${LOCAL_DIR-src}
+      - WP_MULTISITE=${WP_MULTISITE-false}
+      - GITHUB_REF=${GITHUB_REF-false}
+      - GITHUB_EVENT_NAME=${GITHUB_EVENT_NAME-false}
 
     volumes:
       - ./tools/local-env/phpunit-config.ini:/usr/local/etc/php/conf.d/phpunit-config.ini

From 44180691e68fc87458bbdc5280c77a1ca1190083 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Thu, 26 Aug 2021 19:09:16 +0000
Subject: [PATCH 049/257] Editor: Ensure block attribute serialization in PHP
 matches the JavaScript equivalent.

The `serializeAttributes()` function in JavaScript uses `JSON.stringify`, which does not encode slashes and unicode characters by default. This resulted in the PHP serialization through `json_encode()` producing different results.

This also switches from `json_encode()` to `wp_json_encode()` to prevent failures when any non UTF-8 characters are included.

Props kevinfodness, SergeyBiryukov, timothyblynjacobs.
Fixes #53936.

git-svn-id: https://develop.svn.wordpress.org/trunk@51674 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/blocks.php               | 6 +++++-
 tests/phpunit/tests/blocks/serialize.php | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php
index 5351ab94aaa4c..c94a5d5e5e45c 100644
--- a/src/wp-includes/blocks.php
+++ b/src/wp-includes/blocks.php
@@ -488,13 +488,17 @@ function get_dynamic_block_names() {
  * substitution for characters which might otherwise interfere with embedding
  * the result in an HTML comment.
  *
+ * This function must produce output that remains in sync with the output of
+ * the serializeAttributes JavaScript function in the block editor in order
+ * to ensure consistent operation between PHP and JavaScript.
+ *
  * @since 5.3.1
  *
  * @param array $block_attributes Attributes object.
  * @return string Serialized attributes.
  */
 function serialize_block_attributes( $block_attributes ) {
-	$encoded_attributes = json_encode( $block_attributes );
+	$encoded_attributes = wp_json_encode( $block_attributes, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE );
 	$encoded_attributes = preg_replace( '/--/', '\\u002d\\u002d', $encoded_attributes );
 	$encoded_attributes = preg_replace( '/</', '\\u003c', $encoded_attributes );
 	$encoded_attributes = preg_replace( '/>/', '\\u003e', $encoded_attributes );
diff --git a/tests/phpunit/tests/blocks/serialize.php b/tests/phpunit/tests/blocks/serialize.php
index 199a72007ecd0..f7077b7c28c7e 100644
--- a/tests/phpunit/tests/blocks/serialize.php
+++ b/tests/phpunit/tests/blocks/serialize.php
@@ -47,6 +47,9 @@ function data_serialize_identity_from_parsed() {
 
 			// Block with attribute values that may conflict with HTML comment.
 			array( '<!-- wp:attributes {"key":"\\u002d\\u002d\\u003c\\u003e\\u0026\\u0022"} /-->' ),
+
+			// Block with attribute values that should not be escaped.
+			array( '<!-- wp:attributes {"key":"€1.00 / 3 for €2.00"} /-->' ),
 		);
 	}
 

From f838c865734d0abe249d46c692a663a5d7425d97 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Thu, 26 Aug 2021 19:27:59 +0000
Subject: [PATCH 050/257] Security: Correct the inline docs for the
 `wp_kses_allowed_html` filter.

Props peterwilsoncc

Fixes #53597


git-svn-id: https://develop.svn.wordpress.org/trunk@51675 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/kses.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/wp-includes/kses.php b/src/wp-includes/kses.php
index 527d374c9cdeb..cf00df3cbda09 100644
--- a/src/wp-includes/kses.php
+++ b/src/wp-includes/kses.php
@@ -846,22 +846,26 @@ function wp_kses_one_attr( $string, $element ) {
  *
  * @param string|array $context The context for which to retrieve tags. Allowed values are 'post',
  *                              'strip', 'data', 'entities', or the name of a field filter such as
- *                              'pre_user_description'.
+ *                              'pre_user_description', or an array of allowed HTML elements and attributes.
  * @return array Array of allowed HTML tags and their allowed attributes.
  */
 function wp_kses_allowed_html( $context = '' ) {
 	global $allowedposttags, $allowedtags, $allowedentitynames;
 
 	if ( is_array( $context ) ) {
+		// When `$context` is an array it's actually an array of allowed HTML elements and attributes.
+		$html    = $context;
+		$context = 'explicit';
+
 		/**
 		 * Filters the HTML tags that are allowed for a given context.
 		 *
 		 * @since 3.5.0
 		 *
-		 * @param array[]|string $context      Context to judge allowed tags by.
-		 * @param string         $context_type Context name.
+		 * @param array[] $html    Allowed HTML tags.
+		 * @param string  $context Context name.
 		 */
-		return apply_filters( 'wp_kses_allowed_html', $context, 'explicit' );
+		return apply_filters( 'wp_kses_allowed_html', $html, $context );
 	}
 
 	switch ( $context ) {

From 524c2a6fd3d8818dd4789faffd4e18a1d458e320 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Thu, 26 Aug 2021 19:33:22 +0000
Subject: [PATCH 051/257] REST API: Correct the description for the
 `last_updated` property in the block-directory endpoint.

This field shows the date in ISO 8601 format.

Fixes #53595


git-svn-id: https://develop.svn.wordpress.org/trunk@51676 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../endpoints/class-wp-rest-block-directory-controller.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-directory-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-directory-controller.php
index 2f275072ed6a3..3f54f24436513 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-directory-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-directory-controller.php
@@ -270,7 +270,7 @@ public function get_item_schema() {
 					'context'     => array( 'view' ),
 				),
 				'last_updated'        => array(
-					'description' => __( 'The date when the block was last updated, in fuzzy human readable format.' ),
+					'description' => __( 'The date when the block was last updated.' ),
 					'type'        => 'string',
 					'format'      => 'date-time',
 					'context'     => array( 'view' ),

From 2438aca5fce96f0363d3606069ab7bd0f5be51fc Mon Sep 17 00:00:00 2001
From: Mike Schroder <mikeschroder@git.wordpress.org>
Date: Fri, 27 Aug 2021 09:35:17 +0000
Subject: [PATCH 052/257] Customizer: Respect `prefers-reduced-motion` media
 query in Customizer animations.

Disables Customizer animations when media query `prefers-reduced-motion: reduce` returns true.

Continues the effort to reduce motion within the WordPress admin panel when users have enabled this feature in their operating system or browser.

It has the additional effect of making the Block Editor's end-to-end tests run faster, as explored initially with a different approach in #53562.

See https://github.com/WordPress/gutenberg/issues/32024 for the related Gutenberg issue.

See https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-reduced-motion for ways to enable this feature on various platforms.

Props kevin940726, isabel_brison, zieladam, youknowriad, desrosj, mamaduka, mikeschroder.
Previously [51389], [50028], [47813].
Fixes #53542.

git-svn-id: https://develop.svn.wordpress.org/trunk@51677 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/js/_enqueues/wp/customize/controls.js | 19 +++++++++----
 src/wp-admin/css/customize-controls.css   | 33 +++++++++++++++++++++++
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/src/js/_enqueues/wp/customize/controls.js b/src/js/_enqueues/wp/customize/controls.js
index c8ee3de8dfd99..0496435e42827 100644
--- a/src/js/_enqueues/wp/customize/controls.js
+++ b/src/js/_enqueues/wp/customize/controls.js
@@ -6,6 +6,12 @@
 (function( exports, $ ){
 	var Container, focus, normalizedTransitionendEventName, api = wp.customize;
 
+	var reducedMotionMediaQuery = window.matchMedia( '(prefers-reduced-motion: reduce)' );
+	var isReducedMotion = reducedMotionMediaQuery.matches;
+	reducedMotionMediaQuery.addEventListener( 'change' , function handleReducedMotionChange( event ) {
+		isReducedMotion = event.matches;
+	});
+
 	api.OverlayNotification = api.Notification.extend(/** @lends wp.customize.OverlayNotification.prototype */{
 
 		/**
@@ -1264,11 +1270,14 @@
 		 * @return {void}
 		 */
 		_animateChangeExpanded: function( completeCallback ) {
-			// Return if CSS transitions are not supported.
-			if ( ! normalizedTransitionendEventName ) {
-				if ( completeCallback ) {
-					completeCallback();
-				}
+			// Return if CSS transitions are not supported or if reduced motion is enabled.
+			if ( ! normalizedTransitionendEventName || isReducedMotion ) {
+				// Schedule the callback until the next tick to prevent focus loss.
+				_.defer( function () {
+					if ( completeCallback ) {
+						completeCallback();
+					}
+				} );
 				return;
 			}
 
diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css
index 7685073d9ae61..7e50a59bb5fa2 100644
--- a/src/wp-admin/css/customize-controls.css
+++ b/src/wp-admin/css/customize-controls.css
@@ -105,6 +105,12 @@ body:not(.ready) #customize-save-button-wrapper .save {
 	height: 100%;
 }
 
+@media (prefers-reduced-motion: reduce) {
+	#customize-sidebar-outer-content {
+		transition: none;
+	}
+}
+
 #customize-theme-controls .control-section-outer {
 	display: none !important;
 }
@@ -123,6 +129,12 @@ body:not(.ready) #customize-save-button-wrapper .save {
 	transition: left .18s;
 }
 
+@media (prefers-reduced-motion: reduce) {
+	.outer-section-open .wp-full-overlay.expanded #customize-sidebar-outer-content {
+		transition: none;
+	}
+}
+
 .customize-outer-pane-parent {
 	margin: 0;
 }
@@ -537,6 +549,13 @@ body.trashing #publish-settings {
 		.15s border-color ease-in-out;
 }
 
+@media (prefers-reduced-motion: reduce) {
+	#customize-theme-controls .accordion-section-title,
+	#customize-outer-theme-controls .accordion-section-title {
+		transition: none;
+	}
+}
+
 #customize-controls #customize-theme-controls .customize-themes-panel .accordion-section-title {
 	color: #50575e;
 	background-color: #fff;
@@ -635,6 +654,14 @@ body.trashing #publish-settings {
 	transition: 0.18s transform cubic-bezier(0.645, 0.045, 0.355, 1); /* easeInOutCubic */
 }
 
+@media (prefers-reduced-motion: reduce) {
+	#customize-info,
+	#customize-theme-controls .customize-pane-parent,
+	#customize-theme-controls .customize-pane-child {
+		transition: none;
+	}
+}
+
 #customize-theme-controls .customize-pane-child.skip-transition {
 	transition: none;
 }
@@ -1723,6 +1750,12 @@ p.customize-section-description {
 	z-index: 20;
 }
 
+@media (prefers-reduced-motion: reduce) {
+	.control-panel-themes .customize-themes-full-container {
+		transition: none;
+	}
+}
+
 @media screen and (min-width: 1670px) {
 	.control-panel-themes .customize-themes-full-container {
 		width: 82%;

From ef41195ee3a76ab5b439016b9558db6d73474830 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Fri, 27 Aug 2021 15:42:36 +0000
Subject: [PATCH 053/257] Plugins: Display a message on Plugins list table if a
 plugin requires a higher version of PHP or WordPress.

Installation and activation of incompatible plugins was previously disallowed in [43436] and [44978], but if such a plugin was installed manually, there was nothing on the Plugins screen that would show its compatibility status.

Showing an appropriate notice with a documentation link makes the UI more consistent and improves user experience.

Follow-up to [43436], [44937], [44939], [44978], [45043], [45165], [45546], [47573], [47816], [47819], [48172], [48636], [48637], [48638], [48640], [48652], [48653], [48654], [48660].

Props TacoVerdo, SergeyBiryukov.
Fixes #53990.

git-svn-id: https://develop.svn.wordpress.org/trunk@51678 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/list-tables.css              |   2 +-
 .../class-wp-plugin-install-list-table.php    |  53 ++++----
 .../includes/class-wp-plugins-list-table.php  | 118 ++++++++++++++----
 3 files changed, 128 insertions(+), 45 deletions(-)

diff --git a/src/wp-admin/css/list-tables.css b/src/wp-admin/css/list-tables.css
index 2cb19dcd6c012..3b9bb0e945ea4 100644
--- a/src/wp-admin/css/list-tables.css
+++ b/src/wp-admin/css/list-tables.css
@@ -797,7 +797,7 @@ p.pagenav {
 }
 
 .row-actions {
-	color: #dcdcde;
+	color: #a7aaad;
 	font-size: 13px;
 	padding: 2px 0 0;
 	position: relative;
diff --git a/src/wp-admin/includes/class-wp-plugin-install-list-table.php b/src/wp-admin/includes/class-wp-plugin-install-list-table.php
index 9c5f382e9dded..59bce7b8d1d72 100644
--- a/src/wp-admin/includes/class-wp-plugin-install-list-table.php
+++ b/src/wp-admin/includes/class-wp-plugin-install-list-table.php
@@ -586,31 +586,38 @@ public function display_rows() {
 								_x( 'Active', 'plugin' )
 							);
 						} elseif ( current_user_can( 'activate_plugin', $status['file'] ) ) {
-							$button_text = __( 'Activate' );
-							/* translators: %s: Plugin name. */
-							$button_label = _x( 'Activate %s', 'plugin' );
-							$activate_url = add_query_arg(
-								array(
-									'_wpnonce' => wp_create_nonce( 'activate-plugin_' . $status['file'] ),
-									'action'   => 'activate',
-									'plugin'   => $status['file'],
-								),
-								network_admin_url( 'plugins.php' )
-							);
-
-							if ( is_network_admin() ) {
-								$button_text = __( 'Network Activate' );
+							if ( $compatible_php && $compatible_wp ) {
+								$button_text = __( 'Activate' );
 								/* translators: %s: Plugin name. */
-								$button_label = _x( 'Network Activate %s', 'plugin' );
-								$activate_url = add_query_arg( array( 'networkwide' => 1 ), $activate_url );
-							}
+								$button_label = _x( 'Activate %s', 'plugin' );
+								$activate_url = add_query_arg(
+									array(
+										'_wpnonce' => wp_create_nonce( 'activate-plugin_' . $status['file'] ),
+										'action'   => 'activate',
+										'plugin'   => $status['file'],
+									),
+									network_admin_url( 'plugins.php' )
+								);
 
-							$action_links[] = sprintf(
-								'<a href="%1$s" class="button activate-now" aria-label="%2$s">%3$s</a>',
-								esc_url( $activate_url ),
-								esc_attr( sprintf( $button_label, $plugin['name'] ) ),
-								$button_text
-							);
+								if ( is_network_admin() ) {
+									$button_text = __( 'Network Activate' );
+									/* translators: %s: Plugin name. */
+									$button_label = _x( 'Network Activate %s', 'plugin' );
+									$activate_url = add_query_arg( array( 'networkwide' => 1 ), $activate_url );
+								}
+
+								$action_links[] = sprintf(
+									'<a href="%1$s" class="button activate-now" aria-label="%2$s">%3$s</a>',
+									esc_url( $activate_url ),
+									esc_attr( sprintf( $button_label, $plugin['name'] ) ),
+									$button_text
+								);
+							} else {
+								$action_links[] = sprintf(
+									'<button type="button" class="button button-disabled" disabled="disabled">%s</button>',
+									_x( 'Cannot Activate', 'plugin' )
+								);
+							}
 						} else {
 							$action_links[] = sprintf(
 								'<button type="button" class="button button-disabled" disabled="disabled">%s</button>',
diff --git a/src/wp-admin/includes/class-wp-plugins-list-table.php b/src/wp-admin/includes/class-wp-plugins-list-table.php
index 9b74ca3c38ce1..a5831dad175fd 100644
--- a/src/wp-admin/includes/class-wp-plugins-list-table.php
+++ b/src/wp-admin/includes/class-wp-plugins-list-table.php
@@ -739,6 +739,12 @@ public function single_row( $item ) {
 		$restrict_network_active = false;
 		$restrict_network_only   = false;
 
+		$requires_php = isset( $plugin_data['RequiresPHP'] ) ? $plugin_data['RequiresPHP'] : null;
+		$requires_wp  = isset( $plugin_data['RequiresWP'] ) ? $plugin_data['RequiresWP'] : null;
+
+		$compatible_php = is_php_version_compatible( $requires_php );
+		$compatible_wp  = is_wp_version_compatible( $requires_wp );
+
 		if ( 'mustuse' === $context ) {
 			$is_active = true;
 		} elseif ( 'dropins' === $context ) {
@@ -792,14 +798,21 @@ public function single_row( $item ) {
 					}
 				} else {
 					if ( current_user_can( 'manage_network_plugins' ) ) {
-						$actions['activate'] = sprintf(
-							'<a href="%s" id="activate-%s" class="edit" aria-label="%s">%s</a>',
-							wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file ),
-							esc_attr( $plugin_id_attr ),
-							/* translators: %s: Plugin name. */
-							esc_attr( sprintf( _x( 'Network Activate %s', 'plugin' ), $plugin_data['Name'] ) ),
-							__( 'Network Activate' )
-						);
+						if ( $compatible_php && $compatible_wp ) {
+							$actions['activate'] = sprintf(
+								'<a href="%s" id="activate-%s" class="edit" aria-label="%s">%s</a>',
+								wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file ),
+								esc_attr( $plugin_id_attr ),
+								/* translators: %s: Plugin name. */
+								esc_attr( sprintf( _x( 'Network Activate %s', 'plugin' ), $plugin_data['Name'] ) ),
+								__( 'Network Activate' )
+							);
+						} else {
+							$actions['activate'] = sprintf(
+								'<span>%s</span>',
+								_x( 'Cannot Activate', 'plugin' )
+							);
+						}
 					}
 
 					if ( current_user_can( 'delete_plugins' ) && ! is_plugin_active( $plugin_file ) ) {
@@ -846,14 +859,21 @@ public function single_row( $item ) {
 					}
 				} else {
 					if ( current_user_can( 'activate_plugin', $plugin_file ) ) {
-						$actions['activate'] = sprintf(
-							'<a href="%s" id="activate-%s" class="edit" aria-label="%s">%s</a>',
-							wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file ),
-							esc_attr( $plugin_id_attr ),
-							/* translators: %s: Plugin name. */
-							esc_attr( sprintf( _x( 'Activate %s', 'plugin' ), $plugin_data['Name'] ) ),
-							__( 'Activate' )
-						);
+						if ( $compatible_php && $compatible_wp ) {
+							$actions['activate'] = sprintf(
+								'<a href="%s" id="activate-%s" class="edit" aria-label="%s">%s</a>',
+								wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file ),
+								esc_attr( $plugin_id_attr ),
+								/* translators: %s: Plugin name. */
+								esc_attr( sprintf( _x( 'Activate %s', 'plugin' ), $plugin_data['Name'] ) ),
+								__( 'Activate' )
+							);
+						} else {
+							$actions['activate'] = sprintf(
+								'<span>%s</span>',
+								_x( 'Cannot Activate', 'plugin' )
+							);
+						}
 					}
 
 					if ( ! is_multisite() && current_user_can( 'delete_plugins' ) ) {
@@ -945,10 +965,8 @@ public function single_row( $item ) {
 
 		}
 
-		$requires_php   = isset( $plugin_data['requires_php'] ) ? $plugin_data['requires_php'] : null;
-		$compatible_php = is_php_version_compatible( $requires_php );
-		$class          = $is_active ? 'active' : 'inactive';
-		$checkbox_id    = 'checkbox_' . md5( $plugin_file );
+		$class       = $is_active ? 'active' : 'inactive';
+		$checkbox_id = 'checkbox_' . md5( $plugin_file );
 
 		if ( $restrict_network_active || $restrict_network_only || in_array( $status, array( 'mustuse', 'dropins' ), true ) || ! $compatible_php ) {
 			$checkbox = '';
@@ -968,7 +986,9 @@ public function single_row( $item ) {
 			$plugin_name = $plugin_data['Name'];
 		}
 
-		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) ) {
+		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] )
+			|| ! $compatible_php || ! $compatible_wp
+		) {
 			$class .= ' update';
 		}
 
@@ -1190,6 +1210,62 @@ public function single_row( $item ) {
 
 		echo '</tr>';
 
+		if ( ! $compatible_php || ! $compatible_wp ) {
+			printf(
+				'<tr class="plugin-update-tr">' .
+				'<td colspan="%s" class="plugin-update colspanchange">' .
+				'<div class="update-message notice inline notice-error notice-alt"><p>',
+				esc_attr( $this->get_column_count() )
+			);
+
+			if ( ! $compatible_php && ! $compatible_wp ) {
+				_e( 'This plugin doesn&#8217;t work with your versions of WordPress and PHP.' );
+				if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) {
+					printf(
+						/* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */
+						' ' . __( '<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.' ),
+						self_admin_url( 'update-core.php' ),
+						esc_url( wp_get_update_php_url() )
+					);
+					wp_update_php_annotation( '</p><p><em>', '</em>' );
+				} elseif ( current_user_can( 'update_core' ) ) {
+					printf(
+						/* translators: %s: URL to WordPress Updates screen. */
+						' ' . __( '<a href="%s">Please update WordPress</a>.' ),
+						self_admin_url( 'update-core.php' )
+					);
+				} elseif ( current_user_can( 'update_php' ) ) {
+					printf(
+						/* translators: %s: URL to Update PHP page. */
+						' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
+						esc_url( wp_get_update_php_url() )
+					);
+					wp_update_php_annotation( '</p><p><em>', '</em>' );
+				}
+			} elseif ( ! $compatible_wp ) {
+				_e( 'This plugin doesn&#8217;t work with your version of WordPress.' );
+				if ( current_user_can( 'update_core' ) ) {
+					printf(
+						/* translators: %s: URL to WordPress Updates screen. */
+						' ' . __( '<a href="%s">Please update WordPress</a>.' ),
+						self_admin_url( 'update-core.php' )
+					);
+				}
+			} elseif ( ! $compatible_php ) {
+				_e( 'This plugin doesn&#8217;t work with your version of PHP.' );
+				if ( current_user_can( 'update_php' ) ) {
+					printf(
+						/* translators: %s: URL to Update PHP page. */
+						' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
+						esc_url( wp_get_update_php_url() )
+					);
+					wp_update_php_annotation( '</p><p><em>', '</em>' );
+				}
+			}
+
+			echo '</p></div></td></tr>';
+		}
+
 		/**
 		 * Fires after each row in the Plugins list table.
 		 *

From 52fe9ffbd59955c30e1e91ab0ba0f04e72243d8d Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Fri, 27 Aug 2021 17:34:29 +0000
Subject: [PATCH 054/257] Build/Test Tools: Preserve `text within backticks` in
 Slack notifications.

Props SergeyBiryukov, johnbillion, earnjam.
See #52644.

git-svn-id: https://develop.svn.wordpress.org/trunk@51679 602fd350-edb4-49c9-b593-d223f7449a82
---
 .github/workflows/slack-notifications.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/slack-notifications.yml b/.github/workflows/slack-notifications.yml
index 5d4981b901df0..bc3caa63c6a4b 100644
--- a/.github/workflows/slack-notifications.yml
+++ b/.github/workflows/slack-notifications.yml
@@ -63,7 +63,7 @@ jobs:
       - name: Prepare commit message.
         id: commit-message
         run: |
-          COMMIT_MESSAGE=$(cat <<'EOF' | awk 'NR==1' | sed 's/\"/\\"/g'
+          COMMIT_MESSAGE=$(cat <<'EOF' | awk 'NR==1' | sed 's/`/\\`/g' | sed 's/\"/\\"/g'
           ${{ github.event.workflow_run.head_commit.message }}
           EOF
           )

From 780be4296ab9fc6418b2d3df43be658c2d477c07 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sat, 28 Aug 2021 01:24:13 +0000
Subject: [PATCH 055/257] Customize: Prevent collapsing expanded
 panel/section/control when `Esc` is pressed on a block editor instance.

This ensures that the current panel is not collapsed when hitting `Esc` with the focus on the widget block editor.

Follow-up to [37347], [39120].

Props gwwar, dlh.
Fixes #54030.

git-svn-id: https://develop.svn.wordpress.org/trunk@51682 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/js/_enqueues/wp/customize/controls.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/js/_enqueues/wp/customize/controls.js b/src/js/_enqueues/wp/customize/controls.js
index 0496435e42827..5656b41687d3a 100644
--- a/src/js/_enqueues/wp/customize/controls.js
+++ b/src/js/_enqueues/wp/customize/controls.js
@@ -8461,6 +8461,13 @@
 				return;
 			}
 
+			// Abort if we're inside of a block editor instance.
+			if ( event.target.closest( '.block-editor-writing-flow' ) !== null
+				|| event.target.closest( '.block-editor-block-list__block-popover' ) !== null
+			) {
+				return;
+			}
+
 			// Check for expanded expandable controls (e.g. widgets and nav menus items), sections, and panels.
 			api.control.each( function( control ) {
 				if ( control.expanded && control.expanded() && _.isFunction( control.collapse ) ) {

From a632c8592b0bffb6be89ae943a8a640a4e3d562a Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sat, 28 Aug 2021 01:33:06 +0000
Subject: [PATCH 056/257] Coding Standards: Fix WPCS issue in [51682].

This fixes a "Misleading line break before `'||'`; readers may interpret this as an expression boundary" error.

See #54030.

git-svn-id: https://develop.svn.wordpress.org/trunk@51683 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/js/_enqueues/wp/customize/controls.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/js/_enqueues/wp/customize/controls.js b/src/js/_enqueues/wp/customize/controls.js
index 5656b41687d3a..315e42d4c8267 100644
--- a/src/js/_enqueues/wp/customize/controls.js
+++ b/src/js/_enqueues/wp/customize/controls.js
@@ -8462,8 +8462,8 @@
 			}
 
 			// Abort if we're inside of a block editor instance.
-			if ( event.target.closest( '.block-editor-writing-flow' ) !== null
-				|| event.target.closest( '.block-editor-block-list__block-popover' ) !== null
+			if ( event.target.closest( '.block-editor-writing-flow' ) !== null ||
+				event.target.closest( '.block-editor-block-list__block-popover' ) !== null
 			) {
 				return;
 			}

From b29e32c28f2ee1afb7676dea2787c5a175ed108c Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Sat, 28 Aug 2021 13:44:52 +0000
Subject: [PATCH 057/257] Administration: Remove a misleading pointer cursor
 from list items in the admin menu.

This prevents unclickable areas within the menu from appearing clickable.

Props circlecube, kurudrive, ryelle, opurockey

Fixes #51551


git-svn-id: https://develop.svn.wordpress.org/trunk@51684 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/admin-menu.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/wp-admin/css/admin-menu.css b/src/wp-admin/css/admin-menu.css
index 801d518a859f5..593157019669b 100644
--- a/src/wp-admin/css/admin-menu.css
+++ b/src/wp-admin/css/admin-menu.css
@@ -161,7 +161,6 @@
 #adminmenu li {
 	margin: 0;
 	padding: 0;
-	cursor: pointer;
 }
 
 #adminmenu a {

From 29531de7685a8d166707a0f2409ab8517b1b2dff Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Sat, 28 Aug 2021 21:16:22 +0000
Subject: [PATCH 058/257] Build/Test Tools: Install the Composer package
 dependencies within the Docker environment as part of the local development
 environment installation and testing processes.

This makes the use of Composer on the host machine optional when using the Docker environment, which means there is no change to the process for installing, updating, and running the tests since [51559].

Props hellofromTonya, azaozz, netweb, desrosj, jrf, johnbillion

Fixes #53945


git-svn-id: https://develop.svn.wordpress.org/trunk@51685 602fd350-edb4-49c9-b593-d223f7449a82
---
 package.json                       | 4 ++--
 tools/local-env/scripts/install.js | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d680c53851aef..ce21d01bc7a1f 100644
--- a/package.json
+++ b/package.json
@@ -170,8 +170,8 @@
 		"env:cli": "node ./tools/local-env/scripts/docker.js run cli",
 		"env:logs": "node ./tools/local-env/scripts/docker.js logs",
 		"env:pull": "node ./tools/local-env/scripts/docker.js pull",
-		"test:php": "node ./tools/local-env/scripts/docker.js run --rm phpunit phpunit",
-		"test:php-composer": "node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit",
+		"test:php": "node ./tools/local-env/scripts/docker.js run -T php composer update -W && node ./tools/local-env/scripts/docker.js run --rm phpunit phpunit",
+		"test:php-composer": "node ./tools/local-env/scripts/docker.js run -T php composer update -W && node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit",
 		"test:e2e": "node ./tests/e2e/run-tests.js",
 		"wp-packages-update": "wp-scripts packages-update"
 	}
diff --git a/tools/local-env/scripts/install.js b/tools/local-env/scripts/install.js
index 4a21b99953cb1..762273598e77d 100644
--- a/tools/local-env/scripts/install.js
+++ b/tools/local-env/scripts/install.js
@@ -22,6 +22,8 @@ renameSync( 'src/wp-config.php', 'wp-config.php' );
 
 install_wp_importer();
 
+install_composer_dependencies();
+
 // Read in wp-tests-config-sample.php, edit it to work with our config, then write it to wp-tests-config.php.
 const testConfig = readFileSync( 'wp-tests-config-sample.php', 'utf8' )
 	.replace( 'youremptytestdbnamehere', 'wordpress_develop_tests' )
@@ -57,3 +59,10 @@ function install_wp_importer() {
 	execSync( `docker-compose exec -T php rm -rf ${testPluginDirectory}`, { stdio: 'inherit' } );
 	execSync( `docker-compose exec -T php git clone https://github.com/WordPress/wordpress-importer.git ${testPluginDirectory} --depth=1`, { stdio: 'inherit' } );
 }
+
+/**
+ * Installs the Composer package dependencies within the Docker environment.
+ */
+function install_composer_dependencies() {
+	execSync( `docker-compose run -T php composer update -W`, { stdio: 'inherit' } );
+}

From 8dee6dcc55f635e58e0a5ad8b29329a33b33dfc5 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sun, 29 Aug 2021 01:32:46 +0000
Subject: [PATCH 059/257] Filesystem API: Make sure to only call `fread()` on
 non-empty files in `PclZip::privAddFile()`.

This avoids a fatal error on PHP 8 caused by passing a zero value to `fread()` as the `$length` argument, which must be greater than zero.

This commit also amends the previous solution for similar issues elsewhere in the file to ensure consistent type for string values, instead of changing the type from `string` to `bool` when trying to read from an empty file.

Follow-up to [50355].

Props DavidAnderson, jrf, SergeyBiryukov.
Fixes #54036.

git-svn-id: https://develop.svn.wordpress.org/trunk@51686 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-pclzip.php | 27 +++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/wp-admin/includes/class-pclzip.php b/src/wp-admin/includes/class-pclzip.php
index b8f2fdca861cf..b1b39e2dfe67b 100644
--- a/src/wp-admin/includes/class-pclzip.php
+++ b/src/wp-admin/includes/class-pclzip.php
@@ -2674,7 +2674,12 @@ function privAddFile($p_filedescr, &$p_header, &$p_options)
         }
 
         // ----- Read the file content
-        $v_content = @fread($v_file, $p_header['size']);
+        if ($p_header['size'] > 0) {
+          $v_content = @fread($v_file, $p_header['size']);
+        }
+        else {
+          $v_content = '';
+        }
 
         // ----- Close the file
         @fclose($v_file);
@@ -3884,11 +3889,11 @@ function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path,
 
 
             // ----- Read the compressed file in a buffer (one shot)
-            if ( $p_entry['compressed_size'] > 0 ) {
+            if ($p_entry['compressed_size'] > 0) {
               $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
             }
             else {
-              $v_buffer = false;
+              $v_buffer = '';
             }
 
             // ----- Decompress the file
@@ -4101,11 +4106,11 @@ function privExtractFileInOutput(&$p_entry, &$p_options)
         if ($p_entry['compressed_size'] == $p_entry['size']) {
 
           // ----- Read the file in a buffer (one shot)
-          if ( $p_entry['compressed_size'] > 0 ) {
+          if ($p_entry['compressed_size'] > 0) {
             $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
           }
           else {
-            $v_buffer = false;
+            $v_buffer = '';
           }
 
           // ----- Send the file to the output
@@ -4115,11 +4120,11 @@ function privExtractFileInOutput(&$p_entry, &$p_options)
         else {
 
           // ----- Read the compressed file in a buffer (one shot)
-          if ( $p_entry['compressed_size'] > 0 ) {
+          if ($p_entry['compressed_size'] > 0) {
             $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
           }
           else {
-            $v_buffer = false;
+            $v_buffer = '';
           }
 
           // ----- Decompress the file
@@ -4224,21 +4229,21 @@ function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
         if ($p_entry['compression'] == 0) {
 
           // ----- Reading the file
-          if ( $p_entry['compressed_size'] > 0 ) {
+          if ($p_entry['compressed_size'] > 0) {
             $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
           }
           else {
-            $p_string = false;
+            $p_string = '';
           }
         }
         else {
 
           // ----- Reading the file
-          if ( $p_entry['compressed_size'] > 0 ) {
+          if ($p_entry['compressed_size'] > 0) {
             $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
           }
           else {
-            $v_data = false;
+            $v_data = '';
           }
 
           // ----- Decompress the file

From 485c6b83dbaa02bbbbb8e7fa82ef72eb18bd2333 Mon Sep 17 00:00:00 2001
From: Peter Wilson <peterwilsoncc@git.wordpress.org>
Date: Mon, 30 Aug 2021 04:11:30 +0000
Subject: [PATCH 060/257] Menus: Save display locations for new menus.

Fixes a bug preventing the locations saving when creating a new menu. Introduced in [50938].

Props dlh, andraganescu, mukesh27, desrosj.
Fixes #53877.



git-svn-id: https://develop.svn.wordpress.org/trunk@51688 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/nav-menus.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/wp-admin/nav-menus.php b/src/wp-admin/nav-menus.php
index 272aa9b9e6b23..d340fb6b67708 100644
--- a/src/wp-admin/nav-menus.php
+++ b/src/wp-admin/nav-menus.php
@@ -316,6 +316,7 @@
 		check_admin_referer( 'update-nav_menu', 'update-nav-menu-nonce' );
 
 		// Merge new and existing menu locations if any new ones are set.
+		$new_menu_locations = array();
 		if ( isset( $_POST['menu-locations'] ) ) {
 			$new_menu_locations = array_map( 'absint', $_POST['menu-locations'] );
 			$menu_locations     = array_merge( $menu_locations, $new_menu_locations );
@@ -353,6 +354,15 @@
 								break; // There should only be 1.
 						}
 
+						set_theme_mod( 'nav_menu_locations', $locations );
+					} elseif ( count( $new_menu_locations ) > 0 ) {
+						// If locations have been selected for the new menu, save those.
+						$locations = get_nav_menu_locations();
+
+						foreach ( array_keys( $new_menu_locations ) as $location ) {
+							$locations[ $location ] = $nav_menu_selected_id;
+						}
+
 						set_theme_mod( 'nav_menu_locations', $locations );
 					}
 

From bb3075d642159042dcc8b05050281b23bc73a00e Mon Sep 17 00:00:00 2001
From: Peter Wilson <peterwilsoncc@git.wordpress.org>
Date: Mon, 30 Aug 2021 04:34:19 +0000
Subject: [PATCH 061/257] Build: Remove `css/dist` in `grunt clean` command.

Modify the `grunt clean:css` command to include the folder `wp-includes/css/dist` to ensure legacy files do not remain if the built files are removed/relocated.

Props desrosj, netweb.
Fixes #53719.



git-svn-id: https://develop.svn.wordpress.org/trunk@51689 602fd350-edb4-49c9-b593-d223f7449a82
---
 Gruntfile.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gruntfile.js b/Gruntfile.js
index 7aa793a089fc3..d273eac5e65b9 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -115,6 +115,7 @@ module.exports = function(grunt) {
 				WORKING_DIR + 'wp-admin/css/*-rtl*.css',
 				WORKING_DIR + 'wp-includes/css/*.min.css',
 				WORKING_DIR + 'wp-includes/css/*-rtl*.css',
+				WORKING_DIR + 'wp-includes/css/dist/',
 				WORKING_DIR + 'wp-admin/css/colors/**/*.css'
 			],
 			js: [

From 17a285a1361f119ae57ecbb134c6c3f5ff888b33 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 30 Aug 2021 13:49:28 +0000
Subject: [PATCH 062/257] External Libraries: Update `whatwg-fetch` package to
 version 3.6.2.

This matches the version used in the Gutenberg project.

While WordPress core no longer depends on this polyfill as of [50934], this brings the latest updates of the library to anyone still utilizing it.

For a full list of changes in this update, see the `whatwg-fetch` GitHub:
https://github.com/github/fetch/compare/v3.0.0...v3.6.2

Follow-up to [43719], [50934].

Props hareesh-pillai, rsiddharth, desrosj.
Fixes #53929.

git-svn-id: https://develop.svn.wordpress.org/trunk@51692 602fd350-edb4-49c9-b593-d223f7449a82
---
 package-lock.json                 | 6 +++---
 package.json                      | 2 +-
 src/wp-includes/script-loader.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 90ffcd5180e4f..ff7ad249aaad1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26436,9 +26436,9 @@
 			}
 		},
 		"whatwg-fetch": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
-			"integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
+			"version": "3.6.2",
+			"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
+			"integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
 		},
 		"whatwg-mimetype": {
 			"version": "2.3.0",
diff --git a/package.json b/package.json
index ce21d01bc7a1f..6fa0592874bf0 100644
--- a/package.json
+++ b/package.json
@@ -150,7 +150,7 @@
 		"regenerator-runtime": "0.13.7",
 		"twemoji": "13.1.0",
 		"underscore": "1.13.1",
-		"whatwg-fetch": "3.0.0"
+		"whatwg-fetch": "3.6.2"
 	},
 	"scripts": {
 		"build": "grunt build",
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index 608e7936e3650..1bd8b12da212a 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -101,7 +101,7 @@ function wp_default_packages_vendor( $scripts ) {
 		'regenerator-runtime'         => '0.13.7',
 		'moment'                      => '2.29.1',
 		'lodash'                      => '4.17.19',
-		'wp-polyfill-fetch'           => '3.0.0',
+		'wp-polyfill-fetch'           => '3.6.2',
 		'wp-polyfill-formdata'        => '4.0.0',
 		'wp-polyfill-node-contains'   => '3.105.0',
 		'wp-polyfill-url'             => '3.6.4',

From 1fad3ba21fafad3701087aa0a400a5c2f5d4d137 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Mon, 30 Aug 2021 14:08:43 +0000
Subject: [PATCH 063/257] Coding Standards: Apply some minor alignment fixes.

These are updates caused by running `composer format`.

Follow up to [51501], [51599], [51618], [51653].
See #53359, #50542, #53238, #53668, #53690.

git-svn-id: https://develop.svn.wordpress.org/trunk@51693 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../twentytwenty/classes/class-twentytwenty-svg-icons.php       | 2 +-
 src/wp-includes/class-wp-theme-json-resolver.php                | 2 +-
 src/wp-includes/functions.php                                   | 2 +-
 .../rest-api/endpoints/class-wp-rest-block-types-controller.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php
index d735037543f6b..714b3a14542d2 100644
--- a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php
+++ b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php
@@ -223,7 +223,7 @@ public static function get_social_link_svg( $uri ) {
 			'twitch'    => array(
 				'twitch.tv',
 			),
-			'whatsapp' => array(
+			'whatsapp'  => array(
 				'wa.me',
 				'whatsapp.com',
 			),
diff --git a/src/wp-includes/class-wp-theme-json-resolver.php b/src/wp-includes/class-wp-theme-json-resolver.php
index 0e5a92698a728..47427c27e3297 100644
--- a/src/wp-includes/class-wp-theme-json-resolver.php
+++ b/src/wp-includes/class-wp-theme-json-resolver.php
@@ -93,7 +93,7 @@ public static function get_fields_to_translate() {
 	 */
 	private static function translate( $theme_json, $domain = 'default' ) {
 		if ( null === self::$i18n_schema ) {
-			$i18n_schema = wp_json_file_decode( __DIR__ . '/theme-i18n.json' );
+			$i18n_schema       = wp_json_file_decode( __DIR__ . '/theme-i18n.json' );
 			self::$i18n_schema = null === $i18n_schema ? array() : $i18n_schema;
 		}
 
diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index 02d74e1b70f54..e49a5720a3a4b 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -2628,7 +2628,7 @@ function wp_unique_filename( $dir, $filename, $unique_filename_callback = null )
 				$alt_mime_type = $output_formats[ $mime_type ];
 
 				// Other types of images whose names may conflict if their sub-sizes are regenerated.
-				$alt_types = array_keys( array_intersect( $output_formats, array( $mime_type, $alt_mime_type ) ) );
+				$alt_types   = array_keys( array_intersect( $output_formats, array( $mime_type, $alt_mime_type ) ) );
 				$alt_types[] = $alt_mime_type;
 			} elseif ( ! empty( $output_formats ) ) {
 				$alt_types = array_keys( array_intersect( $output_formats, array( $mime_type ) ) );
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php
index 4a1c07764bb1e..44d91449d60f3 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php
@@ -524,7 +524,7 @@ public function get_item_schema() {
 					'context'     => array( 'embed', 'view', 'edit' ),
 					'readonly'    => true,
 				),
-				'view_script'    => array(
+				'view_script'      => array(
 					'description' => __( 'Public facing script handle.' ),
 					'type'        => array( 'string', 'null' ),
 					'default'     => null,

From da835d6627315ba8c3eabf4ab4b9bb02d29d192d Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Mon, 30 Aug 2021 15:19:38 +0000
Subject: [PATCH 064/257] Code Modernization: Add input validation to
 `_set_cron_array()`.

The private `_set_cron_array()` function expects a cron array as the first parameter, but will often be passed the - potentially updated - output of a call to `_get_cron_array()`.

When the `_get_cron_array()` function returns `false`, a "Deprecated: Automatic conversion of false to array is deprecated" warning will be thrown on PHP 8.1.

The input validation resolves the deprecation warning by setting the cron value to an empty array when not given an `array` data type.

Adds a full set of `_set_cron_array()` tests.

Follow-up to [4189], [50152].

Props jrf, hellofromTonya, peterwilsoncc.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51695 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/cron.php                  |   4 +
 tests/phpunit/tests/cron/setCronArray.php | 175 ++++++++++++++++++++++
 2 files changed, 179 insertions(+)
 create mode 100644 tests/phpunit/tests/cron/setCronArray.php

diff --git a/src/wp-includes/cron.php b/src/wp-includes/cron.php
index 18fe14196e9c1..f4810e55a378b 100644
--- a/src/wp-includes/cron.php
+++ b/src/wp-includes/cron.php
@@ -1191,6 +1191,10 @@ function _get_cron_array() {
  * @return bool|WP_Error True if cron array updated. False or WP_Error on failure.
  */
 function _set_cron_array( $cron, $wp_error = false ) {
+	if ( ! is_array( $cron ) ) {
+		$cron = array();
+	}
+
 	$cron['version'] = 2;
 	$result          = update_option( 'cron', $cron );
 
diff --git a/tests/phpunit/tests/cron/setCronArray.php b/tests/phpunit/tests/cron/setCronArray.php
new file mode 100644
index 0000000000000..30e7eddec3e43
--- /dev/null
+++ b/tests/phpunit/tests/cron/setCronArray.php
@@ -0,0 +1,175 @@
+<?php
+
+/**
+ * Test the `_set_cron_array()` function.
+ *
+ * @group cron
+ * @covers ::_set_cron_array
+ */
+class Tests_Cron_setCronArray extends WP_UnitTestCase {
+
+	public function set_up() {
+		parent::set_up();
+		// Make sure the schedule is clear.
+		_set_cron_array( array() );
+	}
+
+	public function tear_down() {
+		// Make sure the schedule is clear.
+		_set_cron_array( array() );
+		parent::tear_down();
+	}
+
+	/**
+	 * Tests the input validation for the `_set_cron_array()` function.
+	 *
+	 * Includes verifying that invalid input - typically `false` - does not result in a PHP
+	 * deprecation warning on PHP 8.1 or higher.
+	 *
+	 * The warning that we should not see:
+	 * `Deprecated: Automatic conversion of false to array is deprecated`.
+	 *
+	 * @ticket 53635
+	 *
+	 * @dataProvider data_set_cron_array_input_validation
+	 *
+	 * @param mixed $input    Cron "array".
+	 * @param array $expected Expected array entry count of the cron option after update.
+	 */
+	public function test_set_cron_array_input_validation( $input, $expected ) {
+		delete_option( 'cron' );
+		$this->assertTrue( _set_cron_array( $input ) );
+
+		$crons = get_option( 'cron' );
+		$this->assertIsArray( $crons, 'Cron option is not an array.' );
+		$this->assertArrayHasKey( 'version', $crons, 'Cron option does not have a "version" key.' );
+		$this->assertCount( $expected, $crons, 'Cron option does not contain the expected nr of entries.' );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_set_cron_array_input_validation() {
+		return array(
+			'null'        => array(
+				'input'    => null,
+				'expected' => 1,
+			),
+			// Function _get_cron_array() may return `false`, so this is the PHP 8.1 "problem" test.
+			'false'       => array(
+				'input'    => false,
+				'expected' => 1,
+			),
+			'empty array' => array(
+				'input'    => array(),
+				'expected' => 1,
+			),
+			'cron array'  => array(
+				'input'    => array(
+					'version' => 2,
+					time()    => array(
+						'hookname' => array(
+							'event key' => array(
+								'schedule' => 'schedule',
+								'args'     => 'args',
+								'interval' => 'interval',
+							),
+						),
+					),
+				),
+				'expected' => 2,
+			),
+		);
+	}
+
+	/**
+	 * Tests that `_set_cron_array()` returns `false` when the cron option was not updated.
+	 *
+	 * @dataProvider data_set_cron_array_returns_false_when_not_updated
+	 *
+	 * @param array $input    Cron array.
+	 * @param mixed $wp_error Value to use for $wp_error.
+	 */
+	public function test_set_cron_array_returns_false_when_not_updated( $input, $wp_error ) {
+		$this->assertFalse( _set_cron_array( $input ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_set_cron_array_returns_false_when_not_updated() {
+		return array(
+			'empty array' => array(
+				'input'    => array(),
+				'wp_error' => false,
+			),
+			'cron array'  => array(
+				'input'    => array(
+					'version' => 2,
+				),
+				'wp_error' => 0,
+			),
+		);
+	}
+
+	/**
+	 * Tests that `_set_cron_array()` returns a WP_Error object when the cron option was not updated and `$wp_error` is truthy.
+	 *
+	 * @dataProvider data_set_cron_array_returns_WP_Error_when_not_updated
+	 *
+	 * @param array $input    Cron array.
+	 * @param mixed $wp_error Value to use for $wp_error.
+	 */
+	public function test_set_cron_array_returns_WP_Error_when_not_updated( $input, $wp_error ) {
+		$result = _set_cron_array( $input, $wp_error );
+		$this->assertWPError( $result, 'Return value is not an instance of WP_Error.' );
+		$this->assertSame( 'could_not_set', $result->get_error_code(), 'WP_Error error code does not match expected code.' );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_set_cron_array_returns_WP_Error_when_not_updated() {
+		return array(
+			'empty array' => array(
+				'input'    => array(),
+				'wp_error' => true,
+			),
+			'cron array'  => array(
+				'input'    => array(
+					'version' => 2,
+				),
+				'wp_error' => 1,
+			),
+		);
+	}
+
+	/**
+	 * Tests that `_set_cron_array()` returns true when the cron option was updated and `$wp_error` is truthy.
+	 */
+	public function test_set_cron_array_does_not_return_WP_Error_when_updated() {
+		$result = _set_cron_array(
+			array(
+				'version' => 2,
+				time()    => array(
+					'hookname' => array(
+						'event key' => array(
+							'schedule' => 'schedule',
+							'args'     => 'args',
+							'interval' => 'interval',
+						),
+					),
+				),
+			),
+			true
+		);
+
+		$this->assertTrue( $result );
+	}
+}

From 877c39bb7faaa76ac5e82a440e9f9762ab91d34f Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Mon, 30 Aug 2021 20:18:31 +0000
Subject: [PATCH 065/257] Tests: Test custom assertions parameter data type in
 `WP_UnitTestCase_Base`.

The following changes improve tests stability.

The `assertEqualFields()` method expects an object and a fields array as inputs and subsequently approaches the received parameters as such, but did not verify whether the received parameters are of the expected types.

Along the same lines, the `assertSameSets()`, `assertEqualSets()`, `assertSameSetsWithIndex()` and the `assertEqualSetsWithIndex()` methods all expect arrays for both the actual as well as the expected values and uses the array function `[k]sort()` on both, but never verified that the received inputs were actually arrays, which could lead to PHP errors on the sorting function calls.

Follow-up to [30687], [42343], [48937], [48939], [51480], [51481].

Props jrf.
See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51697 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/includes/abstract-testcase.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/phpunit/includes/abstract-testcase.php b/tests/phpunit/includes/abstract-testcase.php
index 744e3670e061e..4225f824962ae 100644
--- a/tests/phpunit/includes/abstract-testcase.php
+++ b/tests/phpunit/includes/abstract-testcase.php
@@ -685,6 +685,10 @@ public function assertNotIXRError( $actual, $message = '' ) {
 	 * @param string $message Optional. Message to display when the assertion fails.
 	 */
 	public function assertEqualFields( $object, $fields, $message = '' ) {
+		$this->assertIsObject( $object, $message . ' Passed $object is not an object.' );
+		$this->assertIsArray( $fields, $message . ' Passed $fields is not an array.' );
+		$this->assertNotEmpty( $fields, $message . ' Fields array is empty.' );
+
 		foreach ( $fields as $field_name => $field_value ) {
 			$this->assertObjectHasAttribute( $field_name, $object, $message . " Property $field_name does not exist on the object." );
 			$this->assertSame( $field_value, $object->$field_name, $message . " Value of property $field_name is not $field_value." );
@@ -760,6 +764,9 @@ public function assertEqualsIgnoreEOL( $expected, $actual, $message = '' ) {
 	 * @param string $message  Optional. Message to display when the assertion fails.
 	 */
 	public function assertSameSets( $expected, $actual, $message = '' ) {
+		$this->assertIsArray( $expected, $message . ' Expected value must be an array.' );
+		$this->assertIsArray( $actual, $message . ' Value under test is not an array.' );
+
 		sort( $expected );
 		sort( $actual );
 		$this->assertSame( $expected, $actual, $message );
@@ -776,6 +783,9 @@ public function assertSameSets( $expected, $actual, $message = '' ) {
 	 * @param string $message  Optional. Message to display when the assertion fails.
 	 */
 	public function assertEqualSets( $expected, $actual, $message = '' ) {
+		$this->assertIsArray( $expected, $message . ' Expected value must be an array.' );
+		$this->assertIsArray( $actual, $message . ' Value under test is not an array.' );
+
 		sort( $expected );
 		sort( $actual );
 		$this->assertEquals( $expected, $actual, $message );
@@ -792,6 +802,9 @@ public function assertEqualSets( $expected, $actual, $message = '' ) {
 	 * @param string $message  Optional. Message to display when the assertion fails.
 	 */
 	public function assertSameSetsWithIndex( $expected, $actual, $message = '' ) {
+		$this->assertIsArray( $expected, $message . ' Expected value must be an array.' );
+		$this->assertIsArray( $actual, $message . ' Value under test is not an array.' );
+
 		ksort( $expected );
 		ksort( $actual );
 		$this->assertSame( $expected, $actual, $message );
@@ -808,6 +821,9 @@ public function assertSameSetsWithIndex( $expected, $actual, $message = '' ) {
 	 * @param string $message  Optional. Message to display when the assertion fails.
 	 */
 	public function assertEqualSetsWithIndex( $expected, $actual, $message = '' ) {
+		$this->assertIsArray( $expected, $message . ' Expected value must be an array.' );
+		$this->assertIsArray( $actual, $message . ' Value under test is not an array.' );
+
 		ksort( $expected );
 		ksort( $actual );
 		$this->assertEquals( $expected, $actual, $message );

From 30f9d4e136056d2ebea1efd4fb67a33d1c3a4bc5 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Mon, 30 Aug 2021 20:40:05 +0000
Subject: [PATCH 066/257] Tests: Do whitespace replacement in
 `assertDiscardWhitespace()` only when string.

The `assertDiscardWhitespace()` method uses `assertEquals()` under the hood, meaning that in reality any type of actual/expected value should be accepted by the function. Fixed the documentation to reflect that.

At the same time, only strings can contain whitespace differences. So the whitespace replacement should only be done when string values are passed.

This change (a) prevents potential `passing null to non-nullable` errors on PHP 8.1, if either of the inputs would turn out to be `null` and (b) increases tests stability.

Follow-up to [35003], [44902].

Props jrf.
See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51698 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/includes/abstract-testcase.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/tests/phpunit/includes/abstract-testcase.php b/tests/phpunit/includes/abstract-testcase.php
index 4225f824962ae..cbd8c31f30b99 100644
--- a/tests/phpunit/includes/abstract-testcase.php
+++ b/tests/phpunit/includes/abstract-testcase.php
@@ -701,12 +701,20 @@ public function assertEqualFields( $object, $fields, $message = '' ) {
 	 * @since UT (3.7.0)
 	 * @since 5.9.0 Added the `$message` parameter.
 	 *
-	 * @param string $expected The expected value.
-	 * @param string $actual   The actual value.
+	 * @param mixed  $expected The expected value.
+	 * @param mixed  $actual   The actual value.
 	 * @param string $message  Optional. Message to display when the assertion fails.
 	 */
 	public function assertDiscardWhitespace( $expected, $actual, $message = '' ) {
-		$this->assertEquals( preg_replace( '/\s*/', '', $expected ), preg_replace( '/\s*/', '', $actual ), $message );
+		if ( is_string( $expected ) ) {
+			$expected = preg_replace( '/\s*/', '', $expected );
+		}
+
+		if ( is_string( $actual ) ) {
+			$actual = preg_replace( '/\s*/', '', $actual );
+		}
+
+		$this->assertEquals( $expected, $actual, $message );
 	}
 
 	/**

From 976de7bdfb88a7578acf9edd68f24b2eee6e7f80 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 31 Aug 2021 12:23:46 +0000
Subject: [PATCH 067/257] Docs: Improve documentation in `wp-signup.php`.

* Document the `$active_signup` global in `signup_user()`.
* Update some DocBlocks per the documentation standards.
* Expand some function descriptions for clarity.

Follow-up to [37535], [37536], [41200], [43326], [49078], [50828].

Props mt8.biz, sabernhardt, audrasjb, westonruter, jayupadhyay01, mukesh27, SergeyBiryukov.
Fixes #41566.

git-svn-id: https://develop.svn.wordpress.org/trunk@51699 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-signup.php | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/wp-signup.php b/src/wp-signup.php
index cbc4ddb4020df..e13d6e49e771f 100644
--- a/src/wp-signup.php
+++ b/src/wp-signup.php
@@ -15,7 +15,7 @@
 }
 
 /**
- * Prints signup_header via wp_head
+ * Prints signup_header via wp_head.
  *
  * @since MU (3.0.0)
  */
@@ -50,7 +50,7 @@ function do_signup_header() {
 do_action( 'before_signup_header' );
 
 /**
- * Prints styles for front-end Multisite signup pages
+ * Prints styles for front-end Multisite signup pages.
  *
  * @since MU (3.0.0)
  */
@@ -89,7 +89,7 @@ function wpmu_signup_stylesheet() {
 <div class="mu_register wp-signup-container" role="main">
 <?php
 /**
- * Generates and displays the Signup and Create Site forms
+ * Generates and displays the Signup and Create Site forms.
  *
  * @since MU (3.0.0)
  *
@@ -224,7 +224,7 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
 }
 
 /**
- * Validate the new site signup
+ * Validates the new site signup.
  *
  * @since MU (3.0.0)
  *
@@ -288,7 +288,7 @@ function show_user_form( $user_name = '', $user_email = '', $errors = '' ) {
 }
 
 /**
- * Validate user signup name and email
+ * Validates user signup name and email.
  *
  * @since MU (3.0.0)
  *
@@ -300,7 +300,7 @@ function validate_user_form() {
 }
 
 /**
- * Allow returning users to sign up for another site
+ * Shows a form for returning users to sign up for another site.
  *
  * @since MU (3.0.0)
  *
@@ -394,17 +394,17 @@ function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) {
 }
 
 /**
- * Validate a new site signup for an existing user.
- *
- * @global string          $blogname   The new site's subdomain or directory name.
- * @global string          $blog_title The new site's title.
- * @global WP_Error        $errors     Existing errors in the global scope.
- * @global string          $domain     The new site's domain.
- * @global string          $path       The new site's path.
+ * Validates a new site signup for an existing user.
  *
  * @since MU (3.0.0)
  *
- * @return null|bool True if site signup was validated, false if error.
+ * @global string   $blogname   The new site's subdomain or directory name.
+ * @global string   $blog_title The new site's title.
+ * @global WP_Error $errors     Existing errors in the global scope.
+ * @global string   $domain     The new site's domain.
+ * @global string   $path       The new site's path.
+ *
+ * @return null|bool True if site signup was validated, false on error.
  *                   The function halts all execution if the user is not logged in.
  */
 function validate_another_blog_signup() {
@@ -486,7 +486,7 @@ function validate_another_blog_signup() {
 }
 
 /**
- * Confirm a new site signup.
+ * Shows a message confirming that the new site has been created.
  *
  * @since MU (3.0.0)
  * @since 4.4.0 Added the `$blog_id` parameter.
@@ -553,6 +553,9 @@ function confirm_another_blog_signup( $domain, $path, $blog_title, $user_name, $
  *
  * @since MU (3.0.0)
  *
+ * @global string $active_signup String that returns registration type. The value can be
+ *                               'all', 'none', 'blog', or 'user'.
+ *
  * @param string          $user_name  The username.
  * @param string          $user_email The user's email.
  * @param WP_Error|string $errors     A WP_Error object containing existing errors. Defaults to empty string.
@@ -626,11 +629,11 @@ function signup_user( $user_name = '', $user_email = '', $errors = '' ) {
 }
 
 /**
- * Validate the new user signup
+ * Validates the new user signup.
  *
  * @since MU (3.0.0)
  *
- * @return bool True if new user signup was validated, false if error
+ * @return bool True if new user signup was validated, false on error.
  */
 function validate_user_signup() {
 	$result     = validate_user_form();
@@ -656,12 +659,12 @@ function validate_user_signup() {
 }
 
 /**
- * New user signup confirmation
+ * Shows a message confirming that the new user has been registered and is awaiting activation.
  *
  * @since MU (3.0.0)
  *
- * @param string $user_name The username
- * @param string $user_email The user's email address
+ * @param string $user_name  The username.
+ * @param string $user_email The user's email address.
  */
 function confirm_user_signup( $user_name, $user_email ) {
 	?>
@@ -750,11 +753,11 @@ function signup_blog( $user_name = '', $user_email = '', $blogname = '', $blog_t
 }
 
 /**
- * Validate new site signup
+ * Validates new site signup.
  *
  * @since MU (3.0.0)
  *
- * @return bool True if the site signup was validated, false if error
+ * @return bool True if the site signup was validated, false on error.
  */
 function validate_blog_signup() {
 	// Re-validate user info.

From 6b3019b03e0d57809549f4d88400245c0a3db092 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 31 Aug 2021 13:37:31 +0000
Subject: [PATCH 068/257] Widgets: Pass correct context to
 `get_block_categories()` calls.

The `get_block_categories()` function expects either a `WP_Post` or a `WP_Block_Editor_Context` instance as the context argument, not a string.

Follow-up to [50996], [50997].

Props Enchiridion, pbearne, audrasjb.
Fixes #53757.

git-svn-id: https://develop.svn.wordpress.org/trunk@51700 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/widgets-form-blocks.php           | 2 +-
 src/wp-includes/class-wp-customize-widgets.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/widgets-form-blocks.php b/src/wp-admin/widgets-form-blocks.php
index 7f3b6b2f65934..95908e1e9e2d8 100644
--- a/src/wp-admin/widgets-form-blocks.php
+++ b/src/wp-admin/widgets-form-blocks.php
@@ -52,7 +52,7 @@
 
 wp_add_inline_script(
 	'wp-blocks',
-	sprintf( 'wp.blocks.setCategories( %s );', wp_json_encode( get_block_categories( 'widgets-editor' ) ) ),
+	sprintf( 'wp.blocks.setCategories( %s );', wp_json_encode( get_block_categories( $block_editor_context ) ) ),
 	'after'
 );
 
diff --git a/src/wp-includes/class-wp-customize-widgets.php b/src/wp-includes/class-wp-customize-widgets.php
index 9df026d5b235b..c96773b1397f1 100644
--- a/src/wp-includes/class-wp-customize-widgets.php
+++ b/src/wp-includes/class-wp-customize-widgets.php
@@ -862,7 +862,7 @@ public function enqueue_scripts() {
 
 			wp_add_inline_script(
 				'wp-blocks',
-				sprintf( 'wp.blocks.setCategories( %s );', wp_json_encode( get_block_categories( 'widgets-customizer' ) ) ),
+				sprintf( 'wp.blocks.setCategories( %s );', wp_json_encode( get_block_categories( $block_editor_context ) ) ),
 				'after'
 			);
 

From af99f0e6efabd3f80687842b9d9aa5b8a64f0559 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Tue, 31 Aug 2021 13:49:23 +0000
Subject: [PATCH 069/257] Widgets: Show title and media select fields in
 Accessibility Mode.

This updates the Custom HTML and Media widgets to display the correct fields when adding or editing a widget when using accessibility mode through the Classic Widgets experience.

Follow up to [49973].

Props mark-k, sabernhardt, alexstine, circlecube, audrasjb.
Fixes #53641.

git-svn-id: https://develop.svn.wordpress.org/trunk@51701 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/js/_enqueues/wp/widgets/custom-html.js | 2 +-
 src/js/_enqueues/wp/widgets/media.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/js/_enqueues/wp/widgets/custom-html.js b/src/js/_enqueues/wp/widgets/custom-html.js
index 58b3842a23932..e36d11583f145 100644
--- a/src/js/_enqueues/wp/widgets/custom-html.js
+++ b/src/js/_enqueues/wp/widgets/custom-html.js
@@ -356,7 +356,7 @@ wp.customHtmlWidgets = ( function( $ ) {
 			return;
 		}
 
-		idBase = widgetForm.find( '> .widget-control-actions > .id_base' ).val();
+		idBase = widgetForm.find( '.id_base' ).val();
 		if ( -1 === component.idBases.indexOf( idBase ) ) {
 			return;
 		}
diff --git a/src/js/_enqueues/wp/widgets/media.js b/src/js/_enqueues/wp/widgets/media.js
index dbe007cdb8eda..2ee00a826c768 100644
--- a/src/js/_enqueues/wp/widgets/media.js
+++ b/src/js/_enqueues/wp/widgets/media.js
@@ -1212,7 +1212,7 @@ wp.mediaWidgets = ( function( $ ) {
 			return;
 		}
 
-		idBase = widgetForm.find( '> .widget-control-actions > .id_base' ).val();
+		idBase = widgetForm.find( '.id_base' ).val();
 
 		ControlConstructor = component.controlConstructors[ idBase ];
 		if ( ! ControlConstructor ) {

From 60d68fadbd36ed73eb8e4eaffd9cd02008841106 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Tue, 31 Aug 2021 17:22:32 +0000
Subject: [PATCH 070/257] Tests: Add missing `@covers` tags for actions' tests.

Props pbearne, hudson-atwell, jrf, hellofromTonya.
See #39265.

git-svn-id: https://develop.svn.wordpress.org/trunk@51702 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/actions.php           | 72 ++++++++++++++++++++++-
 tests/phpunit/tests/actions/callbacks.php |  2 +
 tests/phpunit/tests/actions/closures.php  |  4 ++
 3 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/tests/phpunit/tests/actions.php b/tests/phpunit/tests/actions.php
index a511890bb7c5e..ceacc72d7c9b9 100644
--- a/tests/phpunit/tests/actions.php
+++ b/tests/phpunit/tests/actions.php
@@ -7,6 +7,9 @@
  */
 class Tests_Actions extends WP_UnitTestCase {
 
+	/**
+	 * @covers ::do_action
+	 */
 	function test_simple_action() {
 		$a   = new MockAction();
 		$tag = __FUNCTION__;
@@ -24,6 +27,9 @@ function test_simple_action() {
 		$this->assertSame( array( '' ), $args );
 	}
 
+	/**
+	 * @covers ::remove_action
+	 */
 	function test_remove_action() {
 		$a   = new MockAction();
 		$tag = __FUNCTION__;
@@ -43,6 +49,9 @@ function test_remove_action() {
 
 	}
 
+	/**
+	 * @covers ::has_action
+	 */
 	function test_has_action() {
 		$tag  = __FUNCTION__;
 		$func = __FUNCTION__ . '_func';
@@ -57,7 +66,11 @@ function test_has_action() {
 		$this->assertFalse( has_action( $tag ) );
 	}
 
-	// One tag with multiple actions.
+	/**
+	 * One tag with multiple actions.
+	 *
+	 * @covers ::do_action
+	 */
 	function test_multiple_actions() {
 		$a1  = new MockAction();
 		$a2  = new MockAction();
@@ -74,6 +87,11 @@ function test_multiple_actions() {
 		$this->assertSame( 1, $a2->get_call_count() );
 	}
 
+	/**
+	 * One tag with multiple actions.
+	 *
+	 * @covers ::do_action
+	 */
 	function test_action_args_1() {
 		$a   = new MockAction();
 		$tag = __FUNCTION__;
@@ -89,6 +107,11 @@ function test_action_args_1() {
 		$this->assertSame( array( $val ), array_pop( $argsvar ) );
 	}
 
+	/**
+	 * One tag with multiple actions.
+	 *
+	 * @covers ::do_action
+	 */
 	function test_action_args_2() {
 		$a1   = new MockAction();
 		$a2   = new MockAction();
@@ -120,6 +143,8 @@ function test_action_args_2() {
 	 *
 	 * @see https://core.trac.wordpress.org/ticket/17817#comment:72
 	 * @ticket 17817
+	 *
+	 * @covers ::do_action
 	 */
 	function test_action_args_3() {
 		$a1   = new MockAction();
@@ -157,6 +182,8 @@ function test_action_args_3() {
 	 * Tests PHP 4 notation for calling actions while passing in an object by reference.
 	 *
 	 * @ticket 48312
+	 *
+	 * @covers ::do_action
 	 */
 	function test_action_args_with_php4_syntax() {
 		$a   = new MockAction();
@@ -201,6 +228,9 @@ function test_action_priority() {
 		$this->assertSame( $expected, $a->get_events() );
 	}
 
+	/**
+	 * @covers ::did_action
+	 */
 	function test_did_action() {
 		$tag1 = 'action1';
 		$tag2 = 'action2';
@@ -222,6 +252,9 @@ function test_did_action() {
 
 	}
 
+	/**
+	 * @covers ::do_action
+	 */
 	function test_all_action() {
 		$a    = new MockAction();
 		$tag1 = __FUNCTION__ . '_1';
@@ -246,6 +279,9 @@ function test_all_action() {
 
 	}
 
+	/**
+	 * @covers ::remove_action
+	 */
 	function test_remove_all_action() {
 		$a   = new MockAction();
 		$tag = __FUNCTION__;
@@ -266,6 +302,9 @@ function test_remove_all_action() {
 		$this->assertSame( array( $tag ), $a->get_tags() );
 	}
 
+	/**
+	 * @covers ::do_action_ref_array
+	 */
 	function test_action_ref_array() {
 		$obj = new stdClass();
 		$a   = new MockAction();
@@ -284,6 +323,8 @@ function test_action_ref_array() {
 
 	/**
 	 * @ticket 11241
+	 *
+	 * @covers ::do_action
 	 */
 	function test_action_keyed_array() {
 		$a = new MockAction();
@@ -309,6 +350,9 @@ function test_action_keyed_array() {
 
 	}
 
+	/**
+	 * @covers ::remove_action
+	 */
 	function test_action_self_removal() {
 		add_action( 'test_action_self_removal', array( $this, 'action_self_removal' ) );
 		do_action( 'test_action_self_removal' );
@@ -321,6 +365,8 @@ function action_self_removal() {
 
 	/**
 	 * @ticket 17817
+	 *
+	 * @covers ::do_action
 	 */
 	function test_action_recursion() {
 		$tag = __FUNCTION__;
@@ -336,6 +382,9 @@ function test_action_recursion() {
 		$this->assertSame( 2, $b->get_call_count(), 'recursive actions should call callbacks with later priority' );
 	}
 
+	/**
+	 * @covers ::do_action
+	 */
 	function action_that_causes_recursion( $tag ) {
 		static $recursing = false;
 		if ( ! $recursing ) {
@@ -348,6 +397,9 @@ function action_that_causes_recursion( $tag ) {
 	/**
 	 * @ticket 9968
 	 * @ticket 17817
+	 *
+	 * @covers ::remove_action
+	 * @covers ::add_action
 	 */
 	function test_action_callback_manipulation_while_running() {
 		$tag = __FUNCTION__;
@@ -383,6 +435,8 @@ function action_that_manipulates_a_running_hook( $tag, $mocks ) {
 	 *
 	 * This specificaly addresses the concern raised at
 	 * https://core.trac.wordpress.org/ticket/17817#comment:52
+	 *
+	 * @covers ::remove_filter
 	 */
 	function test_remove_anonymous_callback() {
 		$tag = __FUNCTION__;
@@ -416,6 +470,10 @@ function test_remove_anonymous_callback() {
 	 * Test the ArrayAccess methods of WP_Hook
 	 *
 	 * @ticket 17817
+	 *
+	 * @covers WP_Hook::offsetGet
+	 * @covers WP_Hook::offsetSet
+	 * @covers WP_Hook::offsetUnset
 	 */
 	function test_array_access_of_wp_filter_global() {
 		global $wp_filter;
@@ -442,6 +500,8 @@ function test_array_access_of_wp_filter_global() {
 	 * Make sure current_action() behaves as current_filter()
 	 *
 	 * @ticket 14994
+	 *
+	 * @covers ::current_action
 	 */
 	function test_current_action() {
 		global $wp_current_filter;
@@ -453,6 +513,8 @@ function test_current_action() {
 
 	/**
 	 * @ticket 14994
+	 *
+	 * @covers ::doing_filter
 	 */
 	function test_doing_filter() {
 		global $wp_current_filter;
@@ -472,6 +534,8 @@ function test_doing_filter() {
 
 	/**
 	 * @ticket 14994
+	 *
+	 * @covers ::doing_filter
 	 */
 	function test_doing_action() {
 		global $wp_current_filter;
@@ -491,6 +555,8 @@ function test_doing_action() {
 
 	/**
 	 * @ticket 14994
+	 *
+	 * @covers ::doing_filter
 	 */
 	function test_doing_filter_real() {
 		$this->assertFalse( doing_filter() );            // No filter is passed in, and no filter is being processed.
@@ -541,6 +607,8 @@ function apply_testing_nested_filter() {
 	/**
 	 * @ticket 10441
 	 * @expectedDeprecated tests_do_action_deprecated
+	 *
+	 * @covers ::do_action_deprecated
 	 */
 	public function test_do_action_deprecated() {
 		$p = new WP_Post( (object) array( 'post_title' => 'Foo' ) );
@@ -559,6 +627,8 @@ public static function deprecated_action_callback( $p ) {
 	/**
 	 * @ticket 10441
 	 * @expectedDeprecated tests_do_action_deprecated
+	 *
+	 * @covers ::do_action_deprecated
 	 */
 	public function test_do_action_deprecated_with_multiple_params() {
 		$p1 = new WP_Post( (object) array( 'post_title' => 'Foo1' ) );
diff --git a/tests/phpunit/tests/actions/callbacks.php b/tests/phpunit/tests/actions/callbacks.php
index fc58c3390670e..32d1c733d97e6 100644
--- a/tests/phpunit/tests/actions/callbacks.php
+++ b/tests/phpunit/tests/actions/callbacks.php
@@ -7,6 +7,8 @@ class Tests_Actions_Callbacks extends WP_UnitTestCase {
 
 	/**
 	 * @ticket 23265
+	 *
+	 * @covers ::add_action
 	 */
 	function test_callback_representations() {
 		$tag = __FUNCTION__;
diff --git a/tests/phpunit/tests/actions/closures.php b/tests/phpunit/tests/actions/closures.php
index bd8b88d97fa14..833367714b908 100644
--- a/tests/phpunit/tests/actions/closures.php
+++ b/tests/phpunit/tests/actions/closures.php
@@ -9,6 +9,10 @@ class Tests_Actions_Closures extends WP_UnitTestCase {
 
 	/**
 	 * @ticket 10493
+	 *
+	 * @covers ::add_action
+	 * @covers ::has_action
+	 * @covers ::do_action
 	 */
 	function test_action_closure() {
 		$tag     = 'test_action_closure';

From 9002ba2e0492df42d7c13e58864cc5fbc5c6c390 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Tue, 31 Aug 2021 17:26:42 +0000
Subject: [PATCH 071/257] Media: fix showing of the "Filter Media" filds when
 replacing an image from the media modal.

Props mhuntdesign, sabernhardt, azaozz.
Fixes #53833.

git-svn-id: https://develop.svn.wordpress.org/trunk@51703 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/css/media-views.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/css/media-views.css b/src/wp-includes/css/media-views.css
index b3dca00ea1d47..ae62e862ab7d4 100644
--- a/src/wp-includes/css/media-views.css
+++ b/src/wp-includes/css/media-views.css
@@ -370,7 +370,7 @@
 }
 
 .media-sidebar h2,
-.image-details h2 {
+.image-details h2:not(.media-attachments-filter-heading) {
 	position: relative;
 	font-weight: 600;
 	text-transform: uppercase;

From 1bbc5a4737f1c4b9c89503386231c8f3c1bdba17 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Tue, 31 Aug 2021 18:57:09 +0000
Subject: [PATCH 072/257] Media: apply the `wp_editor_set_quality` filter not
 only when loading an image in the editor but also when saving an converted
 image, after the mime-type of the output image has changed.

Props mikeschroder, desrosj, azaozz.
Fixes #53667.

git-svn-id: https://develop.svn.wordpress.org/trunk@51704 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-image-editor.php    | 54 ++++++++++--
 tests/phpunit/includes/mock-image-editor.php |  2 +
 tests/phpunit/tests/image/editor.php         | 86 ++++++++++++++++++++
 3 files changed, 137 insertions(+), 5 deletions(-)

diff --git a/src/wp-includes/class-wp-image-editor.php b/src/wp-includes/class-wp-image-editor.php
index 0bc7ee6aeed18..3c2625d2f3550 100644
--- a/src/wp-includes/class-wp-image-editor.php
+++ b/src/wp-includes/class-wp-image-editor.php
@@ -15,9 +15,12 @@ abstract class WP_Image_Editor {
 	protected $file              = null;
 	protected $size              = null;
 	protected $mime_type         = null;
+	protected $output_mime_type  = null;
 	protected $default_mime_type = 'image/jpeg';
 	protected $quality           = false;
-	protected $default_quality   = 82;
+
+	// Deprecated since 5.8.1. See get_default_quality() below.
+	protected $default_quality = 82;
 
 	/**
 	 * Each instance handles a single file.
@@ -224,6 +227,11 @@ public function get_quality() {
 	 * @return true|WP_Error True if set successfully; WP_Error on failure.
 	 */
 	public function set_quality( $quality = null ) {
+		// Use the output mime type if present. If not, fall back to the input/initial mime type.
+		$mime_type = ! empty( $this->output_mime_type ) ? $this->output_mime_type : $this->mime_type;
+		// Get the default quality setting for the mime type.
+		$default_quality = $this->get_default_quality( $mime_type );
+
 		if ( null === $quality ) {
 			/**
 			 * Filters the default image compression quality setting.
@@ -238,9 +246,9 @@ public function set_quality( $quality = null ) {
 			 * @param int    $quality   Quality level between 1 (low) and 100 (high).
 			 * @param string $mime_type Image mime type.
 			 */
-			$quality = apply_filters( 'wp_editor_set_quality', $this->default_quality, $this->mime_type );
+			$quality = apply_filters( 'wp_editor_set_quality', $default_quality, $mime_type );
 
-			if ( 'image/jpeg' === $this->mime_type ) {
+			if ( 'image/jpeg' === $mime_type ) {
 				/**
 				 * Filters the JPEG compression quality for backward-compatibility.
 				 *
@@ -261,7 +269,7 @@ public function set_quality( $quality = null ) {
 			}
 
 			if ( $quality < 0 || $quality > 100 ) {
-				$quality = $this->default_quality;
+				$quality = $default_quality;
 			}
 		}
 
@@ -278,6 +286,27 @@ public function set_quality( $quality = null ) {
 		}
 	}
 
+	/**
+	 * Returns the default compression quality setting for the mime type.
+	 *
+	 * @since 5.8.1
+	 *
+	 * @param string $mime_type
+	 * @return int The default quality setting for the mime type.
+	 */
+	protected function get_default_quality( $mime_type ) {
+		switch ( $mime_type ) {
+			case 'image/webp':
+				$quality = 86;
+				break;
+			case 'image/jpeg':
+			default:
+				$quality = $this->default_quality;
+		}
+
+		return $quality;
+	}
+
 	/**
 	 * Returns preferred mime-type and extension based on provided
 	 * file's extension and mime, or current file's extension and mime.
@@ -374,13 +403,28 @@ protected function get_output_format( $filename = null, $mime_type = null ) {
 			$new_ext   = $this->get_extension( $mime_type );
 		}
 
-		if ( $filename ) {
+		// Ensure both $filename and $new_ext are not empty.
+		// $this->get_extension() returns false on error which would effectively remove the extension
+		// from $filename. That shouldn't happen, files without extensions are not supported.
+		if ( $filename && $new_ext ) {
 			$dir = pathinfo( $filename, PATHINFO_DIRNAME );
 			$ext = pathinfo( $filename, PATHINFO_EXTENSION );
 
 			$filename = trailingslashit( $dir ) . wp_basename( $filename, ".$ext" ) . ".{$new_ext}";
 		}
 
+		if ( $mime_type && ( $mime_type !== $this->mime_type ) ) {
+			// The image will be converted when saving. Set the quality for the new mime-type if not already set.
+			if ( $mime_type !== $this->output_mime_type ) {
+				$this->output_mime_type = $mime_type;
+				$this->set_quality();
+			}
+		} elseif ( ! empty( $this->output_mime_type ) ) {
+			// Reset output_mime_type and quality.
+			$this->output_mime_type = null;
+			$this->set_quality();
+		}
+
 		return array( $filename, $new_ext, $mime_type );
 	}
 
diff --git a/tests/phpunit/includes/mock-image-editor.php b/tests/phpunit/includes/mock-image-editor.php
index 4cd252b1c3459..bc08fbb2907be 100644
--- a/tests/phpunit/includes/mock-image-editor.php
+++ b/tests/phpunit/includes/mock-image-editor.php
@@ -56,6 +56,8 @@ public function flip( $horz, $vert ) {
 			}
 		}
 		public function save( $destfilename = null, $mime_type = null ) {
+			// Set new mime-type and quality if converting the image.
+			$this->get_output_format( $destfilename, $mime_type );
 			return self::$save_return;
 		}
 		public function stream( $mime_type = null ) {
diff --git a/tests/phpunit/tests/image/editor.php b/tests/phpunit/tests/image/editor.php
index 7ed30ebdb0410..a35f8af9f2856 100644
--- a/tests/phpunit/tests/image/editor.php
+++ b/tests/phpunit/tests/image/editor.php
@@ -110,6 +110,92 @@ public function test_set_quality() {
 		remove_filter( 'wp_editor_set_quality', $func_100_percent );
 	}
 
+	/**
+	 * Test test_quality when converting image
+	 *
+	 * @ticket 6821
+	 */
+	public function test_set_quality_with_image_conversion() {
+		$editor = wp_get_image_editor( DIR_TESTDATA . '/images/test-image.png' );
+		$editor->set_mime_type( 'image/png' ); // Ensure mime-specific filters act properly.
+
+		// Set conversions for uploaded images.
+		add_filter( 'image_editor_output_format', array( $this, 'image_editor_output_formats' ) );
+
+		// Quality setting for the source image. For PNG the fallback default of 82 is used.
+		$this->assertSame( 82, $editor->get_quality(), 'Default quality setting is 82.' );
+
+		// Quality should change to the output format's value.
+		// A PNG image will be converted to WEBP whose quialty should be 86.
+		$editor->save();
+		$this->assertSame( 86, $editor->get_quality(), 'Output image format is WEBP. Quality setting for it should be 86.' );
+
+		// Removing PNG to WEBP conversion on save. Quality setting should reset to the default.
+		remove_filter( 'image_editor_output_format', array( $this, 'image_editor_output_formats' ) );
+		$editor->save();
+		$this->assertSame( 82, $editor->get_quality(), 'After removing image conversion quality setting should reset to the default of 82.' );
+
+		unset( $editor );
+
+		// Set conversions for uploaded images.
+		add_filter( 'image_editor_output_format', array( $this, 'image_editor_output_formats' ) );
+		// Change the quality values.
+		add_filter( 'wp_editor_set_quality', array( $this, 'image_editor_change_quality' ), 10, 2 );
+
+		// Get a new editor to clear quality state.
+		$editor = wp_get_image_editor( DIR_TESTDATA . '/images/test-image.jpg' );
+		$editor->set_mime_type( 'image/jpeg' );
+
+		$this->assertSame( 56, $editor->get_quality(), 'Filtered default quality for JPEG is 56.' );
+
+		// Quality should change to the output format's value as filtered above.
+		// A JPEG image will be converted to WEBP whose quialty should be 42.
+		$editor->save();
+		$this->assertSame( 42, $editor->get_quality(), 'Image conversion from JPEG to WEBP. Filtered WEBP quality shoild be 42.' );
+
+		// After removing the conversion the quality setting should reset to the filtered value for the original image type, JPEG.
+		remove_filter( 'image_editor_output_format', array( $this, 'image_editor_output_formats' ) );
+		$editor->save();
+		$this->assertSame(
+			56,
+			$editor->get_quality(),
+			'After removing image conversion the quality setting should reset to the filtered value for JPEG, 56.'
+		);
+
+		remove_filter( 'wp_editor_set_quality', array( $this, 'image_editor_change_quality' ) );
+	}
+
+	/**
+	 * Changes the output format when editing images. PNG and JPEG files
+	 * will be converted to WEBP (if the image editor in PHP supports it).
+	 *
+	 * @param array $formats
+	 *
+	 * @return array
+	 */
+	public function image_editor_output_formats( $formats ) {
+		$formats['image/png']  = 'image/webp';
+		$formats['image/jpeg'] = 'image/webp';
+		return $formats;
+	}
+
+	/**
+	 * Changes the quality according to the mime-type.
+	 *
+	 * @param int    $quality   Default quality.
+	 * @param string $mime_type Image mime-type.
+	 * @return int The changed quality.
+	 */
+	public function image_editor_change_quality( $quality, $mime_type ) {
+		if ( 'image/jpeg' === $mime_type ) {
+			return 56;
+		} elseif ( 'image/webp' === $mime_type ) {
+			return 42;
+		} else {
+			return 30;
+		}
+	}
+
 	/**
 	 * Test generate_filename
 	 *

From b7a495d3376ffb1ae7d9c6cbf7f0f3f00761055a Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Tue, 31 Aug 2021 19:57:20 +0000
Subject: [PATCH 073/257] Widgets: Rename and soft deprecate
 `retrieve_widgets()`.

The original name `retrieve_widgets()` was unclear as it suggested it was a getter, i.e. getting the widgets. This function does more than get: finds orphaned widgets, assigns them to the inactive sidebar, and updates the database.

The new name is `sync_registered_widgets()` which better represents what happens when this function is invoked.

The original `retrieve_widgets()` function is soft deprecated to avoid unnecessary code churn downstream for developers that support more than the latest version of WordPress.

Follow-up to [18630].

Props zieladam, timothyblynjacobs, andraganescu, hellofromTonya.
See #53811.

git-svn-id: https://develop.svn.wordpress.org/trunk@51705 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/upgrade.php             |  2 +-
 src/wp-admin/widgets-form.php                 |  2 +-
 .../class-wp-customize-widgets.php            |  8 ++---
 .../class-wp-rest-sidebars-controller.php     |  4 +--
 .../class-wp-rest-widgets-controller.php      | 12 +++----
 src/wp-includes/theme.php                     |  2 +-
 src/wp-includes/widgets.php                   | 23 ++++++++++--
 tests/phpunit/tests/widgets.php               | 36 +++++++++----------
 8 files changed, 53 insertions(+), 36 deletions(-)

diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php
index 475608efa7908..8da032d183a98 100644
--- a/src/wp-admin/includes/upgrade.php
+++ b/src/wp-admin/includes/upgrade.php
@@ -1773,7 +1773,7 @@ function upgrade_330() {
 
 			// Intentional fall-through to upgrade to the next version.
 		case 2:
-			$sidebars_widgets                  = retrieve_widgets();
+			$sidebars_widgets                  = sync_registered_widgets();
 			$sidebars_widgets['array_version'] = 3;
 			update_option( 'sidebars_widgets', $sidebars_widgets );
 	}
diff --git a/src/wp-admin/widgets-form.php b/src/wp-admin/widgets-form.php
index df4efdba90582..9284f734e685b 100644
--- a/src/wp-admin/widgets-form.php
+++ b/src/wp-admin/widgets-form.php
@@ -118,7 +118,7 @@
 	)
 );
 
-retrieve_widgets();
+sync_registered_widgets();
 
 // We're saving a widget without JS.
 if ( isset( $_POST['savewidget'] ) || isset( $_POST['removewidget'] ) ) {
diff --git a/src/wp-includes/class-wp-customize-widgets.php b/src/wp-includes/class-wp-customize-widgets.php
index c96773b1397f1..264b502e9d61f 100644
--- a/src/wp-includes/class-wp-customize-widgets.php
+++ b/src/wp-includes/class-wp-customize-widgets.php
@@ -275,9 +275,9 @@ public function override_sidebars_widgets_for_theme_switch() {
 		add_filter( 'customize_value_old_sidebars_widgets_data', array( $this, 'filter_customize_value_old_sidebars_widgets_data' ) );
 		$this->manager->set_post_value( 'old_sidebars_widgets_data', $this->old_sidebars_widgets ); // Override any value cached in changeset.
 
-		// retrieve_widgets() looks at the global $sidebars_widgets.
+		// sync_registered_widgets() looks at the global $sidebars_widgets.
 		$sidebars_widgets = $this->old_sidebars_widgets;
-		$sidebars_widgets = retrieve_widgets( 'customize' );
+		$sidebars_widgets = sync_registered_widgets( 'customize' );
 		add_filter( 'option_sidebars_widgets', array( $this, 'filter_option_sidebars_widgets_for_theme_switch' ), 1 );
 		// Reset global cache var used by wp_get_sidebars_widgets().
 		unset( $GLOBALS['_wp_sidebars_widgets'] );
@@ -287,7 +287,7 @@ public function override_sidebars_widgets_for_theme_switch() {
 	 * Filters old_sidebars_widgets_data Customizer setting.
 	 *
 	 * When switching themes, filter the Customizer setting old_sidebars_widgets_data
-	 * to supply initial $sidebars_widgets before they were overridden by retrieve_widgets().
+	 * to supply initial $sidebars_widgets before they were overridden by sync_registered_widgets().
 	 * The value for old_sidebars_widgets_data gets set in the old theme's sidebars_widgets
 	 * theme_mod.
 	 *
@@ -305,7 +305,7 @@ public function filter_customize_value_old_sidebars_widgets_data( $old_sidebars_
 	/**
 	 * Filters sidebars_widgets option for theme switch.
 	 *
-	 * When switching themes, the retrieve_widgets() function is run when the Customizer initializes,
+	 * When switching themes, the sync_registered_widgets() function is run when the Customizer initializes,
 	 * and then the new sidebars_widgets here get supplied as the default value for the sidebars_widgets
 	 * option.
 	 *
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-sidebars-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-sidebars-controller.php
index 18dcc4e9c0488..f5e132b5aa05a 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-sidebars-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-sidebars-controller.php
@@ -98,7 +98,7 @@ public function get_items_permissions_check( $request ) {
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
 	public function get_items( $request ) {
-		retrieve_widgets();
+		sync_registered_widgets();
 
 		$data = array();
 		foreach ( wp_get_sidebars_widgets() as $id => $widgets ) {
@@ -137,7 +137,7 @@ public function get_item_permissions_check( $request ) {
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
 	public function get_item( $request ) {
-		retrieve_widgets();
+		sync_registered_widgets();
 
 		$sidebar = $this->get_sidebar( $request['id'] );
 
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-widgets-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-widgets-controller.php
index 4c54620f509fa..dea8ed3ac0976 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-widgets-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-widgets-controller.php
@@ -109,7 +109,7 @@ public function get_items_permissions_check( $request ) {
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
 	public function get_items( $request ) {
-		retrieve_widgets();
+		sync_registered_widgets();
 
 		$prepared = array();
 
@@ -151,7 +151,7 @@ public function get_item_permissions_check( $request ) {
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
 	public function get_item( $request ) {
-		retrieve_widgets();
+		sync_registered_widgets();
 
 		$widget_id  = $request['id'];
 		$sidebar_id = wp_find_widgets_sidebar( $widget_id );
@@ -237,7 +237,7 @@ public function update_item( $request ) {
 		global $wp_widget_factory;
 
 		/*
-		 * retrieve_widgets() contains logic to move "hidden" or "lost" widgets to the
+		 * sync_registered_widgets() contains logic to move "hidden" or "lost" widgets to the
 		 * wp_inactive_widgets sidebar based on the contents of the $sidebars_widgets global.
 		 *
 		 * When batch requests are processed, this global is not properly updated by previous
@@ -248,7 +248,7 @@ public function update_item( $request ) {
 		 */
 		wp_get_sidebars_widgets();
 
-		retrieve_widgets();
+		sync_registered_widgets();
 
 		$widget_id  = $request['id'];
 		$sidebar_id = wp_find_widgets_sidebar( $widget_id );
@@ -313,7 +313,7 @@ public function delete_item( $request ) {
 		global $wp_widget_factory, $wp_registered_widget_updates;
 
 		/*
-		 * retrieve_widgets() contains logic to move "hidden" or "lost" widgets to the
+		 * sync_registered_widgets() contains logic to move "hidden" or "lost" widgets to the
 		 * wp_inactive_widgets sidebar based on the contents of the $sidebars_widgets global.
 		 *
 		 * When batch requests are processed, this global is not properly updated by previous
@@ -324,7 +324,7 @@ public function delete_item( $request ) {
 		 */
 		wp_get_sidebars_widgets();
 
-		retrieve_widgets();
+		sync_registered_widgets();
 
 		$widget_id  = $request['id'];
 		$sidebar_id = wp_find_widgets_sidebar( $widget_id );
diff --git a/src/wp-includes/theme.php b/src/wp-includes/theme.php
index 384c056404b2a..e58719e641cbd 100644
--- a/src/wp-includes/theme.php
+++ b/src/wp-includes/theme.php
@@ -805,7 +805,7 @@ function switch_theme( $stylesheet ) {
 		add_option( "theme_mods_$stylesheet", $default_theme_mods );
 	} else {
 		/*
-		 * Since retrieve_widgets() is called when initializing a theme in the Customizer,
+		 * Since sync_registered_widgets() is called when initializing a theme in the Customizer,
 		 * we need to remove the theme mods to avoid overwriting changes made via
 		 * the Customizer when accessing wp-admin/widgets.php.
 		 */
diff --git a/src/wp-includes/widgets.php b/src/wp-includes/widgets.php
index 61caf6af56d6a..4f159173451ed 100644
--- a/src/wp-includes/widgets.php
+++ b/src/wp-includes/widgets.php
@@ -1251,13 +1251,30 @@ function _wp_sidebars_changed() {
 		$sidebars_widgets = wp_get_sidebars_widgets();
 	}
 
-	retrieve_widgets( true );
+	sync_registered_widgets( true );
 }
 
 /**
- * Look for "lost" widgets, this has to run at least on each theme change.
+ * Do not use, deprecated.
+ *
+ * Use sync_registered_widgets() instead.
  *
  * @since 2.8.0
+ * @deprecated 5.8.1 Use sync_registered_widgets()
+ * @see sync_registered_widgets()
+ *
+ * @param string|bool $theme_changed
+ * @return array
+ */
+function retrieve_widgets( $theme_changed = false ) {
+	return sync_registered_widgets( $theme_changed );
+}
+
+/**
+ * Looks for "lost" widgets and Updates widgets-to-sidebars allocation.
+ * This has to run at least on each theme change.
+ *
+ * @since 5.8.1
  *
  * @global array $wp_registered_sidebars Registered sidebars.
  * @global array $sidebars_widgets
@@ -1267,7 +1284,7 @@ function _wp_sidebars_changed() {
  *                                   of 'customize' defers updates for the Customizer.
  * @return array Updated sidebars widgets.
  */
-function retrieve_widgets( $theme_changed = false ) {
+function sync_registered_widgets( $theme_changed = false ) {
 	global $wp_registered_sidebars, $sidebars_widgets, $wp_registered_widgets;
 
 	$registered_sidebars_keys = array_keys( $wp_registered_sidebars );
diff --git a/tests/phpunit/tests/widgets.php b/tests/phpunit/tests/widgets.php
index 886039d687e40..103ea8ec37f2e 100644
--- a/tests/phpunit/tests/widgets.php
+++ b/tests/phpunit/tests/widgets.php
@@ -843,9 +843,9 @@ function register_sidebars( $sidebars ) {
 	/**
 	 * Tests for when 'sidebars_widgets' theme mod is populated.
 	 *
-	 * @covers ::retrieve_widgets
+	 * @covers ::sync_registered_widgets
 	 */
-	function test_retrieve_widgets_with_theme_mod() {
+	function test_sync_registered_widgets_with_theme_mod() {
 		global $sidebars_widgets, $_wp_sidebars_widgets;
 
 		wp_widgets_init();
@@ -873,7 +873,7 @@ function test_retrieve_widgets_with_theme_mod() {
 			'wp_inactive_widgets' => array(),
 		);
 
-		$result = retrieve_widgets( true );
+		$result = sync_registered_widgets( true );
 
 		$this->assertIsArray( $result );
 		$this->assertSame( $result, $sidebars_widgets );
@@ -906,9 +906,9 @@ function test_retrieve_widgets_with_theme_mod() {
 	/**
 	 * Tests for when sidebars widgets matches registered sidebars.
 	 *
-	 * @covers ::retrieve_widgets
+	 * @covers ::sync_registered_widgets
 	 */
-	function test_retrieve_widgets_with_sidebars_widgets_matching_registered_sidebars() {
+	function test_sync_registered_widgets_with_sidebars_widgets_matching_registered_sidebars() {
 		global $sidebars_widgets;
 
 		wp_widgets_init();
@@ -921,7 +921,7 @@ function test_retrieve_widgets_with_sidebars_widgets_matching_registered_sidebar
 			'wp_inactive_widgets' => array(),
 		);
 
-		$result = retrieve_widgets( true );
+		$result = sync_registered_widgets( true );
 
 		// $sidebars_widgets matches registered sidebars.
 		$this->assertIsArray( $result );
@@ -944,9 +944,9 @@ function test_retrieve_widgets_with_sidebars_widgets_matching_registered_sidebar
 	/**
 	 * Tests for when sidebars widgets doesn't match registered sidebars.
 	 *
-	 * @covers ::retrieve_widgets
+	 * @covers ::sync_registered_widgets
 	 */
-	function test_retrieve_widgets_with_sidebars_widgets_not_matching_registered_sidebars() {
+	function test_sync_registered_widgets_with_sidebars_widgets_not_matching_registered_sidebars() {
 		global $sidebars_widgets, $_wp_sidebars_widgets;
 
 		wp_widgets_init();
@@ -960,7 +960,7 @@ function test_retrieve_widgets_with_sidebars_widgets_not_matching_registered_sid
 		);
 
 		// Theme changed.
-		$result = retrieve_widgets( true );
+		$result = sync_registered_widgets( true );
 
 		$_wp_sidebars_widgets = array();
 		$this->assertIsArray( $result );
@@ -1002,7 +1002,7 @@ function test_retrieve_widgets_with_sidebars_widgets_not_matching_registered_sid
 		);
 
 		// Theme did not change.
-		$result = retrieve_widgets();
+		$result = sync_registered_widgets();
 
 		$_wp_sidebars_widgets = array();
 		$this->assertIsArray( $result );
@@ -1036,9 +1036,9 @@ function test_retrieve_widgets_with_sidebars_widgets_not_matching_registered_sid
 	/**
 	 * Tests for Customizer mode.
 	 *
-	 * @covers ::retrieve_widgets
+	 * @covers ::sync_registered_widgets
 	 */
-	function test_retrieve_widgets_for_customizer() {
+	function test_sync_registered_widgets_for_customizer() {
 		global $sidebars_widgets, $_wp_sidebars_widgets;
 
 		wp_widgets_init();
@@ -1053,7 +1053,7 @@ function test_retrieve_widgets_for_customizer() {
 		);
 		set_theme_mod( 'sidebars_widgets', $old_sidebars_widgets );
 
-		$result = retrieve_widgets( 'customize' );
+		$result = sync_registered_widgets( 'customize' );
 
 		$_wp_sidebars_widgets = array();
 		$this->assertIsArray( $result );
@@ -1082,7 +1082,7 @@ function test_retrieve_widgets_for_customizer() {
 		$this->assertNotEquals( $sidebars_widgets, wp_get_sidebars_widgets() );
 	}
 
-	function test_retrieve_widgets_with_single_widget() {
+	function test_sync_registered_widgets_with_single_widget() {
 		global $sidebars_widgets;
 
 		wp_widgets_init();
@@ -1099,7 +1099,7 @@ function test_retrieve_widgets_with_single_widget() {
 		);
 
 		// Theme changed.
-		$result = retrieve_widgets( true );
+		$result = sync_registered_widgets( true );
 
 		$this->assertContains( 'single', $result['wp_inactive_widgets'] );
 	}
@@ -1107,9 +1107,9 @@ function test_retrieve_widgets_with_single_widget() {
 	/**
 	 * Tests for orphaned widgets being moved into inactive widgets.
 	 *
-	 * @covers ::retrieve_widgets
+	 * @covers ::sync_registered_widgets
 	 */
-	function test_retrieve_widgets_move_orphaned_widgets_to_inactive() {
+	function test_sync_registered_widgets_move_orphaned_widgets_to_inactive() {
 		global $sidebars_widgets;
 
 		wp_widgets_init();
@@ -1122,7 +1122,7 @@ function test_retrieve_widgets_move_orphaned_widgets_to_inactive() {
 			'orphaned_widgets_1'  => array( 'calendar-1' ),
 		);
 
-		retrieve_widgets();
+		sync_registered_widgets();
 
 		$this->assertIsArray( $sidebars_widgets );
 

From 1c9ac8c6c1051f9db8acfa0b77d270d5779cead5 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Wed, 1 Sep 2021 00:25:10 +0000
Subject: [PATCH 074/257] =?UTF-8?q?Build/Test=20Tools:=20Double=20escape?=
 =?UTF-8?q?=20quotation=20marks(`=E2=80=9C`)=20for=20Slack=20=E2=80=9Cmess?=
 =?UTF-8?q?ages=E2=80=9D.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This prevents quotation marks from producing invalid JSON errors.

See #52644.

git-svn-id: https://develop.svn.wordpress.org/trunk@51709 602fd350-edb4-49c9-b593-d223f7449a82
---
 .github/workflows/slack-notifications.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/slack-notifications.yml b/.github/workflows/slack-notifications.yml
index bc3caa63c6a4b..2be16eb6efdca 100644
--- a/.github/workflows/slack-notifications.yml
+++ b/.github/workflows/slack-notifications.yml
@@ -63,7 +63,7 @@ jobs:
       - name: Prepare commit message.
         id: commit-message
         run: |
-          COMMIT_MESSAGE=$(cat <<'EOF' | awk 'NR==1' | sed 's/`/\\`/g' | sed 's/\"/\\"/g'
+          COMMIT_MESSAGE=$(cat <<'EOF' | awk 'NR==1' | sed 's/`/\\`/g' | sed 's/\"/\\\\"/g'
           ${{ github.event.workflow_run.head_commit.message }}
           EOF
           )

From d43e6a631407ae32a0cf44f1e6dd8b2db30726f0 Mon Sep 17 00:00:00 2001
From: Peter Wilson <peterwilsoncc@git.wordpress.org>
Date: Wed, 1 Sep 2021 03:59:30 +0000
Subject: [PATCH 075/257] Build: Clean `css/dist` as part of the webpack build
 step.

Move the cleaning of the `wp-includes/css/dist` folder from `clean:css` to `clean:webpack-assets` to avoid an order of operations issue in which the files were built shortly before been deleted later in the build process.

Follow up to [51689].

Props netweb, ramonopoly, peterwilsoncc.
Fixes #53719.



git-svn-id: https://develop.svn.wordpress.org/trunk@51713 602fd350-edb4-49c9-b593-d223f7449a82
---
 Gruntfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index d273eac5e65b9..369079dc1db22 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -115,7 +115,6 @@ module.exports = function(grunt) {
 				WORKING_DIR + 'wp-admin/css/*-rtl*.css',
 				WORKING_DIR + 'wp-includes/css/*.min.css',
 				WORKING_DIR + 'wp-includes/css/*-rtl*.css',
-				WORKING_DIR + 'wp-includes/css/dist/',
 				WORKING_DIR + 'wp-admin/css/colors/**/*.css'
 			],
 			js: [
@@ -124,6 +123,7 @@ module.exports = function(grunt) {
 			],
 			'webpack-assets': [
 				WORKING_DIR + 'wp-includes/assets/*',
+				WORKING_DIR + 'wp-includes/css/dist/',
 				'!' + WORKING_DIR + 'wp-includes/assets/script-loader-packages.php'
 			],
 			dynamic: {

From c5461a67a7438ae03675f76ac8b43d30f8004bfe Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 1 Sep 2021 07:00:35 +0000
Subject: [PATCH 076/257] Site Health: Remove MySQL query cache size from the
 Site Health Info screen.

The query cache is deprecated as of MySQL 5.7.20, and is removed in MySQL 8.0.

Reference: [https://dev.mysql.com/doc/refman/5.7/en/query-cache-configuration.html MySQL 5.7 Reference Manual: Query Cache Configuration].

Follow-up to [51522], [51523].

Props johnbillion, zodiac1978.
Fixes #53845.

git-svn-id: https://develop.svn.wordpress.org/trunk@51715 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-debug-data.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-debug-data.php b/src/wp-admin/includes/class-wp-debug-data.php
index 2b07093365d49..a343196337cb0 100644
--- a/src/wp-admin/includes/class-wp-debug-data.php
+++ b/src/wp-admin/includes/class-wp-debug-data.php
@@ -935,11 +935,6 @@ static function debug_data() {
 			'value' => self::get_mysql_var( 'max_connections' ),
 		);
 
-		$info['wp-database']['fields']['query_cache_size'] = array(
-			'label' => __( 'Query cache size' ),
-			'value' => self::get_mysql_var( 'query_cache_size' ),
-		);
-
 		// List must use plugins if there are any.
 		$mu_plugins = get_mu_plugins();
 

From afb38a6eb6a02f949b12ae381438d0b7c7bbef0e Mon Sep 17 00:00:00 2001
From: Robert Anderson <noisysocks@git.wordpress.org>
Date: Wed, 1 Sep 2021 07:09:05 +0000
Subject: [PATCH 077/257] Customize: Add wp-embed-responsive class to body if
 using widgets block editor

Appends the wp-embed-responsive class to the body if the widgets block editor is
enabled. This fixes a bug preventing embeds (e.g. YouTube embeds) appearing in
the widgets block editor.

Fixes #53609.
Props walbo, kevin940726.


git-svn-id: https://develop.svn.wordpress.org/trunk@51716 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/customize.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/wp-admin/customize.php b/src/wp-admin/customize.php
index 0c9298784cea3..0dd548d43a380 100644
--- a/src/wp-admin/customize.php
+++ b/src/wp-admin/customize.php
@@ -144,6 +144,10 @@
 }
 $body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
 
+if ( wp_use_widgets_block_editor() ) {
+	$body_class .= ' wp-embed-responsive';
+}
+
 $admin_title = sprintf( $wp_customize->get_document_title_template(), __( 'Loading&hellip;' ) );
 
 ?>

From 82c52dab563dd7b4f31171ebe5541406203897b6 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Wed, 1 Sep 2021 17:16:08 +0000
Subject: [PATCH 078/257] Media: Remove documentation detailing specific edge
 cases in the `image_editor_output_format` filter.

In [51422], a few specific edge cases were detailed so that developers using the hook were aware of known pitfalls.

These edge cases have been fixed in 5.8.1 through [51653] and [51704], so the documentation is no longer necessary.

Props azaozz, audrasjb.
Fixes #53955.

git-svn-id: https://develop.svn.wordpress.org/trunk@51717 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-image-editor.php | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/wp-includes/class-wp-image-editor.php b/src/wp-includes/class-wp-image-editor.php
index 3c2625d2f3550..a74d4ac7430b9 100644
--- a/src/wp-includes/class-wp-image-editor.php
+++ b/src/wp-includes/class-wp-image-editor.php
@@ -351,19 +351,6 @@ protected function get_output_format( $filename = null, $mime_type = null ) {
 		 * Enables filtering the mime type used to save images. By default,
 		 * the mapping array is empty, so the mime type matches the source image.
 		 *
-		 * This should be considered experimental as there are a few edge cases that
-		 * still need to be solved.
-		 *
-		 * When this filter is used in combination with the {@see 'wp_editor_set_quality'}
-		 * filter, the image quality value used will be that of the original mime type,
-		 * not the mapped one. This could result in unexpected image quality for generated
-		 * images. See https://core.trac.wordpress.org/ticket/53667 for more details.
-		 *
-		 * When a mime type is mapped to another, and two images with the same name are
-		 * uploaded (image.jpg and image.webp, for example), the generated images for one
-		 * will potentially overwrite the other's.
-		 * See https://core.trac.wordpress.org/ticket/53668 for more details.
-		 *
 		 * @see WP_Image_Editor::get_output_format()
 		 *
 		 * @since 5.8.0

From baa5ba32d8698f6a6a5928bcbd4fea35bd47a8c1 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Wed, 1 Sep 2021 19:05:44 +0000
Subject: [PATCH 079/257] Editor: Update block editor packages for WordPress
 5.8.1.

The following packages were updated:
- @wordpress/a11y to `3.1.2`
- @wordpress/annotations to `2.1.6`
- @wordpress/api-fetch to `5.1.2`
- @wordpress/autop to `3.1.2`
- @wordpress/babel-preset-default to `6.2.1`
- @wordpress/blob to `3.1.2`
- @wordpress/block-directory to `2.1.21`
- @wordpress/block-editor to `6.1.14`
- @wordpress/block-library to `3.2.19`
- @wordpress/block-serialization-default-parser to `4.1.2`
- @wordpress/blocks to `9.1.8`
- @wordpress/components to `14.1.11`
- @wordpress/compose to `4.1.6`
- @wordpress/core-data to `3.1.12`
- @wordpress/customize-widgets to `1.0.20`
- @wordpress/data-controls to `2.1.6`
- @wordpress/data to `5.1.6`
- @wordpress/date to `4.1.2`
- @wordpress/deprecated to `3.1.2`
- @wordpress/dom-ready to `3.1.2`
- @wordpress/dom to `3.1.5`
- @wordpress/e2e-test-utils to `5.3.1`
- @wordpress/edit-post to `4.1.21`
- @wordpress/edit-widgets to `2.1.21`
- @wordpress/editor to `10.1.17`
- @wordpress/element to `3.1.2`
- @wordpress/escape-html to `2.1.2`
- @wordpress/format-library to `2.1.14`
- @wordpress/html-entities to `3.1.2`
- @wordpress/i18n to `4.1.2`
- @wordpress/icons to `4.0.3`
- @wordpress/interface to `3.1.12`
- @wordpress/keyboard-shortcuts to `2.1.7`
- @wordpress/keycodes to `3.1.2`
- @wordpress/list-reusable-blocks to `2.1.11`
- @wordpress/media-utils to `2.1.2`
- @wordpress/notices to `3.1.6`
- @wordpress/nux to `4.1.11`
- @wordpress/plugins to `3.1.6`
- @wordpress/primitives to `2.1.2`
- @wordpress/priority-queue to `2.1.2`
- @wordpress/react-i18n to `2.1.2`
- @wordpress/redux-routine to `4.1.2`
- @wordpress/reusable-blocks to `2.1.17`
- @wordpress/rich-text to `4.1.6`
- @wordpress/scripts to `16.1.5`
- @wordpress/server-side-render to `2.1.12`
- @wordpress/shortcode to `3.1.2`
- @wordpress/url to `3.1.2`
- @wordpress/viewport to `3.1.6`
- @wordpress/warning to `2.1.2`
- @wordpress/widgets to `1.1.19`
- @wordpress/wordcount to `3.1.2`

Props oandregal, juanmaguitar, gziolo, jblz, talldanwp, ribaricplusplus, peterwisoncc, youknowriad, paaljoachim, kreppar, ellatrix, aristath, walbo, ajlende, kevin940726, mamaduka, ntsekouras, toro_unit, mkaz, joen, noisysocks, zieladam, andraganescu, antonvlasenko, terraling, dariak, vladytimy, circlecube, desrosj.
Fixes #54052, #52818.

git-svn-id: https://develop.svn.wordpress.org/trunk@51719 602fd350-edb4-49c9-b593-d223f7449a82
---
 package-lock.json                             | 2648 +++++++++--------
 package.json                                  |  104 +-
 .../assets/script-loader-packages.php         |    2 +-
 3 files changed, 1469 insertions(+), 1285 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ff7ad249aaad1..6e4e117da14ae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,26 +13,26 @@
 			}
 		},
 		"@babel/compat-data": {
-			"version": "7.14.7",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.7.tgz",
-			"integrity": "sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==",
+			"version": "7.15.0",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",
+			"integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==",
 			"dev": true
 		},
 		"@babel/core": {
-			"version": "7.14.6",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.6.tgz",
-			"integrity": "sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA==",
+			"version": "7.15.0",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz",
+			"integrity": "sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==",
 			"dev": true,
 			"requires": {
 				"@babel/code-frame": "^7.14.5",
-				"@babel/generator": "^7.14.5",
-				"@babel/helper-compilation-targets": "^7.14.5",
-				"@babel/helper-module-transforms": "^7.14.5",
-				"@babel/helpers": "^7.14.6",
-				"@babel/parser": "^7.14.6",
+				"@babel/generator": "^7.15.0",
+				"@babel/helper-compilation-targets": "^7.15.0",
+				"@babel/helper-module-transforms": "^7.15.0",
+				"@babel/helpers": "^7.14.8",
+				"@babel/parser": "^7.15.0",
 				"@babel/template": "^7.14.5",
-				"@babel/traverse": "^7.14.5",
-				"@babel/types": "^7.14.5",
+				"@babel/traverse": "^7.15.0",
+				"@babel/types": "^7.15.0",
 				"convert-source-map": "^1.7.0",
 				"debug": "^4.1.0",
 				"gensync": "^1.0.0-beta.2",
@@ -42,9 +42,9 @@
 			},
 			"dependencies": {
 				"@babel/parser": {
-					"version": "7.14.7",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.7.tgz",
-					"integrity": "sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA==",
+					"version": "7.15.3",
+					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz",
+					"integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==",
 					"dev": true
 				},
 				"json5": {
@@ -65,12 +65,12 @@
 			}
 		},
 		"@babel/generator": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.5.tgz",
-			"integrity": "sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA==",
+			"version": "7.15.0",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz",
+			"integrity": "sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.14.5",
+				"@babel/types": "^7.15.0",
 				"jsesc": "^2.5.1",
 				"source-map": "^0.5.0"
 			}
@@ -95,12 +95,12 @@
 			}
 		},
 		"@babel/helper-compilation-targets": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz",
-			"integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==",
+			"version": "7.15.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz",
+			"integrity": "sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==",
 			"dev": true,
 			"requires": {
-				"@babel/compat-data": "^7.14.5",
+				"@babel/compat-data": "^7.15.0",
 				"@babel/helper-validator-option": "^7.14.5",
 				"browserslist": "^4.16.6",
 				"semver": "^6.3.0"
@@ -115,16 +115,16 @@
 			}
 		},
 		"@babel/helper-create-class-features-plugin": {
-			"version": "7.14.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.6.tgz",
-			"integrity": "sha512-Z6gsfGofTxH/+LQXqYEK45kxmcensbzmk/oi8DmaQytlQCgqNZt9XQF8iqlI/SeXWVjaMNxvYvzaYw+kh42mDg==",
+			"version": "7.15.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.0.tgz",
+			"integrity": "sha512-MdmDXgvTIi4heDVX/e9EFfeGpugqm9fobBVg/iioE8kueXrOHdRDe36FAY7SnE9xXLVeYCoJR/gdrBEIHRC83Q==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-annotate-as-pure": "^7.14.5",
 				"@babel/helper-function-name": "^7.14.5",
-				"@babel/helper-member-expression-to-functions": "^7.14.5",
+				"@babel/helper-member-expression-to-functions": "^7.15.0",
 				"@babel/helper-optimise-call-expression": "^7.14.5",
-				"@babel/helper-replace-supers": "^7.14.5",
+				"@babel/helper-replace-supers": "^7.15.0",
 				"@babel/helper-split-export-declaration": "^7.14.5"
 			}
 		},
@@ -201,12 +201,12 @@
 			}
 		},
 		"@babel/helper-member-expression-to-functions": {
-			"version": "7.14.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz",
-			"integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==",
+			"version": "7.15.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz",
+			"integrity": "sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.14.5"
+				"@babel/types": "^7.15.0"
 			}
 		},
 		"@babel/helper-module-imports": {
@@ -218,19 +218,19 @@
 			}
 		},
 		"@babel/helper-module-transforms": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz",
-			"integrity": "sha512-iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA==",
+			"version": "7.15.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz",
+			"integrity": "sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-module-imports": "^7.14.5",
-				"@babel/helper-replace-supers": "^7.14.5",
-				"@babel/helper-simple-access": "^7.14.5",
+				"@babel/helper-replace-supers": "^7.15.0",
+				"@babel/helper-simple-access": "^7.14.8",
 				"@babel/helper-split-export-declaration": "^7.14.5",
-				"@babel/helper-validator-identifier": "^7.14.5",
+				"@babel/helper-validator-identifier": "^7.14.9",
 				"@babel/template": "^7.14.5",
-				"@babel/traverse": "^7.14.5",
-				"@babel/types": "^7.14.5"
+				"@babel/traverse": "^7.15.0",
+				"@babel/types": "^7.15.0"
 			}
 		},
 		"@babel/helper-optimise-call-expression": {
@@ -260,24 +260,24 @@
 			}
 		},
 		"@babel/helper-replace-supers": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz",
-			"integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==",
+			"version": "7.15.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz",
+			"integrity": "sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-member-expression-to-functions": "^7.14.5",
+				"@babel/helper-member-expression-to-functions": "^7.15.0",
 				"@babel/helper-optimise-call-expression": "^7.14.5",
-				"@babel/traverse": "^7.14.5",
-				"@babel/types": "^7.14.5"
+				"@babel/traverse": "^7.15.0",
+				"@babel/types": "^7.15.0"
 			}
 		},
 		"@babel/helper-simple-access": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz",
-			"integrity": "sha512-nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw==",
+			"version": "7.14.8",
+			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz",
+			"integrity": "sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.14.5"
+				"@babel/types": "^7.14.8"
 			}
 		},
 		"@babel/helper-skip-transparent-expression-wrappers": {
@@ -299,9 +299,9 @@
 			}
 		},
 		"@babel/helper-validator-identifier": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz",
-			"integrity": "sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg=="
+			"version": "7.14.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
+			"integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g=="
 		},
 		"@babel/helper-validator-option": {
 			"version": "7.14.5",
@@ -322,14 +322,14 @@
 			}
 		},
 		"@babel/helpers": {
-			"version": "7.14.6",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.6.tgz",
-			"integrity": "sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA==",
+			"version": "7.15.3",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.3.tgz",
+			"integrity": "sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g==",
 			"dev": true,
 			"requires": {
 				"@babel/template": "^7.14.5",
-				"@babel/traverse": "^7.14.5",
-				"@babel/types": "^7.14.5"
+				"@babel/traverse": "^7.15.0",
+				"@babel/types": "^7.15.0"
 			}
 		},
 		"@babel/highlight": {
@@ -372,9 +372,9 @@
 			}
 		},
 		"@babel/plugin-proposal-async-generator-functions": {
-			"version": "7.14.7",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz",
-			"integrity": "sha512-RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q==",
+			"version": "7.14.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz",
+			"integrity": "sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.14.5",
@@ -721,18 +721,18 @@
 			}
 		},
 		"@babel/plugin-transform-block-scoping": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz",
-			"integrity": "sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==",
+			"version": "7.15.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz",
+			"integrity": "sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.14.5"
 			}
 		},
 		"@babel/plugin-transform-classes": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.5.tgz",
-			"integrity": "sha512-J4VxKAMykM06K/64z9rwiL6xnBHgB1+FVspqvlgCdwD1KUbQNfszeKVVOMh59w3sztHYIZDgnhOC4WbdEfHFDA==",
+			"version": "7.14.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz",
+			"integrity": "sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-annotate-as-pure": "^7.14.5",
@@ -840,14 +840,14 @@
 			}
 		},
 		"@babel/plugin-transform-modules-commonjs": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz",
-			"integrity": "sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A==",
+			"version": "7.15.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz",
+			"integrity": "sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-module-transforms": "^7.14.5",
+				"@babel/helper-module-transforms": "^7.15.0",
 				"@babel/helper-plugin-utils": "^7.14.5",
-				"@babel/helper-simple-access": "^7.14.5",
+				"@babel/helper-simple-access": "^7.14.8",
 				"babel-plugin-dynamic-import-node": "^2.3.3"
 			}
 		},
@@ -875,9 +875,9 @@
 			}
 		},
 		"@babel/plugin-transform-named-capturing-groups-regex": {
-			"version": "7.14.7",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz",
-			"integrity": "sha512-DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg==",
+			"version": "7.14.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz",
+			"integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-create-regexp-features-plugin": "^7.14.5"
@@ -930,25 +930,25 @@
 			}
 		},
 		"@babel/plugin-transform-react-display-name": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.5.tgz",
-			"integrity": "sha512-07aqY1ChoPgIxsuDviptRpVkWCSbXWmzQqcgy65C6YSFOfPFvb/DX3bBRHh7pCd/PMEEYHYWUTSVkCbkVainYQ==",
+			"version": "7.15.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.15.1.tgz",
+			"integrity": "sha512-yQZ/i/pUCJAHI/LbtZr413S3VT26qNrEm0M5RRxQJA947/YNYwbZbBaXGDrq6CG5QsZycI1VIP6d7pQaBfP+8Q==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.14.5"
 			}
 		},
 		"@babel/plugin-transform-react-jsx": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.5.tgz",
-			"integrity": "sha512-7RylxNeDnxc1OleDm0F5Q/BSL+whYRbOAR+bwgCxIr0L32v7UFh/pz1DLMZideAUxKT6eMoS2zQH6fyODLEi8Q==",
+			"version": "7.14.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz",
+			"integrity": "sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-annotate-as-pure": "^7.14.5",
 				"@babel/helper-module-imports": "^7.14.5",
 				"@babel/helper-plugin-utils": "^7.14.5",
 				"@babel/plugin-syntax-jsx": "^7.14.5",
-				"@babel/types": "^7.14.5"
+				"@babel/types": "^7.14.9"
 			}
 		},
 		"@babel/plugin-transform-react-jsx-development": {
@@ -989,9 +989,9 @@
 			}
 		},
 		"@babel/plugin-transform-runtime": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.5.tgz",
-			"integrity": "sha512-fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg==",
+			"version": "7.15.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz",
+			"integrity": "sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-module-imports": "^7.14.5",
@@ -1057,12 +1057,12 @@
 			}
 		},
 		"@babel/plugin-transform-typescript": {
-			"version": "7.14.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.6.tgz",
-			"integrity": "sha512-XlTdBq7Awr4FYIzqhmYY80WN0V0azF74DMPyFqVHBvf81ZUgc4X7ZOpx6O8eLDK6iM5cCQzeyJw0ynTaefixRA==",
+			"version": "7.15.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.0.tgz",
+			"integrity": "sha512-WIIEazmngMEEHDaPTx0IZY48SaAmjVWe3TRSX7cmJXn0bEv9midFzAjxiruOWYIVf5iQ10vFx7ASDpgEO08L5w==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.14.6",
+				"@babel/helper-create-class-features-plugin": "^7.15.0",
 				"@babel/helper-plugin-utils": "^7.14.5",
 				"@babel/plugin-syntax-typescript": "^7.14.5"
 			}
@@ -1087,17 +1087,17 @@
 			}
 		},
 		"@babel/preset-env": {
-			"version": "7.14.7",
-			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.7.tgz",
-			"integrity": "sha512-itOGqCKLsSUl0Y+1nSfhbuuOlTs0MJk2Iv7iSH+XT/mR8U1zRLO7NjWlYXB47yhK4J/7j+HYty/EhFZDYKa/VA==",
+			"version": "7.15.0",
+			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.0.tgz",
+			"integrity": "sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q==",
 			"dev": true,
 			"requires": {
-				"@babel/compat-data": "^7.14.7",
-				"@babel/helper-compilation-targets": "^7.14.5",
+				"@babel/compat-data": "^7.15.0",
+				"@babel/helper-compilation-targets": "^7.15.0",
 				"@babel/helper-plugin-utils": "^7.14.5",
 				"@babel/helper-validator-option": "^7.14.5",
 				"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.14.5",
-				"@babel/plugin-proposal-async-generator-functions": "^7.14.7",
+				"@babel/plugin-proposal-async-generator-functions": "^7.14.9",
 				"@babel/plugin-proposal-class-properties": "^7.14.5",
 				"@babel/plugin-proposal-class-static-block": "^7.14.5",
 				"@babel/plugin-proposal-dynamic-import": "^7.14.5",
@@ -1130,7 +1130,7 @@
 				"@babel/plugin-transform-async-to-generator": "^7.14.5",
 				"@babel/plugin-transform-block-scoped-functions": "^7.14.5",
 				"@babel/plugin-transform-block-scoping": "^7.14.5",
-				"@babel/plugin-transform-classes": "^7.14.5",
+				"@babel/plugin-transform-classes": "^7.14.9",
 				"@babel/plugin-transform-computed-properties": "^7.14.5",
 				"@babel/plugin-transform-destructuring": "^7.14.7",
 				"@babel/plugin-transform-dotall-regex": "^7.14.5",
@@ -1141,10 +1141,10 @@
 				"@babel/plugin-transform-literals": "^7.14.5",
 				"@babel/plugin-transform-member-expression-literals": "^7.14.5",
 				"@babel/plugin-transform-modules-amd": "^7.14.5",
-				"@babel/plugin-transform-modules-commonjs": "^7.14.5",
+				"@babel/plugin-transform-modules-commonjs": "^7.15.0",
 				"@babel/plugin-transform-modules-systemjs": "^7.14.5",
 				"@babel/plugin-transform-modules-umd": "^7.14.5",
-				"@babel/plugin-transform-named-capturing-groups-regex": "^7.14.7",
+				"@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9",
 				"@babel/plugin-transform-new-target": "^7.14.5",
 				"@babel/plugin-transform-object-super": "^7.14.5",
 				"@babel/plugin-transform-parameters": "^7.14.5",
@@ -1159,11 +1159,11 @@
 				"@babel/plugin-transform-unicode-escapes": "^7.14.5",
 				"@babel/plugin-transform-unicode-regex": "^7.14.5",
 				"@babel/preset-modules": "^0.1.4",
-				"@babel/types": "^7.14.5",
+				"@babel/types": "^7.15.0",
 				"babel-plugin-polyfill-corejs2": "^0.2.2",
 				"babel-plugin-polyfill-corejs3": "^0.2.2",
 				"babel-plugin-polyfill-regenerator": "^0.2.2",
-				"core-js-compat": "^3.15.0",
+				"core-js-compat": "^3.16.0",
 				"semver": "^6.3.0"
 			},
 			"dependencies": {
@@ -1203,14 +1203,14 @@
 			}
 		},
 		"@babel/preset-typescript": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.14.5.tgz",
-			"integrity": "sha512-u4zO6CdbRKbS9TypMqrlGH7sd2TAJppZwn3c/ZRLeO/wGsbddxgbPDUZVNrie3JWYLQ9vpineKlsrWFvO6Pwkw==",
+			"version": "7.15.0",
+			"resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.15.0.tgz",
+			"integrity": "sha512-lt0Y/8V3y06Wq/8H/u0WakrqciZ7Fz7mwPDHWUJAXlABL5hiUG42BNlRXiELNjeWjO5rWmnNKlx+yzJvxezHow==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.14.5",
 				"@babel/helper-validator-option": "^7.14.5",
-				"@babel/plugin-transform-typescript": "^7.14.5"
+				"@babel/plugin-transform-typescript": "^7.15.0"
 			}
 		},
 		"@babel/runtime": {
@@ -1222,12 +1222,12 @@
 			}
 		},
 		"@babel/runtime-corejs3": {
-			"version": "7.14.7",
-			"resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.7.tgz",
-			"integrity": "sha512-Wvzcw4mBYbTagyBVZpAJWI06auSIj033T/yNE0Zn1xcup83MieCddZA7ls3kme17L4NOGBrQ09Q+nKB41RLWBA==",
+			"version": "7.15.3",
+			"resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz",
+			"integrity": "sha512-30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A==",
 			"dev": true,
 			"requires": {
-				"core-js-pure": "^3.15.0",
+				"core-js-pure": "^3.16.0",
 				"regenerator-runtime": "^0.13.4"
 			}
 		},
@@ -1243,44 +1243,44 @@
 			},
 			"dependencies": {
 				"@babel/parser": {
-					"version": "7.14.7",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.7.tgz",
-					"integrity": "sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA==",
+					"version": "7.15.3",
+					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz",
+					"integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==",
 					"dev": true
 				}
 			}
 		},
 		"@babel/traverse": {
-			"version": "7.14.7",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.7.tgz",
-			"integrity": "sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ==",
+			"version": "7.15.0",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz",
+			"integrity": "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==",
 			"dev": true,
 			"requires": {
 				"@babel/code-frame": "^7.14.5",
-				"@babel/generator": "^7.14.5",
+				"@babel/generator": "^7.15.0",
 				"@babel/helper-function-name": "^7.14.5",
 				"@babel/helper-hoist-variables": "^7.14.5",
 				"@babel/helper-split-export-declaration": "^7.14.5",
-				"@babel/parser": "^7.14.7",
-				"@babel/types": "^7.14.5",
+				"@babel/parser": "^7.15.0",
+				"@babel/types": "^7.15.0",
 				"debug": "^4.1.0",
 				"globals": "^11.1.0"
 			},
 			"dependencies": {
 				"@babel/parser": {
-					"version": "7.14.7",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.7.tgz",
-					"integrity": "sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA==",
+					"version": "7.15.3",
+					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz",
+					"integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==",
 					"dev": true
 				}
 			}
 		},
 		"@babel/types": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz",
-			"integrity": "sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg==",
+			"version": "7.15.0",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz",
+			"integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==",
 			"requires": {
-				"@babel/helper-validator-identifier": "^7.14.5",
+				"@babel/helper-validator-identifier": "^7.14.9",
 				"to-fast-properties": "^2.0.0"
 			}
 		},
@@ -1425,10 +1425,21 @@
 			"resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz",
 			"integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA=="
 		},
+		"@es-joy/jsdoccomment": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.6.0.tgz",
+			"integrity": "sha512-zT1EtysKMITJ7vE4RvOJqitxk/Str6It8hq+fykxkwLuTyzgak+TnVuVSIyovT/qrEz3i46ypCSXgNtIDYwNOg==",
+			"dev": true,
+			"requires": {
+				"comment-parser": "^1.1.5",
+				"esquery": "^1.4.0",
+				"jsdoctypeparser": "^9.0.0"
+			}
+		},
 		"@eslint/eslintrc": {
-			"version": "0.4.2",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz",
-			"integrity": "sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==",
+			"version": "0.4.3",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+			"integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
 			"dev": true,
 			"requires": {
 				"ajv": "^6.12.4",
@@ -1443,9 +1454,9 @@
 			},
 			"dependencies": {
 				"globals": {
-					"version": "13.10.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz",
-					"integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==",
+					"version": "13.11.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
+					"integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
 					"dev": true,
 					"requires": {
 						"type-fest": "^0.20.2"
@@ -1656,6 +1667,12 @@
 				}
 			}
 		},
+		"@gar/promisify": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz",
+			"integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==",
+			"dev": true
+		},
 		"@hapi/address": {
 			"version": "2.1.4",
 			"resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz",
@@ -2154,6 +2171,27 @@
 				"fastq": "^1.6.0"
 			}
 		},
+		"@npmcli/fs": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.0.0.tgz",
+			"integrity": "sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ==",
+			"dev": true,
+			"requires": {
+				"@gar/promisify": "^1.0.1",
+				"semver": "^7.3.5"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "7.3.5",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+					"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "^6.0.0"
+					}
+				}
+			}
+		},
 		"@npmcli/move-file": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
@@ -2182,15 +2220,15 @@
 			}
 		},
 		"@polka/url": {
-			"version": "1.0.0-next.15",
-			"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz",
-			"integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==",
+			"version": "1.0.0-next.20",
+			"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.20.tgz",
+			"integrity": "sha512-88p7+M0QGxKpmnkfXjS4V26AnoC/eiqZutE8GLdaI5X12NY75bXSdTY9NkmYb2Xyk1O+MmkuO6Frmsj84V6I8Q==",
 			"dev": true
 		},
 		"@popperjs/core": {
-			"version": "2.9.2",
-			"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz",
-			"integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q=="
+			"version": "2.9.3",
+			"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.3.tgz",
+			"integrity": "sha512-xDu17cEfh7Kid/d95kB6tZsLOmSWKCZKtprnhVepjsSaCij+lM3mItSJDuuHDMbCWTh8Ejmebwb+KONcCJ0eXQ=="
 		},
 		"@sideway/address": {
 			"version": "4.1.1",
@@ -2364,9 +2402,9 @@
 					"dev": true
 				},
 				"cosmiconfig": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
-					"integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
+					"version": "7.0.1",
+					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
+					"integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
 					"dev": true,
 					"requires": {
 						"@types/parse-json": "^4.0.0",
@@ -2411,9 +2449,9 @@
 			},
 			"dependencies": {
 				"cosmiconfig": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
-					"integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
+					"version": "7.0.1",
+					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
+					"integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
 					"dev": true,
 					"requires": {
 						"@types/parse-json": "^4.0.0",
@@ -2616,10 +2654,16 @@
 			"integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==",
 			"dev": true
 		},
+		"@types/json5": {
+			"version": "0.0.29",
+			"resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+			"integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+			"dev": true
+		},
 		"@types/mdast": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.4.tgz",
-			"integrity": "sha512-gIdhbLDFlspL53xzol2hVzrXAbzt71erJHoOwQZWssjaiouOotf03lNtMmFm9VfFkvnLWccSVjUAZGQ5Kqw+jA==",
+			"version": "3.0.10",
+			"resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz",
+			"integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==",
 			"dev": true,
 			"requires": {
 				"@types/unist": "*"
@@ -2671,9 +2715,9 @@
 			"dev": true
 		},
 		"@types/react": {
-			"version": "16.14.11",
-			"resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.11.tgz",
-			"integrity": "sha512-Don0MtsZZ3fjwTJ2BsoqkyOy7e176KplEAKOpr/4XDdzinlyJBn9yfsKn5mcSgn4kh1B22+3tBnzBC1z63ybtQ==",
+			"version": "16.14.14",
+			"resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.14.tgz",
+			"integrity": "sha512-uwIWDYW8LznHzEMJl7ag9St1RsK0gw/xaFZ5+uI1ZM1HndwUgmPH3/wQkSb87GkOVg7shUxnpNW8DcN0AzvG5Q==",
 			"requires": {
 				"@types/prop-types": "*",
 				"@types/scheduler": "*",
@@ -2729,9 +2773,9 @@
 			}
 		},
 		"@types/unist": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.5.tgz",
-			"integrity": "sha512-wnra4Vw9dopnuybR6HBywJ/URYpYrKLoepBTEtgfJup8Ahoi2zJECPP2cwiXp7btTvOT2CULv87aQRA4eZSP6g==",
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz",
+			"integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==",
 			"dev": true
 		},
 		"@types/webpack": {
@@ -2757,9 +2801,9 @@
 			}
 		},
 		"@types/webpack-sources": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.1.1.tgz",
-			"integrity": "sha512-MjM1R6iuw8XaVbtkCBz0N349cyqBjJHCbQiOeppe3VBeFvxqs74RKHAVt9LkxTnUWc7YLZOEsUfPUnmK6SBPKQ==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.0.tgz",
+			"integrity": "sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg==",
 			"dev": true,
 			"requires": {
 				"@types/node": "*",
@@ -2801,13 +2845,13 @@
 			}
 		},
 		"@typescript-eslint/eslint-plugin": {
-			"version": "4.28.3",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.3.tgz",
-			"integrity": "sha512-jW8sEFu1ZeaV8xzwsfi6Vgtty2jf7/lJmQmDkDruBjYAbx5DA8JtbcMnP0rNPUG+oH5GoQBTSp+9613BzuIpYg==",
+			"version": "4.30.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz",
+			"integrity": "sha512-NgAnqk55RQ/SD+tZFD9aPwNSeHmDHHe5rtUyhIq0ZeCWZEvo4DK9rYz7v9HDuQZFvn320Ot+AikaCKMFKLlD0g==",
 			"dev": true,
 			"requires": {
-				"@typescript-eslint/experimental-utils": "4.28.3",
-				"@typescript-eslint/scope-manager": "4.28.3",
+				"@typescript-eslint/experimental-utils": "4.30.0",
+				"@typescript-eslint/scope-manager": "4.30.0",
 				"debug": "^4.3.1",
 				"functional-red-black-tree": "^1.0.1",
 				"regexpp": "^3.1.0",
@@ -2842,23 +2886,23 @@
 			}
 		},
 		"@typescript-eslint/experimental-utils": {
-			"version": "4.28.3",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.3.tgz",
-			"integrity": "sha512-zZYl9TnrxwEPi3FbyeX0ZnE8Hp7j3OCR+ELoUfbwGHGxWnHg9+OqSmkw2MoCVpZksPCZYpQzC559Ee9pJNHTQw==",
+			"version": "4.30.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz",
+			"integrity": "sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw==",
 			"dev": true,
 			"requires": {
 				"@types/json-schema": "^7.0.7",
-				"@typescript-eslint/scope-manager": "4.28.3",
-				"@typescript-eslint/types": "4.28.3",
-				"@typescript-eslint/typescript-estree": "4.28.3",
+				"@typescript-eslint/scope-manager": "4.30.0",
+				"@typescript-eslint/types": "4.30.0",
+				"@typescript-eslint/typescript-estree": "4.30.0",
 				"eslint-scope": "^5.1.1",
 				"eslint-utils": "^3.0.0"
 			},
 			"dependencies": {
 				"@types/json-schema": {
-					"version": "7.0.8",
-					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
-					"integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==",
+					"version": "7.0.9",
+					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+					"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
 					"dev": true
 				},
 				"eslint-scope": {
@@ -2874,14 +2918,14 @@
 			}
 		},
 		"@typescript-eslint/parser": {
-			"version": "4.28.3",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.3.tgz",
-			"integrity": "sha512-ZyWEn34bJexn/JNYvLQab0Mo5e+qqQNhknxmc8azgNd4XqspVYR5oHq9O11fLwdZMRcj4by15ghSlIEq+H5ltQ==",
+			"version": "4.30.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.30.0.tgz",
+			"integrity": "sha512-HJ0XuluSZSxeboLU7Q2VQ6eLlCwXPBOGnA7CqgBnz2Db3JRQYyBDJgQnop6TZ+rsbSx5gEdWhw4rE4mDa1FnZg==",
 			"dev": true,
 			"requires": {
-				"@typescript-eslint/scope-manager": "4.28.3",
-				"@typescript-eslint/types": "4.28.3",
-				"@typescript-eslint/typescript-estree": "4.28.3",
+				"@typescript-eslint/scope-manager": "4.30.0",
+				"@typescript-eslint/types": "4.30.0",
+				"@typescript-eslint/typescript-estree": "4.30.0",
 				"debug": "^4.3.1"
 			},
 			"dependencies": {
@@ -2903,29 +2947,29 @@
 			}
 		},
 		"@typescript-eslint/scope-manager": {
-			"version": "4.28.3",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.3.tgz",
-			"integrity": "sha512-/8lMisZ5NGIzGtJB+QizQ5eX4Xd8uxedFfMBXOKuJGP0oaBBVEMbJVddQKDXyyB0bPlmt8i6bHV89KbwOelJiQ==",
+			"version": "4.30.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz",
+			"integrity": "sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A==",
 			"dev": true,
 			"requires": {
-				"@typescript-eslint/types": "4.28.3",
-				"@typescript-eslint/visitor-keys": "4.28.3"
+				"@typescript-eslint/types": "4.30.0",
+				"@typescript-eslint/visitor-keys": "4.30.0"
 			}
 		},
 		"@typescript-eslint/types": {
-			"version": "4.28.3",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.3.tgz",
-			"integrity": "sha512-kQFaEsQBQVtA9VGVyciyTbIg7S3WoKHNuOp/UF5RG40900KtGqfoiETWD/v0lzRXc+euVE9NXmfer9dLkUJrkA==",
+			"version": "4.30.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.30.0.tgz",
+			"integrity": "sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw==",
 			"dev": true
 		},
 		"@typescript-eslint/typescript-estree": {
-			"version": "4.28.3",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.3.tgz",
-			"integrity": "sha512-YAb1JED41kJsqCQt1NcnX5ZdTA93vKFCMP4lQYG6CFxd0VzDJcKttRlMrlG+1qiWAw8+zowmHU1H0OzjWJzR2w==",
+			"version": "4.30.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz",
+			"integrity": "sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg==",
 			"dev": true,
 			"requires": {
-				"@typescript-eslint/types": "4.28.3",
-				"@typescript-eslint/visitor-keys": "4.28.3",
+				"@typescript-eslint/types": "4.30.0",
+				"@typescript-eslint/visitor-keys": "4.30.0",
 				"debug": "^4.3.1",
 				"globby": "^11.0.3",
 				"is-glob": "^4.0.1",
@@ -2980,12 +3024,12 @@
 			}
 		},
 		"@typescript-eslint/visitor-keys": {
-			"version": "4.28.3",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.3.tgz",
-			"integrity": "sha512-ri1OzcLnk1HH4gORmr1dllxDzzrN6goUIz/P4MHFV0YZJDCADPR3RvYNp0PW2SetKTThar6wlbFTL00hV2Q+fg==",
+			"version": "4.30.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz",
+			"integrity": "sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw==",
 			"dev": true,
 			"requires": {
-				"@typescript-eslint/types": "4.28.3",
+				"@typescript-eslint/types": "4.30.0",
 				"eslint-visitor-keys": "^2.0.0"
 			}
 		},
@@ -3169,59 +3213,96 @@
 			"resolved": "https://registry.npmjs.org/@webcomponents/template/-/template-1.4.4.tgz",
 			"integrity": "sha512-QqCmmywIKJTilkl6UIPLxEBBuqhDaOBpvQyKOnUEwl9lJuVHBrVlhMIhhnp9VSZJ6xEUnp+PiX8DST1k0q/v4Q=="
 		},
+		"@wojtekmaj/enzyme-adapter-react-17": {
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.6.3.tgz",
+			"integrity": "sha512-Kp1ZJxtHkKEnUksaWrcMABNTOgL4wOt8VI6k2xOek2aH9PtZcWRXJNUEgnKrdJrqg5UqIjRslbVF9uUqwQJtFg==",
+			"dev": true,
+			"requires": {
+				"@wojtekmaj/enzyme-adapter-utils": "^0.1.1",
+				"enzyme-shallow-equal": "^1.0.0",
+				"has": "^1.0.0",
+				"object.assign": "^4.1.0",
+				"object.values": "^1.1.0",
+				"prop-types": "^15.7.0",
+				"react-is": "^17.0.2",
+				"react-test-renderer": "^17.0.0"
+			},
+			"dependencies": {
+				"react-is": {
+					"version": "17.0.2",
+					"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+					"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+					"dev": true
+				}
+			}
+		},
+		"@wojtekmaj/enzyme-adapter-utils": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-utils/-/enzyme-adapter-utils-0.1.1.tgz",
+			"integrity": "sha512-bNPWtN/d8huKOkC6j1E3EkSamnRrHHT7YuR6f9JppAQqtoAm3v4/vERe4J14jQKmHLCyEBHXrlgb7H6l817hVg==",
+			"dev": true,
+			"requires": {
+				"function.prototype.name": "^1.1.0",
+				"has": "^1.0.0",
+				"object.assign": "^4.1.0",
+				"object.fromentries": "^2.0.0",
+				"prop-types": "^15.7.0"
+			}
+		},
 		"@wordpress/a11y": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/a11y/-/a11y-3.1.1.tgz",
-			"integrity": "sha512-IA5z5LAgYYYTJpKM4c/yuYcaKT3aZOHFmEKOyNsUwZfU1OKYbSaytVCY0SqxiV+S4/kYUaCWyw+e8Ujx4IKaNA==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/a11y/-/a11y-3.1.2.tgz",
+			"integrity": "sha512-VUrJN4UcDdYLYVOjArMbSsHNrIPmoAfrSsJi09xpRFBJXUq67sLLPh5+yy01uptbV1aOqcIbRagyj0Zaq8I70g==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/dom-ready": "^3.1.1",
-				"@wordpress/i18n": "^4.1.1"
+				"@wordpress/dom-ready": "^3.1.2",
+				"@wordpress/i18n": "^4.1.2"
 			}
 		},
 		"@wordpress/annotations": {
-			"version": "2.1.5",
-			"resolved": "https://registry.npmjs.org/@wordpress/annotations/-/annotations-2.1.5.tgz",
-			"integrity": "sha512-mvedje+pZnxZMvnZSCi+3Z8x7xBOIlZI8IpD8H+rJPiRn/5wc6MBng/REoO1oP6KY6oMtot4l7YCcYAJpu+cvw==",
+			"version": "2.1.6",
+			"resolved": "https://registry.npmjs.org/@wordpress/annotations/-/annotations-2.1.6.tgz",
+			"integrity": "sha512-z79UvFGm8GiwJZWEIgE9mzIEzoGVRPo31qwjnotFq3uHjAhKsRZk3ppmaLRNZUbJfobNOvDEyD8VT8V033Gp2A==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/data": "^5.1.5",
+				"@wordpress/data": "^5.1.6",
 				"@wordpress/hooks": "^3.1.1",
-				"@wordpress/i18n": "^4.1.1",
-				"@wordpress/rich-text": "^4.1.5",
+				"@wordpress/i18n": "^4.1.2",
+				"@wordpress/rich-text": "^4.1.6",
 				"lodash": "^4.17.21",
 				"rememo": "^3.0.0",
 				"uuid": "^8.3.0"
 			}
 		},
 		"@wordpress/api-fetch": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-5.1.1.tgz",
-			"integrity": "sha512-pThYQhoKiePeGgb5aZnc4A9YT5WktfZkejSk4JIfFxdzXF7YXunyMoA9Aib2YvY94IkItLzBeTl/jDk9yYL2hw==",
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-5.1.2.tgz",
+			"integrity": "sha512-qdYENoku3IHfq9tHQismlOnCXerps3Vf9oHjoicUT7ukUBLawEfJWM8LeMJmuFoMRh4mc5ceuhUmTnmEfbcwIQ==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/i18n": "^4.1.1",
-				"@wordpress/url": "^3.1.1"
+				"@wordpress/i18n": "^4.1.2",
+				"@wordpress/url": "^3.1.2"
 			}
 		},
 		"@wordpress/autop": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/autop/-/autop-3.1.1.tgz",
-			"integrity": "sha512-ZwZy1DNyXQWX1k4cN3lAzVgcAii6bzFXUS08Zj8kaQf+hNE+BwX5cNb/TK98QQQYNAoiCnt4DiWiD1nxwM+EdA==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/autop/-/autop-3.1.2.tgz",
+			"integrity": "sha512-EbQ/lJwK20GjMXa0pszW8RVdIWghrQcjM1GE/IjPhSWuReD8h0R+3LpB+noZpuy4ccqiz3/Enksq9LBlnFUMvg==",
 			"requires": {
 				"@babel/runtime": "^7.13.10"
 			}
 		},
 		"@wordpress/babel-plugin-import-jsx-pragma": {
-			"version": "3.0.5",
-			"resolved": "https://registry.npmjs.org/@wordpress/babel-plugin-import-jsx-pragma/-/babel-plugin-import-jsx-pragma-3.0.5.tgz",
-			"integrity": "sha512-1xzZGFV5Bwox4XcE59I88q0/robJ35LoQNkKPC4tmfzd1XaAoJCZpp5T8LSJJtKKloeoO1JstrvMf3ltZLQ5IA==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/babel-plugin-import-jsx-pragma/-/babel-plugin-import-jsx-pragma-3.1.0.tgz",
+			"integrity": "sha512-518mL3goaSeXtJCQcPK9OYHUUiA0sjXuoGWHBwRalkyTIQZZy5ZZzlwrlSc9ESZcOw9BZ+Uo8CJRjV2OWnx+Zw==",
 			"dev": true
 		},
 		"@wordpress/babel-preset-default": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-6.2.0.tgz",
-			"integrity": "sha512-uNdR8TjUZgTF43psvAPGW/jnKMD+Mr8XiVhJGcVjrKwDoVBvHjtoKSpfafvkrESIHmMz2HgB4+NdqFHL5hhZlg==",
+			"version": "6.2.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-6.2.1.tgz",
+			"integrity": "sha512-io2HbPtmLdfu3WdZg6X6T1oRVCrOTVrTouqSeUxyAZ954fNh8xyB7Q8rfHfxUZHPgGypnbzZOKBiCpUlnBRs7A==",
 			"dev": true,
 			"requires": {
 				"@babel/core": "^7.13.10",
@@ -3232,97 +3313,84 @@
 				"@babel/runtime": "^7.13.10",
 				"@wordpress/babel-plugin-import-jsx-pragma": "^3.0.5",
 				"@wordpress/browserslist-config": "^4.0.1",
-				"@wordpress/element": "^3.1.1",
-				"@wordpress/warning": "^2.1.1",
+				"@wordpress/element": "^3.1.2",
+				"@wordpress/warning": "^2.1.2",
 				"browserslist": "^4.16.6",
 				"core-js": "^3.12.1"
 			}
 		},
 		"@wordpress/base-styles": {
-			"version": "3.5.4",
-			"resolved": "https://registry.npmjs.org/@wordpress/base-styles/-/base-styles-3.5.4.tgz",
-			"integrity": "sha512-5JfLnkQMqaefuoMkqUJMBC8m9RpXJqaaOykxuy9y3uk+s2ENbMGXSUjbzw+anO3SIRORKnHmRkgofcSoqvWV5w==",
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/base-styles/-/base-styles-3.6.0.tgz",
+			"integrity": "sha512-6/vXAmc9FSX7Y17UjKgUJoVU++Pv1U1G8uMx7iClRUaLetc7/jj2DD9PTyX/cdJjHr32e3yXuLVT9wfEbo6SEg==",
 			"dev": true
 		},
 		"@wordpress/blob": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/blob/-/blob-3.1.1.tgz",
-			"integrity": "sha512-yuT184YYi690FgsV7+1PgWPV7t6eQFhi/sAkzQ6cc+iZFaIELvX5gBcqomB3tc3GuXnhwmKTjQDzuzaepX4BoQ==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/blob/-/blob-3.1.2.tgz",
+			"integrity": "sha512-xtuw2+fPok3Ep+fKJlNuatMzag19FUzLziDPa5XLtfncVo+WKg/Tnz+gj138EwYtrjVKnxGlGolps1zqFzH4Bg==",
 			"requires": {
 				"@babel/runtime": "^7.13.10"
 			}
 		},
 		"@wordpress/block-directory": {
-			"version": "2.1.20",
-			"resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-2.1.20.tgz",
-			"integrity": "sha512-22RezQMYfF78N2yPFabAx44U/3DlrHgT6i77wqzZktGw97PaWJtbw9pJkCxDbve3hDjb6EuAkXF1LpRxpLkGjw==",
+			"version": "2.1.21",
+			"resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-2.1.21.tgz",
+			"integrity": "sha512-CCfQDyY7LpWkPxvmA7Dv9KAeSK1WiYIAZKt8FZNXJhnzZHuADsUcZy/7otopcMGHqCYycHcg+ygkpfzNyve5lA==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/a11y": "^3.1.1",
-				"@wordpress/api-fetch": "^5.1.1",
-				"@wordpress/block-editor": "^6.1.13",
-				"@wordpress/blocks": "^9.1.7",
-				"@wordpress/components": "^14.1.10",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/core-data": "^3.1.11",
-				"@wordpress/data": "^5.1.5",
-				"@wordpress/data-controls": "^2.1.5",
-				"@wordpress/edit-post": "^4.1.20",
-				"@wordpress/editor": "^10.1.16",
-				"@wordpress/element": "^3.1.1",
+				"@wordpress/a11y": "^3.1.2",
+				"@wordpress/api-fetch": "^5.1.2",
+				"@wordpress/block-editor": "^6.1.14",
+				"@wordpress/blocks": "^9.1.8",
+				"@wordpress/components": "^14.1.11",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/core-data": "^3.1.12",
+				"@wordpress/data": "^5.1.6",
+				"@wordpress/data-controls": "^2.1.6",
+				"@wordpress/edit-post": "^4.1.21",
+				"@wordpress/editor": "^10.1.17",
+				"@wordpress/element": "^3.1.2",
 				"@wordpress/hooks": "^3.1.1",
-				"@wordpress/html-entities": "^3.1.1",
-				"@wordpress/i18n": "^4.1.1",
-				"@wordpress/icons": "^4.0.2",
-				"@wordpress/notices": "^3.1.5",
-				"@wordpress/plugins": "^3.1.5",
-				"@wordpress/url": "^3.1.1",
+				"@wordpress/html-entities": "^3.1.2",
+				"@wordpress/i18n": "^4.1.2",
+				"@wordpress/icons": "^4.0.3",
+				"@wordpress/notices": "^3.1.6",
+				"@wordpress/plugins": "^3.1.6",
+				"@wordpress/url": "^3.1.2",
 				"lodash": "^4.17.21"
-			},
-			"dependencies": {
-				"@wordpress/data-controls": {
-					"version": "2.1.5",
-					"resolved": "https://registry.npmjs.org/@wordpress/data-controls/-/data-controls-2.1.5.tgz",
-					"integrity": "sha512-B2OEPuT6u0MqhzndzSuyWILHdkoRg6tFgw5/+iDXkuZNCqY1PldbLC7Ymt1IgcoLDd83K6CfqknQHvTUVerklw==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@wordpress/api-fetch": "^5.1.1",
-						"@wordpress/data": "^5.1.5",
-						"@wordpress/deprecated": "^3.1.1"
-					}
-				}
 			}
 		},
 		"@wordpress/block-editor": {
-			"version": "6.1.13",
-			"resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-6.1.13.tgz",
-			"integrity": "sha512-I2NEN+7fUTNiJ/NDkap5NuVT6T9CP+KcpZYziYvYWomcP1iCwBFo78EqBY4mqdhcczWfl1ykjhljPq2DW4ELPg==",
+			"version": "6.1.14",
+			"resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-6.1.14.tgz",
+			"integrity": "sha512-4qiAPqrBSOIO6fanm+jG2nTaNuPc1vfqq+KLHnWWfEZtAA06tuKeW/C8XbHT5NdCBzdSL9sytVw+94gOJVeTww==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/a11y": "^3.1.1",
-				"@wordpress/blob": "^3.1.1",
-				"@wordpress/block-serialization-default-parser": "^4.1.1",
-				"@wordpress/blocks": "^9.1.7",
-				"@wordpress/components": "^14.1.10",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/data": "^5.1.5",
-				"@wordpress/data-controls": "^2.1.5",
-				"@wordpress/deprecated": "^3.1.1",
-				"@wordpress/dom": "^3.1.4",
-				"@wordpress/element": "^3.1.1",
+				"@wordpress/a11y": "^3.1.2",
+				"@wordpress/blob": "^3.1.2",
+				"@wordpress/block-serialization-default-parser": "^4.1.2",
+				"@wordpress/blocks": "^9.1.8",
+				"@wordpress/components": "^14.1.11",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/data": "^5.1.6",
+				"@wordpress/data-controls": "^2.1.6",
+				"@wordpress/deprecated": "^3.1.2",
+				"@wordpress/dom": "^3.1.5",
+				"@wordpress/element": "^3.1.2",
 				"@wordpress/hooks": "^3.1.1",
-				"@wordpress/html-entities": "^3.1.1",
-				"@wordpress/i18n": "^4.1.1",
-				"@wordpress/icons": "^4.0.2",
+				"@wordpress/html-entities": "^3.1.2",
+				"@wordpress/i18n": "^4.1.2",
+				"@wordpress/icons": "^4.0.3",
 				"@wordpress/is-shallow-equal": "^4.1.1",
-				"@wordpress/keyboard-shortcuts": "^2.1.6",
-				"@wordpress/keycodes": "^3.1.1",
-				"@wordpress/notices": "^3.1.5",
-				"@wordpress/rich-text": "^4.1.5",
-				"@wordpress/shortcode": "^3.1.1",
+				"@wordpress/keyboard-shortcuts": "^2.1.7",
+				"@wordpress/keycodes": "^3.1.2",
+				"@wordpress/notices": "^3.1.6",
+				"@wordpress/rich-text": "^4.1.6",
+				"@wordpress/shortcode": "^3.1.2",
 				"@wordpress/token-list": "^2.1.1",
-				"@wordpress/url": "^3.1.1",
-				"@wordpress/wordcount": "^3.1.1",
+				"@wordpress/url": "^3.1.2",
+				"@wordpress/wordcount": "^3.1.2",
 				"classnames": "^2.2.5",
 				"css-mediaquery": "^0.1.2",
 				"diff": "^4.0.2",
@@ -3336,54 +3404,41 @@
 				"rememo": "^3.0.0",
 				"tinycolor2": "^1.4.2",
 				"traverse": "^0.6.6"
-			},
-			"dependencies": {
-				"@wordpress/data-controls": {
-					"version": "2.1.5",
-					"resolved": "https://registry.npmjs.org/@wordpress/data-controls/-/data-controls-2.1.5.tgz",
-					"integrity": "sha512-B2OEPuT6u0MqhzndzSuyWILHdkoRg6tFgw5/+iDXkuZNCqY1PldbLC7Ymt1IgcoLDd83K6CfqknQHvTUVerklw==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@wordpress/api-fetch": "^5.1.1",
-						"@wordpress/data": "^5.1.5",
-						"@wordpress/deprecated": "^3.1.1"
-					}
-				}
 			}
 		},
 		"@wordpress/block-library": {
-			"version": "3.2.18",
-			"resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-3.2.18.tgz",
-			"integrity": "sha512-f61TICHWTIjvWnf8X5NvzYUDZ+RdJ944JLxWKJEhWGljk5iw0Cis+fZbPGK0QQoo8PzKXxqsTNj0oKRYpq92Pw==",
+			"version": "3.2.19",
+			"resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-3.2.19.tgz",
+			"integrity": "sha512-F/Dbg9YYmoQQ9LdtanA1Nn6Bi6z7a5mC9gUankzbl6657Aqw7EcBwvbKfuG3n1TOjbbJZpA2wCCYTge6XNXLWA==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/a11y": "^3.1.1",
-				"@wordpress/api-fetch": "^5.1.1",
-				"@wordpress/autop": "^3.1.1",
-				"@wordpress/blob": "^3.1.1",
-				"@wordpress/block-editor": "^6.1.13",
-				"@wordpress/blocks": "^9.1.7",
-				"@wordpress/components": "^14.1.10",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/core-data": "^3.1.11",
-				"@wordpress/data": "^5.1.5",
-				"@wordpress/date": "^4.1.1",
-				"@wordpress/deprecated": "^3.1.1",
-				"@wordpress/dom": "^3.1.4",
-				"@wordpress/element": "^3.1.1",
-				"@wordpress/escape-html": "^2.1.1",
+				"@wordpress/a11y": "^3.1.2",
+				"@wordpress/api-fetch": "^5.1.2",
+				"@wordpress/autop": "^3.1.2",
+				"@wordpress/blob": "^3.1.2",
+				"@wordpress/block-editor": "^6.1.14",
+				"@wordpress/blocks": "^9.1.8",
+				"@wordpress/components": "^14.1.11",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/core-data": "^3.1.12",
+				"@wordpress/data": "^5.1.6",
+				"@wordpress/date": "^4.1.2",
+				"@wordpress/deprecated": "^3.1.2",
+				"@wordpress/dom": "^3.1.5",
+				"@wordpress/element": "^3.1.2",
+				"@wordpress/escape-html": "^2.1.2",
 				"@wordpress/hooks": "^3.1.1",
-				"@wordpress/i18n": "^4.1.1",
-				"@wordpress/icons": "^4.0.2",
+				"@wordpress/i18n": "^4.1.2",
+				"@wordpress/icons": "^4.0.3",
 				"@wordpress/is-shallow-equal": "^4.1.1",
-				"@wordpress/keycodes": "^3.1.1",
-				"@wordpress/notices": "^3.1.5",
-				"@wordpress/primitives": "^2.1.1",
-				"@wordpress/reusable-blocks": "^2.1.16",
-				"@wordpress/rich-text": "^4.1.5",
-				"@wordpress/server-side-render": "^2.1.11",
-				"@wordpress/url": "^3.1.1",
-				"@wordpress/viewport": "^3.1.5",
+				"@wordpress/keycodes": "^3.1.2",
+				"@wordpress/notices": "^3.1.6",
+				"@wordpress/primitives": "^2.1.2",
+				"@wordpress/reusable-blocks": "^2.1.17",
+				"@wordpress/rich-text": "^4.1.6",
+				"@wordpress/server-side-render": "^2.1.12",
+				"@wordpress/url": "^3.1.2",
+				"@wordpress/viewport": "^3.1.6",
 				"classnames": "^2.2.5",
 				"fast-average-color": "4.3.0",
 				"lodash": "^4.17.21",
@@ -3395,33 +3450,33 @@
 			}
 		},
 		"@wordpress/block-serialization-default-parser": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/block-serialization-default-parser/-/block-serialization-default-parser-4.1.1.tgz",
-			"integrity": "sha512-WBpsFmXy9JK0Jx3CyAe4GFFdIqt7ZRcCD88Wrhf4oJrPbJutdsGMjaSpP3SOwWTh+xeJGiyePjwa3+1Zw0KHcw==",
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/block-serialization-default-parser/-/block-serialization-default-parser-4.1.2.tgz",
+			"integrity": "sha512-jJoXfn6hYYReEl211alNoTFA5Hdgu9LMTkTQJF2g8cGJS5UpDw1lcpJP0hmpfhwzTmUUemy5RXM7noOa2c/RUw==",
 			"requires": {
 				"@babel/runtime": "^7.13.10"
 			}
 		},
 		"@wordpress/blocks": {
-			"version": "9.1.7",
-			"resolved": "https://registry.npmjs.org/@wordpress/blocks/-/blocks-9.1.7.tgz",
-			"integrity": "sha512-mar6I4F5sXIWSxE7bJkqanMo9cvYnS49Tg7hR0vY0gZAPTMmSeuL0Lz5i5fvquhURZtnyfryJ4qEvWix3B8/2w==",
+			"version": "9.1.8",
+			"resolved": "https://registry.npmjs.org/@wordpress/blocks/-/blocks-9.1.8.tgz",
+			"integrity": "sha512-RYemYN+q5/M0k5mESBkQbsB101p9hWSOTSlGLzEPBj7yXJp/OnyQVdc2hAr6CQgX16CxOyRRXx1CYQdiOtXGYg==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/autop": "^3.1.1",
-				"@wordpress/blob": "^3.1.1",
-				"@wordpress/block-serialization-default-parser": "^4.1.1",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/data": "^5.1.5",
-				"@wordpress/deprecated": "^3.1.1",
-				"@wordpress/dom": "^3.1.4",
-				"@wordpress/element": "^3.1.1",
+				"@wordpress/autop": "^3.1.2",
+				"@wordpress/blob": "^3.1.2",
+				"@wordpress/block-serialization-default-parser": "^4.1.2",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/data": "^5.1.6",
+				"@wordpress/deprecated": "^3.1.2",
+				"@wordpress/dom": "^3.1.5",
+				"@wordpress/element": "^3.1.2",
 				"@wordpress/hooks": "^3.1.1",
-				"@wordpress/html-entities": "^3.1.1",
-				"@wordpress/i18n": "^4.1.1",
-				"@wordpress/icons": "^4.0.2",
+				"@wordpress/html-entities": "^3.1.2",
+				"@wordpress/i18n": "^4.1.2",
+				"@wordpress/icons": "^4.0.3",
 				"@wordpress/is-shallow-equal": "^4.1.1",
-				"@wordpress/shortcode": "^3.1.1",
+				"@wordpress/shortcode": "^3.1.2",
 				"hpq": "^1.3.0",
 				"lodash": "^4.17.21",
 				"rememo": "^3.0.0",
@@ -3432,35 +3487,35 @@
 			}
 		},
 		"@wordpress/browserslist-config": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-4.0.1.tgz",
-			"integrity": "sha512-mmLxc21NWxZSSPvD592tmzpBlme+nB0fbG1xO+EldS4vQkeWIQUZlNbrMijZM/hpFaBqDEJCAZFUPUpw1XwBWg==",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-4.1.0.tgz",
+			"integrity": "sha512-RSJhgY2xmz6yAdDNhz/NvAO6JS+91vv9cVL7VDG2CftbyjTXBef05vWt3FzZhfeF0xUrYdpZL1PVpxmJiKvbEg==",
 			"dev": true
 		},
 		"@wordpress/components": {
-			"version": "14.1.10",
-			"resolved": "https://registry.npmjs.org/@wordpress/components/-/components-14.1.10.tgz",
-			"integrity": "sha512-MQ1wgJcLtZJcu2jztR2USELbEamqcPTEnZJmJMpdFYg2cR5b3puj3X0ehPjq3G7kSNCRu1J6mPEv5iADbLM6Yg==",
+			"version": "14.1.11",
+			"resolved": "https://registry.npmjs.org/@wordpress/components/-/components-14.1.11.tgz",
+			"integrity": "sha512-umsDXCtH0eqOaAVXq/N3f5QO4u9ovo2F+RMg7c566Q+StOgCVw0jRnKuyKQtBb1CEv4IIYIDWp/pL3cId8Vz2w==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
 				"@emotion/cache": "^10.0.27",
 				"@emotion/core": "^10.1.1",
 				"@emotion/css": "^10.0.22",
 				"@emotion/styled": "^10.0.23",
-				"@wordpress/a11y": "^3.1.1",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/date": "^4.1.1",
-				"@wordpress/deprecated": "^3.1.1",
-				"@wordpress/dom": "^3.1.4",
-				"@wordpress/element": "^3.1.1",
+				"@wordpress/a11y": "^3.1.2",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/date": "^4.1.2",
+				"@wordpress/deprecated": "^3.1.2",
+				"@wordpress/dom": "^3.1.5",
+				"@wordpress/element": "^3.1.2",
 				"@wordpress/hooks": "^3.1.1",
-				"@wordpress/i18n": "^4.1.1",
-				"@wordpress/icons": "^4.0.2",
+				"@wordpress/i18n": "^4.1.2",
+				"@wordpress/icons": "^4.0.3",
 				"@wordpress/is-shallow-equal": "^4.1.1",
-				"@wordpress/keycodes": "^3.1.1",
-				"@wordpress/primitives": "^2.1.1",
-				"@wordpress/rich-text": "^4.1.5",
-				"@wordpress/warning": "^2.1.1",
+				"@wordpress/keycodes": "^3.1.2",
+				"@wordpress/primitives": "^2.1.2",
+				"@wordpress/rich-text": "^4.1.6",
+				"@wordpress/warning": "^2.1.2",
 				"classnames": "^2.2.5",
 				"dom-scroll-into-view": "^1.2.1",
 				"downshift": "^6.0.15",
@@ -3482,17 +3537,17 @@
 			}
 		},
 		"@wordpress/compose": {
-			"version": "4.1.5",
-			"resolved": "https://registry.npmjs.org/@wordpress/compose/-/compose-4.1.5.tgz",
-			"integrity": "sha512-owW4MkWLUIkm0ocehNaLB2TDdGYN//2+7BJuDnTnQ3EUYBwn6bPOM5LNjSOXNJBW7LqiLEIfXghQQId+IYAJXg==",
+			"version": "4.1.6",
+			"resolved": "https://registry.npmjs.org/@wordpress/compose/-/compose-4.1.6.tgz",
+			"integrity": "sha512-rzSHBvMMwkR70+qOmSGnZpOEa2fnseGbylR3DEN3IAlscxdAn08Ejyz+bZSQ8GgQ6Uq2OkwvYjHjPUD2llpQ/g==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/deprecated": "^3.1.1",
-				"@wordpress/dom": "^3.1.4",
-				"@wordpress/element": "^3.1.1",
+				"@wordpress/deprecated": "^3.1.2",
+				"@wordpress/dom": "^3.1.5",
+				"@wordpress/element": "^3.1.2",
 				"@wordpress/is-shallow-equal": "^4.1.1",
-				"@wordpress/keycodes": "^3.1.1",
-				"@wordpress/priority-queue": "^2.1.1",
+				"@wordpress/keycodes": "^3.1.2",
+				"@wordpress/priority-queue": "^2.1.2",
 				"clipboard": "^2.0.1",
 				"lodash": "^4.17.21",
 				"memize": "^1.1.0",
@@ -3502,37 +3557,24 @@
 			}
 		},
 		"@wordpress/core-data": {
-			"version": "3.1.11",
-			"resolved": "https://registry.npmjs.org/@wordpress/core-data/-/core-data-3.1.11.tgz",
-			"integrity": "sha512-eEuJJ+YzarWOjNfam01IKUN97aTn3s3sVc8Rxg9QR8SvX1UK829dw6i3htv7uhMhJgNf3WzUZl7hli5Jc2/Qdg==",
+			"version": "3.1.12",
+			"resolved": "https://registry.npmjs.org/@wordpress/core-data/-/core-data-3.1.12.tgz",
+			"integrity": "sha512-GUvuWc5SQi0eBKi6gaWDz3Xg8eQyAM4YmYPpWNhWP8oNeAwsLL/RM2kXv6O4ssnGGlS/W3zJtLFTy7yDo0c74Q==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/api-fetch": "^5.1.1",
-				"@wordpress/blocks": "^9.1.7",
-				"@wordpress/data": "^5.1.5",
-				"@wordpress/data-controls": "^2.1.5",
-				"@wordpress/element": "^3.1.1",
-				"@wordpress/html-entities": "^3.1.1",
-				"@wordpress/i18n": "^4.1.1",
+				"@wordpress/api-fetch": "^5.1.2",
+				"@wordpress/blocks": "^9.1.8",
+				"@wordpress/data": "^5.1.6",
+				"@wordpress/data-controls": "^2.1.6",
+				"@wordpress/element": "^3.1.2",
+				"@wordpress/html-entities": "^3.1.2",
+				"@wordpress/i18n": "^4.1.2",
 				"@wordpress/is-shallow-equal": "^4.1.1",
-				"@wordpress/url": "^3.1.1",
+				"@wordpress/url": "^3.1.2",
 				"equivalent-key-map": "^0.2.2",
 				"lodash": "^4.17.21",
 				"rememo": "^3.0.0",
 				"uuid": "^8.3.0"
-			},
-			"dependencies": {
-				"@wordpress/data-controls": {
-					"version": "2.1.5",
-					"resolved": "https://registry.npmjs.org/@wordpress/data-controls/-/data-controls-2.1.5.tgz",
-					"integrity": "sha512-B2OEPuT6u0MqhzndzSuyWILHdkoRg6tFgw5/+iDXkuZNCqY1PldbLC7Ymt1IgcoLDd83K6CfqknQHvTUVerklw==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@wordpress/api-fetch": "^5.1.1",
-						"@wordpress/data": "^5.1.5",
-						"@wordpress/deprecated": "^3.1.1"
-					}
-				}
 			}
 		},
 		"@wordpress/custom-templated-path-webpack-plugin": {
@@ -3545,45 +3587,45 @@
 			}
 		},
 		"@wordpress/customize-widgets": {
-			"version": "1.0.19",
-			"resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-1.0.19.tgz",
-			"integrity": "sha512-3nQMd0Rxy0PIPL3Q6F+ZnHoWVahcWUKvzLnHpdJSx37CGXDJcA4Mx6fl+KLJSUE1ADccZhtKYQRtVIxexaj2ng==",
+			"version": "1.0.20",
+			"resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-1.0.20.tgz",
+			"integrity": "sha512-2zHmZ3IcnkXMD+n1FPRjZTvfTkxt1onxe4oqfQjpobdYjPTSMl3HKaYuHB1lBaVN7qw4sOk/3WgB9cH1kqWpqg==",
 			"requires": {
 				"@babel/runtime": "^7.11.2",
-				"@wordpress/a11y": "^3.1.1",
-				"@wordpress/block-editor": "^6.1.13",
-				"@wordpress/block-library": "^3.2.18",
-				"@wordpress/blocks": "^9.1.7",
-				"@wordpress/components": "^14.1.10",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/core-data": "^3.1.11",
-				"@wordpress/data": "^5.1.5",
-				"@wordpress/dom": "^3.1.4",
-				"@wordpress/element": "^3.1.1",
+				"@wordpress/a11y": "^3.1.2",
+				"@wordpress/block-editor": "^6.1.14",
+				"@wordpress/block-library": "^3.2.19",
+				"@wordpress/blocks": "^9.1.8",
+				"@wordpress/components": "^14.1.11",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/core-data": "^3.1.12",
+				"@wordpress/data": "^5.1.6",
+				"@wordpress/dom": "^3.1.5",
+				"@wordpress/element": "^3.1.2",
 				"@wordpress/hooks": "^3.1.1",
-				"@wordpress/i18n": "^4.1.1",
-				"@wordpress/icons": "^4.0.2",
+				"@wordpress/i18n": "^4.1.2",
+				"@wordpress/icons": "^4.0.3",
 				"@wordpress/is-shallow-equal": "^4.1.1",
-				"@wordpress/keyboard-shortcuts": "^2.1.6",
-				"@wordpress/keycodes": "^3.1.1",
-				"@wordpress/media-utils": "^2.1.1",
-				"@wordpress/widgets": "^1.1.18",
+				"@wordpress/keyboard-shortcuts": "^2.1.7",
+				"@wordpress/keycodes": "^3.1.2",
+				"@wordpress/media-utils": "^2.1.2",
+				"@wordpress/widgets": "^1.1.19",
 				"classnames": "^2.2.6",
 				"lodash": "^4.17.21"
 			}
 		},
 		"@wordpress/data": {
-			"version": "5.1.5",
-			"resolved": "https://registry.npmjs.org/@wordpress/data/-/data-5.1.5.tgz",
-			"integrity": "sha512-Vw8vJx68znQiUYfoCHFzzBZSw9Q7ESC5lMrI8SUnUdqfSxPaaFa67aKoWOTrSMW9utkXQxTL5OOWj2ZXdgLl2Q==",
+			"version": "5.1.6",
+			"resolved": "https://registry.npmjs.org/@wordpress/data/-/data-5.1.6.tgz",
+			"integrity": "sha512-KKcAcYh6XuRXkQvIQOv1/ci5Tj1kXEE2gwNzujN4SytJZmQTNP2EEE8u9bBnhEPoS7bORzlqeNQuMW0Rz74qgg==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/deprecated": "^3.1.1",
-				"@wordpress/element": "^3.1.1",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/deprecated": "^3.1.2",
+				"@wordpress/element": "^3.1.2",
 				"@wordpress/is-shallow-equal": "^4.1.1",
-				"@wordpress/priority-queue": "^2.1.1",
-				"@wordpress/redux-routine": "^4.1.1",
+				"@wordpress/priority-queue": "^2.1.2",
+				"@wordpress/redux-routine": "^4.1.2",
 				"equivalent-key-map": "^0.2.2",
 				"is-promise": "^4.0.0",
 				"lodash": "^4.17.21",
@@ -3594,20 +3636,20 @@
 			}
 		},
 		"@wordpress/data-controls": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/@wordpress/data-controls/-/data-controls-2.1.3.tgz",
-			"integrity": "sha512-gDNufBbLiGhoIMIcNCL9seKP4ZVuDiO/Fx479RwAWSWdSdUFgJtvwkzdVUF5zFZwLIaeMXTPwrNWV97zl7rDtQ==",
+			"version": "2.1.6",
+			"resolved": "https://registry.npmjs.org/@wordpress/data-controls/-/data-controls-2.1.6.tgz",
+			"integrity": "sha512-AON1ZQLGhVQsJQIeW+4D1aB31TBJbDIQUMwnimiMkJ2n0M9V1Q0hvW4P7URC1k2aouNstnF2/TJ4xFPPRINf4Q==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/api-fetch": "^5.1.1",
-				"@wordpress/data": "^5.1.3",
-				"@wordpress/deprecated": "^3.1.1"
+				"@wordpress/api-fetch": "^5.1.2",
+				"@wordpress/data": "^5.1.6",
+				"@wordpress/deprecated": "^3.1.2"
 			}
 		},
 		"@wordpress/date": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/date/-/date-4.1.1.tgz",
-			"integrity": "sha512-TA452SZO6Z35c7HLEmSLT0xb/zbUraKHCmkzgkZbhTRVPnZ824VCTb3ebWko9hoNZ0n6bxDE+ntMwM/YKfzDhw==",
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/date/-/date-4.1.2.tgz",
+			"integrity": "sha512-t1cM1eLCQkLJeypcnFQIBJW0+aS8ZUvZLNSxlMH0jVybF9+bjVIbKY+aRkGwP4OMxxrdQkvF2qFj349bn3nz3Q==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
 				"moment": "^2.22.1",
@@ -3643,75 +3685,75 @@
 			}
 		},
 		"@wordpress/deprecated": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/deprecated/-/deprecated-3.1.1.tgz",
-			"integrity": "sha512-0hILlCNhf0DukFo3hMWybf9q507cxnIHhC1GQ1crZtTqzKS2QY2C1/77V4YGPdBShUj5j1dPriYCzfB5jFFgqQ==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/deprecated/-/deprecated-3.1.2.tgz",
+			"integrity": "sha512-kURIhVWssN6lv4YZNMqeFU8ZHk1Dh3SNbHHDs/Ah4Qcql9uHJisF89lLIQBCs063wgkeXfFxdvM/BXD4kfK6fw==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
 				"@wordpress/hooks": "^3.1.1"
 			}
 		},
 		"@wordpress/dom": {
-			"version": "3.1.4",
-			"resolved": "https://registry.npmjs.org/@wordpress/dom/-/dom-3.1.4.tgz",
-			"integrity": "sha512-25LZXu7mf3kcj+RfDf36spnw8OvRL+2gHVPw7ivvTXSLMSj0I2G2DZzDPRIEYww/zW1VUanoTyRWjQ4mNuSzyA==",
+			"version": "3.1.5",
+			"resolved": "https://registry.npmjs.org/@wordpress/dom/-/dom-3.1.5.tgz",
+			"integrity": "sha512-EDX1BXtIEHw3LjAunASJO9lnbU2KU1gi4UBrjaa+Cem4u6npmfYHh6XkXO2ryA21yjx7rCWPbD0id6E7qlJ4Tw==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
 				"lodash": "^4.17.21"
 			}
 		},
 		"@wordpress/dom-ready": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/dom-ready/-/dom-ready-3.1.1.tgz",
-			"integrity": "sha512-Kc0jxOgOBKDdJ5OOA1iNHXog5D3QzNrv4IBt4UYYDy59XnuzJEwDSeWQE9gP6ssRx4/qzJxi5KGr3pNZzDwqTg==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/dom-ready/-/dom-ready-3.1.2.tgz",
+			"integrity": "sha512-g2zmgC/+6JYgWYzUMByRmjRAXs75q57wnNdYUTXmRFrtLs2+PNa1bUuYWZop15rTZbxuvP6ScVnPxZ5tyQLRUw==",
 			"requires": {
 				"@babel/runtime": "^7.13.10"
 			}
 		},
 		"@wordpress/e2e-test-utils": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils/-/e2e-test-utils-5.3.0.tgz",
-			"integrity": "sha512-01Fba6bN4E+SX0D5sko0p1C6JTyH9SPZZlev7US3XSRQy5AQPiBdMniKEvyaGjql1jNMbuNFJ+ueB88Qd6tVMw==",
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils/-/e2e-test-utils-5.3.1.tgz",
+			"integrity": "sha512-9ZAqA/HbmoxTFc8xI5S0+qVuaLLUMUdOnDHITs5W3iF3MHJcTPZLbI2NwXu/Kt3TultLNVQmK8Pxv2kzWwH7XA==",
 			"dev": true,
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/keycodes": "^3.1.1",
-				"@wordpress/url": "^3.1.1",
+				"@wordpress/keycodes": "^3.1.2",
+				"@wordpress/url": "^3.1.2",
 				"lodash": "^4.17.21",
 				"node-fetch": "^2.6.0"
 			}
 		},
 		"@wordpress/edit-post": {
-			"version": "4.1.20",
-			"resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-4.1.20.tgz",
-			"integrity": "sha512-W420fWlb025GsXIZEawCF4O8B7vtwzGu1UmwvdM3kOcsq09yvSAoIuoiPNzQDJhkK1DcsBvglH6vEYA6uEbwPA==",
+			"version": "4.1.21",
+			"resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-4.1.21.tgz",
+			"integrity": "sha512-tthVG2vA/cEkM5Ksb+AWlfYdRQRh3TE45C0NPMTjRTQaETJjZGZp1VCVl6f+EBMIiW90mzgOfP6t0bvDHBtcFg==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/a11y": "^3.1.1",
-				"@wordpress/api-fetch": "^5.1.1",
-				"@wordpress/block-editor": "^6.1.13",
-				"@wordpress/block-library": "^3.2.18",
-				"@wordpress/blocks": "^9.1.7",
-				"@wordpress/components": "^14.1.10",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/core-data": "^3.1.11",
-				"@wordpress/data": "^5.1.5",
-				"@wordpress/data-controls": "^2.1.5",
-				"@wordpress/editor": "^10.1.16",
-				"@wordpress/element": "^3.1.1",
+				"@wordpress/a11y": "^3.1.2",
+				"@wordpress/api-fetch": "^5.1.2",
+				"@wordpress/block-editor": "^6.1.14",
+				"@wordpress/block-library": "^3.2.19",
+				"@wordpress/blocks": "^9.1.8",
+				"@wordpress/components": "^14.1.11",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/core-data": "^3.1.12",
+				"@wordpress/data": "^5.1.6",
+				"@wordpress/data-controls": "^2.1.6",
+				"@wordpress/editor": "^10.1.17",
+				"@wordpress/element": "^3.1.2",
 				"@wordpress/hooks": "^3.1.1",
-				"@wordpress/i18n": "^4.1.1",
-				"@wordpress/icons": "^4.0.2",
-				"@wordpress/interface": "^3.1.11",
-				"@wordpress/keyboard-shortcuts": "^2.1.6",
-				"@wordpress/keycodes": "^3.1.1",
-				"@wordpress/media-utils": "^2.1.1",
-				"@wordpress/notices": "^3.1.5",
-				"@wordpress/plugins": "^3.1.5",
-				"@wordpress/primitives": "^2.1.1",
-				"@wordpress/url": "^3.1.1",
-				"@wordpress/viewport": "^3.1.5",
-				"@wordpress/warning": "^2.1.1",
+				"@wordpress/i18n": "^4.1.2",
+				"@wordpress/icons": "^4.0.3",
+				"@wordpress/interface": "^3.1.12",
+				"@wordpress/keyboard-shortcuts": "^2.1.7",
+				"@wordpress/keycodes": "^3.1.2",
+				"@wordpress/media-utils": "^2.1.2",
+				"@wordpress/notices": "^3.1.6",
+				"@wordpress/plugins": "^3.1.6",
+				"@wordpress/primitives": "^2.1.2",
+				"@wordpress/url": "^3.1.2",
+				"@wordpress/viewport": "^3.1.6",
+				"@wordpress/warning": "^2.1.2",
 				"classnames": "^2.2.5",
 				"framer-motion": "^4.1.3",
 				"lodash": "^4.17.21",
@@ -3720,17 +3762,6 @@
 				"uuid": "8.3.0"
 			},
 			"dependencies": {
-				"@wordpress/data-controls": {
-					"version": "2.1.5",
-					"resolved": "https://registry.npmjs.org/@wordpress/data-controls/-/data-controls-2.1.5.tgz",
-					"integrity": "sha512-B2OEPuT6u0MqhzndzSuyWILHdkoRg6tFgw5/+iDXkuZNCqY1PldbLC7Ymt1IgcoLDd83K6CfqknQHvTUVerklw==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@wordpress/api-fetch": "^5.1.1",
-						"@wordpress/data": "^5.1.5",
-						"@wordpress/deprecated": "^3.1.1"
-					}
-				},
 				"uuid": {
 					"version": "8.3.0",
 					"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz",
@@ -3739,144 +3770,119 @@
 			}
 		},
 		"@wordpress/edit-widgets": {
-			"version": "2.1.20",
-			"resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-2.1.20.tgz",
-			"integrity": "sha512-nCG4DCqfU1a87BI5YQi6MjWMsLNSZ/NWaC8xGECmZF7m+jGJ3WcXDNz1wISUjRPlfTB88uDfxirK7x9RTL5zLA==",
+			"version": "2.1.21",
+			"resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-2.1.21.tgz",
+			"integrity": "sha512-dkINHh3yPJnCtqXfcKX0+Wf85ztGJLEnt35pUdcif6fkxDvBciYX6maezo+m+r6TgI0J9wUO2t9+G6kX6bda0Q==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/a11y": "^3.1.1",
-				"@wordpress/api-fetch": "^5.1.1",
-				"@wordpress/block-editor": "^6.1.13",
-				"@wordpress/block-library": "^3.2.18",
-				"@wordpress/blocks": "^9.1.7",
-				"@wordpress/components": "^14.1.10",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/core-data": "^3.1.11",
-				"@wordpress/data": "^5.1.5",
-				"@wordpress/data-controls": "^2.1.5",
-				"@wordpress/element": "^3.1.1",
+				"@wordpress/a11y": "^3.1.2",
+				"@wordpress/api-fetch": "^5.1.2",
+				"@wordpress/block-editor": "^6.1.14",
+				"@wordpress/block-library": "^3.2.19",
+				"@wordpress/blocks": "^9.1.8",
+				"@wordpress/components": "^14.1.11",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/core-data": "^3.1.12",
+				"@wordpress/data": "^5.1.6",
+				"@wordpress/data-controls": "^2.1.6",
+				"@wordpress/dom": "^3.1.5",
+				"@wordpress/element": "^3.1.2",
 				"@wordpress/hooks": "^3.1.1",
-				"@wordpress/i18n": "^4.1.1",
-				"@wordpress/icons": "^4.0.2",
-				"@wordpress/interface": "^3.1.11",
-				"@wordpress/keyboard-shortcuts": "^2.1.6",
-				"@wordpress/keycodes": "^3.1.1",
-				"@wordpress/media-utils": "^2.1.1",
-				"@wordpress/notices": "^3.1.5",
-				"@wordpress/plugins": "^3.1.5",
-				"@wordpress/reusable-blocks": "^2.1.16",
-				"@wordpress/server-side-render": "^2.1.11",
-				"@wordpress/url": "^3.1.1",
-				"@wordpress/widgets": "^1.1.18",
+				"@wordpress/i18n": "^4.1.2",
+				"@wordpress/icons": "^4.0.3",
+				"@wordpress/interface": "^3.1.12",
+				"@wordpress/keyboard-shortcuts": "^2.1.7",
+				"@wordpress/keycodes": "^3.1.2",
+				"@wordpress/media-utils": "^2.1.2",
+				"@wordpress/notices": "^3.1.6",
+				"@wordpress/plugins": "^3.1.6",
+				"@wordpress/reusable-blocks": "^2.1.17",
+				"@wordpress/server-side-render": "^2.1.12",
+				"@wordpress/url": "^3.1.2",
+				"@wordpress/widgets": "^1.1.19",
 				"classnames": "^2.2.5",
 				"lodash": "^4.17.21",
 				"rememo": "^3.0.0",
 				"uuid": "^8.3.0"
-			},
-			"dependencies": {
-				"@wordpress/data-controls": {
-					"version": "2.1.5",
-					"resolved": "https://registry.npmjs.org/@wordpress/data-controls/-/data-controls-2.1.5.tgz",
-					"integrity": "sha512-B2OEPuT6u0MqhzndzSuyWILHdkoRg6tFgw5/+iDXkuZNCqY1PldbLC7Ymt1IgcoLDd83K6CfqknQHvTUVerklw==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@wordpress/api-fetch": "^5.1.1",
-						"@wordpress/data": "^5.1.5",
-						"@wordpress/deprecated": "^3.1.1"
-					}
-				}
 			}
 		},
 		"@wordpress/editor": {
-			"version": "10.1.16",
-			"resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-10.1.16.tgz",
-			"integrity": "sha512-QXvV6BxSKAapQeocBn5m83FPzO4x+UFw8EUuM37fiZ0VLeqRuv0Ec2HhxW3WrimeZGEhlG7M1vboGQ2U7VJtmw==",
+			"version": "10.1.17",
+			"resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-10.1.17.tgz",
+			"integrity": "sha512-ALvuojonwMEjWN1tbQR+mZF3ggR/fdkvOKe4esxRL3U10eTfcsSw6qA2QzB8zHrjb1cZd/90gZWixAdE398f+w==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/api-fetch": "^5.1.1",
-				"@wordpress/autop": "^3.1.1",
-				"@wordpress/blob": "^3.1.1",
-				"@wordpress/block-editor": "^6.1.13",
-				"@wordpress/blocks": "^9.1.7",
-				"@wordpress/components": "^14.1.10",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/core-data": "^3.1.11",
-				"@wordpress/data": "^5.1.5",
-				"@wordpress/data-controls": "^2.1.5",
-				"@wordpress/date": "^4.1.1",
-				"@wordpress/deprecated": "^3.1.1",
-				"@wordpress/element": "^3.1.1",
+				"@wordpress/api-fetch": "^5.1.2",
+				"@wordpress/autop": "^3.1.2",
+				"@wordpress/blob": "^3.1.2",
+				"@wordpress/block-editor": "^6.1.14",
+				"@wordpress/blocks": "^9.1.8",
+				"@wordpress/components": "^14.1.11",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/core-data": "^3.1.12",
+				"@wordpress/data": "^5.1.6",
+				"@wordpress/data-controls": "^2.1.6",
+				"@wordpress/date": "^4.1.2",
+				"@wordpress/deprecated": "^3.1.2",
+				"@wordpress/element": "^3.1.2",
 				"@wordpress/hooks": "^3.1.1",
-				"@wordpress/html-entities": "^3.1.1",
-				"@wordpress/i18n": "^4.1.1",
-				"@wordpress/icons": "^4.0.2",
+				"@wordpress/html-entities": "^3.1.2",
+				"@wordpress/i18n": "^4.1.2",
+				"@wordpress/icons": "^4.0.3",
 				"@wordpress/is-shallow-equal": "^4.1.1",
-				"@wordpress/keyboard-shortcuts": "^2.1.6",
-				"@wordpress/keycodes": "^3.1.1",
-				"@wordpress/media-utils": "^2.1.1",
-				"@wordpress/notices": "^3.1.5",
-				"@wordpress/reusable-blocks": "^2.1.16",
-				"@wordpress/rich-text": "^4.1.5",
-				"@wordpress/server-side-render": "^2.1.11",
-				"@wordpress/url": "^3.1.1",
-				"@wordpress/wordcount": "^3.1.1",
+				"@wordpress/keyboard-shortcuts": "^2.1.7",
+				"@wordpress/keycodes": "^3.1.2",
+				"@wordpress/media-utils": "^2.1.2",
+				"@wordpress/notices": "^3.1.6",
+				"@wordpress/reusable-blocks": "^2.1.17",
+				"@wordpress/rich-text": "^4.1.6",
+				"@wordpress/server-side-render": "^2.1.12",
+				"@wordpress/url": "^3.1.2",
+				"@wordpress/wordcount": "^3.1.2",
 				"classnames": "^2.2.5",
 				"lodash": "^4.17.21",
 				"memize": "^1.1.0",
 				"react-autosize-textarea": "^7.1.0",
 				"rememo": "^3.0.0"
-			},
-			"dependencies": {
-				"@wordpress/data-controls": {
-					"version": "2.1.5",
-					"resolved": "https://registry.npmjs.org/@wordpress/data-controls/-/data-controls-2.1.5.tgz",
-					"integrity": "sha512-B2OEPuT6u0MqhzndzSuyWILHdkoRg6tFgw5/+iDXkuZNCqY1PldbLC7Ymt1IgcoLDd83K6CfqknQHvTUVerklw==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@wordpress/api-fetch": "^5.1.1",
-						"@wordpress/data": "^5.1.5",
-						"@wordpress/deprecated": "^3.1.1"
-					}
-				}
 			}
 		},
 		"@wordpress/element": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/element/-/element-3.1.1.tgz",
-			"integrity": "sha512-OaqKQVEV3CCTdrx/G7fMbmxhrxjApobHUAGAVYCCR1MIqScfluYJRLWFLx8tlkl/Qm/UbF9IfdXS1lphufvYog==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/element/-/element-3.1.2.tgz",
+			"integrity": "sha512-6ZDhwXkkohcocZSXp+IE4Xn774+PNHJTNsEOLJRAeDo/clIvly5HoczX03z1GLgvEB3VYik8qHaqrouNIcjZvA==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
 				"@types/react": "^16.9.0",
 				"@types/react-dom": "^16.9.0",
-				"@wordpress/escape-html": "^2.1.1",
+				"@wordpress/escape-html": "^2.1.2",
 				"lodash": "^4.17.21",
 				"react": "^16.13.1",
 				"react-dom": "^16.13.1"
 			}
 		},
 		"@wordpress/escape-html": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-2.1.1.tgz",
-			"integrity": "sha512-ZIkLxGLBhXkZu3t0yF82/brPV5aCOGCXGiH0EMV8GCohhXCNIfQwwFrZ5gd5NyNX5Q8alTLsiA84azJd+n0XiQ==",
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-2.1.2.tgz",
+			"integrity": "sha512-nEKvwzjMkuyV5MBnD5Um/McydurQ65mLjV1NG8bVlljZlP6/263qdZ5otH2uwr6cf2Lz1meupmi9sV3ef4TalQ==",
 			"requires": {
 				"@babel/runtime": "^7.13.10"
 			}
 		},
 		"@wordpress/eslint-plugin": {
-			"version": "9.0.6",
-			"resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-9.0.6.tgz",
-			"integrity": "sha512-ytkG93uzlHlItPR2MDkhUXtnnyw80rwSFZDovsHvMKrB9JjDem2pZnnUjwIOl+zb/9nittUJw6HA5AwCBDw+MQ==",
+			"version": "9.1.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-9.1.1.tgz",
+			"integrity": "sha512-GduOwoTTHh132RHTfLU82ujOmzuLpkA9izq+gzKtzhoDGzcpORXIht7tnbB8fzima4PYIiePz2LmuMCSuP18RA==",
 			"dev": true,
 			"requires": {
 				"@typescript-eslint/eslint-plugin": "^4.15.0",
 				"@typescript-eslint/parser": "^4.15.0",
-				"@wordpress/prettier-config": "^1.0.5",
+				"@wordpress/prettier-config": "^1.1.0",
 				"babel-eslint": "^10.1.0",
 				"cosmiconfig": "^7.0.0",
 				"eslint-config-prettier": "^7.1.0",
-				"eslint-plugin-import": "^2.22.1",
+				"eslint-plugin-import": "^2.23.4",
 				"eslint-plugin-jest": "^24.1.3",
-				"eslint-plugin-jsdoc": "^30.7.13",
+				"eslint-plugin-jsdoc": "^34.1.0",
 				"eslint-plugin-jsx-a11y": "^6.4.1",
 				"eslint-plugin-prettier": "^3.3.0",
 				"eslint-plugin-react": "^7.22.0",
@@ -3887,9 +3893,9 @@
 			},
 			"dependencies": {
 				"cosmiconfig": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
-					"integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
+					"version": "7.0.1",
+					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
+					"integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
 					"dev": true,
 					"requires": {
 						"@types/parse-json": "^4.0.0",
@@ -3917,24 +3923,24 @@
 			}
 		},
 		"@wordpress/format-library": {
-			"version": "2.1.13",
-			"resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-2.1.13.tgz",
-			"integrity": "sha512-svWUeJATHapPXeh7wEGCHKy4eoYwERe1JQF7Rxir/s3Z1jAOmmzWDOxXKBcUVUGZp31laAQ3czJ7BzuPuyurlw==",
+			"version": "2.1.14",
+			"resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-2.1.14.tgz",
+			"integrity": "sha512-INmmTyJX0FDBkG8PTJqvIBi+yTfYHpdpkWqP/JswG7kslrG++elm4jyrA2EsV1anZyxDfsSrP3aSCy+arYkTgA==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/a11y": "^3.1.1",
-				"@wordpress/block-editor": "^6.1.13",
-				"@wordpress/components": "^14.1.10",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/data": "^5.1.5",
-				"@wordpress/dom": "^3.1.4",
-				"@wordpress/element": "^3.1.1",
-				"@wordpress/html-entities": "^3.1.1",
-				"@wordpress/i18n": "^4.1.1",
-				"@wordpress/icons": "^4.0.2",
-				"@wordpress/keycodes": "^3.1.1",
-				"@wordpress/rich-text": "^4.1.5",
-				"@wordpress/url": "^3.1.1",
+				"@wordpress/a11y": "^3.1.2",
+				"@wordpress/block-editor": "^6.1.14",
+				"@wordpress/components": "^14.1.11",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/data": "^5.1.6",
+				"@wordpress/dom": "^3.1.5",
+				"@wordpress/element": "^3.1.2",
+				"@wordpress/html-entities": "^3.1.2",
+				"@wordpress/i18n": "^4.1.2",
+				"@wordpress/icons": "^4.0.3",
+				"@wordpress/keycodes": "^3.1.2",
+				"@wordpress/rich-text": "^4.1.6",
+				"@wordpress/url": "^3.1.2",
 				"lodash": "^4.17.21"
 			}
 		},
@@ -3947,17 +3953,17 @@
 			}
 		},
 		"@wordpress/html-entities": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/html-entities/-/html-entities-3.1.1.tgz",
-			"integrity": "sha512-LDeSO//QV0rm7u4SoYz2wa9fM0VhvInwWI8+mT+7jPubkgC+2DfaPte7ahofPz4/lQd9MAQ9NgvGXWTw2x0/vw==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/html-entities/-/html-entities-3.1.2.tgz",
+			"integrity": "sha512-pPbEBxUTZm9YA/ynq50UEGmefaqFIW4g07KrxDQfa+xm0jb3kFZOtxFqdX7gXNofNCn/f5v4jlpFGmmYYpJMaw==",
 			"requires": {
 				"@babel/runtime": "^7.13.10"
 			}
 		},
 		"@wordpress/i18n": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.1.1.tgz",
-			"integrity": "sha512-Ra/hxR8WCLqDp2P49Ibr9ANhZZZ8WHnsO+4WG3XDarJ3lmzux0TcRThDKRCcYHsW3pzieARmrEa/BOlYD7ZEjQ==",
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.1.2.tgz",
+			"integrity": "sha512-Bp0BnGoN2XQyhFjACh74f3fDIQx/AnBIyZsDIhSlNYedFjuJ9b4M246/YTmCDlRHyCqLyG/OuS0hEZKksKAoRQ==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
 				"@wordpress/hooks": "^3.1.1",
@@ -3969,30 +3975,30 @@
 			}
 		},
 		"@wordpress/icons": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-4.0.2.tgz",
-			"integrity": "sha512-WAD6RDbxtutbm2p+Hwe4zc5nl2fiVZSMIj4f6VUqWaVjAdSjy9NxMsUtum6OmyYwRNSvPLFyYUlRfdUJ4AVCaA==",
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-4.0.3.tgz",
+			"integrity": "sha512-I68iAysutXkYP6JrvnPlha/DKtNhtI1u88PuroZC/RgG+R0WwmxphB/bPoj92BCYDjgrMI8P625Ivttuh1spFA==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/element": "^3.1.1",
-				"@wordpress/primitives": "^2.1.1"
+				"@wordpress/element": "^3.1.2",
+				"@wordpress/primitives": "^2.1.2"
 			}
 		},
 		"@wordpress/interface": {
-			"version": "3.1.11",
-			"resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-3.1.11.tgz",
-			"integrity": "sha512-oyDHaIzYRYLiARBS0sEvpKbNmSrv1KaVp9IugUFDOGwT6NE6l9n2+3j600G8mZBpfg3iL222rMFi40LOc6f5Kg==",
+			"version": "3.1.12",
+			"resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-3.1.12.tgz",
+			"integrity": "sha512-t7ksL3IIlWB47+r8UJ9CyAZZVlEVbA7lN9aqA5Ly6+QPIPwtvATDDM1agiUjGPwGLAsFSoZyda9MDjfVNDvXmw==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/components": "^14.1.10",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/data": "^5.1.5",
-				"@wordpress/deprecated": "^3.1.1",
-				"@wordpress/element": "^3.1.1",
-				"@wordpress/i18n": "^4.1.1",
-				"@wordpress/icons": "^4.0.2",
-				"@wordpress/plugins": "^3.1.5",
-				"@wordpress/viewport": "^3.1.5",
+				"@wordpress/components": "^14.1.11",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/data": "^5.1.6",
+				"@wordpress/deprecated": "^3.1.2",
+				"@wordpress/element": "^3.1.2",
+				"@wordpress/i18n": "^4.1.2",
+				"@wordpress/icons": "^4.0.3",
+				"@wordpress/plugins": "^3.1.6",
+				"@wordpress/viewport": "^3.1.6",
 				"classnames": "^2.2.5",
 				"lodash": "^4.17.21"
 			}
@@ -4006,9 +4012,9 @@
 			}
 		},
 		"@wordpress/jest-console": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/@wordpress/jest-console/-/jest-console-4.0.5.tgz",
-			"integrity": "sha512-njpD0WUBd36FDVgFK7oTBTnxPIyy3e5bJdoJkYjqjw5WlRm2RtCeV0Kc5Lss1ZbtMX9oaSiZ9ih62pHXXFeKdQ==",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/jest-console/-/jest-console-4.1.0.tgz",
+			"integrity": "sha512-MAbEfYUH+odlYYtPNKoKnWzSZKZjSc2r2kvFJ7FR920ZdteEgSAPIOvjyv4r4UbJy3ZuKemnXHuVtcTAKca5Tw==",
 			"dev": true,
 			"requires": {
 				"@babel/runtime": "^7.13.10",
@@ -4017,39 +4023,39 @@
 			}
 		},
 		"@wordpress/jest-preset-default": {
-			"version": "7.0.5",
-			"resolved": "https://registry.npmjs.org/@wordpress/jest-preset-default/-/jest-preset-default-7.0.5.tgz",
-			"integrity": "sha512-Kf8TmGLqYb0hO44wiG57dRAROugGiplFIUG9jZnELTyppKkI/Q3ePJXVf+JmZsyzBw86OaNqSCAipTp5jWHhgw==",
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/jest-preset-default/-/jest-preset-default-7.1.0.tgz",
+			"integrity": "sha512-N6OwVfvNodRTgIkmBor6YOGx3FbLdvPp9ZTGHJ1uw1u+HUuPwVWN9nhcGTnuP8Ht2RWyN5VpN2Peo5+dz5gp0w==",
 			"dev": true,
 			"requires": {
-				"@wordpress/jest-console": "^4.0.5",
+				"@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
+				"@wordpress/jest-console": "^4.1.0",
 				"babel-jest": "^26.6.3",
 				"enzyme": "^3.11.0",
-				"enzyme-adapter-react-16": "^1.15.2",
 				"enzyme-to-json": "^3.4.4"
 			}
 		},
 		"@wordpress/keyboard-shortcuts": {
-			"version": "2.1.6",
-			"resolved": "https://registry.npmjs.org/@wordpress/keyboard-shortcuts/-/keyboard-shortcuts-2.1.6.tgz",
-			"integrity": "sha512-YyF0Iy6F9udYwsxHKsWFLcIUQzfbr9MS3qcm0YmhszZCtLEwKmfcL6s3n4KTFD7EosDXcxyivoifLdiWY3R27w==",
+			"version": "2.1.7",
+			"resolved": "https://registry.npmjs.org/@wordpress/keyboard-shortcuts/-/keyboard-shortcuts-2.1.7.tgz",
+			"integrity": "sha512-V04mCe0Uwxhe2qIkfJ4h5//KsngZA25G/3kI0Ab6vL2N8OrQZQojZ4fnCK3x/P7mvdjXKQn78+vjnp3KiMvRqg==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/data": "^5.1.5",
-				"@wordpress/element": "^3.1.1",
-				"@wordpress/keycodes": "^3.1.1",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/data": "^5.1.6",
+				"@wordpress/element": "^3.1.2",
+				"@wordpress/keycodes": "^3.1.2",
 				"lodash": "^4.17.21",
 				"rememo": "^3.0.0"
 			}
 		},
 		"@wordpress/keycodes": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-3.1.1.tgz",
-			"integrity": "sha512-lLJTl/PJv0F5c02YfFdzS/sspmMM3kWYcix8sXsAQgjzLkOMizSQySBa3bpT2t5auN0YQ34YVyeupVfoY+evOQ==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-3.1.2.tgz",
+			"integrity": "sha512-8N0JiHquULMezdWEAu/MjaW5cQ4EN8z61HkA4/sIIB8JPd2TvNEkE1SeEotzpPICcBitEoQzclQ3uOUPld0WAg==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/i18n": "^4.1.1",
+				"@wordpress/i18n": "^4.1.2",
 				"lodash": "^4.17.21"
 			}
 		},
@@ -4082,108 +4088,139 @@
 			}
 		},
 		"@wordpress/list-reusable-blocks": {
-			"version": "2.1.10",
-			"resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-2.1.10.tgz",
-			"integrity": "sha512-benX4UNOuXZR6Vzkxe48QR/eusqyCs44yCJjh1foem6kdVyMeduwEx88WALVIJq34Y6X3l3bHpQRcVVtEpdEAA==",
+			"version": "2.1.11",
+			"resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-2.1.11.tgz",
+			"integrity": "sha512-/y9YbYKL0E0jGs0QJHzdAK3OHrpWec9/dt2oy/RkB6+r+SjHUMBbCyxtL67SPhqZAliXDO10tJSih0OFK0gULw==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/api-fetch": "^5.1.1",
-				"@wordpress/components": "^14.1.10",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/element": "^3.1.1",
-				"@wordpress/i18n": "^4.1.1",
+				"@wordpress/api-fetch": "^5.1.2",
+				"@wordpress/components": "^14.1.11",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/element": "^3.1.2",
+				"@wordpress/i18n": "^4.1.2",
 				"lodash": "^4.17.21"
 			}
 		},
 		"@wordpress/media-utils": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/media-utils/-/media-utils-2.1.1.tgz",
-			"integrity": "sha512-pp39/OYrr9yhvpgPfRk/ZCNE3kCZ3L9NC9fvwnNiMR5BjfkWPseezXRknnWpAdHccELAcu6WBxzXAZLoGH1/vQ==",
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/media-utils/-/media-utils-2.1.2.tgz",
+			"integrity": "sha512-LhZ52JdLz4Lwr1H1YB90pAHTlAowv9R2HwQXjjmKmkSfGwCOhd6xigSRnDVKEjJxT4sUsVVCJdnb4Og/SVk0Nw==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/api-fetch": "^5.1.1",
-				"@wordpress/blob": "^3.1.1",
-				"@wordpress/element": "^3.1.1",
-				"@wordpress/i18n": "^4.1.1",
+				"@wordpress/api-fetch": "^5.1.2",
+				"@wordpress/blob": "^3.1.2",
+				"@wordpress/element": "^3.1.2",
+				"@wordpress/i18n": "^4.1.2",
 				"lodash": "^4.17.21"
 			}
 		},
 		"@wordpress/notices": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/@wordpress/notices/-/notices-3.1.5.tgz",
-			"integrity": "sha512-xA8z/xFog7OAkSHp6t2cFrJDK5j4o8lsJvhrjpyomIU8xMDMQgCM3wRJ4gr7xniF0VS//C8wzjFXkws9v/wf+w==",
+			"version": "3.1.6",
+			"resolved": "https://registry.npmjs.org/@wordpress/notices/-/notices-3.1.6.tgz",
+			"integrity": "sha512-I+xDHCY7n5I/mBeZvlker7BoMtRFgaHBe/XySGJv2V2D3ZxgpAGXeVv13v+ohSvhaEjFhll+RgszpZOW/8SMLA==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/a11y": "^3.1.1",
-				"@wordpress/data": "^5.1.5",
+				"@wordpress/a11y": "^3.1.2",
+				"@wordpress/data": "^5.1.6",
 				"lodash": "^4.17.21"
 			}
 		},
 		"@wordpress/npm-package-json-lint-config": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/@wordpress/npm-package-json-lint-config/-/npm-package-json-lint-config-4.0.5.tgz",
-			"integrity": "sha512-kckj06QsUe7fSGYWiOhsXbAgU2sL9s/gy7GynvQCqOPPiLGpJ8PvCx8OLMaT0T75CXFqieGvfS8Dtf+d84mFvg==",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/npm-package-json-lint-config/-/npm-package-json-lint-config-4.1.0.tgz",
+			"integrity": "sha512-FjXL5GbpmI/wXXcpCf2sKosVIVuWjUuHmDbwcMzd0SClcudo9QjDRdVe35We+js8eQLPgB9hsG4Cty6cAFFxsQ==",
 			"dev": true
 		},
 		"@wordpress/nux": {
-			"version": "4.1.10",
-			"resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-4.1.10.tgz",
-			"integrity": "sha512-DONHYpLwZV7hAh4C0ZVJTBgKyItcq7zC2UTyXASA2jKj1KDWTQGf0SgxdK5KZLUz43/GlqfTBadl3IaFl9gpvA==",
+			"version": "4.1.11",
+			"resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-4.1.11.tgz",
+			"integrity": "sha512-GRuQW4guMp12NjdUQPpQHJ+YoLt9lzigWO5za5sPXtWzgpYjzzTGIvBrC8hU5s5dXAlvHzZ0yk6swCEBXGqVDw==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/components": "^14.1.10",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/data": "^5.1.5",
-				"@wordpress/deprecated": "^3.1.1",
-				"@wordpress/element": "^3.1.1",
-				"@wordpress/i18n": "^4.1.1",
-				"@wordpress/icons": "^4.0.2",
+				"@wordpress/components": "^14.1.11",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/data": "^5.1.6",
+				"@wordpress/deprecated": "^3.1.2",
+				"@wordpress/element": "^3.1.2",
+				"@wordpress/i18n": "^4.1.2",
+				"@wordpress/icons": "^4.0.3",
 				"lodash": "^4.17.21",
 				"rememo": "^3.0.0"
 			}
 		},
 		"@wordpress/plugins": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/@wordpress/plugins/-/plugins-3.1.5.tgz",
-			"integrity": "sha512-40wMKFrtpiQvkjZw5iefYLVyp5BuruzhV8DUfTSxWs5vlj/9O1hNtKGk58ynqSOsiltV9O5cVgjiq+hJiJNXhA==",
+			"version": "3.1.6",
+			"resolved": "https://registry.npmjs.org/@wordpress/plugins/-/plugins-3.1.6.tgz",
+			"integrity": "sha512-I2ZE6M/IzkLDDy0YOWLqMebutuubeYCk5Y3QkSRVmQYiuTP0o6q2vO8iJjfL87L8wxB3BgkZwNxusFB1not+lw==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/element": "^3.1.1",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/element": "^3.1.2",
 				"@wordpress/hooks": "^3.1.1",
-				"@wordpress/icons": "^4.0.2",
+				"@wordpress/icons": "^4.0.3",
 				"lodash": "^4.17.21",
 				"memize": "^1.1.0"
 			}
 		},
 		"@wordpress/postcss-plugins-preset": {
-			"version": "3.1.4",
-			"resolved": "https://registry.npmjs.org/@wordpress/postcss-plugins-preset/-/postcss-plugins-preset-3.1.4.tgz",
-			"integrity": "sha512-yfzn2AKjHuFAPJL7NlUaga2KEWfBO5Pv9zhu0Km44pV/4Z/lUKu5m8Tqcllx6kUiERakMyvaXkAm0e0p+7oh5w==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/postcss-plugins-preset/-/postcss-plugins-preset-3.2.0.tgz",
+			"integrity": "sha512-vYzlqr92pq9cIdN6eO5/h1hyDjEIUUvRlm3Tgd822dPPr6EpkM8uJ82quObE1pPt4JfmXYhTj+gMgOUzRNLHJg==",
 			"dev": true,
 			"requires": {
-				"@wordpress/base-styles": "^3.5.4",
+				"@wordpress/base-styles": "^3.6.0",
 				"autoprefixer": "^10.2.5"
 			},
 			"dependencies": {
 				"autoprefixer": {
-					"version": "10.3.1",
-					"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.1.tgz",
-					"integrity": "sha512-L8AmtKzdiRyYg7BUXJTzigmhbQRCXFKz6SA1Lqo0+AR2FBbQ4aTAPFSDlOutnFkjhiz8my4agGXog1xlMjPJ6A==",
+					"version": "10.3.3",
+					"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.3.tgz",
+					"integrity": "sha512-yRzjxfnggrP/+qVHlUuZz5FZzEbkT+Yt0/Df6ScEMnbbZBLzYB2W0KLxoQCW+THm1SpOsM1ZPcTHAwuvmibIsQ==",
 					"dev": true,
 					"requires": {
-						"browserslist": "^4.16.6",
-						"caniuse-lite": "^1.0.30001243",
-						"colorette": "^1.2.2",
+						"browserslist": "^4.16.8",
+						"caniuse-lite": "^1.0.30001252",
+						"colorette": "^1.3.0",
 						"fraction.js": "^4.1.1",
 						"normalize-range": "^0.1.2",
 						"postcss-value-parser": "^4.1.0"
 					}
 				},
+				"browserslist": {
+					"version": "4.16.8",
+					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.8.tgz",
+					"integrity": "sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ==",
+					"dev": true,
+					"requires": {
+						"caniuse-lite": "^1.0.30001251",
+						"colorette": "^1.3.0",
+						"electron-to-chromium": "^1.3.811",
+						"escalade": "^3.1.1",
+						"node-releases": "^1.1.75"
+					}
+				},
+				"caniuse-lite": {
+					"version": "1.0.30001252",
+					"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001252.tgz",
+					"integrity": "sha512-I56jhWDGMtdILQORdusxBOH+Nl/KgQSdDmpJezYddnAkVOmnoU8zwjTV9xAjMIYxr0iPreEAVylCGcmHCjfaOw==",
+					"dev": true
+				},
 				"colorette": {
-					"version": "1.2.2",
-					"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-					"integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz",
+					"integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==",
+					"dev": true
+				},
+				"electron-to-chromium": {
+					"version": "1.3.826",
+					"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.826.tgz",
+					"integrity": "sha512-bpLc4QU4B8PYmdO4MSu2ZBTMD8lAaEXRS43C09lB31BvYwuk9UxgBRXbY5OJBw7VuMGcg2MZG5FyTaP9u4PQnw==",
+					"dev": true
+				},
+				"node-releases": {
+					"version": "1.1.75",
+					"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz",
+					"integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==",
 					"dev": true
 				},
 				"postcss-value-parser": {
@@ -4195,33 +4232,33 @@
 			}
 		},
 		"@wordpress/prettier-config": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-1.0.5.tgz",
-			"integrity": "sha512-kZ1EzXmDKOe+QxSJJSu70zx+x2g1awqYJjX7Z947K0affv4l8/oPA+k3SgNi3U9Q5Sbwtb5xLgDr9k0HGJSw7g==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-1.1.0.tgz",
+			"integrity": "sha512-cMYc/dtuiRo9VAb+m8S2Mvv/jELvoJAtcPsq6HT6XMppXC9slZ5z0q1A4PNf3ewMvvHtodjwkl2oHbO+vaAYzg==",
 			"dev": true
 		},
 		"@wordpress/primitives": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/primitives/-/primitives-2.1.1.tgz",
-			"integrity": "sha512-iX31v/302zOrxEVwFUbbwr4BKZcxR+XQ53wuShc8CzcydAYj5JUFdEuwG6Z9jRGJAX2AgizSP6Fex4ercgFLXA==",
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/primitives/-/primitives-2.1.2.tgz",
+			"integrity": "sha512-Eof+TK+zoKIr6w4lMlwxq+HvP+nKXBoidukjP3YhNUPOdB7H27+X6/V/IJd/Zza2xKN2ExkJybssBAGqi5NS6g==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/element": "^3.1.1",
+				"@wordpress/element": "^3.1.2",
 				"classnames": "^2.2.5"
 			}
 		},
 		"@wordpress/priority-queue": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/priority-queue/-/priority-queue-2.1.1.tgz",
-			"integrity": "sha512-e4x4B+1F2wXejqjNr6L3LTf5aO7gzy/9MWy5pUgg1rlo8z+B73OyOUmK39WOnzFtzmwTbFqgzzCwY5JqIaZe2g==",
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/priority-queue/-/priority-queue-2.1.2.tgz",
+			"integrity": "sha512-qXZzmfTRH6ssSZpCbJEHnj/w9W8bjpYm8V1tLKUqBXEYkHbII4O2FIL21LGI5aFhPPWsHG7tlYz3Z4lA/MHALQ==",
 			"requires": {
 				"@babel/runtime": "^7.13.10"
 			}
 		},
 		"@wordpress/redux-routine": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/redux-routine/-/redux-routine-4.1.1.tgz",
-			"integrity": "sha512-wjHASkmDPiOhnTZGn43kBj5RDVnSTRpj3EHL8boUGmOMiEFm/bUAfefhyvlo9ksBF4ZQm2pJjJTWtp5zE1drgg==",
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/redux-routine/-/redux-routine-4.1.2.tgz",
+			"integrity": "sha512-1wOH4zdp58VNeMCoTNRHc1wHTGL3ZWqx8kCCqeA3NhULnRBx2RkI/v6nemKCho5QRbMdIWWUYXffFsLbDOUOSg==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
 				"is-promise": "^4.0.0",
@@ -4230,37 +4267,37 @@
 			}
 		},
 		"@wordpress/reusable-blocks": {
-			"version": "2.1.16",
-			"resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-2.1.16.tgz",
-			"integrity": "sha512-CEVKQcUS7VJH7qUMRzRQqmVZB3JpZ0dKphjWYS0NacJIN2Jlm1HLJS1Sxf4Ayv0SKmYgQp2NE5Zas4aki8wPfA==",
-			"requires": {
-				"@wordpress/block-editor": "^6.1.13",
-				"@wordpress/blocks": "^9.1.7",
-				"@wordpress/components": "^14.1.10",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/core-data": "^3.1.11",
-				"@wordpress/data": "^5.1.5",
-				"@wordpress/element": "^3.1.1",
-				"@wordpress/i18n": "^4.1.1",
-				"@wordpress/icons": "^4.0.2",
-				"@wordpress/notices": "^3.1.5",
-				"@wordpress/url": "^3.1.1",
+			"version": "2.1.17",
+			"resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-2.1.17.tgz",
+			"integrity": "sha512-54tZPQppe4kmDeivxsUk5ZZhTlSY8jum+5OEcYs0jJVctEXhRVh7rU3p2hqSWWriNghqVz4i3cuJ57tqt/tIsw==",
+			"requires": {
+				"@wordpress/block-editor": "^6.1.14",
+				"@wordpress/blocks": "^9.1.8",
+				"@wordpress/components": "^14.1.11",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/core-data": "^3.1.12",
+				"@wordpress/data": "^5.1.6",
+				"@wordpress/element": "^3.1.2",
+				"@wordpress/i18n": "^4.1.2",
+				"@wordpress/icons": "^4.0.3",
+				"@wordpress/notices": "^3.1.6",
+				"@wordpress/url": "^3.1.2",
 				"lodash": "^4.17.21"
 			}
 		},
 		"@wordpress/rich-text": {
-			"version": "4.1.5",
-			"resolved": "https://registry.npmjs.org/@wordpress/rich-text/-/rich-text-4.1.5.tgz",
-			"integrity": "sha512-P5861BnBe+lITv3N8KtOAaIjeYAmFPbOUB9VWD26AzAY4DrTQZDGVcblRjvy3aykmyHF6xQ5UvA+tPcjumQrkg==",
+			"version": "4.1.6",
+			"resolved": "https://registry.npmjs.org/@wordpress/rich-text/-/rich-text-4.1.6.tgz",
+			"integrity": "sha512-wF60RXrGIQ0xgAvMSNwh1dP8lM4RRMWbRS5ZKOf1ld2s7oTsezEodBwCIHhFkHeraM/ORbeFoBPFsLbGf3oXwQ==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/data": "^5.1.5",
-				"@wordpress/dom": "^3.1.4",
-				"@wordpress/element": "^3.1.1",
-				"@wordpress/escape-html": "^2.1.1",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/data": "^5.1.6",
+				"@wordpress/dom": "^3.1.5",
+				"@wordpress/element": "^3.1.2",
+				"@wordpress/escape-html": "^2.1.2",
 				"@wordpress/is-shallow-equal": "^4.1.1",
-				"@wordpress/keycodes": "^3.1.1",
+				"@wordpress/keycodes": "^3.1.2",
 				"classnames": "^2.2.5",
 				"lodash": "^4.17.21",
 				"memize": "^1.1.0",
@@ -4268,13 +4305,13 @@
 			}
 		},
 		"@wordpress/scripts": {
-			"version": "16.1.4",
-			"resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-16.1.4.tgz",
-			"integrity": "sha512-onjnFkshfGO5ecKEI7gG22F851/GVZTjffXamPaJBYiv2a1u05bDD8i9fjJduBcyQP2O2Qy1B8droC4uL7Epvw==",
+			"version": "16.1.5",
+			"resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-16.1.5.tgz",
+			"integrity": "sha512-EF63cT5UGbWEMEJBBhxvcoNAuJIooKlqAAaMq5wN1urzsJRpQOTHTV658onoKFfgAxWB78CD7svuwIqNPGQdIw==",
 			"dev": true,
 			"requires": {
 				"@svgr/webpack": "^5.2.0",
-				"@wordpress/babel-preset-default": "^6.2.0",
+				"@wordpress/babel-preset-default": "^6.2.1",
 				"@wordpress/dependency-extraction-webpack-plugin": "^3.1.4",
 				"@wordpress/eslint-plugin": "^9.0.6",
 				"@wordpress/jest-preset-default": "^7.0.5",
@@ -4328,11 +4365,12 @@
 			},
 			"dependencies": {
 				"cacache": {
-					"version": "15.2.0",
-					"resolved": "https://registry.npmjs.org/cacache/-/cacache-15.2.0.tgz",
-					"integrity": "sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==",
+					"version": "15.3.0",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
+					"integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
 					"dev": true,
 					"requires": {
+						"@npmcli/fs": "^1.0.0",
 						"@npmcli/move-file": "^1.0.1",
 						"chownr": "^2.0.0",
 						"fs-minipass": "^2.0.0",
@@ -4359,9 +4397,9 @@
 					"dev": true
 				},
 				"colorette": {
-					"version": "1.2.2",
-					"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-					"integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz",
+					"integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==",
 					"dev": true
 				},
 				"enhanced-resolve": {
@@ -4399,9 +4437,9 @@
 					}
 				},
 				"find-cache-dir": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
-					"integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+					"version": "3.3.2",
+					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+					"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
 					"dev": true,
 					"requires": {
 						"commondir": "^1.0.1",
@@ -4497,9 +4535,9 @@
 					}
 				},
 				"postcss": {
-					"version": "8.3.5",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz",
-					"integrity": "sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA==",
+					"version": "8.3.6",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz",
+					"integrity": "sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==",
 					"dev": true,
 					"requires": {
 						"colorette": "^1.2.2",
@@ -4809,9 +4847,9 @@
 					}
 				},
 				"webpack-sources": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.0.tgz",
-					"integrity": "sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ==",
+					"version": "2.3.1",
+					"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
+					"integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
 					"dev": true,
 					"requires": {
 						"source-list-map": "^2.0.1",
@@ -4827,27 +4865,27 @@
 			}
 		},
 		"@wordpress/server-side-render": {
-			"version": "2.1.11",
-			"resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-2.1.11.tgz",
-			"integrity": "sha512-TY2OcJRfGpnhCaeAsh7/tHVNOLzToZ1lJ07zfIePCVQ6lNuQvBpLWXuEf7EGXH6jc2AyRS8ler3zCxHX2MaIBA==",
+			"version": "2.1.12",
+			"resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-2.1.12.tgz",
+			"integrity": "sha512-NrxFv/u6xzs97Pgyb0BbhB2f7pAII2trD8nyDY+/JfjNcTguulthRh9kmmPWp/vo6kgyEO1xyo6yHUnHLnh/vQ==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/api-fetch": "^5.1.1",
-				"@wordpress/blocks": "^9.1.7",
-				"@wordpress/components": "^14.1.10",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/data": "^5.1.5",
-				"@wordpress/deprecated": "^3.1.1",
-				"@wordpress/element": "^3.1.1",
-				"@wordpress/i18n": "^4.1.1",
-				"@wordpress/url": "^3.1.1",
+				"@wordpress/api-fetch": "^5.1.2",
+				"@wordpress/blocks": "^9.1.8",
+				"@wordpress/components": "^14.1.11",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/data": "^5.1.6",
+				"@wordpress/deprecated": "^3.1.2",
+				"@wordpress/element": "^3.1.2",
+				"@wordpress/i18n": "^4.1.2",
+				"@wordpress/url": "^3.1.2",
 				"lodash": "^4.17.21"
 			}
 		},
 		"@wordpress/shortcode": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/shortcode/-/shortcode-3.1.1.tgz",
-			"integrity": "sha512-NiYTV42zkav0XUbRKAzoPcN3+GlwNlSXYZFLoNz+WInamTcXR5ZxQr4TE7F3DuoDNgyjwpE7vXbDJ0HFWRkgWw==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/shortcode/-/shortcode-3.1.2.tgz",
+			"integrity": "sha512-pZQf4nu4iQdyQIz3OnphvPcKTL9jlEIR1a58icis+PDnqbr0gv4PGwS3Hbamlm4p7+bkxm5Pskfj3n3ykqwGLQ==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
 				"lodash": "^4.17.21",
@@ -4855,9 +4893,9 @@
 			}
 		},
 		"@wordpress/stylelint-config": {
-			"version": "19.0.5",
-			"resolved": "https://registry.npmjs.org/@wordpress/stylelint-config/-/stylelint-config-19.0.5.tgz",
-			"integrity": "sha512-VI89jNS4wqr6Bd2PklGiTlrzrTH2RLQe2mHkWsYABVcFBFlsv6bTDQbO2c4xX1jd/9yYH7lEyvuzb3sHnyxMSA==",
+			"version": "19.1.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/stylelint-config/-/stylelint-config-19.1.0.tgz",
+			"integrity": "sha512-K/wB9rhB+pH5WvDh3fV3DN5C3Bud+jPGXmnPY8fOXKMYI3twCFozK/j6sVuaJHqGp/0kKEF0hkkGh+HhD30KGQ==",
 			"dev": true,
 			"requires": {
 				"stylelint-config-recommended": "^3.0.0",
@@ -4875,9 +4913,9 @@
 			}
 		},
 		"@wordpress/url": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/url/-/url-3.1.1.tgz",
-			"integrity": "sha512-I+yEw+a66wZ+FrpYU1F78/3c5p7/323UIrfnPUN51hIJcatsqJyQZW9Z1CNZeN5SuCobha0GPq4lw8517+VUMw==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/url/-/url-3.1.2.tgz",
+			"integrity": "sha512-hT214NQG2p+FiL4jdKPJItHMEeA70uqvhKlnPOa7qqf9u+6QMnhVplxFxWSIu5cB7glmx5JQG4EMR2Ohz3jgTg==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
 				"lodash": "^4.17.21",
@@ -4885,47 +4923,47 @@
 			}
 		},
 		"@wordpress/viewport": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/@wordpress/viewport/-/viewport-3.1.5.tgz",
-			"integrity": "sha512-Jgt8HnotByCGfHJi5UKg7M9wcnzjfS8TdpMG8psi/d3bq9sLSZM6yQWdbat2MF93aqtYenF4/Wbev5nKPdKRUw==",
+			"version": "3.1.6",
+			"resolved": "https://registry.npmjs.org/@wordpress/viewport/-/viewport-3.1.6.tgz",
+			"integrity": "sha512-SwIL26Nd691mO8R21GUrODjVqJx1Y1DVNHbX9VusJxvf7citc94dZnXXHiQ8zc7vlg5ryMBF49/EFn8rZ8Zn8w==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/data": "^5.1.5",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/data": "^5.1.6",
 				"lodash": "^4.17.21"
 			}
 		},
 		"@wordpress/warning": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-2.1.1.tgz",
-			"integrity": "sha512-EX+/6P2bWO0zRrKJYx1yck0rY2K5z5aPb67DTU+2ggcowW8JRP7hBzGdzhXqoE32oMS7RO97nG3uD9sZtn2DJA=="
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-2.1.2.tgz",
+			"integrity": "sha512-MqMo5AYffG/Gi3h1uRFJGBxp4TGmxw+7A4W81oe7VC9linJYhbNyeyvaMlL02m06KG2szWwl4fn0bdhyre433w=="
 		},
 		"@wordpress/widgets": {
-			"version": "1.1.18",
-			"resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-1.1.18.tgz",
-			"integrity": "sha512-qUg595IecNXmu/8sS5l7NJdcMJbToj+0bjOQzj3bZDapQuASpWHl9YjrrNNRwt1koq9CXp65E14dNuDFj0RKeQ==",
+			"version": "1.1.19",
+			"resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-1.1.19.tgz",
+			"integrity": "sha512-6ojIQVbeeS3fhXs+nNdmKIc6BtYnPoPq6qXLcTFGV9yXPJs8zX5RRdI3ziEFeV/IILCoIk4fmbw87ncIQwahQA==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/api-fetch": "^5.1.1",
-				"@wordpress/block-editor": "^6.1.13",
-				"@wordpress/blocks": "^9.1.7",
-				"@wordpress/components": "^14.1.10",
-				"@wordpress/compose": "^4.1.5",
-				"@wordpress/core-data": "^3.1.11",
-				"@wordpress/data": "^5.1.5",
-				"@wordpress/element": "^3.1.1",
-				"@wordpress/i18n": "^4.1.1",
-				"@wordpress/icons": "^4.0.2",
-				"@wordpress/notices": "^3.1.5",
-				"@wordpress/url": "^3.1.1",
+				"@wordpress/api-fetch": "^5.1.2",
+				"@wordpress/block-editor": "^6.1.14",
+				"@wordpress/blocks": "^9.1.8",
+				"@wordpress/components": "^14.1.11",
+				"@wordpress/compose": "^4.1.6",
+				"@wordpress/core-data": "^3.1.12",
+				"@wordpress/data": "^5.1.6",
+				"@wordpress/element": "^3.1.2",
+				"@wordpress/i18n": "^4.1.2",
+				"@wordpress/icons": "^4.0.3",
+				"@wordpress/notices": "^3.1.6",
+				"@wordpress/url": "^3.1.2",
 				"classnames": "^2.2.5",
 				"lodash": "^4.17.21"
 			}
 		},
 		"@wordpress/wordcount": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/wordcount/-/wordcount-3.1.1.tgz",
-			"integrity": "sha512-O7T3lONKZYlPxkvIhZp5wEDl61yJs1h87VrDSkv3ZdOtEgpRF1La6pA/GN/BvBOUQL9ZAbqXUmQgUZ8hHd31eA==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/wordcount/-/wordcount-3.1.2.tgz",
+			"integrity": "sha512-jFumH3IJzbEtGupxfre7asRMF6zHmNPeOlNgJw7luaeE1YFwgXkCtflDFf2Y6fC09xJmwuDPwxLnoII8RLhNtQ==",
 			"requires": {
 				"@babel/runtime": "^7.13.10",
 				"lodash": "^4.17.21"
@@ -5264,9 +5302,9 @@
 					}
 				},
 				"es-abstract": {
-					"version": "1.18.3",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
-					"integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
+					"version": "1.18.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
+					"integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
 					"dev": true,
 					"requires": {
 						"call-bind": "^1.0.2",
@@ -5275,11 +5313,12 @@
 						"get-intrinsic": "^1.1.1",
 						"has": "^1.0.3",
 						"has-symbols": "^1.0.2",
+						"internal-slot": "^1.0.3",
 						"is-callable": "^1.2.3",
 						"is-negative-zero": "^2.0.1",
 						"is-regex": "^1.1.3",
 						"is-string": "^1.0.6",
-						"object-inspect": "^1.10.3",
+						"object-inspect": "^1.11.0",
 						"object-keys": "^1.1.1",
 						"object.assign": "^4.1.2",
 						"string.prototype.trimend": "^1.0.4",
@@ -5307,27 +5346,19 @@
 					}
 				},
 				"is-callable": {
-					"version": "1.2.3",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-					"integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+					"version": "1.2.4",
+					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+					"integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
 					"dev": true
 				},
 				"is-regex": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-					"integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
 					"dev": true,
 					"requires": {
 						"call-bind": "^1.0.2",
-						"has-symbols": "^1.0.2"
-					},
-					"dependencies": {
-						"has-symbols": {
-							"version": "1.0.2",
-							"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-							"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-							"dev": true
-						}
+						"has-tostringtag": "^1.0.0"
 					}
 				},
 				"object-inspect": {
@@ -5409,9 +5440,9 @@
 					}
 				},
 				"es-abstract": {
-					"version": "1.18.3",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
-					"integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
+					"version": "1.18.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
+					"integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
 					"dev": true,
 					"requires": {
 						"call-bind": "^1.0.2",
@@ -5420,11 +5451,12 @@
 						"get-intrinsic": "^1.1.1",
 						"has": "^1.0.3",
 						"has-symbols": "^1.0.2",
+						"internal-slot": "^1.0.3",
 						"is-callable": "^1.2.3",
 						"is-negative-zero": "^2.0.1",
 						"is-regex": "^1.1.3",
 						"is-string": "^1.0.6",
-						"object-inspect": "^1.10.3",
+						"object-inspect": "^1.11.0",
 						"object-keys": "^1.1.1",
 						"object.assign": "^4.1.2",
 						"string.prototype.trimend": "^1.0.4",
@@ -5452,19 +5484,19 @@
 					"dev": true
 				},
 				"is-callable": {
-					"version": "1.2.3",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-					"integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+					"version": "1.2.4",
+					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+					"integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
 					"dev": true
 				},
 				"is-regex": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-					"integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
 					"dev": true,
 					"requires": {
 						"call-bind": "^1.0.2",
-						"has-symbols": "^1.0.2"
+						"has-tostringtag": "^1.0.0"
 					}
 				},
 				"object-inspect": {
@@ -5515,9 +5547,9 @@
 			},
 			"dependencies": {
 				"es-abstract": {
-					"version": "1.18.3",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
-					"integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
+					"version": "1.18.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
+					"integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
 					"requires": {
 						"call-bind": "^1.0.2",
 						"es-to-primitive": "^1.2.1",
@@ -5525,11 +5557,12 @@
 						"get-intrinsic": "^1.1.1",
 						"has": "^1.0.3",
 						"has-symbols": "^1.0.2",
+						"internal-slot": "^1.0.3",
 						"is-callable": "^1.2.3",
 						"is-negative-zero": "^2.0.1",
 						"is-regex": "^1.1.3",
 						"is-string": "^1.0.6",
-						"object-inspect": "^1.10.3",
+						"object-inspect": "^1.11.0",
 						"object-keys": "^1.1.1",
 						"object.assign": "^4.1.2",
 						"string.prototype.trimend": "^1.0.4",
@@ -5564,17 +5597,17 @@
 					"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
 				},
 				"is-callable": {
-					"version": "1.2.3",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-					"integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="
+					"version": "1.2.4",
+					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+					"integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
 				},
 				"is-regex": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-					"integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
 					"requires": {
 						"call-bind": "^1.0.2",
-						"has-symbols": "^1.0.2"
+						"has-tostringtag": "^1.0.0"
 					},
 					"dependencies": {
 						"call-bind": {
@@ -5648,9 +5681,9 @@
 			},
 			"dependencies": {
 				"es-abstract": {
-					"version": "1.18.3",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
-					"integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
+					"version": "1.18.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
+					"integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
 					"dev": true,
 					"requires": {
 						"call-bind": "^1.0.2",
@@ -5659,11 +5692,12 @@
 						"get-intrinsic": "^1.1.1",
 						"has": "^1.0.3",
 						"has-symbols": "^1.0.2",
+						"internal-slot": "^1.0.3",
 						"is-callable": "^1.2.3",
 						"is-negative-zero": "^2.0.1",
 						"is-regex": "^1.1.3",
 						"is-string": "^1.0.6",
-						"object-inspect": "^1.10.3",
+						"object-inspect": "^1.11.0",
 						"object-keys": "^1.1.1",
 						"object.assign": "^4.1.2",
 						"string.prototype.trimend": "^1.0.4",
@@ -5701,19 +5735,19 @@
 					"dev": true
 				},
 				"is-callable": {
-					"version": "1.2.3",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-					"integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+					"version": "1.2.4",
+					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+					"integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
 					"dev": true
 				},
 				"is-regex": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-					"integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
 					"dev": true,
 					"requires": {
 						"call-bind": "^1.0.2",
-						"has-symbols": "^1.0.2"
+						"has-tostringtag": "^1.0.0"
 					},
 					"dependencies": {
 						"call-bind": {
@@ -5939,9 +5973,9 @@
 			"dev": true
 		},
 		"axe-core": {
-			"version": "4.3.1",
-			"resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.1.tgz",
-			"integrity": "sha512-3WVgVPs/7OnKU3s+lqMtkv3wQlg3WxK1YifmpJSDO0E1aPBrZWlrrTO6cxRqCXLuX2aYgCljqXIQd0VnRidV0g==",
+			"version": "4.3.3",
+			"resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.3.tgz",
+			"integrity": "sha512-/lqqLAmuIPi79WYfRpy2i8z+x+vxU3zX2uAm0gs1q52qTuKwolOj1P8XbufpXcsydrpKx2yGn2wzAnxCMV86QA==",
 			"dev": true
 		},
 		"axios": {
@@ -6010,9 +6044,9 @@
 			},
 			"dependencies": {
 				"find-cache-dir": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
-					"integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+					"version": "3.3.2",
+					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+					"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
 					"dev": true,
 					"requires": {
 						"commondir": "^1.0.1",
@@ -6172,9 +6206,9 @@
 			}
 		},
 		"babel-plugin-polyfill-corejs3": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.3.tgz",
-			"integrity": "sha512-rCOFzEIJpJEAU14XCcV/erIf/wZQMmMT5l5vXOpL5uoznyOGfDIjPj6FVytMvtzaKSTSVKouOCTPJ5OMUZH30g==",
+			"version": "0.2.4",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz",
+			"integrity": "sha512-z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-define-polyfill-provider": "^0.2.2",
@@ -7469,9 +7503,9 @@
 					"dev": true
 				},
 				"tslib": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-					"integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==",
+					"version": "2.3.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+					"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
 					"dev": true
 				}
 			}
@@ -7526,9 +7560,9 @@
 					"dev": true
 				},
 				"domutils": {
-					"version": "2.7.0",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz",
-					"integrity": "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==",
+					"version": "2.8.0",
+					"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+					"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
 					"dev": true,
 					"requires": {
 						"dom-serializer": "^1.0.1",
@@ -7900,9 +7934,9 @@
 			"dev": true
 		},
 		"comment-parser": {
-			"version": "0.7.6",
-			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-0.7.6.tgz",
-			"integrity": "sha512-GKNxVA7/iuTnAqGADlTWX4tkhzxZKXp5fLJqKTlQLHkE65XDUKutZ3BHaJC5IGcper2tT3QRD1xr4o3jNpgXXg==",
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.5.tgz",
+			"integrity": "sha512-RePCE4leIhBlmrqiYTvaqEeGYg7qpSl4etaIabKtdOQVi+mSTIBBklGUwIr79GXYnl3LpMwmDw4KeR2stNc6FA==",
 			"dev": true
 		},
 		"commondir": {
@@ -8232,21 +8266,58 @@
 			}
 		},
 		"core-js": {
-			"version": "3.15.2",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.15.2.tgz",
-			"integrity": "sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q==",
+			"version": "3.17.0",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.17.0.tgz",
+			"integrity": "sha512-zXT4rclS9jM6tikbAUKAGLonuRKOJ2ZvBnZCEOJAbzuTLw4kKcuA5plNt8juzdU6O/py/EgAehzvLh0VXEdBbQ==",
 			"dev": true
 		},
 		"core-js-compat": {
-			"version": "3.15.2",
-			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.15.2.tgz",
-			"integrity": "sha512-Wp+BJVvwopjI+A1EFqm2dwUmWYXrvucmtIB2LgXn/Rb+gWPKYxtmb4GKHGKG/KGF1eK9jfjzT38DITbTOCX/SQ==",
+			"version": "3.17.0",
+			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.17.0.tgz",
+			"integrity": "sha512-haEcBrfU3hu83JXWpcLHzeg8Ypf05LGK4GIjzLiYgFJYXuxrkdN2MrDBeHt/t5/ZFmIzLcdsT2x8Xw654wXsuw==",
 			"dev": true,
 			"requires": {
-				"browserslist": "^4.16.6",
+				"browserslist": "^4.16.8",
 				"semver": "7.0.0"
 			},
 			"dependencies": {
+				"browserslist": {
+					"version": "4.16.8",
+					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.8.tgz",
+					"integrity": "sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ==",
+					"dev": true,
+					"requires": {
+						"caniuse-lite": "^1.0.30001251",
+						"colorette": "^1.3.0",
+						"electron-to-chromium": "^1.3.811",
+						"escalade": "^3.1.1",
+						"node-releases": "^1.1.75"
+					}
+				},
+				"caniuse-lite": {
+					"version": "1.0.30001252",
+					"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001252.tgz",
+					"integrity": "sha512-I56jhWDGMtdILQORdusxBOH+Nl/KgQSdDmpJezYddnAkVOmnoU8zwjTV9xAjMIYxr0iPreEAVylCGcmHCjfaOw==",
+					"dev": true
+				},
+				"colorette": {
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz",
+					"integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==",
+					"dev": true
+				},
+				"electron-to-chromium": {
+					"version": "1.3.826",
+					"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.826.tgz",
+					"integrity": "sha512-bpLc4QU4B8PYmdO4MSu2ZBTMD8lAaEXRS43C09lB31BvYwuk9UxgBRXbY5OJBw7VuMGcg2MZG5FyTaP9u4PQnw==",
+					"dev": true
+				},
+				"node-releases": {
+					"version": "1.1.75",
+					"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz",
+					"integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==",
+					"dev": true
+				},
 				"semver": {
 					"version": "7.0.0",
 					"resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
@@ -8256,9 +8327,9 @@
 			}
 		},
 		"core-js-pure": {
-			"version": "3.15.2",
-			"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.15.2.tgz",
-			"integrity": "sha512-D42L7RYh1J2grW8ttxoY1+17Y4wXZeKe7uyplAI3FkNQyI5OgBIAjUfFiTPfL1rs0qLpxaabITNbjKl1Sp82tA==",
+			"version": "3.17.0",
+			"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.17.0.tgz",
+			"integrity": "sha512-O5RvMRWW+I0hfR227mrIwU+gPLVaa4kPEq+9b8FcjuFed4QckOvYc94c2KSI/X5dlvcsj/V1Sp5F5cecYpNQOQ==",
 			"dev": true
 		},
 		"core-js-url-browser": {
@@ -8449,15 +8520,15 @@
 			},
 			"dependencies": {
 				"@types/json-schema": {
-					"version": "7.0.8",
-					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
-					"integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==",
+					"version": "7.0.9",
+					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+					"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
 					"dev": true
 				},
 				"colorette": {
-					"version": "1.2.2",
-					"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-					"integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz",
+					"integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==",
 					"dev": true
 				},
 				"json5": {
@@ -8481,9 +8552,9 @@
 					}
 				},
 				"postcss": {
-					"version": "8.3.5",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz",
-					"integrity": "sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA==",
+					"version": "8.3.6",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz",
+					"integrity": "sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==",
 					"dev": true,
 					"requires": {
 						"colorette": "^1.2.2",
@@ -8498,12 +8569,12 @@
 					"dev": true
 				},
 				"schema-utils": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz",
-					"integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==",
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+					"integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
 					"dev": true,
 					"requires": {
-						"@types/json-schema": "^7.0.7",
+						"@types/json-schema": "^7.0.8",
 						"ajv": "^6.12.5",
 						"ajv-keywords": "^3.5.2"
 					}
@@ -9390,9 +9461,9 @@
 			}
 		},
 		"domhandler": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz",
-			"integrity": "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==",
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz",
+			"integrity": "sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==",
 			"dev": true,
 			"requires": {
 				"domelementtype": "^2.2.0"
@@ -9491,20 +9562,34 @@
 			}
 		},
 		"downshift": {
-			"version": "6.1.3",
-			"resolved": "https://registry.npmjs.org/downshift/-/downshift-6.1.3.tgz",
-			"integrity": "sha512-RA1MuaNcTbt0j+sVLhSs8R2oZbBXYAtdQP/V+uHhT3DoDteZzJPjlC+LQVm9T07Wpvo84QXaZtUCePLDTDwGXg==",
+			"version": "6.1.7",
+			"resolved": "https://registry.npmjs.org/downshift/-/downshift-6.1.7.tgz",
+			"integrity": "sha512-cVprZg/9Lvj/uhYRxELzlu1aezRcgPWBjTvspiGTVEU64gF5pRdSRKFVLcxqsZC637cLAGMbL40JavEfWnqgNg==",
 			"requires": {
-				"@babel/runtime": "^7.13.10",
+				"@babel/runtime": "^7.14.8",
 				"compute-scroll-into-view": "^1.0.17",
 				"prop-types": "^15.7.2",
-				"react-is": "^17.0.2"
+				"react-is": "^17.0.2",
+				"tslib": "^2.3.0"
 			},
 			"dependencies": {
+				"@babel/runtime": {
+					"version": "7.15.3",
+					"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz",
+					"integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==",
+					"requires": {
+						"regenerator-runtime": "^0.13.4"
+					}
+				},
 				"react-is": {
 					"version": "17.0.2",
 					"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
 					"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+				},
+				"tslib": {
+					"version": "2.3.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+					"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
 				}
 			}
 		},
@@ -9745,54 +9830,6 @@
 				"string.prototype.trim": "^1.2.1"
 			}
 		},
-		"enzyme-adapter-react-16": {
-			"version": "1.15.6",
-			"resolved": "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.6.tgz",
-			"integrity": "sha512-yFlVJCXh8T+mcQo8M6my9sPgeGzj85HSHi6Apgf1Cvq/7EL/J9+1JoJmJsRxZgyTvPMAqOEpRSu/Ii/ZpyOk0g==",
-			"dev": true,
-			"requires": {
-				"enzyme-adapter-utils": "^1.14.0",
-				"enzyme-shallow-equal": "^1.0.4",
-				"has": "^1.0.3",
-				"object.assign": "^4.1.2",
-				"object.values": "^1.1.2",
-				"prop-types": "^15.7.2",
-				"react-is": "^16.13.1",
-				"react-test-renderer": "^16.0.0-0",
-				"semver": "^5.7.0"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-					"dev": true
-				}
-			}
-		},
-		"enzyme-adapter-utils": {
-			"version": "1.14.0",
-			"resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.0.tgz",
-			"integrity": "sha512-F/z/7SeLt+reKFcb7597IThpDp0bmzcH1E9Oabqv+o01cID2/YInlqHbFl7HzWBl4h3OdZYedtwNDOmSKkk0bg==",
-			"dev": true,
-			"requires": {
-				"airbnb-prop-types": "^2.16.0",
-				"function.prototype.name": "^1.1.3",
-				"has": "^1.0.3",
-				"object.assign": "^4.1.2",
-				"object.fromentries": "^2.0.3",
-				"prop-types": "^15.7.2",
-				"semver": "^5.7.1"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-					"dev": true
-				}
-			}
-		},
 		"enzyme-shallow-equal": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz",
@@ -9962,13 +9999,13 @@
 			}
 		},
 		"eslint": {
-			"version": "7.30.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.30.0.tgz",
-			"integrity": "sha512-VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg==",
+			"version": "7.32.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+			"integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
 			"dev": true,
 			"requires": {
 				"@babel/code-frame": "7.12.11",
-				"@eslint/eslintrc": "^0.4.2",
+				"@eslint/eslintrc": "^0.4.3",
 				"@humanwhocodes/config-array": "^0.5.0",
 				"ajv": "^6.10.0",
 				"chalk": "^4.0.0",
@@ -10078,9 +10115,9 @@
 					}
 				},
 				"globals": {
-					"version": "13.10.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz",
-					"integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==",
+					"version": "13.11.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
+					"integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
 					"dev": true,
 					"requires": {
 						"type-fest": "^0.20.2"
@@ -10137,36 +10174,40 @@
 			"dev": true
 		},
 		"eslint-import-resolver-node": {
-			"version": "0.3.4",
-			"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
-			"integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
+			"version": "0.3.6",
+			"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+			"integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
 			"dev": true,
 			"requires": {
-				"debug": "^2.6.9",
-				"resolve": "^1.13.1"
+				"debug": "^3.2.7",
+				"resolve": "^1.20.0"
 			},
 			"dependencies": {
 				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"version": "3.2.7",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+					"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"resolve": {
+					"version": "1.20.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+					"integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
 					"dev": true,
 					"requires": {
-						"ms": "2.0.0"
+						"is-core-module": "^2.2.0",
+						"path-parse": "^1.0.6"
 					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
 				}
 			}
 		},
 		"eslint-module-utils": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz",
-			"integrity": "sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==",
+			"version": "2.6.2",
+			"resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz",
+			"integrity": "sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q==",
 			"dev": true,
 			"requires": {
 				"debug": "^3.2.7",
@@ -10237,26 +10278,26 @@
 			}
 		},
 		"eslint-plugin-import": {
-			"version": "2.23.4",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz",
-			"integrity": "sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ==",
+			"version": "2.24.2",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz",
+			"integrity": "sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==",
 			"dev": true,
 			"requires": {
 				"array-includes": "^3.1.3",
 				"array.prototype.flat": "^1.2.4",
 				"debug": "^2.6.9",
 				"doctrine": "^2.1.0",
-				"eslint-import-resolver-node": "^0.3.4",
-				"eslint-module-utils": "^2.6.1",
+				"eslint-import-resolver-node": "^0.3.6",
+				"eslint-module-utils": "^2.6.2",
 				"find-up": "^2.0.0",
 				"has": "^1.0.3",
-				"is-core-module": "^2.4.0",
+				"is-core-module": "^2.6.0",
 				"minimatch": "^3.0.4",
-				"object.values": "^1.1.3",
+				"object.values": "^1.1.4",
 				"pkg-up": "^2.0.0",
 				"read-pkg-up": "^3.0.0",
 				"resolve": "^1.20.0",
-				"tsconfig-paths": "^3.9.0"
+				"tsconfig-paths": "^3.11.0"
 			},
 			"dependencies": {
 				"call-bind": {
@@ -10279,9 +10320,9 @@
 					}
 				},
 				"es-abstract": {
-					"version": "1.18.3",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
-					"integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
+					"version": "1.18.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
+					"integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
 					"dev": true,
 					"requires": {
 						"call-bind": "^1.0.2",
@@ -10290,11 +10331,12 @@
 						"get-intrinsic": "^1.1.1",
 						"has": "^1.0.3",
 						"has-symbols": "^1.0.2",
+						"internal-slot": "^1.0.3",
 						"is-callable": "^1.2.3",
 						"is-negative-zero": "^2.0.1",
 						"is-regex": "^1.1.3",
 						"is-string": "^1.0.6",
-						"object-inspect": "^1.10.3",
+						"object-inspect": "^1.11.0",
 						"object-keys": "^1.1.1",
 						"object.assign": "^4.1.2",
 						"string.prototype.trimend": "^1.0.4",
@@ -10331,28 +10373,28 @@
 					"dev": true
 				},
 				"is-callable": {
-					"version": "1.2.3",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-					"integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+					"version": "1.2.4",
+					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+					"integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
 					"dev": true
 				},
 				"is-core-module": {
-					"version": "2.5.0",
-					"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz",
-					"integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==",
+					"version": "2.6.0",
+					"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz",
+					"integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==",
 					"dev": true,
 					"requires": {
 						"has": "^1.0.3"
 					}
 				},
 				"is-regex": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-					"integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
 					"dev": true,
 					"requires": {
 						"call-bind": "^1.0.2",
-						"has-symbols": "^1.0.2"
+						"has-tostringtag": "^1.0.0"
 					}
 				},
 				"locate-path": {
@@ -10455,26 +10497,28 @@
 			}
 		},
 		"eslint-plugin-jest": {
-			"version": "24.3.6",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.3.6.tgz",
-			"integrity": "sha512-WOVH4TIaBLIeCX576rLcOgjNXqP+jNlCiEmRgFTfQtJ52DpwnIQKAVGlGPAN7CZ33bW6eNfHD6s8ZbEUTQubJg==",
+			"version": "24.4.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.4.0.tgz",
+			"integrity": "sha512-8qnt/hgtZ94E9dA6viqfViKBfkJwFHXgJmTWlMGDgunw1XJEGqm3eiPjDsTanM3/u/3Az82nyQM9GX7PM/QGmg==",
 			"dev": true,
 			"requires": {
 				"@typescript-eslint/experimental-utils": "^4.0.1"
 			}
 		},
 		"eslint-plugin-jsdoc": {
-			"version": "30.7.13",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.13.tgz",
-			"integrity": "sha512-YM4WIsmurrp0rHX6XiXQppqKB8Ne5ATiZLJe2+/fkp9l9ExXFr43BbAbjZaVrpCT+tuPYOZ8k1MICARHnURUNQ==",
+			"version": "34.8.2",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-34.8.2.tgz",
+			"integrity": "sha512-UOU9A40Cl806JMtla2vF+RM6sNqfLPbhLv9FZqhcC7+LmChD3DVaWqM7ADxpF0kMyZNWe1QKUnqGnXaA3NTn+w==",
 			"dev": true,
 			"requires": {
-				"comment-parser": "^0.7.6",
+				"@es-joy/jsdoccomment": "^0.6.0",
+				"comment-parser": "1.1.5",
 				"debug": "^4.3.1",
+				"esquery": "^1.4.0",
 				"jsdoctypeparser": "^9.0.0",
-				"lodash": "^4.17.20",
+				"lodash": "^4.17.21",
 				"regextras": "^0.7.1",
-				"semver": "^7.3.4",
+				"semver": "^7.3.5",
 				"spdx-expression-parse": "^3.0.1"
 			},
 			"dependencies": {
@@ -10492,6 +10536,15 @@
 					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
 					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
 					"dev": true
+				},
+				"semver": {
+					"version": "7.3.5",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+					"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "^6.0.0"
+					}
 				}
 			}
 		},
@@ -10534,23 +10587,24 @@
 			}
 		},
 		"eslint-plugin-prettier": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz",
-			"integrity": "sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw==",
+			"version": "3.4.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz",
+			"integrity": "sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==",
 			"dev": true,
 			"requires": {
 				"prettier-linter-helpers": "^1.0.0"
 			}
 		},
 		"eslint-plugin-react": {
-			"version": "7.24.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz",
-			"integrity": "sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q==",
+			"version": "7.25.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.25.1.tgz",
+			"integrity": "sha512-P4j9K1dHoFXxDNP05AtixcJEvIT6ht8FhYKsrkY0MPCPaUMYijhpWwNiRDZVtA8KFuZOkGSeft6QwH8KuVpJug==",
 			"dev": true,
 			"requires": {
 				"array-includes": "^3.1.3",
 				"array.prototype.flatmap": "^1.2.4",
 				"doctrine": "^2.1.0",
+				"estraverse": "^5.2.0",
 				"has": "^1.0.3",
 				"jsx-ast-utils": "^2.4.1 || ^3.0.0",
 				"minimatch": "^3.0.4",
@@ -10573,9 +10627,9 @@
 					}
 				},
 				"es-abstract": {
-					"version": "1.18.3",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
-					"integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
+					"version": "1.18.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
+					"integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
 					"dev": true,
 					"requires": {
 						"call-bind": "^1.0.2",
@@ -10584,11 +10638,12 @@
 						"get-intrinsic": "^1.1.1",
 						"has": "^1.0.3",
 						"has-symbols": "^1.0.2",
+						"internal-slot": "^1.0.3",
 						"is-callable": "^1.2.3",
 						"is-negative-zero": "^2.0.1",
 						"is-regex": "^1.1.3",
 						"is-string": "^1.0.6",
-						"object-inspect": "^1.10.3",
+						"object-inspect": "^1.11.0",
 						"object-keys": "^1.1.1",
 						"object.assign": "^4.1.2",
 						"string.prototype.trimend": "^1.0.4",
@@ -10609,6 +10664,12 @@
 						}
 					}
 				},
+				"estraverse": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+					"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+					"dev": true
+				},
 				"has-symbols": {
 					"version": "1.0.2",
 					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
@@ -10616,19 +10677,19 @@
 					"dev": true
 				},
 				"is-callable": {
-					"version": "1.2.3",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-					"integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+					"version": "1.2.4",
+					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+					"integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
 					"dev": true
 				},
 				"is-regex": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-					"integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
 					"dev": true,
 					"requires": {
 						"call-bind": "^1.0.2",
-						"has-symbols": "^1.0.2"
+						"has-tostringtag": "^1.0.0"
 					}
 				},
 				"object-inspect": {
@@ -11427,9 +11488,9 @@
 			"integrity": "sha512-Pb8d48e+oIuY4MaM64Cd7OW1gt4nxCHs7/ddPPZ/Ic3sg8yVGM7O9wDvZ7us6ScaUupzM+pfBolwtYhN1IxBIw=="
 		},
 		"fastq": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.1.tgz",
-			"integrity": "sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==",
+			"version": "1.12.0",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.12.0.tgz",
+			"integrity": "sha512-VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg==",
 			"dev": true,
 			"requires": {
 				"reusify": "^1.0.4"
@@ -11503,9 +11564,9 @@
 			},
 			"dependencies": {
 				"@types/json-schema": {
-					"version": "7.0.8",
-					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
-					"integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==",
+					"version": "7.0.9",
+					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+					"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
 					"dev": true
 				},
 				"json5": {
@@ -11529,12 +11590,12 @@
 					}
 				},
 				"schema-utils": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz",
-					"integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==",
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+					"integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
 					"dev": true,
 					"requires": {
-						"@types/json-schema": "^7.0.7",
+						"@types/json-schema": "^7.0.8",
 						"ajv": "^6.12.5",
 						"ajv-keywords": "^3.5.2"
 					}
@@ -11834,9 +11895,9 @@
 			}
 		},
 		"flatted": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.1.tgz",
-			"integrity": "sha512-OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg==",
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
+			"integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
 			"dev": true
 		},
 		"flush-write-stream": {
@@ -11930,9 +11991,9 @@
 			},
 			"dependencies": {
 				"tslib": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-					"integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+					"version": "2.3.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+					"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
 				}
 			}
 		},
@@ -11945,9 +12006,9 @@
 			},
 			"dependencies": {
 				"tslib": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-					"integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+					"version": "2.3.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+					"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
 				}
 			}
 		},
@@ -12064,9 +12125,9 @@
 					}
 				},
 				"es-abstract": {
-					"version": "1.18.3",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
-					"integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
+					"version": "1.18.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
+					"integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
 					"requires": {
 						"call-bind": "^1.0.2",
 						"es-to-primitive": "^1.2.1",
@@ -12074,11 +12135,12 @@
 						"get-intrinsic": "^1.1.1",
 						"has": "^1.0.3",
 						"has-symbols": "^1.0.2",
+						"internal-slot": "^1.0.3",
 						"is-callable": "^1.2.3",
 						"is-negative-zero": "^2.0.1",
 						"is-regex": "^1.1.3",
 						"is-string": "^1.0.6",
-						"object-inspect": "^1.10.3",
+						"object-inspect": "^1.11.0",
 						"object-keys": "^1.1.1",
 						"object.assign": "^4.1.2",
 						"string.prototype.trimend": "^1.0.4",
@@ -12104,17 +12166,17 @@
 					"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
 				},
 				"is-callable": {
-					"version": "1.2.3",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-					"integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="
+					"version": "1.2.4",
+					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+					"integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
 				},
 				"is-regex": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-					"integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
 					"requires": {
 						"call-bind": "^1.0.2",
-						"has-symbols": "^1.0.2"
+						"has-tostringtag": "^1.0.0"
 					}
 				},
 				"object-inspect": {
@@ -13343,6 +13405,21 @@
 				"has-symbol-support-x": "^1.4.1"
 			}
 		},
+		"has-tostringtag": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+			"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+			"requires": {
+				"has-symbols": "^1.0.2"
+			},
+			"dependencies": {
+				"has-symbols": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+					"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
+				}
+			}
+		},
 		"has-value": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -13590,9 +13667,9 @@
 					"dev": true
 				},
 				"domutils": {
-					"version": "2.7.0",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz",
-					"integrity": "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==",
+					"version": "2.8.0",
+					"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+					"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
 					"dev": true,
 					"requires": {
 						"dom-serializer": "^1.0.1",
@@ -14179,7 +14256,6 @@
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
 			"integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-			"dev": true,
 			"requires": {
 				"get-intrinsic": "^1.1.0",
 				"has": "^1.0.3",
@@ -14190,7 +14266,6 @@
 					"version": "1.1.1",
 					"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
 					"integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-					"dev": true,
 					"requires": {
 						"function-bind": "^1.1.1",
 						"has": "^1.0.3",
@@ -14295,9 +14370,12 @@
 			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
 		},
 		"is-bigint": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
-			"integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA=="
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+			"integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+			"requires": {
+				"has-bigints": "^1.0.1"
+			}
 		},
 		"is-binary-path": {
 			"version": "2.1.0",
@@ -14308,11 +14386,12 @@
 			}
 		},
 		"is-boolean-object": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
-			"integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+			"integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
 			"requires": {
-				"call-bind": "^1.0.2"
+				"call-bind": "^1.0.2",
+				"has-tostringtag": "^1.0.0"
 			},
 			"dependencies": {
 				"call-bind": {
@@ -14501,9 +14580,12 @@
 			}
 		},
 		"is-number-object": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
-			"integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw=="
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
+			"integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
+			"requires": {
+				"has-tostringtag": "^1.0.0"
+			}
 		},
 		"is-obj": {
 			"version": "2.0.0",
@@ -14618,9 +14700,12 @@
 			"dev": true
 		},
 		"is-string": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
-			"integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w=="
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+			"integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+			"requires": {
+				"has-tostringtag": "^1.0.0"
+			}
 		},
 		"is-subset": {
 			"version": "0.1.1",
@@ -15074,9 +15159,9 @@
 					}
 				},
 				"is-stream": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-					"integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+					"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
 					"dev": true
 				},
 				"npm-run-path": {
@@ -16210,9 +16295,9 @@
 			"dev": true
 		},
 		"jsdom": {
-			"version": "16.6.0",
-			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.6.0.tgz",
-			"integrity": "sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg==",
+			"version": "16.7.0",
+			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+			"integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
 			"dev": true,
 			"requires": {
 				"abab": "^2.0.5",
@@ -16240,7 +16325,7 @@
 				"whatwg-encoding": "^1.0.5",
 				"whatwg-mimetype": "^2.3.0",
 				"whatwg-url": "^8.5.0",
-				"ws": "^7.4.5",
+				"ws": "^7.4.6",
 				"xml-name-validator": "^3.0.0"
 			},
 			"dependencies": {
@@ -17815,9 +17900,9 @@
 			},
 			"dependencies": {
 				"@types/json-schema": {
-					"version": "7.0.8",
-					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
-					"integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==",
+					"version": "7.0.9",
+					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+					"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
 					"dev": true
 				},
 				"json5": {
@@ -17841,12 +17926,12 @@
 					}
 				},
 				"schema-utils": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz",
-					"integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==",
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+					"integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
 					"dev": true,
 					"requires": {
-						"@types/json-schema": "^7.0.7",
+						"@types/json-schema": "^7.0.8",
 						"ajv": "^6.12.5",
 						"ajv-keywords": "^3.5.2"
 					}
@@ -18108,9 +18193,9 @@
 			"optional": true
 		},
 		"nanoid": {
-			"version": "3.1.23",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz",
-			"integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==",
+			"version": "3.1.25",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
+			"integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==",
 			"dev": true
 		},
 		"nanomatch": {
@@ -18410,28 +18495,37 @@
 			}
 		},
 		"npm-package-json-lint": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/npm-package-json-lint/-/npm-package-json-lint-5.1.0.tgz",
-			"integrity": "sha512-gPGpoFTbt0H4uPlubAKqHORg4+GObXqeYJh5ovkkSv76ua+t29vzRP4Qhm+9N/Q59Z3LT0tCmpoDlbTcNB7Jcg==",
+			"version": "5.2.3",
+			"resolved": "https://registry.npmjs.org/npm-package-json-lint/-/npm-package-json-lint-5.2.3.tgz",
+			"integrity": "sha512-rSgc4eVhtfwrU7AWwovqFWy8OEkgQL99vD3vWJmqtU9gxxJxKzi6Wqgo3gF7lhrBpyVcnlKxy/L2JCsvjWruDA==",
 			"dev": true,
 			"requires": {
-				"ajv": "^6.12.2",
+				"ajv": "^6.12.6",
 				"ajv-errors": "^1.0.1",
-				"chalk": "^4.0.0",
+				"chalk": "^4.1.2",
 				"cosmiconfig": "^6.0.0",
-				"debug": "^4.1.1",
-				"globby": "^11.0.0",
-				"ignore": "^5.1.4",
-				"is-plain-obj": "^2.1.0",
-				"jsonc-parser": "^2.2.1",
-				"log-symbols": "^4.0.0",
-				"meow": "^6.1.0",
+				"debug": "^4.3.2",
+				"globby": "^11.0.4",
+				"ignore": "^5.1.8",
+				"is-plain-obj": "^3.0.0",
+				"jsonc-parser": "^2.3.1",
+				"log-symbols": "^4.1.0",
+				"meow": "^6.1.1",
 				"plur": "^4.0.0",
-				"semver": "^7.3.2",
+				"semver": "^7.3.5",
 				"slash": "^3.0.0",
-				"strip-json-comments": "^3.1.0"
+				"strip-json-comments": "^3.1.1"
 			},
 			"dependencies": {
+				"ansi-styles": {
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+					"dev": true,
+					"requires": {
+						"color-convert": "^2.0.1"
+					}
+				},
 				"array-union": {
 					"version": "2.1.0",
 					"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
@@ -18449,6 +18543,40 @@
 						"quick-lru": "^4.0.1"
 					}
 				},
+				"chalk": {
+					"version": "4.1.2",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^4.1.0",
+						"supports-color": "^7.1.0"
+					}
+				},
+				"color-convert": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+					"dev": true,
+					"requires": {
+						"color-name": "~1.1.4"
+					}
+				},
+				"color-name": {
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+					"dev": true
+				},
+				"debug": {
+					"version": "4.3.2",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+					"integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+					"dev": true,
+					"requires": {
+						"ms": "2.1.2"
+					}
+				},
 				"find-up": {
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -18473,6 +18601,12 @@
 						"slash": "^3.0.0"
 					}
 				},
+				"has-flag": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+					"dev": true
+				},
 				"indent-string": {
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
@@ -18480,9 +18614,15 @@
 					"dev": true
 				},
 				"is-plain-obj": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-					"integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+					"integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
+					"dev": true
+				},
+				"jsonc-parser": {
+					"version": "2.3.1",
+					"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz",
+					"integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==",
 					"dev": true
 				},
 				"locate-path": {
@@ -18519,6 +18659,12 @@
 						"yargs-parser": "^18.1.3"
 					}
 				},
+				"ms": {
+					"version": "2.1.2",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+					"dev": true
+				},
 				"p-locate": {
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
@@ -18583,6 +18729,15 @@
 						"strip-indent": "^3.0.0"
 					}
 				},
+				"semver": {
+					"version": "7.3.5",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+					"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "^6.0.0"
+					}
+				},
 				"strip-indent": {
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
@@ -18592,6 +18747,15 @@
 						"min-indent": "^1.0.0"
 					}
 				},
+				"supports-color": {
+					"version": "7.2.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^4.0.0"
+					}
+				},
 				"trim-newlines": {
 					"version": "3.0.1",
 					"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
@@ -18773,9 +18937,9 @@
 					}
 				},
 				"es-abstract": {
-					"version": "1.18.3",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
-					"integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
+					"version": "1.18.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
+					"integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
 					"requires": {
 						"call-bind": "^1.0.2",
 						"es-to-primitive": "^1.2.1",
@@ -18783,11 +18947,12 @@
 						"get-intrinsic": "^1.1.1",
 						"has": "^1.0.3",
 						"has-symbols": "^1.0.2",
+						"internal-slot": "^1.0.3",
 						"is-callable": "^1.2.3",
 						"is-negative-zero": "^2.0.1",
 						"is-regex": "^1.1.3",
 						"is-string": "^1.0.6",
-						"object-inspect": "^1.10.3",
+						"object-inspect": "^1.11.0",
 						"object-keys": "^1.1.1",
 						"object.assign": "^4.1.2",
 						"string.prototype.trimend": "^1.0.4",
@@ -18813,17 +18978,17 @@
 					"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
 				},
 				"is-callable": {
-					"version": "1.2.3",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-					"integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="
+					"version": "1.2.4",
+					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+					"integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
 				},
 				"is-regex": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-					"integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
 					"requires": {
 						"call-bind": "^1.0.2",
-						"has-symbols": "^1.0.2"
+						"has-tostringtag": "^1.0.0"
 					}
 				},
 				"object-inspect": {
@@ -18874,9 +19039,9 @@
 					}
 				},
 				"es-abstract": {
-					"version": "1.18.3",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
-					"integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
+					"version": "1.18.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
+					"integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
 					"dev": true,
 					"requires": {
 						"call-bind": "^1.0.2",
@@ -18885,11 +19050,12 @@
 						"get-intrinsic": "^1.1.1",
 						"has": "^1.0.3",
 						"has-symbols": "^1.0.2",
+						"internal-slot": "^1.0.3",
 						"is-callable": "^1.2.3",
 						"is-negative-zero": "^2.0.1",
 						"is-regex": "^1.1.3",
 						"is-string": "^1.0.6",
-						"object-inspect": "^1.10.3",
+						"object-inspect": "^1.11.0",
 						"object-keys": "^1.1.1",
 						"object.assign": "^4.1.2",
 						"string.prototype.trimend": "^1.0.4",
@@ -18917,19 +19083,19 @@
 					"dev": true
 				},
 				"is-callable": {
-					"version": "1.2.3",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-					"integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+					"version": "1.2.4",
+					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+					"integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
 					"dev": true
 				},
 				"is-regex": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-					"integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
 					"dev": true,
 					"requires": {
 						"call-bind": "^1.0.2",
-						"has-symbols": "^1.0.2"
+						"has-tostringtag": "^1.0.0"
 					}
 				},
 				"object-inspect": {
@@ -19732,9 +19898,9 @@
 			},
 			"dependencies": {
 				"tslib": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-					"integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+					"version": "2.3.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+					"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
 				}
 			}
 		},
@@ -19968,15 +20134,15 @@
 			},
 			"dependencies": {
 				"@types/json-schema": {
-					"version": "7.0.8",
-					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
-					"integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==",
+					"version": "7.0.9",
+					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+					"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
 					"dev": true
 				},
 				"cosmiconfig": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
-					"integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
+					"version": "7.0.1",
+					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
+					"integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
 					"dev": true,
 					"requires": {
 						"@types/parse-json": "^4.0.0",
@@ -20007,12 +20173,12 @@
 					}
 				},
 				"schema-utils": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz",
-					"integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==",
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+					"integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
 					"dev": true,
 					"requires": {
-						"@types/json-schema": "^7.0.7",
+						"@types/json-schema": "^7.0.8",
 						"ajv": "^6.12.5",
 						"ajv-keywords": "^3.5.2"
 					}
@@ -21014,6 +21180,16 @@
 			"resolved": "https://registry.npmjs.org/react-resize-aware/-/react-resize-aware-3.1.0.tgz",
 			"integrity": "sha512-bIhHlxVTX7xKUz14ksXMEHjzCZPTpQZKZISY3nbTD273pDKPABGFNFBP6Tr42KECxzC5YQiKpMchjTVJCqaxpA=="
 		},
+		"react-shallow-renderer": {
+			"version": "16.14.1",
+			"resolved": "https://registry.npmjs.org/react-shallow-renderer/-/react-shallow-renderer-16.14.1.tgz",
+			"integrity": "sha512-rkIMcQi01/+kxiTE9D3fdS959U1g7gs+/rborw++42m1O9FAQiNI/UNRZExVUoAOprn4umcXf+pFRou8i4zuBg==",
+			"dev": true,
+			"requires": {
+				"object-assign": "^4.1.1",
+				"react-is": "^16.12.0 || ^17.0.0"
+			}
+		},
 		"react-spring": {
 			"version": "8.0.27",
 			"resolved": "https://registry.npmjs.org/react-spring/-/react-spring-8.0.27.tgz",
@@ -21024,15 +21200,33 @@
 			}
 		},
 		"react-test-renderer": {
-			"version": "16.14.0",
-			"resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.14.0.tgz",
-			"integrity": "sha512-L8yPjqPE5CZO6rKsKXRO/rVPiaCOy0tQQJbC+UjPNlobl5mad59lvPjwFsQHTvL03caVDIVr9x9/OSgDe6I5Eg==",
+			"version": "17.0.2",
+			"resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-17.0.2.tgz",
+			"integrity": "sha512-yaQ9cB89c17PUb0x6UfWRs7kQCorVdHlutU1boVPEsB8IDZH6n9tHxMacc3y0JoXOJUsZb/t/Mb8FUWMKaM7iQ==",
 			"dev": true,
 			"requires": {
 				"object-assign": "^4.1.1",
-				"prop-types": "^15.6.2",
-				"react-is": "^16.8.6",
-				"scheduler": "^0.19.1"
+				"react-is": "^17.0.2",
+				"react-shallow-renderer": "^16.13.1",
+				"scheduler": "^0.20.2"
+			},
+			"dependencies": {
+				"react-is": {
+					"version": "17.0.2",
+					"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+					"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+					"dev": true
+				},
+				"scheduler": {
+					"version": "0.20.2",
+					"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
+					"integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
+					"dev": true,
+					"requires": {
+						"loose-envify": "^1.1.0",
+						"object-assign": "^4.1.1"
+					}
+				}
 			}
 		},
 		"react-use-gesture": {
@@ -21267,9 +21461,9 @@
 			}
 		},
 		"redux": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/redux/-/redux-4.1.0.tgz",
-			"integrity": "sha512-uI2dQN43zqLWCt6B/BMGRMY6db7TTY4qeHHfGeKb3EOhmOKjU3KdWvNLJyqaHRksv/ErdNH7cFZWg9jXtewy4g==",
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/redux/-/redux-4.1.1.tgz",
+			"integrity": "sha512-hZQZdDEM25UY2P493kPYuKqviVwZ58lEmGQNeQ+gXa+U0gYPUBf7NKYazbe3m+bs/DzM/ahN12DbF+NG8i0CWw==",
 			"requires": {
 				"@babel/runtime": "^7.9.2"
 			}
@@ -21415,9 +21609,9 @@
 					}
 				},
 				"unified": {
-					"version": "9.2.1",
-					"resolved": "https://registry.npmjs.org/unified/-/unified-9.2.1.tgz",
-					"integrity": "sha512-juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA==",
+					"version": "9.2.2",
+					"resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz",
+					"integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==",
 					"dev": true,
 					"requires": {
 						"bail": "^1.0.0",
@@ -22059,9 +22253,9 @@
 			},
 			"dependencies": {
 				"@types/json-schema": {
-					"version": "7.0.8",
-					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
-					"integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==",
+					"version": "7.0.9",
+					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+					"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
 					"dev": true
 				},
 				"json5": {
@@ -22085,12 +22279,12 @@
 					}
 				},
 				"schema-utils": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz",
-					"integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==",
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+					"integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
 					"dev": true,
 					"requires": {
-						"@types/json-schema": "^7.0.7",
+						"@types/json-schema": "^7.0.8",
 						"ajv": "^6.12.5",
 						"ajv-keywords": "^3.5.2"
 					}
@@ -22448,7 +22642,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
 			"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.0",
 				"get-intrinsic": "^1.0.2",
@@ -22545,12 +22738,12 @@
 			"dev": true
 		},
 		"sirv": {
-			"version": "1.0.12",
-			"resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.12.tgz",
-			"integrity": "sha512-+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg==",
+			"version": "1.0.17",
+			"resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.17.tgz",
+			"integrity": "sha512-qx9go5yraB7ekT7bCMqUHJ5jEaOC/GXBxUWv+jeWnb7WzHUFdcQPGWk7YmAwFBaQBrogpuSqd/azbC2lZRqqmw==",
 			"dev": true,
 			"requires": {
-				"@polka/url": "^1.0.0-next.15",
+				"@polka/url": "^1.0.0-next.20",
 				"mime": "^2.3.1",
 				"totalist": "^1.0.0"
 			}
@@ -23387,9 +23580,9 @@
 					}
 				},
 				"es-abstract": {
-					"version": "1.18.3",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
-					"integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
+					"version": "1.18.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
+					"integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
 					"dev": true,
 					"requires": {
 						"call-bind": "^1.0.2",
@@ -23398,11 +23591,12 @@
 						"get-intrinsic": "^1.1.1",
 						"has": "^1.0.3",
 						"has-symbols": "^1.0.2",
+						"internal-slot": "^1.0.3",
 						"is-callable": "^1.2.3",
 						"is-negative-zero": "^2.0.1",
 						"is-regex": "^1.1.3",
 						"is-string": "^1.0.6",
-						"object-inspect": "^1.10.3",
+						"object-inspect": "^1.11.0",
 						"object-keys": "^1.1.1",
 						"object.assign": "^4.1.2",
 						"string.prototype.trimend": "^1.0.4",
@@ -23428,19 +23622,19 @@
 					"dev": true
 				},
 				"is-callable": {
-					"version": "1.2.3",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-					"integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+					"version": "1.2.4",
+					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+					"integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
 					"dev": true
 				},
 				"is-regex": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-					"integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
 					"dev": true,
 					"requires": {
 						"call-bind": "^1.0.2",
-						"has-symbols": "^1.0.2"
+						"has-tostringtag": "^1.0.0"
 					}
 				},
 				"object-inspect": {
@@ -23503,9 +23697,9 @@
 					}
 				},
 				"es-abstract": {
-					"version": "1.18.3",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
-					"integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
+					"version": "1.18.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
+					"integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
 					"dev": true,
 					"requires": {
 						"call-bind": "^1.0.2",
@@ -23514,11 +23708,12 @@
 						"get-intrinsic": "^1.1.1",
 						"has": "^1.0.3",
 						"has-symbols": "^1.0.2",
+						"internal-slot": "^1.0.3",
 						"is-callable": "^1.2.3",
 						"is-negative-zero": "^2.0.1",
 						"is-regex": "^1.1.3",
 						"is-string": "^1.0.6",
-						"object-inspect": "^1.10.3",
+						"object-inspect": "^1.11.0",
 						"object-keys": "^1.1.1",
 						"object.assign": "^4.1.2",
 						"string.prototype.trimend": "^1.0.4",
@@ -23546,19 +23741,19 @@
 					"dev": true
 				},
 				"is-callable": {
-					"version": "1.2.3",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-					"integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+					"version": "1.2.4",
+					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+					"integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
 					"dev": true
 				},
 				"is-regex": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-					"integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
 					"dev": true,
 					"requires": {
 						"call-bind": "^1.0.2",
-						"has-symbols": "^1.0.2"
+						"has-tostringtag": "^1.0.0"
 					}
 				},
 				"object-inspect": {
@@ -23708,9 +23903,9 @@
 			},
 			"dependencies": {
 				"tslib": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-					"integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+					"version": "2.3.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+					"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
 				}
 			}
 		},
@@ -23833,9 +24028,9 @@
 					}
 				},
 				"cosmiconfig": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
-					"integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
+					"version": "7.0.1",
+					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
+					"integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
 					"dev": true,
 					"requires": {
 						"@types/parse-json": "^4.0.0",
@@ -23934,6 +24129,15 @@
 					"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
 					"dev": true
 				},
+				"is-core-module": {
+					"version": "2.6.0",
+					"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz",
+					"integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==",
+					"dev": true,
+					"requires": {
+						"has": "^1.0.3"
+					}
+				},
 				"is-fullwidth-code-point": {
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -24004,13 +24208,13 @@
 					"dev": true
 				},
 				"normalize-package-data": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
-					"integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==",
+					"version": "3.0.3",
+					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+					"integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
 					"dev": true,
 					"requires": {
 						"hosted-git-info": "^4.0.1",
-						"resolve": "^1.20.0",
+						"is-core-module": "^2.5.0",
 						"semver": "^7.3.4",
 						"validate-npm-package-license": "^3.0.1"
 					}
@@ -24125,16 +24329,6 @@
 						"strip-indent": "^3.0.0"
 					}
 				},
-				"resolve": {
-					"version": "1.20.0",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-					"integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-					"dev": true,
-					"requires": {
-						"is-core-module": "^2.2.0",
-						"path-parse": "^1.0.6"
-					}
-				},
 				"resolve-from": {
 					"version": "5.0.0",
 					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
@@ -24232,9 +24426,9 @@
 			}
 		},
 		"stylelint-scss": {
-			"version": "3.19.0",
-			"resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.19.0.tgz",
-			"integrity": "sha512-Ic5bsmpS4wVucOw44doC1Yi9f5qbeVL4wPFiEOaUElgsOuLEN6Ofn/krKI8BeNL2gAn53Zu+IcVV4E345r6rBw==",
+			"version": "3.20.1",
+			"resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.20.1.tgz",
+			"integrity": "sha512-OTd55O1TTAC5nGKkVmUDLpz53LlK39R3MImv1CfuvsK7/qugktqiZAeQLuuC4UBhzxCnsc7fp9u/gfRZwFAIkA==",
 			"dev": true,
 			"requires": {
 				"lodash": "^4.17.15",
@@ -24363,9 +24557,9 @@
 			},
 			"dependencies": {
 				"ajv": {
-					"version": "8.6.1",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.1.tgz",
-					"integrity": "sha512-42VLtQUOLefAvKFAQIxIZDaThq6om/PrfP0CYk3/vn+y4BMNkKnbli8ON2QCiHov4KkzOSJ/xSoBJdayiiYvVQ==",
+					"version": "8.6.2",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz",
+					"integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==",
 					"dev": true,
 					"requires": {
 						"fast-deep-equal": "^3.1.1",
@@ -24441,9 +24635,9 @@
 			"dev": true
 		},
 		"tar": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
-			"integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
+			"version": "6.1.11",
+			"resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+			"integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
 			"dev": true,
 			"requires": {
 				"chownr": "^2.0.0",
@@ -24618,9 +24812,9 @@
 			},
 			"dependencies": {
 				"@types/json-schema": {
-					"version": "7.0.8",
-					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
-					"integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==",
+					"version": "7.0.9",
+					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+					"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
 					"dev": true
 				},
 				"json5": {
@@ -24650,12 +24844,12 @@
 					}
 				},
 				"schema-utils": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz",
-					"integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==",
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+					"integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
 					"dev": true,
 					"requires": {
-						"@types/json-schema": "^7.0.7",
+						"@types/json-schema": "^7.0.8",
 						"ajv": "^6.12.5",
 						"ajv-keywords": "^3.5.2"
 					}
@@ -24903,25 +25097,15 @@
 			"dev": true
 		},
 		"tsconfig-paths": {
-			"version": "3.10.1",
-			"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz",
-			"integrity": "sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==",
+			"version": "3.11.0",
+			"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz",
+			"integrity": "sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==",
 			"dev": true,
 			"requires": {
-				"json5": "^2.2.0",
+				"@types/json5": "^0.0.29",
+				"json5": "^1.0.1",
 				"minimist": "^1.2.0",
 				"strip-bom": "^3.0.0"
-			},
-			"dependencies": {
-				"json5": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-					"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-					"dev": true,
-					"requires": {
-						"minimist": "^1.2.5"
-					}
-				}
 			}
 		},
 		"tslib": {
@@ -25397,9 +25581,9 @@
 			},
 			"dependencies": {
 				"@types/json-schema": {
-					"version": "7.0.8",
-					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
-					"integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==",
+					"version": "7.0.9",
+					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+					"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
 					"dev": true
 				},
 				"json5": {
@@ -25423,12 +25607,12 @@
 					}
 				},
 				"schema-utils": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz",
-					"integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==",
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+					"integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
 					"dev": true,
 					"requires": {
-						"@types/json-schema": "^7.0.7",
+						"@types/json-schema": "^7.0.8",
 						"ajv": "^6.12.5",
 						"ajv-keywords": "^3.5.2"
 					}
diff --git a/package.json b/package.json
index 6fa0592874bf0..f87b9b26fcc99 100644
--- a/package.json
+++ b/package.json
@@ -24,12 +24,12 @@
 		"last 2 Opera versions"
 	],
 	"devDependencies": {
-		"@wordpress/babel-preset-default": "6.2.0",
+		"@wordpress/babel-preset-default": "6.2.1",
 		"@wordpress/custom-templated-path-webpack-plugin": "2.0.5",
 		"@wordpress/dependency-extraction-webpack-plugin": "3.1.4",
-		"@wordpress/e2e-test-utils": "5.3.0",
+		"@wordpress/e2e-test-utils": "5.3.1",
 		"@wordpress/library-export-default-webpack-plugin": "2.0.5",
-		"@wordpress/scripts": "16.1.4",
+		"@wordpress/scripts": "16.1.5",
 		"autoprefixer": "^9.8.6",
 		"chalk": "4.1.1",
 		"check-node-version": "4.1.0",
@@ -77,58 +77,58 @@
 		"webpack-livereload-plugin": "2.3.0"
 	},
 	"dependencies": {
-		"@wordpress/a11y": "3.1.1",
-		"@wordpress/annotations": "2.1.5",
-		"@wordpress/api-fetch": "5.1.1",
-		"@wordpress/autop": "3.1.1",
-		"@wordpress/blob": "3.1.1",
-		"@wordpress/block-directory": "2.1.20",
-		"@wordpress/block-editor": "6.1.13",
-		"@wordpress/block-library": "3.2.18",
-		"@wordpress/block-serialization-default-parser": "4.1.1",
-		"@wordpress/blocks": "9.1.7",
-		"@wordpress/components": "14.1.10",
-		"@wordpress/compose": "4.1.5",
-		"@wordpress/core-data": "3.1.11",
-		"@wordpress/customize-widgets": "1.0.19",
-		"@wordpress/data": "5.1.5",
-		"@wordpress/data-controls": "2.1.3",
-		"@wordpress/date": "4.1.1",
-		"@wordpress/deprecated": "3.1.1",
-		"@wordpress/dom": "3.1.4",
-		"@wordpress/dom-ready": "3.1.1",
-		"@wordpress/edit-post": "4.1.20",
-		"@wordpress/edit-widgets": "2.1.20",
-		"@wordpress/editor": "10.1.16",
-		"@wordpress/element": "3.1.1",
-		"@wordpress/escape-html": "2.1.1",
-		"@wordpress/format-library": "2.1.13",
+		"@wordpress/a11y": "3.1.2",
+		"@wordpress/annotations": "2.1.6",
+		"@wordpress/api-fetch": "5.1.2",
+		"@wordpress/autop": "3.1.2",
+		"@wordpress/blob": "3.1.2",
+		"@wordpress/block-directory": "2.1.21",
+		"@wordpress/block-editor": "6.1.14",
+		"@wordpress/block-library": "3.2.19",
+		"@wordpress/block-serialization-default-parser": "4.1.2",
+		"@wordpress/blocks": "9.1.8",
+		"@wordpress/components": "14.1.11",
+		"@wordpress/compose": "4.1.6",
+		"@wordpress/core-data": "3.1.12",
+		"@wordpress/customize-widgets": "1.0.20",
+		"@wordpress/data": "5.1.6",
+		"@wordpress/data-controls": "2.1.6",
+		"@wordpress/date": "4.1.2",
+		"@wordpress/deprecated": "3.1.2",
+		"@wordpress/dom": "3.1.5",
+		"@wordpress/dom-ready": "3.1.2",
+		"@wordpress/edit-post": "4.1.21",
+		"@wordpress/edit-widgets": "2.1.21",
+		"@wordpress/editor": "10.1.17",
+		"@wordpress/element": "3.1.2",
+		"@wordpress/escape-html": "2.1.2",
+		"@wordpress/format-library": "2.1.14",
 		"@wordpress/hooks": "3.1.1",
-		"@wordpress/html-entities": "3.1.1",
-		"@wordpress/i18n": "4.1.1",
-		"@wordpress/icons": "4.0.2",
-		"@wordpress/interface": "3.1.11",
+		"@wordpress/html-entities": "3.1.2",
+		"@wordpress/i18n": "4.1.2",
+		"@wordpress/icons": "4.0.3",
+		"@wordpress/interface": "3.1.12",
 		"@wordpress/is-shallow-equal": "4.1.1",
-		"@wordpress/keyboard-shortcuts": "2.1.6",
-		"@wordpress/keycodes": "3.1.1",
-		"@wordpress/list-reusable-blocks": "2.1.10",
-		"@wordpress/media-utils": "2.1.1",
-		"@wordpress/notices": "3.1.5",
-		"@wordpress/nux": "4.1.10",
-		"@wordpress/plugins": "3.1.5",
-		"@wordpress/primitives": "2.1.1",
-		"@wordpress/priority-queue": "2.1.1",
-		"@wordpress/redux-routine": "4.1.1",
-		"@wordpress/reusable-blocks": "2.1.16",
-		"@wordpress/rich-text": "4.1.5",
-		"@wordpress/server-side-render": "2.1.11",
-		"@wordpress/shortcode": "3.1.1",
+		"@wordpress/keyboard-shortcuts": "2.1.7",
+		"@wordpress/keycodes": "3.1.2",
+		"@wordpress/list-reusable-blocks": "2.1.11",
+		"@wordpress/media-utils": "2.1.2",
+		"@wordpress/notices": "3.1.6",
+		"@wordpress/nux": "4.1.11",
+		"@wordpress/plugins": "3.1.6",
+		"@wordpress/primitives": "2.1.2",
+		"@wordpress/priority-queue": "2.1.2",
+		"@wordpress/redux-routine": "4.1.2",
+		"@wordpress/reusable-blocks": "2.1.17",
+		"@wordpress/rich-text": "4.1.6",
+		"@wordpress/server-side-render": "2.1.12",
+		"@wordpress/shortcode": "3.1.2",
 		"@wordpress/token-list": "2.1.1",
-		"@wordpress/url": "3.1.1",
-		"@wordpress/viewport": "3.1.5",
-		"@wordpress/warning": "2.1.1",
-		"@wordpress/widgets": "1.1.18",
-		"@wordpress/wordcount": "3.1.1",
+		"@wordpress/url": "3.1.2",
+		"@wordpress/viewport": "3.1.6",
+		"@wordpress/warning": "2.1.2",
+		"@wordpress/widgets": "1.1.19",
+		"@wordpress/wordcount": "3.1.2",
 		"backbone": "1.4.0",
 		"clipboard": "2.0.8",
 		"core-js-url-browser": "3.6.4",
diff --git a/src/wp-includes/assets/script-loader-packages.php b/src/wp-includes/assets/script-loader-packages.php
index 62571cdcf4f61..b4c86f09ef0f3 100644
--- a/src/wp-includes/assets/script-loader-packages.php
+++ b/src/wp-includes/assets/script-loader-packages.php
@@ -1 +1 @@
-<?php return array('a11y.js' => array('dependencies' => array('wp-dom-ready', 'wp-i18n', 'wp-polyfill'), 'version' => '3243bf46da298d46850bacd71bcc111e'), 'annotations.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-hooks', 'wp-i18n', 'wp-polyfill', 'wp-rich-text'), 'version' => '4556c7bbdf2d9d6a81c1ca770cf73893'), 'api-fetch.js' => array('dependencies' => array('wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '293ce6ecd6439249249485d369385617'), 'autop.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'bed28c77ea305cd8e02b0529011189f9'), 'blob.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'b8855b04f6a52a7bca89f8d945d46866'), 'block-directory.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives'), 'version' => 'de3c45fbc5977806e2091ee4f6f59b13'), 'block-editor.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-blob', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-shortcode', 'wp-token-list', 'wp-url', 'wp-wordcount'), 'version' => 'e84b3c853d39dd6df78803fe767d1c88'), 'block-library.js' => array('dependencies' => array('lodash', 'moment', 'react', 'wp-api-fetch', 'wp-autop', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-viewport'), 'version' => '7e6bd6c0e7b1c87f20935dbef3c2d2dd'), 'block-serialization-default-parser.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'cc8e5d0e23cf68bb9944bf2a7a016e52'), 'blocks.js' => array('dependencies' => array('lodash', 'wp-autop', 'wp-blob', 'wp-block-serialization-default-parser', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-primitives', 'wp-shortcode'), 'version' => '751c2504a888adf0398a0c604da94753'), 'components.js' => array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-a11y', 'wp-compose', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-warning'), 'version' => '89247fd67b948303f04bcba1cf7b9b0a'), 'compose.js' => array('dependencies' => array('lodash', 'react', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-priority-queue'), 'version' => '0f215b3868e125c7f29468d3cbb4a759'), 'core-data.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-data', 'wp-data-controls', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-url'), 'version' => '2b920f4b2b10716d0b8d2bbfe4799a48'), 'customize-widgets.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-polyfill', 'wp-primitives', 'wp-widgets'), 'version' => '66b17b2fb27061c0a1266a6186e1b854'), 'data.js' => array('dependencies' => array('lodash', 'react', 'wp-compose', 'wp-deprecated', 'wp-element', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-priority-queue', 'wp-redux-routine'), 'version' => '98309fcd2b4633f5d768069fc08ac82a'), 'data-controls.js' => array('dependencies' => array('wp-api-fetch', 'wp-data', 'wp-deprecated', 'wp-polyfill'), 'version' => 'ceef9ce8c9c058d69ebf44db39353687'), 'date.js' => array('dependencies' => array('moment', 'wp-polyfill'), 'version' => '2abad43cdd2da929e01f7d7648e392ab'), 'deprecated.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '13724e4923d40e224e7c99fdc350a6a1'), 'dom.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '25489fd13f6cba04738b00752f79a668'), 'dom-ready.js' => array('dependencies' => array('wp-polyfill'), 'version' => '1e1b9c1535c1c32d3236d41aa27c7bf9'), 'edit-post.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url', 'wp-viewport', 'wp-warning'), 'version' => '6df42dd19732b0afb3d8f29613d6d89b'), 'edit-widgets.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-url', 'wp-viewport', 'wp-widgets'), 'version' => '89fce7c4d2f4e3090c0019cc40194413'), 'editor.js' => array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-date', 'wp-deprecated', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-wordcount'), 'version' => '565f9748e2cfcd1679929d424a9cffbe'), 'element.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-escape-html', 'wp-polyfill'), 'version' => '669f5c11ca4fe7c44d64157347343913'), 'escape-html.js' => array('dependencies' => array('wp-polyfill'), 'version' => '4f03d9c45a01df8191f6833373fe1cfa'), 'format-library.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-url'), 'version' => '23c734677604301357e154aef27733a3'), 'hooks.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'f7ecf196f38940ae0673c46c6c30cd86'), 'html-entities.js' => array('dependencies' => array('wp-polyfill'), 'version' => '140ecb91be91e7eec34220584d085033'), 'i18n.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => 'd897c43bea0c2753dd7368eb2d990898'), 'is-shallow-equal.js' => array('dependencies' => array('wp-polyfill'), 'version' => '798b660598677b39413fdb5f68624aa8'), 'keyboard-shortcuts.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-keycodes', 'wp-polyfill'), 'version' => '53d021916e259972fbc68f68892323ac'), 'keycodes.js' => array('dependencies' => array('lodash', 'wp-i18n', 'wp-polyfill'), 'version' => 'cf38e80b47baf72f4822ddb8847f4f24'), 'list-reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '80af68069161321e8e131bad6a00d5dc'), 'media-utils.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blob', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'df373dcd13d7abc3f8b042f369b88557'), 'notices.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-polyfill'), 'version' => 'b08e53c1e070954fa0884cad9a164683'), 'nux.js' => array('dependencies' => array('lodash', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => 'c0c1a368ca9ade95dbf55485e8d59b68'), 'plugins.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-element', 'wp-hooks', 'wp-polyfill', 'wp-primitives'), 'version' => 'a843ba54a81c99735da976cf43fac526'), 'primitives.js' => array('dependencies' => array('wp-element', 'wp-polyfill'), 'version' => 'dc0962ac2885a26f8c2abdbe0cf0e333'), 'priority-queue.js' => array('dependencies' => array('wp-polyfill'), 'version' => '18c93919f04bb681234310b314675b17'), 'redux-routine.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '3c50c6bd1563bc7fb88433198400a74c'), 'reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'bec2012396758ad7603274e338191a42'), 'rich-text.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-keycodes', 'wp-polyfill'), 'version' => 'f0498feae49f87cd9a121f3e1bae242d'), 'server-side-render.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '7c732c1add9f9667bdf8dd66fbf74759'), 'shortcode.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '15757929bc8d52a3b184c3fcaeb38c64'), 'token-list.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '7bcd3684420783ef1f6ebb7680fe958e'), 'url.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'e9868cffba8a348b31011f87dd53b3c4'), 'viewport.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-element', 'wp-polyfill'), 'version' => '0a54bbdc44c5f135018c568a887b8279'), 'warning.js' => array('dependencies' => array('wp-polyfill'), 'version' => '202ac16e99afe7c33c257b248625a947'), 'widgets.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '0f11251901b3f83a3373551071d06740'), 'wordcount.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '02339c8ad03da1e7a03f9212da004007'));
\ No newline at end of file
+<?php return array('a11y.js' => array('dependencies' => array('wp-dom-ready', 'wp-i18n', 'wp-polyfill'), 'version' => '3243bf46da298d46850bacd71bcc111e'), 'annotations.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-hooks', 'wp-i18n', 'wp-polyfill', 'wp-rich-text'), 'version' => '4556c7bbdf2d9d6a81c1ca770cf73893'), 'api-fetch.js' => array('dependencies' => array('wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '293ce6ecd6439249249485d369385617'), 'autop.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'bed28c77ea305cd8e02b0529011189f9'), 'blob.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'b8855b04f6a52a7bca89f8d945d46866'), 'block-directory.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives'), 'version' => 'de3c45fbc5977806e2091ee4f6f59b13'), 'block-editor.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-blob', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-shortcode', 'wp-token-list', 'wp-url', 'wp-wordcount'), 'version' => 'd94e63317f1c2e9373815c1ae03f911b'), 'block-library.js' => array('dependencies' => array('lodash', 'moment', 'react', 'wp-api-fetch', 'wp-autop', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-viewport'), 'version' => '175a701e1aae933281f8553f0ea7c8f5'), 'block-serialization-default-parser.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'cc8e5d0e23cf68bb9944bf2a7a016e52'), 'blocks.js' => array('dependencies' => array('lodash', 'wp-autop', 'wp-blob', 'wp-block-serialization-default-parser', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-primitives', 'wp-shortcode'), 'version' => '751c2504a888adf0398a0c604da94753'), 'components.js' => array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-a11y', 'wp-compose', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-warning'), 'version' => '4d174b4215adfc2b5b76752aad04e5e7'), 'compose.js' => array('dependencies' => array('lodash', 'react', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-priority-queue'), 'version' => '0f215b3868e125c7f29468d3cbb4a759'), 'core-data.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-data', 'wp-data-controls', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-url'), 'version' => 'b077dccf93658b45b01de1f28d38f04c'), 'customize-widgets.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-polyfill', 'wp-primitives', 'wp-widgets'), 'version' => '09aff80d8b1c180d502f354b5d4ba91f'), 'data.js' => array('dependencies' => array('lodash', 'react', 'wp-compose', 'wp-deprecated', 'wp-element', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-priority-queue', 'wp-redux-routine'), 'version' => 'c15e612c9f374c80bc488bce207feb1f'), 'data-controls.js' => array('dependencies' => array('wp-api-fetch', 'wp-data', 'wp-deprecated', 'wp-polyfill'), 'version' => 'ceef9ce8c9c058d69ebf44db39353687'), 'date.js' => array('dependencies' => array('moment', 'wp-polyfill'), 'version' => '2abad43cdd2da929e01f7d7648e392ab'), 'deprecated.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '13724e4923d40e224e7c99fdc350a6a1'), 'dom.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '25489fd13f6cba04738b00752f79a668'), 'dom-ready.js' => array('dependencies' => array('wp-polyfill'), 'version' => '1e1b9c1535c1c32d3236d41aa27c7bf9'), 'edit-post.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url', 'wp-viewport', 'wp-warning'), 'version' => '01ede5cc8087545dfed018f2b0b9dba0'), 'edit-widgets.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-url', 'wp-viewport', 'wp-widgets'), 'version' => 'ef2446963dc78b4208f8f4f0cf70b483'), 'editor.js' => array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-date', 'wp-deprecated', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-wordcount'), 'version' => '60592ad74e11e6bf6d5f155bd5fe286c'), 'element.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-escape-html', 'wp-polyfill'), 'version' => '669f5c11ca4fe7c44d64157347343913'), 'escape-html.js' => array('dependencies' => array('wp-polyfill'), 'version' => '4f03d9c45a01df8191f6833373fe1cfa'), 'format-library.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-url'), 'version' => '23c734677604301357e154aef27733a3'), 'hooks.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'f7ecf196f38940ae0673c46c6c30cd86'), 'html-entities.js' => array('dependencies' => array('wp-polyfill'), 'version' => '140ecb91be91e7eec34220584d085033'), 'i18n.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => 'd897c43bea0c2753dd7368eb2d990898'), 'is-shallow-equal.js' => array('dependencies' => array('wp-polyfill'), 'version' => '798b660598677b39413fdb5f68624aa8'), 'keyboard-shortcuts.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-keycodes', 'wp-polyfill'), 'version' => '53d021916e259972fbc68f68892323ac'), 'keycodes.js' => array('dependencies' => array('lodash', 'wp-i18n', 'wp-polyfill'), 'version' => 'cf38e80b47baf72f4822ddb8847f4f24'), 'list-reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '80af68069161321e8e131bad6a00d5dc'), 'media-utils.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blob', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'df373dcd13d7abc3f8b042f369b88557'), 'notices.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-polyfill'), 'version' => 'b08e53c1e070954fa0884cad9a164683'), 'nux.js' => array('dependencies' => array('lodash', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => 'c0c1a368ca9ade95dbf55485e8d59b68'), 'plugins.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-element', 'wp-hooks', 'wp-polyfill', 'wp-primitives'), 'version' => 'a843ba54a81c99735da976cf43fac526'), 'primitives.js' => array('dependencies' => array('wp-element', 'wp-polyfill'), 'version' => 'dc0962ac2885a26f8c2abdbe0cf0e333'), 'priority-queue.js' => array('dependencies' => array('wp-polyfill'), 'version' => '18c93919f04bb681234310b314675b17'), 'redux-routine.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '3c50c6bd1563bc7fb88433198400a74c'), 'reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'bec2012396758ad7603274e338191a42'), 'rich-text.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-keycodes', 'wp-polyfill'), 'version' => 'f0498feae49f87cd9a121f3e1bae242d'), 'server-side-render.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '7c732c1add9f9667bdf8dd66fbf74759'), 'shortcode.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '15757929bc8d52a3b184c3fcaeb38c64'), 'token-list.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '7bcd3684420783ef1f6ebb7680fe958e'), 'url.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'e9868cffba8a348b31011f87dd53b3c4'), 'viewport.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-element', 'wp-polyfill'), 'version' => '0a54bbdc44c5f135018c568a887b8279'), 'warning.js' => array('dependencies' => array('wp-polyfill'), 'version' => '202ac16e99afe7c33c257b248625a947'), 'widgets.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '0f11251901b3f83a3373551071d06740'), 'wordcount.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '02339c8ad03da1e7a03f9212da004007'));
\ No newline at end of file

From 88cdf9f6636d4f9c6c2819bdfb9888dc30053daf Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Wed, 1 Sep 2021 21:58:32 +0000
Subject: [PATCH 080/257] Tests: Add missing @covers tags for
 `Tests_Admin_IncludesComment`.

Follow-up to [34456], [34460].

Props pbearne, jrf, hellofromTonya.
See #39265.

git-svn-id: https://develop.svn.wordpress.org/trunk@51724 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/admin/includesComment.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/phpunit/tests/admin/includesComment.php b/tests/phpunit/tests/admin/includesComment.php
index 79f96afe24f16..1e0aba2108fd2 100644
--- a/tests/phpunit/tests/admin/includesComment.php
+++ b/tests/phpunit/tests/admin/includesComment.php
@@ -47,6 +47,8 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 
 	/**
 	 * Verify that both the comment date and author must match for a comment to exist.
+	 *
+	 * @covers ::comment_exists
 	 */
 	public function test_must_match_date_and_author() {
 		$this->assertNull( comment_exists( 1, '2004-01-02 12:00:00' ) );
@@ -55,6 +57,8 @@ public function test_must_match_date_and_author() {
 
 	/**
 	 * @ticket 33871
+	 *
+	 * @covers ::comment_exists
 	 */
 	public function test_default_value_of_timezone_should_be_blog() {
 		$this->assertEquals( self::$post_id, comment_exists( 1, '2014-05-06 12:00:00' ) );
@@ -62,6 +66,8 @@ public function test_default_value_of_timezone_should_be_blog() {
 
 	/**
 	 * @ticket 33871
+	 *
+	 * @covers ::comment_exists
 	 */
 	public function test_should_respect_timezone_blog() {
 		$this->assertEquals( self::$post_id, comment_exists( 1, '2014-05-06 12:00:00', 'blog' ) );
@@ -69,6 +75,8 @@ public function test_should_respect_timezone_blog() {
 
 	/**
 	 * @ticket 33871
+	 *
+	 * @covers ::comment_exists
 	 */
 	public function test_should_respect_timezone_gmt() {
 		$this->assertEquals( self::$post_id, comment_exists( 1, '2014-05-06 07:00:00', 'gmt' ) );
@@ -76,6 +84,8 @@ public function test_should_respect_timezone_gmt() {
 
 	/**
 	 * @ticket 33871
+	 *
+	 * @covers ::comment_exists
 	 */
 	public function test_invalid_timezone_should_fall_back_on_blog() {
 		$this->assertEquals( self::$post_id, comment_exists( 1, '2014-05-06 12:00:00', 'not_a_valid_value' ) );

From 793bde1af74ad24c407d3645c788ac49ea352fa6 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Wed, 1 Sep 2021 22:26:33 +0000
Subject: [PATCH 081/257] Tests: Add missing @covers tags for
 `Tests_Admin_wpCommunityEvents`.

Adds missing and moves placement of existing @covers tags for consistency.

Follow-up to [40607], [42726], [49145].

Props pbearne, jrf, hellofromTonya.
See #39265.

git-svn-id: https://develop.svn.wordpress.org/trunk@51725 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../phpunit/tests/admin/wpCommunityEvents.php | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/tests/phpunit/tests/admin/wpCommunityEvents.php b/tests/phpunit/tests/admin/wpCommunityEvents.php
index 493ad7b68c8f6..631d8fdfeb80f 100644
--- a/tests/phpunit/tests/admin/wpCommunityEvents.php
+++ b/tests/phpunit/tests/admin/wpCommunityEvents.php
@@ -69,6 +69,8 @@ private function get_user_location() {
 	 * Test: get_events() should return an instance of WP_Error if the response code is not 200.
 	 *
 	 * @since 4.8.0
+	 *
+	 * @covers WP_Community_Events::get_events
 	 */
 	public function test_get_events_bad_response_code() {
 		add_filter( 'pre_http_request', array( $this, '_http_request_bad_response_code' ) );
@@ -82,6 +84,8 @@ public function test_get_events_bad_response_code() {
 	 * Test: The response body should not be cached if the response code is not 200.
 	 *
 	 * @since 4.8.0
+	 *
+	 * @covers WP_Community_Events::get_cached_events
 	 */
 	public function test_get_cached_events_bad_response_code() {
 		add_filter( 'pre_http_request', array( $this, '_http_request_bad_response_code' ) );
@@ -117,6 +121,8 @@ public function _http_request_bad_response_code() {
 	 * the required properties.
 	 *
 	 * @since 4.8.0
+	 *
+	 * @covers WP_Community_Events::get_events
 	 */
 	public function test_get_events_invalid_response() {
 		add_filter( 'pre_http_request', array( $this, '_http_request_invalid_response' ) );
@@ -130,6 +136,8 @@ public function test_get_events_invalid_response() {
 	 * Test: The response body should not be cached if it does not have the required properties.
 	 *
 	 * @since 4.8.0
+	 *
+	 * @covers WP_Community_Events::get_cached_events
 	 */
 	public function test_get_cached_events_invalid_response() {
 		add_filter( 'pre_http_request', array( $this, '_http_request_invalid_response' ) );
@@ -165,6 +173,8 @@ public function _http_request_invalid_response() {
 	 * an events array with individual events that have Unix start/end timestamps.
 	 *
 	 * @since 4.8.0
+	 *
+	 * @covers WP_Community_Events::get_events
 	 */
 	public function test_get_events_valid_response() {
 		add_filter( 'pre_http_request', array( $this, '_http_request_valid_response' ) );
@@ -184,6 +194,8 @@ public function test_get_events_valid_response() {
 	 * timestamps for each event.
 	 *
 	 * @since 4.8.0
+	 *
+	 * @covers WP_Community_Events::get_cached_events
 	 */
 	public function test_get_cached_events_valid_response() {
 		add_filter( 'pre_http_request', array( $this, '_http_request_valid_response' ) );
@@ -287,9 +299,9 @@ protected function get_valid_events() {
 	/**
 	 * Test: `trim_events()` should immediately remove expired events.
 	 *
-	 * @covers WP_Community_Events::trim_events
-	 *
 	 * @since 5.5.2
+	 *
+	 * @covers WP_Community_Events::trim_events
 	 */
 	public function test_trim_expired_events() {
 		$trim_events = new ReflectionMethod( $this->instance, 'trim_events' );
@@ -315,10 +327,10 @@ public function test_trim_expired_events() {
 	/**
 	 * Test: get_events() should return the events with the WordCamp pinned in the prepared list.
 	 *
-	 * @covers WP_Community_Events::trim_events
-	 *
 	 * @since 4.9.7
 	 * @since 5.5.2 Tests `trim_events()` directly instead of indirectly via `get_events()`.
+	 *
+	 * @covers WP_Community_Events::trim_events
 	 */
 	public function test_trim_events_pin_wordcamp() {
 		$trim_events = new ReflectionMethod( $this->instance, 'trim_events' );
@@ -420,10 +432,10 @@ public function _events_with_unpinned_wordcamp() {
 	 * Test: get_events() shouldn't stick an extra WordCamp when there's already one that naturally
 	 * falls into the list.
 	 *
-	 * @covers WP_Community_Events::trim_events
-	 *
 	 * @since 4.9.7
 	 * @since 5.5.2 Tests `trim_events()` directly instead of indirectly via `get_events()`.
+	 *
+	 * @covers WP_Community_Events::trim_events
 	 */
 	public function test_trim_events_dont_pin_multiple_wordcamps() {
 		$trim_events = new ReflectionMethod( $this->instance, 'trim_events' );
@@ -545,6 +557,8 @@ public function _events_with_multiple_wordcamps() {
 	 * @dataProvider data_get_unsafe_client_ip
 	 *
 	 * @ticket 41083
+	 *
+	 * @covers WP_Community_Events::get_unsafe_client_ip
 	 */
 	public function test_get_unsafe_client_ip( $raw_ip, $expected_result ) {
 		$_SERVER['REMOTE_ADDR']    = 'this should not be used';

From 40edc2addb5284804e698beda487206f8dd70992 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Thu, 2 Sep 2021 08:29:03 +0000
Subject: [PATCH 082/257] Docs: Provide a more accurate description for a few
 script and style functions.

This should make it clear that the functions only work if the script or style has already been registered.

This affects:
* `wp_localize_script()`
* `wp_set_script_translations()`
* `wp_script_add_data()`
* `wp_style_add_data()`

Follow-up to [7970], [18464], [25594], [31223], [36633], [44169], [44350].

Props audrasjb.
Fixes #54044.

git-svn-id: https://develop.svn.wordpress.org/trunk@51726 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/functions.wp-scripts.php | 6 +++---
 src/wp-includes/functions.wp-styles.php  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wp-includes/functions.wp-scripts.php b/src/wp-includes/functions.wp-scripts.php
index abe930758dc18..82d36856724ac 100644
--- a/src/wp-includes/functions.wp-scripts.php
+++ b/src/wp-includes/functions.wp-scripts.php
@@ -186,7 +186,7 @@ function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_f
 /**
  * Localize a script.
  *
- * Works only if the script has already been added.
+ * Works only if the script has already been registered.
  *
  * Accepts an associative array $l10n and creates a JavaScript object:
  *
@@ -224,7 +224,7 @@ function wp_localize_script( $handle, $object_name, $l10n ) {
 /**
  * Sets translated strings for a script.
  *
- * Works only if the script has already been added.
+ * Works only if the script has already been registered.
  *
  * @see WP_Scripts::set_translations()
  * @global WP_Scripts $wp_scripts The WP_Scripts object for printing scripts.
@@ -402,7 +402,7 @@ function wp_script_is( $handle, $list = 'enqueued' ) {
 /**
  * Add metadata to a script.
  *
- * Works only if the script has already been added.
+ * Works only if the script has already been registered.
  *
  * Possible values for $key and $value:
  * 'conditional' string Comments for IE 6, lte IE 7, etc.
diff --git a/src/wp-includes/functions.wp-styles.php b/src/wp-includes/functions.wp-styles.php
index e1749477cae82..d82bb559250d0 100644
--- a/src/wp-includes/functions.wp-styles.php
+++ b/src/wp-includes/functions.wp-styles.php
@@ -217,7 +217,7 @@ function wp_style_is( $handle, $list = 'enqueued' ) {
 /**
  * Add metadata to a CSS stylesheet.
  *
- * Works only if the stylesheet has already been added.
+ * Works only if the stylesheet has already been registered.
  *
  * Possible values for $key and $value:
  * 'conditional' string      Comments for IE 6, lte IE 7 etc.

From d6851a30d0c0c17639c8b2aa12a9012efdea3362 Mon Sep 17 00:00:00 2001
From: Kelly Choyce-Dwan <ryelle@git.wordpress.org>
Date: Thu, 2 Sep 2021 22:16:16 +0000
Subject: [PATCH 083/257] Coding Standards: Apply coding standards on CSS.

Remove units when the value is zero. Combine redundant values in shorthand declarations.
This was generated with `stylelint --fix` and a custom config (see #53866).

Props ankitmaru, audrasjb, pbiron, ayeshrajans, hareesh-pillai, netweb, mukesh27.
Fixes #53866.



git-svn-id: https://develop.svn.wordpress.org/trunk@51727 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/admin-menu.css           | 10 +++++-----
 src/wp-admin/css/color-picker.css         |  2 +-
 src/wp-admin/css/common.css               | 22 ++++++++++-----------
 src/wp-admin/css/customize-controls.css   | 24 +++++++++++------------
 src/wp-admin/css/customize-nav-menus.css  | 20 +++++++++----------
 src/wp-admin/css/customize-widgets.css    |  2 +-
 src/wp-admin/css/dashboard.css            |  6 +++---
 src/wp-admin/css/deprecated-media.css     |  2 +-
 src/wp-admin/css/edit.css                 | 12 ++++++------
 src/wp-admin/css/forms.css                | 12 ++++++------
 src/wp-admin/css/install.css              |  6 +++---
 src/wp-admin/css/list-tables.css          |  4 ++--
 src/wp-admin/css/login.css                |  4 ++--
 src/wp-admin/css/media.css                |  6 +++---
 src/wp-admin/css/nav-menus.css            | 10 +++++-----
 src/wp-admin/css/site-health.css          |  4 ++--
 src/wp-admin/css/themes.css               | 12 ++++++------
 src/wp-admin/css/widgets.css              | 10 +++++-----
 src/wp-includes/css/editor.css            |  4 ++--
 src/wp-includes/css/media-views.css       | 14 ++++++-------
 src/wp-includes/css/wp-embed-template.css |  2 +-
 src/wp-includes/css/wp-pointer.css        |  4 ++--
 22 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/src/wp-admin/css/admin-menu.css b/src/wp-admin/css/admin-menu.css
index 593157019669b..243dde7daa3b0 100644
--- a/src/wp-admin/css/admin-menu.css
+++ b/src/wp-admin/css/admin-menu.css
@@ -39,7 +39,7 @@
 .icon16 {
 	height: 18px;
 	width: 18px;
-	padding: 6px 6px;
+	padding: 6px;
 	margin: -6px 0 0 -8px;
 	float: left;
 }
@@ -344,7 +344,7 @@
 }
 
 #adminmenu .wp-menu-image img {
-	padding: 9px 0 0 0;
+	padding: 9px 0 0;
 	opacity: 0.6;
 	filter: alpha(opacity=60);
 }
@@ -487,7 +487,7 @@ ul#adminmenu > li.current > a.current:after {
 #adminmenu li.wp-menu-separator {
 	height: 5px;
 	padding: 0;
-	margin: 0 0 6px 0;
+	margin: 0 0 6px;
 	cursor: inherit;
 }
 
@@ -502,7 +502,7 @@ ul#adminmenu > li.current > a.current:after {
 	font-weight: 400;
 	font-size: 14px;
 	padding: 5px 4px 5px 11px;
-	margin: -7px 0px 4px -5px;
+	margin: -7px 0 4px -5px;
 	border-width: 3px 0 3px 5px;
 	border-style: solid;
 	border-color: transparent;
@@ -653,7 +653,7 @@ li#wp-admin-bar-menu-toggle {
 	.auto-fold #adminmenu .wp-has-current-submenu.opensub .wp-submenu,
 	.auto-fold #adminmenu a.menu-top:focus + .wp-submenu,
 	.auto-fold #adminmenu .wp-has-current-submenu a.menu-top:focus + .wp-submenu {
-		top: 0px;
+		top: 0;
 		left: 36px;
 	}
 
diff --git a/src/wp-admin/css/color-picker.css b/src/wp-admin/css/color-picker.css
index be98537fb2948..89513949579b6 100644
--- a/src/wp-admin/css/color-picker.css
+++ b/src/wp-admin/css/color-picker.css
@@ -11,7 +11,7 @@
 /* Needs higher specificiity. */
 .wp-picker-container .wp-color-result.button {
 	min-height: 30px;
-	margin: 0 6px 6px 0px;
+	margin: 0 6px 6px 0;
 	padding: 0 0 0 30px;
 	font-size: 11px;
 }
diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
index fb60bac031ff3..50eb94d98e242 100644
--- a/src/wp-admin/css/common.css
+++ b/src/wp-admin/css/common.css
@@ -417,7 +417,7 @@ code {
 
 kbd,
 code {
-	padding: 3px 5px 2px 5px;
+	padding: 3px 5px 2px;
 	margin: 0 1px;
 	background: #f0f0f1;
 	background: rgba(0, 0, 0, 0.07);
@@ -582,7 +582,7 @@ code {
 	font-size: 23px;
 	font-weight: 400;
 	margin: 0;
-	padding: 9px 0 4px 0;
+	padding: 9px 0 4px;
 	line-height: 1.3;
 }
 
@@ -957,7 +957,7 @@ a#remove-post-thumbnail:hover {
 }
 
 #minor-publishing-actions {
-	padding: 10px 10px 0 10px;
+	padding: 10px 10px 0;
 	text-align: right;
 }
 
@@ -1232,7 +1232,7 @@ th.action-links {
 
 .filter-group .filter-group-feature label {
 	display: block;
-	margin: 14px 0px 14px 23px;
+	margin: 14px 0 14px 23px;
 }
 
 .filter-drawer .buttons {
@@ -1609,7 +1609,7 @@ form.upgrade {
 form.upgrade .hint {
 	font-style: italic;
 	font-size: 85%;
-	margin: -0.5em 0 2em 0;
+	margin: -0.5em 0 2em;
 }
 
 .update-php .spinner {
@@ -1707,7 +1707,7 @@ p.auto-update-status {
 /* screen options and help tabs revert */
 #screen-meta {
 	display: none;
-	margin: 0 20px -1px 0px;
+	margin: 0 20px -1px 0;
 	position: relative;
 	background-color: #fff;
 	border: 1px solid #c3c4c7;
@@ -3285,7 +3285,7 @@ img {
 .tree-folder > .current-file::before {
 	left: 4px;
 	height: 15px;
-	width: 0px;
+	width: 0;
 	border-left: none;
 	top: 3px;
 }
@@ -3380,7 +3380,7 @@ img {
 }
 
 #templateside li.howto {
-	padding: 6px 12px 12px 12px;
+	padding: 6px 12px 12px;
 }
 
 .theme-editor-php .highlight {
@@ -3432,7 +3432,7 @@ img {
 }
 
 .widget-top .widget-action .toggle-indicator:before {
-	padding: 1px 2px 1px 0px;
+	padding: 1px 2px 1px 0;
 	border-radius: 50%;
 }
 
@@ -3827,7 +3827,7 @@ img {
 	.wrap div.updated,
 	.wrap div.error,
 	.media-upload-form div.error {
-		margin: 20px 0 10px 0;
+		margin: 20px 0 10px;
 		padding: 5px 10px;
 		font-size: 14px;
 		line-height: 175%;
@@ -3937,7 +3937,7 @@ img {
 		left: -8px;
 	}
 	.tree-folder > li::before {
-		top: 0px;
+		top: 0;
 		height: 13px;
 	}
 	.tree-folder > .current-file::before {
diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css
index 7e50a59bb5fa2..7f437e86e810b 100644
--- a/src/wp-admin/css/customize-controls.css
+++ b/src/wp-admin/css/customize-controls.css
@@ -743,7 +743,7 @@ body.trashing #publish-settings {
 }
 
 .customize-section-title {
-	margin: -12px -12px 0 -12px;
+	margin: -12px -12px 0;
 	border-bottom: 1px solid #dcdcde;
 	background: #fff;
 }
@@ -766,11 +766,11 @@ div.customize-section-description p:last-child {
 
 #customize-theme-controls .customize-themes-panel h3.customize-section-title:first-child {
 	border-bottom: 1px solid #dcdcde;
-	padding: 12px 12px 12px 12px;
+	padding: 12px;
 }
 
 .ios #customize-theme-controls .customize-themes-panel h3.customize-section-title:first-child {
-	padding: 12px 12px 13px 12px;
+	padding: 12px 12px 13px;
 }
 
 .customize-section-title h3,
@@ -1140,7 +1140,7 @@ p.customize-section-description {
  */
 
 #customize-controls .customize-control-notifications-container { /* Scoped to #customize-controls for specificity over notification styles in common.css. */
-	margin: 4px 0 8px 0;
+	margin: 4px 0 8px;
 	padding: 0;
 	cursor: default;
 }
@@ -1153,7 +1153,7 @@ p.customize-section-description {
 
 #customize-controls .customize-control-notifications-container li.notice {
 	list-style: none;
-	margin: 0 0 6px 0;
+	margin: 0 0 6px;
 	padding: 9px 14px;
 	overflow: hidden;
 }
@@ -1455,7 +1455,7 @@ p.customize-section-description {
 }
 
 .customize-control-header .header-view:last-child {
-	margin-bottom: 0px;
+	margin-bottom: 0;
 }
 
 /* Convoluted, but 'outline' support isn't good enough yet */
@@ -1691,7 +1691,7 @@ p.customize-section-description {
 	border-bottom: 1px solid #dcdcde;
 	border-left: none;
 	border-right: none;
-	margin: 0 0 15px 0;
+	margin: 0 0 15px;
 	padding-right: 100px; /* Space for the button */
 }
 
@@ -1893,7 +1893,7 @@ p.customize-section-description {
 }
 
 .control-panel-themes .customize-themes-notifications .notice {
-	margin: 0 0 25px 0;
+	margin: 0 0 25px;
 }
 
 .customize-themes-full-container .customize-themes-section {
@@ -1907,7 +1907,7 @@ p.customize-section-description {
 
 .control-section .customize-section-text-before {
 	padding: 0 0 8px 15px;
-	margin: 15px 0 0 0;
+	margin: 15px 0 0;
 	line-height: 16px;
 	border-bottom: 1px solid #dcdcde;
 	color: #50575e;
@@ -2128,7 +2128,7 @@ p.customize-section-description {
 		position: relative;
 		left: 0;
 		width: 100%;
-		margin: 0 0 25px 0;
+		margin: 0 0 25px;
 	}
 	.filter-drawer {
 		top: 46px;
@@ -2238,7 +2238,7 @@ p.customize-section-description {
 		width: 26px;
 		display: block;
 		line-height: 2.3;
-		padding: 0 8px 0 8px;
+		padding: 0 8px;
 		border-right: 1px solid #dcdcde;
 	}
 
@@ -2399,7 +2399,7 @@ body.cheatin h1 {
 	color: #50575e;
 	font-size: 24px;
 	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-	margin: 30px 0 0 0;
+	margin: 30px 0 0;
 	padding: 0 0 7px;
 }
 
diff --git a/src/wp-admin/css/customize-nav-menus.css b/src/wp-admin/css/customize-nav-menus.css
index 0fa7bc4f15c25..46ac3066efd1d 100644
--- a/src/wp-admin/css/customize-nav-menus.css
+++ b/src/wp-admin/css/customize-nav-menus.css
@@ -11,7 +11,7 @@
 #customize-theme-controls .customize-section-title-nav_menus-heading,
 #customize-theme-controls .customize-section-title-menu_locations-heading,
 #customize-theme-controls .customize-section-title-menu_locations-description {
-	padding: 0 12px 0 12px;
+	padding: 0 12px;
 }
 
 #customize-theme-controls .customize-control-description.customize-section-title-menu_locations-description {
@@ -100,7 +100,7 @@
 .wp-customizer .menu-item-settings .description-thin {
 	width: 100%;
 	height: auto;
-	margin: 0 0 8px 0;
+	margin: 0 0 8px;
 }
 
 .wp-customizer .menu-item-settings input[type="text"] {
@@ -185,7 +185,7 @@
 }
 
 .wp-customizer .menu-settings dl {
-	margin: 12px 0 0 0;
+	margin: 12px 0 0;
 	padding: 0;
 }
 
@@ -322,7 +322,7 @@
 #available-menu-items .accordion-section-title .toggle-indicator:before {
 	content: "\f140";
 	display: block;
-	padding: 1px 2px 1px 0px;
+	padding: 1px 2px 1px 0;
 	speak: never;
 	border-radius: 50%;
 	color: #787c82;
@@ -581,8 +581,8 @@
 }
 
 #available-menu-items .accordion-section-content .available-menu-items-list {
-	margin: 0 0 45px 0;
-	padding: 1px 15px 15px 15px;
+	margin: 0 0 45px;
+	padding: 1px 15px 15px;
 }
 
 #available-menu-items .accordion-section-content .available-menu-items-list:only-child { /* Types that do not support new items for the current user */
@@ -590,7 +590,7 @@
 }
 
 #new-custom-menu-item .accordion-section-content {
-	padding: 0 15px 15px 15px;
+	padding: 0 15px 15px;
 }
 
 #available-menu-items .menu-item-tpl {
@@ -690,7 +690,7 @@
 	position: absolute;
 	left: 0;
 	top: 60px; /* below title div / search input */
-	bottom: 0px; /* 100% height that still triggers lazy load */
+	bottom: 0; /* 100% height that still triggers lazy load */
 	max-height: none;
 	width: 100%;
 	padding: 1px 15px 15px;
@@ -795,7 +795,7 @@ body.adding-menu-items #customize-preview iframe {
 
 #create-new-menu-submit {
 	float: right;
-	margin: 0 0 12px 0;
+	margin: 0 0 12px;
 }
 
 .menu-delete-item {
@@ -805,7 +805,7 @@ body.adding-menu-items #customize-preview iframe {
 }
 
 .assigned-menu-locations-title p {
-	margin: 0 0 8px 0;
+	margin: 0 0 8px;
 }
 
 li.assigned-to-menu-location .menu-delete-item {
diff --git a/src/wp-admin/css/customize-widgets.css b/src/wp-admin/css/customize-widgets.css
index 52d9552be0429..3bd7a46b28e33 100644
--- a/src/wp-admin/css/customize-widgets.css
+++ b/src/wp-admin/css/customize-widgets.css
@@ -81,7 +81,7 @@
 }
 
 .widget-inside {
-	padding: 1px 10px 10px 10px;
+	padding: 1px 10px 10px;
 	border-top: none;
 	line-height: 1.23076923;
 }
diff --git a/src/wp-admin/css/dashboard.css b/src/wp-admin/css/dashboard.css
index 1dfe3b5736052..66505ec34e008 100644
--- a/src/wp-admin/css/dashboard.css
+++ b/src/wp-admin/css/dashboard.css
@@ -518,7 +518,7 @@ body #dashboard-widgets .postbox form .submit {
 
 #dashboard_primary .rss-widget {
 	font-size: 13px;
-	padding: 0 12px 0;
+	padding: 0 12px;
 }
 
 #dashboard_primary .rss-widget:last-child {
@@ -599,7 +599,7 @@ body #dashboard-widgets .postbox form .submit {
 	color: #50575e;
 	background: #f6f7f7;
 	border-top: 1px solid #f0f0f1;
-	padding: 10px 12px 6px 12px;
+	padding: 10px 12px 6px;
 }
 
 #dashboard_right_now .sub h3 {
@@ -835,7 +835,7 @@ body #dashboard-widgets .postbox form .submit {
 }
 
 #activity-widget #the-comment-list .comment-item p.row-actions {
-	margin: 4px 0 0 0;
+	margin: 4px 0 0;
 }
 
 #activity-widget #the-comment-list .comment-item:first-child {
diff --git a/src/wp-admin/css/deprecated-media.css b/src/wp-admin/css/deprecated-media.css
index 66eae89047e78..359fc59e3c3b5 100644
--- a/src/wp-admin/css/deprecated-media.css
+++ b/src/wp-admin/css/deprecated-media.css
@@ -100,7 +100,7 @@ th {
 	width: 100%;
 	border: none;
 	text-align: justify;
-	margin: 0 0 1em 0;
+	margin: 0 0 1em;
 	padding: 0;
 }
 
diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css
index a6bfda6310f75..44a444b7140c6 100644
--- a/src/wp-admin/css/edit.css
+++ b/src/wp-admin/css/edit.css
@@ -450,7 +450,7 @@ form#tags-filter {
 }
 
 .curtime #timestamp {
-	padding: 2px 0 1px 0;
+	padding: 2px 0 1px;
 	display: inline !important;
 	height: auto !important;
 }
@@ -650,7 +650,7 @@ form#tags-filter {
 }
 
 #poststuff .inside {
-	margin: 6px 0 0 0;
+	margin: 6px 0 0;
 }
 
 .link-php #poststuff .inside,
@@ -721,7 +721,7 @@ form#tags-filter {
 	font-weight: 600;
 	margin: 0 0.8rem 1rem;
 	font-size: 23px;
-	padding: 9px 0 4px 0;
+	padding: 9px 0 4px;
 	line-height: 1.3;
 }
 
@@ -1363,7 +1363,7 @@ p.description code {
 }
 
 #poststuff .tagsdiv .howto {
-	margin: 1em 0 6px 0;
+	margin: 1em 0 6px;
 }
 
 .ajaxtag .newtag {
@@ -1772,7 +1772,7 @@ table.links-table {
 	}
 
 	#titlediv #title-prompt-text {
-		padding: 10px 10px;
+		padding: 10px;
 	}
 
 	#poststuff .stuffbox .inside {
@@ -1955,7 +1955,7 @@ table.links-table {
 	}
 
 	.misc-pub-section {
-		padding: 20px 10px 20px;
+		padding: 20px 10px;
 	}
 
 	.misc-pub-section > a {
diff --git a/src/wp-admin/css/forms.css b/src/wp-admin/css/forms.css
index 56c78b5c488d2..7893915d6d9aa 100644
--- a/src/wp-admin/css/forms.css
+++ b/src/wp-admin/css/forms.css
@@ -32,7 +32,7 @@ select {
 }
 
 textarea.code {
-	padding: 4px 6px 1px 6px;
+	padding: 4px 6px 1px;
 }
 
 input[type="text"],
@@ -999,8 +999,8 @@ table.form-table td .updated p {
 
 .pressthis-bookmarklet span {
 	display: inline-block;
-	margin: 0px 0 0;
-	padding: 0px 12px 8px 9px;
+	margin: 0;
+	padding: 0 12px 8px 9px;
 }
 
 .pressthis-bookmarklet span:before {
@@ -1225,7 +1225,7 @@ table.form-table td .updated p {
 }
 
 .request-filesystem-credentials-form .notice {
-	margin: 0 0 20px 0;
+	margin: 0 0 20px;
 	clear: both;
 }
 
@@ -1562,13 +1562,13 @@ table.form-table td .updated p {
 	}
 
 	.form-table th {
-		padding: 10px 0 0 0;
+		padding: 10px 0 0;
 		border-bottom: 0;
 	}
 
 	.form-table td {
 		margin-bottom: 0;
-		padding: 4px 0 6px 0;
+		padding: 4px 0 6px;
 	}
 
 	.form-table.permalink-structure td code {
diff --git a/src/wp-admin/css/install.css b/src/wp-admin/css/install.css
index b8ddbef0141d0..62a596f0fe1fa 100644
--- a/src/wp-admin/css/install.css
+++ b/src/wp-admin/css/install.css
@@ -9,7 +9,7 @@ body {
 	color: #3c434a;
 	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
 	margin: 140px auto 25px;
-	padding: 20px 20px 10px 20px;
+	padding: 20px 20px 10px;
 	max-width: 700px;
 	-webkit-font-smoothing: subpixel-antialiased;
 	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
@@ -78,7 +78,7 @@ label {
 
 #logo {
 	margin: -130px auto 25px;
-	padding: 0 0 25px 0;
+	padding: 0 0 25px;
 	width: 84px;
 	height: 84px;
 	overflow: hidden;
@@ -141,7 +141,7 @@ textarea {
 }
 
 .form-table p {
-	margin: 4px 0 0 0;
+	margin: 4px 0 0;
 	font-size: 11px;
 }
 
diff --git a/src/wp-admin/css/list-tables.css b/src/wp-admin/css/list-tables.css
index 3b9bb0e945ea4..55145b598dbad 100644
--- a/src/wp-admin/css/list-tables.css
+++ b/src/wp-admin/css/list-tables.css
@@ -1552,7 +1552,7 @@ div.action-links,
 }
 
 .plugin-card .notice {
-	margin: 20px 20px 0 20px;
+	margin: 20px 20px 0;
 }
 
 .plugin-icon {
@@ -1643,7 +1643,7 @@ div.action-links,
 	}
 
 	.tablenav.top {
-		margin: 20px 0 5px 0;
+		margin: 20px 0 5px;
 	}
 
 	.tablenav.bottom {
diff --git a/src/wp-admin/css/login.css b/src/wp-admin/css/login.css
index 245799fa987eb..3c795ebab5c42 100644
--- a/src/wp-admin/css/login.css
+++ b/src/wp-admin/css/login.css
@@ -288,11 +288,11 @@ p {
 .login #nav,
 .login #backtoblog {
 	font-size: 13px;
-	padding: 0 24px 0;
+	padding: 0 24px;
 }
 
 .login #nav {
-	margin: 24px 0 0 0;
+	margin: 24px 0 0;
 }
 
 #backtoblog {
diff --git a/src/wp-admin/css/media.css b/src/wp-admin/css/media.css
index 1e2959748d712..5aaf859ad4cfb 100644
--- a/src/wp-admin/css/media.css
+++ b/src/wp-admin/css/media.css
@@ -248,7 +248,7 @@
 .media-upload-form .media-item.error,
 .media-upload-form .media-item .error {
 	width: auto;
-	margin: 0 0 1px 0;
+	margin: 0 0 1px;
 }
 
 .media-upload-form .media-item .error {
@@ -759,7 +759,7 @@ border color while dragging a file over the uploader drop area */
 	bottom: 0;
 	right: 0;
 	left: 0;
-	box-shadow: inset 0px 4px 4px -4px rgba(0, 0, 0, 0.1);
+	box-shadow: inset 0 4px 4px -4px rgba(0, 0, 0, 0.1);
 }
 
 .edit-attachment-frame .attachment-media-view {
@@ -810,7 +810,7 @@ border color while dragging a file over the uploader drop area */
 	padding: 12px 16px 0;
 	width: 35%;
 	height: 100%;
-	box-shadow: inset 0px 4px 4px -4px rgba(0, 0, 0, 0.1);
+	box-shadow: inset 0 4px 4px -4px rgba(0, 0, 0, 0.1);
 	border-bottom: 0;
 	border-left: 1px solid #dcdcde;
 	background: #f6f7f7;
diff --git a/src/wp-admin/css/nav-menus.css b/src/wp-admin/css/nav-menus.css
index a6804bccaf792..086ceafad807f 100644
--- a/src/wp-admin/css/nav-menus.css
+++ b/src/wp-admin/css/nav-menus.css
@@ -303,7 +303,7 @@ input.bulk-select-switcher:focus + .bulk-select-button-label{
 
 #select-nav-menu-container {
 	text-align: right;
-	padding: 0 10px 3px 10px;
+	padding: 0 10px 3px;
 	margin-bottom: 5px;
 }
 
@@ -433,7 +433,7 @@ input.bulk-select-switcher:focus + .bulk-select-button-label{
 }
 
 #manage-menu .inside {
-	padding: 0px 0px;
+	padding: 0;
 }
 
 /* Custom Links */
@@ -614,7 +614,7 @@ li.menu-item.ui-sortable-helper .menu-item-transport .menu-item-bar {
 }
 
 /* WARNING: The factor of 30px is hardcoded into the nav-menus JavaScript. */
-.menu-item-depth-0 { margin-left: 0px; }
+.menu-item-depth-0 { margin-left: 0; }
 .menu-item-depth-1 { margin-left: 30px; }
 .menu-item-depth-2 { margin-left: 60px; }
 .menu-item-depth-3 { margin-left: 90px; }
@@ -627,7 +627,7 @@ li.menu-item.ui-sortable-helper .menu-item-transport .menu-item-bar {
 .menu-item-depth-10 { margin-left: 300px; }
 .menu-item-depth-11 { margin-left: 330px; }
 
-.menu-item-depth-0 .menu-item-transport { margin-left: 0px; }
+.menu-item-depth-0 .menu-item-transport { margin-left: 0; }
 .menu-item-depth-1 .menu-item-transport { margin-left: -30px; }
 .menu-item-depth-2 .menu-item-transport { margin-left: -60px; }
 .menu-item-depth-3 .menu-item-transport { margin-left: -90px; }
@@ -1005,7 +1005,7 @@ body.menu-max-depth-11 { min-width: 1280px !important; }
                 position: sticky;
 				bottom: 0;
 				z-index: 10;
-				box-shadow: 0 -1px 0 0px #ddd;
+				box-shadow: 0 -1px 0 0 #ddd;
         }
 
         #save_menu_header {
diff --git a/src/wp-admin/css/site-health.css b/src/wp-admin/css/site-health.css
index 8c16d4b4a056a..60f07f2d0d09d 100644
--- a/src/wp-admin/css/site-health.css
+++ b/src/wp-admin/css/site-health.css
@@ -149,8 +149,8 @@ are styled in the Privacy section of edit.css */
 	width: 0;
 	height: 0;
 	border-style: solid;
-	border-width: 0 10px 5px 10px;
-	border-color: transparent transparent #ffffff transparent;
+	border-width: 0 10px 5px;
+	border-color: transparent transparent #ffffff;
 	right: 20px;
 	top: 5px;
 }
diff --git a/src/wp-admin/css/themes.css b/src/wp-admin/css/themes.css
index b5811c347b59b..04bfdd00f7f7d 100644
--- a/src/wp-admin/css/themes.css
+++ b/src/wp-admin/css/themes.css
@@ -703,7 +703,7 @@ body.folded .theme-browser ~ .theme-overlay .theme-wrap {
 	font-size: 15px;
 	font-weight: 400;
 	line-height: 1.5;
-	margin: 30px 0 0 0;
+	margin: 30px 0 0;
 }
 
 .theme-overlay .theme-tags {
@@ -711,7 +711,7 @@ body.folded .theme-browser ~ .theme-overlay .theme-wrap {
 	color: #646970;
 	font-size: 13px;
 	font-weight: 400;
-	margin: 30px 0 0 0;
+	margin: 30px 0 0;
 	padding-top: 20px;
 }
 
@@ -865,7 +865,7 @@ body.folded .theme-browser ~ .theme-overlay .theme-wrap {
 	}
 
 	.theme-browser .theme .theme-actions {
-		padding: 5px 10px 4px 10px;
+		padding: 5px 10px 4px;
 	}
 
 	.theme-overlay.small-screenshot .theme-screenshots {
@@ -938,7 +938,7 @@ body.folded .theme-browser ~ .theme-overlay .theme-wrap {
 	}
 
 	.theme-overlay .theme-author {
-		margin: 5px 0 15px 0;
+		margin: 5px 0 15px;
 	}
 
 	.theme-overlay .current-label {
@@ -951,7 +951,7 @@ body.folded .theme-browser ~ .theme-overlay .theme-wrap {
 		clear: both;
 		left: 0;
 		right: 0;
-		margin: -5px 0 20px 0;
+		margin: -5px 0 20px;
 		width: 100%;
 		max-width: 280px;
 	}
@@ -1316,7 +1316,7 @@ div#custom-background-image img {
 }
 
 .background-position-control .button-group:last-child > label:last-child .button {
-	border-radius: 0 0 3px 0;
+	border-radius: 0 0 3px;
 }
 
 .background-position-control .button-group:last-child > label:last-child .dashicons {
diff --git a/src/wp-admin/css/widgets.css b/src/wp-admin/css/widgets.css
index c5798c7fb1a81..9d64f979702b4 100644
--- a/src/wp-admin/css/widgets.css
+++ b/src/wp-admin/css/widgets.css
@@ -42,7 +42,7 @@
 
 .widgets-holder-wrap .widget-inside {
 	border-top: none;
-	padding: 1px 15px 15px 15px;
+	padding: 1px 15px 15px;
 	line-height: 1.23076923;
 }
 
@@ -436,7 +436,7 @@ div#widgets-left .widget-holder {
 	width: 100%;
 	background: transparent;
 	padding: 0;
-	margin: 0 0 20px 0;
+	margin: 0 0 20px;
 	border: none;
 	box-shadow: none;
 }
@@ -471,7 +471,7 @@ div#widgets-right .sidebars-column-2 {
 }
 
 div#widgets-right .widgets-holder-wrap {
-	margin: 10px 0 0 0;
+	margin: 10px 0 0;
 }
 
 div#widgets-right .sidebar-description {
@@ -734,7 +734,7 @@ div#widgets-right .widget-top:hover,
 }
 
 .widgets-chooser .widgets-chooser-actions {
-	padding: 10px 0 12px 0;
+	padding: 10px 0 12px;
 	text-align: center;
 }
 
@@ -826,7 +826,7 @@ ul.CodeMirror-hints {
 
 	.widget-access-link {
 		float: none;
-		margin: 15px 0 0 0;
+		margin: 15px 0 0;
 	}
 }
 
diff --git a/src/wp-includes/css/editor.css b/src/wp-includes/css/editor.css
index e75e9b7b4db0c..fac059c7874ef 100644
--- a/src/wp-includes/css/editor.css
+++ b/src/wp-includes/css/editor.css
@@ -623,7 +623,7 @@ div.mce-path {
 div.mce-menubar {
 	border-color: #dcdcde;
 	background: #fff;
-	border-width: 0px 0px 1px;
+	border-width: 0 0 1px;
 }
 
 .mce-menubar .mce-menubtn:hover,
@@ -643,7 +643,7 @@ div.mce-menubar {
 div.mce-menu .mce-menu-item-sep,
 .mce-menu-item-sep:hover {
 	border-bottom: 1px solid #dcdcde;
-	height: 0px;
+	height: 0;
 	margin: 5px 0;
 }
 
diff --git a/src/wp-includes/css/media-views.css b/src/wp-includes/css/media-views.css
index ae62e862ab7d4..02c32c4998cb8 100644
--- a/src/wp-includes/css/media-views.css
+++ b/src/wp-includes/css/media-views.css
@@ -1394,7 +1394,7 @@
 	top: 50%;
 	left: 15%;
 	width: 70%;
-	margin: -5px 0 0 0;
+	margin: -5px 0 0;
 }
 
 .media-uploader-status {
@@ -1976,7 +1976,7 @@
 }
 
 .media-modal .imgedit-wrap .imgedit-panel-content {
-	padding: 16px 16px 0 16px;
+	padding: 16px 16px 0;
 	position: absolute;
 	top: 0;
 	right: 282px;
@@ -2289,7 +2289,7 @@
 
 .image-details .custom-size .sep {
 	float: left;
-	margin: 26px 6px 0 6px;
+	margin: 26px 6px 0;
 }
 
 .image-details .custom-size .description {
@@ -2428,7 +2428,7 @@
 	float: left;
 	width: 25%;
 	text-align: right;
-	margin: 8px 1% 0 1%;
+	margin: 8px 1% 0;
 	line-height: 1.1;
 }
 
@@ -2625,7 +2625,7 @@
 
 	.media-sidebar .setting,
 	.attachment-details .setting {
-		margin: 6px 0px;
+		margin: 6px 0;
 	}
 
 	.media-sidebar .setting input,
@@ -2919,7 +2919,7 @@
 
 	/* Change margin direction on load more button in responsive views. */
 	.load-more-wrapper .load-more-jump {
-		margin: 12px 0 0 0;
+		margin: 12px 0 0;
 	}
 
 }
@@ -2933,7 +2933,7 @@
 
 	/* Change margin direction on load more button in responsive views. */
 	.load-more-wrapper .load-more-jump {
-		margin: 12px 0 0 0;
+		margin: 12px 0 0;
 	}
 
 }
diff --git a/src/wp-includes/css/wp-embed-template.css b/src/wp-includes/css/wp-embed-template.css
index 2c1e294643116..c1f1cc5c847b9 100644
--- a/src/wp-includes/css/wp-embed-template.css
+++ b/src/wp-includes/css/wp-embed-template.css
@@ -301,7 +301,7 @@ p.wp-embed-share-description {
 	width: 100%;
 	border: none;
 	height: 28px;
-	margin: 0 0 10px 0;
+	margin: 0 0 10px;
 	padding: 0 5px;
 	font-size: 14px;
 	font-weight: 400;
diff --git a/src/wp-includes/css/wp-pointer.css b/src/wp-includes/css/wp-pointer.css
index 9263346e06eb2..a1c085cbcfaa0 100644
--- a/src/wp-includes/css/wp-pointer.css
+++ b/src/wp-includes/css/wp-pointer.css
@@ -140,7 +140,7 @@
 .wp-pointer-top .wp-pointer-arrow,
 .wp-pointer-undefined .wp-pointer-arrow {
 	top: 0;
-	border-width: 0 13px 13px 13px;
+	border-width: 0 13px 13px;
 	border-bottom-color: #2271b1;
 }
 
@@ -157,7 +157,7 @@
 
 .wp-pointer-bottom .wp-pointer-arrow {
 	bottom: 0;
-	border-width: 13px 13px 0 13px;
+	border-width: 13px 13px 0;
 	border-top-color: #c3c4c7;
 }
 

From be4552d686a89b39e79ced95664be1d16d896c67 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 2 Sep 2021 22:25:58 +0000
Subject: [PATCH 084/257] Code Modernization: Fix parameter name mismatches for
 parent/child classes in `WP_List_Table::column_default()`.

Matches the method signatures of the parent class and each child class.

Why? PHP 8 introduces the ability to pass named arguments to function/method calls. This means the child and parent method signatures (i.e. parameter names) need to match.

For readability:

- `@since` clearly specifies the original parameter name and its new name as well as why the change happened

- in methods longer than a single line, the generic parameter is reassigned to the original parameter restoring it for context for use within the method. An inline comment is added to explain why this reassignment is made.

Follow-up to [15632], [30679], [31210], [32740], [32753], [32754], [32755], [32756], [32757].

Props jrf, hellofromTonya, @sergeybiryukov, @azaozz, @desrosj, @johnbillion
See #51553.

git-svn-id: https://develop.svn.wordpress.org/trunk@51728 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../includes/class-wp-comments-list-table.php      |  8 +++++---
 .../includes/class-wp-links-list-table.php         |  7 ++++---
 .../includes/class-wp-media-list-table.php         |  8 ++++++--
 .../includes/class-wp-ms-sites-list-table.php      |  7 ++++---
 .../includes/class-wp-ms-themes-list-table.php     | 14 +++++++++-----
 .../includes/class-wp-ms-users-list-table.php      | 12 +++++++++---
 .../includes/class-wp-posts-list-table.php         |  8 ++++++--
 .../includes/class-wp-terms-list-table.php         | 10 ++++++----
 8 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-comments-list-table.php b/src/wp-admin/includes/class-wp-comments-list-table.php
index d62020039d3b4..a027e800cd891 100644
--- a/src/wp-admin/includes/class-wp-comments-list-table.php
+++ b/src/wp-admin/includes/class-wp-comments-list-table.php
@@ -1047,10 +1047,12 @@ public function column_response( $comment ) {
 	}
 
 	/**
-	 * @param WP_Comment $comment     The comment object.
+	 * @since 5.9.0 Renamed `$comment` to `$item` to match parent class for PHP 8 named param.
+	 *
+	 * @param WP_Comment $item        The comment object.
 	 * @param string     $column_name The custom column's name.
 	 */
-	public function column_default( $comment, $column_name ) {
+	public function column_default( $item, $column_name ) {
 		/**
 		 * Fires when the default column output is displayed for a single row.
 		 *
@@ -1059,6 +1061,6 @@ public function column_default( $comment, $column_name ) {
 		 * @param string $column_name The custom column's name.
 		 * @param int    $comment_id  The custom column's unique ID number.
 		 */
-		do_action( 'manage_comments_custom_column', $column_name, $comment->comment_ID );
+		do_action( 'manage_comments_custom_column', $column_name, $item->comment_ID );
 	}
 }
diff --git a/src/wp-admin/includes/class-wp-links-list-table.php b/src/wp-admin/includes/class-wp-links-list-table.php
index b867a8ad1997e..60ba8ed7787ae 100644
--- a/src/wp-admin/includes/class-wp-links-list-table.php
+++ b/src/wp-admin/includes/class-wp-links-list-table.php
@@ -279,11 +279,12 @@ public function column_rating( $link ) {
 	 * Handles the default column output.
 	 *
 	 * @since 4.3.0
+	 * @since 5.9.0 Renamed `$link` to `$item` to match parent class for PHP 8 named param.
 	 *
-	 * @param object $link        Link object.
+	 * @param object $item        Link object.
 	 * @param string $column_name Current column name.
 	 */
-	public function column_default( $link, $column_name ) {
+	public function column_default( $item, $column_name ) {
 		/**
 		 * Fires for each registered custom link column.
 		 *
@@ -292,7 +293,7 @@ public function column_default( $link, $column_name ) {
 		 * @param string $column_name Name of the custom column.
 		 * @param int    $link_id     Link ID.
 		 */
-		do_action( 'manage_link_custom_column', $column_name, $link->link_id );
+		do_action( 'manage_link_custom_column', $column_name, $item->link_id );
 	}
 
 	public function display_rows() {
diff --git a/src/wp-admin/includes/class-wp-media-list-table.php b/src/wp-admin/includes/class-wp-media-list-table.php
index 275d07caca7e8..6c0a499001fd8 100644
--- a/src/wp-admin/includes/class-wp-media-list-table.php
+++ b/src/wp-admin/includes/class-wp-media-list-table.php
@@ -594,11 +594,15 @@ public function column_comments( $post ) {
 	 * Handles output for the default column.
 	 *
 	 * @since 4.3.0
+	 * @since 5.9.0 Renamed `$post` to `$item` to match parent class for PHP 8 named param.
 	 *
-	 * @param WP_Post $post        The current WP_Post object.
+	 * @param WP_Post $item        The current WP_Post object.
 	 * @param string  $column_name Current column name.
 	 */
-	public function column_default( $post, $column_name ) {
+	public function column_default( $item, $column_name ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$post = $item;
+
 		if ( 'categories' === $column_name ) {
 			$taxonomy = 'category';
 		} elseif ( 'tags' === $column_name ) {
diff --git a/src/wp-admin/includes/class-wp-ms-sites-list-table.php b/src/wp-admin/includes/class-wp-ms-sites-list-table.php
index b928ee92c6816..02f7938eadb6b 100644
--- a/src/wp-admin/includes/class-wp-ms-sites-list-table.php
+++ b/src/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -560,11 +560,12 @@ public function column_plugins( $blog ) {
 	 * Handles output for the default column.
 	 *
 	 * @since 4.3.0
+	 * @since 5.9.0 Renamed `$blog` to `$item` to match parent class for PHP 8 named param.
 	 *
-	 * @param array  $blog        Current site.
+	 * @param array  $item        Current site.
 	 * @param string $column_name Current column name.
 	 */
-	public function column_default( $blog, $column_name ) {
+	public function column_default( $item, $column_name ) {
 		/**
 		 * Fires for each registered custom column in the Sites list table.
 		 *
@@ -573,7 +574,7 @@ public function column_default( $blog, $column_name ) {
 		 * @param string $column_name The name of the column to display.
 		 * @param int    $blog_id     The site ID.
 		 */
-		do_action( 'manage_sites_custom_column', $column_name, $blog['blog_id'] );
+		do_action( 'manage_sites_custom_column', $column_name, $item['blog_id'] );
 	}
 
 	/**
diff --git a/src/wp-admin/includes/class-wp-ms-themes-list-table.php b/src/wp-admin/includes/class-wp-ms-themes-list-table.php
index d7d20e238af36..d4ad43df57359 100644
--- a/src/wp-admin/includes/class-wp-ms-themes-list-table.php
+++ b/src/wp-admin/includes/class-wp-ms-themes-list-table.php
@@ -855,13 +855,12 @@ public function column_autoupdates( $theme ) {
 	 * Handles default column output.
 	 *
 	 * @since 4.3.0
+	 * @since 5.9.0 Renamed `$theme` to `$item` to match parent class for PHP 8 named param.
 	 *
-	 * @param WP_Theme $theme       The current WP_Theme object.
+	 * @param WP_Theme $item        The current WP_Theme object.
 	 * @param string   $column_name The current column name.
 	 */
-	public function column_default( $theme, $column_name ) {
-		$stylesheet = $theme->get_stylesheet();
-
+	public function column_default( $item, $column_name ) {
 		/**
 		 * Fires inside each custom column of the Multisite themes list table.
 		 *
@@ -871,7 +870,12 @@ public function column_default( $theme, $column_name ) {
 		 * @param string   $stylesheet  Directory name of the theme.
 		 * @param WP_Theme $theme       Current WP_Theme object.
 		 */
-		do_action( 'manage_themes_custom_column', $column_name, $stylesheet, $theme );
+		do_action(
+			'manage_themes_custom_column',
+			$column_name,
+			$item->get_stylesheet(), // Directory name of the theme.
+			$item // Theme object.
+		);
 	}
 
 	/**
diff --git a/src/wp-admin/includes/class-wp-ms-users-list-table.php b/src/wp-admin/includes/class-wp-ms-users-list-table.php
index 8e1656ed6c583..825f8e86ef85c 100644
--- a/src/wp-admin/includes/class-wp-ms-users-list-table.php
+++ b/src/wp-admin/includes/class-wp-ms-users-list-table.php
@@ -442,13 +442,19 @@ public function column_blogs( $user ) {
 	 * Handles the default column output.
 	 *
 	 * @since 4.3.0
+	 * @since 5.9.0 Renamed `$user` to `$item` to match parent class for PHP 8 named param.
 	 *
-	 * @param WP_User $user        The current WP_User object.
+	 * @param WP_User $item        The current WP_User object.
 	 * @param string  $column_name The current column name.
 	 */
-	public function column_default( $user, $column_name ) {
+	public function column_default( $item, $column_name ) {
 		/** This filter is documented in wp-admin/includes/class-wp-users-list-table.php */
-		echo apply_filters( 'manage_users_custom_column', '', $column_name, $user->ID );
+		echo apply_filters(
+			'manage_users_custom_column',
+			'', // Custom column output. Default empty.
+			$column_name,
+			$item->ID // User ID.
+		);
 	}
 
 	public function display_rows() {
diff --git a/src/wp-admin/includes/class-wp-posts-list-table.php b/src/wp-admin/includes/class-wp-posts-list-table.php
index f8687efb956c8..9b3a03b1c0370 100644
--- a/src/wp-admin/includes/class-wp-posts-list-table.php
+++ b/src/wp-admin/includes/class-wp-posts-list-table.php
@@ -1235,11 +1235,15 @@ public function column_author( $post ) {
 	 * Handles the default column output.
 	 *
 	 * @since 4.3.0
+	 * @since 5.9.0 Renamed `$post` to `$item` to match parent class for PHP 8 named param.
 	 *
-	 * @param WP_Post $post        The current WP_Post object.
+	 * @param WP_Post $item        The current WP_Post object.
 	 * @param string  $column_name The current column name.
 	 */
-	public function column_default( $post, $column_name ) {
+	public function column_default( $item, $column_name ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$post = $item;
+
 		if ( 'categories' === $column_name ) {
 			$taxonomy = 'category';
 		} elseif ( 'tags' === $column_name ) {
diff --git a/src/wp-admin/includes/class-wp-terms-list-table.php b/src/wp-admin/includes/class-wp-terms-list-table.php
index f6697f13a9d37..ef4b37ee4dcf3 100644
--- a/src/wp-admin/includes/class-wp-terms-list-table.php
+++ b/src/wp-admin/includes/class-wp-terms-list-table.php
@@ -620,11 +620,13 @@ public function column_links( $tag ) {
 	}
 
 	/**
-	 * @param WP_Term $tag         Term object.
+	 * @since 5.9.0 Renamed `$tag` to `$item` to match parent class for PHP 8 named param.
+	 *
+	 * @param WP_Term $item        Term object.
 	 * @param string  $column_name Name of the column.
 	 * @return string
 	 */
-	public function column_default( $tag, $column_name ) {
+	public function column_default( $item, $column_name ) {
 		/**
 		 * Filters the displayed columns in the terms list table.
 		 *
@@ -638,11 +640,11 @@ public function column_default( $tag, $column_name ) {
 		 *
 		 * @since 2.8.0
 		 *
-		 * @param string $string      Blank string.
+		 * @param string $string      Custom column output. Default empty.
 		 * @param string $column_name Name of the column.
 		 * @param int    $term_id     Term ID.
 		 */
-		return apply_filters( "manage_{$this->screen->taxonomy}_custom_column", '', $column_name, $tag->term_id );
+		return apply_filters( "manage_{$this->screen->taxonomy}_custom_column", '', $column_name, $item->term_id );
 	}
 
 	/**

From b83b01e1b01429dc4a6da49ec23e1f7dfc4ae446 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Fri, 3 Sep 2021 01:36:20 +0000
Subject: [PATCH 085/257] Docs: Move `@since` notes from the `safe_style_css`
 filter to the `safecss_filter_attr()` function.

The filter allows to modify the list of allowed CSS attributes, however support for specific CSS attributes is added to the function rather than the filter.

Follow-up to [37931], [38121], [42880], [44136], [44531], [45242], [45363], [46235], [46793], [50634], [50923].

Props tmatsuur, muhammadfaizanhaidar, sabernhardt.
Fixes #53731.

git-svn-id: https://develop.svn.wordpress.org/trunk@51729 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/kses.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/wp-includes/kses.php b/src/wp-includes/kses.php
index cf00df3cbda09..0b24a1ba0c13f 100644
--- a/src/wp-includes/kses.php
+++ b/src/wp-includes/kses.php
@@ -2152,6 +2152,16 @@ function kses_init() {
  * Filters an inline style attribute and removes disallowed rules.
  *
  * @since 2.8.1
+ * @since 4.4.0 Added support for `min-height`, `max-height`, `min-width`, and `max-width`.
+ * @since 4.6.0 Added support for `list-style-type`.
+ * @since 5.0.0 Added support for `background-image`.
+ * @since 5.1.0 Added support for `text-transform`.
+ * @since 5.2.0 Added support for `background-position` and `grid-template-columns`.
+ * @since 5.3.0 Added support for `grid`, `flex` and `column` layout properties.
+ *              Extend `background-*` support of individual properties.
+ * @since 5.3.1 Added support for gradient backgrounds.
+ * @since 5.7.1 Added support for `object-position`.
+ * @since 5.8.0 Added support for `calc()` and `var()` values.
  *
  * @param string $css        A string of CSS rules.
  * @param string $deprecated Not used.
@@ -2170,19 +2180,9 @@ function safecss_filter_attr( $css, $deprecated = '' ) {
 	$css_array = explode( ';', trim( $css ) );
 
 	/**
-	 * Filters list of allowed CSS attributes.
+	 * Filters the list of allowed CSS attributes.
 	 *
 	 * @since 2.8.1
-	 * @since 4.4.0 Added support for `min-height`, `max-height`, `min-width`, and `max-width`.
-	 * @since 4.6.0 Added support for `list-style-type`.
-	 * @since 5.0.0 Added support for `background-image`.
-	 * @since 5.1.0 Added support for `text-transform`.
-	 * @since 5.2.0 Added support for `background-position` and `grid-template-columns`.
-	 * @since 5.3.0 Added support for `grid`, `flex` and `column` layout properties.
-	 *              Extend `background-*` support of individual properties.
-	 * @since 5.3.1 Added support for gradient backgrounds.
-	 * @since 5.7.1 Added support for `object-position`.
-	 * @since 5.8.0 Added support for `calc()` and `var()` values.
 	 *
 	 * @param string[] $attr Array of allowed CSS attributes.
 	 */

From 26c0800c4625e1668bf91f97319abebb9ad6bd8f Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sat, 4 Sep 2021 00:37:21 +0000
Subject: [PATCH 086/257] Docs: Fix typo in a comment in
 `WP_Customize_Manager::get_return_url()`.

Follow-up to [46754].

See #53399.

git-svn-id: https://develop.svn.wordpress.org/trunk@51730 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-customize-manager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/class-wp-customize-manager.php b/src/wp-includes/class-wp-customize-manager.php
index 25660393a070d..b0da2b0a843f8 100644
--- a/src/wp-includes/class-wp-customize-manager.php
+++ b/src/wp-includes/class-wp-customize-manager.php
@@ -4688,7 +4688,7 @@ public function get_return_url() {
 
 			/*
 			 * If the return URL is a page added by a theme to the Appearance menu via add_submenu_page(),
-			 * verify that belongs to the active theme, otherwise fall back to the Themes screen.
+			 * verify that it belongs to the active theme, otherwise fall back to the Themes screen.
 			 */
 			if ( isset( $query_vars['page'] ) && ! isset( $_registered_pages[ "appearance_page_{$query_vars['page']}" ] ) ) {
 				$return_url = admin_url( 'themes.php' );

From a52bc208ba436a6f30c336d867eb9112ce9705b2 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sun, 5 Sep 2021 11:05:58 +0000
Subject: [PATCH 087/257] =?UTF-8?q?Docs:=20=D0=A1larify=20that=20`term=5Fi?=
 =?UTF-8?q?d`=20is=20a=20valid=20value=20for=20the=20`$field`=20parameter?=
 =?UTF-8?q?=20of=20`get=5Fterm=5Fby()`.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As `term_id` is the actual property name of the `WP_Term`, it should appear first and we should make it more clear that `id` and `ID` are aliases.

Follow-up to [6254], [25334], [38677], [47865], [47870].

Props gazchap, audrasjb.
Fixes #54065.

git-svn-id: https://develop.svn.wordpress.org/trunk@51731 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/taxonomy.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/taxonomy.php b/src/wp-includes/taxonomy.php
index 5d9cf1ad2c8d1..4014a62655034 100644
--- a/src/wp-includes/taxonomy.php
+++ b/src/wp-includes/taxonomy.php
@@ -1006,7 +1006,7 @@ function get_term( $term, $taxonomy = '', $output = OBJECT, $filter = 'raw' ) {
  *
  * @see sanitize_term_field() The $context param lists the available values for get_term_by() $filter param.
  *
- * @param string     $field    Either 'slug', 'name', 'id' or 'ID' (term_id), or 'term_taxonomy_id'.
+ * @param string     $field    Either 'slug', 'name', 'term_id' (or 'id', 'ID'), or 'term_taxonomy_id'.
  * @param string|int $value    Search for this term value.
  * @param string     $taxonomy Taxonomy name. Optional, if `$field` is 'term_taxonomy_id'.
  * @param string     $output   Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which

From b3326d8aa4aee71524261d980abcebe2758d5361 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 6 Sep 2021 13:34:36 +0000
Subject: [PATCH 088/257] Docs: Correct the `post_submitbox_minor_actions` hook
 description.

The action fires after the Save Draft (or Save as Pending) and Preview (or Preview Changes) buttons in the Publish meta box.

The previous description stated that the action fires before the post date/time setting, which was not quite correct, as there are also post status and visibility settings between the action and the date/time setting.

Follow-up to [34895].

Props bedas, audrasjb.
Fixes #54045.

git-svn-id: https://develop.svn.wordpress.org/trunk@51732 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/meta-boxes.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/wp-admin/includes/meta-boxes.php b/src/wp-admin/includes/meta-boxes.php
index 517a81d049a98..0dcc9f5e5cb3f 100644
--- a/src/wp-admin/includes/meta-boxes.php
+++ b/src/wp-admin/includes/meta-boxes.php
@@ -87,7 +87,8 @@ function post_submit_meta_box( $post, $args = array() ) {
 		endif;
 
 		/**
-		 * Fires before the post time/date setting in the Publish meta box.
+		 * Fires after the Save Draft (or Save as Pending) and Preview (or Preview Changes) buttons
+		 * in the Publish meta box.
 		 *
 		 * @since 4.4.0
 		 *

From c6a9a598bb956d688fcee0b56277f0be4d9e5dec Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 7 Sep 2021 12:53:35 +0000
Subject: [PATCH 089/257] Docs: Correct documentation for the
 `in_plugin_update_message-{$file}` filter.

The `$response` parameter is an object, not an array.

This is a minor inconsistency with the corresponding `in_theme_update_message-{$theme_key}` action for themes, where the `$response` parameter is an array.

For backward compatibility, it is safer not to change the parameter type at this point, but to make sure the documentation is correct.

Follow-up to [11193], [16141], [26540].

Props davidmosterd, audrasjb, SergeyBiryukov.
See #40006.

git-svn-id: https://develop.svn.wordpress.org/trunk@51733 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/update.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wp-admin/includes/update.php b/src/wp-admin/includes/update.php
index aeccc3e049cb7..29a5f0c783878 100644
--- a/src/wp-admin/includes/update.php
+++ b/src/wp-admin/includes/update.php
@@ -558,7 +558,7 @@ function wp_plugin_update_row( $file, $plugin_data ) {
 		 *
 		 * @since 2.8.0
 		 *
-		 * @param array $plugin_data {
+		 * @param array  $plugin_data {
 		 *     An array of plugin metadata.
 		 *
 		 *     @type string $name        The human-readable name of the plugin.
@@ -574,8 +574,8 @@ function wp_plugin_update_row( $file, $plugin_data ) {
 		 *     @type string $author_name Plugin author's name.
 		 *     @type bool   $update      Whether there's an available update. Default null.
 		 * }
-		 * @param array $response {
-		 *     An array of metadata about the available plugin update.
+		 * @param object $response {
+		 *     An object of metadata about the available plugin update.
 		 *
 		 *     @type int    $id          Plugin ID.
 		 *     @type string $slug        Plugin slug.

From 60876f2954499867b37c4e671d02c44d85435694 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Tue, 7 Sep 2021 16:56:34 +0000
Subject: [PATCH 090/257] Code Modernization: Improve `@since` message in
 `WP_List_Table::column_default()`.

Improves the `@since` message to more clearly specify the reason for this change" for PHP 8 named parameter support.

Follow-up to [51728].

Props jrf.
See #51553.

git-svn-id: https://develop.svn.wordpress.org/trunk@51734 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-comments-list-table.php  | 2 +-
 src/wp-admin/includes/class-wp-links-list-table.php     | 2 +-
 src/wp-admin/includes/class-wp-media-list-table.php     | 2 +-
 src/wp-admin/includes/class-wp-ms-sites-list-table.php  | 2 +-
 src/wp-admin/includes/class-wp-ms-themes-list-table.php | 2 +-
 src/wp-admin/includes/class-wp-ms-users-list-table.php  | 2 +-
 src/wp-admin/includes/class-wp-posts-list-table.php     | 2 +-
 src/wp-admin/includes/class-wp-terms-list-table.php     | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-comments-list-table.php b/src/wp-admin/includes/class-wp-comments-list-table.php
index a027e800cd891..c4cc308b3e0c1 100644
--- a/src/wp-admin/includes/class-wp-comments-list-table.php
+++ b/src/wp-admin/includes/class-wp-comments-list-table.php
@@ -1047,7 +1047,7 @@ public function column_response( $comment ) {
 	}
 
 	/**
-	 * @since 5.9.0 Renamed `$comment` to `$item` to match parent class for PHP 8 named param.
+	 * @since 5.9.0 Renamed `$comment` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @param WP_Comment $item        The comment object.
 	 * @param string     $column_name The custom column's name.
diff --git a/src/wp-admin/includes/class-wp-links-list-table.php b/src/wp-admin/includes/class-wp-links-list-table.php
index 60ba8ed7787ae..21d4724e622b2 100644
--- a/src/wp-admin/includes/class-wp-links-list-table.php
+++ b/src/wp-admin/includes/class-wp-links-list-table.php
@@ -279,7 +279,7 @@ public function column_rating( $link ) {
 	 * Handles the default column output.
 	 *
 	 * @since 4.3.0
-	 * @since 5.9.0 Renamed `$link` to `$item` to match parent class for PHP 8 named param.
+	 * @since 5.9.0 Renamed `$link` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @param object $item        Link object.
 	 * @param string $column_name Current column name.
diff --git a/src/wp-admin/includes/class-wp-media-list-table.php b/src/wp-admin/includes/class-wp-media-list-table.php
index 6c0a499001fd8..c3013c84dbe7a 100644
--- a/src/wp-admin/includes/class-wp-media-list-table.php
+++ b/src/wp-admin/includes/class-wp-media-list-table.php
@@ -594,7 +594,7 @@ public function column_comments( $post ) {
 	 * Handles output for the default column.
 	 *
 	 * @since 4.3.0
-	 * @since 5.9.0 Renamed `$post` to `$item` to match parent class for PHP 8 named param.
+	 * @since 5.9.0 Renamed `$post` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @param WP_Post $item        The current WP_Post object.
 	 * @param string  $column_name Current column name.
diff --git a/src/wp-admin/includes/class-wp-ms-sites-list-table.php b/src/wp-admin/includes/class-wp-ms-sites-list-table.php
index 02f7938eadb6b..a95a971f49b26 100644
--- a/src/wp-admin/includes/class-wp-ms-sites-list-table.php
+++ b/src/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -560,7 +560,7 @@ public function column_plugins( $blog ) {
 	 * Handles output for the default column.
 	 *
 	 * @since 4.3.0
-	 * @since 5.9.0 Renamed `$blog` to `$item` to match parent class for PHP 8 named param.
+	 * @since 5.9.0 Renamed `$blog` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @param array  $item        Current site.
 	 * @param string $column_name Current column name.
diff --git a/src/wp-admin/includes/class-wp-ms-themes-list-table.php b/src/wp-admin/includes/class-wp-ms-themes-list-table.php
index d4ad43df57359..5336f8d932ac8 100644
--- a/src/wp-admin/includes/class-wp-ms-themes-list-table.php
+++ b/src/wp-admin/includes/class-wp-ms-themes-list-table.php
@@ -855,7 +855,7 @@ public function column_autoupdates( $theme ) {
 	 * Handles default column output.
 	 *
 	 * @since 4.3.0
-	 * @since 5.9.0 Renamed `$theme` to `$item` to match parent class for PHP 8 named param.
+	 * @since 5.9.0 Renamed `$theme` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @param WP_Theme $item        The current WP_Theme object.
 	 * @param string   $column_name The current column name.
diff --git a/src/wp-admin/includes/class-wp-ms-users-list-table.php b/src/wp-admin/includes/class-wp-ms-users-list-table.php
index 825f8e86ef85c..20e1fc1c3357d 100644
--- a/src/wp-admin/includes/class-wp-ms-users-list-table.php
+++ b/src/wp-admin/includes/class-wp-ms-users-list-table.php
@@ -442,7 +442,7 @@ public function column_blogs( $user ) {
 	 * Handles the default column output.
 	 *
 	 * @since 4.3.0
-	 * @since 5.9.0 Renamed `$user` to `$item` to match parent class for PHP 8 named param.
+	 * @since 5.9.0 Renamed `$user` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @param WP_User $item        The current WP_User object.
 	 * @param string  $column_name The current column name.
diff --git a/src/wp-admin/includes/class-wp-posts-list-table.php b/src/wp-admin/includes/class-wp-posts-list-table.php
index 9b3a03b1c0370..113f7e9f937b3 100644
--- a/src/wp-admin/includes/class-wp-posts-list-table.php
+++ b/src/wp-admin/includes/class-wp-posts-list-table.php
@@ -1235,7 +1235,7 @@ public function column_author( $post ) {
 	 * Handles the default column output.
 	 *
 	 * @since 4.3.0
-	 * @since 5.9.0 Renamed `$post` to `$item` to match parent class for PHP 8 named param.
+	 * @since 5.9.0 Renamed `$post` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @param WP_Post $item        The current WP_Post object.
 	 * @param string  $column_name The current column name.
diff --git a/src/wp-admin/includes/class-wp-terms-list-table.php b/src/wp-admin/includes/class-wp-terms-list-table.php
index ef4b37ee4dcf3..ab6e135cc3b1c 100644
--- a/src/wp-admin/includes/class-wp-terms-list-table.php
+++ b/src/wp-admin/includes/class-wp-terms-list-table.php
@@ -620,7 +620,7 @@ public function column_links( $tag ) {
 	}
 
 	/**
-	 * @since 5.9.0 Renamed `$tag` to `$item` to match parent class for PHP 8 named param.
+	 * @since 5.9.0 Renamed `$tag` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @param WP_Term $item        Term object.
 	 * @param string  $column_name Name of the column.

From a5423694f740186b920188cfb8d612fe170c63b0 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Tue, 7 Sep 2021 18:18:10 +0000
Subject: [PATCH 091/257] Code Modernization: Fix parameter name mismatches for
 parent/child classes in `WP_List_Table::column_cb()`.

Matches the method signatures of the parent class and each child class.

Why? PHP 8 introduces the ability to pass named arguments to function/method calls. This means the child and parent method signatures (i.e. parameter names) need to match.

For readability:

- `@since` clearly specifies the original parameter name and its new name as well as why the change happened

- in methods longer than a single line, the generic parameter is reassigned to the original parameter restoring it for context for use within the method. An inline comment is added to explain why this reassignment is made.

Follow-up to [15632], [30679], [31210], [32740], [32753], [32754], [32755], [32756], [32757].

Props jrf, hellofromTonya, sergeybiryukov, azaozz, desrosj, johnbillion.
See #51553.

git-svn-id: https://develop.svn.wordpress.org/trunk@51735 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-comments-list-table.php  | 9 +++++++--
 src/wp-admin/includes/class-wp-links-list-table.php     | 8 ++++++--
 src/wp-admin/includes/class-wp-media-list-table.php     | 8 ++++++--
 src/wp-admin/includes/class-wp-ms-sites-list-table.php  | 8 ++++++--
 src/wp-admin/includes/class-wp-ms-themes-list-table.php | 7 +++++--
 src/wp-admin/includes/class-wp-ms-users-list-table.php  | 8 ++++++--
 src/wp-admin/includes/class-wp-posts-list-table.php     | 7 +++++--
 src/wp-admin/includes/class-wp-terms-list-table.php     | 9 +++++++--
 8 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-comments-list-table.php b/src/wp-admin/includes/class-wp-comments-list-table.php
index c4cc308b3e0c1..4efe76dd41c58 100644
--- a/src/wp-admin/includes/class-wp-comments-list-table.php
+++ b/src/wp-admin/includes/class-wp-comments-list-table.php
@@ -868,9 +868,14 @@ protected function handle_row_actions( $comment, $column_name, $primary ) {
 	}
 
 	/**
-	 * @param WP_Comment $comment The comment object.
+	 * @since 5.9.0 Renamed `$comment` to `$item` to match parent class for PHP 8 named parameter support.
+	 *
+	 * @param WP_Comment $item The comment object.
 	 */
-	public function column_cb( $comment ) {
+	public function column_cb( $item ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$comment = $item;
+
 		if ( $this->user_can ) {
 			?>
 		<label class="screen-reader-text" for="cb-select-<?php echo $comment->comment_ID; ?>"><?php _e( 'Select comment' ); ?></label>
diff --git a/src/wp-admin/includes/class-wp-links-list-table.php b/src/wp-admin/includes/class-wp-links-list-table.php
index 21d4724e622b2..8c2d06bb2c931 100644
--- a/src/wp-admin/includes/class-wp-links-list-table.php
+++ b/src/wp-admin/includes/class-wp-links-list-table.php
@@ -166,10 +166,14 @@ protected function get_default_primary_column_name() {
 	 * Handles the checkbox column output.
 	 *
 	 * @since 4.3.0
+	 * @since 5.9.0 Renamed `$link` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param object $link The current link object.
+	 * @param object $item The current link object.
 	 */
-	public function column_cb( $link ) {
+	public function column_cb( $item ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$link = $item;
+
 		?>
 		<label class="screen-reader-text" for="cb-select-<?php echo $link->link_id; ?>">
 			<?php
diff --git a/src/wp-admin/includes/class-wp-media-list-table.php b/src/wp-admin/includes/class-wp-media-list-table.php
index c3013c84dbe7a..a95b2a332ed9e 100644
--- a/src/wp-admin/includes/class-wp-media-list-table.php
+++ b/src/wp-admin/includes/class-wp-media-list-table.php
@@ -387,10 +387,14 @@ protected function get_sortable_columns() {
 	 * Handles the checkbox column output.
 	 *
 	 * @since 4.3.0
+	 * @since 5.9.0 Renamed `$post` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param WP_Post $post The current WP_Post object.
+	 * @param WP_Post $item The current WP_Post object.
 	 */
-	public function column_cb( $post ) {
+	public function column_cb( $item ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$post = $item;
+
 		if ( current_user_can( 'edit_post', $post->ID ) ) {
 			?>
 			<label class="screen-reader-text" for="cb-select-<?php echo $post->ID; ?>">
diff --git a/src/wp-admin/includes/class-wp-ms-sites-list-table.php b/src/wp-admin/includes/class-wp-ms-sites-list-table.php
index a95a971f49b26..3b41e21e5f6c1 100644
--- a/src/wp-admin/includes/class-wp-ms-sites-list-table.php
+++ b/src/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -396,10 +396,14 @@ protected function get_sortable_columns() {
 	 * Handles the checkbox column output.
 	 *
 	 * @since 4.3.0
+	 * @since 5.9.0 Renamed `$blog` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param array $blog Current site.
+	 * @param array $item Current site.
 	 */
-	public function column_cb( $blog ) {
+	public function column_cb( $item ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$blog = $item;
+
 		if ( ! is_main_site( $blog['blog_id'] ) ) :
 			$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
 			?>
diff --git a/src/wp-admin/includes/class-wp-ms-themes-list-table.php b/src/wp-admin/includes/class-wp-ms-themes-list-table.php
index 5336f8d932ac8..dd6b6d6c17961 100644
--- a/src/wp-admin/includes/class-wp-ms-themes-list-table.php
+++ b/src/wp-admin/includes/class-wp-ms-themes-list-table.php
@@ -505,10 +505,13 @@ public function display_rows() {
 	 * Handles the checkbox column output.
 	 *
 	 * @since 4.3.0
+	 * @since 5.9.0 Renamed `$theme` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param WP_Theme $theme The current WP_Theme object.
+	 * @param WP_Theme $item The current WP_Theme object.
 	 */
-	public function column_cb( $theme ) {
+	public function column_cb( $item ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$theme       = $item;
 		$checkbox_id = 'checkbox_' . md5( $theme->get( 'Name' ) );
 		?>
 		<input type="checkbox" name="checked[]" value="<?php echo esc_attr( $theme->get_stylesheet() ); ?>" id="<?php echo $checkbox_id; ?>" />
diff --git a/src/wp-admin/includes/class-wp-ms-users-list-table.php b/src/wp-admin/includes/class-wp-ms-users-list-table.php
index 20e1fc1c3357d..726d83092f9e9 100644
--- a/src/wp-admin/includes/class-wp-ms-users-list-table.php
+++ b/src/wp-admin/includes/class-wp-ms-users-list-table.php
@@ -227,10 +227,14 @@ protected function get_sortable_columns() {
 	 * Handles the checkbox column output.
 	 *
 	 * @since 4.3.0
+	 * @since 5.9.0 Renamed `$user` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param WP_User $user The current WP_User object.
+	 * @param WP_User $item The current WP_User object.
 	 */
-	public function column_cb( $user ) {
+	public function column_cb( $item ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$user = $item;
+
 		if ( is_super_admin( $user->ID ) ) {
 			return;
 		}
diff --git a/src/wp-admin/includes/class-wp-posts-list-table.php b/src/wp-admin/includes/class-wp-posts-list-table.php
index 113f7e9f937b3..a4e089948139d 100644
--- a/src/wp-admin/includes/class-wp-posts-list-table.php
+++ b/src/wp-admin/includes/class-wp-posts-list-table.php
@@ -971,10 +971,13 @@ private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenu
 	 * Handles the checkbox column output.
 	 *
 	 * @since 4.3.0
+	 * @since 5.9.0 Renamed `$post` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param WP_Post $post The current WP_Post object.
+	 * @param WP_Post $item The current WP_Post object.
 	 */
-	public function column_cb( $post ) {
+	public function column_cb( $item ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$post = $item;
 		$show = current_user_can( 'edit_post', $post->ID );
 
 		/**
diff --git a/src/wp-admin/includes/class-wp-terms-list-table.php b/src/wp-admin/includes/class-wp-terms-list-table.php
index ab6e135cc3b1c..0b931c4228175 100644
--- a/src/wp-admin/includes/class-wp-terms-list-table.php
+++ b/src/wp-admin/includes/class-wp-terms-list-table.php
@@ -364,10 +364,15 @@ public function single_row( $tag, $level = 0 ) {
 	}
 
 	/**
-	 * @param WP_Term $tag Term object.
+	 * @since 5.9.0 Renamed `$tag` to `$item` to match parent class for PHP 8 named parameter support.
+	 *
+	 * @param WP_Term $item Term object.
 	 * @return string
 	 */
-	public function column_cb( $tag ) {
+	public function column_cb( $item ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$tag = $item;
+
 		if ( current_user_can( 'delete_term', $tag->term_id ) ) {
 			return sprintf(
 				'<label class="screen-reader-text" for="cb-select-%1$s">%2$s</label>' .

From 031e8ae457068450a51bff9c881d5e78455178e7 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Tue, 7 Sep 2021 19:22:57 +0000
Subject: [PATCH 092/257] Build/Test Tools: Fix CI for running tests on PHP
 8.1.

This fixes the CI for PHP 8.1 while retaining the needed improvements for local testing when running `npm run test:php-composer` by:

* Replacing the npm script with the full node command
* Removing the `composer update` command from the `env:install` process

Props BinaryKitten, hellofromTonya

See #53945


git-svn-id: https://develop.svn.wordpress.org/trunk@51736 602fd350-edb4-49c9-b593-d223f7449a82
---
 .github/workflows/phpunit-tests.yml | 16 ++++++++--------
 tools/local-env/scripts/install.js  |  9 ---------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
index c855f0cd31348..efad1739d62ca 100644
--- a/.github/workflows/phpunit-tests.yml
+++ b/.github/workflows/phpunit-tests.yml
@@ -191,41 +191,41 @@ jobs:
 
       - name: Run slow PHPUnit tests
         if: ${{ matrix.split_slow }}
-        run: npm run test:php-composer -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ${{ env.SLOW_TESTS }}
+        run: node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ${{ env.SLOW_TESTS }}
 
       - name: Run PHPUnit tests for single site excluding slow tests
         if: ${{ matrix.php < '7.0' && ! matrix.split_slow && ! matrix.multisite }}
-        run: npm run test:php-composer -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-required
+        run: node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-required
 
       - name: Run PHPUnit tests for Multisite excluding slow tests
         if: ${{ matrix.php < '7.0' && ! matrix.split_slow && matrix.multisite }}
-        run: npm run test:php-composer -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-excluded,oembed-headers
+        run: node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-excluded,oembed-headers
 
       - name: Run PHPUnit tests
         if: ${{ matrix.php >= '7.0' }}
         continue-on-error: ${{ matrix.php == '8.1' }}
-        run: npm run test:php-composer -- --verbose -c ${{ env.PHPUNIT_CONFIG }}
+        run: node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }}
 
       - name: Run AJAX tests
         if: ${{ ! matrix.split_slow }}
         continue-on-error: ${{ matrix.php == '8.1' }}
-        run: npm run test:php-composer -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ajax
+        run: node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ajax
 
       - name: Run ms-files tests as a multisite install
         if: ${{ matrix.multisite && ! matrix.split_slow }}
         continue-on-error: ${{ matrix.php == '8.1' }}
-        run: npm run test:php-composer -- --verbose -c tests/phpunit/multisite.xml --group ms-files
+        run: node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit --verbose -c tests/phpunit/multisite.xml --group ms-files
 
       - name: Run external HTTP tests
         if: ${{ ! matrix.multisite && ! matrix.split_slow }}
         continue-on-error: ${{ matrix.php == '8.1' }}
-        run: npm run test:php-composer -- --verbose -c phpunit.xml.dist --group external-http
+        run: node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit --verbose -c phpunit.xml.dist --group external-http
 
       # __fakegroup__ is excluded to force PHPUnit to ignore the <exclude> settings in phpunit.xml.dist.
       - name: Run (xDebug) tests
         if: ${{ ! matrix.split_slow }}
         continue-on-error: ${{ matrix.php == '8.1' }}
-        run: LOCAL_PHP_XDEBUG=true npm run test:php-composer -- -v --group xdebug --exclude-group __fakegroup__
+        run: LOCAL_PHP_XDEBUG=true node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit -v --group xdebug --exclude-group __fakegroup__
 
       - name: Ensure version-controlled files are not modified or deleted
         run: git diff --exit-code
diff --git a/tools/local-env/scripts/install.js b/tools/local-env/scripts/install.js
index 762273598e77d..4a21b99953cb1 100644
--- a/tools/local-env/scripts/install.js
+++ b/tools/local-env/scripts/install.js
@@ -22,8 +22,6 @@ renameSync( 'src/wp-config.php', 'wp-config.php' );
 
 install_wp_importer();
 
-install_composer_dependencies();
-
 // Read in wp-tests-config-sample.php, edit it to work with our config, then write it to wp-tests-config.php.
 const testConfig = readFileSync( 'wp-tests-config-sample.php', 'utf8' )
 	.replace( 'youremptytestdbnamehere', 'wordpress_develop_tests' )
@@ -59,10 +57,3 @@ function install_wp_importer() {
 	execSync( `docker-compose exec -T php rm -rf ${testPluginDirectory}`, { stdio: 'inherit' } );
 	execSync( `docker-compose exec -T php git clone https://github.com/WordPress/wordpress-importer.git ${testPluginDirectory} --depth=1`, { stdio: 'inherit' } );
 }
-
-/**
- * Installs the Composer package dependencies within the Docker environment.
- */
-function install_composer_dependencies() {
-	execSync( `docker-compose run -T php composer update -W`, { stdio: 'inherit' } );
-}

From 16b04903feec8216bdd2e6230f4ad511a9238db1 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Tue, 7 Sep 2021 19:23:00 +0000
Subject: [PATCH 093/257] Code Modernization: Fix parameter name mismatches for
 parent/child classes in `WP_List_Table::handle_row_actions()`.

Matches the method signatures of the parent class and each child class.

Why? PHP 8 introduces the ability to pass named arguments to function/method calls. This means the child and parent method signatures (i.e. parameter names) need to match.

For readability:

- `@since` clearly specifies the original parameter name and its new name as well as why the change happened

- in methods longer than a single line, the generic parameter is reassigned to the original parameter restoring it for context for use within the method. An inline comment is added to explain why this reassignment is made.

Follow-up to [32644], [32664], [32798], [38489], [49183], [49197].

Props jrf, hellofromTonya, sergeybiryukov, azaozz, desrosj, johnbillion.
See #51553.

git-svn-id: https://develop.svn.wordpress.org/trunk@51737 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../includes/class-wp-comments-list-table.php         |  7 +++++--
 src/wp-admin/includes/class-wp-links-list-table.php   |  7 +++++--
 src/wp-admin/includes/class-wp-media-list-table.php   | 11 ++++++++---
 .../includes/class-wp-ms-sites-list-table.php         |  7 +++++--
 .../includes/class-wp-ms-users-list-table.php         |  7 +++++--
 src/wp-admin/includes/class-wp-posts-list-table.php   |  7 +++++--
 src/wp-admin/includes/class-wp-terms-list-table.php   |  7 +++++--
 7 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-comments-list-table.php b/src/wp-admin/includes/class-wp-comments-list-table.php
index 4efe76dd41c58..2fbbbc33287be 100644
--- a/src/wp-admin/includes/class-wp-comments-list-table.php
+++ b/src/wp-admin/includes/class-wp-comments-list-table.php
@@ -651,17 +651,18 @@ public function single_row( $item ) {
 	 * Generate and display row actions links.
 	 *
 	 * @since 4.3.0
+	 * @since 5.9.0 Renamed `$comment` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @global string $comment_status Status for the current listed comments.
 	 *
-	 * @param WP_Comment $comment     The comment object.
+	 * @param WP_Comment $item        The comment object.
 	 * @param string     $column_name Current column name.
 	 * @param string     $primary     Primary column name.
 	 * @return string Row actions output for comments. An empty string
 	 *                if the current column is not the primary column,
 	 *                or if the current user cannot edit the comment.
 	 */
-	protected function handle_row_actions( $comment, $column_name, $primary ) {
+	protected function handle_row_actions( $item, $column_name, $primary ) {
 		global $comment_status;
 
 		if ( $primary !== $column_name ) {
@@ -672,6 +673,8 @@ protected function handle_row_actions( $comment, $column_name, $primary ) {
 			return '';
 		}
 
+		// Restores the more descriptive, specific name for use within this method.
+		$comment            = $item;
 		$the_comment_status = wp_get_comment_status( $comment );
 
 		$out = '';
diff --git a/src/wp-admin/includes/class-wp-links-list-table.php b/src/wp-admin/includes/class-wp-links-list-table.php
index 8c2d06bb2c931..58ee4d6fff966 100644
--- a/src/wp-admin/includes/class-wp-links-list-table.php
+++ b/src/wp-admin/includes/class-wp-links-list-table.php
@@ -317,18 +317,21 @@ public function display_rows() {
 	 * Generates and displays row action links.
 	 *
 	 * @since 4.3.0
+	 * @since 5.9.0 Renamed `$link` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param object $link        Link being acted upon.
+	 * @param object $item        Link being acted upon.
 	 * @param string $column_name Current column name.
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output for links, or an empty string
 	 *                if the current column is not the primary column.
 	 */
-	protected function handle_row_actions( $link, $column_name, $primary ) {
+	protected function handle_row_actions( $item, $column_name, $primary ) {
 		if ( $primary !== $column_name ) {
 			return '';
 		}
 
+		// Restores the more descriptive, specific name for use within this method.
+		$link      = $item;
 		$edit_link = get_edit_bookmark_link( $link );
 
 		$actions           = array();
diff --git a/src/wp-admin/includes/class-wp-media-list-table.php b/src/wp-admin/includes/class-wp-media-list-table.php
index a95b2a332ed9e..cc27e8032492a 100644
--- a/src/wp-admin/includes/class-wp-media-list-table.php
+++ b/src/wp-admin/includes/class-wp-media-list-table.php
@@ -827,20 +827,25 @@ private function _get_row_actions( $post, $att_title ) {
 	 * Generates and displays row action links.
 	 *
 	 * @since 4.3.0
+	 * @since 5.9.0 Renamed `$post` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param WP_Post $post        Attachment being acted upon.
+	 * @param WP_Post $item        Attachment being acted upon.
 	 * @param string  $column_name Current column name.
 	 * @param string  $primary     Primary column name.
 	 * @return string Row actions output for media attachments, or an empty string
 	 *                if the current column is not the primary column.
 	 */
-	protected function handle_row_actions( $post, $column_name, $primary ) {
+	protected function handle_row_actions( $item, $column_name, $primary ) {
 		if ( $primary !== $column_name ) {
 			return '';
 		}
 
 		$att_title = _draft_or_post_title();
+		$actions   = $this->_get_row_actions(
+			$item, // WP_Post object for an attachment.
+			$att_title
+		);
 
-		return $this->row_actions( $this->_get_row_actions( $post, $att_title ) );
+		return $this->row_actions( $actions );
 	}
 }
diff --git a/src/wp-admin/includes/class-wp-ms-sites-list-table.php b/src/wp-admin/includes/class-wp-ms-sites-list-table.php
index 3b41e21e5f6c1..64cab8cecbdc4 100644
--- a/src/wp-admin/includes/class-wp-ms-sites-list-table.php
+++ b/src/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -668,18 +668,21 @@ protected function get_default_primary_column_name() {
 	 * Generates and displays row action links.
 	 *
 	 * @since 4.3.0
+	 * @since 5.9.0 Renamed `$blog` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param array  $blog        Site being acted upon.
+	 * @param array  $item        Site being acted upon.
 	 * @param string $column_name Current column name.
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output for sites in Multisite, or an empty string
 	 *                if the current column is not the primary column.
 	 */
-	protected function handle_row_actions( $blog, $column_name, $primary ) {
+	protected function handle_row_actions( $item, $column_name, $primary ) {
 		if ( $primary !== $column_name ) {
 			return '';
 		}
 
+		// Restores the more descriptive, specific name for use within this method.
+		$blog     = $item;
 		$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
 
 		// Preordered.
diff --git a/src/wp-admin/includes/class-wp-ms-users-list-table.php b/src/wp-admin/includes/class-wp-ms-users-list-table.php
index 726d83092f9e9..3494f8c871f41 100644
--- a/src/wp-admin/includes/class-wp-ms-users-list-table.php
+++ b/src/wp-admin/includes/class-wp-ms-users-list-table.php
@@ -499,18 +499,21 @@ protected function get_default_primary_column_name() {
 	 * Generates and displays row action links.
 	 *
 	 * @since 4.3.0
+	 * @since 5.9.0 Renamed `$user` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param WP_User $user        User being acted upon.
+	 * @param WP_User $item        User being acted upon.
 	 * @param string  $column_name Current column name.
 	 * @param string  $primary     Primary column name.
 	 * @return string Row actions output for users in Multisite, or an empty string
 	 *                if the current column is not the primary column.
 	 */
-	protected function handle_row_actions( $user, $column_name, $primary ) {
+	protected function handle_row_actions( $item, $column_name, $primary ) {
 		if ( $primary !== $column_name ) {
 			return '';
 		}
 
+		// Restores the more descriptive, specific name for use within this method.
+		$user         = $item;
 		$super_admins = get_super_admins();
 
 		$actions = array();
diff --git a/src/wp-admin/includes/class-wp-posts-list-table.php b/src/wp-admin/includes/class-wp-posts-list-table.php
index a4e089948139d..19686959e20b6 100644
--- a/src/wp-admin/includes/class-wp-posts-list-table.php
+++ b/src/wp-admin/includes/class-wp-posts-list-table.php
@@ -1402,18 +1402,21 @@ protected function get_default_primary_column_name() {
 	 * Generates and displays row action links.
 	 *
 	 * @since 4.3.0
+	 * @since 5.9.0 Renamed `$post` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param WP_Post $post        Post being acted upon.
+	 * @param WP_Post $item        Post being acted upon.
 	 * @param string  $column_name Current column name.
 	 * @param string  $primary     Primary column name.
 	 * @return string Row actions output for posts, or an empty string
 	 *                if the current column is not the primary column.
 	 */
-	protected function handle_row_actions( $post, $column_name, $primary ) {
+	protected function handle_row_actions( $item, $column_name, $primary ) {
 		if ( $primary !== $column_name ) {
 			return '';
 		}
 
+		// Restores the more descriptive, specific name for use within this method.
+		$post             = $item;
 		$post_type_object = get_post_type_object( $post->post_type );
 		$can_edit_post    = current_user_can( 'edit_post', $post->ID );
 		$actions          = array();
diff --git a/src/wp-admin/includes/class-wp-terms-list-table.php b/src/wp-admin/includes/class-wp-terms-list-table.php
index 0b931c4228175..e90574908825f 100644
--- a/src/wp-admin/includes/class-wp-terms-list-table.php
+++ b/src/wp-admin/includes/class-wp-terms-list-table.php
@@ -461,18 +461,21 @@ protected function get_default_primary_column_name() {
 	 * Generates and displays row action links.
 	 *
 	 * @since 4.3.0
+	 * @since 5.9.0 Renamed `$tag` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param WP_Term $tag         Tag being acted upon.
+	 * @param WP_Term $item        Tag being acted upon.
 	 * @param string  $column_name Current column name.
 	 * @param string  $primary     Primary column name.
 	 * @return string Row actions output for terms, or an empty string
 	 *                if the current column is not the primary column.
 	 */
-	protected function handle_row_actions( $tag, $column_name, $primary ) {
+	protected function handle_row_actions( $item, $column_name, $primary ) {
 		if ( $primary !== $column_name ) {
 			return '';
 		}
 
+		// Restores the more descriptive, specific name for use within this method.
+		$tag      = $item;
 		$taxonomy = $this->screen->taxonomy;
 		$tax      = get_taxonomy( $taxonomy );
 		$uri      = wp_doing_ajax() ? wp_get_referer() : $_SERVER['REQUEST_URI'];

From 594079c5d108822fcb785bcf02bd797f275961b8 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Tue, 7 Sep 2021 21:30:07 +0000
Subject: [PATCH 094/257] Users: Introduce a `meta_input` argument for
 `wp_insert_user()`.

This allows custom user meta values to be provided when creating or updating a user in the same way custom post meta can be provided to `wp_insert_post()` when creating or updating a post.

Also introduces the `insert_custom_user_meta` to filter these values.

Props desrosj, donmhico

Fixes #41950


git-svn-id: https://develop.svn.wordpress.org/trunk@51738 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/user.php     | 29 ++++++++++++++-
 tests/phpunit/tests/user.php | 72 ++++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php
index 94598e84935a3..55bd546568fe1 100644
--- a/src/wp-includes/user.php
+++ b/src/wp-includes/user.php
@@ -1711,9 +1711,10 @@ function validate_username( $username ) {
  * @since 2.0.0
  * @since 3.6.0 The `aim`, `jabber`, and `yim` fields were removed as default user contact
  *              methods for new installations. See wp_get_user_contact_methods().
- * @since 4.7.0 The user's locale can be passed to `$userdata`.
+ * @since 4.7.0 The `locale` field can be passed to `$userdata`.
  * @since 5.3.0 The `user_activation_key` field can be passed to `$userdata`.
  * @since 5.3.0 The `spam` field can be passed to `$userdata` (Multisite only).
+ * @since 5.9.0 The `meta_input` field can be passed to `$userdata` to allow addition of user meta data.
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
@@ -1758,6 +1759,8 @@ function validate_username( $username ) {
  *                                        as a string literal, not boolean. Default 'true'.
  *     @type string $role                 User's role.
  *     @type string $locale               User's locale. Default empty.
+ *     @type array  $meta_input           Array of custom user meta values keyed by meta key.
+ *                                        Default empty.
  * }
  * @return int|WP_Error The newly created user's ID or a WP_Error object if the user could not
  *                      be created.
@@ -2058,6 +2061,8 @@ function wp_insert_user( $userdata ) {
 	 *
 	 * Does not include contact methods. These are added using `wp_get_user_contact_methods( $user )`.
 	 *
+	 * For custom meta fields, see the {@see 'insert_custom_user_meta'} filter.
+	 *
 	 * @since 4.4.0
 	 * @since 5.8.0 The $userdata parameter was added.
 	 *
@@ -2084,6 +2089,28 @@ function wp_insert_user( $userdata ) {
 	 */
 	$meta = apply_filters( 'insert_user_meta', $meta, $user, $update, $userdata );
 
+	$custom_meta = array();
+	if ( array_key_exists( 'meta_input', $userdata ) && is_array( $userdata['meta_input'] ) && ! empty( $userdata['meta_input'] ) ) {
+		$custom_meta = $userdata['meta_input'];
+	}
+
+	/**
+	 * Filters a user's custom meta values and keys immediately after the user is created or updated
+	 * and before any user meta is inserted or updated.
+	 *
+	 * For non-custom meta fields, see the {@see 'insert_user_meta'} filter.
+	 *
+	 * @since 5.9.0
+	 *
+	 * @param array   $custom_meta Array of custom user meta values keyed by meta key.
+	 * @param WP_User $user        User object.
+	 * @param bool    $update      Whether the user is being updated rather than created.
+	 * @param array   $userdata    The raw array of data passed to wp_insert_user().
+	 */
+	$custom_meta = apply_filters( 'insert_custom_user_meta', $custom_meta, $user, $update, $userdata );
+
+	$meta = array_merge( $meta, $custom_meta );
+
 	// Update user meta.
 	foreach ( $meta as $key => $value ) {
 		update_user_meta( $user_id, $key, $value );
diff --git a/tests/phpunit/tests/user.php b/tests/phpunit/tests/user.php
index 5f94848e05976..c7a04779cd7c6 100644
--- a/tests/phpunit/tests/user.php
+++ b/tests/phpunit/tests/user.php
@@ -1845,6 +1845,78 @@ function test_wp_session_tokens_personal_data_exporter() {
 		$this->assertSame( 'January 29, 2020 09:13 AM', $actual['data'][1]['data'][3]['value'] );
 	}
 
+	/**
+	 * Test `$user_data['meta_input']` args in `wp_insert_user( $user_data )`.
+	 *
+	 * @ticket 41950
+	 */
+	public function test_wp_insert_user_with_meta() {
+		$user_data   = array(
+			'user_login' => 'test_user',
+			'user_pass'  => 'test_password',
+			'user_email' => 'user@example.com',
+			'meta_input' => array(
+				'test_meta_key' => 'test_meta_value',
+				'custom_meta'   => 'custom_value',
+			),
+		);
+		$create_user = wp_insert_user( $user_data );
+
+		$this->assertSame( 'test_meta_value', get_user_meta( $create_user, 'test_meta_key', true ) );
+		$this->assertSame( 'custom_value', get_user_meta( $create_user, 'custom_meta', true ) );
+
+		// Update the user meta thru wp_insert_user.
+		$update_data = array(
+			'ID'         => $create_user,
+			'user_login' => 'test_user',
+			'meta_input' => array(
+				'test_meta_key' => 'test_meta_updated',
+				'custom_meta'   => 'updated_value',
+				'new_meta_k'    => 'new_meta_val',
+			),
+		);
+		$update_user = wp_insert_user( $update_data );
+
+		$this->assertSame( 'test_meta_updated', get_user_meta( $update_user, 'test_meta_key', true ) );
+		$this->assertSame( 'updated_value', get_user_meta( $update_user, 'custom_meta', true ) );
+		$this->assertSame( 'new_meta_val', get_user_meta( $update_user, 'new_meta_k', true ) );
+
+		// Create new user.
+		$new_user_data = array(
+			'user_login' => 'new_test',
+			'user_pass'  => 'new_password',
+			'user_email' => 'new_user@newexample.com',
+			'meta_input' => array(
+				'test_meta_key' => 'test_meta_value',
+				'custom_meta'   => 'new_user_custom_value',
+			),
+		);
+
+		// Hook filter
+		add_filter( 'insert_custom_user_meta', array( $this, 'filter_custom_meta' ) );
+
+		$new_user = wp_insert_user( $new_user_data );
+
+		// This meta is updated by the filter.
+		$this->assertSame( 'update_from_filter', get_user_meta( $new_user, 'test_meta_key', true ) );
+		$this->assertSame( 'new_user_custom_value', get_user_meta( $new_user, 'custom_meta', true ) );
+		// This meta is inserted by the filter.
+		$this->assertSame( 'new_from_filter', get_user_meta( $new_user, 'new_meta_from_filter', true ) );
+	}
+
+	/**
+	 * Hook a filter to alter custom meta when inserting new user.
+	 * This hook is used in `test_wp_insert_user_with_meta()`.
+	 */
+	public function filter_custom_meta( $meta_input ) {
+		// Update some meta inputs
+		$meta_input['test_meta_key'] = 'update_from_filter';
+		// Add a new meta
+		$meta_input['new_meta_from_filter'] = 'new_from_filter';
+
+		return $meta_input;
+	}
+
 	/**
 	 * Testing the `wp_privacy_additional_user_profile_data` filter works.
 	 *

From 4f4c3443d7001a7003932b558776cc63b022b341 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Wed, 8 Sep 2021 15:35:32 +0000
Subject: [PATCH 095/257] Code Modernization: Fix reserved keyword and
 parameter name mismatches for parent/child classes in `Walker::start_el()`.

In the parent class, renames the parameter `$object` to `$data_object`.

Why? `object` is a PHP reserved keyword.

In each child class: renames the corresponding parameter to match the parent's method signature.

Why?

PHP 8 introduces the ability to pass named arguments to function/method calls. This means the child and parent method signatures (i.e. parameter names) need to match.

Changes for readability:

- `@since` clearly specifies the original parameter name and its new name as well as why the change happened.

- in methods longer than a single line, the generic parameter is reassigned to the original parameter restoring it for context for use within the method. An inline comment is added to explain why this reassignment is made.

- in cases where the original parameter name was too generic, renamed (when reassigning) to a more descriptive name for use within the method.

Follow-up to [7737], [8900], [8970], [14248], [15077], [16100], [25642], [25644], [37051], [37054], [37056], [46271], [47189].

Props jrf, hellofromTonya, sergeybiryukov, azaozz, desrosj, johnbillion.
See #51553.

git-svn-id: https://develop.svn.wordpress.org/trunk@51739 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../class-walker-category-checklist.php       | 16 ++--
 .../class-walker-nav-menu-checklist.php       | 56 ++++++------
 .../includes/class-walker-nav-menu-edit.php   | 88 ++++++++++---------
 .../class-twentytwenty-walker-page.php        |  7 +-
 .../class-walker-category-dropdown.php        | 19 ++--
 src/wp-includes/class-walker-category.php     | 17 ++--
 src/wp-includes/class-walker-comment.php      | 16 ++--
 src/wp-includes/class-walker-nav-menu.php     | 84 +++++++++---------
 .../class-walker-page-dropdown.php            | 23 ++---
 src/wp-includes/class-walker-page.php         |  8 +-
 src/wp-includes/class-wp-walker.php           |  5 +-
 11 files changed, 189 insertions(+), 150 deletions(-)

diff --git a/src/wp-admin/includes/class-walker-category-checklist.php b/src/wp-admin/includes/class-walker-category-checklist.php
index 171e731987c60..9e360d62fe43a 100644
--- a/src/wp-admin/includes/class-walker-category-checklist.php
+++ b/src/wp-admin/includes/class-walker-category-checklist.php
@@ -61,14 +61,18 @@ public function end_lvl( &$output, $depth = 0, $args = array() ) {
 	 * @see Walker::start_el()
 	 *
 	 * @since 2.5.1
+	 * @since 5.9.0 Renamed `$category` to `$data_object` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param string  $output   Used to append additional content (passed by reference).
-	 * @param WP_Term $category The current term object.
-	 * @param int     $depth    Depth of the term in reference to parents. Default 0.
-	 * @param array   $args     An array of arguments. @see wp_terms_checklist()
-	 * @param int     $id       ID of the current term.
+	 * @param string  $output      Used to append additional content (passed by reference).
+	 * @param WP_Term $data_object The current term object.
+	 * @param int     $depth       Depth of the term in reference to parents. Default 0.
+	 * @param array   $args        An array of arguments. @see wp_terms_checklist()
+	 * @param int     $id          ID of the current term.
 	 */
-	public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $id = 0 ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$category = $data_object;
+
 		if ( empty( $args['taxonomy'] ) ) {
 			$taxonomy = 'category';
 		} else {
diff --git a/src/wp-admin/includes/class-walker-nav-menu-checklist.php b/src/wp-admin/includes/class-walker-nav-menu-checklist.php
index afafe4a96b93c..e1ff27a59bec9 100644
--- a/src/wp-admin/includes/class-walker-nav-menu-checklist.php
+++ b/src/wp-admin/includes/class-walker-nav-menu-checklist.php
@@ -61,22 +61,26 @@ public function end_lvl( &$output, $depth = 0, $args = null ) {
 	 * @see Walker_Nav_Menu::start_el()
 	 *
 	 * @since 3.0.0
+	 * @since 5.9.0 Renamed `$item` to `$data_object` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @global int        $_nav_menu_placeholder
 	 * @global int|string $nav_menu_selected_id
 	 *
-	 * @param string   $output Used to append additional content (passed by reference).
-	 * @param WP_Post  $item   Menu item data object.
-	 * @param int      $depth  Depth of menu item. Used for padding.
-	 * @param stdClass $args   Not used.
-	 * @param int      $id     Not used.
+	 * @param string   $output      Used to append additional content (passed by reference).
+	 * @param WP_Post  $data_object Menu item data object.
+	 * @param int      $depth       Depth of menu item. Used for padding.
+	 * @param stdClass $args        Not used.
+	 * @param int      $id          Not used.
 	 */
-	public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
+	public function start_el( &$output, $data_object, $depth = 0, $args = null, $id = 0 ) {
 		global $_nav_menu_placeholder, $nav_menu_selected_id;
 
+		// Restores the more descriptive, specific name for use within this method.
+		$menu_item = $data_object;
+
 		$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? (int) $_nav_menu_placeholder - 1 : -1;
-		$possible_object_id    = isset( $item->post_type ) && 'nav_menu_item' === $item->post_type ? $item->object_id : $_nav_menu_placeholder;
-		$possible_db_id        = ( ! empty( $item->ID ) ) && ( 0 < $possible_object_id ) ? (int) $item->ID : 0;
+		$possible_object_id    = isset( $menu_item->post_type ) && 'nav_menu_item' === $menu_item->post_type ? $menu_item->object_id : $_nav_menu_placeholder;
+		$possible_db_id        = ( ! empty( $menu_item->ID ) ) && ( 0 < $possible_object_id ) ? (int) $menu_item->ID : 0;
 
 		$indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
 
@@ -84,39 +88,39 @@ public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
 		$output .= '<label class="menu-item-title">';
 		$output .= '<input type="checkbox"' . wp_nav_menu_disabled_check( $nav_menu_selected_id, false ) . ' class="menu-item-checkbox';
 
-		if ( ! empty( $item->front_or_home ) ) {
+		if ( ! empty( $menu_item->front_or_home ) ) {
 			$output .= ' add-to-top';
 		}
 
-		$output .= '" name="menu-item[' . $possible_object_id . '][menu-item-object-id]" value="' . esc_attr( $item->object_id ) . '" /> ';
+		$output .= '" name="menu-item[' . $possible_object_id . '][menu-item-object-id]" value="' . esc_attr( $menu_item->object_id ) . '" /> ';
 
-		if ( ! empty( $item->label ) ) {
-			$title = $item->label;
-		} elseif ( isset( $item->post_type ) ) {
+		if ( ! empty( $menu_item->label ) ) {
+			$title = $menu_item->label;
+		} elseif ( isset( $menu_item->post_type ) ) {
 			/** This filter is documented in wp-includes/post-template.php */
-			$title = apply_filters( 'the_title', $item->post_title, $item->ID );
+			$title = apply_filters( 'the_title', $menu_item->post_title, $menu_item->ID );
 		}
 
-		$output .= isset( $title ) ? esc_html( $title ) : esc_html( $item->title );
+		$output .= isset( $title ) ? esc_html( $title ) : esc_html( $menu_item->title );
 
-		if ( empty( $item->label ) && isset( $item->post_type ) && 'page' === $item->post_type ) {
+		if ( empty( $menu_item->label ) && isset( $menu_item->post_type ) && 'page' === $menu_item->post_type ) {
 			// Append post states.
-			$output .= _post_states( $item, false );
+			$output .= _post_states( $menu_item, false );
 		}
 
 		$output .= '</label>';
 
 		// Menu item hidden fields.
 		$output .= '<input type="hidden" class="menu-item-db-id" name="menu-item[' . $possible_object_id . '][menu-item-db-id]" value="' . $possible_db_id . '" />';
-		$output .= '<input type="hidden" class="menu-item-object" name="menu-item[' . $possible_object_id . '][menu-item-object]" value="' . esc_attr( $item->object ) . '" />';
-		$output .= '<input type="hidden" class="menu-item-parent-id" name="menu-item[' . $possible_object_id . '][menu-item-parent-id]" value="' . esc_attr( $item->menu_item_parent ) . '" />';
-		$output .= '<input type="hidden" class="menu-item-type" name="menu-item[' . $possible_object_id . '][menu-item-type]" value="' . esc_attr( $item->type ) . '" />';
-		$output .= '<input type="hidden" class="menu-item-title" name="menu-item[' . $possible_object_id . '][menu-item-title]" value="' . esc_attr( $item->title ) . '" />';
-		$output .= '<input type="hidden" class="menu-item-url" name="menu-item[' . $possible_object_id . '][menu-item-url]" value="' . esc_attr( $item->url ) . '" />';
-		$output .= '<input type="hidden" class="menu-item-target" name="menu-item[' . $possible_object_id . '][menu-item-target]" value="' . esc_attr( $item->target ) . '" />';
-		$output .= '<input type="hidden" class="menu-item-attr-title" name="menu-item[' . $possible_object_id . '][menu-item-attr-title]" value="' . esc_attr( $item->attr_title ) . '" />';
-		$output .= '<input type="hidden" class="menu-item-classes" name="menu-item[' . $possible_object_id . '][menu-item-classes]" value="' . esc_attr( implode( ' ', $item->classes ) ) . '" />';
-		$output .= '<input type="hidden" class="menu-item-xfn" name="menu-item[' . $possible_object_id . '][menu-item-xfn]" value="' . esc_attr( $item->xfn ) . '" />';
+		$output .= '<input type="hidden" class="menu-item-object" name="menu-item[' . $possible_object_id . '][menu-item-object]" value="' . esc_attr( $menu_item->object ) . '" />';
+		$output .= '<input type="hidden" class="menu-item-parent-id" name="menu-item[' . $possible_object_id . '][menu-item-parent-id]" value="' . esc_attr( $menu_item->menu_item_parent ) . '" />';
+		$output .= '<input type="hidden" class="menu-item-type" name="menu-item[' . $possible_object_id . '][menu-item-type]" value="' . esc_attr( $menu_item->type ) . '" />';
+		$output .= '<input type="hidden" class="menu-item-title" name="menu-item[' . $possible_object_id . '][menu-item-title]" value="' . esc_attr( $menu_item->title ) . '" />';
+		$output .= '<input type="hidden" class="menu-item-url" name="menu-item[' . $possible_object_id . '][menu-item-url]" value="' . esc_attr( $menu_item->url ) . '" />';
+		$output .= '<input type="hidden" class="menu-item-target" name="menu-item[' . $possible_object_id . '][menu-item-target]" value="' . esc_attr( $menu_item->target ) . '" />';
+		$output .= '<input type="hidden" class="menu-item-attr-title" name="menu-item[' . $possible_object_id . '][menu-item-attr-title]" value="' . esc_attr( $menu_item->attr_title ) . '" />';
+		$output .= '<input type="hidden" class="menu-item-classes" name="menu-item[' . $possible_object_id . '][menu-item-classes]" value="' . esc_attr( implode( ' ', $menu_item->classes ) ) . '" />';
+		$output .= '<input type="hidden" class="menu-item-xfn" name="menu-item[' . $possible_object_id . '][menu-item-xfn]" value="' . esc_attr( $menu_item->xfn ) . '" />';
 	}
 
 }
diff --git a/src/wp-admin/includes/class-walker-nav-menu-edit.php b/src/wp-admin/includes/class-walker-nav-menu-edit.php
index bf8e77ec2ae5e..1b5be7d8c47dd 100644
--- a/src/wp-admin/includes/class-walker-nav-menu-edit.php
+++ b/src/wp-admin/includes/class-walker-nav-menu-edit.php
@@ -46,21 +46,25 @@ public function end_lvl( &$output, $depth = 0, $args = null ) {}
 	 *
 	 * @see Walker_Nav_Menu::start_el()
 	 * @since 3.0.0
+	 * @since 5.9.0 Renamed `$item` to `$data_object` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @global int $_wp_nav_menu_max_depth
 	 *
-	 * @param string   $output Used to append additional content (passed by reference).
-	 * @param WP_Post  $item   Menu item data object.
-	 * @param int      $depth  Depth of menu item. Used for padding.
-	 * @param stdClass $args   Not used.
-	 * @param int      $id     Not used.
+	 * @param string   $output      Used to append additional content (passed by reference).
+	 * @param WP_Post  $data_object Menu item data object.
+	 * @param int      $depth       Depth of menu item. Used for padding.
+	 * @param stdClass $args        Not used.
+	 * @param int      $id          Not used.
 	 */
-	public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
+	public function start_el( &$output, $data_object, $depth = 0, $args = null, $id = 0 ) {
 		global $_wp_nav_menu_max_depth;
+
+		// Restores the more descriptive, specific name for use within this method.
+		$menu_item              = $data_object;
 		$_wp_nav_menu_max_depth = $depth > $_wp_nav_menu_max_depth ? $depth : $_wp_nav_menu_max_depth;
 
 		ob_start();
-		$item_id      = esc_attr( $item->ID );
+		$item_id      = esc_attr( $menu_item->ID );
 		$removed_args = array(
 			'action',
 			'customlink-tab',
@@ -72,18 +76,18 @@ public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
 
 		$original_title = false;
 
-		if ( 'taxonomy' === $item->type ) {
-			$original_object = get_term( (int) $item->object_id, $item->object );
+		if ( 'taxonomy' === $menu_item->type ) {
+			$original_object = get_term( (int) $menu_item->object_id, $menu_item->object );
 			if ( $original_object && ! is_wp_error( $original_object ) ) {
 				$original_title = $original_object->name;
 			}
-		} elseif ( 'post_type' === $item->type ) {
-			$original_object = get_post( $item->object_id );
+		} elseif ( 'post_type' === $menu_item->type ) {
+			$original_object = get_post( $menu_item->object_id );
 			if ( $original_object ) {
 				$original_title = get_the_title( $original_object->ID );
 			}
-		} elseif ( 'post_type_archive' === $item->type ) {
-			$original_object = get_post_type_object( $item->object );
+		} elseif ( 'post_type_archive' === $menu_item->type ) {
+			$original_object = get_post_type_object( $menu_item->object );
 			if ( $original_object ) {
 				$original_title = $original_object->labels->archives;
 			}
@@ -91,23 +95,23 @@ public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
 
 		$classes = array(
 			'menu-item menu-item-depth-' . $depth,
-			'menu-item-' . esc_attr( $item->object ),
+			'menu-item-' . esc_attr( $menu_item->object ),
 			'menu-item-edit-' . ( ( isset( $_GET['edit-menu-item'] ) && $item_id === $_GET['edit-menu-item'] ) ? 'active' : 'inactive' ),
 		);
 
-		$title = $item->title;
+		$title = $menu_item->title;
 
-		if ( ! empty( $item->_invalid ) ) {
+		if ( ! empty( $menu_item->_invalid ) ) {
 			$classes[] = 'menu-item-invalid';
 			/* translators: %s: Title of an invalid menu item. */
-			$title = sprintf( __( '%s (Invalid)' ), $item->title );
-		} elseif ( isset( $item->post_status ) && 'draft' === $item->post_status ) {
+			$title = sprintf( __( '%s (Invalid)' ), $menu_item->title );
+		} elseif ( isset( $menu_item->post_status ) && 'draft' === $menu_item->post_status ) {
 			$classes[] = 'pending';
 			/* translators: %s: Title of a menu item in draft status. */
-			$title = sprintf( __( '%s (Pending)' ), $item->title );
+			$title = sprintf( __( '%s (Pending)' ), $menu_item->title );
 		}
 
-		$title = ( ! isset( $item->label ) || '' === $item->label ) ? $title : $item->label;
+		$title = ( ! isset( $menu_item->label ) || '' === $menu_item->label ) ? $title : $menu_item->label;
 
 		$submenu_text = '';
 		if ( 0 === $depth ) {
@@ -124,7 +128,7 @@ public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
 						<span class="is-submenu" <?php echo $submenu_text; ?>><?php _e( 'sub item' ); ?></span>
 					</label>
 					<span class="item-controls">
-						<span class="item-type"><?php echo esc_html( $item->type_label ); ?></span>
+						<span class="item-type"><?php echo esc_html( $menu_item->type_label ); ?></span>
 						<span class="item-order hide-if-js">
 							<?php
 							printf(
@@ -185,48 +189,48 @@ public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
 			</div>
 
 			<div class="menu-item-settings wp-clearfix" id="menu-item-settings-<?php echo $item_id; ?>">
-				<?php if ( 'custom' === $item->type ) : ?>
+				<?php if ( 'custom' === $menu_item->type ) : ?>
 					<p class="field-url description description-wide">
 						<label for="edit-menu-item-url-<?php echo $item_id; ?>">
 							<?php _e( 'URL' ); ?><br />
-							<input type="text" id="edit-menu-item-url-<?php echo $item_id; ?>" class="widefat code edit-menu-item-url" name="menu-item-url[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->url ); ?>" />
+							<input type="text" id="edit-menu-item-url-<?php echo $item_id; ?>" class="widefat code edit-menu-item-url" name="menu-item-url[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $menu_item->url ); ?>" />
 						</label>
 					</p>
 				<?php endif; ?>
 				<p class="description description-wide">
 					<label for="edit-menu-item-title-<?php echo $item_id; ?>">
 						<?php _e( 'Navigation Label' ); ?><br />
-						<input type="text" id="edit-menu-item-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-title" name="menu-item-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->title ); ?>" />
+						<input type="text" id="edit-menu-item-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-title" name="menu-item-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $menu_item->title ); ?>" />
 					</label>
 				</p>
 				<p class="field-title-attribute field-attr-title description description-wide">
 					<label for="edit-menu-item-attr-title-<?php echo $item_id; ?>">
 						<?php _e( 'Title Attribute' ); ?><br />
-						<input type="text" id="edit-menu-item-attr-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->post_excerpt ); ?>" />
+						<input type="text" id="edit-menu-item-attr-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $menu_item->post_excerpt ); ?>" />
 					</label>
 				</p>
 				<p class="field-link-target description">
 					<label for="edit-menu-item-target-<?php echo $item_id; ?>">
-						<input type="checkbox" id="edit-menu-item-target-<?php echo $item_id; ?>" value="_blank" name="menu-item-target[<?php echo $item_id; ?>]"<?php checked( $item->target, '_blank' ); ?> />
+						<input type="checkbox" id="edit-menu-item-target-<?php echo $item_id; ?>" value="_blank" name="menu-item-target[<?php echo $item_id; ?>]"<?php checked( $menu_item->target, '_blank' ); ?> />
 						<?php _e( 'Open link in a new tab' ); ?>
 					</label>
 				</p>
 				<p class="field-css-classes description description-thin">
 					<label for="edit-menu-item-classes-<?php echo $item_id; ?>">
 						<?php _e( 'CSS Classes (optional)' ); ?><br />
-						<input type="text" id="edit-menu-item-classes-<?php echo $item_id; ?>" class="widefat code edit-menu-item-classes" name="menu-item-classes[<?php echo $item_id; ?>]" value="<?php echo esc_attr( implode( ' ', $item->classes ) ); ?>" />
+						<input type="text" id="edit-menu-item-classes-<?php echo $item_id; ?>" class="widefat code edit-menu-item-classes" name="menu-item-classes[<?php echo $item_id; ?>]" value="<?php echo esc_attr( implode( ' ', $menu_item->classes ) ); ?>" />
 					</label>
 				</p>
 				<p class="field-xfn description description-thin">
 					<label for="edit-menu-item-xfn-<?php echo $item_id; ?>">
 						<?php _e( 'Link Relationship (XFN)' ); ?><br />
-						<input type="text" id="edit-menu-item-xfn-<?php echo $item_id; ?>" class="widefat code edit-menu-item-xfn" name="menu-item-xfn[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->xfn ); ?>" />
+						<input type="text" id="edit-menu-item-xfn-<?php echo $item_id; ?>" class="widefat code edit-menu-item-xfn" name="menu-item-xfn[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $menu_item->xfn ); ?>" />
 					</label>
 				</p>
 				<p class="field-description description description-wide">
 					<label for="edit-menu-item-description-<?php echo $item_id; ?>">
 						<?php _e( 'Description' ); ?><br />
-						<textarea id="edit-menu-item-description-<?php echo $item_id; ?>" class="widefat edit-menu-item-description" rows="3" cols="20" name="menu-item-description[<?php echo $item_id; ?>]"><?php echo esc_html( $item->description ); // textarea_escaped ?></textarea>
+						<textarea id="edit-menu-item-description-<?php echo $item_id; ?>" class="widefat edit-menu-item-description" rows="3" cols="20" name="menu-item-description[<?php echo $item_id; ?>]"><?php echo esc_html( $menu_item->description ); // textarea_escaped ?></textarea>
 						<span class="description"><?php _e( 'The description will be displayed in the menu if the current theme supports it.' ); ?></span>
 					</label>
 				</p>
@@ -237,13 +241,13 @@ public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
 				 *
 				 * @since 5.4.0
 				 *
-				 * @param int      $item_id Menu item ID.
-				 * @param WP_Post  $item    Menu item data object.
-				 * @param int      $depth   Depth of menu item. Used for padding.
-				 * @param stdClass $args    An object of menu item arguments.
-				 * @param int      $id      Nav menu ID.
+				 * @param int      $item_id   Menu item ID.
+				 * @param WP_Post  $menu_item Menu item data object.
+				 * @param int      $depth     Depth of menu item. Used for padding.
+				 * @param stdClass $args      An object of menu item arguments.
+				 * @param int      $id        Nav menu ID.
 				 */
-				do_action( 'wp_nav_menu_item_custom_fields', $item_id, $item, $depth, $args, $id );
+				do_action( 'wp_nav_menu_item_custom_fields', $item_id, $menu_item, $depth, $args, $id );
 				?>
 
 				<fieldset class="field-move hide-if-no-js description description-wide">
@@ -256,11 +260,11 @@ public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
 				</fieldset>
 
 				<div class="menu-item-actions description-wide submitbox">
-					<?php if ( 'custom' !== $item->type && false !== $original_title ) : ?>
+					<?php if ( 'custom' !== $menu_item->type && false !== $original_title ) : ?>
 						<p class="link-to-original">
 							<?php
 							/* translators: %s: Link to menu item's original object. */
-							printf( __( 'Original: %s' ), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $original_title ) . '</a>' );
+							printf( __( 'Original: %s' ), '<a href="' . esc_attr( $menu_item->url ) . '">' . esc_html( $original_title ) . '</a>' );
 							?>
 						</p>
 					<?php endif; ?>
@@ -303,11 +307,11 @@ public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
 				</div>
 
 				<input class="menu-item-data-db-id" type="hidden" name="menu-item-db-id[<?php echo $item_id; ?>]" value="<?php echo $item_id; ?>" />
-				<input class="menu-item-data-object-id" type="hidden" name="menu-item-object-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object_id ); ?>" />
-				<input class="menu-item-data-object" type="hidden" name="menu-item-object[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object ); ?>" />
-				<input class="menu-item-data-parent-id" type="hidden" name="menu-item-parent-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_item_parent ); ?>" />
-				<input class="menu-item-data-position" type="hidden" name="menu-item-position[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_order ); ?>" />
-				<input class="menu-item-data-type" type="hidden" name="menu-item-type[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->type ); ?>" />
+				<input class="menu-item-data-object-id" type="hidden" name="menu-item-object-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $menu_item->object_id ); ?>" />
+				<input class="menu-item-data-object" type="hidden" name="menu-item-object[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $menu_item->object ); ?>" />
+				<input class="menu-item-data-parent-id" type="hidden" name="menu-item-parent-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $menu_item->menu_item_parent ); ?>" />
+				<input class="menu-item-data-position" type="hidden" name="menu-item-position[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $menu_item->menu_order ); ?>" />
+				<input class="menu-item-data-type" type="hidden" name="menu-item-type[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $menu_item->type ); ?>" />
 			</div><!-- .menu-item-settings-->
 			<ul class="menu-item-transport"></ul>
 		<?php
diff --git a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php
index dcdc8445ad95e..8fe9bae8d80a7 100644
--- a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php
+++ b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php
@@ -20,16 +20,19 @@ class TwentyTwenty_Walker_Page extends Walker_Page {
 		 * Outputs the beginning of the current element in the tree.
 		 *
 		 * @since Twenty Twenty 1.0
+		 * @since Twenty Twenty 1.9 Renamed `$page` to `$data_object` to match parent class for PHP 8 named parameter support.
 		 *
 		 * @see Walker::start_el()
 		 *
 		 * @param string  $output       Used to append additional content. Passed by reference.
-		 * @param WP_Post $page         Page data object.
+		 * @param WP_Post $data_object  Page data object.
 		 * @param int     $depth        Optional. Depth of page. Used for padding. Default 0.
 		 * @param array   $args         Optional. Array of arguments. Default empty array.
 		 * @param int     $current_page Optional. Page ID. Default 0.
 		 */
-		public function start_el( &$output, $page, $depth = 0, $args = array(), $current_page = 0 ) {
+		public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_page = 0 ) {
+			// Restores the more descriptive, specific name for use within this method.
+			$page = $data_object;
 
 			if ( isset( $args['item_spacing'] ) && 'preserve' === $args['item_spacing'] ) {
 				$t = "\t";
diff --git a/src/wp-includes/class-walker-category-dropdown.php b/src/wp-includes/class-walker-category-dropdown.php
index a2ff82d37b8d1..b8404dd9c6153 100644
--- a/src/wp-includes/class-walker-category-dropdown.php
+++ b/src/wp-includes/class-walker-category-dropdown.php
@@ -44,18 +44,21 @@ class Walker_CategoryDropdown extends Walker {
 	 * Starts the element output.
 	 *
 	 * @since 2.1.0
+	 * @since 5.9.0 Renamed `$category` to `$data_object` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @see Walker::start_el()
 	 *
-	 * @param string  $output   Used to append additional content (passed by reference).
-	 * @param WP_Term $category Category data object.
-	 * @param int     $depth    Depth of category. Used for padding.
-	 * @param array   $args     Uses 'selected', 'show_count', and 'value_field' keys, if they exist.
-	 *                          See wp_dropdown_categories().
-	 * @param int     $id       Optional. ID of the current category. Default 0 (unused).
+	 * @param string  $output      Used to append additional content (passed by reference).
+	 * @param WP_Term $data_object Category data object.
+	 * @param int     $depth       Depth of category. Used for padding.
+	 * @param array   $args        Uses 'selected', 'show_count', and 'value_field' keys, if they exist.
+	 *                             See wp_dropdown_categories().
+	 * @param int     $id          Optional. ID of the current category. Default 0 (unused).
 	 */
-	public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
-		$pad = str_repeat( '&nbsp;', $depth * 3 );
+	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $id = 0 ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$category = $data_object;
+		$pad      = str_repeat( '&nbsp;', $depth * 3 );
 
 		/** This filter is documented in wp-includes/category-template.php */
 		$cat_name = apply_filters( 'list_cats', $category->name, $category );
diff --git a/src/wp-includes/class-walker-category.php b/src/wp-includes/class-walker-category.php
index 94ebc58db21cb..651bd1310f87c 100644
--- a/src/wp-includes/class-walker-category.php
+++ b/src/wp-includes/class-walker-category.php
@@ -86,16 +86,21 @@ public function end_lvl( &$output, $depth = 0, $args = array() ) {
 	 * Starts the element output.
 	 *
 	 * @since 2.1.0
+	 * @since 5.9.0 Renamed `$category` to `$data_object` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @see Walker::start_el()
 	 *
-	 * @param string  $output   Used to append additional content (passed by reference).
-	 * @param WP_Term $category Category data object.
-	 * @param int     $depth    Optional. Depth of category in reference to parents. Default 0.
-	 * @param array   $args     Optional. An array of arguments. See wp_list_categories(). Default empty array.
-	 * @param int     $id       Optional. ID of the current category. Default 0.
+	 * @param string  $output      Used to append additional content (passed by reference).
+	 * @param WP_Term $data_object Category data object.
+	 * @param int     $depth       Optional. Depth of category in reference to parents. Default 0.
+	 * @param array   $args        Optional. An array of arguments. See wp_list_categories().
+	 *                             Default empty array.
+	 * @param int     $id          Optional. ID of the current category. Default 0.
 	 */
-	public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $id = 0 ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$category = $data_object;
+
 		/** This filter is documented in wp-includes/category-template.php */
 		$cat_name = apply_filters( 'list_cats', esc_attr( $category->name ), $category );
 
diff --git a/src/wp-includes/class-walker-comment.php b/src/wp-includes/class-walker-comment.php
index 0ac661e547664..4d871ff73d44d 100644
--- a/src/wp-includes/class-walker-comment.php
+++ b/src/wp-includes/class-walker-comment.php
@@ -157,19 +157,23 @@ public function display_element( $element, &$children_elements, $max_depth, $dep
 	 * Starts the element output.
 	 *
 	 * @since 2.7.0
+	 * @since 5.9.0 Renamed `$comment` to `$data_object` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @see Walker::start_el()
 	 * @see wp_list_comments()
 	 * @global int        $comment_depth
 	 * @global WP_Comment $comment       Global comment object.
 	 *
-	 * @param string     $output  Used to append additional content. Passed by reference.
-	 * @param WP_Comment $comment Comment data object.
-	 * @param int        $depth   Optional. Depth of the current comment in reference to parents. Default 0.
-	 * @param array      $args    Optional. An array of arguments. Default empty array.
-	 * @param int        $id      Optional. ID of the current comment. Default 0 (unused).
+	 * @param string     $output      Used to append additional content. Passed by reference.
+	 * @param WP_Comment $data_object Comment data object.
+	 * @param int        $depth       Optional. Depth of the current comment in reference to parents. Default 0.
+	 * @param array      $args        Optional. An array of arguments. Default empty array.
+	 * @param int        $id          Optional. ID of the current comment. Default 0 (unused).
 	 */
-	public function start_el( &$output, $comment, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $id = 0 ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$comment = $data_object;
+
 		$depth++;
 		$GLOBALS['comment_depth'] = $depth;
 		$GLOBALS['comment']       = $comment;
diff --git a/src/wp-includes/class-walker-nav-menu.php b/src/wp-includes/class-walker-nav-menu.php
index ecbb8d9642602..9ae43543645ee 100644
--- a/src/wp-includes/class-walker-nav-menu.php
+++ b/src/wp-includes/class-walker-nav-menu.php
@@ -106,16 +106,20 @@ public function end_lvl( &$output, $depth = 0, $args = null ) {
 	 *
 	 * @since 3.0.0
 	 * @since 4.4.0 The {@see 'nav_menu_item_args'} filter was added.
+	 * @since 5.9.0 Renamed `$item` to `$data_object` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @see Walker::start_el()
 	 *
-	 * @param string   $output Used to append additional content (passed by reference).
-	 * @param WP_Post  $item   Menu item data object.
-	 * @param int      $depth  Depth of menu item. Used for padding.
-	 * @param stdClass $args   An object of wp_nav_menu() arguments.
-	 * @param int      $id     Current item ID.
+	 * @param string   $output      Used to append additional content (passed by reference).
+	 * @param WP_Post  $data_object Menu item data object.
+	 * @param int      $depth       Depth of menu item. Used for padding.
+	 * @param stdClass $args        An object of wp_nav_menu() arguments.
+	 * @param int      $id          Current item ID.
 	 */
-	public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
+	public function start_el( &$output, $data_object, $depth = 0, $args = null, $id = 0 ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$menu_item = $data_object;
+
 		if ( isset( $args->item_spacing ) && 'discard' === $args->item_spacing ) {
 			$t = '';
 			$n = '';
@@ -125,19 +129,19 @@ public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
 		}
 		$indent = ( $depth ) ? str_repeat( $t, $depth ) : '';
 
-		$classes   = empty( $item->classes ) ? array() : (array) $item->classes;
-		$classes[] = 'menu-item-' . $item->ID;
+		$classes   = empty( $menu_item->classes ) ? array() : (array) $menu_item->classes;
+		$classes[] = 'menu-item-' . $menu_item->ID;
 
 		/**
 		 * Filters the arguments for a single nav menu item.
 		 *
 		 * @since 4.4.0
 		 *
-		 * @param stdClass $args  An object of wp_nav_menu() arguments.
-		 * @param WP_Post  $item  Menu item data object.
-		 * @param int      $depth Depth of menu item. Used for padding.
+		 * @param stdClass $args      An object of wp_nav_menu() arguments.
+		 * @param WP_Post  $menu_item Menu item data object.
+		 * @param int      $depth     Depth of menu item. Used for padding.
 		 */
-		$args = apply_filters( 'nav_menu_item_args', $args, $item, $depth );
+		$args = apply_filters( 'nav_menu_item_args', $args, $menu_item, $depth );
 
 		/**
 		 * Filters the CSS classes applied to a menu item's list item element.
@@ -145,12 +149,12 @@ public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
 		 * @since 3.0.0
 		 * @since 4.1.0 The `$depth` parameter was added.
 		 *
-		 * @param string[] $classes Array of the CSS classes that are applied to the menu item's `<li>` element.
-		 * @param WP_Post  $item    The current menu item.
-		 * @param stdClass $args    An object of wp_nav_menu() arguments.
-		 * @param int      $depth   Depth of menu item. Used for padding.
+		 * @param string[] $classes   Array of the CSS classes that are applied to the menu item's `<li>` element.
+		 * @param WP_Post  $menu_item The current menu item object.
+		 * @param stdClass $args      An object of wp_nav_menu() arguments.
+		 * @param int      $depth     Depth of menu item. Used for padding.
 		 */
-		$class_names = implode( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item, $args, $depth ) );
+		$class_names = implode( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $menu_item, $args, $depth ) );
 		$class_names = $class_names ? ' class="' . esc_attr( $class_names ) . '"' : '';
 
 		/**
@@ -159,26 +163,26 @@ public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
 		 * @since 3.0.1
 		 * @since 4.1.0 The `$depth` parameter was added.
 		 *
-		 * @param string   $menu_id The ID that is applied to the menu item's `<li>` element.
-		 * @param WP_Post  $item    The current menu item.
-		 * @param stdClass $args    An object of wp_nav_menu() arguments.
-		 * @param int      $depth   Depth of menu item. Used for padding.
+		 * @param string   $menu_id   The ID that is applied to the menu item's `<li>` element.
+		 * @param WP_Post  $menu_item The current menu item.
+		 * @param stdClass $args      An object of wp_nav_menu() arguments.
+		 * @param int      $depth     Depth of menu item. Used for padding.
 		 */
-		$id = apply_filters( 'nav_menu_item_id', 'menu-item-' . $item->ID, $item, $args, $depth );
+		$id = apply_filters( 'nav_menu_item_id', 'menu-item-' . $menu_item->ID, $menu_item, $args, $depth );
 		$id = $id ? ' id="' . esc_attr( $id ) . '"' : '';
 
 		$output .= $indent . '<li' . $id . $class_names . '>';
 
 		$atts           = array();
-		$atts['title']  = ! empty( $item->attr_title ) ? $item->attr_title : '';
-		$atts['target'] = ! empty( $item->target ) ? $item->target : '';
-		if ( '_blank' === $item->target && empty( $item->xfn ) ) {
+		$atts['title']  = ! empty( $menu_item->attr_title ) ? $menu_item->attr_title : '';
+		$atts['target'] = ! empty( $menu_item->target ) ? $menu_item->target : '';
+		if ( '_blank' === $menu_item->target && empty( $menu_item->xfn ) ) {
 			$atts['rel'] = 'noopener';
 		} else {
-			$atts['rel'] = $item->xfn;
+			$atts['rel'] = $menu_item->xfn;
 		}
-		$atts['href']         = ! empty( $item->url ) ? $item->url : '';
-		$atts['aria-current'] = $item->current ? 'page' : '';
+		$atts['href']         = ! empty( $menu_item->url ) ? $menu_item->url : '';
+		$atts['aria-current'] = $menu_item->current ? 'page' : '';
 
 		/**
 		 * Filters the HTML attributes applied to a menu item's anchor element.
@@ -195,11 +199,11 @@ public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
 		 *     @type string $href         The href attribute.
 		 *     @type string $aria-current The aria-current attribute.
 		 * }
-		 * @param WP_Post  $item  The current menu item.
-		 * @param stdClass $args  An object of wp_nav_menu() arguments.
-		 * @param int      $depth Depth of menu item. Used for padding.
+		 * @param WP_Post  $menu_item The current menu item object.
+		 * @param stdClass $args      An object of wp_nav_menu() arguments.
+		 * @param int      $depth     Depth of menu item. Used for padding.
 		 */
-		$atts = apply_filters( 'nav_menu_link_attributes', $atts, $item, $args, $depth );
+		$atts = apply_filters( 'nav_menu_link_attributes', $atts, $menu_item, $args, $depth );
 
 		$attributes = '';
 		foreach ( $atts as $attr => $value ) {
@@ -210,19 +214,19 @@ public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
 		}
 
 		/** This filter is documented in wp-includes/post-template.php */
-		$title = apply_filters( 'the_title', $item->title, $item->ID );
+		$title = apply_filters( 'the_title', $menu_item->title, $menu_item->ID );
 
 		/**
 		 * Filters a menu item's title.
 		 *
 		 * @since 4.4.0
 		 *
-		 * @param string   $title The menu item's title.
-		 * @param WP_Post  $item  The current menu item.
-		 * @param stdClass $args  An object of wp_nav_menu() arguments.
-		 * @param int      $depth Depth of menu item. Used for padding.
+		 * @param string   $title     The menu item's title.
+		 * @param WP_Post  $menu_item The current menu item object.
+		 * @param stdClass $args      An object of wp_nav_menu() arguments.
+		 * @param int      $depth     Depth of menu item. Used for padding.
 		 */
-		$title = apply_filters( 'nav_menu_item_title', $title, $item, $args, $depth );
+		$title = apply_filters( 'nav_menu_item_title', $title, $menu_item, $args, $depth );
 
 		$item_output  = $args->before;
 		$item_output .= '<a' . $attributes . '>';
@@ -240,11 +244,11 @@ public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
 		 * @since 3.0.0
 		 *
 		 * @param string   $item_output The menu item's starting HTML output.
-		 * @param WP_Post  $item        Menu item data object.
+		 * @param WP_Post  $menu_item   Menu item data object.
 		 * @param int      $depth       Depth of menu item. Used for padding.
 		 * @param stdClass $args        An object of wp_nav_menu() arguments.
 		 */
-		$output .= apply_filters( 'walker_nav_menu_start_el', $item_output, $item, $depth, $args );
+		$output .= apply_filters( 'walker_nav_menu_start_el', $item_output, $menu_item, $depth, $args );
 	}
 
 	/**
diff --git a/src/wp-includes/class-walker-page-dropdown.php b/src/wp-includes/class-walker-page-dropdown.php
index 1e3a2fd3aa7da..f391f1ace8cd4 100644
--- a/src/wp-includes/class-walker-page-dropdown.php
+++ b/src/wp-includes/class-walker-page-dropdown.php
@@ -44,20 +44,23 @@ class Walker_PageDropdown extends Walker {
 	 * Starts the element output.
 	 *
 	 * @since 2.1.0
+	 * @since 5.9.0 Renamed `$page` to `$data_object` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @see Walker::start_el()
 	 *
-	 * @param string  $output Used to append additional content. Passed by reference.
-	 * @param WP_Post $page   Page data object.
-	 * @param int     $depth  Optional. Depth of page in reference to parent pages. Used for padding.
-	 *                        Default 0.
-	 * @param array   $args   Optional. Uses 'selected' argument for selected page to set selected HTML
-	 *                        attribute for option element. Uses 'value_field' argument to fill "value"
-	 *                        attribute. See wp_dropdown_pages(). Default empty array.
-	 * @param int     $id     Optional. ID of the current page. Default 0 (unused).
+	 * @param string  $output      Used to append additional content. Passed by reference.
+	 * @param WP_Post $data_object Page data object.
+	 * @param int     $depth       Optional. Depth of page in reference to parent pages. Used for padding.
+	 *                             Default 0.
+	 * @param array   $args        Optional. Uses 'selected' argument for selected page to set selected HTML
+	 *                             attribute for option element. Uses 'value_field' argument to fill "value"
+	 *                             attribute. See wp_dropdown_pages(). Default empty array.
+	 * @param int     $id          Optional. ID of the current page. Default 0 (unused).
 	 */
-	public function start_el( &$output, $page, $depth = 0, $args = array(), $id = 0 ) {
-		$pad = str_repeat( '&nbsp;', $depth * 3 );
+	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $id = 0 ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$page = $data_object;
+		$pad  = str_repeat( '&nbsp;', $depth * 3 );
 
 		if ( ! isset( $args['value_field'] ) || ! isset( $page->{$args['value_field']} ) ) {
 			$args['value_field'] = 'ID';
diff --git a/src/wp-includes/class-walker-page.php b/src/wp-includes/class-walker-page.php
index 5c2684929d089..6eaa147050f77 100644
--- a/src/wp-includes/class-walker-page.php
+++ b/src/wp-includes/class-walker-page.php
@@ -93,14 +93,18 @@ public function end_lvl( &$output, $depth = 0, $args = array() ) {
 	 *
 	 * @see Walker::start_el()
 	 * @since 2.1.0
+	 * @since 5.9.0 Renamed `$page` to `$data_object` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @param string  $output       Used to append additional content. Passed by reference.
-	 * @param WP_Post $page         Page data object.
+	 * @param WP_Post $data_object  Page data object.
 	 * @param int     $depth        Optional. Depth of page. Used for padding. Default 0.
 	 * @param array   $args         Optional. Array of arguments. Default empty array.
 	 * @param int     $current_page Optional. Page ID. Default 0.
 	 */
-	public function start_el( &$output, $page, $depth = 0, $args = array(), $current_page = 0 ) {
+	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_page = 0 ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$page = $data_object;
+
 		if ( isset( $args['item_spacing'] ) && 'preserve' === $args['item_spacing'] ) {
 			$t = "\t";
 			$n = "\n";
diff --git a/src/wp-includes/class-wp-walker.php b/src/wp-includes/class-wp-walker.php
index c76451cd9453f..b3c5c6e6962e7 100644
--- a/src/wp-includes/class-wp-walker.php
+++ b/src/wp-includes/class-wp-walker.php
@@ -83,15 +83,16 @@ public function end_lvl( &$output, $depth = 0, $args = array() ) {}
 	 * class methods. Includes the element output also.
 	 *
 	 * @since 2.1.0
+	 * @since 5.9.0 Renamed `$object` (a PHP reserved keyword) to `$data_object` for PHP 8 named parameter support.
 	 * @abstract
 	 *
 	 * @param string $output            Used to append additional content (passed by reference).
-	 * @param object $object            The data object.
+	 * @param object $data_object       The data object.
 	 * @param int    $depth             Depth of the item.
 	 * @param array  $args              An array of additional arguments.
 	 * @param int    $current_object_id ID of the current item.
 	 */
-	public function start_el( &$output, $object, $depth = 0, $args = array(), $current_object_id = 0 ) {}
+	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) {}
 
 	/**
 	 * Ends the element output, if needed.

From ca4765c62c65acb732b574a6761bf5fd84595706 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 8 Sep 2021 17:16:01 +0000
Subject: [PATCH 096/257] General: Only use `_jsonp_wp_die_handler()` for JSONP
 REST API requests.

Props mdawaffe, peterwilsoncc.

git-svn-id: https://develop.svn.wordpress.org/trunk@51740 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index e49a5720a3a4b..12de2395d7d87 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -3557,9 +3557,9 @@ function wp_die( $message = '', $title = '', $args = array() ) {
 		 * @param callable $function Callback function name.
 		 */
 		$function = apply_filters( 'wp_die_json_handler', '_json_wp_die_handler' );
-	} elseif ( wp_is_jsonp_request() ) {
+	} elseif ( defined( 'REST_REQUEST' ) && REST_REQUEST && wp_is_jsonp_request() ) {
 		/**
-		 * Filters the callback for killing WordPress execution for JSONP requests.
+		 * Filters the callback for killing WordPress execution for JSONP REST requests.
 		 *
 		 * @since 5.2.0
 		 *

From 46c9b7026549ddbd0e5d16563428c2cc456ec5fb Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Wed, 8 Sep 2021 19:14:49 +0000
Subject: [PATCH 097/257] Editor: fix the replacement of `wp.editor` with
 `wp.oldEditor` in the inline script outputted when enqueueing the old editor.

Props fullofcaffeine, davidbinda, grantmkin, get_dave, azaozz.
Fixes #53762.

git-svn-id: https://develop.svn.wordpress.org/trunk@51748 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-editor.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php
index 9ec353c90799c..5387d850d5b45 100644
--- a/src/wp-includes/class-wp-editor.php
+++ b/src/wp-includes/class-wp-editor.php
@@ -969,8 +969,12 @@ public static function print_default_editor_scripts() {
 		?>
 		<script type="text/javascript">
 		window.wp = window.wp || {};
-		window.wp.editor = window.wp.oldEditor = window.wp.oldEditor || {};
-		window.wp.oldEditor.getDefaultSettings = function() {
+		window.wp.editor = window.wp.editor || {};
+		window.wp.oldEditor = window.wp.oldEditor || {};
+
+		// Add getDefaultSettings() to both wp.editor and wp.oldEditor for back compat.
+		// Use of wp.editor for "old editor" functionality should be deprecated.
+		window.wp.editor.getDefaultSettings = window.wp.oldEditor.getDefaultSettings = function() {
 			return {
 				tinymce: <?php echo $settings; ?>,
 				quicktags: {

From 0bf7d5ea0dd8761ec3026a01aaa27646db8bd7a4 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Wed, 8 Sep 2021 23:28:43 +0000
Subject: [PATCH 098/257] Editor: Revert [51748] and [51649]. They intorduced a
 bug where `wp.editor` may be replaced with `wp.oldEditor` in certain cases.

Props desrosj, davidbinda, azaozz.
Fixes #53762.

git-svn-id: https://develop.svn.wordpress.org/trunk@51768 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/js/_enqueues/lib/quicktags.js             |  6 +++---
 .../tinymce/plugins/wordpress/plugin.js       |  6 +++---
 src/js/_enqueues/wp/editor/base.js            | 20 +++++++++----------
 src/js/_enqueues/wp/editor/dfw.js             |  6 +++---
 src/wp-includes/class-wp-editor.php           |  6 +-----
 src/wp-includes/general-template.php          |  2 +-
 6 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/js/_enqueues/lib/quicktags.js b/src/js/_enqueues/lib/quicktags.js
index 0e69fa6843015..4b1a80fa28c94 100644
--- a/src/js/_enqueues/lib/quicktags.js
+++ b/src/js/_enqueues/lib/quicktags.js
@@ -435,7 +435,7 @@ window.edToolbar = function(){};
 			ariaLabel = this.attr && this.attr.ariaLabel ? ' aria-label="' + _escape( this.attr.ariaLabel ) + '"' : '',
 			val = this.display ? ' value="' + _escape( this.display ) + '"' : '',
 			id = this.id ? ' id="' + _escape( idPrefix + this.id ) + '"' : '',
-			dfw = ( wp = window.wp ) && wp.oldEditor && wp.oldEditor.dfw;
+			dfw = ( wp = window.wp ) && wp.editor && wp.editor.dfw;
 
 		if ( this.id === 'fullscreen' ) {
 			return '<button type="button"' + id + ' class="ed_button qt-dfw qt-fullscreen"' + title + ariaLabel + '></button>';
@@ -681,11 +681,11 @@ window.edToolbar = function(){};
 	qt.DFWButton.prototype.callback = function() {
 		var wp;
 
-		if ( ! ( wp = window.wp ) || ! wp.oldEditor || ! wp.oldEditor.dfw ) {
+		if ( ! ( wp = window.wp ) || ! wp.editor || ! wp.editor.dfw ) {
 			return;
 		}
 
-		window.wp.oldEditor.dfw.toggle();
+		window.wp.editor.dfw.toggle();
 	};
 
 	qt.TextDirectionButton = function() {
diff --git a/src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js b/src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js
index 9fcf03b780c23..3f9544826654f 100644
--- a/src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js
+++ b/src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js
@@ -12,7 +12,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 		__ = editor.editorManager.i18n.translate,
 		$ = window.jQuery,
 		wp = window.wp,
-		hasWpautop = ( wp && wp.oldEditor && wp.oldEditor.autop && editor.getParam( 'wpautop', true ) ),
+		hasWpautop = ( wp && wp.editor && wp.editor.autop && editor.getParam( 'wpautop', true ) ),
 		wpTooltips = false;
 
 	if ( $ ) {
@@ -130,7 +130,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 
 			if ( event.load && event.format !== 'raw' ) {
 				if ( hasWpautop ) {
-					event.content = wp.oldEditor.autop( event.content );
+					event.content = wp.editor.autop( event.content );
 				} else {
 					// Prevent creation of paragraphs out of multiple HTML comments.
 					event.content = event.content.replace( /-->\s+<!--/g, '--><!--' );
@@ -601,7 +601,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 		event.content = event.content.replace( /<p>(?:<br ?\/?>|\u00a0|\uFEFF| )*<\/p>/g, '<p>&nbsp;</p>' );
 
 		if ( hasWpautop ) {
-			event.content = wp.oldEditor.removep( event.content );
+			event.content = wp.editor.removep( event.content );
 		} else {
 			// Restore formatting of block boundaries.
 			event.content = event.content.replace( /-->\s*<!-- wp:/g, '-->\n\n<!-- wp:' );
diff --git a/src/js/_enqueues/wp/editor/base.js b/src/js/_enqueues/wp/editor/base.js
index e420a68fefe84..d5fe958c19395 100644
--- a/src/js/_enqueues/wp/editor/base.js
+++ b/src/js/_enqueues/wp/editor/base.js
@@ -5,7 +5,7 @@
 window.wp = window.wp || {};
 
 ( function( $, wp ) {
-	wp.editor = wp.oldEditor = wp.oldEditor || {};
+	wp.editor = wp.editor || {};
 
 	/**
 	 * Utility functions for the editor.
@@ -1191,8 +1191,8 @@ window.wp = window.wp || {};
 			} );
 		}
 
-		wp.oldEditor.autop = wpautop;
-		wp.oldEditor.removep = pre_wpautop;
+		wp.editor.autop = wpautop;
+		wp.editor.removep = pre_wpautop;
 
 		exports = {
 			go: switchEditor,
@@ -1241,15 +1241,15 @@ window.wp = window.wp || {};
 	 *    }
 	 * }
 	 */
-	wp.oldEditor.initialize = function( id, settings ) {
+	wp.editor.initialize = function( id, settings ) {
 		var init;
 		var defaults;
 
-		if ( ! $ || ! id || ! wp.oldEditor.getDefaultSettings ) {
+		if ( ! $ || ! id || ! wp.editor.getDefaultSettings ) {
 			return;
 		}
 
-		defaults = wp.oldEditor.getDefaultSettings();
+		defaults = wp.editor.getDefaultSettings();
 
 		// Initialize TinyMCE by default.
 		if ( ! settings ) {
@@ -1349,13 +1349,13 @@ window.wp = window.wp || {};
 	/**
 	 * Remove one editor instance.
 	 *
-	 * Intended for use with editors that were initialized with wp.oldEditor.initialize().
+	 * Intended for use with editors that were initialized with wp.editor.initialize().
 	 *
 	 * @since 4.8.0
 	 *
 	 * @param {string} id The HTML id of the editor textarea.
 	 */
-	wp.oldEditor.remove = function( id ) {
+	wp.editor.remove = function( id ) {
 		var mceInstance, qtInstance,
 			$wrap = $( '#wp-' + id + '-wrap' );
 
@@ -1388,14 +1388,14 @@ window.wp = window.wp || {};
 	/**
 	 * Get the editor content.
 	 *
-	 * Intended for use with editors that were initialized with wp.oldEditor.initialize().
+	 * Intended for use with editors that were initialized with wp.editor.initialize().
 	 *
 	 * @since 4.8.0
 	 *
 	 * @param {string} id The HTML id of the editor textarea.
 	 * @return The editor content.
 	 */
-	wp.oldEditor.getContent = function( id ) {
+	wp.editor.getContent = function( id ) {
 		var editor;
 
 		if ( ! $ || ! id ) {
diff --git a/src/js/_enqueues/wp/editor/dfw.js b/src/js/_enqueues/wp/editor/dfw.js
index d1a646ca85456..a47c548dc9a8f 100644
--- a/src/js/_enqueues/wp/editor/dfw.js
+++ b/src/js/_enqueues/wp/editor/dfw.js
@@ -33,7 +33,7 @@
 			$sideSortables = $( '#side-sortables' ),
 			$postboxContainer = $( '#postbox-container-1' ),
 			$postBody = $('#post-body'),
-			fullscreen = window.wp.oldEditor && window.wp.oldEditor.fullscreen,
+			fullscreen = window.wp.editor && window.wp.editor.fullscreen,
 			mceEditor,
 			mceBind = function(){},
 			mceUnbind = function(){},
@@ -1603,8 +1603,8 @@
 		}
 
 		window.wp = window.wp || {};
-		window.wp.oldEditor = window.wp.oldEditor || {};
-		window.wp.oldEditor.dfw = {
+		window.wp.editor = window.wp.editor || {};
+		window.wp.editor.dfw = {
 			activate: activate,
 			deactivate: deactivate,
 			isActive: isActive,
diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php
index 5387d850d5b45..61cda16585feb 100644
--- a/src/wp-includes/class-wp-editor.php
+++ b/src/wp-includes/class-wp-editor.php
@@ -970,11 +970,7 @@ public static function print_default_editor_scripts() {
 		<script type="text/javascript">
 		window.wp = window.wp || {};
 		window.wp.editor = window.wp.editor || {};
-		window.wp.oldEditor = window.wp.oldEditor || {};
-
-		// Add getDefaultSettings() to both wp.editor and wp.oldEditor for back compat.
-		// Use of wp.editor for "old editor" functionality should be deprecated.
-		window.wp.editor.getDefaultSettings = window.wp.oldEditor.getDefaultSettings = function() {
+		window.wp.editor.getDefaultSettings = function() {
 			return {
 				tinymce: <?php echo $settings; ?>,
 				quicktags: {
diff --git a/src/wp-includes/general-template.php b/src/wp-includes/general-template.php
index a9540c937876d..41b0a174c03fa 100644
--- a/src/wp-includes/general-template.php
+++ b/src/wp-includes/general-template.php
@@ -3524,7 +3524,7 @@ function wp_editor( $content, $editor_id, $settings = array() ) {
  * Outputs the editor scripts, stylesheets, and default settings.
  *
  * The editor can be initialized when needed after page load.
- * See wp.oldEditor.initialize() in wp-admin/js/editor.js for initialization options.
+ * See wp.editor.initialize() in wp-admin/js/editor.js for initialization options.
  *
  * @uses _WP_Editors
  * @since 4.8.0

From 47a3b90231c9a55532c97a7b5137c13c547c1a4b Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 9 Sep 2021 12:38:36 +0000
Subject: [PATCH 099/257] Code Modernization: Fix last parameter name
 mismatches for parent/child classes in `Walker::start_el()`.

The parent class uses `$current_object_id` while most of the child classes use `$id`. As the parent class' is more descriptive, renaming the last parameter in each of child class.

Why? PHP 8 introduces the ability to pass named arguments to function/method calls. This means the child and parent method signatures (i.e. parameter names) need to match.

Changes for readability:

- `@since` clearly specifies the original parameter name and its new name as well as why the change happened.

- In methods longer than a single line, the generic parameter is reassigned to the original parameter restoring it for context for use within the method. An inline comment is added to explain why this reassignment is made.

- In cases where the original parameter name was too generic or misleading, renamed (when reassigning) to a more descriptive name for use within the method.

Follow-up to [7737], [8900], [8970], [14248], [15077], [16100], [25642], [25644], [37051], [37054], [37056], [46271], [47189], [51739].

Props jrf, hellofromTonya, sergeybiryukov, azaozz, desrosj, johnbillion.
See #51553.

git-svn-id: https://develop.svn.wordpress.org/trunk@51779 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../class-walker-category-checklist.php       | 15 +++---
 .../class-walker-nav-menu-checklist.php       | 15 +++---
 .../includes/class-walker-nav-menu-edit.php   | 27 ++++++-----
 .../class-twentytwenty-walker-page.php        | 30 ++++++------
 .../class-walker-category-dropdown.php        | 17 +++----
 src/wp-includes/class-walker-category.php     | 27 ++++++-----
 src/wp-includes/class-walker-comment.php      | 15 +++---
 src/wp-includes/class-walker-nav-menu.php     | 15 +++---
 .../class-walker-page-dropdown.php            | 22 +++++----
 src/wp-includes/class-walker-page.php         | 48 ++++++++++---------
 src/wp-includes/class-wp-walker.php           |  2 +-
 11 files changed, 123 insertions(+), 110 deletions(-)

diff --git a/src/wp-admin/includes/class-walker-category-checklist.php b/src/wp-admin/includes/class-walker-category-checklist.php
index 9e360d62fe43a..90ee40f83469d 100644
--- a/src/wp-admin/includes/class-walker-category-checklist.php
+++ b/src/wp-admin/includes/class-walker-category-checklist.php
@@ -61,15 +61,16 @@ public function end_lvl( &$output, $depth = 0, $args = array() ) {
 	 * @see Walker::start_el()
 	 *
 	 * @since 2.5.1
-	 * @since 5.9.0 Renamed `$category` to `$data_object` to match parent class for PHP 8 named parameter support.
+	 * @since 5.9.0 Renamed `$category` to `$data_object` and `$id` to `$current_object_id`
+	 *              to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param string  $output      Used to append additional content (passed by reference).
-	 * @param WP_Term $data_object The current term object.
-	 * @param int     $depth       Depth of the term in reference to parents. Default 0.
-	 * @param array   $args        An array of arguments. @see wp_terms_checklist()
-	 * @param int     $id          ID of the current term.
+	 * @param string  $output            Used to append additional content (passed by reference).
+	 * @param WP_Term $data_object       The current term object.
+	 * @param int     $depth             Depth of the term in reference to parents. Default 0.
+	 * @param array   $args              An array of arguments. @see wp_terms_checklist()
+	 * @param int     $current_object_id Optional. ID of the current term. Default 0.
 	 */
-	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) {
 		// Restores the more descriptive, specific name for use within this method.
 		$category = $data_object;
 
diff --git a/src/wp-admin/includes/class-walker-nav-menu-checklist.php b/src/wp-admin/includes/class-walker-nav-menu-checklist.php
index e1ff27a59bec9..939d08b4201d1 100644
--- a/src/wp-admin/includes/class-walker-nav-menu-checklist.php
+++ b/src/wp-admin/includes/class-walker-nav-menu-checklist.php
@@ -61,18 +61,19 @@ public function end_lvl( &$output, $depth = 0, $args = null ) {
 	 * @see Walker_Nav_Menu::start_el()
 	 *
 	 * @since 3.0.0
-	 * @since 5.9.0 Renamed `$item` to `$data_object` to match parent class for PHP 8 named parameter support.
+	 * @since 5.9.0 Renamed `$item` to `$data_object` and `$id` to `$current_object_id`
+	 *              to match parent class for PHP 8 named parameter support.
 	 *
 	 * @global int        $_nav_menu_placeholder
 	 * @global int|string $nav_menu_selected_id
 	 *
-	 * @param string   $output      Used to append additional content (passed by reference).
-	 * @param WP_Post  $data_object Menu item data object.
-	 * @param int      $depth       Depth of menu item. Used for padding.
-	 * @param stdClass $args        Not used.
-	 * @param int      $id          Not used.
+	 * @param string   $output            Used to append additional content (passed by reference).
+	 * @param WP_Post  $data_object       Menu item data object.
+	 * @param int      $depth             Depth of menu item. Used for padding.
+	 * @param stdClass $args              Not used.
+	 * @param int      $current_object_id Optional. ID of the current menu item. Default 0.
 	 */
-	public function start_el( &$output, $data_object, $depth = 0, $args = null, $id = 0 ) {
+	public function start_el( &$output, $data_object, $depth = 0, $args = null, $current_object_id = 0 ) {
 		global $_nav_menu_placeholder, $nav_menu_selected_id;
 
 		// Restores the more descriptive, specific name for use within this method.
diff --git a/src/wp-admin/includes/class-walker-nav-menu-edit.php b/src/wp-admin/includes/class-walker-nav-menu-edit.php
index 1b5be7d8c47dd..f91c086950c45 100644
--- a/src/wp-admin/includes/class-walker-nav-menu-edit.php
+++ b/src/wp-admin/includes/class-walker-nav-menu-edit.php
@@ -46,17 +46,18 @@ public function end_lvl( &$output, $depth = 0, $args = null ) {}
 	 *
 	 * @see Walker_Nav_Menu::start_el()
 	 * @since 3.0.0
-	 * @since 5.9.0 Renamed `$item` to `$data_object` to match parent class for PHP 8 named parameter support.
+	 * @since 5.9.0 Renamed `$item` to `$data_object` and `$id` to `$current_object_id`
+	 *              to match parent class for PHP 8 named parameter support.
 	 *
 	 * @global int $_wp_nav_menu_max_depth
 	 *
-	 * @param string   $output      Used to append additional content (passed by reference).
-	 * @param WP_Post  $data_object Menu item data object.
-	 * @param int      $depth       Depth of menu item. Used for padding.
-	 * @param stdClass $args        Not used.
-	 * @param int      $id          Not used.
+	 * @param string   $output            Used to append additional content (passed by reference).
+	 * @param WP_Post  $data_object       Menu item data object.
+	 * @param int      $depth             Depth of menu item. Used for padding.
+	 * @param stdClass $args              Not used.
+	 * @param int      $current_object_id Optional. ID of the current menu item. Default 0.
 	 */
-	public function start_el( &$output, $data_object, $depth = 0, $args = null, $id = 0 ) {
+	public function start_el( &$output, $data_object, $depth = 0, $args = null, $current_object_id = 0 ) {
 		global $_wp_nav_menu_max_depth;
 
 		// Restores the more descriptive, specific name for use within this method.
@@ -241,13 +242,13 @@ public function start_el( &$output, $data_object, $depth = 0, $args = null, $id
 				 *
 				 * @since 5.4.0
 				 *
-				 * @param int      $item_id   Menu item ID.
-				 * @param WP_Post  $menu_item Menu item data object.
-				 * @param int      $depth     Depth of menu item. Used for padding.
-				 * @param stdClass $args      An object of menu item arguments.
-				 * @param int      $id        Nav menu ID.
+				 * @param int      $item_id           Menu item ID.
+				 * @param WP_Post  $menu_item         Menu item data object.
+				 * @param int      $depth             Depth of menu item. Used for padding.
+				 * @param stdClass $args              An object of menu item arguments.
+				 * @param int      $current_object_id Nav menu ID.
 				 */
-				do_action( 'wp_nav_menu_item_custom_fields', $item_id, $menu_item, $depth, $args, $id );
+				do_action( 'wp_nav_menu_item_custom_fields', $item_id, $menu_item, $depth, $args, $current_object_id );
 				?>
 
 				<fieldset class="field-move hide-if-no-js description description-wide">
diff --git a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php
index 8fe9bae8d80a7..eb927ec938e54 100644
--- a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php
+++ b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php
@@ -20,19 +20,21 @@ class TwentyTwenty_Walker_Page extends Walker_Page {
 		 * Outputs the beginning of the current element in the tree.
 		 *
 		 * @since Twenty Twenty 1.0
-		 * @since Twenty Twenty 1.9 Renamed `$page` to `$data_object` to match parent class for PHP 8 named parameter support.
+		 * @since Twenty Twenty 1.9 Renamed `$page` to `$data_object` and `$current_page` to `$current_object_id`
+		 *                          to match parent class for PHP 8 named parameter support.
 		 *
 		 * @see Walker::start_el()
 		 *
-		 * @param string  $output       Used to append additional content. Passed by reference.
-		 * @param WP_Post $data_object  Page data object.
-		 * @param int     $depth        Optional. Depth of page. Used for padding. Default 0.
-		 * @param array   $args         Optional. Array of arguments. Default empty array.
-		 * @param int     $current_page Optional. Page ID. Default 0.
+		 * @param string  $output            Used to append additional content. Passed by reference.
+		 * @param WP_Post $data_object       Page data object.
+		 * @param int     $depth             Optional. Depth of page. Used for padding. Default 0.
+		 * @param array   $args              Optional. Array of arguments. Default empty array.
+		 * @param int     $current_object_id Optional. ID of the current page. Default 0.
 		 */
-		public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_page = 0 ) {
+		public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) {
 			// Restores the more descriptive, specific name for use within this method.
-			$page = $data_object;
+			$page            = $data_object;
+			$current_page_id = $current_object_id;
 
 			if ( isset( $args['item_spacing'] ) && 'preserve' === $args['item_spacing'] ) {
 				$t = "\t";
@@ -53,12 +55,12 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 				$css_class[] = 'page_item_has_children';
 			}
 
-			if ( ! empty( $current_page ) ) {
-				$_current_page = get_post( $current_page );
+			if ( ! empty( $current_page_id ) ) {
+				$_current_page = get_post( $current_page_id );
 				if ( $_current_page && in_array( $page->ID, $_current_page->ancestors, true ) ) {
 					$css_class[] = 'current_page_ancestor';
 				}
-				if ( $page->ID === $current_page ) {
+				if ( $page->ID === $current_page_id ) {
 					$css_class[] = 'current_page_item';
 				} elseif ( $_current_page && $page->ID === $_current_page->post_parent ) {
 					$css_class[] = 'current_page_parent';
@@ -68,7 +70,7 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 			}
 
 			/** This filter is documented in wp-includes/class-walker-page.php */
-			$css_classes = implode( ' ', apply_filters( 'page_css_class', $css_class, $page, $depth, $args, $current_page ) );
+			$css_classes = implode( ' ', apply_filters( 'page_css_class', $css_class, $page, $depth, $args, $current_page_id ) );
 			$css_classes = $css_classes ? ' class="' . esc_attr( $css_classes ) . '"' : '';
 
 			if ( '' === $page->post_title ) {
@@ -81,10 +83,10 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 
 			$atts                 = array();
 			$atts['href']         = get_permalink( $page->ID );
-			$atts['aria-current'] = ( $page->ID === $current_page ) ? 'page' : '';
+			$atts['aria-current'] = ( $page->ID === $current_page_id ) ? 'page' : '';
 
 			/** This filter is documented in wp-includes/class-walker-page.php */
-			$atts = apply_filters( 'page_menu_link_attributes', $atts, $page, $depth, $args, $current_page );
+			$atts = apply_filters( 'page_menu_link_attributes', $atts, $page, $depth, $args, $current_page_id );
 
 			$attributes = '';
 			foreach ( $atts as $attr => $value ) {
diff --git a/src/wp-includes/class-walker-category-dropdown.php b/src/wp-includes/class-walker-category-dropdown.php
index b8404dd9c6153..82b4fedbc54c6 100644
--- a/src/wp-includes/class-walker-category-dropdown.php
+++ b/src/wp-includes/class-walker-category-dropdown.php
@@ -44,18 +44,19 @@ class Walker_CategoryDropdown extends Walker {
 	 * Starts the element output.
 	 *
 	 * @since 2.1.0
-	 * @since 5.9.0 Renamed `$category` to `$data_object` to match parent class for PHP 8 named parameter support.
+	 * @since 5.9.0 Renamed `$category` to `$data_object` and `$id` to `$current_object_id`
+	 *              to match parent class for PHP 8 named parameter support.
 	 *
 	 * @see Walker::start_el()
 	 *
-	 * @param string  $output      Used to append additional content (passed by reference).
-	 * @param WP_Term $data_object Category data object.
-	 * @param int     $depth       Depth of category. Used for padding.
-	 * @param array   $args        Uses 'selected', 'show_count', and 'value_field' keys, if they exist.
-	 *                             See wp_dropdown_categories().
-	 * @param int     $id          Optional. ID of the current category. Default 0 (unused).
+	 * @param string  $output            Used to append additional content (passed by reference).
+	 * @param WP_Term $data_object       Category data object.
+	 * @param int     $depth             Depth of category. Used for padding.
+	 * @param array   $args              Uses 'selected', 'show_count', and 'value_field' keys, if they exist.
+	 *                                   See wp_dropdown_categories().
+	 * @param int     $current_object_id Optional. ID of the current category. Default 0.
 	 */
-	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) {
 		// Restores the more descriptive, specific name for use within this method.
 		$category = $data_object;
 		$pad      = str_repeat( '&nbsp;', $depth * 3 );
diff --git a/src/wp-includes/class-walker-category.php b/src/wp-includes/class-walker-category.php
index 651bd1310f87c..43bb7c69cf910 100644
--- a/src/wp-includes/class-walker-category.php
+++ b/src/wp-includes/class-walker-category.php
@@ -86,18 +86,19 @@ public function end_lvl( &$output, $depth = 0, $args = array() ) {
 	 * Starts the element output.
 	 *
 	 * @since 2.1.0
-	 * @since 5.9.0 Renamed `$category` to `$data_object` to match parent class for PHP 8 named parameter support.
+	 * @since 5.9.0 Renamed `$category` to `$data_object` and `$id` to `$current_object_id`
+	 *              to match parent class for PHP 8 named parameter support.
 	 *
 	 * @see Walker::start_el()
 	 *
-	 * @param string  $output      Used to append additional content (passed by reference).
-	 * @param WP_Term $data_object Category data object.
-	 * @param int     $depth       Optional. Depth of category in reference to parents. Default 0.
-	 * @param array   $args        Optional. An array of arguments. See wp_list_categories().
-	 *                             Default empty array.
-	 * @param int     $id          Optional. ID of the current category. Default 0.
+	 * @param string  $output            Used to append additional content (passed by reference).
+	 * @param WP_Term $data_object       Category data object.
+	 * @param int     $depth             Optional. Depth of category in reference to parents. Default 0.
+	 * @param array   $args              Optional. An array of arguments. See wp_list_categories().
+	 *                                   Default empty array.
+	 * @param int     $current_object_id Optional. ID of the current category. Default 0.
 	 */
-	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) {
 		// Restores the more descriptive, specific name for use within this method.
 		$category = $data_object;
 
@@ -135,12 +136,12 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 		 *     @type string $href  The href attribute.
 		 *     @type string $title The title attribute.
 		 * }
-		 * @param WP_Term $category Term data object.
-		 * @param int     $depth    Depth of category, used for padding.
-		 * @param array   $args     An array of arguments.
-		 * @param int     $id       ID of the current category.
+		 * @param WP_Term $category          Term data object.
+		 * @param int     $depth             Depth of category, used for padding.
+		 * @param array   $args              An array of arguments.
+		 * @param int     $current_object_id ID of the current category.
 		 */
-		$atts = apply_filters( 'category_list_link_attributes', $atts, $category, $depth, $args, $id );
+		$atts = apply_filters( 'category_list_link_attributes', $atts, $category, $depth, $args, $current_object_id );
 
 		$attributes = '';
 		foreach ( $atts as $attr => $value ) {
diff --git a/src/wp-includes/class-walker-comment.php b/src/wp-includes/class-walker-comment.php
index 4d871ff73d44d..bf00996028c4f 100644
--- a/src/wp-includes/class-walker-comment.php
+++ b/src/wp-includes/class-walker-comment.php
@@ -157,20 +157,21 @@ public function display_element( $element, &$children_elements, $max_depth, $dep
 	 * Starts the element output.
 	 *
 	 * @since 2.7.0
-	 * @since 5.9.0 Renamed `$comment` to `$data_object` to match parent class for PHP 8 named parameter support.
+	 * @since 5.9.0 Renamed `$comment` to `$data_object` and `$id` to `$current_object_id`
+	 *              to match parent class for PHP 8 named parameter support.
 	 *
 	 * @see Walker::start_el()
 	 * @see wp_list_comments()
 	 * @global int        $comment_depth
 	 * @global WP_Comment $comment       Global comment object.
 	 *
-	 * @param string     $output      Used to append additional content. Passed by reference.
-	 * @param WP_Comment $data_object Comment data object.
-	 * @param int        $depth       Optional. Depth of the current comment in reference to parents. Default 0.
-	 * @param array      $args        Optional. An array of arguments. Default empty array.
-	 * @param int        $id          Optional. ID of the current comment. Default 0 (unused).
+	 * @param string     $output            Used to append additional content. Passed by reference.
+	 * @param WP_Comment $data_object       Comment data object.
+	 * @param int        $depth             Optional. Depth of the current comment in reference to parents. Default 0.
+	 * @param array      $args              Optional. An array of arguments. Default empty array.
+	 * @param int        $current_object_id Optional. ID of the current comment. Default 0.
 	 */
-	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) {
 		// Restores the more descriptive, specific name for use within this method.
 		$comment = $data_object;
 
diff --git a/src/wp-includes/class-walker-nav-menu.php b/src/wp-includes/class-walker-nav-menu.php
index 9ae43543645ee..3fdc8d8c4bf4c 100644
--- a/src/wp-includes/class-walker-nav-menu.php
+++ b/src/wp-includes/class-walker-nav-menu.php
@@ -106,17 +106,18 @@ public function end_lvl( &$output, $depth = 0, $args = null ) {
 	 *
 	 * @since 3.0.0
 	 * @since 4.4.0 The {@see 'nav_menu_item_args'} filter was added.
-	 * @since 5.9.0 Renamed `$item` to `$data_object` to match parent class for PHP 8 named parameter support.
+	 * @since 5.9.0 Renamed `$item` to `$data_object` and `$id` to `$current_object_id`
+	 *              to match parent class for PHP 8 named parameter support.
 	 *
 	 * @see Walker::start_el()
 	 *
-	 * @param string   $output      Used to append additional content (passed by reference).
-	 * @param WP_Post  $data_object Menu item data object.
-	 * @param int      $depth       Depth of menu item. Used for padding.
-	 * @param stdClass $args        An object of wp_nav_menu() arguments.
-	 * @param int      $id          Current item ID.
+	 * @param string   $output            Used to append additional content (passed by reference).
+	 * @param WP_Post  $data_object       Menu item data object.
+	 * @param int      $depth             Depth of menu item. Used for padding.
+	 * @param stdClass $args              An object of wp_nav_menu() arguments.
+	 * @param int      $current_object_id Optional. ID of the current menu item. Default 0.
 	 */
-	public function start_el( &$output, $data_object, $depth = 0, $args = null, $id = 0 ) {
+	public function start_el( &$output, $data_object, $depth = 0, $args = null, $current_object_id = 0 ) {
 		// Restores the more descriptive, specific name for use within this method.
 		$menu_item = $data_object;
 
diff --git a/src/wp-includes/class-walker-page-dropdown.php b/src/wp-includes/class-walker-page-dropdown.php
index f391f1ace8cd4..e27ea813bf0f1 100644
--- a/src/wp-includes/class-walker-page-dropdown.php
+++ b/src/wp-includes/class-walker-page-dropdown.php
@@ -44,20 +44,22 @@ class Walker_PageDropdown extends Walker {
 	 * Starts the element output.
 	 *
 	 * @since 2.1.0
-	 * @since 5.9.0 Renamed `$page` to `$data_object` to match parent class for PHP 8 named parameter support.
+	 * @since 5.9.0 Renamed `$page` to `$data_object` and `$id` to `$current_object_id`
+	 *              to match parent class for PHP 8 named parameter support.
 	 *
 	 * @see Walker::start_el()
 	 *
-	 * @param string  $output      Used to append additional content. Passed by reference.
-	 * @param WP_Post $data_object Page data object.
-	 * @param int     $depth       Optional. Depth of page in reference to parent pages. Used for padding.
-	 *                             Default 0.
-	 * @param array   $args        Optional. Uses 'selected' argument for selected page to set selected HTML
-	 *                             attribute for option element. Uses 'value_field' argument to fill "value"
-	 *                             attribute. See wp_dropdown_pages(). Default empty array.
-	 * @param int     $id          Optional. ID of the current page. Default 0 (unused).
+	 * @param string  $output             Used to append additional content. Passed by reference.
+	 * @param WP_Post $data_object        Page data object.
+	 * @param int     $depth              Optional. Depth of page in reference to parent pages.
+	 *                                    Used for padding. Default 0.
+	 * @param array   $args               Optional. Uses 'selected' argument for selected page to
+	 *                                    set selected HTML attribute for option element. Uses
+	 *                                    'value_field' argument to fill "value" attribute.
+	 *                                    See wp_dropdown_pages(). Default empty array.
+	 * @param int     $current_object_id  Optional. ID of the current page. Default 0.
 	 */
-	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) {
 		// Restores the more descriptive, specific name for use within this method.
 		$page = $data_object;
 		$pad  = str_repeat( '&nbsp;', $depth * 3 );
diff --git a/src/wp-includes/class-walker-page.php b/src/wp-includes/class-walker-page.php
index 6eaa147050f77..daa162d74bcde 100644
--- a/src/wp-includes/class-walker-page.php
+++ b/src/wp-includes/class-walker-page.php
@@ -93,17 +93,19 @@ public function end_lvl( &$output, $depth = 0, $args = array() ) {
 	 *
 	 * @see Walker::start_el()
 	 * @since 2.1.0
-	 * @since 5.9.0 Renamed `$page` to `$data_object` to match parent class for PHP 8 named parameter support.
+	 * @since 5.9.0 Renamed `$page` to `$data_object` and `$current_page` to `$current_object_id`
+	 *              to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param string  $output       Used to append additional content. Passed by reference.
-	 * @param WP_Post $data_object  Page data object.
-	 * @param int     $depth        Optional. Depth of page. Used for padding. Default 0.
-	 * @param array   $args         Optional. Array of arguments. Default empty array.
-	 * @param int     $current_page Optional. Page ID. Default 0.
+	 * @param string  $output            Used to append additional content. Passed by reference.
+	 * @param WP_Post $data_object       Page data object.
+	 * @param int     $depth             Optional. Depth of page. Used for padding. Default 0.
+	 * @param array   $args              Optional. Array of arguments. Default empty array.
+	 * @param int     $current_object_id Optional. ID of the current page. Default 0.
 	 */
-	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_page = 0 ) {
+	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) {
 		// Restores the more descriptive, specific name for use within this method.
-		$page = $data_object;
+		$page            = $data_object;
+		$current_page_id = $current_object_id;
 
 		if ( isset( $args['item_spacing'] ) && 'preserve' === $args['item_spacing'] ) {
 			$t = "\t";
@@ -124,14 +126,14 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 			$css_class[] = 'page_item_has_children';
 		}
 
-		if ( ! empty( $current_page ) ) {
-			$_current_page = get_post( $current_page );
+		if ( ! empty( $current_page_id ) ) {
+			$_current_page = get_post( $current_page_id );
 
 			if ( $_current_page && in_array( $page->ID, $_current_page->ancestors, true ) ) {
 				$css_class[] = 'current_page_ancestor';
 			}
 
-			if ( $page->ID == $current_page ) {
+			if ( $page->ID == $current_page_id ) {
 				$css_class[] = 'current_page_item';
 			} elseif ( $_current_page && $page->ID === $_current_page->post_parent ) {
 				$css_class[] = 'current_page_parent';
@@ -147,13 +149,13 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 		 *
 		 * @see wp_list_pages()
 		 *
-		 * @param string[] $css_class    An array of CSS classes to be applied to each list item.
-		 * @param WP_Post  $page         Page data object.
-		 * @param int      $depth        Depth of page, used for padding.
-		 * @param array    $args         An array of arguments.
-		 * @param int      $current_page ID of the current page.
+		 * @param string[] $css_class       An array of CSS classes to be applied to each list item.
+		 * @param WP_Post  $page            Page data object.
+		 * @param int      $depth           Depth of page, used for padding.
+		 * @param array    $args            An array of arguments.
+		 * @param int      $current_page_id ID of the current page.
 		 */
-		$css_classes = implode( ' ', apply_filters( 'page_css_class', $css_class, $page, $depth, $args, $current_page ) );
+		$css_classes = implode( ' ', apply_filters( 'page_css_class', $css_class, $page, $depth, $args, $current_page_id ) );
 		$css_classes = $css_classes ? ' class="' . esc_attr( $css_classes ) . '"' : '';
 
 		if ( '' === $page->post_title ) {
@@ -166,7 +168,7 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 
 		$atts                 = array();
 		$atts['href']         = get_permalink( $page->ID );
-		$atts['aria-current'] = ( $page->ID == $current_page ) ? 'page' : '';
+		$atts['aria-current'] = ( $page->ID == $current_page_id ) ? 'page' : '';
 
 		/**
 		 * Filters the HTML attributes applied to a page menu item's anchor element.
@@ -179,12 +181,12 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 		 *     @type string $href         The href attribute.
 		 *     @type string $aria-current The aria-current attribute.
 		 * }
-		 * @param WP_Post $page         Page data object.
-		 * @param int     $depth        Depth of page, used for padding.
-		 * @param array   $args         An array of arguments.
-		 * @param int     $current_page ID of the current page.
+		 * @param WP_Post $page            Page data object.
+		 * @param int     $depth           Depth of page, used for padding.
+		 * @param array   $args            An array of arguments.
+		 * @param int     $current_page_id ID of the current page.
 		 */
-		$atts = apply_filters( 'page_menu_link_attributes', $atts, $page, $depth, $args, $current_page );
+		$atts = apply_filters( 'page_menu_link_attributes', $atts, $page, $depth, $args, $current_page_id );
 
 		$attributes = '';
 		foreach ( $atts as $attr => $value ) {
diff --git a/src/wp-includes/class-wp-walker.php b/src/wp-includes/class-wp-walker.php
index b3c5c6e6962e7..9e39777579c15 100644
--- a/src/wp-includes/class-wp-walker.php
+++ b/src/wp-includes/class-wp-walker.php
@@ -90,7 +90,7 @@ public function end_lvl( &$output, $depth = 0, $args = array() ) {}
 	 * @param object $data_object       The data object.
 	 * @param int    $depth             Depth of the item.
 	 * @param array  $args              An array of additional arguments.
-	 * @param int    $current_object_id ID of the current item.
+	 * @param int    $current_object_id Optional. ID of the current item. Default 0.
 	 */
 	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) {}
 

From e96aa67fe15bb5e13e3697400cb881080041f1b6 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 9 Sep 2021 13:02:46 +0000
Subject: [PATCH 100/257] Code Modernization: Fix reserved keyword and
 parameter name mismatches for parent/child classes in `Walker::end_el()`.

In the parent class, renames the parameter `$object` to `$data_object`.
Why? `object` is a PHP reserved keyword. The parameter name is selected for consistency with `Walker::start_el()`.

In each child class: renames the parameter to match the parent's method signature.
Why? PHP 8 introduces the ability to pass named arguments to function/method calls. This means the child and parent method signatures (i.e. parameter names) need to match.

Changes for readability:

- `@since` clearly specifies the original parameter name and its new name as well as why the change happened.

Follow-up to [7737], [8900], [8970], [14248], [16100], [25642], [25644], [37051], [37056].

Props jrf, hellofromTonya, sergeybiryukov, azaozz, desrosj, johnbillion.
See #51553.

git-svn-id: https://develop.svn.wordpress.org/trunk@51780 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../class-walker-category-checklist.php        | 11 ++++++-----
 src/wp-includes/class-walker-category.php      | 13 +++++++------
 src/wp-includes/class-walker-comment.php       | 18 ++++++++++++------
 src/wp-includes/class-walker-nav-menu.php      | 11 ++++++-----
 src/wp-includes/class-walker-page.php          | 11 ++++++-----
 src/wp-includes/class-wp-walker.php            | 11 ++++++-----
 6 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/src/wp-admin/includes/class-walker-category-checklist.php b/src/wp-admin/includes/class-walker-category-checklist.php
index 90ee40f83469d..b86ba23a2b375 100644
--- a/src/wp-admin/includes/class-walker-category-checklist.php
+++ b/src/wp-admin/includes/class-walker-category-checklist.php
@@ -125,13 +125,14 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 	 * @see Walker::end_el()
 	 *
 	 * @since 2.5.1
+	 * @since 5.9.0 Renamed `$category` to `$data_object` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param string  $output   Used to append additional content (passed by reference).
-	 * @param WP_Term $category The current term object.
-	 * @param int     $depth    Depth of the term in reference to parents. Default 0.
-	 * @param array   $args     An array of arguments. @see wp_terms_checklist()
+	 * @param string  $output      Used to append additional content (passed by reference).
+	 * @param WP_Term $data_object The current term object.
+	 * @param int     $depth       Depth of the term in reference to parents. Default 0.
+	 * @param array   $args        An array of arguments. @see wp_terms_checklist()
 	 */
-	public function end_el( &$output, $category, $depth = 0, $args = array() ) {
+	public function end_el( &$output, $data_object, $depth = 0, $args = array() ) {
 		$output .= "</li>\n";
 	}
 }
diff --git a/src/wp-includes/class-walker-category.php b/src/wp-includes/class-walker-category.php
index 43bb7c69cf910..fcf54a333f492 100644
--- a/src/wp-includes/class-walker-category.php
+++ b/src/wp-includes/class-walker-category.php
@@ -254,16 +254,17 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 	 * Ends the element output, if needed.
 	 *
 	 * @since 2.1.0
+	 * @since 5.9.0 Renamed `$page` to `$data_object` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @see Walker::end_el()
 	 *
-	 * @param string $output Used to append additional content (passed by reference).
-	 * @param object $page   Not used.
-	 * @param int    $depth  Optional. Depth of category. Not used.
-	 * @param array  $args   Optional. An array of arguments. Only uses 'list' for whether should append
-	 *                       to output. See wp_list_categories(). Default empty array.
+	 * @param string $output      Used to append additional content (passed by reference).
+	 * @param object $data_object Category data object. Not used.
+	 * @param int    $depth       Optional. Depth of category. Not used.
+	 * @param array  $args        Optional. An array of arguments. Only uses 'list' for whether should
+	 *                            append to output. See wp_list_categories(). Default empty array.
 	 */
-	public function end_el( &$output, $page, $depth = 0, $args = array() ) {
+	public function end_el( &$output, $data_object, $depth = 0, $args = array() ) {
 		if ( 'list' !== $args['style'] ) {
 			return;
 		}
diff --git a/src/wp-includes/class-walker-comment.php b/src/wp-includes/class-walker-comment.php
index bf00996028c4f..1a81a0b5d15ce 100644
--- a/src/wp-includes/class-walker-comment.php
+++ b/src/wp-includes/class-walker-comment.php
@@ -213,19 +213,25 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 	 * Ends the element output, if needed.
 	 *
 	 * @since 2.7.0
+	 * @since 5.9.0 Renamed `$comment` to `$data_object` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @see Walker::end_el()
 	 * @see wp_list_comments()
 	 *
-	 * @param string     $output  Used to append additional content. Passed by reference.
-	 * @param WP_Comment $comment The current comment object. Default current comment.
-	 * @param int        $depth   Optional. Depth of the current comment. Default 0.
-	 * @param array      $args    Optional. An array of arguments. Default empty array.
+	 * @param string     $output      Used to append additional content. Passed by reference.
+	 * @param WP_Comment $data_object Comment data object.
+	 * @param int        $depth       Optional. Depth of the current comment. Default 0.
+	 * @param array      $args        Optional. An array of arguments. Default empty array.
 	 */
-	public function end_el( &$output, $comment, $depth = 0, $args = array() ) {
+	public function end_el( &$output, $data_object, $depth = 0, $args = array() ) {
 		if ( ! empty( $args['end-callback'] ) ) {
 			ob_start();
-			call_user_func( $args['end-callback'], $comment, $args, $depth );
+			call_user_func(
+				$args['end-callback'],
+				$data_object, // The current comment object.
+				$args,
+				$depth
+			);
 			$output .= ob_get_clean();
 			return;
 		}
diff --git a/src/wp-includes/class-walker-nav-menu.php b/src/wp-includes/class-walker-nav-menu.php
index 3fdc8d8c4bf4c..fad796005c9d1 100644
--- a/src/wp-includes/class-walker-nav-menu.php
+++ b/src/wp-includes/class-walker-nav-menu.php
@@ -256,15 +256,16 @@ public function start_el( &$output, $data_object, $depth = 0, $args = null, $cur
 	 * Ends the element output, if needed.
 	 *
 	 * @since 3.0.0
+	 * @since 5.9.0 Renamed `$item` to `$data_object` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @see Walker::end_el()
 	 *
-	 * @param string   $output Used to append additional content (passed by reference).
-	 * @param WP_Post  $item   Page data object. Not used.
-	 * @param int      $depth  Depth of page. Not Used.
-	 * @param stdClass $args   An object of wp_nav_menu() arguments.
+	 * @param string   $output      Used to append additional content (passed by reference).
+	 * @param WP_Post  $data_object Menu item data object. Not used.
+	 * @param int      $depth       Depth of page. Not Used.
+	 * @param stdClass $args        An object of wp_nav_menu() arguments.
 	 */
-	public function end_el( &$output, $item, $depth = 0, $args = null ) {
+	public function end_el( &$output, $data_object, $depth = 0, $args = null ) {
 		if ( isset( $args->item_spacing ) && 'discard' === $args->item_spacing ) {
 			$t = '';
 			$n = '';
diff --git a/src/wp-includes/class-walker-page.php b/src/wp-includes/class-walker-page.php
index daa162d74bcde..ad443dc2a6c31 100644
--- a/src/wp-includes/class-walker-page.php
+++ b/src/wp-includes/class-walker-page.php
@@ -222,15 +222,16 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 	 * Outputs the end of the current element in the tree.
 	 *
 	 * @since 2.1.0
+	 * @since 5.9.0 Renamed `$page` to `$data_object` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @see Walker::end_el()
 	 *
-	 * @param string  $output Used to append additional content. Passed by reference.
-	 * @param WP_Post $page   Page data object. Not used.
-	 * @param int     $depth  Optional. Depth of page. Default 0 (unused).
-	 * @param array   $args   Optional. Array of arguments. Default empty array.
+	 * @param string  $output      Used to append additional content. Passed by reference.
+	 * @param WP_Post $data_object Page data object. Not used.
+	 * @param int     $depth       Optional. Depth of page. Default 0 (unused).
+	 * @param array   $args        Optional. Array of arguments. Default empty array.
 	 */
-	public function end_el( &$output, $page, $depth = 0, $args = array() ) {
+	public function end_el( &$output, $data_object, $depth = 0, $args = array() ) {
 		if ( isset( $args['item_spacing'] ) && 'preserve' === $args['item_spacing'] ) {
 			$t = "\t";
 			$n = "\n";
diff --git a/src/wp-includes/class-wp-walker.php b/src/wp-includes/class-wp-walker.php
index 9e39777579c15..b50c2d7505204 100644
--- a/src/wp-includes/class-wp-walker.php
+++ b/src/wp-includes/class-wp-walker.php
@@ -100,14 +100,15 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 	 * The $args parameter holds additional values that may be used with the child class methods.
 	 *
 	 * @since 2.1.0
+	 * @since 5.9.0 Renamed `$object` (a PHP reserved keyword) to `$data_object` for PHP 8 named parameter support.
 	 * @abstract
 	 *
-	 * @param string $output Used to append additional content (passed by reference).
-	 * @param object $object The data object.
-	 * @param int    $depth  Depth of the item.
-	 * @param array  $args   An array of additional arguments.
+	 * @param string $output      Used to append additional content (passed by reference).
+	 * @param object $data_object The data object.
+	 * @param int    $depth       Depth of the item.
+	 * @param array  $args        An array of additional arguments.
 	 */
-	public function end_el( &$output, $object, $depth = 0, $args = array() ) {}
+	public function end_el( &$output, $data_object, $depth = 0, $args = array() ) {}
 
 	/**
 	 * Traverse elements to create list from elements.

From 2a3113bbafdce6079b17142f5095acfa7898cc26 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 9 Sep 2021 13:47:17 +0000
Subject: [PATCH 101/257] Code Modernization: Fix reserved keyword and
 parameter name mismatches for parent/child classes in
 `WP_Upgrader_Skin::feedback()`.

In the parent class, renames the parameter `$string` to `$feedback`.
Why? `string` is a PHP reserved keyword.

In each child class: renames the parameter to match the parent's method signature.

Why? PHP 8 introduces the ability to pass named arguments to function/method calls. This means the child and parent method signatures (i.e. parameter names) need to match.

Changes for readability:

- `@since` clearly specifies the original parameter name and its new name as well as why the change happened.

Follow-up to [11005], [25228], [30680], [32655], [38199], [49596].

Props jrf, hellofromTonya, sergeybiryukov, azaozz, desrosj, johnbillion.
See #51553.

git-svn-id: https://develop.svn.wordpress.org/trunk@51781 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../class-automatic-upgrader-skin.php         | 16 +++++++-----
 .../includes/class-bulk-upgrader-skin.php     | 26 ++++++++++---------
 .../includes/class-wp-ajax-upgrader-skin.php  | 15 ++++++-----
 .../includes/class-wp-upgrader-skin.php       | 23 ++++++++--------
 4 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/src/wp-admin/includes/class-automatic-upgrader-skin.php b/src/wp-admin/includes/class-automatic-upgrader-skin.php
index 686f95dd84fb2..15ea79f5f46e7 100644
--- a/src/wp-admin/includes/class-automatic-upgrader-skin.php
+++ b/src/wp-admin/includes/class-automatic-upgrader-skin.php
@@ -66,18 +66,20 @@ public function get_upgrade_messages() {
 	 * Stores a message about the upgrade.
 	 *
 	 * @since 3.7.0
+	 * @since 5.9.0 Renamed `$data` to `$feedback` for PHP 8 named parameter support.
 	 *
-	 * @param string|array|WP_Error $data    Message data.
-	 * @param mixed                 ...$args Optional text replacements.
+	 * @param string|array|WP_Error $feedback Message data.
+	 * @param mixed                 ...$args  Optional text replacements.
 	 */
-	public function feedback( $data, ...$args ) {
-		if ( is_wp_error( $data ) ) {
-			$string = $data->get_error_message();
-		} elseif ( is_array( $data ) ) {
+	public function feedback( $feedback, ...$args ) {
+		if ( is_wp_error( $feedback ) ) {
+			$string = $feedback->get_error_message();
+		} elseif ( is_array( $feedback ) ) {
 			return;
 		} else {
-			$string = $data;
+			$string = $feedback;
 		}
+
 		if ( ! empty( $this->upgrader->strings[ $string ] ) ) {
 			$string = $this->upgrader->strings[ $string ];
 		}
diff --git a/src/wp-admin/includes/class-bulk-upgrader-skin.php b/src/wp-admin/includes/class-bulk-upgrader-skin.php
index c5cbcd487e55a..d09b0e9fcceee 100644
--- a/src/wp-admin/includes/class-bulk-upgrader-skin.php
+++ b/src/wp-admin/includes/class-bulk-upgrader-skin.php
@@ -49,28 +49,30 @@ public function add_strings() {
 	}
 
 	/**
-	 * @param string $string
-	 * @param mixed  ...$args Optional text replacements.
+	 * @since 5.9.0 Renamed `$string` (a PHP reserved keyword) to `$feedback` for PHP 8 named parameter support.
+	 *
+	 * @param string $feedback Message data.
+	 * @param mixed  ...$args  Optional text replacements.
 	 */
-	public function feedback( $string, ...$args ) {
-		if ( isset( $this->upgrader->strings[ $string ] ) ) {
-			$string = $this->upgrader->strings[ $string ];
+	public function feedback( $feedback, ...$args ) {
+		if ( isset( $this->upgrader->strings[ $feedback ] ) ) {
+			$feedback = $this->upgrader->strings[ $feedback ];
 		}
 
-		if ( strpos( $string, '%' ) !== false ) {
+		if ( strpos( $feedback, '%' ) !== false ) {
 			if ( $args ) {
-				$args   = array_map( 'strip_tags', $args );
-				$args   = array_map( 'esc_html', $args );
-				$string = vsprintf( $string, $args );
+				$args     = array_map( 'strip_tags', $args );
+				$args     = array_map( 'esc_html', $args );
+				$feedback = vsprintf( $feedback, $args );
 			}
 		}
-		if ( empty( $string ) ) {
+		if ( empty( $feedback ) ) {
 			return;
 		}
 		if ( $this->in_loop ) {
-			echo "$string<br />\n";
+			echo "$feedback<br />\n";
 		} else {
-			echo "<p>$string</p>\n";
+			echo "<p>$feedback</p>\n";
 		}
 	}
 
diff --git a/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php b/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php
index 27d8beb740771..bb5a9612515b2 100644
--- a/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php
+++ b/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php
@@ -121,17 +121,18 @@ public function error( $errors, ...$args ) {
 	 * @since 4.6.0
 	 * @since 5.3.0 Formalized the existing `...$args` parameter by adding it
 	 *              to the function signature.
+	 * @since 5.9.0 Renamed `$data` to `$feedback` for PHP 8 named parameter support.
 	 *
-	 * @param string|array|WP_Error $data    Message data.
-	 * @param mixed                 ...$args Optional text replacements.
+	 * @param string|array|WP_Error $feedback Message data.
+	 * @param mixed                 ...$args  Optional text replacements.
 	 */
-	public function feedback( $data, ...$args ) {
-		if ( is_wp_error( $data ) ) {
-			foreach ( $data->get_error_codes() as $error_code ) {
-				$this->errors->add( $error_code, $data->get_error_message( $error_code ), $data->get_error_data( $error_code ) );
+	public function feedback( $feedback, ...$args ) {
+		if ( is_wp_error( $feedback ) ) {
+			foreach ( $feedback->get_error_codes() as $error_code ) {
+				$this->errors->add( $error_code, $feedback->get_error_message( $error_code ), $feedback->get_error_data( $error_code ) );
 			}
 		}
 
-		parent::feedback( $data, ...$args );
+		parent::feedback( $feedback, ...$args );
 	}
 }
diff --git a/src/wp-admin/includes/class-wp-upgrader-skin.php b/src/wp-admin/includes/class-wp-upgrader-skin.php
index 33f083a3e7f6a..40053df1bcecb 100644
--- a/src/wp-admin/includes/class-wp-upgrader-skin.php
+++ b/src/wp-admin/includes/class-wp-upgrader-skin.php
@@ -186,26 +186,27 @@ public function error( $errors ) {
 
 	/**
 	 * @since 2.8.0
+	 * @since 5.9.0 Renamed `$string` (a PHP reserved keyword) to `$feedback` for PHP 8 named parameter support.
 	 *
-	 * @param string $string
-	 * @param mixed  ...$args Optional text replacements.
+	 * @param string $feedback Message data.
+	 * @param mixed  ...$args  Optional text replacements.
 	 */
-	public function feedback( $string, ...$args ) {
-		if ( isset( $this->upgrader->strings[ $string ] ) ) {
-			$string = $this->upgrader->strings[ $string ];
+	public function feedback( $feedback, ...$args ) {
+		if ( isset( $this->upgrader->strings[ $feedback ] ) ) {
+			$feedback = $this->upgrader->strings[ $feedback ];
 		}
 
-		if ( strpos( $string, '%' ) !== false ) {
+		if ( strpos( $feedback, '%' ) !== false ) {
 			if ( $args ) {
-				$args   = array_map( 'strip_tags', $args );
-				$args   = array_map( 'esc_html', $args );
-				$string = vsprintf( $string, $args );
+				$args     = array_map( 'strip_tags', $args );
+				$args     = array_map( 'esc_html', $args );
+				$feedback = vsprintf( $feedback, $args );
 			}
 		}
-		if ( empty( $string ) ) {
+		if ( empty( $feedback ) ) {
 			return;
 		}
-		show_message( $string );
+		show_message( $feedback );
 	}
 
 	/**

From 123b0e467837bb51091e1e2f6821165b6c252ae5 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 9 Sep 2021 13:58:25 +0000
Subject: [PATCH 102/257] Code Modernization: Fix parameter name mismatches for
 parent/child classes in `WP_Upgrader_Skin::error()`.

In each child class: renames the parameter to match the parent's method signature.

Why? PHP 8 introduces the ability to pass named arguments to function/method calls. This means the child and parent method signatures (i.e. parameter names) need to match.

Changes for readability:

- `@since` clearly specifies the original parameter name and its new name as well as why the change happened.

Follow-up to [11005], [25806], [32655], [38199].

Props jrf, hellofromTonya, sergeybiryukov, azaozz, desrosj, johnbillion.
See #51553.

git-svn-id: https://develop.svn.wordpress.org/trunk@51782 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../includes/class-bulk-upgrader-skin.php      | 18 ++++++++++--------
 .../class-language-pack-upgrader-skin.php      |  8 +++++---
 .../includes/class-wp-upgrader-skin.php        |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/wp-admin/includes/class-bulk-upgrader-skin.php b/src/wp-admin/includes/class-bulk-upgrader-skin.php
index d09b0e9fcceee..89367c4cf82f3 100644
--- a/src/wp-admin/includes/class-bulk-upgrader-skin.php
+++ b/src/wp-admin/includes/class-bulk-upgrader-skin.php
@@ -89,18 +89,20 @@ public function footer() {
 	}
 
 	/**
-	 * @param string|WP_Error $error
+	 * @since 5.9.0 Renamed `$error` to `$errors` for PHP 8 named parameter support.
+	 *
+	 * @param string|WP_Error $errors Errors.
 	 */
-	public function error( $error ) {
-		if ( is_string( $error ) && isset( $this->upgrader->strings[ $error ] ) ) {
-			$this->error = $this->upgrader->strings[ $error ];
+	public function error( $errors ) {
+		if ( is_string( $errors ) && isset( $this->upgrader->strings[ $errors ] ) ) {
+			$this->error = $this->upgrader->strings[ $errors ];
 		}
 
-		if ( is_wp_error( $error ) ) {
+		if ( is_wp_error( $errors ) ) {
 			$messages = array();
-			foreach ( $error->get_error_messages() as $emessage ) {
-				if ( $error->get_error_data() && is_string( $error->get_error_data() ) ) {
-					$messages[] = $emessage . ' ' . esc_html( strip_tags( $error->get_error_data() ) );
+			foreach ( $errors->get_error_messages() as $emessage ) {
+				if ( $errors->get_error_data() && is_string( $errors->get_error_data() ) ) {
+					$messages[] = $emessage . ' ' . esc_html( strip_tags( $errors->get_error_data() ) );
 				} else {
 					$messages[] = $emessage;
 				}
diff --git a/src/wp-admin/includes/class-language-pack-upgrader-skin.php b/src/wp-admin/includes/class-language-pack-upgrader-skin.php
index 05676269f0492..57b0a1c3764c6 100644
--- a/src/wp-admin/includes/class-language-pack-upgrader-skin.php
+++ b/src/wp-admin/includes/class-language-pack-upgrader-skin.php
@@ -52,11 +52,13 @@ public function before() {
 	}
 
 	/**
-	 * @param string|WP_Error $error
+	 * @since 5.9.0 Renamed `$error` to `$errors` for PHP 8 named parameter support.
+	 *
+	 * @param string|WP_Error $errors Errors.
 	 */
-	public function error( $error ) {
+	public function error( $errors ) {
 		echo '<div class="lp-error">';
-		parent::error( $error );
+		parent::error( $errors );
 		echo '</div>';
 	}
 
diff --git a/src/wp-admin/includes/class-wp-upgrader-skin.php b/src/wp-admin/includes/class-wp-upgrader-skin.php
index 40053df1bcecb..bb7e7bbf3b9e6 100644
--- a/src/wp-admin/includes/class-wp-upgrader-skin.php
+++ b/src/wp-admin/includes/class-wp-upgrader-skin.php
@@ -165,7 +165,7 @@ public function footer() {
 	/**
 	 * @since 2.8.0
 	 *
-	 * @param string|WP_Error $errors
+	 * @param string|WP_Error $errors Errors.
 	 */
 	public function error( $errors ) {
 		if ( ! $this->done_header ) {

From 653790b83c335998cea5083cc3b07faa4e207d0b Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 9 Sep 2021 14:31:13 +0000
Subject: [PATCH 103/257] Code Modernization: Fix parameter name mismatches for
 parent/child classes in `WP_Customize_Setting::sanitize()`.

In each child class: renames the parameter to match the parent's method signature.

Why? PHP 8 introduces the ability to pass named arguments to function/method calls. This means the child and parent method signatures (i.e. parameter names) need to match.

Changes for readability:

- `@since` clearly specifies the original parameter name and its new name as well as why the change happened.

- In methods longer than a single line, the generic parameter is reassigned to the original parameter restoring it for context for use within the method. An inline comment is added to explain why this reassignment is made.

Follow-up to [19995], [32806].

Props jrf, hellofromTonya, sergeybiryukov, azaozz, desrosj, johnbillion.
See #51553.

git-svn-id: https://develop.svn.wordpress.org/trunk@51783 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-customize-setting.php            | 2 +-
 .../class-wp-customize-nav-menu-item-setting.php          | 8 ++++++--
 .../customize/class-wp-customize-nav-menu-setting.php     | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/wp-includes/class-wp-customize-setting.php b/src/wp-includes/class-wp-customize-setting.php
index 752593fa6136e..c10285e1c35a3 100644
--- a/src/wp-includes/class-wp-customize-setting.php
+++ b/src/wp-includes/class-wp-customize-setting.php
@@ -559,7 +559,7 @@ final public function post_value( $default = null ) {
 	 *
 	 * @since 3.4.0
 	 *
-	 * @param string|array $value    The value to sanitize.
+	 * @param string|array $value The value to sanitize.
 	 * @return string|array|null|WP_Error Sanitized value, or `null`/`WP_Error` if invalid.
 	 */
 	public function sanitize( $value ) {
diff --git a/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php b/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php
index 18cf83dfdaf47..8e35e32238973 100644
--- a/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php
+++ b/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php
@@ -653,12 +653,16 @@ public function value_as_wp_post_nav_menu_item() {
 	 * we remove that in this override.
 	 *
 	 * @since 4.3.0
+	 * @since 5.9.0 Renamed `$menu_item_value` to `$value` for PHP 8 named parameter support.
 	 *
-	 * @param array $menu_item_value The value to sanitize.
+	 * @param array $value The menu item value to sanitize.
 	 * @return array|false|null|WP_Error Null or WP_Error if an input isn't valid. False if it is marked for deletion.
 	 *                                   Otherwise the sanitized value.
 	 */
-	public function sanitize( $menu_item_value ) {
+	public function sanitize( $value ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$menu_item_value = $value;
+
 		// Menu is marked for deletion.
 		if ( false === $menu_item_value ) {
 			return $menu_item_value;
diff --git a/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php b/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php
index 8962606e5c3c6..c3dc1e9eb544b 100644
--- a/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php
+++ b/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php
@@ -407,7 +407,7 @@ public function filter_nav_menu_options( $nav_menu_options ) {
 	 *
 	 * @since 4.3.0
 	 *
-	 * @param array $value The value to sanitize.
+	 * @param array $value The menu value to sanitize.
 	 * @return array|false|null Null if an input isn't valid. False if it is marked for deletion.
 	 *                          Otherwise the sanitized value.
 	 */

From dbc7e56e06005d06951f18a78a14211e85305a52 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 9 Sep 2021 14:47:10 +0000
Subject: [PATCH 104/257] Code Modernization: Fix parameter name mismatches for
 parent/child classes in `WP_Customize_Setting::update()`.

In each child class: renames the parameter to match the parent's method signature.

Why? PHP 8 introduces the ability to pass named arguments to function/method calls. This means the child and parent method signatures (i.e. parameter names) need to match.

Changes for readability:

- `@since` clearly specifies the original parameter name and its new name as well as why the change happened.

- In methods longer than a single line, the generic parameter is reassigned to the original parameter restoring it for context for use within the method. An inline comment is added to explain why this reassignment is made.

Follow-up to [19995], [21037], [21053], [21354], [38829], [51298].

Props jrf, hellofromTonya, sergeybiryukov, azaozz, desrosj, johnbillion.
See #51553.

git-svn-id: https://develop.svn.wordpress.org/trunk@51784 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../class-wp-customize-background-image-setting.php       | 2 +-
 .../customize/class-wp-customize-custom-css-setting.php   | 8 ++++++--
 .../customize/class-wp-customize-header-image-setting.php | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/wp-includes/customize/class-wp-customize-background-image-setting.php b/src/wp-includes/customize/class-wp-customize-background-image-setting.php
index 96b69a022df32..b8b1a06a9d8c7 100644
--- a/src/wp-includes/customize/class-wp-customize-background-image-setting.php
+++ b/src/wp-includes/customize/class-wp-customize-background-image-setting.php
@@ -20,7 +20,7 @@ final class WP_Customize_Background_Image_Setting extends WP_Customize_Setting {
 	/**
 	 * @since 3.4.0
 	 *
-	 * @param mixed $value
+	 * @param mixed $value The value to update. Not used.
 	 */
 	public function update( $value ) {
 		remove_theme_mod( 'background_image_thumb' );
diff --git a/src/wp-includes/customize/class-wp-customize-custom-css-setting.php b/src/wp-includes/customize/class-wp-customize-custom-css-setting.php
index 39750f864c3a3..b0fd89540b083 100644
--- a/src/wp-includes/customize/class-wp-customize-custom-css-setting.php
+++ b/src/wp-includes/customize/class-wp-customize-custom-css-setting.php
@@ -173,11 +173,15 @@ public function validate( $css ) {
 	 * Store the CSS setting value in the custom_css custom post type for the stylesheet.
 	 *
 	 * @since 4.7.0
+	 * @since 5.9.0 Renamed `$css` to `$value` for PHP 8 named parameter support.
 	 *
-	 * @param string $css The input value.
+	 * @param string $value CSS to update.
 	 * @return int|false The post ID or false if the value could not be saved.
 	 */
-	public function update( $css ) {
+	public function update( $value ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$css = $value;
+
 		if ( empty( $css ) ) {
 			$css = '';
 		}
diff --git a/src/wp-includes/customize/class-wp-customize-header-image-setting.php b/src/wp-includes/customize/class-wp-customize-header-image-setting.php
index a45193f76e82c..7bbc923a40b2a 100644
--- a/src/wp-includes/customize/class-wp-customize-header-image-setting.php
+++ b/src/wp-includes/customize/class-wp-customize-header-image-setting.php
@@ -24,7 +24,7 @@ final class WP_Customize_Header_Image_Setting extends WP_Customize_Setting {
 	 *
 	 * @global Custom_Image_Header $custom_image_header
 	 *
-	 * @param mixed $value
+	 * @param mixed $value The value to update.
 	 */
 	public function update( $value ) {
 		global $custom_image_header;

From bff35b8cefa584b743c96777c6405e15a6adee2a Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 9 Sep 2021 15:17:20 +0000
Subject: [PATCH 105/257] Code Modernization: Fix parameter name mismatch with
 parent in `WP_Customize_Custom_CSS_Setting::validate()`.

Renames the parameter to match the parent's method signature.
Why? PHP 8 introduces the ability to pass named arguments to function/method calls. This means the child and parent method signatures (i.e. parameter names) need to match.

Adds `@since` to clearly specify why the change happened.

Reassigns the generic parameter to the original parameter.
Why? Restoring the original name keeps the context intact within the method and makes the code more readable. An inline comment explains why this reassignment is made

Follow-up to [37476], [38829], [41376].

Props jrf, hellofromTonya, sergeybiryukov, azaozz, desrosj, johnbillion.
See #51553.

git-svn-id: https://develop.svn.wordpress.org/trunk@51785 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../class-wp-customize-custom-css-setting.php          | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/wp-includes/customize/class-wp-customize-custom-css-setting.php b/src/wp-includes/customize/class-wp-customize-custom-css-setting.php
index b0fd89540b083..0e6132f3397db 100644
--- a/src/wp-includes/customize/class-wp-customize-custom-css-setting.php
+++ b/src/wp-includes/customize/class-wp-customize-custom-css-setting.php
@@ -145,18 +145,22 @@ public function value() {
 	}
 
 	/**
-	 * Validate CSS.
+	 * Validate a received value for being valid CSS.
 	 *
 	 * Checks for imbalanced braces, brackets, and comments.
 	 * Notifications are rendered when the customizer state is saved.
 	 *
 	 * @since 4.7.0
 	 * @since 4.9.0 Checking for balanced characters has been moved client-side via linting in code editor.
+	 * @since 5.9.0 Renamed `$css` to `$value` for PHP 8 named parameter support.
 	 *
-	 * @param string $css The input string.
+	 * @param string $value CSS to validate.
 	 * @return true|WP_Error True if the input was validated, otherwise WP_Error.
 	 */
-	public function validate( $css ) {
+	public function validate( $value ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$css = $value;
+
 		$validity = new WP_Error();
 
 		if ( preg_match( '#</?\w+#', $css ) ) {

From 36d6e7d3b056fafc3d1b920f6429f7148b5f3643 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 9 Sep 2021 18:35:34 +0000
Subject: [PATCH 106/257] Code Modernization: Fix parameter name mismatches for
 parent/child classes in `WP_REST_Controller::prepare_item_for_response()`.

In each child and grandchild class, renames the first parameter to match the parent's method signature.

Why? PHP 8 introduces the ability to pass named arguments to function/method calls. This means the child and parent method signatures (i.e. parameter names) need to match.

Changes for readability:

- `@since` clearly specifies the original parameter name and its new name as well as why the change happened.

- In methods longer than a single line, the generic parameter is reassigned to the original parameter restoring it for context for use within the method. An inline comment is added to explain why this reassignment is made.

Follow-up to [38832], [39011], [39015], [39021], [39024], [39025], [39031], [39036], [43519], [43735], [43739], [43768], [46821], [48173], [48242], [49088], [50995], [51003], [51021].

Props jrf, hellofromTonya, sergeybiryukov, azaozz, desrosj, johnbillion.
See #51553.

git-svn-id: https://develop.svn.wordpress.org/trunk@51786 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../class-wp-rest-attachments-controller.php       |  7 +++++--
 .../class-wp-rest-autosaves-controller.php         |  8 +++++---
 .../class-wp-rest-block-directory-controller.php   |  8 ++++++--
 .../class-wp-rest-block-types-controller.php       | 14 ++++++++------
 .../class-wp-rest-comments-controller.php          | 12 +++++++-----
 .../class-wp-rest-pattern-directory-controller.php |  9 ++++++---
 .../class-wp-rest-post-statuses-controller.php     |  8 +++++---
 .../class-wp-rest-post-types-controller.php        |  9 ++++++---
 .../endpoints/class-wp-rest-posts-controller.php   |  7 +++++--
 .../class-wp-rest-revisions-controller.php         |  7 +++++--
 .../endpoints/class-wp-rest-search-controller.php  | 11 +++++++----
 .../class-wp-rest-sidebars-controller.php          | 13 ++++++++-----
 .../class-wp-rest-taxonomies-controller.php        | 11 +++++++----
 .../class-wp-rest-templates-controller.php         |  9 ++++++---
 .../endpoints/class-wp-rest-themes-controller.php  |  7 +++++--
 .../endpoints/class-wp-rest-users-controller.php   |  8 +++++---
 .../class-wp-rest-widget-types-controller.php      | 13 ++++++++-----
 17 files changed, 104 insertions(+), 57 deletions(-)

diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php
index 3519b0ad2b50a..ad6a89b234c8f 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php
@@ -707,12 +707,15 @@ protected function prepare_item_for_database( $request ) {
 	 * Prepares a single attachment output for response.
 	 *
 	 * @since 4.7.0
+	 * @since 5.9.0 Renamed `$post` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param WP_Post         $post    Attachment object.
+	 * @param WP_Post         $item    Attachment object.
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response Response object.
 	 */
-	public function prepare_item_for_response( $post, $request ) {
+	public function prepare_item_for_response( $item, $request ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$post     = $item;
 		$response = parent::prepare_item_for_response( $post, $request );
 		$fields   = $this->get_fields_for_response( $request );
 		$data     = $response->get_data();
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php
index 5f90b4640168d..3cb3d7efe58e8 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php
@@ -396,13 +396,15 @@ public function create_post_autosave( $post_data ) {
 	 * Prepares the revision for the REST response.
 	 *
 	 * @since 5.0.0
+	 * @since 5.9.0 Renamed `$post` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param WP_Post         $post    Post revision object.
+	 * @param WP_Post         $item    Post revision object.
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response Response object.
 	 */
-	public function prepare_item_for_response( $post, $request ) {
-
+	public function prepare_item_for_response( $item, $request ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$post     = $item;
 		$response = $this->revisions_controller->prepare_item_for_response( $post, $request );
 
 		$fields = $this->get_fields_for_response( $request );
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-directory-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-directory-controller.php
index 3f54f24436513..d054a814d4a9f 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-directory-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-directory-controller.php
@@ -109,12 +109,16 @@ public function get_items( $request ) {
 	 * Parse block metadata for a block, and prepare it for an API repsonse.
 	 *
 	 * @since 5.5.0
+	 * @since 5.9.0 Renamed `$plugin` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param array           $plugin  The plugin metadata.
+	 * @param array           $item    The plugin metadata.
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function prepare_item_for_response( $plugin, $request ) {
+	public function prepare_item_for_response( $item, $request ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$plugin = $item;
+
 		// There might be multiple blocks in a plugin. Only the first block is mapped.
 		$block_data = reset( $plugin['blocks'] );
 
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php
index 44d91449d60f3..c546a3082a3d4 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php
@@ -236,15 +236,17 @@ public function get_item( $request ) {
 	 * Prepares a block type object for serialization.
 	 *
 	 * @since 5.5.0
+	 * @since 5.9.0 Renamed `$block_type` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param WP_Block_Type   $block_type Block type data.
-	 * @param WP_REST_Request $request    Full details about the request.
+	 * @param WP_Block_Type   $item    Block type data.
+	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response Block type data.
 	 */
-	public function prepare_item_for_response( $block_type, $request ) {
-
-		$fields = $this->get_fields_for_response( $request );
-		$data   = array();
+	public function prepare_item_for_response( $item, $request ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$block_type = $item;
+		$fields     = $this->get_fields_for_response( $request );
+		$data       = array();
 
 		if ( rest_is_field_included( 'attributes', $fields ) ) {
 			$data['attributes'] = $block_type->get_attributes();
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php
index 1845e7bd94b77..6e2daa829a508 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php
@@ -1028,15 +1028,17 @@ public function delete_item( $request ) {
 	 * Prepares a single comment output for response.
 	 *
 	 * @since 4.7.0
+	 * @since 5.9.0 Renamed `$comment` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param WP_Comment      $comment Comment object.
+	 * @param WP_Comment      $item    Comment object.
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response Response object.
 	 */
-	public function prepare_item_for_response( $comment, $request ) {
-
-		$fields = $this->get_fields_for_response( $request );
-		$data   = array();
+	public function prepare_item_for_response( $item, $request ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$comment = $item;
+		$fields  = $this->get_fields_for_response( $request );
+		$data    = array();
 
 		if ( in_array( 'id', $fields, true ) ) {
 			$data['id'] = (int) $comment->comment_ID;
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php
index e79a1615eafc1..0c26c20ae0c53 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php
@@ -199,12 +199,15 @@ public function get_items( $request ) {
 	 * Prepare a raw pattern before it's output in an API response.
 	 *
 	 * @since 5.8.0
+	 * @since 5.9.0 Renamed `$raw_pattern` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param object          $raw_pattern A pattern from api.wordpress.org, before any changes.
-	 * @param WP_REST_Request $request     Request object.
+	 * @param object          $item    Raw pattern from api.wordpress.org, before any changes.
+	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response
 	 */
-	public function prepare_item_for_response( $raw_pattern, $request ) {
+	public function prepare_item_for_response( $item, $request ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$raw_pattern      = $item;
 		$prepared_pattern = array(
 			'id'             => absint( $raw_pattern->id ),
 			'title'          => sanitize_text_field( $raw_pattern->title->rendered ),
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php
index 588bfcaf4158f..8ef94ea21a33e 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php
@@ -213,13 +213,15 @@ public function get_item( $request ) {
 	 * Prepares a post status object for serialization.
 	 *
 	 * @since 4.7.0
+	 * @since 5.9.0 Renamed `$status` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param stdClass        $status  Post status data.
+	 * @param stdClass        $item    Post status data.
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response Post status data.
 	 */
-	public function prepare_item_for_response( $status, $request ) {
-
+	public function prepare_item_for_response( $item, $request ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$status = $item;
 		$fields = $this->get_fields_for_response( $request );
 		$data   = array();
 
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php
index 5d1d327f4f4e4..1301246dea206 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php
@@ -168,12 +168,15 @@ public function get_item( $request ) {
 	 * Prepares a post type object for serialization.
 	 *
 	 * @since 4.7.0
+	 * @since 5.9.0 Renamed `$post_type` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param WP_Post_Type    $post_type Post type object.
-	 * @param WP_REST_Request $request   Full details about the request.
+	 * @param WP_Post_Type    $item    Post type object.
+	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response Response object.
 	 */
-	public function prepare_item_for_response( $post_type, $request ) {
+	public function prepare_item_for_response( $item, $request ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$post_type  = $item;
 		$taxonomies = wp_list_filter( get_object_taxonomies( $post_type->name, 'objects' ), array( 'show_in_rest' => true ) );
 		$taxonomies = wp_list_pluck( $taxonomies, 'name' );
 		$base       = ! empty( $post_type->rest_base ) ? $post_type->rest_base : $post_type->name;
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
index b534cec5fbdb0..068cc70bc2a9d 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
@@ -1679,12 +1679,15 @@ protected function check_delete_permission( $post ) {
 	 * Prepares a single post output for response.
 	 *
 	 * @since 4.7.0
+	 * @since 5.9.0 Renamed `$post` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param WP_Post         $post    Post object.
+	 * @param WP_Post         $item    Post object.
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response Response object.
 	 */
-	public function prepare_item_for_response( $post, $request ) {
+	public function prepare_item_for_response( $item, $request ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$post            = $item;
 		$GLOBALS['post'] = $post;
 
 		setup_postdata( $post );
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
index 09f9981d2b3d5..5449812e1979a 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
@@ -535,12 +535,15 @@ protected function prepare_items_query( $prepared_args = array(), $request = nul
 	 * Prepares the revision for the REST response.
 	 *
 	 * @since 4.7.0
+	 * @since 5.9.0 Renamed `$post` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param WP_Post         $post    Post revision object.
+	 * @param WP_Post         $item    Post revision object.
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response Response object.
 	 */
-	public function prepare_item_for_response( $post, $request ) {
+	public function prepare_item_for_response( $item, $request ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$post            = $item;
 		$GLOBALS['post'] = $post;
 
 		setup_postdata( $post );
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-search-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-search-controller.php
index a0f2e17520259..b87973c9d606a 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-search-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-search-controller.php
@@ -186,12 +186,15 @@ public function get_items( $request ) {
 	 *
 	 * @since 5.0.0
 	 * @since 5.6.0 The `$id` parameter can accept a string.
+	 * @since 5.9.0 Renamed `$id` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param int|string      $id      ID of the item to prepare.
+	 * @param int|string      $item    ID of the item to prepare.
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response Response object.
 	 */
-	public function prepare_item_for_response( $id, $request ) {
+	public function prepare_item_for_response( $item, $request ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$item_id = $item;
 		$handler = $this->get_search_handler( $request );
 		if ( is_wp_error( $handler ) ) {
 			return new WP_REST_Response();
@@ -199,7 +202,7 @@ public function prepare_item_for_response( $id, $request ) {
 
 		$fields = $this->get_fields_for_response( $request );
 
-		$data = $handler->prepare_item( $id, $fields );
+		$data = $handler->prepare_item( $item_id, $fields );
 		$data = $this->add_additional_fields_to_object( $data, $request );
 
 		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
@@ -207,7 +210,7 @@ public function prepare_item_for_response( $id, $request ) {
 
 		$response = rest_ensure_response( $data );
 
-		$links               = $handler->prepare_item_links( $id );
+		$links               = $handler->prepare_item_links( $item_id );
 		$links['collection'] = array(
 			'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
 		);
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-sidebars-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-sidebars-controller.php
index f5e132b5aa05a..24f13814cf2be 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-sidebars-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-sidebars-controller.php
@@ -262,19 +262,22 @@ protected function get_sidebar( $id ) {
 	 * Prepares a single sidebar output for response.
 	 *
 	 * @since 5.8.0
+	 * @since 5.9.0 Renamed `$raw_sidebar` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @global array $wp_registered_sidebars The registered sidebars.
 	 * @global array $wp_registered_widgets  The registered widgets.
 	 *
-	 * @param array           $raw_sidebar Sidebar instance.
-	 * @param WP_REST_Request $request     Full details about the request.
+	 * @param array           $item    Sidebar instance.
+	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response Prepared response object.
 	 */
-	public function prepare_item_for_response( $raw_sidebar, $request ) {
+	public function prepare_item_for_response( $item, $request ) {
 		global $wp_registered_sidebars, $wp_registered_widgets;
 
-		$id      = $raw_sidebar['id'];
-		$sidebar = array( 'id' => $id );
+		// Restores the more descriptive, specific name for use within this method.
+		$raw_sidebar = $item;
+		$id          = $raw_sidebar['id'];
+		$sidebar     = array( 'id' => $id );
 
 		if ( isset( $wp_registered_sidebars[ $id ] ) ) {
 			$registered_sidebar = $wp_registered_sidebars[ $id ];
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php
index 0089afbfb1fac..9d43ca2874b71 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php
@@ -200,13 +200,16 @@ public function get_item( $request ) {
 	 * Prepares a taxonomy object for serialization.
 	 *
 	 * @since 4.7.0
+	 * @since 5.9.0 Renamed `$taxonomy` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param WP_Taxonomy     $taxonomy Taxonomy data.
-	 * @param WP_REST_Request $request  Full details about the request.
+	 * @param WP_Taxonomy     $item    Taxonomy data.
+	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response Response object.
 	 */
-	public function prepare_item_for_response( $taxonomy, $request ) {
-		$base = ! empty( $taxonomy->rest_base ) ? $taxonomy->rest_base : $taxonomy->name;
+	public function prepare_item_for_response( $item, $request ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$taxonomy = $item;
+		$base     = ! empty( $taxonomy->rest_base ) ? $taxonomy->rest_base : $taxonomy->name;
 
 		$fields = $this->get_fields_for_response( $request );
 		$data   = array();
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
index 48b6d71be0f10..1b4df794e81a1 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
@@ -402,13 +402,16 @@ protected function prepare_item_for_database( $request ) {
 	 * Prepare a single template output for response
 	 *
 	 * @since 5.8.0
+	 * @since 5.9.0 Renamed `$template` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param WP_Block_Template $template Template instance.
+	 * @param WP_Block_Template $item    Template instance.
 	 * @param WP_REST_Request   $request Request object.
 	 * @return WP_REST_Response $data
 	 */
-	public function prepare_item_for_response( $template, $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		$result = array(
+	public function prepare_item_for_response( $item, $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		// Restores the more descriptive, specific name for use within this method.
+		$template = $item;
+		$result   = array(
 			'id'             => $template->id,
 			'theme'          => $template->theme,
 			'content'        => array( 'raw' => $template->content ),
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php
index 021f6adfafcd3..10b5c29a33e76 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php
@@ -204,12 +204,15 @@ public function get_items( $request ) {
 	 * Prepares a single theme output for response.
 	 *
 	 * @since 5.0.0
+	 * @since 5.9.0 Renamed `$theme` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param WP_Theme        $theme   Theme object.
+	 * @param WP_Theme        $item    Theme object.
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response Response object.
 	 */
-	public function prepare_item_for_response( $theme, $request ) {
+	public function prepare_item_for_response( $item, $request ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$theme  = $item;
 		$data   = array();
 		$fields = $this->get_fields_for_response( $request );
 
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
index 63ad45b8ecab8..b3cdfc2e31e93 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
@@ -963,13 +963,15 @@ public function delete_current_item( $request ) {
 	 * Prepares a single user output for response.
 	 *
 	 * @since 4.7.0
+	 * @since 5.9.0 Renamed `$user` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param WP_User         $user    User object.
+	 * @param WP_User         $item    User object.
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response Response object.
 	 */
-	public function prepare_item_for_response( $user, $request ) {
-
+	public function prepare_item_for_response( $item, $request ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$user   = $item;
 		$data   = array();
 		$fields = $this->get_fields_for_response( $request );
 
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php
index c137302f31aee..39405664673d2 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php
@@ -263,14 +263,17 @@ public function get_item( $request ) {
 	 * Prepares a widget type object for serialization.
 	 *
 	 * @since 5.8.0
+	 * @since 5.9.0 Renamed `$widget_type` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
-	 * @param array           $widget_type Widget type data.
-	 * @param WP_REST_Request $request    Full details about the request.
+	 * @param array           $item    Widget type data.
+	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response Widget type data.
 	 */
-	public function prepare_item_for_response( $widget_type, $request ) {
-		$fields = $this->get_fields_for_response( $request );
-		$data   = array(
+	public function prepare_item_for_response( $item, $request ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$widget_type = $item;
+		$fields      = $this->get_fields_for_response( $request );
+		$data        = array(
 			'id' => $widget_type['id'],
 		);
 

From 36bca16d3166e608ce32ccd8437e9778c4882115 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 9 Sep 2021 19:20:56 +0000
Subject: [PATCH 107/257] Code Modernization: Fix parameter name mismatches for
 parent/child classes in `WP_Sitemaps_Provider::get_url_list()`.

In each child and grandchild class, renames the second parameter to match the parent's method signature.
Why? PHP 8 introduces the ability to pass named arguments to function/method calls. This means the child and parent method signatures (i.e. parameter names) need to match.

Adds @since to clearly specify why the change happened.

Reassigns the generic parameter to the original parameter.
Why? Restoring the original name keeps the context intact within the method and makes the code more readable. An inline comment explains why this reassignment is made.

Follow-up to [48072].

Props jrf, hellofromTonya, sergeybiryukov, azaozz, desrosj, johnbillion.
See #51553.

git-svn-id: https://develop.svn.wordpress.org/trunk@51787 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../sitemaps/providers/class-wp-sitemaps-posts.php   | 12 +++++++++---
 .../providers/class-wp-sitemaps-taxonomies.php       | 10 +++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/wp-includes/sitemaps/providers/class-wp-sitemaps-posts.php b/src/wp-includes/sitemaps/providers/class-wp-sitemaps-posts.php
index 56acfb7697c20..c9d982ddce5d4 100644
--- a/src/wp-includes/sitemaps/providers/class-wp-sitemaps-posts.php
+++ b/src/wp-includes/sitemaps/providers/class-wp-sitemaps-posts.php
@@ -53,12 +53,18 @@ public function get_object_subtypes() {
 	 * Gets a URL list for a post type sitemap.
 	 *
 	 * @since 5.5.0
+	 * @since 5.9.0 Renamed `$post_type` to `$object_subtype` to match parent class
+	 *              for PHP 8 named parameter support.
+	 *
+	 * @param int    $page_num       Page of results.
+	 * @param string $object_subtype Optional. Post type name. Default empty.
 	 *
-	 * @param int    $page_num  Page of results.
-	 * @param string $post_type Optional. Post type name. Default empty.
 	 * @return array Array of URLs for a sitemap.
 	 */
-	public function get_url_list( $page_num, $post_type = '' ) {
+	public function get_url_list( $page_num, $object_subtype = '' ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$post_type = $object_subtype;
+
 		// Bail early if the queried post type is not supported.
 		$supported_types = $this->get_object_subtypes();
 
diff --git a/src/wp-includes/sitemaps/providers/class-wp-sitemaps-taxonomies.php b/src/wp-includes/sitemaps/providers/class-wp-sitemaps-taxonomies.php
index e8fcc6d5ab222..f5b6bb631abb5 100644
--- a/src/wp-includes/sitemaps/providers/class-wp-sitemaps-taxonomies.php
+++ b/src/wp-includes/sitemaps/providers/class-wp-sitemaps-taxonomies.php
@@ -51,12 +51,16 @@ public function get_object_subtypes() {
 	 * Gets a URL list for a taxonomy sitemap.
 	 *
 	 * @since 5.5.0
+	 * @since 5.9.0 Renamed `$taxonomy` to `$object_subtype` to match parent class
+	 *              for PHP 8 named parameter support.
 	 *
-	 * @param int    $page_num Page of results.
-	 * @param string $taxonomy Optional. Taxonomy name. Default empty.
+	 * @param int    $page_num       Page of results.
+	 * @param string $object_subtype Optional. Taxonomy name. Default empty.
 	 * @return array Array of URLs for a sitemap.
 	 */
-	public function get_url_list( $page_num, $taxonomy = '' ) {
+	public function get_url_list( $page_num, $object_subtype = '' ) {
+		// Restores the more descriptive, specific name for use within this method.
+		$taxonomy        = $object_subtype;
 		$supported_types = $this->get_object_subtypes();
 
 		// Bail early if the queried taxonomy is not supported.

From ec3b4135da6e892cea1b00897147d56d7c8ba97d Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 9 Sep 2021 19:41:53 +0000
Subject: [PATCH 108/257] Code Modernization: Fix parameter name mismatches for
 parent/child classes in `WP_Sitemaps_Provider::get_max_num_pages()`.

In each child class, renames the parameter to match the parent's method signature.
Why? PHP 8 introduces the ability to pass named arguments to function/method calls. This means the child and parent method signatures (i.e. parameter names) need to match.

Adds @since to clearly specify why the change happened.

Reassigns the generic parameter to the original parameter.
Why? Restoring the original name keeps the context intact within the method and makes the code more readable. An inline comment explains why this reassignment is made.

Note: Reassignment is done after the guard clause.
Why? To avoid unnecessary processing and memory should the method bail out.

Follow-up to [48072].

Props jrf, hellofromTonya, sergeybiryukov, azaozz, desrosj, johnbillion.
See #51553.

git-svn-id: https://develop.svn.wordpress.org/trunk@51788 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../sitemaps/providers/class-wp-sitemaps-posts.php    | 11 ++++++++---
 .../providers/class-wp-sitemaps-taxonomies.php        | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/wp-includes/sitemaps/providers/class-wp-sitemaps-posts.php b/src/wp-includes/sitemaps/providers/class-wp-sitemaps-posts.php
index c9d982ddce5d4..701d170a6ad72 100644
--- a/src/wp-includes/sitemaps/providers/class-wp-sitemaps-posts.php
+++ b/src/wp-includes/sitemaps/providers/class-wp-sitemaps-posts.php
@@ -148,15 +148,20 @@ public function get_url_list( $page_num, $object_subtype = '' ) {
 	 * Gets the max number of pages available for the object type.
 	 *
 	 * @since 5.5.0
+	 * @since 5.9.0 Renamed `$post_type` to `$object_subtype` to match parent class
+	 *              for PHP 8 named parameter support.
 	 *
-	 * @param string $post_type Optional. Post type name. Default empty.
+	 * @param string $object_subtype Optional. Post type name. Default empty.
 	 * @return int Total number of pages.
 	 */
-	public function get_max_num_pages( $post_type = '' ) {
-		if ( empty( $post_type ) ) {
+	public function get_max_num_pages( $object_subtype = '' ) {
+		if ( empty( $object_subtype ) ) {
 			return 0;
 		}
 
+		// Restores the more descriptive, specific name for use within this method.
+		$post_type = $object_subtype;
+
 		/**
 		 * Filters the max number of pages before it is generated.
 		 *
diff --git a/src/wp-includes/sitemaps/providers/class-wp-sitemaps-taxonomies.php b/src/wp-includes/sitemaps/providers/class-wp-sitemaps-taxonomies.php
index f5b6bb631abb5..636815397e181 100644
--- a/src/wp-includes/sitemaps/providers/class-wp-sitemaps-taxonomies.php
+++ b/src/wp-includes/sitemaps/providers/class-wp-sitemaps-taxonomies.php
@@ -134,15 +134,20 @@ public function get_url_list( $page_num, $object_subtype = '' ) {
 	 * Gets the max number of pages available for the object type.
 	 *
 	 * @since 5.5.0
+	 * @since 5.9.0 Renamed `$taxonomy` to `$object_subtype` to match parent class
+	 *              for PHP 8 named parameter support.
 	 *
-	 * @param string $taxonomy Taxonomy name.
+	 * @param string $object_subtype Optional. Taxonomy name. Default empty.
 	 * @return int Total number of pages.
 	 */
-	public function get_max_num_pages( $taxonomy = '' ) {
-		if ( empty( $taxonomy ) ) {
+	public function get_max_num_pages( $object_subtype = '' ) {
+		if ( empty( $object_subtype ) ) {
 			return 0;
 		}
 
+		// Restores the more descriptive, specific name for use within this method.
+		$taxonomy = $object_subtype;
+
 		/**
 		 * Filters the max number of pages before it is generated.
 		 *

From cc1632c046b815d377374097798485c5a9d520b9 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 9 Sep 2021 20:12:58 +0000
Subject: [PATCH 109/257] Code Modernization: Fix parameter name mismatches for
 parent/child classes in `WP_Widget::update()`.

In each child class, renames the parameter to match the parent's method signature.
Why? PHP 8 introduces the ability to pass named arguments to function/method calls. This means the child and parent method signatures (i.e. parameter names) need to match.

Adds @since to clearly specify why the change happened.

Replaces the original with the variable name with within each method.
Why? The new name is more specific and descriptive, which improves readability.

Follow-up to [10782], [25090], [26556], [40640].

Props jrf, hellofromTonya, sergeybiryukov, azaozz, desrosj, johnbillion.
See #51553.

git-svn-id: https://develop.svn.wordpress.org/trunk@51789 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../themes/twentyfourteen/inc/widgets.php          | 14 ++++++++------
 src/wp-includes/widgets/class-wp-widget-media.php  | 10 ++++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/wp-content/themes/twentyfourteen/inc/widgets.php b/src/wp-content/themes/twentyfourteen/inc/widgets.php
index d8d15c2ba4b55..397b2fc0d8b96 100644
--- a/src/wp-content/themes/twentyfourteen/inc/widgets.php
+++ b/src/wp-content/themes/twentyfourteen/inc/widgets.php
@@ -262,20 +262,22 @@ public function widget( $args, $instance ) {
 	 * Here is where any validation should happen.
 	 *
 	 * @since Twenty Fourteen 1.0
+	 * @since Twenty Fourteen 3.3 Renamed `$instance` to `$old_instance` to match
+	 *                            parent class for PHP 8 named parameter support.
 	 *
 	 * @param array $new_instance New widget instance.
-	 * @param array $instance     Original widget instance.
+	 * @param array $old_instance Original widget instance.
 	 * @return array Updated widget instance.
 	 */
-	function update( $new_instance, $instance ) {
-		$instance['title']  = strip_tags( $new_instance['title'] );
-		$instance['number'] = empty( $new_instance['number'] ) ? 2 : absint( $new_instance['number'] );
+	function update( $new_instance, $old_instance ) {
+		$old_instance['title']  = strip_tags( $new_instance['title'] );
+		$old_instance['number'] = empty( $new_instance['number'] ) ? 2 : absint( $new_instance['number'] );
 
 		if ( in_array( $new_instance['format'], $this->formats, true ) ) {
-			$instance['format'] = $new_instance['format'];
+			$old_instance['format'] = $new_instance['format'];
 		}
 
-		return $instance;
+		return $old_instance;
 	}
 
 	/**
diff --git a/src/wp-includes/widgets/class-wp-widget-media.php b/src/wp-includes/widgets/class-wp-widget-media.php
index 25016fd268d0a..b6eaff793e18b 100644
--- a/src/wp-includes/widgets/class-wp-widget-media.php
+++ b/src/wp-includes/widgets/class-wp-widget-media.php
@@ -259,16 +259,18 @@ public function widget( $args, $instance ) {
 	 * Sanitizes the widget form values as they are saved.
 	 *
 	 * @since 4.8.0
+	 * @since 5.9.0 Renamed `$instance` to `$old_instance` to match parent class
+	 *              for PHP 8 named parameter support.
 	 *
 	 * @see WP_Widget::update()
 	 * @see WP_REST_Request::has_valid_params()
 	 * @see WP_REST_Request::sanitize_params()
 	 *
 	 * @param array $new_instance Values just sent to be saved.
-	 * @param array $instance     Previously saved values from database.
+	 * @param array $old_instance Previously saved values from database.
 	 * @return array Updated safe values to be saved.
 	 */
-	public function update( $new_instance, $instance ) {
+	public function update( $new_instance, $old_instance ) {
 
 		$schema = $this->get_instance_schema();
 		foreach ( $schema as $field => $field_schema ) {
@@ -303,10 +305,10 @@ public function update( $new_instance, $instance ) {
 			if ( is_wp_error( $value ) ) {
 				continue;
 			}
-			$instance[ $field ] = $value;
+			$old_instance[ $field ] = $value;
 		}
 
-		return $instance;
+		return $old_instance;
 	}
 
 	/**

From 50d7248e1eac54d1c2d3994cfa6f563c6cbe3741 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 9 Sep 2021 20:38:20 +0000
Subject: [PATCH 110/257] Code Modernization: Fix parameter name mismatches for
 parent/child classes in `WP_Image_Editor::save()`.

Renames the first parameter in `WP_Image_Editor_GD::save()` to match the parent's method signature.
Why? PHP 8 introduces the ability to pass named arguments to function/method calls. This means the child and parent method signatures (i.e. parameter names) need to match.

Adds @since to clearly specify why the change happened.

Adds parameter descriptions to parent and both child classes.

Follow-up to [22094], [22619], [30681].

Props jrf, hellofromTonya, sergeybiryukov, azaozz, desrosj, johnbillion.
See #51553.

git-svn-id: https://develop.svn.wordpress.org/trunk@51790 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-image-editor-gd.php      | 10 ++++++----
 src/wp-includes/class-wp-image-editor-imagick.php |  4 ++--
 src/wp-includes/class-wp-image-editor.php         |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/wp-includes/class-wp-image-editor-gd.php b/src/wp-includes/class-wp-image-editor-gd.php
index c2105169ec5c6..f175b90d2016b 100644
--- a/src/wp-includes/class-wp-image-editor-gd.php
+++ b/src/wp-includes/class-wp-image-editor-gd.php
@@ -423,13 +423,15 @@ public function flip( $horz, $vert ) {
 	 * Saves current in-memory image to file.
 	 *
 	 * @since 3.5.0
+	 * @since 5.9.0 Renamed `$filename` to `$destfilename` to match parent class
+	 *              for PHP 8 named parameter support.
 	 *
-	 * @param string|null $filename
-	 * @param string|null $mime_type
+	 * @param string|null $destfilename Optional. Destination filename. Default null.
+	 * @param string|null $mime_type    Optional. The mime-type. Default null.
 	 * @return array|WP_Error {'path'=>string, 'file'=>string, 'width'=>int, 'height'=>int, 'mime-type'=>string}
 	 */
-	public function save( $filename = null, $mime_type = null ) {
-		$saved = $this->_save( $this->image, $filename, $mime_type );
+	public function save( $destfilename = null, $mime_type = null ) {
+		$saved = $this->_save( $this->image, $destfilename, $mime_type );
 
 		if ( ! is_wp_error( $saved ) ) {
 			$this->file      = $saved['path'];
diff --git a/src/wp-includes/class-wp-image-editor-imagick.php b/src/wp-includes/class-wp-image-editor-imagick.php
index ae91e4697091e..b7336fe5aeb3e 100644
--- a/src/wp-includes/class-wp-image-editor-imagick.php
+++ b/src/wp-includes/class-wp-image-editor-imagick.php
@@ -662,8 +662,8 @@ public function maybe_exif_rotate() {
 	 *
 	 * @since 3.5.0
 	 *
-	 * @param string $destfilename
-	 * @param string $mime_type
+	 * @param string $destfilename Optional. Destination filename. Default null.
+	 * @param string $mime_type    Optional. The mime-type. Default null.
 	 * @return array|WP_Error {'path'=>string, 'file'=>string, 'width'=>int, 'height'=>int, 'mime-type'=>string}
 	 */
 	public function save( $destfilename = null, $mime_type = null ) {
diff --git a/src/wp-includes/class-wp-image-editor.php b/src/wp-includes/class-wp-image-editor.php
index a74d4ac7430b9..b9e580c46f3b1 100644
--- a/src/wp-includes/class-wp-image-editor.php
+++ b/src/wp-includes/class-wp-image-editor.php
@@ -77,8 +77,8 @@ abstract public function load();
 	 * @since 3.5.0
 	 * @abstract
 	 *
-	 * @param string $destfilename
-	 * @param string $mime_type
+	 * @param string $destfilename Optional. Destination filename. Default null.
+	 * @param string $mime_type    Optional. The mime-type. Default null.
 	 * @return array|WP_Error {'path'=>string, 'file'=>string, 'width'=>int, 'height'=>int, 'mime-type'=>string}
 	 */
 	abstract public function save( $destfilename = null, $mime_type = null );

From 1d0e4441c108d854d6f1c7c8842eefb5140c4608 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 9 Sep 2021 21:39:39 +0000
Subject: [PATCH 111/257] Widgets: Revert [51705].

While the new name is much better, it doesn't fully tell what will happen when invoked nor does it fully solve the root problems.

Why? The function is doing too much. And naming is hard.

Props azaozz, desrosj, andraganescu, zieladam, hellofromTonya.
See #53811.

git-svn-id: https://develop.svn.wordpress.org/trunk@51791 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/upgrade.php             |  2 +-
 src/wp-admin/widgets-form.php                 |  2 +-
 .../class-wp-customize-widgets.php            |  8 ++---
 .../class-wp-rest-sidebars-controller.php     |  4 +--
 .../class-wp-rest-widgets-controller.php      | 12 +++----
 src/wp-includes/theme.php                     |  2 +-
 src/wp-includes/widgets.php                   | 23 ++----------
 tests/phpunit/tests/widgets.php               | 36 +++++++++----------
 8 files changed, 36 insertions(+), 53 deletions(-)

diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php
index 8da032d183a98..475608efa7908 100644
--- a/src/wp-admin/includes/upgrade.php
+++ b/src/wp-admin/includes/upgrade.php
@@ -1773,7 +1773,7 @@ function upgrade_330() {
 
 			// Intentional fall-through to upgrade to the next version.
 		case 2:
-			$sidebars_widgets                  = sync_registered_widgets();
+			$sidebars_widgets                  = retrieve_widgets();
 			$sidebars_widgets['array_version'] = 3;
 			update_option( 'sidebars_widgets', $sidebars_widgets );
 	}
diff --git a/src/wp-admin/widgets-form.php b/src/wp-admin/widgets-form.php
index 9284f734e685b..df4efdba90582 100644
--- a/src/wp-admin/widgets-form.php
+++ b/src/wp-admin/widgets-form.php
@@ -118,7 +118,7 @@
 	)
 );
 
-sync_registered_widgets();
+retrieve_widgets();
 
 // We're saving a widget without JS.
 if ( isset( $_POST['savewidget'] ) || isset( $_POST['removewidget'] ) ) {
diff --git a/src/wp-includes/class-wp-customize-widgets.php b/src/wp-includes/class-wp-customize-widgets.php
index 264b502e9d61f..c96773b1397f1 100644
--- a/src/wp-includes/class-wp-customize-widgets.php
+++ b/src/wp-includes/class-wp-customize-widgets.php
@@ -275,9 +275,9 @@ public function override_sidebars_widgets_for_theme_switch() {
 		add_filter( 'customize_value_old_sidebars_widgets_data', array( $this, 'filter_customize_value_old_sidebars_widgets_data' ) );
 		$this->manager->set_post_value( 'old_sidebars_widgets_data', $this->old_sidebars_widgets ); // Override any value cached in changeset.
 
-		// sync_registered_widgets() looks at the global $sidebars_widgets.
+		// retrieve_widgets() looks at the global $sidebars_widgets.
 		$sidebars_widgets = $this->old_sidebars_widgets;
-		$sidebars_widgets = sync_registered_widgets( 'customize' );
+		$sidebars_widgets = retrieve_widgets( 'customize' );
 		add_filter( 'option_sidebars_widgets', array( $this, 'filter_option_sidebars_widgets_for_theme_switch' ), 1 );
 		// Reset global cache var used by wp_get_sidebars_widgets().
 		unset( $GLOBALS['_wp_sidebars_widgets'] );
@@ -287,7 +287,7 @@ public function override_sidebars_widgets_for_theme_switch() {
 	 * Filters old_sidebars_widgets_data Customizer setting.
 	 *
 	 * When switching themes, filter the Customizer setting old_sidebars_widgets_data
-	 * to supply initial $sidebars_widgets before they were overridden by sync_registered_widgets().
+	 * to supply initial $sidebars_widgets before they were overridden by retrieve_widgets().
 	 * The value for old_sidebars_widgets_data gets set in the old theme's sidebars_widgets
 	 * theme_mod.
 	 *
@@ -305,7 +305,7 @@ public function filter_customize_value_old_sidebars_widgets_data( $old_sidebars_
 	/**
 	 * Filters sidebars_widgets option for theme switch.
 	 *
-	 * When switching themes, the sync_registered_widgets() function is run when the Customizer initializes,
+	 * When switching themes, the retrieve_widgets() function is run when the Customizer initializes,
 	 * and then the new sidebars_widgets here get supplied as the default value for the sidebars_widgets
 	 * option.
 	 *
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-sidebars-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-sidebars-controller.php
index 24f13814cf2be..2aad57ad5425a 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-sidebars-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-sidebars-controller.php
@@ -98,7 +98,7 @@ public function get_items_permissions_check( $request ) {
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
 	public function get_items( $request ) {
-		sync_registered_widgets();
+		retrieve_widgets();
 
 		$data = array();
 		foreach ( wp_get_sidebars_widgets() as $id => $widgets ) {
@@ -137,7 +137,7 @@ public function get_item_permissions_check( $request ) {
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
 	public function get_item( $request ) {
-		sync_registered_widgets();
+		retrieve_widgets();
 
 		$sidebar = $this->get_sidebar( $request['id'] );
 
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-widgets-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-widgets-controller.php
index dea8ed3ac0976..4c54620f509fa 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-widgets-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-widgets-controller.php
@@ -109,7 +109,7 @@ public function get_items_permissions_check( $request ) {
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
 	public function get_items( $request ) {
-		sync_registered_widgets();
+		retrieve_widgets();
 
 		$prepared = array();
 
@@ -151,7 +151,7 @@ public function get_item_permissions_check( $request ) {
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
 	public function get_item( $request ) {
-		sync_registered_widgets();
+		retrieve_widgets();
 
 		$widget_id  = $request['id'];
 		$sidebar_id = wp_find_widgets_sidebar( $widget_id );
@@ -237,7 +237,7 @@ public function update_item( $request ) {
 		global $wp_widget_factory;
 
 		/*
-		 * sync_registered_widgets() contains logic to move "hidden" or "lost" widgets to the
+		 * retrieve_widgets() contains logic to move "hidden" or "lost" widgets to the
 		 * wp_inactive_widgets sidebar based on the contents of the $sidebars_widgets global.
 		 *
 		 * When batch requests are processed, this global is not properly updated by previous
@@ -248,7 +248,7 @@ public function update_item( $request ) {
 		 */
 		wp_get_sidebars_widgets();
 
-		sync_registered_widgets();
+		retrieve_widgets();
 
 		$widget_id  = $request['id'];
 		$sidebar_id = wp_find_widgets_sidebar( $widget_id );
@@ -313,7 +313,7 @@ public function delete_item( $request ) {
 		global $wp_widget_factory, $wp_registered_widget_updates;
 
 		/*
-		 * sync_registered_widgets() contains logic to move "hidden" or "lost" widgets to the
+		 * retrieve_widgets() contains logic to move "hidden" or "lost" widgets to the
 		 * wp_inactive_widgets sidebar based on the contents of the $sidebars_widgets global.
 		 *
 		 * When batch requests are processed, this global is not properly updated by previous
@@ -324,7 +324,7 @@ public function delete_item( $request ) {
 		 */
 		wp_get_sidebars_widgets();
 
-		sync_registered_widgets();
+		retrieve_widgets();
 
 		$widget_id  = $request['id'];
 		$sidebar_id = wp_find_widgets_sidebar( $widget_id );
diff --git a/src/wp-includes/theme.php b/src/wp-includes/theme.php
index e58719e641cbd..384c056404b2a 100644
--- a/src/wp-includes/theme.php
+++ b/src/wp-includes/theme.php
@@ -805,7 +805,7 @@ function switch_theme( $stylesheet ) {
 		add_option( "theme_mods_$stylesheet", $default_theme_mods );
 	} else {
 		/*
-		 * Since sync_registered_widgets() is called when initializing a theme in the Customizer,
+		 * Since retrieve_widgets() is called when initializing a theme in the Customizer,
 		 * we need to remove the theme mods to avoid overwriting changes made via
 		 * the Customizer when accessing wp-admin/widgets.php.
 		 */
diff --git a/src/wp-includes/widgets.php b/src/wp-includes/widgets.php
index 4f159173451ed..61caf6af56d6a 100644
--- a/src/wp-includes/widgets.php
+++ b/src/wp-includes/widgets.php
@@ -1251,30 +1251,13 @@ function _wp_sidebars_changed() {
 		$sidebars_widgets = wp_get_sidebars_widgets();
 	}
 
-	sync_registered_widgets( true );
+	retrieve_widgets( true );
 }
 
 /**
- * Do not use, deprecated.
- *
- * Use sync_registered_widgets() instead.
+ * Look for "lost" widgets, this has to run at least on each theme change.
  *
  * @since 2.8.0
- * @deprecated 5.8.1 Use sync_registered_widgets()
- * @see sync_registered_widgets()
- *
- * @param string|bool $theme_changed
- * @return array
- */
-function retrieve_widgets( $theme_changed = false ) {
-	return sync_registered_widgets( $theme_changed );
-}
-
-/**
- * Looks for "lost" widgets and Updates widgets-to-sidebars allocation.
- * This has to run at least on each theme change.
- *
- * @since 5.8.1
  *
  * @global array $wp_registered_sidebars Registered sidebars.
  * @global array $sidebars_widgets
@@ -1284,7 +1267,7 @@ function retrieve_widgets( $theme_changed = false ) {
  *                                   of 'customize' defers updates for the Customizer.
  * @return array Updated sidebars widgets.
  */
-function sync_registered_widgets( $theme_changed = false ) {
+function retrieve_widgets( $theme_changed = false ) {
 	global $wp_registered_sidebars, $sidebars_widgets, $wp_registered_widgets;
 
 	$registered_sidebars_keys = array_keys( $wp_registered_sidebars );
diff --git a/tests/phpunit/tests/widgets.php b/tests/phpunit/tests/widgets.php
index 103ea8ec37f2e..886039d687e40 100644
--- a/tests/phpunit/tests/widgets.php
+++ b/tests/phpunit/tests/widgets.php
@@ -843,9 +843,9 @@ function register_sidebars( $sidebars ) {
 	/**
 	 * Tests for when 'sidebars_widgets' theme mod is populated.
 	 *
-	 * @covers ::sync_registered_widgets
+	 * @covers ::retrieve_widgets
 	 */
-	function test_sync_registered_widgets_with_theme_mod() {
+	function test_retrieve_widgets_with_theme_mod() {
 		global $sidebars_widgets, $_wp_sidebars_widgets;
 
 		wp_widgets_init();
@@ -873,7 +873,7 @@ function test_sync_registered_widgets_with_theme_mod() {
 			'wp_inactive_widgets' => array(),
 		);
 
-		$result = sync_registered_widgets( true );
+		$result = retrieve_widgets( true );
 
 		$this->assertIsArray( $result );
 		$this->assertSame( $result, $sidebars_widgets );
@@ -906,9 +906,9 @@ function test_sync_registered_widgets_with_theme_mod() {
 	/**
 	 * Tests for when sidebars widgets matches registered sidebars.
 	 *
-	 * @covers ::sync_registered_widgets
+	 * @covers ::retrieve_widgets
 	 */
-	function test_sync_registered_widgets_with_sidebars_widgets_matching_registered_sidebars() {
+	function test_retrieve_widgets_with_sidebars_widgets_matching_registered_sidebars() {
 		global $sidebars_widgets;
 
 		wp_widgets_init();
@@ -921,7 +921,7 @@ function test_sync_registered_widgets_with_sidebars_widgets_matching_registered_
 			'wp_inactive_widgets' => array(),
 		);
 
-		$result = sync_registered_widgets( true );
+		$result = retrieve_widgets( true );
 
 		// $sidebars_widgets matches registered sidebars.
 		$this->assertIsArray( $result );
@@ -944,9 +944,9 @@ function test_sync_registered_widgets_with_sidebars_widgets_matching_registered_
 	/**
 	 * Tests for when sidebars widgets doesn't match registered sidebars.
 	 *
-	 * @covers ::sync_registered_widgets
+	 * @covers ::retrieve_widgets
 	 */
-	function test_sync_registered_widgets_with_sidebars_widgets_not_matching_registered_sidebars() {
+	function test_retrieve_widgets_with_sidebars_widgets_not_matching_registered_sidebars() {
 		global $sidebars_widgets, $_wp_sidebars_widgets;
 
 		wp_widgets_init();
@@ -960,7 +960,7 @@ function test_sync_registered_widgets_with_sidebars_widgets_not_matching_registe
 		);
 
 		// Theme changed.
-		$result = sync_registered_widgets( true );
+		$result = retrieve_widgets( true );
 
 		$_wp_sidebars_widgets = array();
 		$this->assertIsArray( $result );
@@ -1002,7 +1002,7 @@ function test_sync_registered_widgets_with_sidebars_widgets_not_matching_registe
 		);
 
 		// Theme did not change.
-		$result = sync_registered_widgets();
+		$result = retrieve_widgets();
 
 		$_wp_sidebars_widgets = array();
 		$this->assertIsArray( $result );
@@ -1036,9 +1036,9 @@ function test_sync_registered_widgets_with_sidebars_widgets_not_matching_registe
 	/**
 	 * Tests for Customizer mode.
 	 *
-	 * @covers ::sync_registered_widgets
+	 * @covers ::retrieve_widgets
 	 */
-	function test_sync_registered_widgets_for_customizer() {
+	function test_retrieve_widgets_for_customizer() {
 		global $sidebars_widgets, $_wp_sidebars_widgets;
 
 		wp_widgets_init();
@@ -1053,7 +1053,7 @@ function test_sync_registered_widgets_for_customizer() {
 		);
 		set_theme_mod( 'sidebars_widgets', $old_sidebars_widgets );
 
-		$result = sync_registered_widgets( 'customize' );
+		$result = retrieve_widgets( 'customize' );
 
 		$_wp_sidebars_widgets = array();
 		$this->assertIsArray( $result );
@@ -1082,7 +1082,7 @@ function test_sync_registered_widgets_for_customizer() {
 		$this->assertNotEquals( $sidebars_widgets, wp_get_sidebars_widgets() );
 	}
 
-	function test_sync_registered_widgets_with_single_widget() {
+	function test_retrieve_widgets_with_single_widget() {
 		global $sidebars_widgets;
 
 		wp_widgets_init();
@@ -1099,7 +1099,7 @@ function test_sync_registered_widgets_with_single_widget() {
 		);
 
 		// Theme changed.
-		$result = sync_registered_widgets( true );
+		$result = retrieve_widgets( true );
 
 		$this->assertContains( 'single', $result['wp_inactive_widgets'] );
 	}
@@ -1107,9 +1107,9 @@ function test_sync_registered_widgets_with_single_widget() {
 	/**
 	 * Tests for orphaned widgets being moved into inactive widgets.
 	 *
-	 * @covers ::sync_registered_widgets
+	 * @covers ::retrieve_widgets
 	 */
-	function test_sync_registered_widgets_move_orphaned_widgets_to_inactive() {
+	function test_retrieve_widgets_move_orphaned_widgets_to_inactive() {
 		global $sidebars_widgets;
 
 		wp_widgets_init();
@@ -1122,7 +1122,7 @@ function test_sync_registered_widgets_move_orphaned_widgets_to_inactive() {
 			'orphaned_widgets_1'  => array( 'calendar-1' ),
 		);
 
-		sync_registered_widgets();
+		retrieve_widgets();
 
 		$this->assertIsArray( $sidebars_widgets );
 

From c556e0dbab51d8f02e3d6ae61f08aaa3ab89836f Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 9 Sep 2021 22:43:49 +0000
Subject: [PATCH 112/257] Tests: Add more invalid IP test cases and `@covers`
 to `Tests_Functions_Anonymization`.

Adds a few more invalid IP test cases.

Adds extra `@covers` tag for the two functions which are testing the `wp_privacy_anonymize_ip()` function.

(At class level, the `wp_privacy_anonymize_data()` is set as covered).

Follow-up to [42971].

Props jrf, hellofromTonya.
See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51792 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../phpunit/tests/functions/anonymization.php | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tests/phpunit/tests/functions/anonymization.php b/tests/phpunit/tests/functions/anonymization.php
index 9ca33b441e80b..b0dfafa528a28 100644
--- a/tests/phpunit/tests/functions/anonymization.php
+++ b/tests/phpunit/tests/functions/anonymization.php
@@ -26,6 +26,8 @@ class Tests_Functions_Anonymization extends WP_UnitTestCase {
 	 * @ticket 41083
 	 * @ticket 43545
 	 *
+	 * @covers ::wp_privacy_anonymize_ip
+	 *
 	 * @param string $raw_ip          Raw IP address.
 	 * @param string $expected_result Expected result.
 	 */
@@ -56,6 +58,22 @@ public function data_wp_privacy_anonymize_ip() {
 				null,
 				'0.0.0.0',
 			),
+			array(
+				false,
+				'0.0.0.0',
+			),
+			array(
+				true,
+				'0.0.0.0',
+			),
+			array(
+				0,
+				'0.0.0.0',
+			),
+			array(
+				1,
+				'0.0.0.0',
+			),
 			array(
 				'',
 				'0.0.0.0',
@@ -166,6 +184,8 @@ public function data_wp_privacy_anonymize_ip() {
 	 * @requires function inet_ntop
 	 * @requires function inet_pton
 	 *
+	 * @covers ::wp_privacy_anonymize_ip
+	 *
 	 * @param string $raw_ip          Raw IP address.
 	 * @param string $expected_result Expected result.
 	 */

From acad2b4149d45632547197a24cb96f8dd7f20a95 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 9 Sep 2021 22:55:36 +0000
Subject: [PATCH 113/257] Code Modernization: Fix null to non-nullable
 deprecation in `wp_privacy_anonymize_ip()`.

The `wp_privacy_anonymize_ip()` function expects a string for the `$ip_addr` parameter, but did not do any input validation.

One of the pre-existing test cases, passed `null` to the function, leading to a `substr_count(): Passing null to parameter #1 ($haystack) of type string is deprecated` notice on PHP 8.1.

Fixed now by doing a cursory check on the variable at the start of the function and bowing out early for a number of cases (`null`, `false`, `0`, `''`) which would all result in the same `0.0.0.0` output anyway.

Follow-up [42971].

Props jrf, hellofromTonya.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51793 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/functions.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index 12de2395d7d87..f75c396328691 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -7618,6 +7618,10 @@ function wp_site_admin_email_change_notification( $old_email, $new_email, $optio
  * @return string  The anonymized IP address.
  */
 function wp_privacy_anonymize_ip( $ip_addr, $ipv6_fallback = false ) {
+	if ( empty( $ip_addr ) ) {
+		return '0.0.0.0';
+	}
+
 	// Detect what kind of IP address this is.
 	$ip_prefix = '';
 	$is_ipv6   = substr_count( $ip_addr, ':' ) > 1;

From 088f3043a4555c29f4f57ba29d287ac9bd6e0b7c Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Fri, 10 Sep 2021 00:01:24 +0000
Subject: [PATCH 114/257] External Libraries: Update jQuery UI to 1.13.0-rc2.

The final release is expected at the beginning of October. Updating to rc2 now gives everybody plenty of time to test and report any issues either with UI 1.13.0 or with the WordPress implementation.

Props Clorith, mgol, azaozz.
See #52163.

git-svn-id: https://develop.svn.wordpress.org/trunk@51794 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../_enqueues/vendor/jquery/ui/accordion.js   |  25 +-
 .../vendor/jquery/ui/autocomplete.js          |  55 ++-
 src/js/_enqueues/vendor/jquery/ui/button.js   | 101 ++++-
 .../vendor/jquery/ui/checkboxradio.js         |  18 +-
 .../vendor/jquery/ui/controlgroup.js          |  16 +-
 src/js/_enqueues/vendor/jquery/ui/core.js     | 251 ++++++------
 .../_enqueues/vendor/jquery/ui/datepicker.js  | 232 ++++++++---
 src/js/_enqueues/vendor/jquery/ui/dialog.js   |  76 ++--
 .../_enqueues/vendor/jquery/ui/draggable.js   |  35 +-
 .../_enqueues/vendor/jquery/ui/droppable.js   |  32 +-
 .../vendor/jquery/ui/effect-blind.js          |   9 +-
 .../vendor/jquery/ui/effect-bounce.js         |   9 +-
 .../_enqueues/vendor/jquery/ui/effect-clip.js |   9 +-
 .../_enqueues/vendor/jquery/ui/effect-drop.js |   9 +-
 .../vendor/jquery/ui/effect-explode.js        |  13 +-
 .../_enqueues/vendor/jquery/ui/effect-fade.js |   9 +-
 .../_enqueues/vendor/jquery/ui/effect-fold.js |   9 +-
 .../vendor/jquery/ui/effect-highlight.js      |   9 +-
 .../_enqueues/vendor/jquery/ui/effect-puff.js |   9 +-
 .../vendor/jquery/ui/effect-pulsate.js        |   9 +-
 .../vendor/jquery/ui/effect-scale.js          |   9 +-
 .../vendor/jquery/ui/effect-shake.js          |   9 +-
 .../_enqueues/vendor/jquery/ui/effect-size.js |  11 +-
 .../vendor/jquery/ui/effect-slide.js          |   9 +-
 .../vendor/jquery/ui/effect-transfer.js       |   9 +-
 src/js/_enqueues/vendor/jquery/ui/effect.js   | 273 +++++++------
 src/js/_enqueues/vendor/jquery/ui/menu.js     | 126 ++++--
 src/js/_enqueues/vendor/jquery/ui/mouse.js    |  25 +-
 .../_enqueues/vendor/jquery/ui/progressbar.js |  15 +-
 .../_enqueues/vendor/jquery/ui/resizable.js   |  54 ++-
 .../_enqueues/vendor/jquery/ui/selectable.js  |  19 +-
 .../_enqueues/vendor/jquery/ui/selectmenu.js  |  23 +-
 src/js/_enqueues/vendor/jquery/ui/slider.js   |  17 +-
 src/js/_enqueues/vendor/jquery/ui/sortable.js | 380 ++++++++++--------
 src/js/_enqueues/vendor/jquery/ui/spinner.js  |  33 +-
 src/js/_enqueues/vendor/jquery/ui/tabs.js     |  24 +-
 src/js/_enqueues/vendor/jquery/ui/tooltip.js  |  26 +-
 src/wp-includes/script-loader.php             |  80 ++--
 38 files changed, 1286 insertions(+), 791 deletions(-)

diff --git a/src/js/_enqueues/vendor/jquery/ui/accordion.js b/src/js/_enqueues/vendor/jquery/ui/accordion.js
index c1b3f26e8e456..283380a10b53f 100644
--- a/src/js/_enqueues/vendor/jquery/ui/accordion.js
+++ b/src/js/_enqueues/vendor/jquery/ui/accordion.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Accordion 1.12.1
+ * jQuery UI Accordion 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -9,9 +9,9 @@
 
 //>>label: Accordion
 //>>group: Widgets
-// jscs:disable maximumLineLength
+/* eslint-disable max-len */
 //>>description: Displays collapsible content panels for presenting information in a limited amount of space.
-// jscs:enable maximumLineLength
+/* eslint-enable max-len */
 //>>docs: http://api.jqueryui.com/accordion/
 //>>demos: http://jqueryui.com/accordion/
 //>>css.structure: ../../themes/base/core.css
@@ -19,6 +19,8 @@
 //>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -31,10 +33,11 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.widget( "ui.accordion", {
-	version: "1.12.1",
+	version: "1.13.0-rc.2",
 	options: {
 		active: 0,
 		animate: {},
@@ -45,7 +48,9 @@ return $.widget( "ui.accordion", {
 		},
 		collapsible: false,
 		event: "click",
-		header: "> li > :first-child, > :not(li):even",
+		header: function( elem ) {
+			return elem.find( "> li > :first-child" ).add( elem.find( "> :not(li)" ).even() );
+		},
 		heightStyle: "auto",
 		icons: {
 			activeHeader: "ui-icon-triangle-1-s",
@@ -276,7 +281,11 @@ return $.widget( "ui.accordion", {
 		var prevHeaders = this.headers,
 			prevPanels = this.panels;
 
-		this.headers = this.element.find( this.options.header );
+		if ( typeof this.options.header === "function" ) {
+			this.headers = this.options.header( this.element );
+		} else {
+			this.headers = this.element.find( this.options.header );
+		}
 		this._addClass( this.headers, "ui-accordion-header ui-accordion-header-collapsed",
 			"ui-state-default" );
 
@@ -607,4 +616,4 @@ return $.widget( "ui.accordion", {
 	}
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/autocomplete.js b/src/js/_enqueues/vendor/jquery/ui/autocomplete.js
index f5f58213f19ef..7f4117e41a73b 100644
--- a/src/js/_enqueues/vendor/jquery/ui/autocomplete.js
+++ b/src/js/_enqueues/vendor/jquery/ui/autocomplete.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Autocomplete 1.12.1
+ * jQuery UI Autocomplete 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -17,6 +17,8 @@
 //>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -30,10 +32,11 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 $.widget( "ui.autocomplete", {
-	version: "1.12.1",
+	version: "1.13.0-rc.2",
 	defaultElement: "<input>",
 	options: {
 		appendTo: null,
@@ -196,11 +199,6 @@ $.widget( "ui.autocomplete", {
 				this.previous = this._value();
 			},
 			blur: function( event ) {
-				if ( this.cancelBlur ) {
-					delete this.cancelBlur;
-					return;
-				}
-
 				clearTimeout( this.searching );
 				this.close( event );
 				this._change( event );
@@ -216,31 +214,24 @@ $.widget( "ui.autocomplete", {
 				role: null
 			} )
 			.hide()
+
+			// Support: IE 11 only, Edge <= 14
+			// For other browsers, we preventDefault() on the mousedown event
+			// to keep the dropdown from taking focus from the input. This doesn't
+			// work for IE/Edge, causing problems with selection and scrolling (#9638)
+			// Happily, IE and Edge support an "unselectable" attribute that
+			// prevents an element from receiving focus, exactly what we want here.
+			.attr( {
+				"unselectable": "on"
+			} )
 			.menu( "instance" );
 
 		this._addClass( this.menu.element, "ui-autocomplete", "ui-front" );
 		this._on( this.menu.element, {
 			mousedown: function( event ) {
 
-				// prevent moving focus out of the text field
+				// Prevent moving focus out of the text field
 				event.preventDefault();
-
-				// IE doesn't prevent moving focus even with event.preventDefault()
-				// so we set a flag to know when we should ignore the blur event
-				this.cancelBlur = true;
-				this._delay( function() {
-					delete this.cancelBlur;
-
-					// Support: IE 8 only
-					// Right clicking a menu item or selecting text from the menu items will
-					// result in focus moving out of the input. However, we've already received
-					// and ignored the blur event because of the cancelBlur flag set above. So
-					// we restore focus to ensure that the menu closes properly based on the user's
-					// next actions.
-					if ( this.element[ 0 ] !== $.ui.safeActiveElement( this.document[ 0 ] ) ) {
-						this.element.trigger( "focus" );
-					}
-				} );
 			},
 			menufocus: function( event, ui ) {
 				var label, item;
@@ -271,7 +262,7 @@ $.widget( "ui.autocomplete", {
 
 				// Announce the value in the liveRegion
 				label = ui.item.attr( "aria-label" ) || item.value;
-				if ( label && $.trim( label ).length ) {
+				if ( label && String.prototype.trim.call( label ).length ) {
 					this.liveRegion.children().hide();
 					$( "<div>" ).text( label ).appendTo( this.liveRegion );
 				}
@@ -383,7 +374,7 @@ $.widget( "ui.autocomplete", {
 	_initSource: function() {
 		var array, url,
 			that = this;
-		if ( $.isArray( this.options.source ) ) {
+		if ( Array.isArray( this.options.source ) ) {
 			array = this.options.source;
 			this.source = function( request, response ) {
 				response( $.ui.autocomplete.filter( array, request.term ) );
@@ -455,7 +446,7 @@ $.widget( "ui.autocomplete", {
 	_response: function() {
 		var index = ++this.requestIndex;
 
-		return $.proxy( function( content ) {
+		return function( content ) {
 			if ( index === this.requestIndex ) {
 				this.__response( content );
 			}
@@ -464,7 +455,7 @@ $.widget( "ui.autocomplete", {
 			if ( !this.pending ) {
 				this._removeClass( "ui-autocomplete-loading" );
 			}
-		}, this );
+		}.bind( this );
 	},
 
 	__response: function( content ) {
@@ -624,7 +615,7 @@ $.widget( "ui.autocomplete", {
 		var editable = element.prop( "contentEditable" );
 
 		if ( editable === "inherit" ) {
-		  return this._isContentEditable( element.parent() );
+			return this._isContentEditable( element.parent() );
 		}
 
 		return editable === "true";
@@ -675,4 +666,4 @@ $.widget( "ui.autocomplete", $.ui.autocomplete, {
 
 return $.ui.autocomplete;
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/button.js b/src/js/_enqueues/vendor/jquery/ui/button.js
index 17348b716628b..a48cc6a3f306b 100644
--- a/src/js/_enqueues/vendor/jquery/ui/button.js
+++ b/src/js/_enqueues/vendor/jquery/ui/button.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Button 1.12.1
+ * jQuery UI Button 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -17,6 +17,8 @@
 //>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -35,10 +37,11 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 $.widget( "ui.button", {
-	version: "1.12.1",
+	version: "1.13.0-rc.2",
 	defaultElement: "<button>",
 	options: {
 		classes: {
@@ -262,7 +265,7 @@ $.widget( "ui.button", {
 			this._toggleClass( null, "ui-state-disabled", value );
 			this.element[ 0 ].disabled = value;
 			if ( value ) {
-				this.element.blur();
+				this.element.trigger( "blur" );
 			}
 		}
 	},
@@ -341,22 +344,82 @@ if ( $.uiBackCompat !== false ) {
 	} );
 
 	$.fn.button = ( function( orig ) {
-		return function() {
-			if ( !this.length || ( this.length && this[ 0 ].tagName !== "INPUT" ) ||
-					( this.length && this[ 0 ].tagName === "INPUT" && (
-						this.attr( "type" ) !== "checkbox" && this.attr( "type" ) !== "radio"
-					) ) ) {
-				return orig.apply( this, arguments );
-			}
-			if ( !$.ui.checkboxradio ) {
-				$.error( "Checkboxradio widget missing" );
-			}
-			if ( arguments.length === 0 ) {
-				return this.checkboxradio( {
-					"icon": false
+		return function( options ) {
+			var isMethodCall = typeof options === "string";
+			var args = Array.prototype.slice.call( arguments, 1 );
+			var returnValue = this;
+
+			if ( isMethodCall ) {
+
+				// If this is an empty collection, we need to have the instance method
+				// return undefined instead of the jQuery instance
+				if ( !this.length && options === "instance" ) {
+					returnValue = undefined;
+				} else {
+					this.each( function() {
+						var methodValue;
+						var type = $( this ).attr( "type" );
+						var name = type !== "checkbox" && type !== "radio" ?
+							"button" :
+							"checkboxradio";
+						var instance = $.data( this, "ui-" + name );
+
+						if ( options === "instance" ) {
+							returnValue = instance;
+							return false;
+						}
+
+						if ( !instance ) {
+							return $.error( "cannot call methods on button" +
+								" prior to initialization; " +
+								"attempted to call method '" + options + "'" );
+						}
+
+						if ( typeof instance[ options ] !== "function" ||
+							options.charAt( 0 ) === "_" ) {
+							return $.error( "no such method '" + options + "' for button" +
+								" widget instance" );
+						}
+
+						methodValue = instance[ options ].apply( instance, args );
+
+						if ( methodValue !== instance && methodValue !== undefined ) {
+							returnValue = methodValue && methodValue.jquery ?
+								returnValue.pushStack( methodValue.get() ) :
+								methodValue;
+							return false;
+						}
+					} );
+				}
+			} else {
+
+				// Allow multiple hashes to be passed on init
+				if ( args.length ) {
+					options = $.widget.extend.apply( null, [ options ].concat( args ) );
+				}
+
+				this.each( function() {
+					var type = $( this ).attr( "type" );
+					var name = type !== "checkbox" && type !== "radio" ? "button" : "checkboxradio";
+					var instance = $.data( this, "ui-" + name );
+
+					if ( instance ) {
+						instance.option( options || {} );
+						if ( instance._init ) {
+							instance._init();
+						}
+					} else {
+						if ( name === "button" ) {
+							orig.call( $( this ), options );
+							return;
+						}
+
+						$( this ).checkboxradio( $.extend( { icon: false }, options ) );
+					}
 				} );
 			}
-			return this.checkboxradio.apply( this, arguments );
+
+			return returnValue;
 		};
 	} )( $.fn.button );
 
@@ -382,4 +445,4 @@ if ( $.uiBackCompat !== false ) {
 
 return $.ui.button;
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/checkboxradio.js b/src/js/_enqueues/vendor/jquery/ui/checkboxradio.js
index c2d9029207299..47ec104c3b13d 100644
--- a/src/js/_enqueues/vendor/jquery/ui/checkboxradio.js
+++ b/src/js/_enqueues/vendor/jquery/ui/checkboxradio.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Checkboxradio 1.12.1
+ * jQuery UI Checkboxradio 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -18,6 +18,8 @@
 //>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -30,10 +32,11 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
-	version: "1.12.1",
+	version: "1.13.0-rc.2",
 	options: {
 		disabled: null,
 		label: null,
@@ -112,9 +115,6 @@ $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
 
 		if ( checked ) {
 			this._addClass( this.label, "ui-checkboxradio-checked", "ui-state-active" );
-			if ( this.icon ) {
-				this._addClass( this.icon, null, "ui-state-hover" );
-			}
 		}
 
 		this._on( {
@@ -149,7 +149,7 @@ $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
 	_getRadioGroup: function() {
 		var group;
 		var name = this.element[ 0 ].name;
-		var nameSelector = "input[name='" + $.ui.escapeSelector( name ) + "']";
+		var nameSelector = "input[name='" + $.escapeSelector( name ) + "']";
 
 		if ( !name ) {
 			return $( [] );
@@ -161,7 +161,7 @@ $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
 
 			// Not inside a form, check all inputs that also are not inside a form
 			group = $( nameSelector ).filter( function() {
-				return $( this ).form().length === 0;
+				return $( this )._form().length === 0;
 			} );
 		}
 
@@ -280,4 +280,4 @@ $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
 
 return $.ui.checkboxradio;
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/controlgroup.js b/src/js/_enqueues/vendor/jquery/ui/controlgroup.js
index 9fc364b84696e..9c60b843998b3 100644
--- a/src/js/_enqueues/vendor/jquery/ui/controlgroup.js
+++ b/src/js/_enqueues/vendor/jquery/ui/controlgroup.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Controlgroup 1.12.1
+ * jQuery UI Controlgroup 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -17,6 +17,8 @@
 //>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -29,11 +31,13 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
+
 var controlgroupCornerRegex = /ui-corner-([a-z]){2,6}/g;
 
 return $.widget( "ui.controlgroup", {
-	version: "1.12.1",
+	version: "1.13.0-rc.2",
 	defaultElement: "<div>",
 	options: {
 		direction: "horizontal",
@@ -150,7 +154,7 @@ return $.widget( "ui.controlgroup", {
 				} );
 		} );
 
-		this.childWidgets = $( $.unique( childWidgets ) );
+		this.childWidgets = $( $.uniqueSort( childWidgets ) );
 		this._addClass( this.childWidgets, "ui-controlgroup-item" );
 	},
 
@@ -234,7 +238,7 @@ return $.widget( "ui.controlgroup", {
 		var result = {};
 		$.each( classes, function( key ) {
 			var current = instance.options.classes[ key ] || "";
-			current = $.trim( current.replace( controlgroupCornerRegex, "" ) );
+			current = String.prototype.trim.call( current.replace( controlgroupCornerRegex, "" ) );
 			result[ key ] = ( current + " " + classes[ key ] ).replace( /\s+/g, " " );
 		} );
 		return result;
@@ -295,4 +299,4 @@ return $.widget( "ui.controlgroup", {
 		}
 	}
 } );
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/core.js b/src/js/_enqueues/vendor/jquery/ui/core.js
index 32b8d108429b0..5c4223db7ec95 100644
--- a/src/js/_enqueues/vendor/jquery/ui/core.js
+++ b/src/js/_enqueues/vendor/jquery/ui/core.js
@@ -1,8 +1,10 @@
-/*! jQuery UI - v1.12.1 - 2020-09-25
+/*! jQuery UI - v1.13.0-rc.2 - 2021-09-05
 * http://jqueryui.com
 * Includes: data.js, disable-selection.js, escape-selector.js, focusable.js, form-reset-mixin.js, form.js, ie.js, jquery-1-7.js, keycode.js, labels.js, plugin.js, position.js, safe-active-element.js, safe-blur.js, scroll-parent.js, tabbable.js, unique-id.js, version.js, widget.js
 * Copyright jQuery Foundation and other contributors; Licensed  */
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -13,15 +15,16 @@
 		factory( jQuery );
 	}
 } ( function( $ ) {
+"use strict";
 
 // Source: version.js
 $.ui = $.ui || {};
 
-$.ui.version = "1.12.1";
+$.ui.version = "1.13.0-rc.2";
 
 // Source: data.js
 /*!
- * jQuery UI :data 1.12.1
+ * jQuery UI :data 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -34,7 +37,7 @@ $.ui.version = "1.12.1";
 //>>description: Selects elements which have data stored under the specified key.
 //>>docs: http://api.jqueryui.com/data-selector/
 
-$.extend( $.expr[ ":" ], {
+$.extend( $.expr.pseudos, {
 	data: $.expr.createPseudo ?
 		$.expr.createPseudo( function( dataName ) {
 			return function( elem ) {
@@ -48,10 +51,9 @@ $.extend( $.expr[ ":" ], {
 		}
 } );
 
-
 // Source: disable-selection.js
 /*!
- * jQuery UI Disable Selection 1.12.1
+ * jQuery UI Disable Selection 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -83,18 +85,9 @@ $.fn.extend( {
 	}
 } );
 
-// Source: escape-selector.js
-// Internal use only
-$.ui.escapeSelector = ( function() {
-	var selectorEscape = /([!"#$%&'()*+,./:;<=>?@[\]^`{|}~])/g;
-	return function( selector ) {
-		return selector.replace( selectorEscape, "\\$1" );
-	};
-} )();
-
 // Source: focusable.js
 /*!
- * jQuery UI Focusable 1.12.1
+ * jQuery UI Focusable 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -153,10 +146,10 @@ function visible( element ) {
 		element = element.parent();
 		visibility = element.css( "visibility" );
 	}
-	return visibility !== "hidden";
+	return visibility === "visible";
 }
 
-$.extend( $.expr[ ":" ], {
+$.extend( $.expr.pseudos, {
 	focusable: function( element ) {
 		return $.ui.focusable( element, $.attr( element, "tabindex" ) != null );
 	}
@@ -166,13 +159,13 @@ $.extend( $.expr[ ":" ], {
 // Support: IE8 Only
 // IE8 does not support the form attribute and when it is supplied. It overwrites the form prop
 // with a string, so we need to find the proper form.
-$.fn.form = function() {
+$.fn._form = function() {
 	return typeof this[ 0 ].form === "string" ? this.closest( "form" ) : $( this[ 0 ].form );
 };
 
 // Source: form-reset-mixin.js
 /*!
- * jQuery UI Form Reset Mixin 1.12.1
+ * jQuery UI Form Reset Mixin 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -199,7 +192,7 @@ $.ui.formResetMixin = {
 	},
 
 	_bindFormResetHandler: function() {
-		this.form = this.element.form();
+		this.form = this.element._form();
 		if ( !this.form.length ) {
 			return;
 		}
@@ -235,9 +228,9 @@ $.ui.formResetMixin = {
 // This file is deprecated
 $.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
 
-// Source: jquery-1-7.js
+// Source: jquery-patch.js
 /*!
- * jQuery UI Support for jQuery core 1.7.x 1.12.1
+ * jQuery UI Support for jQuery core 1.8.x and newer 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -246,75 +239,72 @@ $.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
  *
  */
 
-//>>label: jQuery 1.7 Support
+//>>label: jQuery 1.8+ Support
 //>>group: Core
-//>>description: Support version 1.7.x of jQuery core
-
-// Support: jQuery 1.7 only
-// Not a great way to check versions, but since we only support 1.7+ and only
-// need to detect <1.8, this is a simple check that should suffice. Checking
-// for "1.7." would be a bit safer, but the version string is 1.7, not 1.7.0
-// and we'll never reach 1.70.0 (if we do, we certainly won't be supporting
-// 1.7 anymore). See #11197 for why we're not using feature detection.
-if ( $.fn.jquery.substring( 0, 3 ) === "1.7" ) {
-
-	// Setters for .innerWidth(), .innerHeight(), .outerWidth(), .outerHeight()
-	// Unlike jQuery Core 1.8+, these only support numeric values to set the
-	// dimensions in pixels
-	$.each( [ "Width", "Height" ], function( i, name ) {
-		var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ],
-			type = name.toLowerCase(),
-			orig = {
-				innerWidth: $.fn.innerWidth,
-				innerHeight: $.fn.innerHeight,
-				outerWidth: $.fn.outerWidth,
-				outerHeight: $.fn.outerHeight
-			};
+//>>description: Support version 1.8.x and newer of jQuery core
 
-		function reduce( elem, size, border, margin ) {
-			$.each( side, function() {
-				size -= parseFloat( $.css( elem, "padding" + this ) ) || 0;
-				if ( border ) {
-					size -= parseFloat( $.css( elem, "border" + this + "Width" ) ) || 0;
-				}
-				if ( margin ) {
-					size -= parseFloat( $.css( elem, "margin" + this ) ) || 0;
-				}
-			} );
-			return size;
-		}
+// Support: jQuery 1.9.x or older
+// $.expr[ ":" ] is deprecated.
+if ( !$.expr.pseudos ) {
+	$.expr.pseudos = $.expr[ ":" ];
+}
 
-		$.fn[ "inner" + name ] = function( size ) {
-			if ( size === undefined ) {
-				return orig[ "inner" + name ].call( this );
-			}
+// Support: jQuery 1.11.x or older
+// $.unique has been renamed to $.uniqueSort
+if ( !$.uniqueSort ) {
+	$.uniqueSort = $.unique;
+}
 
-			return this.each( function() {
-				$( this ).css( type, reduce( this, size ) + "px" );
-			} );
-		};
+// Support: jQuery 2.2.x or older.
+// This method has been defined in jQuery 3.0.0.
+// Code from https://github.com/jquery/jquery/blob/e539bac79e666bba95bba86d690b4e609dca2286/src/selector/escapeSelector.js
+if ( !$.escapeSelector ) {
 
-		$.fn[ "outer" + name ] = function( size, margin ) {
-			if ( typeof size !== "number" ) {
-				return orig[ "outer" + name ].call( this, size );
+	// CSS string/identifier serialization
+	// https://drafts.csswg.org/cssom/#common-serializing-idioms
+	var rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g;
+
+	var fcssescape = function( ch, asCodePoint ) {
+		if ( asCodePoint ) {
+
+			// U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER
+			if ( ch === "\0" ) {
+				return "\uFFFD";
 			}
 
-			return this.each( function() {
-				$( this ).css( type, reduce( this, size, true, margin ) + "px" );
-			} );
-		};
-	} );
+			// Control characters and (dependent upon position) numbers get escaped as code points
+			return ch.slice( 0, -1 ) + "\\" + ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
+		}
+
+		// Other potentially-special ASCII characters get backslash-escaped
+		return "\\" + ch;
+	};
 
-	$.fn.addBack = function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter( selector )
-		);
+	$.escapeSelector = function( sel ) {
+		return ( sel + "" ).replace( rcssescape, fcssescape );
 	};
 }
 
+// Support: jQuery 3.4.x or older
+// These methods have been defined in jQuery 3.5.0.
+if ( !$.fn.even || !$.fn.odd ) {
+	$.fn.extend( {
+		even: function() {
+			return this.filter( function( i ) {
+				return i % 2 === 0;
+			} );
+		},
+		odd: function() {
+			return this.filter( function( i ) {
+				return i % 2 === 1;
+			} );
+		}
+	} );
+}
+
 // Source: keycode.js
 /*!
- * jQuery UI Keycode 1.12.1
+ * jQuery UI Keycode 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -348,7 +338,7 @@ $.ui.keyCode = {
 
 // Source: labels.js
 /*!
- * jQuery UI Labels 1.12.1
+ * jQuery UI Labels 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -364,6 +354,10 @@ $.ui.keyCode = {
 $.fn.labels = function() {
 	var ancestor, selector, id, labels, ancestors;
 
+	if ( !this.length ) {
+		return this.pushStack( [] );
+	}
+
 	// Check control.labels first
 	if ( this[ 0 ].labels && this[ 0 ].labels.length ) {
 		return this.pushStack( this[ 0 ].labels );
@@ -386,7 +380,7 @@ $.fn.labels = function() {
 		ancestors = ancestor.add( ancestor.length ? ancestor.siblings() : this.siblings() );
 
 		// Create a selector for the label based on the id
-		selector = "label[for='" + $.ui.escapeSelector( id ) + "']";
+		selector = "label[for='" + $.escapeSelector( id ) + "']";
 
 		labels = labels.add( ancestors.find( selector ).addBack( selector ) );
 
@@ -430,7 +424,7 @@ $.ui.plugin = {
 
 // Source: position.js
 /*!
- * jQuery UI Position 1.12.1
+ * jQuery UI Position 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -468,6 +462,10 @@ function parseCss( element, property ) {
 	return parseInt( $.css( element, property ), 10 ) || 0;
 }
 
+function isWindow( obj ) {
+	return obj != null && obj === obj.window;
+}
+
 function getDimensions( elem ) {
 	var raw = elem[ 0 ];
 	if ( raw.nodeType === 9 ) {
@@ -477,7 +475,7 @@ function getDimensions( elem ) {
 			offset: { top: 0, left: 0 }
 		};
 	}
-	if ( $.isWindow( raw ) ) {
+	if ( isWindow( raw ) ) {
 		return {
 			width: elem.width(),
 			height: elem.height(),
@@ -504,9 +502,9 @@ $.position = {
 			return cachedScrollbarWidth;
 		}
 		var w1, w2,
-			div = $( "<div " +
-				"style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'>" +
-				"<div style='height:100px;width:auto;'></div></div>" ),
+			div = $( "<div style=" +
+				"'display:block;position:absolute;width:200px;height:200px;overflow:hidden;'>" +
+				"<div style='height:300px;width:auto;'></div></div>" ),
 			innerDiv = div.children()[ 0 ];
 
 		$( "body" ).append( div );
@@ -539,12 +537,12 @@ $.position = {
 	},
 	getWithinInfo: function( element ) {
 		var withinElement = $( element || window ),
-			isWindow = $.isWindow( withinElement[ 0 ] ),
+			isElemWindow = isWindow( withinElement[ 0 ] ),
 			isDocument = !!withinElement[ 0 ] && withinElement[ 0 ].nodeType === 9,
-			hasOffset = !isWindow && !isDocument;
+			hasOffset = !isElemWindow && !isDocument;
 		return {
 			element: withinElement,
-			isWindow: isWindow,
+			isWindow: isElemWindow,
 			isDocument: isDocument,
 			offset: hasOffset ? $( element ).offset() : { left: 0, top: 0 },
 			scrollLeft: withinElement.scrollLeft(),
@@ -564,7 +562,12 @@ $.fn.position = function( options ) {
 	options = $.extend( {}, options );
 
 	var atOffset, targetWidth, targetHeight, targetOffset, basePosition, dimensions,
-		target = $( options.of ),
+
+		// Make sure string options are treated as CSS selectors
+		target = typeof options.of === "string" ?
+			$( document ).find( options.of ) :
+			$( options.of ),
+
 		within = $.position.getWithinInfo( options.within ),
 		scrollInfo = $.position.getScrollInfo( within ),
 		collision = ( options.collision || "flip" ).split( " " ),
@@ -954,7 +957,7 @@ $.ui.safeBlur = function( element ) {
 
 // Source: scroll-parent.js
 /*!
- * jQuery UI Scroll Parent 1.12.1
+ * jQuery UI Scroll Parent 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -987,7 +990,7 @@ $.fn.scrollParent = function( includeHidden ) {
 
 // Source: tabbable.js
 /*!
- * jQuery UI Tabbable 1.12.1
+ * jQuery UI Tabbable 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -1000,7 +1003,7 @@ $.fn.scrollParent = function( includeHidden ) {
 //>>description: Selects elements which can be tabbed to.
 //>>docs: http://api.jqueryui.com/tabbable-selector/
 
-$.extend( $.expr[ ":" ], {
+$.extend( $.expr.pseudos, {
 	tabbable: function( element ) {
 		var tabIndex = $.attr( element, "tabindex" ),
 			hasTabindex = tabIndex != null;
@@ -1010,7 +1013,7 @@ $.extend( $.expr[ ":" ], {
 
 // Source: unique-id.js
 /*!
- * jQuery UI Unique ID 1.12.1
+ * jQuery UI Unique ID 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -1047,7 +1050,7 @@ $.fn.extend( {
 
 // Source: widget.js
 /*!
- * jQuery UI Widget 1.12.1
+ * jQuery UI Widget 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -1062,22 +1065,19 @@ $.fn.extend( {
 //>>demos: http://jqueryui.com/widget/
 
 var widgetUuid = 0;
+var widgetHasOwnProperty = Array.prototype.hasOwnProperty;
 var widgetSlice = Array.prototype.slice;
 
 $.cleanData = ( function( orig ) {
 	return function( elems ) {
 		var events, elem, i;
 		for ( i = 0; ( elem = elems[ i ] ) != null; i++ ) {
-			try {
-
-				// Only trigger remove when necessary to save time
-				events = $._data( elem, "events" );
-				if ( events && events.remove ) {
-					$( elem ).triggerHandler( "remove" );
-				}
 
-			// Http://bugs.jquery.com/ticket/8235
-			} catch ( e ) {}
+			// Only trigger remove when necessary to save time
+			events = $._data( elem, "events" );
+			if ( events && events.remove ) {
+				$( elem ).triggerHandler( "remove" );
+			}
 		}
 		orig( elems );
 	};
@@ -1099,12 +1099,12 @@ $.widget = function( name, base, prototype ) {
 		base = $.Widget;
 	}
 
-	if ( $.isArray( prototype ) ) {
+	if ( Array.isArray( prototype ) ) {
 		prototype = $.extend.apply( null, [ {} ].concat( prototype ) );
 	}
 
 	// Create selector for plugin
-	$.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
+	$.expr.pseudos[ fullName.toLowerCase() ] = function( elem ) {
 		return !!$.data( elem, fullName );
 	};
 
@@ -1144,7 +1144,7 @@ $.widget = function( name, base, prototype ) {
 	// inheriting from
 	basePrototype.options = $.widget.extend( {}, basePrototype.options );
 	$.each( prototype, function( prop, value ) {
-		if ( !$.isFunction( value ) ) {
+		if ( typeof value !== "function" ) {
 			proxiedPrototype[ prop ] = value;
 			return;
 		}
@@ -1223,7 +1223,7 @@ $.widget.extend = function( target ) {
 	for ( ; inputIndex < inputLength; inputIndex++ ) {
 		for ( key in input[ inputIndex ] ) {
 			value = input[ inputIndex ][ key ];
-			if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
+			if ( widgetHasOwnProperty.call( input[ inputIndex ], key ) && value !== undefined ) {
 
 				// Clone objects
 				if ( $.isPlainObject( value ) ) {
@@ -1272,7 +1272,8 @@ $.widget.bridge = function( name, object ) {
 							"attempted to call method '" + options + "'" );
 					}
 
-					if ( !$.isFunction( instance[ options ] ) || options.charAt( 0 ) === "_" ) {
+					if ( typeof instance[ options ] !== "function" ||
+						options.charAt( 0 ) === "_" ) {
 						return $.error( "no such method '" + options + "' for " + name +
 							" widget instance" );
 					}
@@ -1533,12 +1534,30 @@ $.Widget.prototype = {
 			classes: this.options.classes || {}
 		}, options );
 
+		function bindRemoveEvent() {
+			options.element.each( function( _, element ) {
+				var isTracked = $.map( that.classesElementLookup, function( elements ) {
+					return elements;
+				} )
+					.some( function( elements ) {
+						return elements.is( element );
+					} );
+
+				if ( !isTracked ) {
+					that._on( $( element ), {
+						remove: "_untrackClassesElement"
+					} );
+				}
+			} );
+		}
+
 		function processClassString( classes, checkOption ) {
 			var current, i;
 			for ( i = 0; i < classes.length; i++ ) {
 				current = that.classesElementLookup[ classes[ i ] ] || $();
 				if ( options.add ) {
-					current = $( $.unique( current.get().concat( options.element.get() ) ) );
+					bindRemoveEvent();
+					current = $( $.uniqueSort( current.get().concat( options.element.get() ) ) );
 				} else {
 					current = $( current.not( options.element ).get() );
 				}
@@ -1550,10 +1569,6 @@ $.Widget.prototype = {
 			}
 		}
 
-		this._on( options.element, {
-			"remove": "_untrackClassesElement"
-		} );
-
 		if ( options.keys ) {
 			processClassString( options.keys.match( /\S+/g ) || [], true );
 		}
@@ -1571,6 +1586,8 @@ $.Widget.prototype = {
 				that.classesElementLookup[ key ] = $( value.not( event.target ).get() );
 			}
 		} );
+
+		this._off( $( event.target ) );
 	},
 
 	_removeClass: function( element, keys, extra ) {
@@ -1651,7 +1668,7 @@ $.Widget.prototype = {
 	_off: function( element, eventName ) {
 		eventName = ( eventName || "" ).split( " " ).join( this.eventNamespace + " " ) +
 			this.eventNamespace;
-		element.off( eventName ).off( eventName );
+		element.off( eventName );
 
 		// Clear the stack to avoid memory leaks (#10056)
 		this.bindings = $( this.bindings.not( element ).get() );
@@ -1717,7 +1734,7 @@ $.Widget.prototype = {
 		}
 
 		this.element.trigger( event, data );
-		return !( $.isFunction( callback ) &&
+		return !( typeof callback === "function" &&
 			callback.apply( this.element[ 0 ], [ event ].concat( data ) ) === false ||
 			event.isDefaultPrevented() );
 	}
@@ -1739,6 +1756,8 @@ $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
 		options = options || {};
 		if ( typeof options === "number" ) {
 			options = { duration: options };
+		} else if ( options === true ) {
+			options = {};
 		}
 
 		hasOptions = !$.isEmptyObject( options );
diff --git a/src/js/_enqueues/vendor/jquery/ui/datepicker.js b/src/js/_enqueues/vendor/jquery/ui/datepicker.js
index 7bb751b69bdca..564839ad1d525 100644
--- a/src/js/_enqueues/vendor/jquery/ui/datepicker.js
+++ b/src/js/_enqueues/vendor/jquery/ui/datepicker.js
@@ -1,7 +1,6 @@
-// jscs:disable maximumLineLength
-/* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
+/* eslint-disable max-len, camelcase */
 /*!
- * jQuery UI Datepicker 1.12.1
+ * jQuery UI Datepicker 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -19,6 +18,8 @@
 //>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -31,9 +32,10 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
-$.extend( $.ui, { datepicker: { version: "1.12.1" } } );
+$.extend( $.ui, { datepicker: { version: "1.13.0-rc.2" } } );
 
 var datepicker_instActive;
 
@@ -61,6 +63,7 @@ function datepicker_getZindex( elem ) {
 
 	return 0;
 }
+
 /* Date picker manager.
    Use the singleton instance of this class, $.datepicker, to interact with the date picker.
    Settings for (groups of) date pickers are maintained in an instance object,
@@ -87,18 +90,20 @@ function Datepicker() {
 		prevText: "Prev", // Display text for previous month link
 		nextText: "Next", // Display text for next month link
 		currentText: "Today", // Display text for current month link
-		monthNames: [ "January","February","March","April","May","June",
-			"July","August","September","October","November","December" ], // Names of months for drop-down and formatting
+		monthNames: [ "January", "February", "March", "April", "May", "June",
+			"July", "August", "September", "October", "November", "December" ], // Names of months for drop-down and formatting
 		monthNamesShort: [ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" ], // For formatting
 		dayNames: [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ], // For formatting
 		dayNamesShort: [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ], // For formatting
-		dayNamesMin: [ "Su","Mo","Tu","We","Th","Fr","Sa" ], // Column headings for days starting at Sunday
+		dayNamesMin: [ "Su", "Mo", "Tu", "We", "Th", "Fr", "Sa" ], // Column headings for days starting at Sunday
 		weekHeader: "Wk", // Column header for week of the year
 		dateFormat: "mm/dd/yy", // See format options on parseDate
 		firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
 		isRTL: false, // True if right-to-left language, false if left-to-right
 		showMonthAfterYear: false, // True if the year select precedes month, false for month then year
-		yearSuffix: "" // Additional text to append to the year in the month headers
+		yearSuffix: "", // Additional text to append to the year in the month headers,
+		selectMonthLabel: "Select month", // Invisible label for month selector
+		selectYearLabel: "Select year" // Invisible label for year selector
 	};
 	this._defaults = { // Global defaults for all the date picker instances
 		showOn: "focus", // "focus" for popup on focus,
@@ -139,6 +144,7 @@ function Datepicker() {
 		onSelect: null, // Define a callback function when a date is selected
 		onChangeMonthYear: null, // Define a callback function when the month or year is changed
 		onClose: null, // Define a callback function when the datepicker is closed
+		onUpdateDatepicker: null, // Define a callback function when the datepicker is updated
 		numberOfMonths: 1, // Number of months to show at a time
 		showCurrentAtPos: 0, // The position in multipe months at which to show the current month (starting at 0)
 		stepMonths: 1, // Number of months to step back/forward
@@ -157,6 +163,7 @@ function Datepicker() {
 }
 
 $.extend( Datepicker.prototype, {
+
 	/* Class name added to elements to indicate already configured with a date picker. */
 	markerClassName: "hasDatepicker",
 
@@ -239,7 +246,9 @@ $.extend( Datepicker.prototype, {
 			inst.append.remove();
 		}
 		if ( appendText ) {
-			inst.append = $( "<span class='" + this._appendClass + "'>" + appendText + "</span>" );
+			inst.append = $( "<span>" )
+				.addClass( this._appendClass )
+				.text( appendText );
 			input[ isRTL ? "before" : "after" ]( inst.append );
 		}
 
@@ -256,12 +265,32 @@ $.extend( Datepicker.prototype, {
 		if ( showOn === "button" || showOn === "both" ) { // pop-up date picker when button clicked
 			buttonText = this._get( inst, "buttonText" );
 			buttonImage = this._get( inst, "buttonImage" );
-			inst.trigger = $( this._get( inst, "buttonImageOnly" ) ?
-				$( "<img/>" ).addClass( this._triggerClass ).
-					attr( { src: buttonImage, alt: buttonText, title: buttonText } ) :
-				$( "<button type='button'></button>" ).addClass( this._triggerClass ).
-					html( !buttonImage ? buttonText : $( "<img/>" ).attr(
-					{ src:buttonImage, alt:buttonText, title:buttonText } ) ) );
+
+			if ( this._get( inst, "buttonImageOnly" ) ) {
+				inst.trigger = $( "<img>" )
+					.addClass( this._triggerClass )
+					.attr( {
+						src: buttonImage,
+						alt: buttonText,
+						title: buttonText
+					} );
+			} else {
+				inst.trigger = $( "<button type='button'>" )
+					.addClass( this._triggerClass );
+				if ( buttonImage ) {
+					inst.trigger.html(
+						$( "<img>" )
+							.attr( {
+								src: buttonImage,
+								alt: buttonText,
+								title: buttonText
+							} )
+					);
+				} else {
+					inst.trigger.text( buttonText );
+				}
+			}
+
 			input[ isRTL ? "before" : "after" ]( inst.trigger );
 			inst.trigger.on( "click", function() {
 				if ( $.datepicker._datepickerShowing && $.datepicker._lastInput === input[ 0 ] ) {
@@ -407,6 +436,7 @@ $.extend( Datepicker.prototype, {
 
 		if ( datepicker_instActive === inst ) {
 			datepicker_instActive = null;
+			this._curInst = null;
 		}
 	},
 
@@ -426,7 +456,9 @@ $.extend( Datepicker.prototype, {
 		if ( nodeName === "input" ) {
 			target.disabled = false;
 			inst.trigger.filter( "button" ).
-				each( function() { this.disabled = false; } ).end().
+				each( function() {
+					this.disabled = false;
+				} ).end().
 				filter( "img" ).css( { opacity: "1.0", cursor: "" } );
 		} else if ( nodeName === "div" || nodeName === "span" ) {
 			inline = $target.children( "." + this._inlineClass );
@@ -435,7 +467,11 @@ $.extend( Datepicker.prototype, {
 				prop( "disabled", false );
 		}
 		this._disabledInputs = $.map( this._disabledInputs,
-			function( value ) { return ( value === target ? null : value ); } ); // delete entry
+
+			// Delete entry
+			function( value ) {
+				return ( value === target ? null : value );
+			} );
 	},
 
 	/* Disable the date picker to a jQuery selection.
@@ -454,7 +490,9 @@ $.extend( Datepicker.prototype, {
 		if ( nodeName === "input" ) {
 			target.disabled = true;
 			inst.trigger.filter( "button" ).
-				each( function() { this.disabled = true; } ).end().
+				each( function() {
+					this.disabled = true;
+				} ).end().
 				filter( "img" ).css( { opacity: "0.5", cursor: "default" } );
 		} else if ( nodeName === "div" || nodeName === "span" ) {
 			inline = $target.children( "." + this._inlineClass );
@@ -463,7 +501,11 @@ $.extend( Datepicker.prototype, {
 				prop( "disabled", true );
 		}
 		this._disabledInputs = $.map( this._disabledInputs,
-			function( value ) { return ( value === target ? null : value ); } ); // delete entry
+
+			// Delete entry
+			function( value ) {
+				return ( value === target ? null : value );
+			} );
 		this._disabledInputs[ this._disabledInputs.length ] = target;
 	},
 
@@ -491,8 +533,7 @@ $.extend( Datepicker.prototype, {
 	_getInst: function( target ) {
 		try {
 			return $.data( target, "datepicker" );
-		}
-		catch ( err ) {
+		} catch ( err ) {
 			throw "Missing instance data for this datepicker";
 		}
 	},
@@ -725,8 +766,7 @@ $.extend( Datepicker.prototype, {
 					$.datepicker._updateAlternate( inst );
 					$.datepicker._updateDatepicker( inst );
 				}
-			}
-			catch ( err ) {
+			} catch ( err ) {
 			}
 		}
 		return true;
@@ -831,7 +871,8 @@ $.extend( Datepicker.prototype, {
 			numMonths = this._getNumberOfMonths( inst ),
 			cols = numMonths[ 1 ],
 			width = 17,
-			activeCell = inst.dpDiv.find( "." + this._dayOverClass + " a" );
+			activeCell = inst.dpDiv.find( "." + this._dayOverClass + " a" ),
+			onUpdateDatepicker = $.datepicker._get( inst, "onUpdateDatepicker" );
 
 		if ( activeCell.length > 0 ) {
 			datepicker_handleMouseover.apply( activeCell.get( 0 ) );
@@ -857,11 +898,15 @@ $.extend( Datepicker.prototype, {
 
 				//assure that inst.yearshtml didn't change.
 				if ( origyearshtml === inst.yearshtml && inst.yearshtml ) {
-					inst.dpDiv.find( "select.ui-datepicker-year:first" ).replaceWith( inst.yearshtml );
+					inst.dpDiv.find( "select.ui-datepicker-year" ).first().replaceWith( inst.yearshtml );
 				}
 				origyearshtml = inst.yearshtml = null;
 			}, 0 );
 		}
+
+		if ( onUpdateDatepicker ) {
+			onUpdateDatepicker.apply( ( inst.input ? inst.input[ 0 ] : null ), [ inst ] );
+		}
 	},
 
 	// #6694 - don't focus the input if it's already focused
@@ -899,7 +944,7 @@ $.extend( Datepicker.prototype, {
 			inst = this._getInst( obj ),
 			isRTL = this._get( inst, "isRTL" );
 
-		while ( obj && ( obj.type === "hidden" || obj.nodeType !== 1 || $.expr.filters.hidden( obj ) ) ) {
+		while ( obj && ( obj.type === "hidden" || obj.nodeType !== 1 || $.expr.pseudos.hidden( obj ) ) ) {
 			obj = obj[ isRTL ? "previousSibling" : "nextSibling" ];
 		}
 
@@ -987,9 +1032,7 @@ $.extend( Datepicker.prototype, {
 		if ( this._isDisabledDatepicker( target[ 0 ] ) ) {
 			return;
 		}
-		this._adjustInstDate( inst, offset +
-			( period === "M" ? this._get( inst, "showCurrentAtPos" ) : 0 ), // undo positioning
-			period );
+		this._adjustInstDate( inst, offset, period );
 		this._updateDatepicker( inst );
 	},
 
@@ -1036,7 +1079,7 @@ $.extend( Datepicker.prototype, {
 		}
 
 		inst = this._getInst( target[ 0 ] );
-		inst.selectedDay = inst.currentDay = $( "a", td ).html();
+		inst.selectedDay = inst.currentDay = parseInt( $( "a", td ).attr( "data-date" ) );
 		inst.selectedMonth = inst.currentMonth = month;
 		inst.selectedYear = inst.currentYear = year;
 		this._selectDate( id, this._formatDate( inst,
@@ -1089,7 +1132,7 @@ $.extend( Datepicker.prototype, {
 			altFormat = this._get( inst, "altFormat" ) || this._get( inst, "dateFormat" );
 			date = this._getDate( inst );
 			dateStr = this.formatDate( altFormat, date, this._getFormatConfig( inst ) );
-			$( altField ).val( dateStr );
+			$( document ).find( altField ).val( dateStr );
 		}
 	},
 
@@ -1528,8 +1571,7 @@ $.extend( Datepicker.prototype, {
 				try {
 					return $.datepicker.parseDate( $.datepicker._get( inst, "dateFormat" ),
 						offset, $.datepicker._getFormatConfig( inst ) );
-				}
-				catch ( e ) {
+				} catch ( e ) {
 
 					// Ignore
 				}
@@ -1703,32 +1745,104 @@ $.extend( Datepicker.prototype, {
 			this._daylightSavingAdjust( new Date( drawYear, drawMonth - stepMonths, 1 ) ),
 			this._getFormatConfig( inst ) ) );
 
-		prev = ( this._canAdjustMonth( inst, -1, drawYear, drawMonth ) ?
-			"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click'" +
-			" title='" + prevText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w" ) + "'>" + prevText + "</span></a>" :
-			( hideIfNoPrevNext ? "" : "<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='" + prevText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w" ) + "'>" + prevText + "</span></a>" ) );
+		if ( this._canAdjustMonth( inst, -1, drawYear, drawMonth ) ) {
+			prev = $( "<a>" )
+				.attr( {
+					"class": "ui-datepicker-prev ui-corner-all",
+					"data-handler": "prev",
+					"data-event": "click",
+					title: prevText
+				} )
+				.append(
+					$( "<span>" )
+						.addClass( "ui-icon ui-icon-circle-triangle-" +
+							( isRTL ? "e" : "w" ) )
+						.text( prevText )
+				)[ 0 ].outerHTML;
+		} else if ( hideIfNoPrevNext ) {
+			prev = "";
+		} else {
+			prev = $( "<a>" )
+				.attr( {
+					"class": "ui-datepicker-prev ui-corner-all ui-state-disabled",
+					title: prevText
+				} )
+				.append(
+					$( "<span>" )
+						.addClass( "ui-icon ui-icon-circle-triangle-" +
+							( isRTL ? "e" : "w" ) )
+						.text( prevText )
+				)[ 0 ].outerHTML;
+		}
 
 		nextText = this._get( inst, "nextText" );
 		nextText = ( !navigationAsDateFormat ? nextText : this.formatDate( nextText,
 			this._daylightSavingAdjust( new Date( drawYear, drawMonth + stepMonths, 1 ) ),
 			this._getFormatConfig( inst ) ) );
 
-		next = ( this._canAdjustMonth( inst, +1, drawYear, drawMonth ) ?
-			"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click'" +
-			" title='" + nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e" ) + "'>" + nextText + "</span></a>" :
-			( hideIfNoPrevNext ? "" : "<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='" + nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e" ) + "'>" + nextText + "</span></a>" ) );
+		if ( this._canAdjustMonth( inst, +1, drawYear, drawMonth ) ) {
+			next = $( "<a>" )
+				.attr( {
+					"class": "ui-datepicker-next ui-corner-all",
+					"data-handler": "next",
+					"data-event": "click",
+					title: nextText
+				} )
+				.append(
+					$( "<span>" )
+						.addClass( "ui-icon ui-icon-circle-triangle-" +
+							( isRTL ? "w" : "e" ) )
+						.text( nextText )
+				)[ 0 ].outerHTML;
+		} else if ( hideIfNoPrevNext ) {
+			next = "";
+		} else {
+			next = $( "<a>" )
+				.attr( {
+					"class": "ui-datepicker-next ui-corner-all ui-state-disabled",
+					title: nextText
+				} )
+				.append(
+					$( "<span>" )
+						.attr( "class", "ui-icon ui-icon-circle-triangle-" +
+							( isRTL ? "w" : "e" ) )
+						.text( nextText )
+				)[ 0 ].outerHTML;
+		}
 
 		currentText = this._get( inst, "currentText" );
 		gotoDate = ( this._get( inst, "gotoCurrent" ) && inst.currentDay ? currentDate : today );
 		currentText = ( !navigationAsDateFormat ? currentText :
 			this.formatDate( currentText, gotoDate, this._getFormatConfig( inst ) ) );
 
-		controls = ( !inst.inline ? "<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>" +
-			this._get( inst, "closeText" ) + "</button>" : "" );
-
-		buttonPanel = ( showButtonPanel ) ? "<div class='ui-datepicker-buttonpane ui-widget-content'>" + ( isRTL ? controls : "" ) +
-			( this._isInRange( inst, gotoDate ) ? "<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'" +
-			">" + currentText + "</button>" : "" ) + ( isRTL ? "" : controls ) + "</div>" : "";
+		controls = "";
+		if ( !inst.inline ) {
+			controls = $( "<button>" )
+				.attr( {
+					type: "button",
+					"class": "ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all",
+					"data-handler": "hide",
+					"data-event": "click"
+				} )
+				.text( this._get( inst, "closeText" ) )[ 0 ].outerHTML;
+		}
+
+		buttonPanel = "";
+		if ( showButtonPanel ) {
+			buttonPanel = $( "<div class='ui-datepicker-buttonpane ui-widget-content'>" )
+				.append( isRTL ? controls : "" )
+				.append( this._isInRange( inst, gotoDate ) ?
+					$( "<button>" )
+						.attr( {
+							type: "button",
+							"class": "ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all",
+							"data-handler": "today",
+							"data-event": "click"
+						} )
+						.text( currentText ) :
+					"" )
+				.append( isRTL ? "" : controls )[ 0 ].outerHTML;
+		}
 
 		firstDay = parseInt( this._get( inst, "firstDay" ), 10 );
 		firstDay = ( isNaN( firstDay ) ? 0 : firstDay );
@@ -1816,7 +1930,9 @@ $.extend( Datepicker.prototype, {
 							( printDate.getTime() === today.getTime() ? " ui-state-highlight" : "" ) +
 							( printDate.getTime() === currentDate.getTime() ? " ui-state-active" : "" ) + // highlight selected day
 							( otherMonth ? " ui-priority-secondary" : "" ) + // distinguish dates from other months
-							"' href='#'>" + printDate.getDate() + "</a>" ) ) + "</td>"; // display selectable date
+							"' href='#' aria-current='" + ( printDate.getTime() === currentDate.getTime() ? "true" : "false" ) + // mark date as selected for screen reader
+							"' data-date='" + printDate.getDate() + // store date as data
+							"'>" + printDate.getDate() + "</a>" ) ) + "</td>"; // display selectable date
 						printDate.setDate( printDate.getDate() + 1 );
 						printDate = this._daylightSavingAdjust( printDate );
 					}
@@ -1846,6 +1962,8 @@ $.extend( Datepicker.prototype, {
 			changeMonth = this._get( inst, "changeMonth" ),
 			changeYear = this._get( inst, "changeYear" ),
 			showMonthAfterYear = this._get( inst, "showMonthAfterYear" ),
+			selectMonthLabel = this._get( inst, "selectMonthLabel" ),
+			selectYearLabel = this._get( inst, "selectYearLabel" ),
 			html = "<div class='ui-datepicker-title'>",
 			monthHtml = "";
 
@@ -1855,7 +1973,7 @@ $.extend( Datepicker.prototype, {
 		} else {
 			inMinYear = ( minDate && minDate.getFullYear() === drawYear );
 			inMaxYear = ( maxDate && maxDate.getFullYear() === drawYear );
-			monthHtml += "<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>";
+			monthHtml += "<select class='ui-datepicker-month' aria-label='" + selectMonthLabel + "' data-handler='selectMonth' data-event='change'>";
 			for ( month = 0; month < 12; month++ ) {
 				if ( ( !inMinYear || month >= minDate.getMonth() ) && ( !inMaxYear || month <= maxDate.getMonth() ) ) {
 					monthHtml += "<option value='" + month + "'" +
@@ -1890,7 +2008,7 @@ $.extend( Datepicker.prototype, {
 				endYear = Math.max( year, determineYear( years[ 1 ] || "" ) );
 				year = ( minDate ? Math.max( year, minDate.getFullYear() ) : year );
 				endYear = ( maxDate ? Math.min( endYear, maxDate.getFullYear() ) : endYear );
-				inst.yearshtml += "<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";
+				inst.yearshtml += "<select class='ui-datepicker-year' aria-label='" + selectYearLabel + "' data-handler='selectYear' data-event='change'>";
 				for ( ; year <= endYear; year++ ) {
 					inst.yearshtml += "<option value='" + year + "'" +
 						( year === drawYear ? " selected='selected'" : "" ) +
@@ -2102,18 +2220,20 @@ $.fn.datepicker = function( options ) {
 			apply( $.datepicker, [ this[ 0 ] ].concat( otherArgs ) );
 	}
 	return this.each( function() {
-		typeof options === "string" ?
-			$.datepicker[ "_" + options + "Datepicker" ].
-				apply( $.datepicker, [ this ].concat( otherArgs ) ) :
+		if ( typeof options === "string" ) {
+			$.datepicker[ "_" + options + "Datepicker" ]
+				.apply( $.datepicker, [ this ].concat( otherArgs ) );
+		} else {
 			$.datepicker._attachDatepicker( this, options );
+		}
 	} );
 };
 
 $.datepicker = new Datepicker(); // singleton instance
 $.datepicker.initialized = false;
 $.datepicker.uuid = new Date().getTime();
-$.datepicker.version = "1.12.1";
+$.datepicker.version = "1.13.0-rc.2";
 
 return $.datepicker;
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/dialog.js b/src/js/_enqueues/vendor/jquery/ui/dialog.js
index aa9b871de6b82..5c33f2d1c12b5 100644
--- a/src/js/_enqueues/vendor/jquery/ui/dialog.js
+++ b/src/js/_enqueues/vendor/jquery/ui/dialog.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Dialog 1.12.1
+ * jQuery UI Dialog 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -17,6 +17,8 @@
 //>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -33,10 +35,11 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 $.widget( "ui.dialog", {
-	version: "1.12.1",
+	version: "1.13.0-rc.2",
 	options: {
 		appendTo: "body",
 		autoOpen: true,
@@ -281,7 +284,7 @@ $.widget( "ui.dialog", {
 			that._trigger( "focus" );
 		} );
 
-		// Track the dialog immediately upon openening in case a focus event
+		// Track the dialog immediately upon opening in case a focus event
 		// somehow occurs outside of the dialog before an element inside the
 		// dialog is focused (#10152)
 		this._makeFocusTarget();
@@ -317,22 +320,23 @@ $.widget( "ui.dialog", {
 		hasFocus.eq( 0 ).trigger( "focus" );
 	},
 
-	_keepFocus: function( event ) {
-		function checkFocus() {
-			var activeElement = $.ui.safeActiveElement( this.document[ 0 ] ),
-				isActive = this.uiDialog[ 0 ] === activeElement ||
-					$.contains( this.uiDialog[ 0 ], activeElement );
-			if ( !isActive ) {
-				this._focusTabbable();
-			}
+	_restoreTabbableFocus: function() {
+		var activeElement = $.ui.safeActiveElement( this.document[ 0 ] ),
+			isActive = this.uiDialog[ 0 ] === activeElement ||
+				$.contains( this.uiDialog[ 0 ], activeElement );
+		if ( !isActive ) {
+			this._focusTabbable();
 		}
+	},
+
+	_keepFocus: function( event ) {
 		event.preventDefault();
-		checkFocus.call( this );
+		this._restoreTabbableFocus();
 
 		// support: IE
 		// IE <= 8 doesn't prevent moving focus even with event.preventDefault()
 		// so we check again later
-		this._delay( checkFocus );
+		this._delay( this._restoreTabbableFocus );
 	},
 
 	_createWrapper: function() {
@@ -361,8 +365,8 @@ $.widget( "ui.dialog", {
 					return;
 				}
 				var tabbables = this.uiDialog.find( ":tabbable" ),
-					first = tabbables.filter( ":first" ),
-					last = tabbables.filter( ":last" );
+					first = tabbables.first(),
+					last = tabbables.last();
 
 				if ( ( event.target === last[ 0 ] || event.target === this.uiDialog[ 0 ] ) &&
 						!event.shiftKey ) {
@@ -473,14 +477,14 @@ $.widget( "ui.dialog", {
 		this.uiDialogButtonPane.remove();
 		this.uiButtonSet.empty();
 
-		if ( $.isEmptyObject( buttons ) || ( $.isArray( buttons ) && !buttons.length ) ) {
+		if ( $.isEmptyObject( buttons ) || ( Array.isArray( buttons ) && !buttons.length ) ) {
 			this._removeClass( this.uiDialog, "ui-dialog-buttons" );
 			return;
 		}
 
 		$.each( buttons, function( name, props ) {
 			var click, buttonOptions;
-			props = $.isFunction( props ) ?
+			props = typeof props === "function" ?
 				{ click: props, text: name } :
 				props;
 
@@ -845,6 +849,8 @@ $.widget( "ui.dialog", {
 			return;
 		}
 
+		var jqMinor = $.fn.jquery.substring( 0, 4 );
+
 		// We use a delay in case the overlay is created from an
 		// event that we're going to be cancelling (#2804)
 		var isOpening = true;
@@ -855,20 +861,28 @@ $.widget( "ui.dialog", {
 		if ( !this.document.data( "ui-dialog-overlays" ) ) {
 
 			// Prevent use of anchors and inputs
-			// Using _on() for an event handler shared across many instances is
-			// safe because the dialogs stack and must be closed in reverse order
-			this._on( this.document, {
-				focusin: function( event ) {
-					if ( isOpening ) {
-						return;
-					}
+			// This doesn't use `_on()` because it is a shared event handler
+			// across all open modal dialogs.
+			this.document.on( "focusin.ui-dialog", function( event ) {
+				if ( isOpening ) {
+					return;
+				}
 
-					if ( !this._allowInteraction( event ) ) {
-						event.preventDefault();
-						this._trackingInstances()[ 0 ]._focusTabbable();
+				var instance = this._trackingInstances()[ 0 ];
+				if ( !instance._allowInteraction( event ) ) {
+					event.preventDefault();
+					instance._focusTabbable();
+
+					// Support: jQuery >=3.4 <3.6 only
+					// Focus re-triggering in jQuery 3.4/3.5 makes the original element
+					// have its focus event propagated last, breaking the re-targeting.
+					// Trigger focus in a delay in addition if needed to avoid the issue
+					// See https://github.com/jquery/jquery/issues/4382
+					if ( jqMinor === "3.4." || jqMinor === "3.5." ) {
+						instance._delay( instance._restoreTabbableFocus );
 					}
 				}
-			} );
+			}.bind( this ) );
 		}
 
 		this.overlay = $( "<div>" )
@@ -891,7 +905,7 @@ $.widget( "ui.dialog", {
 			var overlays = this.document.data( "ui-dialog-overlays" ) - 1;
 
 			if ( !overlays ) {
-				this._off( this.document, "focusin" );
+				this.document.off( "focusin.ui-dialog" );
 				this.document.removeData( "ui-dialog-overlays" );
 			} else {
 				this.document.data( "ui-dialog-overlays", overlays );
@@ -929,4 +943,4 @@ if ( $.uiBackCompat !== false ) {
 
 return $.ui.dialog;
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/draggable.js b/src/js/_enqueues/vendor/jquery/ui/draggable.js
index 7a1746fd19eae..3ba056a75d7d4 100644
--- a/src/js/_enqueues/vendor/jquery/ui/draggable.js
+++ b/src/js/_enqueues/vendor/jquery/ui/draggable.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Draggable 1.12.1
+ * jQuery UI Draggable 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -15,6 +15,8 @@
 //>>css.structure: ../../themes/base/draggable.css
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -28,10 +30,11 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 $.widget( "ui.draggable", $.ui.mouse, {
-	version: "1.12.1",
+	version: "1.13.0-rc.2",
 	widgetEventPrefix: "drag",
 	options: {
 		addClasses: true,
@@ -195,7 +198,9 @@ $.widget( "ui.draggable", $.ui.mouse, {
 		this.originalPageY = event.pageY;
 
 		//Adjust the mouse offset relative to the helper if "cursorAt" is supplied
-		( o.cursorAt && this._adjustOffsetFromHelper( o.cursorAt ) );
+		if ( o.cursorAt ) {
+			this._adjustOffsetFromHelper( o.cursorAt );
+		}
 
 		//Set a containment if given in the options
 		this._setContainment();
@@ -290,7 +295,7 @@ $.widget( "ui.draggable", $.ui.mouse, {
 
 		if ( ( this.options.revert === "invalid" && !dropped ) ||
 				( this.options.revert === "valid" && dropped ) ||
-				this.options.revert === true || ( $.isFunction( this.options.revert ) &&
+				this.options.revert === true || ( typeof this.options.revert === "function" &&
 				this.options.revert.call( this.element, dropped ) )
 		) {
 			$( this.helper ).animate(
@@ -362,7 +367,7 @@ $.widget( "ui.draggable", $.ui.mouse, {
 	_createHelper: function( event ) {
 
 		var o = this.options,
-			helperIsFunction = $.isFunction( o.helper ),
+			helperIsFunction = typeof o.helper === "function",
 			helper = helperIsFunction ?
 				$( o.helper.apply( this.element[ 0 ], [ event ] ) ) :
 				( o.helper === "clone" ?
@@ -401,7 +406,7 @@ $.widget( "ui.draggable", $.ui.mouse, {
 		if ( typeof obj === "string" ) {
 			obj = obj.split( " " );
 		}
-		if ( $.isArray( obj ) ) {
+		if ( Array.isArray( obj ) ) {
 			obj = { left: +obj[ 0 ], top: +obj[ 1 ] || 0 };
 		}
 		if ( "left" in obj ) {
@@ -1110,12 +1115,13 @@ $.ui.plugin.add( "draggable", "snap", {
 					!$.contains( inst.snapElements[ i ].item.ownerDocument,
 					inst.snapElements[ i ].item ) ) {
 				if ( inst.snapElements[ i ].snapping ) {
-					( inst.options.snap.release &&
+					if ( inst.options.snap.release ) {
 						inst.options.snap.release.call(
 							inst.element,
 							event,
 							$.extend( inst._uiHash(), { snapItem: inst.snapElements[ i ].item } )
-						) );
+						);
+					}
 				}
 				inst.snapElements[ i ].snapping = false;
 				continue;
@@ -1186,13 +1192,14 @@ $.ui.plugin.add( "draggable", "snap", {
 			}
 
 			if ( !inst.snapElements[ i ].snapping && ( ts || bs || ls || rs || first ) ) {
-				( inst.options.snap.snap &&
+				if ( inst.options.snap.snap ) {
 					inst.options.snap.snap.call(
 						inst.element,
 						event,
 						$.extend( inst._uiHash(), {
 							snapItem: inst.snapElements[ i ].item
-						} ) ) );
+						} ) );
+				}
 			}
 			inst.snapElements[ i ].snapping = ( ts || bs || ls || rs || first );
 
@@ -1210,7 +1217,9 @@ $.ui.plugin.add( "draggable", "stack", {
 					( parseInt( $( b ).css( "zIndex" ), 10 ) || 0 );
 			} );
 
-		if ( !group.length ) { return; }
+		if ( !group.length ) {
+			return;
+		}
 
 		min = parseInt( $( group[ 0 ] ).css( "zIndex" ), 10 ) || 0;
 		$( group ).each( function( i ) {
@@ -1241,4 +1250,4 @@ $.ui.plugin.add( "draggable", "zIndex", {
 
 return $.ui.draggable;
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/droppable.js b/src/js/_enqueues/vendor/jquery/ui/droppable.js
index b71cc30bce419..1770ab2f1fea2 100644
--- a/src/js/_enqueues/vendor/jquery/ui/droppable.js
+++ b/src/js/_enqueues/vendor/jquery/ui/droppable.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Droppable 1.12.1
+ * jQuery UI Droppable 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -14,6 +14,8 @@
 //>>demos: http://jqueryui.com/droppable/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -28,10 +30,11 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 $.widget( "ui.droppable", {
-	version: "1.12.1",
+	version: "1.13.0-rc.2",
 	widgetEventPrefix: "drop",
 	options: {
 		accept: "*",
@@ -56,7 +59,7 @@ $.widget( "ui.droppable", {
 		this.isover = false;
 		this.isout = true;
 
-		this.accept = $.isFunction( accept ) ? accept : function( d ) {
+		this.accept = typeof accept === "function" ? accept : function( d ) {
 			return d.is( accept );
 		};
 
@@ -79,7 +82,9 @@ $.widget( "ui.droppable", {
 
 		this._addToManager( o.scope );
 
-		o.addClasses && this._addClass( "ui-droppable" );
+		if ( o.addClasses ) {
+			this._addClass( "ui-droppable" );
+		}
 
 	},
 
@@ -108,7 +113,7 @@ $.widget( "ui.droppable", {
 	_setOption: function( key, value ) {
 
 		if ( key === "accept" ) {
-			this.accept = $.isFunction( value ) ? value : function( d ) {
+			this.accept = typeof value === "function" ? value : function( d ) {
 				return d.is( value );
 			};
 		} else if ( key === "scope" ) {
@@ -198,14 +203,15 @@ $.widget( "ui.droppable", {
 					inst.accept.call(
 						inst.element[ 0 ], ( draggable.currentItem || draggable.element )
 					) &&
-					intersect(
+					$.ui.intersect(
 						draggable,
 						$.extend( inst, { offset: inst.element.offset() } ),
 						inst.options.tolerance, event
 					)
 				) {
 					childrenIntersection = true;
-					return false; }
+					return false;
+				}
 			} );
 		if ( childrenIntersection ) {
 			return false;
@@ -234,7 +240,7 @@ $.widget( "ui.droppable", {
 	},
 
 	// Extension points just to make backcompat sane and avoid duplicating logic
-	// TODO: Remove in 1.13 along with call to it below
+	// TODO: Remove in 1.14 along with call to it below
 	_addHoverClass: function() {
 		this._addClass( "ui-droppable-hover" );
 	},
@@ -252,7 +258,7 @@ $.widget( "ui.droppable", {
 	}
 } );
 
-var intersect = $.ui.intersect = ( function() {
+$.ui.intersect = ( function() {
 	function isOverAxis( x, reference, size ) {
 		return ( x >= reference ) && ( x < ( reference + size ) );
 	}
@@ -360,7 +366,7 @@ $.ui.ddmanager = {
 				return;
 			}
 			if ( !this.options.disabled && this.visible &&
-					intersect( draggable, this, this.options.tolerance, event ) ) {
+					$.ui.intersect( draggable, this, this.options.tolerance, event ) ) {
 				dropped = this._drop.call( this, event ) || dropped;
 			}
 
@@ -401,7 +407,7 @@ $.ui.ddmanager = {
 			}
 
 			var parentInstance, scope, parent,
-				intersects = intersect( draggable, this, this.options.tolerance, event ),
+				intersects = $.ui.intersect( draggable, this, this.options.tolerance, event ),
 				c = !intersects && this.isover ?
 					"isout" :
 					( intersects && !this.isover ? "isover" : null );
@@ -493,4 +499,4 @@ if ( $.uiBackCompat !== false ) {
 
 return $.ui.droppable;
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-blind.js b/src/js/_enqueues/vendor/jquery/ui/effect-blind.js
index 6ab63fa1d0b4e..6a27d2ef6ccf7 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-blind.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-blind.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Blind 1.12.1
+ * jQuery UI Effects Blind 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -14,6 +14,8 @@
 //>>demos: http://jqueryui.com/effect/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -26,7 +28,8 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.effects.define( "blind", "hide", function( options, done ) {
 	var map = {
@@ -66,4 +69,4 @@ return $.effects.define( "blind", "hide", function( options, done ) {
 	} );
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-bounce.js b/src/js/_enqueues/vendor/jquery/ui/effect-bounce.js
index 00ff5b22358eb..0f07eed03954d 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-bounce.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-bounce.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Bounce 1.12.1
+ * jQuery UI Effects Bounce 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -14,6 +14,8 @@
 //>>demos: http://jqueryui.com/effect/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -26,7 +28,8 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.effects.define( "bounce", function( options, done ) {
 	var upAnim, downAnim, refValue,
@@ -106,4 +109,4 @@ return $.effects.define( "bounce", function( options, done ) {
 	$.effects.unshift( element, queuelen, anims + 1 );
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-clip.js b/src/js/_enqueues/vendor/jquery/ui/effect-clip.js
index bdeaeb26070e8..b08ae48a2450b 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-clip.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-clip.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Clip 1.12.1
+ * jQuery UI Effects Clip 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -14,6 +14,8 @@
 //>>demos: http://jqueryui.com/effect/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -26,7 +28,8 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.effects.define( "clip", "hide", function( options, done ) {
 	var start,
@@ -61,4 +64,4 @@ return $.effects.define( "clip", "hide", function( options, done ) {
 
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-drop.js b/src/js/_enqueues/vendor/jquery/ui/effect-drop.js
index b38fe5ff60317..9976a933609e6 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-drop.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-drop.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Drop 1.12.1
+ * jQuery UI Effects Drop 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -14,6 +14,8 @@
 //>>demos: http://jqueryui.com/effect/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -26,7 +28,8 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.effects.define( "drop", "hide", function( options, done ) {
 
@@ -65,4 +68,4 @@ return $.effects.define( "drop", "hide", function( options, done ) {
 	} );
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-explode.js b/src/js/_enqueues/vendor/jquery/ui/effect-explode.js
index 89a2c83f7fccb..8ce41aa221252 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-explode.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-explode.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Explode 1.12.1
+ * jQuery UI Effects Explode 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -9,13 +9,15 @@
 
 //>>label: Explode Effect
 //>>group: Effects
-// jscs:disable maximumLineLength
+/* eslint-disable max-len */
 //>>description: Explodes an element in all directions into n pieces. Implodes an element to its original wholeness.
-// jscs:enable maximumLineLength
+/* eslint-enable max-len */
 //>>docs: http://api.jqueryui.com/explode-effect/
 //>>demos: http://jqueryui.com/effect/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -28,7 +30,8 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.effects.define( "explode", "hide", function( options, done ) {
 
@@ -107,4 +110,4 @@ return $.effects.define( "explode", "hide", function( options, done ) {
 	}
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-fade.js b/src/js/_enqueues/vendor/jquery/ui/effect-fade.js
index 8ea555204a8d4..6b3aac99cf60f 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-fade.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-fade.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Fade 1.12.1
+ * jQuery UI Effects Fade 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -14,6 +14,8 @@
 //>>demos: http://jqueryui.com/effect/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -26,7 +28,8 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.effects.define( "fade", "toggle", function( options, done ) {
 	var show = options.mode === "show";
@@ -43,4 +46,4 @@ return $.effects.define( "fade", "toggle", function( options, done ) {
 		} );
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-fold.js b/src/js/_enqueues/vendor/jquery/ui/effect-fold.js
index 357689954e0d2..982aa98bd6d9f 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-fold.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-fold.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Fold 1.12.1
+ * jQuery UI Effects Fold 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -14,6 +14,8 @@
 //>>demos: http://jqueryui.com/effect/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -26,7 +28,8 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.effects.define( "fold", "hide", function( options, done ) {
 
@@ -85,4 +88,4 @@ return $.effects.define( "fold", "hide", function( options, done ) {
 	$.effects.unshift( element, queuelen, 4 );
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-highlight.js b/src/js/_enqueues/vendor/jquery/ui/effect-highlight.js
index 0f48bf33cb640..21e13d45ecac3 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-highlight.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-highlight.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Highlight 1.12.1
+ * jQuery UI Effects Highlight 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -14,6 +14,8 @@
 //>>demos: http://jqueryui.com/effect/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -26,7 +28,8 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.effects.define( "highlight", "show", function( options, done ) {
 	var element = $( this ),
@@ -53,4 +56,4 @@ return $.effects.define( "highlight", "show", function( options, done ) {
 		} );
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-puff.js b/src/js/_enqueues/vendor/jquery/ui/effect-puff.js
index 51d5ab43ba72a..28f4aa7fa9b20 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-puff.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-puff.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Puff 1.12.1
+ * jQuery UI Effects Puff 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -14,6 +14,8 @@
 //>>demos: http://jqueryui.com/effect/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -27,7 +29,8 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.effects.define( "puff", "hide", function( options, done ) {
 	var newOptions = $.extend( true, {}, options, {
@@ -38,4 +41,4 @@ return $.effects.define( "puff", "hide", function( options, done ) {
 	$.effects.effect.scale.call( this, newOptions, done );
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-pulsate.js b/src/js/_enqueues/vendor/jquery/ui/effect-pulsate.js
index 065025815ac2b..b236c38f143f1 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-pulsate.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-pulsate.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Pulsate 1.12.1
+ * jQuery UI Effects Pulsate 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -14,6 +14,8 @@
 //>>demos: http://jqueryui.com/effect/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -26,7 +28,8 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.effects.define( "pulsate", "show", function( options, done ) {
 	var element = $( this ),
@@ -60,4 +63,4 @@ return $.effects.define( "pulsate", "show", function( options, done ) {
 	$.effects.unshift( element, queuelen, anims + 1 );
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-scale.js b/src/js/_enqueues/vendor/jquery/ui/effect-scale.js
index 04daabfe6cd5a..68ce95abcb553 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-scale.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-scale.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Scale 1.12.1
+ * jQuery UI Effects Scale 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -14,6 +14,8 @@
 //>>demos: http://jqueryui.com/effect/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -27,7 +29,8 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.effects.define( "scale", function( options, done ) {
 
@@ -52,4 +55,4 @@ return $.effects.define( "scale", function( options, done ) {
 	$.effects.effect.size.call( this, newOptions, done );
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-shake.js b/src/js/_enqueues/vendor/jquery/ui/effect-shake.js
index a59e1a8899af4..568eca5e8629f 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-shake.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-shake.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Shake 1.12.1
+ * jQuery UI Effects Shake 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -14,6 +14,8 @@
 //>>demos: http://jqueryui.com/effect/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -26,7 +28,8 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.effects.define( "shake", function( options, done ) {
 
@@ -70,4 +73,4 @@ return $.effects.define( "shake", function( options, done ) {
 	$.effects.unshift( element, queuelen, anims + 1 );
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-size.js b/src/js/_enqueues/vendor/jquery/ui/effect-size.js
index 8449271aff0d8..28a9d6c9d4503 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-size.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-size.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Size 1.12.1
+ * jQuery UI Effects Size 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -14,6 +14,8 @@
 //>>demos: http://jqueryui.com/effect/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -26,7 +28,8 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.effects.define( "size", function( options, done ) {
 
@@ -104,6 +107,8 @@ return $.effects.define( "size", function( options, done ) {
 		to.top = ( original.outerHeight - to.outerHeight ) * baseline.y + pos.top;
 		to.left = ( original.outerWidth - to.outerWidth ) * baseline.x + pos.left;
 	}
+	delete from.outerHeight;
+	delete from.outerWidth;
 	element.css( from );
 
 	// Animate the children if desired
@@ -187,4 +192,4 @@ return $.effects.define( "size", function( options, done ) {
 
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-slide.js b/src/js/_enqueues/vendor/jquery/ui/effect-slide.js
index 055d1d4879c65..34c2aae29019d 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-slide.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-slide.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Slide 1.12.1
+ * jQuery UI Effects Slide 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -14,6 +14,8 @@
 //>>demos: http://jqueryui.com/effect/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -26,7 +28,8 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.effects.define( "slide", "show", function( options, done ) {
 	var startClip, startRef,
@@ -72,4 +75,4 @@ return $.effects.define( "slide", "show", function( options, done ) {
 	} );
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-transfer.js b/src/js/_enqueues/vendor/jquery/ui/effect-transfer.js
index 6c2e3ac1ad13b..ecdd495fccc5b 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-transfer.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-transfer.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Transfer 1.12.1
+ * jQuery UI Effects Transfer 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -14,6 +14,8 @@
 //>>demos: http://jqueryui.com/effect/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -26,7 +28,8 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 var effect;
 if ( $.uiBackCompat !== false ) {
@@ -36,4 +39,4 @@ if ( $.uiBackCompat !== false ) {
 }
 return effect;
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect.js b/src/js/_enqueues/vendor/jquery/ui/effect.js
index d1031bb3a723b..a9952d980a4eb 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects 1.12.1
+ * jQuery UI Effects 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -9,13 +9,15 @@
 
 //>>label: Effects Core
 //>>group: Effects
-// jscs:disable maximumLineLength
+/* eslint-disable max-len */
 //>>description: Extends the internal jQuery effects. Includes morphing and easing. Required by all other effects.
-// jscs:enable maximumLineLength
+/* eslint-enable max-len */
 //>>docs: http://api.jqueryui.com/category/effects-core/
 //>>demos: http://jqueryui.com/effect/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -25,43 +27,42 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 // Include version.js
 $.ui = $.ui || {};
-$.ui.version = "1.12.1";
+$.ui.version = "1.13.0-rc.2";
 
-var dataSpace = "ui-effects-",
-	dataSpaceStyle = "ui-effects-style",
-	dataSpaceAnimated = "ui-effects-animated",
+// Source: jquery-var-for-color.js
+// Create a local jQuery because jQuery Color relies on it and the
+// global may not exist with AMD and a custom build (#10199).
+// This module is a noop if used as a regular AMD module.
+// eslint-disable-next-line no-unused-vars
+var jQuery = $;
 
-	// Create a local jQuery because jQuery Color relies on it and the
-	// global may not exist with AMD and a custom build (#10199)
-	jQuery = $;
-
-$.effects = {
-	effect: {}
-};
 
 /*!
- * jQuery Color Animations v2.1.2
+ * jQuery Color Animations v2.2.0
  * https://github.com/jquery/jquery-color
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
- * Date: Wed Jan 16 08:47:09 2013 -0600
+ * Date: Sun May 10 09:02:36 2020 +0200
  */
-( function( jQuery, undefined ) {
 
 	var stepHooks = "backgroundColor borderBottomColor borderLeftColor borderRightColor " +
 		"borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",
 
-	// Plusequals test for += 100 -= 100
+	class2type = {},
+	toString = class2type.toString,
+
+	// plusequals test for += 100 -= 100
 	rplusequals = /^([\-+])=\s*(\d+\.?\d*)/,
 
-	// A set of RE's that can match strings and generate color tuples.
+	// a set of RE's that can match strings and generate color tuples.
 	stringParsers = [ {
 			re: /rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
 			parse: function( execResult ) {
@@ -84,24 +85,31 @@ $.effects = {
 			}
 		}, {
 
-			// This regex ignores A-F because it's compared against an already lowercased string
-			re: /#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,
+			// this regex ignores A-F because it's compared against an already lowercased string
+			re: /#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})?/,
 			parse: function( execResult ) {
 				return [
 					parseInt( execResult[ 1 ], 16 ),
 					parseInt( execResult[ 2 ], 16 ),
-					parseInt( execResult[ 3 ], 16 )
+					parseInt( execResult[ 3 ], 16 ),
+					execResult[ 4 ] ?
+						( parseInt( execResult[ 4 ], 16 ) / 255 ).toFixed( 2 ) :
+						1
 				];
 			}
 		}, {
 
-			// This regex ignores A-F because it's compared against an already lowercased string
-			re: /#([a-f0-9])([a-f0-9])([a-f0-9])/,
+			// this regex ignores A-F because it's compared against an already lowercased string
+			re: /#([a-f0-9])([a-f0-9])([a-f0-9])([a-f0-9])?/,
 			parse: function( execResult ) {
 				return [
 					parseInt( execResult[ 1 ] + execResult[ 1 ], 16 ),
 					parseInt( execResult[ 2 ] + execResult[ 2 ], 16 ),
-					parseInt( execResult[ 3 ] + execResult[ 3 ], 16 )
+					parseInt( execResult[ 3 ] + execResult[ 3 ], 16 ),
+					execResult[ 4 ] ?
+						( parseInt( execResult[ 4 ] + execResult[ 4 ], 16 ) / 255 )
+							.toFixed( 2 ) :
+						1
 				];
 			}
 		}, {
@@ -117,7 +125,7 @@ $.effects = {
 			}
 		} ],
 
-	// JQuery.Color( )
+	// jQuery.Color( )
 	color = jQuery.Color = function( color, green, blue, alpha ) {
 		return new jQuery.Color.fn.parse( color, green, blue, alpha );
 	},
@@ -171,20 +179,20 @@ $.effects = {
 	},
 	support = color.support = {},
 
-	// Element for support tests
+	// element for support tests
 	supportElem = jQuery( "<p>" )[ 0 ],
 
-	// Colors = jQuery.Color.names
+	// colors = jQuery.Color.names
 	colors,
 
-	// Local aliases of functions called often
+	// local aliases of functions called often
 	each = jQuery.each;
 
-// Determine rgba support immediately
+// determine rgba support immediately
 supportElem.style.cssText = "background-color:rgba(1,1,1,.5)";
 support.rgba = supportElem.style.backgroundColor.indexOf( "rgba" ) > -1;
 
-// Define cache name and alpha properties
+// define cache name and alpha properties
 // for rgba and hsla spaces
 each( spaces, function( spaceName, space ) {
 	space.cache = "_" + spaceName;
@@ -195,6 +203,22 @@ each( spaces, function( spaceName, space ) {
 	};
 } );
 
+// Populate the class2type map
+jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
+	function( _i, name ) {
+		class2type[ "[object " + name + "]" ] = name.toLowerCase();
+	} );
+
+function getType( obj ) {
+	if ( obj == null ) {
+		return obj + "";
+	}
+
+	return typeof obj === "object" ?
+		class2type[ toString.call( obj ) ] || "object" :
+		typeof obj;
+}
+
 function clamp( value, prop, allowEmpty ) {
 	var type = propTypes[ prop.type ] || {};
 
@@ -213,13 +237,13 @@ function clamp( value, prop, allowEmpty ) {
 
 	if ( type.mod ) {
 
-		// We add mod before modding to make sure that negatives values
+		// we add mod before modding to make sure that negatives values
 		// get converted properly: -10 -> 350
 		return ( value + type.mod ) % type.mod;
 	}
 
-	// For now all property types without mod have min and max
-	return 0 > value ? 0 : type.max < value ? type.max : value;
+	// for now all property types without mod have min and max
+	return Math.min( type.max, Math.max( 0, value ) );
 }
 
 function stringParse( string ) {
@@ -228,7 +252,7 @@ function stringParse( string ) {
 
 	string = string.toLowerCase();
 
-	each( stringParsers, function( i, parser ) {
+	each( stringParsers, function( _i, parser ) {
 		var parsed,
 			match = parser.re.exec( string ),
 			values = match && parser.parse( match ),
@@ -237,12 +261,12 @@ function stringParse( string ) {
 		if ( values ) {
 			parsed = inst[ spaceName ]( values );
 
-			// If this was an rgba parse the assignment might happen twice
+			// if this was an rgba parse the assignment might happen twice
 			// oh well....
 			inst[ spaces[ spaceName ].cache ] = parsed[ spaces[ spaceName ].cache ];
 			rgba = inst._rgba = parsed._rgba;
 
-			// Exit each( stringParsers ) here because we matched
+			// exit each( stringParsers ) here because we matched
 			return false;
 		}
 	} );
@@ -250,7 +274,7 @@ function stringParse( string ) {
 	// Found a stringParser that handled it
 	if ( rgba.length ) {
 
-		// If this came from a parsed string, force "transparent" when alpha is 0
+		// if this came from a parsed string, force "transparent" when alpha is 0
 		// chrome, (and maybe others) return "transparent" as rgba(0,0,0,0)
 		if ( rgba.join() === "0,0,0,0" ) {
 			jQuery.extend( rgba, colors.transparent );
@@ -258,7 +282,7 @@ function stringParse( string ) {
 		return inst;
 	}
 
-	// Named colors
+	// named colors
 	return colors[ string ];
 }
 
@@ -274,10 +298,10 @@ color.fn = jQuery.extend( color.prototype, {
 		}
 
 		var inst = this,
-			type = jQuery.type( red ),
+			type = getType( red ),
 			rgba = this._rgba = [];
 
-		// More than 1 argument specified - assume ( red, green, blue, alpha )
+		// more than 1 argument specified - assume ( red, green, blue, alpha )
 		if ( green !== undefined ) {
 			red = [ red, green, blue, alpha ];
 			type = "array";
@@ -288,7 +312,7 @@ color.fn = jQuery.extend( color.prototype, {
 		}
 
 		if ( type === "array" ) {
-			each( spaces.rgba.props, function( key, prop ) {
+			each( spaces.rgba.props, function( _key, prop ) {
 				rgba[ prop.idx ] = clamp( red[ prop.idx ], prop );
 			} );
 			return this;
@@ -296,20 +320,20 @@ color.fn = jQuery.extend( color.prototype, {
 
 		if ( type === "object" ) {
 			if ( red instanceof color ) {
-				each( spaces, function( spaceName, space ) {
+				each( spaces, function( _spaceName, space ) {
 					if ( red[ space.cache ] ) {
 						inst[ space.cache ] = red[ space.cache ].slice();
 					}
 				} );
 			} else {
-				each( spaces, function( spaceName, space ) {
+				each( spaces, function( _spaceName, space ) {
 					var cache = space.cache;
 					each( space.props, function( key, prop ) {
 
-						// If the cache doesn't exist, and we know how to convert
+						// if the cache doesn't exist, and we know how to convert
 						if ( !inst[ cache ] && space.to ) {
 
-							// If the value was null, we don't need to copy it
+							// if the value was null, we don't need to copy it
 							// if the key was alpha, we don't need to copy it either
 							if ( key === "alpha" || red[ key ] == null ) {
 								return;
@@ -317,17 +341,19 @@ color.fn = jQuery.extend( color.prototype, {
 							inst[ cache ] = space.to( inst._rgba );
 						}
 
-						// This is the only case where we allow nulls for ALL properties.
+						// this is the only case where we allow nulls for ALL properties.
 						// call clamp with alwaysAllowEmpty
 						inst[ cache ][ prop.idx ] = clamp( red[ key ], prop, true );
 					} );
 
-					// Everything defined but alpha?
-					if ( inst[ cache ] &&
-							jQuery.inArray( null, inst[ cache ].slice( 0, 3 ) ) < 0 ) {
+					// everything defined but alpha?
+					if ( inst[ cache ] && jQuery.inArray( null, inst[ cache ].slice( 0, 3 ) ) < 0 ) {
+
+						// use the default of 1
+						if ( inst[ cache ][ 3 ] == null ) {
+							inst[ cache ][ 3 ] = 1;
+						}
 
-						// Use the default of 1
-						inst[ cache ][ 3 ] = 1;
 						if ( space.from ) {
 							inst._rgba = space.from( inst[ cache ] );
 						}
@@ -377,18 +403,18 @@ color.fn = jQuery.extend( color.prototype, {
 			result = start.slice();
 
 		end = end[ space.cache ];
-		each( space.props, function( key, prop ) {
+		each( space.props, function( _key, prop ) {
 			var index = prop.idx,
 				startValue = start[ index ],
 				endValue = end[ index ],
 				type = propTypes[ prop.type ] || {};
 
-			// If null, don't override start value
+			// if null, don't override start value
 			if ( endValue === null ) {
 				return;
 			}
 
-			// If null - use end
+			// if null - use end
 			if ( startValue === null ) {
 				result[ index ] = endValue;
 			} else {
@@ -406,7 +432,7 @@ color.fn = jQuery.extend( color.prototype, {
 	},
 	blend: function( opaque ) {
 
-		// If we are already opaque - return ourself
+		// if we are already opaque - return ourself
 		if ( this._rgba[ 3 ] === 1 ) {
 			return this;
 		}
@@ -422,7 +448,10 @@ color.fn = jQuery.extend( color.prototype, {
 	toRgbaString: function() {
 		var prefix = "rgba(",
 			rgba = jQuery.map( this._rgba, function( v, i ) {
-				return v == null ? ( i > 2 ? 1 : 0 ) : v;
+				if ( v != null ) {
+					return v;
+				}
+				return i > 2 ? 1 : 0;
 			} );
 
 		if ( rgba[ 3 ] === 1 ) {
@@ -439,7 +468,7 @@ color.fn = jQuery.extend( color.prototype, {
 					v = i > 2 ? 1 : 0;
 				}
 
-				// Catch 1 and 2
+				// catch 1 and 2
 				if ( i && i < 3 ) {
 					v = Math.round( v * 100 ) + "%";
 				}
@@ -462,7 +491,7 @@ color.fn = jQuery.extend( color.prototype, {
 
 		return "#" + jQuery.map( rgba, function( v ) {
 
-			// Default to 0 when nulls exist
+			// default to 0 when nulls exist
 			v = ( v || 0 ).toString( 16 );
 			return v.length === 1 ? "0" + v : v;
 		} ).join( "" );
@@ -473,7 +502,7 @@ color.fn = jQuery.extend( color.prototype, {
 } );
 color.fn.parse.prototype = color.fn;
 
-// Hsla conversions adapted from:
+// hsla conversions adapted from:
 // https://code.google.com/p/maashaack/source/browse/packages/graphics/trunk/src/graphics/colors/HUE2RGB.as?r=5021
 
 function hue2rgb( p, q, h ) {
@@ -515,7 +544,7 @@ spaces.hsla.to = function( rgba ) {
 		h = ( 60 * ( r - g ) / diff ) + 240;
 	}
 
-	// Chroma (diff) == 0 means greyscale which, by definition, saturation = 0%
+	// chroma (diff) == 0 means greyscale which, by definition, saturation = 0%
 	// otherwise, saturation is based on the ratio of chroma (diff) to lightness (add)
 	if ( diff === 0 ) {
 		s = 0;
@@ -546,16 +575,17 @@ spaces.hsla.from = function( hsla ) {
 	];
 };
 
+
 each( spaces, function( spaceName, space ) {
 	var props = space.props,
 		cache = space.cache,
 		to = space.to,
 		from = space.from;
 
-	// Makes rgba() and hsla()
+	// makes rgba() and hsla()
 	color.fn[ spaceName ] = function( value ) {
 
-		// Generate a cache for this space if it doesn't exist
+		// generate a cache for this space if it doesn't exist
 		if ( to && !this[ cache ] ) {
 			this[ cache ] = to( this._rgba );
 		}
@@ -564,7 +594,7 @@ each( spaces, function( spaceName, space ) {
 		}
 
 		var ret,
-			type = jQuery.type( value ),
+			type = getType( value ),
 			arr = ( type === "array" || type === "object" ) ? value : arguments,
 			local = this[ cache ].slice();
 
@@ -585,19 +615,24 @@ each( spaces, function( spaceName, space ) {
 		}
 	};
 
-	// Makes red() green() blue() alpha() hue() saturation() lightness()
+	// makes red() green() blue() alpha() hue() saturation() lightness()
 	each( props, function( key, prop ) {
 
-		// Alpha is included in more than one space
+		// alpha is included in more than one space
 		if ( color.fn[ key ] ) {
 			return;
 		}
 		color.fn[ key ] = function( value ) {
-			var vtype = jQuery.type( value ),
-				fn = ( key === "alpha" ? ( this._hsla ? "hsla" : "rgba" ) : spaceName ),
-				local = this[ fn ](),
-				cur = local[ prop.idx ],
-				match;
+			var local, cur, match, fn,
+				vtype = getType( value );
+
+			if ( key === "alpha" ) {
+				fn = this._hsla ? "hsla" : "rgba";
+			} else {
+				fn = spaceName;
+			}
+			local = this[ fn ]();
+			cur = local[ prop.idx ];
 
 			if ( vtype === "undefined" ) {
 				return cur;
@@ -605,7 +640,7 @@ each( spaces, function( spaceName, space ) {
 
 			if ( vtype === "function" ) {
 				value = value.call( this, cur );
-				vtype = jQuery.type( value );
+				vtype = getType( value );
 			}
 			if ( value == null && prop.empty ) {
 				return this;
@@ -622,18 +657,17 @@ each( spaces, function( spaceName, space ) {
 	} );
 } );
 
-// Add cssHook and .fx.step function for each named hook.
+// add cssHook and .fx.step function for each named hook.
 // accept a space separated string of properties
 color.hook = function( hook ) {
 	var hooks = hook.split( " " );
-	each( hooks, function( i, hook ) {
+	each( hooks, function( _i, hook ) {
 		jQuery.cssHooks[ hook ] = {
 			set: function( elem, value ) {
 				var parsed, curElem,
 					backgroundColor = "";
 
-				if ( value !== "transparent" && ( jQuery.type( value ) !== "string" ||
-						( parsed = stringParse( value ) ) ) ) {
+				if ( value !== "transparent" && ( getType( value ) !== "string" || ( parsed = stringParse( value ) ) ) ) {
 					value = color( parsed || value );
 					if ( !support.rgba && value._rgba[ 3 ] !== 1 ) {
 						curElem = hook === "backgroundColor" ? elem.parentNode : elem;
@@ -659,8 +693,7 @@ color.hook = function( hook ) {
 					elem.style[ hook ] = value;
 				} catch ( e ) {
 
-					// Wrapped to prevent IE from throwing errors on "invalid" values like
-					// 'auto' or 'inherit'
+					// wrapped to prevent IE from throwing errors on "invalid" values like 'auto' or 'inherit'
 				}
 			}
 		};
@@ -682,7 +715,7 @@ jQuery.cssHooks.borderColor = {
 	expand: function( value ) {
 		var expanded = {};
 
-		each( [ "Top", "Right", "Bottom", "Left" ], function( i, part ) {
+		each( [ "Top", "Right", "Bottom", "Left" ], function( _i, part ) {
 			expanded[ "border" + part + "Color" ] = value;
 		} );
 		return expanded;
@@ -718,7 +751,14 @@ colors = jQuery.Color.names = {
 	_default: "#ffffff"
 };
 
-} )( jQuery );
+
+var dataSpace = "ui-effects-",
+	dataSpaceStyle = "ui-effects-style",
+	dataSpaceAnimated = "ui-effects-animated";
+
+$.effects = {
+	effect: {}
+};
 
 /******************************************************************************/
 /****************************** CLASS ANIMATIONS ******************************/
@@ -750,6 +790,12 @@ $.each(
 	}
 );
 
+function camelCase( string ) {
+	return string.replace( /-([\da-z])/gi, function( all, letter ) {
+		return letter.toUpperCase();
+	} );
+}
+
 function getElementStyles( elem ) {
 	var key, len,
 		style = elem.ownerDocument.defaultView ?
@@ -762,7 +808,7 @@ function getElementStyles( elem ) {
 		while ( len-- ) {
 			key = style[ len ];
 			if ( typeof style[ key ] === "string" ) {
-				styles[ $.camelCase( key ) ] = style[ key ];
+				styles[ camelCase( key ) ] = style[ key ];
 			}
 		}
 
@@ -936,12 +982,12 @@ $.fn.extend( {
 
 ( function() {
 
-if ( $.expr && $.expr.filters && $.expr.filters.animated ) {
-	$.expr.filters.animated = ( function( orig ) {
+if ( $.expr && $.expr.pseudos && $.expr.pseudos.animated ) {
+	$.expr.pseudos.animated = ( function( orig ) {
 		return function( elem ) {
 			return !!$( elem ).data( dataSpaceAnimated ) || orig( elem );
 		};
-	} )( $.expr.filters.animated );
+	} )( $.expr.pseudos.animated );
 }
 
 if ( $.uiBackCompat !== false ) {
@@ -1010,6 +1056,7 @@ if ( $.uiBackCompat !== false ) {
 			// Firefox incorrectly exposes anonymous content
 			// https://bugzilla.mozilla.org/show_bug.cgi?id=561664
 			try {
+				// eslint-disable-next-line no-unused-expressions
 				active.id;
 			} catch ( e ) {
 				active = document.body;
@@ -1072,7 +1119,7 @@ if ( $.uiBackCompat !== false ) {
 }
 
 $.extend( $.effects, {
-	version: "1.12.1",
+	version: "1.13.0-rc.2",
 
 	define: function( name, mode, effect ) {
 		if ( !effect ) {
@@ -1288,7 +1335,7 @@ function _normalizeArguments( effect, options, speed, callback ) {
 	}
 
 	// Catch (effect, callback)
-	if ( $.isFunction( options ) ) {
+	if ( typeof options === "function" ) {
 		callback = options;
 		speed = null;
 		options = {};
@@ -1302,7 +1349,7 @@ function _normalizeArguments( effect, options, speed, callback ) {
 	}
 
 	// Catch (effect, options, callback)
-	if ( $.isFunction( speed ) ) {
+	if ( typeof speed === "function" ) {
 		callback = speed;
 		speed = null;
 	}
@@ -1336,7 +1383,7 @@ function standardAnimationOption( option ) {
 	}
 
 	// Complete callback
-	if ( $.isFunction( option ) ) {
+	if ( typeof option === "function" ) {
 		return true;
 	}
 
@@ -1363,7 +1410,7 @@ $.fn.extend( {
 				var el = $( this ),
 					normalizedMode = $.effects.mode( el, mode ) || defaultMode;
 
-				// Sentinel for duck-punching the :animated psuedo-selector
+				// Sentinel for duck-punching the :animated pseudo-selector
 				el.data( dataSpaceAnimated, true );
 
 				// Save effect mode for later use,
@@ -1371,7 +1418,7 @@ $.fn.extend( {
 				// as the .show() below destroys the initial state
 				modes.push( normalizedMode );
 
-				// See $.uiBackCompat inside of run() for removal of defaultMode in 1.13
+				// See $.uiBackCompat inside of run() for removal of defaultMode in 1.14
 				if ( defaultMode && ( normalizedMode === "show" ||
 						( normalizedMode === defaultMode && normalizedMode === "hide" ) ) ) {
 					el.show();
@@ -1381,7 +1428,7 @@ $.fn.extend( {
 					$.effects.saveStyle( el );
 				}
 
-				if ( $.isFunction( next ) ) {
+				if ( typeof next === "function" ) {
 					next();
 				}
 			};
@@ -1416,11 +1463,11 @@ $.fn.extend( {
 			}
 
 			function done() {
-				if ( $.isFunction( complete ) ) {
+				if ( typeof complete === "function" ) {
 					complete.call( elem[ 0 ] );
 				}
 
-				if ( $.isFunction( next ) ) {
+				if ( typeof next === "function" ) {
 					next();
 				}
 			}
@@ -1529,22 +1576,24 @@ $.fn.extend( {
 				width: target.innerWidth()
 			},
 			startPosition = element.offset(),
-			transfer = $( "<div class='ui-effects-transfer'></div>" )
-				.appendTo( "body" )
-				.addClass( options.className )
-				.css( {
-					top: startPosition.top - fixTop,
-					left: startPosition.left - fixLeft,
-					height: element.innerHeight(),
-					width: element.innerWidth(),
-					position: targetFixed ? "fixed" : "absolute"
-				} )
-				.animate( animation, options.duration, options.easing, function() {
-					transfer.remove();
-					if ( $.isFunction( done ) ) {
-						done();
-					}
-				} );
+			transfer = $( "<div class='ui-effects-transfer'></div>" );
+
+		transfer
+			.appendTo( "body" )
+			.addClass( options.className )
+			.css( {
+				top: startPosition.top - fixTop,
+				left: startPosition.left - fixLeft,
+				height: element.innerHeight(),
+				width: element.innerWidth(),
+				position: targetFixed ? "fixed" : "absolute"
+			} )
+			.animate( animation, options.duration, options.easing, function() {
+				transfer.remove();
+				if ( typeof done === "function" ) {
+					done();
+				}
+			} );
 	}
 } );
 
@@ -1636,4 +1685,4 @@ $.each( baseEasings, function( name, easeIn ) {
 
 return $.effects;
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/menu.js b/src/js/_enqueues/vendor/jquery/ui/menu.js
index f5c4f73115bd0..f06be2c4aec1d 100644
--- a/src/js/_enqueues/vendor/jquery/ui/menu.js
+++ b/src/js/_enqueues/vendor/jquery/ui/menu.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Menu 1.12.1
+ * jQuery UI Menu 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -17,6 +17,8 @@
 //>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -29,10 +31,11 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.widget( "ui.menu", {
-	version: "1.12.1",
+	version: "1.13.0-rc.2",
 	defaultElement: "<ul>",
 	delay: 300,
 	options: {
@@ -59,6 +62,7 @@ return $.widget( "ui.menu", {
 		// Flag used to prevent firing of the click handler
 		// as the event bubbles up through nested menus
 		this.mouseHandled = false;
+		this.lastMousePosition = { x: null, y: null };
 		this.element
 			.uniqueId()
 			.attr( {
@@ -73,6 +77,8 @@ return $.widget( "ui.menu", {
 			// them (focus should always stay on UL during navigation).
 			"mousedown .ui-menu-item": function( event ) {
 				event.preventDefault();
+
+				this._activateItem( event );
 			},
 			"click .ui-menu-item": function( event ) {
 				var target = $( event.target );
@@ -102,36 +108,15 @@ return $.widget( "ui.menu", {
 					}
 				}
 			},
-			"mouseenter .ui-menu-item": function( event ) {
-
-				// Ignore mouse events while typeahead is active, see #10458.
-				// Prevents focusing the wrong item when typeahead causes a scroll while the mouse
-				// is over an item in the menu
-				if ( this.previousFilter ) {
-					return;
-				}
-
-				var actualTarget = $( event.target ).closest( ".ui-menu-item" ),
-					target = $( event.currentTarget );
-
-				// Ignore bubbled events on parent items, see #11641
-				if ( actualTarget[ 0 ] !== target[ 0 ] ) {
-					return;
-				}
-
-				// Remove ui-state-active class from siblings of the newly focused menu item
-				// to avoid a jump caused by adjacent elements both having a class with a border
-				this._removeClass( target.siblings().children( ".ui-state-active" ),
-					null, "ui-state-active" );
-				this.focus( event, target );
-			},
+			"mouseenter .ui-menu-item": "_activateItem",
+			"mousemove .ui-menu-item": "_activateItem",
 			mouseleave: "collapseAll",
 			"mouseleave .ui-menu": "collapseAll",
 			focus: function( event, keepActiveItem ) {
 
 				// If there's already an active item, keep it active
 				// If not, activate the first item
-				var item = this.active || this.element.find( this.options.items ).eq( 0 );
+				var item = this.active || this._menuItems().first();
 
 				if ( !keepActiveItem ) {
 					this.focus( event, item );
@@ -157,7 +142,7 @@ return $.widget( "ui.menu", {
 		this._on( this.document, {
 			click: function( event ) {
 				if ( this._closeOnDocumentClick( event ) ) {
-					this.collapseAll( event );
+					this.collapseAll( event, true );
 				}
 
 				// Reset the mouseHandled flag
@@ -166,6 +151,46 @@ return $.widget( "ui.menu", {
 		} );
 	},
 
+	_activateItem: function( event ) {
+
+		// Ignore mouse events while typeahead is active, see #10458.
+		// Prevents focusing the wrong item when typeahead causes a scroll while the mouse
+		// is over an item in the menu
+		if ( this.previousFilter ) {
+			return;
+		}
+
+		// If the mouse didn't actually move, but the page was scrolled, ignore the event (#9356)
+		if ( event.clientX === this.lastMousePosition.x &&
+				event.clientY === this.lastMousePosition.y ) {
+			return;
+		}
+
+		this.lastMousePosition = {
+			x: event.clientX,
+			y: event.clientY
+		};
+
+		var actualTarget = $( event.target ).closest( ".ui-menu-item" ),
+			target = $( event.currentTarget );
+
+		// Ignore bubbled events on parent items, see #11641
+		if ( actualTarget[ 0 ] !== target[ 0 ] ) {
+			return;
+		}
+
+		// If the item is already active, there's nothing to do
+		if ( target.is( ".ui-state-active" ) ) {
+			return;
+		}
+
+		// Remove ui-state-active class from siblings of the newly focused menu item
+		// to avoid a jump caused by adjacent elements both having a class with a border
+		this._removeClass( target.siblings().children( ".ui-state-active" ),
+			null, "ui-state-active" );
+		this.focus( event, target );
+	},
+
 	_destroy: function() {
 		var items = this.element.find( ".ui-menu-item" )
 				.removeAttr( "role aria-disabled" ),
@@ -497,7 +522,7 @@ return $.widget( "ui.menu", {
 			this._removeClass( currentMenu.find( ".ui-state-active" ), null, "ui-state-active" );
 
 			this.activeMenu = currentMenu;
-		}, this.delay );
+		}, all ? 0 : this.delay );
 	},
 
 	// With no arguments, closes the currently active menu - if nothing is active
@@ -533,11 +558,7 @@ return $.widget( "ui.menu", {
 	},
 
 	expand: function( event ) {
-		var newItem = this.active &&
-			this.active
-				.children( ".ui-menu " )
-					.find( this.options.items )
-						.first();
+		var newItem = this.active && this._menuItems( this.active.children( ".ui-menu" ) ).first();
 
 		if ( newItem && newItem.length ) {
 			this._open( newItem.parent() );
@@ -565,21 +586,27 @@ return $.widget( "ui.menu", {
 		return this.active && !this.active.nextAll( ".ui-menu-item" ).length;
 	},
 
+	_menuItems: function( menu ) {
+		return ( menu || this.element )
+			.find( this.options.items )
+			.filter( ".ui-menu-item" );
+	},
+
 	_move: function( direction, filter, event ) {
 		var next;
 		if ( this.active ) {
 			if ( direction === "first" || direction === "last" ) {
 				next = this.active
 					[ direction === "first" ? "prevAll" : "nextAll" ]( ".ui-menu-item" )
-					.eq( -1 );
+					.last();
 			} else {
 				next = this.active
 					[ direction + "All" ]( ".ui-menu-item" )
-					.eq( 0 );
+					.first();
 			}
 		}
 		if ( !next || !next.length || !this.active ) {
-			next = this.activeMenu.find( this.options.items )[ filter ]();
+			next = this._menuItems( this.activeMenu )[ filter ]();
 		}
 
 		this.focus( event, next );
@@ -597,7 +624,13 @@ return $.widget( "ui.menu", {
 		}
 		if ( this._hasScroll() ) {
 			base = this.active.offset().top;
-			height = this.element.height();
+			height = this.element.innerHeight();
+
+			// jQuery 3.2 doesn't include scrollbars in innerHeight, add it back.
+			if ( $.fn.jquery.indexOf( "3.2." ) === 0 ) {
+				height += this.element[ 0 ].offsetHeight - this.element.outerHeight();
+			}
+
 			this.active.nextAll( ".ui-menu-item" ).each( function() {
 				item = $( this );
 				return item.offset().top - base - height < 0;
@@ -605,7 +638,7 @@ return $.widget( "ui.menu", {
 
 			this.focus( event, item );
 		} else {
-			this.focus( event, this.activeMenu.find( this.options.items )
+			this.focus( event, this._menuItems( this.activeMenu )
 				[ !this.active ? "first" : "last" ]() );
 		}
 	},
@@ -621,7 +654,13 @@ return $.widget( "ui.menu", {
 		}
 		if ( this._hasScroll() ) {
 			base = this.active.offset().top;
-			height = this.element.height();
+			height = this.element.innerHeight();
+
+			// jQuery 3.2 doesn't include scrollbars in innerHeight, add it back.
+			if ( $.fn.jquery.indexOf( "3.2." ) === 0 ) {
+				height += this.element[ 0 ].offsetHeight - this.element.outerHeight();
+			}
+
 			this.active.prevAll( ".ui-menu-item" ).each( function() {
 				item = $( this );
 				return item.offset().top - base + height > 0;
@@ -629,7 +668,7 @@ return $.widget( "ui.menu", {
 
 			this.focus( event, item );
 		} else {
-			this.focus( event, this.activeMenu.find( this.options.items ).first() );
+			this.focus( event, this._menuItems( this.activeMenu ).first() );
 		}
 	},
 
@@ -660,9 +699,10 @@ return $.widget( "ui.menu", {
 				.filter( ".ui-menu-item" )
 					.filter( function() {
 						return regex.test(
-							$.trim( $( this ).children( ".ui-menu-item-wrapper" ).text() ) );
+							String.prototype.trim.call(
+								$( this ).children( ".ui-menu-item-wrapper" ).text() ) );
 					} );
 	}
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/mouse.js b/src/js/_enqueues/vendor/jquery/ui/mouse.js
index 54f5e48bc4e36..425d962bed1dd 100644
--- a/src/js/_enqueues/vendor/jquery/ui/mouse.js
+++ b/src/js/_enqueues/vendor/jquery/ui/mouse.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Mouse 1.12.1
+ * jQuery UI Mouse 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -13,6 +13,8 @@
 //>>docs: http://api.jqueryui.com/mouse/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -25,7 +27,8 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 var mouseHandled = false;
 $( document ).on( "mouseup", function() {
@@ -33,7 +36,7 @@ $( document ).on( "mouseup", function() {
 } );
 
 return $.widget( "ui.mouse", {
-	version: "1.12.1",
+	version: "1.13.0-rc.2",
 	options: {
 		cancel: "input, textarea, button, select, option",
 		distance: 1,
@@ -78,7 +81,9 @@ return $.widget( "ui.mouse", {
 		this._mouseMoved = false;
 
 		// We may have missed mouseup (out of window)
-		( this._mouseStarted && this._mouseUp( event ) );
+		if ( this._mouseStarted ) {
+			this._mouseUp( event );
+		}
 
 		this._mouseDownEvent = event;
 
@@ -171,7 +176,11 @@ return $.widget( "ui.mouse", {
 		if ( this._mouseDistanceMet( event ) && this._mouseDelayMet( event ) ) {
 			this._mouseStarted =
 				( this._mouseStart( this._mouseDownEvent, event ) !== false );
-			( this._mouseStarted ? this._mouseDrag( event ) : this._mouseUp( event ) );
+			if ( this._mouseStarted ) {
+				this._mouseDrag( event );
+			} else {
+				this._mouseUp( event );
+			}
 		}
 
 		return !this._mouseStarted;
@@ -218,7 +227,9 @@ return $.widget( "ui.mouse", {
 	_mouseStart: function( /* event */ ) {},
 	_mouseDrag: function( /* event */ ) {},
 	_mouseStop: function( /* event */ ) {},
-	_mouseCapture: function( /* event */ ) { return true; }
+	_mouseCapture: function( /* event */ ) {
+		return true;
+	}
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/progressbar.js b/src/js/_enqueues/vendor/jquery/ui/progressbar.js
index ff7dd90c85eec..6c30e97df194b 100644
--- a/src/js/_enqueues/vendor/jquery/ui/progressbar.js
+++ b/src/js/_enqueues/vendor/jquery/ui/progressbar.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Progressbar 1.12.1
+ * jQuery UI Progressbar 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -9,9 +9,9 @@
 
 //>>label: Progressbar
 //>>group: Widgets
-// jscs:disable maximumLineLength
+/* eslint-disable max-len */
 //>>description: Displays a status indicator for loading state, standard percentage, and other progress indicators.
-// jscs:enable maximumLineLength
+/* eslint-enable max-len */
 //>>docs: http://api.jqueryui.com/progressbar/
 //>>demos: http://jqueryui.com/progressbar/
 //>>css.structure: ../../themes/base/core.css
@@ -19,6 +19,8 @@
 //>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -31,10 +33,11 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.widget( "ui.progressbar", {
-	version: "1.12.1",
+	version: "1.13.0-rc.2",
 	options: {
 		classes: {
 			"ui-progressbar": "ui-corner-all",
@@ -174,4 +177,4 @@ return $.widget( "ui.progressbar", {
 	}
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/resizable.js b/src/js/_enqueues/vendor/jquery/ui/resizable.js
index 62a0fc821b3bb..acbc73aafff27 100644
--- a/src/js/_enqueues/vendor/jquery/ui/resizable.js
+++ b/src/js/_enqueues/vendor/jquery/ui/resizable.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Resizable 1.12.1
+ * jQuery UI Resizable 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -17,6 +17,8 @@
 //>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -30,10 +32,11 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 $.widget( "ui.resizable", $.ui.mouse, {
-	version: "1.12.1",
+	version: "1.13.0-rc.2",
 	widgetEventPrefix: "resize",
 	options: {
 		alsoResize: false,
@@ -88,9 +91,15 @@ $.widget( "ui.resizable", $.ui.mouse, {
 		// TODO: determine which cases actually cause this to happen
 		// if the element doesn't have the scroll set, see if it's possible to
 		// set the scroll
-		el[ scroll ] = 1;
-		has = ( el[ scroll ] > 0 );
-		el[ scroll ] = 0;
+		try {
+			el[ scroll ] = 1;
+			has = ( el[ scroll ] > 0 );
+			el[ scroll ] = 0;
+		} catch ( e ) {
+
+			// `el` might be a string, then setting `scroll` will throw
+			// an error in strict mode; ignore it.
+		}
 		return has;
 	},
 
@@ -113,7 +122,8 @@ $.widget( "ui.resizable", $.ui.mouse, {
 		if ( this.element[ 0 ].nodeName.match( /^(canvas|textarea|input|select|button|img)$/i ) ) {
 
 			this.element.wrap(
-				$( "<div class='ui-wrapper' style='overflow: hidden;'></div>" ).css( {
+				$( "<div class='ui-wrapper'></div>" ).css( {
+					overflow: "hidden",
 					position: this.element.css( "position" ),
 					width: this.element.outerWidth(),
 					height: this.element.outerHeight(),
@@ -184,15 +194,14 @@ $.widget( "ui.resizable", $.ui.mouse, {
 	_destroy: function() {
 
 		this._mouseDestroy();
+		this._addedHandles.remove();
 
 		var wrapper,
 			_destroy = function( exp ) {
 				$( exp )
 					.removeData( "resizable" )
 					.removeData( "ui-resizable" )
-					.off( ".resizable" )
-					.find( ".ui-resizable-handle" )
-						.remove();
+					.off( ".resizable" );
 			};
 
 		// TODO: Unwrap at same DOM position
@@ -223,6 +232,9 @@ $.widget( "ui.resizable", $.ui.mouse, {
 			this._removeHandles();
 			this._setupHandles();
 			break;
+		case "aspectRatio":
+			this._aspectRatio = !!value;
+			break;
 		default:
 			break;
 		}
@@ -244,6 +256,7 @@ $.widget( "ui.resizable", $.ui.mouse, {
 				} );
 
 		this._handles = $();
+		this._addedHandles = $();
 		if ( this.handles.constructor === String ) {
 
 			if ( this.handles === "all" ) {
@@ -255,7 +268,7 @@ $.widget( "ui.resizable", $.ui.mouse, {
 
 			for ( i = 0; i < n.length; i++ ) {
 
-				handle = $.trim( n[ i ] );
+				handle = String.prototype.trim.call( n[ i ] );
 				hname = "ui-resizable-" + handle;
 				axis = $( "<div>" );
 				this._addClass( axis, "ui-resizable-handle " + hname );
@@ -263,7 +276,10 @@ $.widget( "ui.resizable", $.ui.mouse, {
 				axis.css( { zIndex: o.zIndex } );
 
 				this.handles[ handle ] = ".ui-resizable-" + handle;
-				this.element.append( axis );
+				if ( !this.element.children( this.handles[ handle ] ).length ) {
+					this.element.append( axis );
+					this._addedHandles = this._addedHandles.add( axis );
+				}
 			}
 
 		}
@@ -329,7 +345,7 @@ $.widget( "ui.resizable", $.ui.mouse, {
 	},
 
 	_removeHandles: function() {
-		this._handles.remove();
+		this._addedHandles.remove();
 	},
 
 	_mouseCapture: function( event ) {
@@ -709,7 +725,7 @@ $.widget( "ui.resizable", $.ui.mouse, {
 
 		if ( this._helper ) {
 
-			this.helper = this.helper || $( "<div style='overflow:hidden;'></div>" );
+			this.helper = this.helper || $( "<div></div>" ).css( { overflow: "hidden" } );
 
 			this._addClass( this.helper, this._helper );
 			this.helper.css( {
@@ -766,7 +782,9 @@ $.widget( "ui.resizable", $.ui.mouse, {
 
 	_propagate: function( n, event ) {
 		$.ui.plugin.call( this, n, [ event, this.ui() ] );
-		( n !== "resize" && this._trigger( n, event, this.ui() ) );
+		if ( n !== "resize" ) {
+			this._trigger( n, event, this.ui() );
+		}
 	},
 
 	plugins: {},
@@ -887,8 +905,8 @@ $.ui.plugin.add( "resizable", "containment", {
 			co = that.containerOffset;
 			ch = that.containerSize.height;
 			cw = that.containerSize.width;
-			width = ( that._hasScroll ( ce, "left" ) ? ce.scrollWidth : cw );
-			height = ( that._hasScroll ( ce ) ? ce.scrollHeight : ch ) ;
+			width = ( that._hasScroll( ce, "left" ) ? ce.scrollWidth : cw );
+			height = ( that._hasScroll( ce ) ? ce.scrollHeight : ch );
 
 			that.parentData = {
 				element: ce,
@@ -1195,4 +1213,4 @@ $.ui.plugin.add( "resizable", "grid", {
 
 return $.ui.resizable;
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/selectable.js b/src/js/_enqueues/vendor/jquery/ui/selectable.js
index 8c0ebce159cec..64feccea4515b 100644
--- a/src/js/_enqueues/vendor/jquery/ui/selectable.js
+++ b/src/js/_enqueues/vendor/jquery/ui/selectable.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Selectable 1.12.1
+ * jQuery UI Selectable 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -15,6 +15,8 @@
 //>>css.structure: ../../themes/base/selectable.css
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -28,10 +30,11 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.widget( "ui.selectable", $.ui.mouse, {
-	version: "1.12.1",
+	version: "1.13.0-rc.2",
 	options: {
 		appendTo: "body",
 		autoRefresh: true,
@@ -182,8 +185,12 @@ return $.widget( "ui.selectable", $.ui.mouse, {
 			x2 = event.pageX,
 			y2 = event.pageY;
 
-		if ( x1 > x2 ) { tmp = x2; x2 = x1; x1 = tmp; }
-		if ( y1 > y2 ) { tmp = y2; y2 = y1; y1 = tmp; }
+		if ( x1 > x2 ) {
+			tmp = x2; x2 = x1; x1 = tmp;
+		}
+		if ( y1 > y2 ) {
+			tmp = y2; y2 = y1; y1 = tmp;
+		}
 		this.helper.css( { left: x1, top: y1, width: x2 - x1, height: y2 - y1 } );
 
 		this.selectees.each( function() {
@@ -306,4 +313,4 @@ return $.widget( "ui.selectable", $.ui.mouse, {
 
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/selectmenu.js b/src/js/_enqueues/vendor/jquery/ui/selectmenu.js
index 0df60c949f5a8..df61b606f8a0f 100644
--- a/src/js/_enqueues/vendor/jquery/ui/selectmenu.js
+++ b/src/js/_enqueues/vendor/jquery/ui/selectmenu.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Selectmenu 1.12.1
+ * jQuery UI Selectmenu 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -9,9 +9,9 @@
 
 //>>label: Selectmenu
 //>>group: Widgets
-// jscs:disable maximumLineLength
+/* eslint-disable max-len */
 //>>description: Duplicates and extends the functionality of a native HTML select element, allowing it to be customizable in behavior and appearance far beyond the limitations of a native select.
-// jscs:enable maximumLineLength
+/* eslint-enable max-len */
 //>>docs: http://api.jqueryui.com/selectmenu/
 //>>demos: http://jqueryui.com/selectmenu/
 //>>css.structure: ../../themes/base/core.css
@@ -19,6 +19,8 @@
 //>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -32,10 +34,11 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
-	version: "1.12.1",
+	version: "1.13.0-rc.2",
 	defaultElement: "<select>",
 	options: {
 		appendTo: null,
@@ -90,7 +93,7 @@ return $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 		this.labels = this.element.labels().attr( "for", this.ids.button );
 		this._on( this.labels, {
 			click: function( event ) {
-				this.button.focus();
+				this.button.trigger( "focus" );
 				event.preventDefault();
 			}
 		} );
@@ -418,7 +421,7 @@ return $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 			}
 
 			if ( !$( event.target ).closest( ".ui-selectmenu-menu, #" +
-					$.ui.escapeSelector( this.ids.button ) ).length ) {
+				$.escapeSelector( this.ids.button ) ).length ) {
 				this.close( event );
 			}
 		}
@@ -649,6 +652,10 @@ return $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 		var that = this,
 			data = [];
 		options.each( function( index, item ) {
+			if ( item.hidden ) {
+				return;
+			}
+
 			data.push( that._parseOption( $( item ), index ) );
 		} );
 		this.items = data;
@@ -677,4 +684,4 @@ return $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 	}
 } ] );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/slider.js b/src/js/_enqueues/vendor/jquery/ui/slider.js
index bac9ad921a994..dd9a9f68b3d09 100644
--- a/src/js/_enqueues/vendor/jquery/ui/slider.js
+++ b/src/js/_enqueues/vendor/jquery/ui/slider.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Slider 1.12.1
+ * jQuery UI Slider 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -17,6 +17,8 @@
 //>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -30,10 +32,11 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.widget( "ui.slider", $.ui.mouse, {
-	version: "1.12.1",
+	version: "1.13.0-rc.2",
 	widgetEventPrefix: "slide",
 
 	options: {
@@ -130,7 +133,7 @@ return $.widget( "ui.slider", $.ui.mouse, {
 					options.values = [ this._valueMin(), this._valueMin() ];
 				} else if ( options.values.length && options.values.length !== 2 ) {
 					options.values = [ options.values[ 0 ], options.values[ 0 ] ];
-				} else if ( $.isArray( options.values ) ) {
+				} else if ( Array.isArray( options.values ) ) {
 					options.values = options.values.slice( 0 );
 				}
 			}
@@ -393,7 +396,7 @@ return $.widget( "ui.slider", $.ui.mouse, {
 		}
 
 		if ( arguments.length ) {
-			if ( $.isArray( arguments[ 0 ] ) ) {
+			if ( Array.isArray( arguments[ 0 ] ) ) {
 				vals = this.options.values;
 				newValues = arguments[ 0 ];
 				for ( i = 0; i < vals.length; i += 1 ) {
@@ -427,7 +430,7 @@ return $.widget( "ui.slider", $.ui.mouse, {
 			}
 		}
 
-		if ( $.isArray( this.options.values ) ) {
+		if ( Array.isArray( this.options.values ) ) {
 			valsLength = this.options.values.length;
 		}
 
@@ -747,4 +750,4 @@ return $.widget( "ui.slider", $.ui.mouse, {
 	}
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/sortable.js b/src/js/_enqueues/vendor/jquery/ui/sortable.js
index 0f5e4c0b817ec..9ccce7305118f 100644
--- a/src/js/_enqueues/vendor/jquery/ui/sortable.js
+++ b/src/js/_enqueues/vendor/jquery/ui/sortable.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Sortable 1.12.1
+ * jQuery UI Sortable 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -15,6 +15,8 @@
 //>>css.structure: ../../themes/base/sortable.css
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -28,10 +30,11 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.widget( "ui.sortable", $.ui.mouse, {
-	version: "1.12.1",
+	version: "1.13.0-rc.2",
 	widgetEventPrefix: "sort",
 	ready: false,
 	options: {
@@ -191,6 +194,11 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 		// mouseCapture
 		this.refreshPositions();
 
+		//Prepare the dragged items parent
+		this.appendTo = $( o.appendTo !== "parent" ?
+				o.appendTo :
+				this.currentItem.parent() );
+
 		//Create and append the visible helper
 		this.helper = this._createHelper( event );
 
@@ -205,9 +213,6 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 		//Cache the margins of the original element
 		this._cacheMargins();
 
-		//Get the next scrolling parent
-		this.scrollParent = this.helper.scrollParent();
-
 		//The element's absolute position on the page minus margins
 		this.offset = this.currentItem.offset();
 		this.offset = {
@@ -220,25 +225,22 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 				left: event.pageX - this.offset.left,
 				top: event.pageY - this.offset.top
 			},
-			parent: this._getParentOffset(),
 
 			// This is a relative to absolute position minus the actual position calculation -
 			// only used for relative positioned helper
 			relative: this._getRelativeOffset()
 		} );
 
-		// Only after we got the offset, we can change the helper's position to absolute
+		// After we get the helper offset, but before we get the parent offset we can
+		// change the helper's position to absolute
 		// TODO: Still need to figure out a way to make relative sorting possible
 		this.helper.css( "position", "absolute" );
 		this.cssPosition = this.helper.css( "position" );
 
-		//Generate the original position
-		this.originalPosition = this._generatePosition( event );
-		this.originalPageX = event.pageX;
-		this.originalPageY = event.pageY;
-
 		//Adjust the mouse offset relative to the helper if "cursorAt" is supplied
-		( o.cursorAt && this._adjustOffsetFromHelper( o.cursorAt ) );
+		if ( o.cursorAt ) {
+			this._adjustOffsetFromHelper( o.cursorAt );
+		}
 
 		//Cache the former DOM position
 		this.domPosition = {
@@ -255,6 +257,13 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 		//Create the placeholder
 		this._createPlaceholder();
 
+		//Get the next scrolling parent
+		this.scrollParent = this.placeholder.scrollParent();
+
+		$.extend( this.offset, {
+			parent: this._getParentOffset()
+		} );
+
 		//Set a containment if given in the options
 		if ( o.containment ) {
 			this._setContainment();
@@ -271,13 +280,9 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 				$( "<style>*{ cursor: " + o.cursor + " !important; }</style>" ).appendTo( body );
 		}
 
-		if ( o.opacity ) { // opacity option
-			if ( this.helper.css( "opacity" ) ) {
-				this._storedOpacity = this.helper.css( "opacity" );
-			}
-			this.helper.css( "opacity", o.opacity );
-		}
-
+		// We need to make sure to grab the zIndex before setting the
+		// opacity, because setting the opacity to anything lower than 1
+		// causes the zIndex to change from "auto" to 0.
 		if ( o.zIndex ) { // zIndex option
 			if ( this.helper.css( "zIndex" ) ) {
 				this._storedZIndex = this.helper.css( "zIndex" );
@@ -285,6 +290,13 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 			this.helper.css( "zIndex", o.zIndex );
 		}
 
+		if ( o.opacity ) { // opacity option
+			if ( this.helper.css( "opacity" ) ) {
+				this._storedOpacity = this.helper.css( "opacity" );
+			}
+			this.helper.css( "opacity", o.opacity );
+		}
+
 		//Prepare scrolling
 		if ( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
 				this.scrollParent[ 0 ].tagName !== "HTML" ) {
@@ -319,77 +331,82 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 
 		this._addClass( this.helper, "ui-sortable-helper" );
 
-		// Execute the drag once - this causes the helper not to be visiblebefore getting its
-		// correct position
-		this._mouseDrag( event );
-		return true;
+		//Move the helper, if needed
+		if ( !this.helper.parent().is( this.appendTo ) ) {
+			this.helper.detach().appendTo( this.appendTo );
 
-	},
+			//Update position
+			this.offset.parent = this._getParentOffset();
+		}
 
-	_mouseDrag: function( event ) {
-		var i, item, itemElement, intersection,
-			o = this.options,
-			scrolled = false;
+		//Generate the original position
+		this.position = this.originalPosition = this._generatePosition( event );
+		this.originalPageX = event.pageX;
+		this.originalPageY = event.pageY;
+		this.lastPositionAbs = this.positionAbs = this._convertPositionTo( "absolute" );
 
-		//Compute the helpers position
-		this.position = this._generatePosition( event );
-		this.positionAbs = this._convertPositionTo( "absolute" );
+		this._mouseDrag( event );
 
-		if ( !this.lastPositionAbs ) {
-			this.lastPositionAbs = this.positionAbs;
-		}
+		return true;
 
-		//Do scrolling
-		if ( this.options.scroll ) {
-			if ( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
-					this.scrollParent[ 0 ].tagName !== "HTML" ) {
+	},
 
-				if ( ( this.overflowOffset.top + this.scrollParent[ 0 ].offsetHeight ) -
-						event.pageY < o.scrollSensitivity ) {
-					this.scrollParent[ 0 ].scrollTop =
-						scrolled = this.scrollParent[ 0 ].scrollTop + o.scrollSpeed;
-				} else if ( event.pageY - this.overflowOffset.top < o.scrollSensitivity ) {
-					this.scrollParent[ 0 ].scrollTop =
-						scrolled = this.scrollParent[ 0 ].scrollTop - o.scrollSpeed;
-				}
+	_scroll: function( event ) {
+		var o = this.options,
+			scrolled = false;
 
-				if ( ( this.overflowOffset.left + this.scrollParent[ 0 ].offsetWidth ) -
-						event.pageX < o.scrollSensitivity ) {
-					this.scrollParent[ 0 ].scrollLeft = scrolled =
-						this.scrollParent[ 0 ].scrollLeft + o.scrollSpeed;
-				} else if ( event.pageX - this.overflowOffset.left < o.scrollSensitivity ) {
-					this.scrollParent[ 0 ].scrollLeft = scrolled =
-						this.scrollParent[ 0 ].scrollLeft - o.scrollSpeed;
-				}
+		if ( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+				this.scrollParent[ 0 ].tagName !== "HTML" ) {
 
-			} else {
+			if ( ( this.overflowOffset.top + this.scrollParent[ 0 ].offsetHeight ) -
+					event.pageY < o.scrollSensitivity ) {
+				this.scrollParent[ 0 ].scrollTop =
+					scrolled = this.scrollParent[ 0 ].scrollTop + o.scrollSpeed;
+			} else if ( event.pageY - this.overflowOffset.top < o.scrollSensitivity ) {
+				this.scrollParent[ 0 ].scrollTop =
+					scrolled = this.scrollParent[ 0 ].scrollTop - o.scrollSpeed;
+			}
 
-				if ( event.pageY - this.document.scrollTop() < o.scrollSensitivity ) {
-					scrolled = this.document.scrollTop( this.document.scrollTop() - o.scrollSpeed );
-				} else if ( this.window.height() - ( event.pageY - this.document.scrollTop() ) <
-						o.scrollSensitivity ) {
-					scrolled = this.document.scrollTop( this.document.scrollTop() + o.scrollSpeed );
-				}
+			if ( ( this.overflowOffset.left + this.scrollParent[ 0 ].offsetWidth ) -
+					event.pageX < o.scrollSensitivity ) {
+				this.scrollParent[ 0 ].scrollLeft = scrolled =
+					this.scrollParent[ 0 ].scrollLeft + o.scrollSpeed;
+			} else if ( event.pageX - this.overflowOffset.left < o.scrollSensitivity ) {
+				this.scrollParent[ 0 ].scrollLeft = scrolled =
+					this.scrollParent[ 0 ].scrollLeft - o.scrollSpeed;
+			}
 
-				if ( event.pageX - this.document.scrollLeft() < o.scrollSensitivity ) {
-					scrolled = this.document.scrollLeft(
-						this.document.scrollLeft() - o.scrollSpeed
-					);
-				} else if ( this.window.width() - ( event.pageX - this.document.scrollLeft() ) <
-						o.scrollSensitivity ) {
-					scrolled = this.document.scrollLeft(
-						this.document.scrollLeft() + o.scrollSpeed
-					);
-				}
+		} else {
 
+			if ( event.pageY - this.document.scrollTop() < o.scrollSensitivity ) {
+				scrolled = this.document.scrollTop( this.document.scrollTop() - o.scrollSpeed );
+			} else if ( this.window.height() - ( event.pageY - this.document.scrollTop() ) <
+					o.scrollSensitivity ) {
+				scrolled = this.document.scrollTop( this.document.scrollTop() + o.scrollSpeed );
 			}
 
-			if ( scrolled !== false && $.ui.ddmanager && !o.dropBehaviour ) {
-				$.ui.ddmanager.prepareOffsets( this, event );
+			if ( event.pageX - this.document.scrollLeft() < o.scrollSensitivity ) {
+				scrolled = this.document.scrollLeft(
+					this.document.scrollLeft() - o.scrollSpeed
+				);
+			} else if ( this.window.width() - ( event.pageX - this.document.scrollLeft() ) <
+					o.scrollSensitivity ) {
+				scrolled = this.document.scrollLeft(
+					this.document.scrollLeft() + o.scrollSpeed
+				);
 			}
+
 		}
 
-		//Regenerate the absolute position used for position checks
+		return scrolled;
+	},
+
+	_mouseDrag: function( event ) {
+		var i, item, itemElement, intersection,
+			o = this.options;
+
+		//Compute the helpers position
+		this.position = this._generatePosition( event );
 		this.positionAbs = this._convertPositionTo( "absolute" );
 
 		//Set the helper position
@@ -400,56 +417,79 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 			this.helper[ 0 ].style.top = this.position.top + "px";
 		}
 
-		//Rearrange
-		for ( i = this.items.length - 1; i >= 0; i-- ) {
+		//Post events to containers
+		this._contactContainers( event );
 
-			//Cache variables and intersection, continue if no intersection
-			item = this.items[ i ];
-			itemElement = item.item[ 0 ];
-			intersection = this._intersectsWithPointer( item );
-			if ( !intersection ) {
-				continue;
-			}
+		if ( this.innermostContainer !== null ) {
 
-			// Only put the placeholder inside the current Container, skip all
-			// items from other containers. This works because when moving
-			// an item from one container to another the
-			// currentContainer is switched before the placeholder is moved.
-			//
-			// Without this, moving items in "sub-sortables" can cause
-			// the placeholder to jitter between the outer and inner container.
-			if ( item.instance !== this.currentContainer ) {
-				continue;
+			//Do scrolling
+			if ( o.scroll ) {
+				if ( this._scroll( event ) !== false ) {
+
+					//Update item positions used in position checks
+					this._refreshItemPositions( true );
+
+					if ( $.ui.ddmanager && !o.dropBehaviour ) {
+						$.ui.ddmanager.prepareOffsets( this, event );
+					}
+				}
 			}
 
-			// Cannot intersect with itself
-			// no useless actions that have been done before
-			// no action if the item moved is the parent of the item checked
-			if ( itemElement !== this.currentItem[ 0 ] &&
-				this.placeholder[ intersection === 1 ? "next" : "prev" ]()[ 0 ] !== itemElement &&
-				!$.contains( this.placeholder[ 0 ], itemElement ) &&
-				( this.options.type === "semi-dynamic" ?
-					!$.contains( this.element[ 0 ], itemElement ) :
-					true
-				)
-			) {
-
-				this.direction = intersection === 1 ? "down" : "up";
-
-				if ( this.options.tolerance === "pointer" || this._intersectsWithSides( item ) ) {
-					this._rearrange( event, item );
-				} else {
-					break;
+			this.dragDirection = {
+				vertical: this._getDragVerticalDirection(),
+				horizontal: this._getDragHorizontalDirection()
+			};
+
+			//Rearrange
+			for ( i = this.items.length - 1; i >= 0; i-- ) {
+
+				//Cache variables and intersection, continue if no intersection
+				item = this.items[ i ];
+				itemElement = item.item[ 0 ];
+				intersection = this._intersectsWithPointer( item );
+				if ( !intersection ) {
+					continue;
 				}
 
-				this._trigger( "change", event, this._uiHash() );
-				break;
+				// Only put the placeholder inside the current Container, skip all
+				// items from other containers. This works because when moving
+				// an item from one container to another the
+				// currentContainer is switched before the placeholder is moved.
+				//
+				// Without this, moving items in "sub-sortables" can cause
+				// the placeholder to jitter between the outer and inner container.
+				if ( item.instance !== this.currentContainer ) {
+					continue;
+				}
+
+				// Cannot intersect with itself
+				// no useless actions that have been done before
+				// no action if the item moved is the parent of the item checked
+				if ( itemElement !== this.currentItem[ 0 ] &&
+					this.placeholder[ intersection === 1 ?
+					"next" : "prev" ]()[ 0 ] !== itemElement &&
+					!$.contains( this.placeholder[ 0 ], itemElement ) &&
+					( this.options.type === "semi-dynamic" ?
+						!$.contains( this.element[ 0 ], itemElement ) :
+						true
+					)
+				) {
+
+					this.direction = intersection === 1 ? "down" : "up";
+
+					if ( this.options.tolerance === "pointer" ||
+							this._intersectsWithSides( item ) ) {
+						this._rearrange( event, item );
+					} else {
+						break;
+					}
+
+					this._trigger( "change", event, this._uiHash() );
+					break;
+				}
 			}
 		}
 
-		//Post events to containers
-		this._contactContainers( event );
-
 		//Interconnect with droppables
 		if ( $.ui.ddmanager ) {
 			$.ui.ddmanager.drag( this, event );
@@ -652,12 +692,12 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 			return false;
 		}
 
-		verticalDirection = this._getDragVerticalDirection();
-		horizontalDirection = this._getDragHorizontalDirection();
+		verticalDirection = this.dragDirection.vertical;
+		horizontalDirection = this.dragDirection.horizontal;
 
 		return this.floating ?
-			( ( horizontalDirection === "right" || verticalDirection === "down" ) ? 2 : 1 )
-			: ( verticalDirection && ( verticalDirection === "down" ? 2 : 1 ) );
+			( ( horizontalDirection === "right" || verticalDirection === "down" ) ? 2 : 1 ) :
+			( verticalDirection && ( verticalDirection === "down" ? 2 : 1 ) );
 
 	},
 
@@ -667,8 +707,8 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 				this.offset.click.top, item.top + ( item.height / 2 ), item.height ),
 			isOverRightHalf = this._isOverAxis( this.positionAbs.left +
 				this.offset.click.left, item.left + ( item.width / 2 ), item.width ),
-			verticalDirection = this._getDragVerticalDirection(),
-			horizontalDirection = this._getDragHorizontalDirection();
+			verticalDirection = this.dragDirection.vertical,
+			horizontalDirection = this.dragDirection.horizontal;
 
 		if ( this.floating && horizontalDirection ) {
 			return ( ( horizontalDirection === "right" && isOverRightHalf ) ||
@@ -717,7 +757,7 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 				for ( j = cur.length - 1; j >= 0; j-- ) {
 					inst = $.data( cur[ j ], this.widgetFullName );
 					if ( inst && inst !== this && !inst.options.disabled ) {
-						queries.push( [ $.isFunction( inst.options.items ) ?
+						queries.push( [ typeof inst.options.items === "function" ?
 							inst.options.items.call( inst.element ) :
 							$( inst.options.items, inst.element )
 								.not( ".ui-sortable-helper" )
@@ -727,7 +767,7 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 			}
 		}
 
-		queries.push( [ $.isFunction( this.options.items ) ?
+		queries.push( [ typeof this.options.items === "function" ?
 			this.options.items
 				.call( this.element, null, { options: this.options, item: this.currentItem } ) :
 			$( this.options.items, this.element )
@@ -767,7 +807,7 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 
 		var i, j, cur, inst, targetData, _queries, item, queriesLength,
 			items = this.items,
-			queries = [ [ $.isFunction( this.options.items ) ?
+			queries = [ [ typeof this.options.items === "function" ?
 				this.options.items.call( this.element[ 0 ], event, { item: this.currentItem } ) :
 				$( this.options.items, this.element ), this ] ],
 			connectWith = this._connectWith();
@@ -779,7 +819,7 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 				for ( j = cur.length - 1; j >= 0; j-- ) {
 					inst = $.data( cur[ j ], this.widgetFullName );
 					if ( inst && inst !== this && !inst.options.disabled ) {
-						queries.push( [ $.isFunction( inst.options.items ) ?
+						queries.push( [ typeof inst.options.items === "function" ?
 							inst.options.items
 								.call( inst.element[ 0 ], event, { item: this.currentItem } ) :
 							$( inst.options.items, inst.element ), inst ] );
@@ -810,26 +850,14 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 
 	},
 
-	refreshPositions: function( fast ) {
-
-		// Determine whether items are being displayed horizontally
-		this.floating = this.items.length ?
-			this.options.axis === "x" || this._isFloating( this.items[ 0 ].item ) :
-			false;
-
-		//This has to be redone because due to the item being moved out/into the offsetParent,
-		// the offsetParent's position will change
-		if ( this.offsetParent && this.helper ) {
-			this.offset.parent = this._getParentOffset();
-		}
-
+	_refreshItemPositions: function( fast ) {
 		var i, item, t, p;
 
 		for ( i = this.items.length - 1; i >= 0; i-- ) {
 			item = this.items[ i ];
 
 			//We ignore calculating positions of all connected containers when we're not over them
-			if ( item.instance !== this.currentContainer && this.currentContainer &&
+			if ( this.currentContainer && item.instance !== this.currentContainer &&
 					item.item[ 0 ] !== this.currentItem[ 0 ] ) {
 				continue;
 			}
@@ -847,6 +875,20 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 			item.left = p.left;
 			item.top = p.top;
 		}
+	},
+
+	refreshPositions: function( fast ) {
+
+		// Determine whether items are being displayed horizontally
+		this.floating = this.items.length ?
+			this.options.axis === "x" || this._isFloating( this.items[ 0 ].item ) :
+			false;
+
+		if ( this.innermostContainer !== null ) {
+			this._refreshItemPositions( fast );
+		}
+
+		var i, p;
 
 		if ( this.options.custom && this.options.custom.refreshContainers ) {
 			this.options.custom.refreshContainers.call( this );
@@ -867,20 +909,20 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 
 	_createPlaceholder: function( that ) {
 		that = that || this;
-		var className,
+		var className, nodeName,
 			o = that.options;
 
 		if ( !o.placeholder || o.placeholder.constructor === String ) {
 			className = o.placeholder;
+			nodeName = that.currentItem[ 0 ].nodeName.toLowerCase();
 			o.placeholder = {
 				element: function() {
 
-					var nodeName = that.currentItem[ 0 ].nodeName.toLowerCase(),
-						element = $( "<" + nodeName + ">", that.document[ 0 ] );
+					var element = $( "<" + nodeName + ">", that.document[ 0 ] );
 
-						that._addClass( element, "ui-sortable-placeholder",
-								className || that.currentItem[ 0 ].className )
-							._removeClass( element, "ui-sortable-helper" );
+					that._addClass( element, "ui-sortable-placeholder",
+							className || that.currentItem[ 0 ].className )
+						._removeClass( element, "ui-sortable-helper" );
 
 					if ( nodeName === "tbody" ) {
 						that._createTrPlaceholder(
@@ -909,9 +951,15 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 						return;
 					}
 
-					//If the element doesn't have a actual height by itself (without styles coming
-					// from a stylesheet), it receives the inline height from the dragged item
-					if ( !p.height() ) {
+					// If the element doesn't have a actual height or width by itself (without
+					// styles coming from a stylesheet), it receives the inline height and width
+					// from the dragged item. Or, if it's a tbody or tr, it's going to have a height
+					// anyway since we're populating them with <td>s above, but they're unlikely to
+					// be the correct height on their own if the row heights are dynamic, so we'll
+					// always assign the height of the dragged item given forcePlaceholderSize
+					// is true.
+					if ( !p.height() || ( o.forcePlaceholderSize &&
+							( nodeName === "tbody" || nodeName === "tr" ) ) ) {
 						p.height(
 							that.currentItem.innerHeight() -
 							parseInt( that.currentItem.css( "paddingTop" ) || 0, 10 ) -
@@ -986,6 +1034,8 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 
 		}
 
+		this.innermostContainer = innermostContainer;
+
 		// If no intersecting containers found, return
 		if ( !innermostContainer ) {
 			return;
@@ -1044,9 +1094,11 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 				return;
 			}
 
-			itemWithLeastDistance ?
-				this._rearrange( event, itemWithLeastDistance, null, true ) :
+			if ( itemWithLeastDistance ) {
+				this._rearrange( event, itemWithLeastDistance, null, true );
+			} else {
 				this._rearrange( event, null, this.containers[ innermostIndex ].element, true );
+			}
 			this._trigger( "change", event, this._uiHash() );
 			this.containers[ innermostIndex ]._trigger( "change", event, this._uiHash( this ) );
 			this.currentContainer = this.containers[ innermostIndex ];
@@ -1054,6 +1106,15 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 			//Update the placeholder
 			this.options.placeholder.update( this.currentContainer, this.placeholder );
 
+			//Update scrollParent
+			this.scrollParent = this.placeholder.scrollParent();
+
+			//Update overflowOffset
+			if ( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+					this.scrollParent[ 0 ].tagName !== "HTML" ) {
+				this.overflowOffset = this.scrollParent.offset();
+			}
+
 			this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash( this ) );
 			this.containers[ innermostIndex ].containerCache.over = 1;
 		}
@@ -1063,15 +1124,13 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 	_createHelper: function( event ) {
 
 		var o = this.options,
-			helper = $.isFunction( o.helper ) ?
+			helper = typeof o.helper === "function" ?
 				$( o.helper.apply( this.element[ 0 ], [ event, this.currentItem ] ) ) :
 				( o.helper === "clone" ? this.currentItem.clone() : this.currentItem );
 
 		//Add the helper to the DOM if that didn't happen already
 		if ( !helper.parents( "body" ).length ) {
-			$( o.appendTo !== "parent" ?
-				o.appendTo :
-				this.currentItem[ 0 ].parentNode )[ 0 ].appendChild( helper[ 0 ] );
+			this.appendTo[ 0 ].appendChild( helper[ 0 ] );
 		}
 
 		if ( helper[ 0 ] === this.currentItem[ 0 ] ) {
@@ -1099,7 +1158,7 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 		if ( typeof obj === "string" ) {
 			obj = obj.split( " " );
 		}
-		if ( $.isArray( obj ) ) {
+		if ( Array.isArray( obj ) ) {
 			obj = { left: +obj[ 0 ], top: +obj[ 1 ] || 0 };
 		}
 		if ( "left" in obj ) {
@@ -1379,9 +1438,12 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 
 	_rearrange: function( event, i, a, hardRefresh ) {
 
-		a ? a[ 0 ].appendChild( this.placeholder[ 0 ] ) :
+		if ( a ) {
+			a[ 0 ].appendChild( this.placeholder[ 0 ] );
+		} else {
 			i.item[ 0 ].parentNode.insertBefore( this.placeholder[ 0 ],
 				( this.direction === "down" ? i.item[ 0 ] : i.item[ 0 ].nextSibling ) );
+		}
 
 		//Various things done here to improve the performance:
 		// 1. we create a setTimeout, that calls refreshPositions
@@ -1547,4 +1609,4 @@ return $.widget( "ui.sortable", $.ui.mouse, {
 
 } );
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/spinner.js b/src/js/_enqueues/vendor/jquery/ui/spinner.js
index d89db59474cd8..de065a4cee510 100644
--- a/src/js/_enqueues/vendor/jquery/ui/spinner.js
+++ b/src/js/_enqueues/vendor/jquery/ui/spinner.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Spinner 1.12.1
+ * jQuery UI Spinner 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -17,6 +17,8 @@
 //>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -30,9 +32,10 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
-function spinnerModifer( fn ) {
+function spinnerModifier( fn ) {
 	return function() {
 		var previous = this.element.val();
 		fn.apply( this, arguments );
@@ -44,7 +47,7 @@ function spinnerModifer( fn ) {
 }
 
 $.widget( "ui.spinner", {
-	version: "1.12.1",
+	version: "1.13.0-rc.2",
 	defaultElement: "<input>",
 	widgetEventPrefix: "spin",
 	options: {
@@ -137,9 +140,13 @@ $.widget( "ui.spinner", {
 			}
 		},
 		mousewheel: function( event, delta ) {
-			if ( !delta ) {
+			var activeElement = $.ui.safeActiveElement( this.document[ 0 ] );
+			var isActive = this.element[ 0 ] === activeElement;
+
+			if ( !isActive || !delta ) {
 				return;
 			}
+
 			if ( !this.spinning && !this._start( event ) ) {
 				return false;
 			}
@@ -337,7 +344,7 @@ $.widget( "ui.spinner", {
 		var incremental = this.options.incremental;
 
 		if ( incremental ) {
-			return $.isFunction( incremental ) ?
+			return typeof incremental === "function" ?
 				incremental( i ) :
 				Math.floor( i * i * i / 50000 - i * i / 500 + 17 * i / 200 + 1 );
 		}
@@ -435,7 +442,7 @@ $.widget( "ui.spinner", {
 		this.buttons.button( value ? "disable" : "enable" );
 	},
 
-	_setOptions: spinnerModifer( function( options ) {
+	_setOptions: spinnerModifier( function( options ) {
 		this._super( options );
 	} ),
 
@@ -502,7 +509,7 @@ $.widget( "ui.spinner", {
 		this.uiSpinner.replaceWith( this.element );
 	},
 
-	stepUp: spinnerModifer( function( steps ) {
+	stepUp: spinnerModifier( function( steps ) {
 		this._stepUp( steps );
 	} ),
 	_stepUp: function( steps ) {
@@ -512,7 +519,7 @@ $.widget( "ui.spinner", {
 		}
 	},
 
-	stepDown: spinnerModifer( function( steps ) {
+	stepDown: spinnerModifier( function( steps ) {
 		this._stepDown( steps );
 	} ),
 	_stepDown: function( steps ) {
@@ -522,11 +529,11 @@ $.widget( "ui.spinner", {
 		}
 	},
 
-	pageUp: spinnerModifer( function( pages ) {
+	pageUp: spinnerModifier( function( pages ) {
 		this._stepUp( ( pages || 1 ) * this.options.page );
 	} ),
 
-	pageDown: spinnerModifer( function( pages ) {
+	pageDown: spinnerModifier( function( pages ) {
 		this._stepDown( ( pages || 1 ) * this.options.page );
 	} ),
 
@@ -534,7 +541,7 @@ $.widget( "ui.spinner", {
 		if ( !arguments.length ) {
 			return this._parse( this.element.val() );
 		}
-		spinnerModifer( this._value ).call( this, newVal );
+		spinnerModifier( this._value ).call( this, newVal );
 	},
 
 	widget: function() {
@@ -569,4 +576,4 @@ if ( $.uiBackCompat !== false ) {
 
 return $.ui.spinner;
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/tabs.js b/src/js/_enqueues/vendor/jquery/ui/tabs.js
index a896a51823af5..b5405c221e748 100644
--- a/src/js/_enqueues/vendor/jquery/ui/tabs.js
+++ b/src/js/_enqueues/vendor/jquery/ui/tabs.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Tabs 1.12.1
+ * jQuery UI Tabs 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -17,6 +17,8 @@
 //>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -29,10 +31,11 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 $.widget( "ui.tabs", {
-	version: "1.12.1",
+	version: "1.13.0-rc.2",
 	delay: 300,
 	options: {
 		active: null,
@@ -90,8 +93,8 @@ $.widget( "ui.tabs", {
 
 		// Take disabling tabs via class attribute from HTML
 		// into account and update option properly.
-		if ( $.isArray( options.disabled ) ) {
-			options.disabled = $.unique( options.disabled.concat(
+		if ( Array.isArray( options.disabled ) ) {
+			options.disabled = $.uniqueSort( options.disabled.concat(
 				$.map( this.tabs.filter( ".ui-state-disabled" ), function( li ) {
 					return that.tabs.index( li );
 				} )
@@ -426,7 +429,6 @@ $.widget( "ui.tabs", {
 			return $( "a", this )[ 0 ];
 		} )
 			.attr( {
-				role: "presentation",
 				tabIndex: -1
 			} );
 		this._addClass( this.anchors, "ui-tabs-anchor" );
@@ -498,7 +500,7 @@ $.widget( "ui.tabs", {
 	_setOptionDisabled: function( disabled ) {
 		var currentItem, li, i;
 
-		if ( $.isArray( disabled ) ) {
+		if ( Array.isArray( disabled ) ) {
 			if ( !disabled.length ) {
 				disabled = false;
 			} else if ( disabled.length === this.anchors.length ) {
@@ -729,7 +731,7 @@ $.widget( "ui.tabs", {
 		// meta-function to give users option to provide a href string instead of a numerical index.
 		if ( typeof index === "string" ) {
 			index = this.anchors.index( this.anchors.filter( "[href$='" +
-				$.ui.escapeSelector( index ) + "']" ) );
+				$.escapeSelector( index ) + "']" ) );
 		}
 
 		return index;
@@ -786,7 +788,7 @@ $.widget( "ui.tabs", {
 			disabled = false;
 		} else {
 			index = this._getIndex( index );
-			if ( $.isArray( disabled ) ) {
+			if ( Array.isArray( disabled ) ) {
 				disabled = $.map( disabled, function( num ) {
 					return num !== index ? num : null;
 				} );
@@ -812,7 +814,7 @@ $.widget( "ui.tabs", {
 			if ( $.inArray( index, disabled ) !== -1 ) {
 				return;
 			}
-			if ( $.isArray( disabled ) ) {
+			if ( Array.isArray( disabled ) ) {
 				disabled = $.merge( [ index ], disabled ).sort();
 			} else {
 				disabled = [ index ];
@@ -916,4 +918,4 @@ if ( $.uiBackCompat !== false ) {
 
 return $.ui.tabs;
 
-} ) );
+} );
diff --git a/src/js/_enqueues/vendor/jquery/ui/tooltip.js b/src/js/_enqueues/vendor/jquery/ui/tooltip.js
index b59471c295a1c..1e34fdc268ddc 100644
--- a/src/js/_enqueues/vendor/jquery/ui/tooltip.js
+++ b/src/js/_enqueues/vendor/jquery/ui/tooltip.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Tooltip 1.12.1
+ * jQuery UI Tooltip 1.13.0-rc.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -17,6 +17,8 @@
 //>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -29,19 +31,17 @@
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 $.widget( "ui.tooltip", {
-	version: "1.12.1",
+	version: "1.13.0-rc.2",
 	options: {
 		classes: {
 			"ui-tooltip": "ui-corner-all ui-widget-shadow"
 		},
 		content: function() {
-
-			// support: IE<9, Opera in jQuery <1.7
-			// .text() can't accept undefined, so coerce to a string
-			var title = $( this ).attr( "title" ) || "";
+			var title = $( this ).attr( "title" );
 
 			// Escape title, since we're going from an attribute to raw HTML
 			return $( "<a>" ).text( title ).html();
@@ -68,7 +68,7 @@ $.widget( "ui.tooltip", {
 		describedby.push( id );
 		elem
 			.data( "ui-tooltip-id", id )
-			.attr( "aria-describedby", $.trim( describedby.join( " " ) ) );
+			.attr( "aria-describedby", String.prototype.trim.call( describedby.join( " " ) ) );
 	},
 
 	_removeDescribedBy: function( elem ) {
@@ -81,7 +81,7 @@ $.widget( "ui.tooltip", {
 		}
 
 		elem.removeData( "ui-tooltip-id" );
-		describedby = $.trim( describedby.join( " " ) );
+		describedby = String.prototype.trim.call( describedby.join( " " ) );
 		if ( describedby ) {
 			elem.attr( "aria-describedby", describedby );
 		} else {
@@ -327,7 +327,7 @@ $.widget( "ui.tooltip", {
 					position( positionOption.of );
 					clearInterval( delayedShow );
 				}
-			}, $.fx.interval );
+			}, 13 );
 		}
 
 		this._trigger( "open", event, { tooltip: tooltip } );
@@ -448,6 +448,10 @@ $.widget( "ui.tooltip", {
 	},
 
 	_removeTooltip: function( tooltip ) {
+
+		// Clear the interval for delayed tracking tooltips
+		clearInterval( this.delayedShow );
+
 		tooltip.remove();
 		delete this.tooltips[ tooltip.attr( "id" ) ];
 	},
@@ -513,4 +517,4 @@ if ( $.uiBackCompat !== false ) {
 
 return $.ui.tooltip;
 
-} ) );
+} );
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index 1bd8b12da212a..9e0d5cb721973 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -756,55 +756,55 @@ function wp_default_scripts( $scripts ) {
 	// In order to keep backwards compatibility, and to keep the optimized loading,
 	// the source files were flattened and included with some modifications for AMD loading.
 	// A notable change is that 'jquery-ui-core' now contains 'jquery-ui-position' and 'jquery-ui-widget'.
-	$scripts->add( 'jquery-ui-core', "/wp-includes/js/jquery/ui/core$suffix.js", array( 'jquery' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-effects-core', "/wp-includes/js/jquery/ui/effect$suffix.js", array( 'jquery' ), '1.12.1', 1 );
-
-	$scripts->add( 'jquery-effects-blind', "/wp-includes/js/jquery/ui/effect-blind$suffix.js", array( 'jquery-effects-core' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-effects-bounce', "/wp-includes/js/jquery/ui/effect-bounce$suffix.js", array( 'jquery-effects-core' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-effects-clip', "/wp-includes/js/jquery/ui/effect-clip$suffix.js", array( 'jquery-effects-core' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-effects-drop', "/wp-includes/js/jquery/ui/effect-drop$suffix.js", array( 'jquery-effects-core' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-effects-explode', "/wp-includes/js/jquery/ui/effect-explode$suffix.js", array( 'jquery-effects-core' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-effects-fade', "/wp-includes/js/jquery/ui/effect-fade$suffix.js", array( 'jquery-effects-core' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-effects-fold', "/wp-includes/js/jquery/ui/effect-fold$suffix.js", array( 'jquery-effects-core' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-effects-highlight', "/wp-includes/js/jquery/ui/effect-highlight$suffix.js", array( 'jquery-effects-core' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-effects-puff', "/wp-includes/js/jquery/ui/effect-puff$suffix.js", array( 'jquery-effects-core', 'jquery-effects-scale' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-effects-pulsate', "/wp-includes/js/jquery/ui/effect-pulsate$suffix.js", array( 'jquery-effects-core' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-effects-scale', "/wp-includes/js/jquery/ui/effect-scale$suffix.js", array( 'jquery-effects-core', 'jquery-effects-size' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-effects-shake', "/wp-includes/js/jquery/ui/effect-shake$suffix.js", array( 'jquery-effects-core' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-effects-size', "/wp-includes/js/jquery/ui/effect-size$suffix.js", array( 'jquery-effects-core' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-effects-slide', "/wp-includes/js/jquery/ui/effect-slide$suffix.js", array( 'jquery-effects-core' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-effects-transfer', "/wp-includes/js/jquery/ui/effect-transfer$suffix.js", array( 'jquery-effects-core' ), '1.12.1', 1 );
+	$scripts->add( 'jquery-ui-core', "/wp-includes/js/jquery/ui/core$suffix.js", array( 'jquery' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-effects-core', "/wp-includes/js/jquery/ui/effect$suffix.js", array( 'jquery' ), '1.13.0-rc.2', 1 );
+
+	$scripts->add( 'jquery-effects-blind', "/wp-includes/js/jquery/ui/effect-blind$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-effects-bounce', "/wp-includes/js/jquery/ui/effect-bounce$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-effects-clip', "/wp-includes/js/jquery/ui/effect-clip$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-effects-drop', "/wp-includes/js/jquery/ui/effect-drop$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-effects-explode', "/wp-includes/js/jquery/ui/effect-explode$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-effects-fade', "/wp-includes/js/jquery/ui/effect-fade$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-effects-fold', "/wp-includes/js/jquery/ui/effect-fold$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-effects-highlight', "/wp-includes/js/jquery/ui/effect-highlight$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-effects-puff', "/wp-includes/js/jquery/ui/effect-puff$suffix.js", array( 'jquery-effects-core', 'jquery-effects-scale' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-effects-pulsate', "/wp-includes/js/jquery/ui/effect-pulsate$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-effects-scale', "/wp-includes/js/jquery/ui/effect-scale$suffix.js", array( 'jquery-effects-core', 'jquery-effects-size' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-effects-shake', "/wp-includes/js/jquery/ui/effect-shake$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-effects-size', "/wp-includes/js/jquery/ui/effect-size$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-effects-slide', "/wp-includes/js/jquery/ui/effect-slide$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-effects-transfer', "/wp-includes/js/jquery/ui/effect-transfer$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
 
 	// Widgets
-	$scripts->add( 'jquery-ui-accordion', "/wp-includes/js/jquery/ui/accordion$suffix.js", array( 'jquery-ui-core' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-ui-autocomplete', "/wp-includes/js/jquery/ui/autocomplete$suffix.js", array( 'jquery-ui-menu', 'wp-a11y' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-ui-button', "/wp-includes/js/jquery/ui/button$suffix.js", array( 'jquery-ui-core', 'jquery-ui-controlgroup', 'jquery-ui-checkboxradio' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-ui-datepicker', "/wp-includes/js/jquery/ui/datepicker$suffix.js", array( 'jquery-ui-core' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-ui-dialog', "/wp-includes/js/jquery/ui/dialog$suffix.js", array( 'jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-ui-menu', "/wp-includes/js/jquery/ui/menu$suffix.js", array( 'jquery-ui-core' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-ui-mouse', "/wp-includes/js/jquery/ui/mouse$suffix.js", array( 'jquery-ui-core' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-ui-progressbar', "/wp-includes/js/jquery/ui/progressbar$suffix.js", array( 'jquery-ui-core' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-ui-selectmenu', "/wp-includes/js/jquery/ui/selectmenu$suffix.js", array( 'jquery-ui-menu' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-ui-slider', "/wp-includes/js/jquery/ui/slider$suffix.js", array( 'jquery-ui-mouse' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-ui-spinner', "/wp-includes/js/jquery/ui/spinner$suffix.js", array( 'jquery-ui-button' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-ui-tabs', "/wp-includes/js/jquery/ui/tabs$suffix.js", array( 'jquery-ui-core' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-ui-tooltip', "/wp-includes/js/jquery/ui/tooltip$suffix.js", array( 'jquery-ui-core' ), '1.12.1', 1 );
+	$scripts->add( 'jquery-ui-accordion', "/wp-includes/js/jquery/ui/accordion$suffix.js", array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-autocomplete', "/wp-includes/js/jquery/ui/autocomplete$suffix.js", array( 'jquery-ui-menu', 'wp-a11y' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-button', "/wp-includes/js/jquery/ui/button$suffix.js", array( 'jquery-ui-core', 'jquery-ui-controlgroup', 'jquery-ui-checkboxradio' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-datepicker', "/wp-includes/js/jquery/ui/datepicker$suffix.js", array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-dialog', "/wp-includes/js/jquery/ui/dialog$suffix.js", array( 'jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-menu', "/wp-includes/js/jquery/ui/menu$suffix.js", array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-mouse', "/wp-includes/js/jquery/ui/mouse$suffix.js", array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-progressbar', "/wp-includes/js/jquery/ui/progressbar$suffix.js", array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-selectmenu', "/wp-includes/js/jquery/ui/selectmenu$suffix.js", array( 'jquery-ui-menu' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-slider', "/wp-includes/js/jquery/ui/slider$suffix.js", array( 'jquery-ui-mouse' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-spinner', "/wp-includes/js/jquery/ui/spinner$suffix.js", array( 'jquery-ui-button' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-tabs', "/wp-includes/js/jquery/ui/tabs$suffix.js", array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-tooltip', "/wp-includes/js/jquery/ui/tooltip$suffix.js", array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
 
 	// New in 1.12.1
-	$scripts->add( 'jquery-ui-checkboxradio', "/wp-includes/js/jquery/ui/checkboxradio$suffix.js", array( 'jquery-ui-core' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-ui-controlgroup', "/wp-includes/js/jquery/ui/controlgroup$suffix.js", array( 'jquery-ui-core' ), '1.12.1', 1 );
+	$scripts->add( 'jquery-ui-checkboxradio', "/wp-includes/js/jquery/ui/checkboxradio$suffix.js", array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-controlgroup', "/wp-includes/js/jquery/ui/controlgroup$suffix.js", array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
 
 	// Interactions
-	$scripts->add( 'jquery-ui-draggable', "/wp-includes/js/jquery/ui/draggable$suffix.js", array( 'jquery-ui-mouse' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-ui-droppable', "/wp-includes/js/jquery/ui/droppable$suffix.js", array( 'jquery-ui-draggable' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-ui-resizable', "/wp-includes/js/jquery/ui/resizable$suffix.js", array( 'jquery-ui-mouse' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-ui-selectable', "/wp-includes/js/jquery/ui/selectable$suffix.js", array( 'jquery-ui-mouse' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-ui-sortable', "/wp-includes/js/jquery/ui/sortable$suffix.js", array( 'jquery-ui-mouse' ), '1.12.1', 1 );
+	$scripts->add( 'jquery-ui-draggable', "/wp-includes/js/jquery/ui/draggable$suffix.js", array( 'jquery-ui-mouse' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-droppable', "/wp-includes/js/jquery/ui/droppable$suffix.js", array( 'jquery-ui-draggable' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-resizable', "/wp-includes/js/jquery/ui/resizable$suffix.js", array( 'jquery-ui-mouse' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-selectable', "/wp-includes/js/jquery/ui/selectable$suffix.js", array( 'jquery-ui-mouse' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-sortable', "/wp-includes/js/jquery/ui/sortable$suffix.js", array( 'jquery-ui-mouse' ), '1.13.0-rc.2', 1 );
 
 	// As of 1.12.1 `jquery-ui-position` and `jquery-ui-widget` are part of `jquery-ui-core`.
 	// Listed here for back-compat.
-	$scripts->add( 'jquery-ui-position', false, array( 'jquery-ui-core' ), '1.12.1', 1 );
-	$scripts->add( 'jquery-ui-widget', false, array( 'jquery-ui-core' ), '1.12.1', 1 );
+	$scripts->add( 'jquery-ui-position', false, array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-widget', false, array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
 
 	// Strings for 'jquery-ui-autocomplete' live region messages.
 	did_action( 'init' ) && $scripts->localize(

From ce168ea06b3589c323428975b9ae269c9e27f7a0 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Fri, 10 Sep 2021 14:47:24 +0000
Subject: [PATCH 115/257] Accessibility: Administration: Improve `aria-label`
 on network admin Themes screen.

This ensures that the beginning of the label matches the visible link text.

Add a similar label for the plugin URI link on the Plugins screen when the plugin is outside of the directory.

Follow-up to [28673], [28706], [35924].

Props sabernhardt, zeo, audrasjb.
Fixes #24442.

git-svn-id: https://develop.svn.wordpress.org/trunk@51795 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-ms-themes-list-table.php | 2 +-
 src/wp-admin/includes/class-wp-plugins-list-table.php   | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-ms-themes-list-table.php b/src/wp-admin/includes/class-wp-ms-themes-list-table.php
index dd6b6d6c17961..e87da5ca7a80b 100644
--- a/src/wp-admin/includes/class-wp-ms-themes-list-table.php
+++ b/src/wp-admin/includes/class-wp-ms-themes-list-table.php
@@ -721,7 +721,7 @@ public function column_description( $theme ) {
 
 		if ( $theme->get( 'ThemeURI' ) ) {
 			/* translators: %s: Theme name. */
-			$aria_label = sprintf( __( 'Visit %s homepage' ), $theme->display( 'Name' ) );
+			$aria_label = sprintf( __( 'Visit theme site for %s' ), $theme->display( 'Name' ) );
 
 			$theme_meta[] = sprintf(
 				'<a href="%s" aria-label="%s">%s</a>',
diff --git a/src/wp-admin/includes/class-wp-plugins-list-table.php b/src/wp-admin/includes/class-wp-plugins-list-table.php
index a5831dad175fd..32af4ad8ae71b 100644
--- a/src/wp-admin/includes/class-wp-plugins-list-table.php
+++ b/src/wp-admin/includes/class-wp-plugins-list-table.php
@@ -1066,9 +1066,13 @@ public function single_row( $item ) {
 							__( 'View details' )
 						);
 					} elseif ( ! empty( $plugin_data['PluginURI'] ) ) {
+						/* translators: %s: Plugin name. */
+						$aria_label = sprintf( __( 'Visit plugin site for %s' ), $plugin_name );
+
 						$plugin_meta[] = sprintf(
-							'<a href="%s">%s</a>',
+							'<a href="%s" aria-label="%s">%s</a>',
 							esc_url( $plugin_data['PluginURI'] ),
+							esc_attr( $aria_label ),
 							__( 'Visit plugin site' )
 						);
 					}

From 9abf35cfa703f547810ccdacbeeec8a7dccede89 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Fri, 10 Sep 2021 15:02:07 +0000
Subject: [PATCH 116/257] Code Modernization: Fix null to non-nullable
 deprecation in `term_exists()`.

The `term_exists()` function expects a string or an integer for the `$term` parameter. It validates for integer, but not for string or `null`.

One of the pre-existing test cases, passed `null` to the function, leading to a `trim(): Passing null to parameter #1 ($string) of type string is deprecated` notice on PHP 8.1.

Fixed now by doing a cursory check on the variable at the start of the function and bowing out early in case the `$term` is `null`.

The issue was discovered via and is already covered by the `Tests_TermExists::test_term_exists_unknown()` test method.

Follow-up to [15220]. [38716].

Props jrf, hellofromTonya.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51796 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/taxonomy.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/wp-includes/taxonomy.php b/src/wp-includes/taxonomy.php
index 4014a62655034..531a6f537bc9b 100644
--- a/src/wp-includes/taxonomy.php
+++ b/src/wp-includes/taxonomy.php
@@ -1480,6 +1480,10 @@ function unregister_term_meta( $taxonomy, $meta_key ) {
 function term_exists( $term, $taxonomy = '', $parent = null ) {
 	global $wpdb;
 
+	if ( null === $term ) {
+		return null;
+	}
+
 	$select     = "SELECT term_id FROM $wpdb->terms as t WHERE ";
 	$tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";
 

From dade4c62b584be7707b0e184b2049698427f5cf7 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Fri, 10 Sep 2021 15:59:17 +0000
Subject: [PATCH 117/257] Code Modernization: Fix null to non-nullable
 deprecations in `WP_Meta_Query::get_sql_for_clause()`.

In the `WP_Meta_Query::get_sql_for_clause()`, the `'value'` index from a meta query array is passed to the PHP native `trim()` function without prior validation.

In PHP 8.1, this could lead to a `trim(): Passing null to parameter #1 ($string) of type string is deprecated` notice.

`trim()` expects a text string and is only useful when ''passed'' a text string as no other variable type can contain whitespace.

Fixed now by verifying that the ''value'' is a string before processing it with `trim()`.

This issue is already covered by the existing `Tests_Meta_Query::test_null_value_sql()` and the `Tests_Meta_Query::test_convert_null_value_to_empty_string()` tests.

Follow-up to [17699], [29887], [29940].

Props jrf, hellofromTonya.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51797 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-meta-query.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/class-wp-meta-query.php b/src/wp-includes/class-wp-meta-query.php
index 4ca9e892b0814..0b3ffab033d4d 100644
--- a/src/wp-includes/class-wp-meta-query.php
+++ b/src/wp-includes/class-wp-meta-query.php
@@ -691,7 +691,7 @@ public function get_sql_for_clause( &$clause, $parent_query, $clause_key = '' )
 				if ( ! is_array( $meta_value ) ) {
 					$meta_value = preg_split( '/[,\s]+/', $meta_value );
 				}
-			} else {
+			} elseif ( is_string( $meta_value ) ) {
 				$meta_value = trim( $meta_value );
 			}
 

From 43de6d5cb50abdbb2a18b23c3f7ea0b186d37391 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Fri, 10 Sep 2021 16:29:24 +0000
Subject: [PATCH 118/257] Tests: Add tests for `wpdb::_real_escape()`.

Adds a new dedicated test file.

Adds a test to check that various input types passed to `wpdb::_real_escape()` are handled correctly.

Note: This new test does not test the actual escaping or other logic in the function. Rather, it just and only tests and documents how the function handles various input types.

Props jrf, hellofromTonya.
See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51798 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/db/realEscape.php | 87 +++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 tests/phpunit/tests/db/realEscape.php

diff --git a/tests/phpunit/tests/db/realEscape.php b/tests/phpunit/tests/db/realEscape.php
new file mode 100644
index 0000000000000..393b9515c9137
--- /dev/null
+++ b/tests/phpunit/tests/db/realEscape.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * Test WPDB _real_escape() method.
+ *
+ * @group  wpdb
+ * @covers wpdb::_real_escape
+ */
+class Tests_DB_RealEscape extends WP_UnitTestCase {
+
+	/**
+	 * Test that various types of input passed to `wpdb::_real_escape()` are handled correctly.
+	 *
+	 * Note: this test does not test the actual escaping or other logic in the function.
+	 * It just and only tests and documents how the function handles various input types.
+	 *
+	 * @ticket 53635
+	 *
+	 * @dataProvider data_real_escape_input_type_handling
+	 *
+	 * @param mixed  $input    The input to escape.
+	 * @param string $expected The expected function output.
+	 */
+	function test_real_escape_input_type_handling( $input, $expected ) {
+		global $wpdb;
+
+		$this->assertSame( $expected, $wpdb->_real_escape( $input ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @var array
+	 */
+	public function data_real_escape_input_type_handling() {
+		return array(
+			'null'             => array(
+				'input'    => null,
+				'expected' => '',
+			),
+			'boolean false'    => array(
+				'input'    => false,
+				'expected' => '',
+			),
+			'boolean true'     => array(
+				'input'    => true,
+				'expected' => '1',
+			),
+			'integer zero'     => array(
+				'input'    => 0,
+				'expected' => '0',
+			),
+			'negative integer' => array(
+				'input'    => -1327,
+				'expected' => '-1327',
+			),
+			'positive integer' => array(
+				'input'    => 47896,
+				'expected' => '47896',
+			),
+			'float zero'       => array(
+				'input'    => 0.0,
+				'expected' => '0',
+			),
+			'positive float'   => array(
+				'input'    => 25.52,
+				'expected' => '25.52',
+			),
+			'simple string'    => array(
+				'input'    => 'foobar',
+				'expected' => 'foobar',
+			),
+			'empty array'      => array(
+				'input'    => array(),
+				'expected' => '',
+			),
+			'non-empty array'  => array(
+				'input'    => array( 1, 2, 3 ),
+				'expected' => '',
+			),
+			'simple object'    => array(
+				'input'    => new stdClass(),
+				'expected' => '',
+			),
+		);
+	}
+}

From 14f92886f1442dc9567fe0ff2f03161e2958f90b Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Fri, 10 Sep 2021 16:35:39 +0000
Subject: [PATCH 119/257] Code Modernization: Fix "passing null to
 non-nullable" deprecation in `wpdb::_real_escape()`.

The PHP native `mysqli_real_escape_string()` function expects to be passed a string as the second parameter and this is not a nullable parameter.

Passing `null` to it will result in a `mysqli_real_escape_string(): Passing null to parameter #2 ($string) of type string is deprecated` notice on PHP 8.1.

Previously, an input type check was put in place to prevent fatal errors on PHP 8.0 when an array, object or resource was passed. Changeset [48980].

A `null` value was explicitly excluded from that check, even though a `null` value being passed would only ever result in an empty string anyway.

This commit changes the previous input type check to also bow out early for `null` values and to automatically return an empty string for those.

Refs:
- https://www.php.net/manual/en/mysqli.real-escape-string.php
- https://wiki.php.net/rfc/deprecate_null_to_scalar_internal_arg

Follow-up to [48980].

Props jrf, hellofromTonya.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51799 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/wp-db.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/wp-db.php b/src/wp-includes/wp-db.php
index 04fa15c1ee6a9..340a6f5861e5b 100644
--- a/src/wp-includes/wp-db.php
+++ b/src/wp-includes/wp-db.php
@@ -1158,7 +1158,7 @@ function _weak_escape( $string ) {
 	 * @return string Escaped string.
 	 */
 	function _real_escape( $string ) {
-		if ( ! is_scalar( $string ) && ! is_null( $string ) ) {
+		if ( ! is_scalar( $string ) ) {
 			return '';
 		}
 

From c64c2d77aab0a0e1bc454b08790e6c8f3e3ec7c8 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Fri, 10 Sep 2021 17:26:42 +0000
Subject: [PATCH 120/257] Tests: Fix "null to non-nullable" deprecation notice
 in `Tests_Admin_IncludesPlugin::test_get_plugin_files_folder()`.

The `Tests_Admin_IncludesPlugin::_create_plugin()` expects the first parameter to be a text string to be written to a plugin file using `fwrite()`.

Passing null causes a `fwrite(): Passing null to parameter #2 ($data) of type string is deprecated` notice.

Ref: https://www.php.net/manual/en/function.fwrite

Follow-up to [31002]. [41806].

Props jrf, hellofromTonya.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51800 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/admin/includesPlugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/phpunit/tests/admin/includesPlugin.php b/tests/phpunit/tests/admin/includesPlugin.php
index 6ba4cb33e0e1c..7542db6b59b36 100644
--- a/tests/phpunit/tests/admin/includesPlugin.php
+++ b/tests/phpunit/tests/admin/includesPlugin.php
@@ -366,7 +366,7 @@ public function test_get_plugin_files_single() {
 	public function test_get_plugin_files_folder() {
 		$plugin_dir = WP_PLUGIN_DIR . '/list_files_test_plugin';
 		@mkdir( $plugin_dir );
-		$plugin = $this->_create_plugin( null, 'list_files_test_plugin.php', $plugin_dir );
+		$plugin = $this->_create_plugin( '', 'list_files_test_plugin.php', $plugin_dir );
 
 		$sub_dir = trailingslashit( dirname( $plugin[1] ) ) . 'subdir';
 		mkdir( $sub_dir );

From d82accc291317ad590c1e81be9d914e5cec42d90 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Fri, 10 Sep 2021 17:42:36 +0000
Subject: [PATCH 121/257] Code Modernization: Fix "passing null to
 non-nullable" deprecation notices in `WP_Http::normalize_cookies()`.

The `Requests_Cookie` class expects valid - non-`null` - attributes to be passed, either as an array or as a `Requests_Utility_CaseInsensitiveDictionary` object.

However, the `WP_Http_Cookie::get_attributes()` explicitly sets the `expires`, `path` and `domain` index keys in an array with values which _may_ be `null`. This will cause `strtotime(): Passing null to parameter #1 ($datetime) of type string is deprecated`-like errors when the attributes are passed to the `Requests_Cookie` class.

Note: a `null` value for `path` would generate a similar deprecation notice, but for the `preg_match()` function.

Fixed by using `array_filter()` on the attributes to explicitly filter out `null` values before passing the attributes to `Requests_Cookie`.

Note: I'm choosing to explicitly only filter `null` values. Using `array_filter()` without a callback would filter out all "empty" values, but that may also remove values which are explicitly set to `false` or `0`, which may be valid values.

Fixes two errors in the `external-http` group in the WordPress Core test suite:
{{{
1) Tests_HTTP_Functions::test_get_response_cookies_with_wp_http_cookie_object
strtotime(): Passing null to parameter #1 ($datetime) of type string is deprecated

/var/www/src/wp-includes/Requests/Cookie.php:268
/var/www/src/wp-includes/Requests/Cookie.php:237
/var/www/src/wp-includes/Requests/Cookie.php:90
/var/www/src/wp-includes/class-http.php:460
/var/www/src/wp-includes/class-http.php:349
/var/www/src/wp-includes/class-http.php:624
/var/www/src/wp-includes/http.php:162
/var/www/tests/phpunit/tests/http/functions.php:156

2) Tests_HTTP_Functions::test_get_cookie_host_only
strtotime(): Passing null to parameter #1 ($datetime) of type string is deprecated

/var/www/src/wp-includes/Requests/Cookie.php:268
/var/www/src/wp-includes/Requests/Cookie.php:237
/var/www/src/wp-includes/Requests/Cookie.php:90
/var/www/src/wp-includes/class-http.php:460
/var/www/tests/phpunit/tests/http/functions.php:235
}}}

Follow-up to [38164], [45135], [51657].

Props jrf, hellofromTonya.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51801 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-http.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/wp-includes/class-http.php b/src/wp-includes/class-http.php
index 703a74e208af2..24b7724b89cb5 100644
--- a/src/wp-includes/class-http.php
+++ b/src/wp-includes/class-http.php
@@ -459,7 +459,13 @@ public static function normalize_cookies( $cookies ) {
 
 		foreach ( $cookies as $name => $value ) {
 			if ( $value instanceof WP_Http_Cookie ) {
-				$cookie_jar[ $value->name ] = new Requests_Cookie( $value->name, $value->value, $value->get_attributes(), array( 'host-only' => $value->host_only ) );
+				$attributes                 = array_filter(
+					$value->get_attributes(),
+					static function( $attr ) {
+						return null !== $attr;
+					}
+				);
+				$cookie_jar[ $value->name ] = new Requests_Cookie( $value->name, $value->value, $attributes, array( 'host-only' => $value->host_only ) );
 			} elseif ( is_scalar( $value ) ) {
 				$cookie_jar[ $name ] = new Requests_Cookie( $name, $value );
 			}

From ad96dc23321d542ac958720e4e8fae6e3ae39609 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sat, 11 Sep 2021 18:19:31 +0000
Subject: [PATCH 122/257] Site Health: Add Intl to the list of recommended PHP
 extensions.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Why is the PHP Intl extension important?**

WordPress is a global, international software, with support for a multitude of languages and with infinite combinations. Approximately half of the installations are in a language that is not the default (English), and this leads us to think about localization, transliteration, encoding conversions, calendar operations, collation… in short, everything you have with the different languages and formats that are around the planet. And this is what the [https://www.php.net/manual/en/intro.intl.php PHP Intl extension] provides.

**What do we as the WordPress Community gain from this extension?**

This extension provides a lot of functions for better internationalization support, including but not limited to:
* [https://www.php.net/manual/en/collator.compare.php collator_compare()] to compare Unicode text strings
* [https://www.php.net/manual/en/numberformatter.format.php numfmt_format()] to format a number according to the selected locale
* the [https://www.php.net/manual/en/normalizer.normalize.php normalization] of characters
* the [https://www.php.net/manual/en/messageformatter.formatmessage.php formatting] of messages
* getting the [https://www.php.net/manual/en/intlcalendar.getfirstdayofweek.php first day of the week] according to the locale.


In addition to functionality and ease of development, the extension can also help improve security, with classes like `Spoofchecker` that can tell you [https://www.php.net/manual/en/spoofchecker.areconfusable.php if ‘google.com’, ‘goog1e.com’ can confuse the user], or functions related to Internet domains, both to convert an [https://www.php.net/manual/en/function.idn-to-ascii.php IDN domain to text] and [https://www.php.net/manual/en/function.idn-to-utf8.php text to IDN].

**Hosting Team Recommendation**

Taking into account that WordPress continues to grow, the Hosting Team has considered a good recommendation, but not an obligation, for all hosts that work with WordPress to offer this extension, by default, to all users.

Reference: [https://make.wordpress.org/hosting/2021/05/20/why-hosters-should-install-the-php-intl-extension/ Why hosters should install the PHP-intl extension].

Follow-up to [44986], [46268].

Props zodiac1978, JavierCasares, jrf, Clorith, josklever.
Fixes #52654.

git-svn-id: https://develop.svn.wordpress.org/trunk@51804 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-site-health.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/wp-admin/includes/class-wp-site-health.php b/src/wp-admin/includes/class-wp-site-health.php
index 0adff0078f204..555c6749fd9db 100644
--- a/src/wp-admin/includes/class-wp-site-health.php
+++ b/src/wp-admin/includes/class-wp-site-health.php
@@ -941,6 +941,10 @@ public function get_test_php_extensions() {
 				'function' => 'iconv',
 				'required' => false,
 			),
+			'intl'      => array(
+				'extension' => 'intl',
+				'required'  => false,
+			),
 			'mcrypt'    => array(
 				'extension'    => 'mcrypt',
 				'required'     => false,

From 092ee0fbffaa8723cbddd1134ec811fdcf8601b8 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sun, 12 Sep 2021 10:08:25 +0000
Subject: [PATCH 123/257] Site Health: Move the Imagick entry higher in the
 list of recommended PHP extensions.

This better matches its position in the [https://make.wordpress.org/hosting/handbook/server-environment/#php-extensions Hosting Team's handbook] recommendations.

Follow-up to [44986], [46268], [51804].

See #52654.

git-svn-id: https://develop.svn.wordpress.org/trunk@51805 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-site-health.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-site-health.php b/src/wp-admin/includes/class-wp-site-health.php
index 555c6749fd9db..884b37ca5a6c5 100644
--- a/src/wp-admin/includes/class-wp-site-health.php
+++ b/src/wp-admin/includes/class-wp-site-health.php
@@ -891,6 +891,10 @@ public function get_test_php_extensions() {
 				'function' => 'hash',
 				'required' => false,
 			),
+			'imagick'   => array(
+				'extension' => 'imagick',
+				'required'  => false,
+			),
 			'json'      => array(
 				'function' => 'json_last_error',
 				'required' => true,
@@ -916,10 +920,6 @@ public function get_test_php_extensions() {
 				'function' => 'preg_match',
 				'required' => false,
 			),
-			'imagick'   => array(
-				'extension' => 'imagick',
-				'required'  => false,
-			),
 			'mod_xml'   => array(
 				'extension' => 'libxml',
 				'required'  => false,

From 08fe0469f94d6790ab7ed9a8137e53ba491c5a13 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Mon, 13 Sep 2021 18:53:57 +0000
Subject: [PATCH 124/257] Code Modernization: Fix "passing null to
 non-nullable" deprecation notice in `WP_Comment_Query::get_comment_ids()`.

The `WP_Comment_Query::get_comment_ids()` method is supposed to handle `null` as a search query, but was throwing a `strlen(): Passing null to parameter #1 ($string) of type string is deprecated` notice on PHP 8.1.

Discovered via and already covered via the pre-existing `Tests_Comment_Query::test_search_null_should_be_ignored()` test method.

Follow-up to [36345], [48275].

Props jrf, hellofromTonya.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51806 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-comment-query.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/class-wp-comment-query.php b/src/wp-includes/class-wp-comment-query.php
index f35354c76c2dc..a592fdb687bc4 100644
--- a/src/wp-includes/class-wp-comment-query.php
+++ b/src/wp-includes/class-wp-comment-query.php
@@ -801,7 +801,7 @@ protected function get_comment_ids() {
 		}
 
 		// Falsey search strings are ignored.
-		if ( strlen( $this->query_vars['search'] ) ) {
+		if ( isset( $this->query_vars['search'] ) && strlen( $this->query_vars['search'] ) ) {
 			$search_sql = $this->get_search_sql(
 				$this->query_vars['search'],
 				array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_content' )

From a591d5159d9645efd49fb9b01c185df60bd52acc Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 13 Sep 2021 20:40:29 +0000
Subject: [PATCH 125/257] Twenty Eleven: Set a fixed height for search form
 when header image is added.

This ensures that the search form does not collide with the menu on smaller screens.

Props sabernhardt, fedepia, Soean, lukecavanagh, mukesh27.
Fixes #40398.

git-svn-id: https://develop.svn.wordpress.org/trunk@51807 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-content/themes/twentyeleven/style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/wp-content/themes/twentyeleven/style.css b/src/wp-content/themes/twentyeleven/style.css
index 46afe60b61da7..f63975c648cec 100644
--- a/src/wp-content/themes/twentyeleven/style.css
+++ b/src/wp-content/themes/twentyeleven/style.css
@@ -701,6 +701,7 @@ a.assistive-text:focus,
 	top: auto;
 	bottom: -27px;
 	max-width: 195px;
+	height: 32px;
 }
 #branding .only-search + #access div {
 	padding-right: 205px;

From cabe470ae75d6fed4d6b9c8b3f8567b2334d83d9 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 14 Sep 2021 10:17:05 +0000
Subject: [PATCH 126/257] Twenty Seventeen: Make blog header margin more
 specific on front page.

This avoids a large gap between title and content when the layout is set to one column.

Props laurelfulford, sabernhardt, hirofumi2012, jainnidhi, mukesh27.
Fixes #43628.

git-svn-id: https://develop.svn.wordpress.org/trunk@51808 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-content/themes/twentyseventeen/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-content/themes/twentyseventeen/style.css b/src/wp-content/themes/twentyseventeen/style.css
index b6007aed24c61..b3621b79e38c0 100644
--- a/src/wp-content/themes/twentyseventeen/style.css
+++ b/src/wp-content/themes/twentyseventeen/style.css
@@ -3822,7 +3822,7 @@ p > object:only-child {
 		width: 100%;
 	}
 
-	.panel-content .recent-posts .entry-header {
+	.twentyseventeen-front-page .panel-content .recent-posts .entry-header {
 		margin-bottom: 1.5em;
 	}
 

From f98b2847687fdf1c4b2278dba0c3650c9963a82f Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 14 Sep 2021 17:30:48 +0000
Subject: [PATCH 127/257] Docs: Update description for the `$wp_version`
 global.

In addition to holding the version number, the WordPress version string is used to bust caches and to enable development mode for scripts when running from the `/src` directory.

Follow-up to [803], [2585], [6554], [47230].

Props muhammadfaizanhaidar, azaozz.
Fixes #53413.

git-svn-id: https://develop.svn.wordpress.org/trunk@51809 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/version.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/wp-includes/version.php b/src/wp-includes/version.php
index 9965b10a7220f..27e14721a9209 100644
--- a/src/wp-includes/version.php
+++ b/src/wp-includes/version.php
@@ -11,6 +11,9 @@
 /**
  * The WordPress version string.
  *
+ * Holds the current version number for WordPress core. Used to bust caches
+ * and to enable development mode for scripts when running from the /src directory.
+ *
  * @global string $wp_version
  */
 $wp_version = '5.9-alpha-51272-src';

From 6f1a983d52fa87001be8f9388d3bba1007c58008 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Tue, 14 Sep 2021 18:32:39 +0000
Subject: [PATCH 128/257] Build/Test Tools: Make
 `WP_TESTS_PHPUNIT_POLYFILLS_PATH` more flexible.

The constant `WP_TESTS_PHPUNIT_POLYFILLS_PATH` is intended to contain the path to the root directory of the PHPUnit Polyfills library without trailing slash.

The code already took into account that the value could potentially include a trailing slash.

Now it will also take into account if it is accidentally set to point to the autoload file instead of the path.

Follow-up to [51598].

Props jrf, schlessera, hellofromTonya, jeherve, lucatume.
See #46149.

git-svn-id: https://develop.svn.wordpress.org/trunk@51810 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/includes/bootstrap.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/phpunit/includes/bootstrap.php b/tests/phpunit/includes/bootstrap.php
index dfb858c8c939b..511bb9d3695f2 100644
--- a/tests/phpunit/includes/bootstrap.php
+++ b/tests/phpunit/includes/bootstrap.php
@@ -86,8 +86,13 @@
 		if ( is_string( WP_TESTS_PHPUNIT_POLYFILLS_PATH )
 			&& '' !== WP_TESTS_PHPUNIT_POLYFILLS_PATH
 		) {
-			$phpunit_polyfills_path = rtrim( $phpunit_polyfills_path, '/\\' );
-			$phpunit_polyfills_path = realpath( $phpunit_polyfills_path . '/phpunitpolyfills-autoload.php' );
+			// Be tolerant to the path being provided including the filename.
+			if ( substr( $phpunit_polyfills_path, -29 ) !== 'phpunitpolyfills-autoload.php' ) {
+				$phpunit_polyfills_path = rtrim( $phpunit_polyfills_path, '/\\' );
+				$phpunit_polyfills_path = $phpunit_polyfills_path . '/phpunitpolyfills-autoload.php';
+			}
+
+			$phpunit_polyfills_path = realpath( $phpunit_polyfills_path );
 			if ( false !== $phpunit_polyfills_path ) {
 				$phpunit_polyfills_autoloader = $phpunit_polyfills_path;
 			} else {

From c3a3da800b4b1781da573a8e1d7570d87a51fc8c Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Tue, 14 Sep 2021 18:40:30 +0000
Subject: [PATCH 129/257] Build/Test Tools: Improve messaging when PHPUnit
 Polyfills cannot be found.

Previously, two situations were taken in to account:
1. The `WP_TESTS_PHPUNIT_POLYFILLS_PATH` constant is defined => show message specific to that constant not being set correctly.
    This message would typically be shown for plugin/theme integration tests which are already aware of the changes in WP 5.9.
2. The constant is not defined => show a message to run `composer update`.
    This message is intended for people trying to run the WP Core tests.

This left two situations unaccounted for:
- Someone trying to run the WP Core tests, but not having set the `WP_RUN_CORE_TESTS` constant or not having set it to `1`.
- Someone trying to run plugin/theme integration tests without the new `WP_TESTS_PHPUNIT_POLYFILLS_PATH` constant being defined as they are not (yet) aware of the changes made in WP 5.9.

The changes made in this commit, are intended to improve the error messages displayed in those situations.

Follow-up to [51598], [51810].

Props jrf, schlessera, hellofromTonya, jeherve, lucatume.
See #46149.

git-svn-id: https://develop.svn.wordpress.org/trunk@51811 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/includes/bootstrap.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/phpunit/includes/bootstrap.php b/tests/phpunit/includes/bootstrap.php
index 511bb9d3695f2..2707cb9960a53 100644
--- a/tests/phpunit/includes/bootstrap.php
+++ b/tests/phpunit/includes/bootstrap.php
@@ -105,15 +105,19 @@
 
 	if ( $phpunit_polyfills_error || ! file_exists( $phpunit_polyfills_autoloader ) ) {
 		echo 'Error: The PHPUnit Polyfills library is a requirement for running the WP test suite.' . PHP_EOL;
-		if ( isset( $phpunit_polyfills_path ) ) {
+		if ( defined( 'WP_TESTS_PHPUNIT_POLYFILLS_PATH' ) ) {
 			printf(
 				'The PHPUnit Polyfills autoload file was not found in "%s"' . PHP_EOL,
 				WP_TESTS_PHPUNIT_POLYFILLS_PATH
 			);
 			echo 'Please verify that the file path provided in the WP_TESTS_PHPUNIT_POLYFILLS_PATH constant is correct.' . PHP_EOL;
-		} else {
+		} elseif ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS ) {
 			echo 'You need to run `composer update` before running the tests.' . PHP_EOL;
 			echo 'Once the dependencies are installed, you can run the tests using the Composer-installed version of PHPUnit or using a PHPUnit phar file, but the dependencies do need to be installed whichever way the tests are run.' . PHP_EOL;
+		} else {
+			echo 'If you are trying to run plugin/theme integration tests, make sure the PHPUnit Polyfills library is available and either load the autoload file of this library in your own test bootstrap before calling the WP Core test bootstrap file; or set the path to the PHPUnit Polyfills library in a "WP_TESTS_PHPUNIT_POLYFILLS_PATH" constant to allow the WP Core bootstrap to load the Polyfills.' . PHP_EOL . PHP_EOL;
+			echo 'If you are trying to run the WP Core tests, make sure to set the "WP_RUN_CORE_TESTS" constant to 1 and run `composer update` before running the tests.' . PHP_EOL;
+			echo 'Once the dependencies are installed, you can run the tests using the Composer-installed version of PHPUnit or using a PHPUnit phar file, but the dependencies do need to be installed whichever way the tests are run.' . PHP_EOL;
 		}
 		exit( 1 );
 	}

From 3062b3d80346718abfb7cc0e28d13671dec103ce Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Tue, 14 Sep 2021 18:47:46 +0000
Subject: [PATCH 130/257] Build/Test Tools: Improve messaging when PHPUnit
 Polyfills do not comply with version requirements.

Previously, two situations were taken in to account:
1. The `WP_TESTS_PHPUNIT_POLYFILLS_PATH` constant is defined => just show a message about the version mismatch.
2. The constant is not defined => show a message to run `composer update`. This message is intended for people trying to run the WP Core tests.

This could lead to an unclear situation for people trying to run plugin/theme integration tests without the new `WP_TESTS_PHPUNIT_POLYFILLS_PATH` constant being defined.

They could be shown the message to run `composer update` while if they would do so for their local install without adding the Polyfills, the message would still display the next time they would attempt to run the tests.

This commit:
1. Provides more information about the PHPUnit Polyfills version detected vs the version expected.
2. Shows a more specific message to guide users which have the `WP_TESTS_PHPUNIT_POLYFILLS_PATH` constant declared.
3. Only shows the message to run `composer update` when the `WP_RUN_CORE_TESTS` constant is declared to prevent confusing people more.

Follow-up to [51598], [51810], [51811].

Props jrf, schlessera, hellofromTonya, jeherve, lucatume.
See #46149.

git-svn-id: https://develop.svn.wordpress.org/trunk@51812 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/includes/bootstrap.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/tests/phpunit/includes/bootstrap.php b/tests/phpunit/includes/bootstrap.php
index 2707cb9960a53..68fa544c0f24b 100644
--- a/tests/phpunit/includes/bootstrap.php
+++ b/tests/phpunit/includes/bootstrap.php
@@ -133,13 +133,20 @@
 $phpunit_polyfills_minimum_version = '1.0.1';
 if ( class_exists( '\Yoast\PHPUnitPolyfills\Autoload' )
 	&& ( defined( '\Yoast\PHPUnitPolyfills\Autoload::VERSION' ) === false
-	|| version_compare( \Yoast\PHPUnitPolyfills\Autoload::VERSION, $phpunit_polyfills_minimum_version, '<' ) )
+	|| version_compare( Yoast\PHPUnitPolyfills\Autoload::VERSION, $phpunit_polyfills_minimum_version, '<' ) )
 ) {
 	printf(
-		'Error: Version mismatch detected for the PHPUnit Polyfills. Please ensure that PHPUnit Polyfills %s or higher is loaded.' . PHP_EOL,
-		$phpunit_polyfills_minimum_version
+		'Error: Version mismatch detected for the PHPUnit Polyfills. Please ensure that PHPUnit Polyfills %s or higher is loaded. Found version: %s' . PHP_EOL,
+		$phpunit_polyfills_minimum_version,
+		defined( '\Yoast\PHPUnitPolyfills\Autoload::VERSION' ) ? Yoast\PHPUnitPolyfills\Autoload::VERSION : '1.0.0 or lower'
 	);
-	if ( ! defined( 'WP_TESTS_PHPUNIT_POLYFILLS_PATH' ) ) {
+	if ( defined( 'WP_TESTS_PHPUNIT_POLYFILLS_PATH' ) ) {
+		printf(
+			'Please ensure that the PHPUnit Polyfill install in "%s" is updated to version %s or higher.' . PHP_EOL,
+			WP_TESTS_PHPUNIT_POLYFILLS_PATH,
+			$phpunit_polyfills_minimum_version
+		);
+	} elseif ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS ) {
 		echo 'Please run `composer update` to install the latest version.' . PHP_EOL;
 	}
 	exit( 1 );

From f44a99529758e9a5ada443347c5febb5b8a67b6f Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Tue, 14 Sep 2021 18:52:57 +0000
Subject: [PATCH 131/257] Build/Test Tools: Expect an absolute path in
 `WP_TESTS_PHPUNIT_POLYFILLS_PATH` constant.

This commit:
* Removes the use of `realpath()` to prevent issues with WSL and other virtualized filesystems.
* Changes the logic of the Polyfill bootstrap loading to expect an absolute path, rather than a relative path to the root directory of the PHPUnit Polyfills library.
* Adjusts the relevant inline documentation and error messages to expect an absolute path.
* Breaks up error messages into smaller line lengths for readability.

Follow-up to [51598], [51810], [51811], [51812].

Props jrf, schlessera, hellofromTonya, jeherve, lucatume.
See #46149.

git-svn-id: https://develop.svn.wordpress.org/trunk@51813 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/includes/bootstrap.php | 50 +++++++++++++++++-----------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/tests/phpunit/includes/bootstrap.php b/tests/phpunit/includes/bootstrap.php
index 68fa544c0f24b..5d6ded0bcb969 100644
--- a/tests/phpunit/includes/bootstrap.php
+++ b/tests/phpunit/includes/bootstrap.php
@@ -61,22 +61,25 @@
  *
  * The PHPUnit Polyfills are a requirement for the WP test suite.
  *
+ * For running the Core tests, the Make WordPress Core handbook contains step-by-step instructions
+ * on how to get up and running for a variety of supported workflows:
+ * {@link https://make.wordpress.org/core/handbook/testing/automated-testing/phpunit/#test-running-workflow-options}
+ *
  * Plugin/theme integration tests can handle this in any of the following ways:
  * - When using a full WP install: run `composer update` for the WP install prior to running the tests.
  * - When using a partial WP test suite install:
- *   - Add a `yoast/phpunit-polyfills` (dev) requirement to their own `composer.json` file.
+ *   - Add a `yoast/phpunit-polyfills` (dev) requirement to the plugin/theme's own `composer.json` file.
  *   - And then:
  *     - Either load the PHPUnit Polyfills autoload file prior to running the WP core bootstrap file.
- *     - Or declare a `WP_TESTS_PHPUNIT_POLYFILLS_PATH` constant pointing to the root directory
- *       of the PHPUnit Polyfills installation.
- *       This constant can be declared in the `phpunit.xml[.dist]` file like this:
- *       `<php><const name="WP_TESTS_PHPUNIT_POLYFILLS_PATH" value="path/to/yoast/phpunit-polyfills"/></php>
- *       or can be declared as a PHP constant in the `wp-tests-config.php` file or the plugin/theme
- *       test bootstrap file.
+ *     - Or declare a `WP_TESTS_PHPUNIT_POLYFILLS_PATH` constant containing the absolute path to the
+ *       root directory of the PHPUnit Polyfills installation.
+ *       If the constant is used, it is strongly recommended to declare this constant in the plugin/theme's
+ *       own test bootstrap file.
+ *       The constant MUST be declared prior to calling this file.
  */
 if ( ! class_exists( 'Yoast\PHPUnitPolyfills\Autoload' ) ) {
 	// Default location of the autoloader for WP core test runs.
-	$phpunit_polyfills_autoloader = __DIR__ . '/../../../vendor/yoast/phpunit-polyfills/phpunitpolyfills-autoload.php';
+	$phpunit_polyfills_autoloader = dirname( dirname( dirname( __DIR__ ) ) ) . '/vendor/yoast/phpunit-polyfills/phpunitpolyfills-autoload.php';
 	$phpunit_polyfills_error      = false;
 
 	// Allow for a custom installation location to be provided for plugin/theme integration tests.
@@ -92,12 +95,7 @@
 				$phpunit_polyfills_path = $phpunit_polyfills_path . '/phpunitpolyfills-autoload.php';
 			}
 
-			$phpunit_polyfills_path = realpath( $phpunit_polyfills_path );
-			if ( false !== $phpunit_polyfills_path ) {
-				$phpunit_polyfills_autoloader = $phpunit_polyfills_path;
-			} else {
-				$phpunit_polyfills_error = true;
-			}
+			$phpunit_polyfills_autoloader = $phpunit_polyfills_path;
 		} else {
 			$phpunit_polyfills_error = true;
 		}
@@ -111,13 +109,24 @@
 				WP_TESTS_PHPUNIT_POLYFILLS_PATH
 			);
 			echo 'Please verify that the file path provided in the WP_TESTS_PHPUNIT_POLYFILLS_PATH constant is correct.' . PHP_EOL;
+			echo 'The WP_TESTS_PHPUNIT_POLYFILLS_PATH constant should contain an absolute path to the root directory'
+				. ' of the PHPUnit Polyfills library.' . PHP_EOL;
 		} elseif ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS ) {
 			echo 'You need to run `composer update` before running the tests.' . PHP_EOL;
-			echo 'Once the dependencies are installed, you can run the tests using the Composer-installed version of PHPUnit or using a PHPUnit phar file, but the dependencies do need to be installed whichever way the tests are run.' . PHP_EOL;
+			echo 'Once the dependencies are installed, you can run the tests using the Composer-installed version'
+				. ' of PHPUnit or using a PHPUnit phar file, but the dependencies do need to be installed'
+				. ' whichever way the tests are run.' . PHP_EOL;
 		} else {
-			echo 'If you are trying to run plugin/theme integration tests, make sure the PHPUnit Polyfills library is available and either load the autoload file of this library in your own test bootstrap before calling the WP Core test bootstrap file; or set the path to the PHPUnit Polyfills library in a "WP_TESTS_PHPUNIT_POLYFILLS_PATH" constant to allow the WP Core bootstrap to load the Polyfills.' . PHP_EOL . PHP_EOL;
-			echo 'If you are trying to run the WP Core tests, make sure to set the "WP_RUN_CORE_TESTS" constant to 1 and run `composer update` before running the tests.' . PHP_EOL;
-			echo 'Once the dependencies are installed, you can run the tests using the Composer-installed version of PHPUnit or using a PHPUnit phar file, but the dependencies do need to be installed whichever way the tests are run.' . PHP_EOL;
+			echo 'If you are trying to run plugin/theme integration tests, make sure the PHPUnit Polyfills library'
+				. ' (https://github.com/Yoast/PHPUnit-Polyfills) is available and either load the autoload file'
+				. ' of this library in your own test bootstrap before calling the WP Core test bootstrap file;'
+				. ' or set the absolute path to the PHPUnit Polyfills library in a "WP_TESTS_PHPUNIT_POLYFILLS_PATH"'
+				. ' constant to allow the WP Core bootstrap to load the Polyfills.' . PHP_EOL . PHP_EOL;
+			echo 'If you are trying to run the WP Core tests, make sure to set the "WP_RUN_CORE_TESTS" constant'
+				. ' to 1 and run `composer update` before running the tests.' . PHP_EOL;
+			echo 'Once the dependencies are installed, you can run the tests using the Composer-installed'
+				. ' version of PHPUnit or using a PHPUnit phar file, but the dependencies do need to be'
+				. ' installed whichever way the tests are run.' . PHP_EOL;
 		}
 		exit( 1 );
 	}
@@ -136,13 +145,14 @@
 	|| version_compare( Yoast\PHPUnitPolyfills\Autoload::VERSION, $phpunit_polyfills_minimum_version, '<' ) )
 ) {
 	printf(
-		'Error: Version mismatch detected for the PHPUnit Polyfills. Please ensure that PHPUnit Polyfills %s or higher is loaded. Found version: %s' . PHP_EOL,
+		'Error: Version mismatch detected for the PHPUnit Polyfills.'
+		. ' Please ensure that PHPUnit Polyfills %s or higher is loaded. Found version: %s' . PHP_EOL,
 		$phpunit_polyfills_minimum_version,
 		defined( '\Yoast\PHPUnitPolyfills\Autoload::VERSION' ) ? Yoast\PHPUnitPolyfills\Autoload::VERSION : '1.0.0 or lower'
 	);
 	if ( defined( 'WP_TESTS_PHPUNIT_POLYFILLS_PATH' ) ) {
 		printf(
-			'Please ensure that the PHPUnit Polyfill install in "%s" is updated to version %s or higher.' . PHP_EOL,
+			'Please ensure that the PHPUnit Polyfill installation in "%s" is updated to version %s or higher.' . PHP_EOL,
 			WP_TESTS_PHPUNIT_POLYFILLS_PATH,
 			$phpunit_polyfills_minimum_version
 		);

From f32960878484e2b6338bc5c58140e637f564ed46 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 15 Sep 2021 11:47:56 +0000
Subject: [PATCH 132/257] I18N: Add a translator comment to clarify the "Block
 HTML" string in the Block widget settings form.

The string refers to HTML code of the block, not an option that blocks HTML.

Follow-up to [50995].

Props Amieiro, NekoJonez, knutsp, johnbillion, namith.jawahar, SergeyBiryukov.
Fixes #54110.

git-svn-id: https://develop.svn.wordpress.org/trunk@51814 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/widgets/class-wp-widget-block.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/wp-includes/widgets/class-wp-widget-block.php b/src/wp-includes/widgets/class-wp-widget-block.php
index bf63359e2152b..44534c7fa88ea 100644
--- a/src/wp-includes/widgets/class-wp-widget-block.php
+++ b/src/wp-includes/widgets/class-wp-widget-block.php
@@ -202,7 +202,12 @@ public function form( $instance ) {
 		$instance = wp_parse_args( (array) $instance, $this->default_instance );
 		?>
 		<p>
-			<label for="<?php echo $this->get_field_id( 'content' ); ?>"><?php echo __( 'Block HTML:' ); ?></label>
+			<label for="<?php echo $this->get_field_id( 'content' ); ?>">
+				<?php
+				/* translators: HTML code of the block, not an option that blocks HTML. */
+				_e( 'Block HTML:' );
+				?>
+			</label>
 			<textarea id="<?php echo $this->get_field_id( 'content' ); ?>" name="<?php echo $this->get_field_name( 'content' ); ?>" rows="6" cols="50" class="widefat code"><?php echo esc_textarea( $instance['content'] ); ?></textarea>
 		</p>
 		<?php

From f5aaafd1fe59e80f66186f84fc268b6e38d64b39 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 15 Sep 2021 18:39:09 +0000
Subject: [PATCH 133/257] Upgrade/Install: Create a temporary backup of plugins
 and themes before updating.

This aims to make the update process more reliable and ensures that if a plugin or theme update fails, the previous version can be safely restored.

* When updating a plugin or theme, the old version is moved to a temporary backup directory:
 * `wp-content/upgrade/temp-backup/plugins/[plugin-slug]` for plugins
 * `wp-content/upgrade/temp-backup/themes/[theme-slug]` for themes.

* If the update fails, then the temporary backup kept in the `upgrade/temp-backup` directory is restored to its original location.
* If the update succeeds, the temporary backup is deleted.

To further help troubleshoot plugin and theme updates, two new checks were added to the Site Health screen:
* A check to make sure that the `temp-backup` directory is writable.
* A check that there is enough disk space available to safely perform updates.

To avoid confusion: The `temp-backup` directory will NOT be used to "roll back" a plugin to a previous version after a completed update. This directory will simply contain a transient backup of the previous version of a plugin or theme being updated, and as soon as the update process finishes, the directory will be empty.

Props aristath, afragen, pbiron, dd32, poena, TimothyBlynJacobs, audrasjb, mikeschroder, a2hosting, hellofromTonya, KZeni, galbaras, richards1052, Boniu91, mai21, francina, SergeyBiryukov.
See #51857.

git-svn-id: https://develop.svn.wordpress.org/trunk@51815 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../includes/class-plugin-upgrader.php        |  18 +-
 .../includes/class-theme-upgrader.php         |  18 +-
 .../includes/class-wp-site-health.php         | 231 ++++++++++++++++--
 src/wp-admin/includes/class-wp-upgrader.php   | 187 ++++++++++++++
 4 files changed, 430 insertions(+), 24 deletions(-)

diff --git a/src/wp-admin/includes/class-plugin-upgrader.php b/src/wp-admin/includes/class-plugin-upgrader.php
index 76083b5211c25..aeefaf9875f68 100644
--- a/src/wp-admin/includes/class-plugin-upgrader.php
+++ b/src/wp-admin/includes/class-plugin-upgrader.php
@@ -226,9 +226,14 @@ public function upgrade( $plugin, $args = array() ) {
 				'clear_destination' => true,
 				'clear_working'     => true,
 				'hook_extra'        => array(
-					'plugin' => $plugin,
-					'type'   => 'plugin',
-					'action' => 'update',
+					'plugin'      => $plugin,
+					'type'        => 'plugin',
+					'action'      => 'update',
+					'temp_backup' => array(
+						'slug' => dirname( $plugin ),
+						'src'  => WP_PLUGIN_DIR,
+						'dir'  => 'plugins',
+					),
 				),
 			)
 		);
@@ -342,7 +347,12 @@ public function bulk_upgrade( $plugins, $args = array() ) {
 					'clear_working'     => true,
 					'is_multi'          => true,
 					'hook_extra'        => array(
-						'plugin' => $plugin,
+						'plugin'      => $plugin,
+						'temp_backup' => array(
+							'slug' => dirname( $plugin ),
+							'src'  => WP_PLUGIN_DIR,
+							'dir'  => 'plugins',
+						),
 					),
 				)
 			);
diff --git a/src/wp-admin/includes/class-theme-upgrader.php b/src/wp-admin/includes/class-theme-upgrader.php
index c550314c5d5ac..3a7beaf1fdb36 100644
--- a/src/wp-admin/includes/class-theme-upgrader.php
+++ b/src/wp-admin/includes/class-theme-upgrader.php
@@ -328,9 +328,14 @@ public function upgrade( $theme, $args = array() ) {
 				'clear_destination' => true,
 				'clear_working'     => true,
 				'hook_extra'        => array(
-					'theme'  => $theme,
-					'type'   => 'theme',
-					'action' => 'update',
+					'theme'       => $theme,
+					'type'        => 'theme',
+					'action'      => 'update',
+					'temp_backup' => array(
+						'slug' => $theme,
+						'src'  => get_theme_root( $theme ),
+						'dir'  => 'themes',
+					),
 				),
 			)
 		);
@@ -443,7 +448,12 @@ public function bulk_upgrade( $themes, $args = array() ) {
 					'clear_working'     => true,
 					'is_multi'          => true,
 					'hook_extra'        => array(
-						'theme' => $theme,
+						'theme'       => $theme,
+						'temp_backup' => array(
+							'slug' => $theme,
+							'src'  => get_theme_root( $theme ),
+							'dir'  => 'themes',
+						),
 					),
 				)
 			);
diff --git a/src/wp-admin/includes/class-wp-site-health.php b/src/wp-admin/includes/class-wp-site-health.php
index 884b37ca5a6c5..8a6fa79827696 100644
--- a/src/wp-admin/includes/class-wp-site-health.php
+++ b/src/wp-admin/includes/class-wp-site-health.php
@@ -1882,6 +1882,196 @@ public function get_test_plugin_theme_auto_updates() {
 		return $result;
 	}
 
+	/**
+	 * Test available disk space for updates.
+	 *
+	 * @since 5.9.0
+	 *
+	 * @return array The test results.
+	 */
+	public function get_test_available_updates_disk_space() {
+		$available_space       = function_exists( 'disk_free_space' ) ? (int) @disk_free_space( WP_CONTENT_DIR . '/upgrade/' ) : false;
+		$available_space_in_mb = $available_space / MB_IN_BYTES;
+
+		$result = array(
+			'label'       => __( 'Disk space available to safely perform updates' ),
+			'status'      => 'good',
+			'badge'       => array(
+				'label' => __( 'Security' ),
+				'color' => 'blue',
+			),
+			'description' => sprintf(
+				/* translators: %s: Available disk space in MB or GB. */
+				'<p>' . __( '%s available disk space was detected, update routines can be performed safely.' ),
+				size_format( $available_space )
+			),
+			'actions'     => '',
+			'test'        => 'available_updates_disk_space',
+		);
+
+		if ( $available_space_in_mb < 100 ) {
+			$result['description'] = __( 'Available disk space is low, less than 100 MB available.' );
+			$result['status']      = 'recommended';
+		}
+
+		if ( $available_space_in_mb < 20 ) {
+			$result['description'] = __( 'Available disk space is critically low, less than 20 MB available. Proceed with caution, updates may fail.' );
+			$result['status']      = 'critical';
+		}
+
+		if ( ! $available_space ) {
+			$result['description'] = __( 'Could not determine available disk space for updates.' );
+			$result['status']      = 'recommended';
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Test if plugin and theme updates temp-backup directories are writable or can be created.
+	 *
+	 * @since 5.9.0
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
+	 *
+	 * @return array The test results.
+	 */
+	public function get_test_update_temp_backup_writable() {
+		global $wp_filesystem;
+
+		$result = array(
+			'label'       => sprintf(
+				/* translators: %s: temp-backup */
+				__( 'Plugin and theme update %s directory is writable' ),
+				'temp-backup'
+			),
+			'status'      => 'good',
+			'badge'       => array(
+				'label' => __( 'Security' ),
+				'color' => 'blue',
+			),
+			'description' => sprintf(
+				/* translators: %s: wp-content/upgrade/temp-backup */
+				'<p>' . __( 'The %s directory used to improve the stability of plugin and theme updates is writable.' ),
+				'<code>wp-content/upgrade/temp-backup</code>'
+			),
+			'actions'     => '',
+			'test'        => 'update_temp_backup_writable',
+		);
+
+		if ( ! $wp_filesystem ) {
+			if ( ! function_exists( 'WP_Filesystem' ) ) {
+				require_once wp_normalize_path( ABSPATH . '/wp-admin/includes/file.php' );
+			}
+			WP_Filesystem();
+		}
+		$wp_content = $wp_filesystem->wp_content_dir();
+
+		$upgrade_dir_exists      = $wp_filesystem->is_dir( "$wp_content/upgrade" );
+		$upgrade_dir_is_writable = $wp_filesystem->is_writable( "$wp_content/upgrade" );
+		$backup_dir_exists       = $wp_filesystem->is_dir( "$wp_content/upgrade/temp-backup" );
+		$backup_dir_is_writable  = $wp_filesystem->is_writable( "$wp_content/upgrade/temp-backup" );
+
+		$plugins_dir_exists      = $wp_filesystem->is_dir( "$wp_content/upgrade/temp-backup/plugins" );
+		$plugins_dir_is_writable = $wp_filesystem->is_writable( "$wp_content/upgrade/temp-backup/plugins" );
+		$themes_dir_exists       = $wp_filesystem->is_dir( "$wp_content/upgrade/temp-backup/themes" );
+		$themes_dir_is_writable  = $wp_filesystem->is_writable( "$wp_content/upgrade/temp-backup/themes" );
+
+		if ( $plugins_dir_exists && ! $plugins_dir_is_writable && $themes_dir_exists && ! $themes_dir_is_writable ) {
+			$result['status']      = 'critical';
+			$result['label']       = sprintf(
+				/* translators: %s: temp-backup */
+				__( 'Plugins and themes %s directories exist but are not writable' ),
+				'temp-backup'
+			);
+			$result['description'] = sprintf(
+				/* translators: 1: wp-content/upgrade/temp-backup/plugins, 2: wp-content/upgrade/temp-backup/themes. */
+				'<p>' . __( 'The %1$s and %2$s directories exist but are not writable. These directories are used to improve the stability of plugin updates. Please make sure the server has write permissions to these directories.' ) . '</p>',
+				'<code>wp-content/upgrade/temp-backup/plugins</code>',
+				'<code>wp-content/upgrade/temp-backup/themes</code>'
+			);
+			return $result;
+		}
+
+		if ( $plugins_dir_exists && ! $plugins_dir_is_writable ) {
+			$result['status']      = 'critical';
+			$result['label']       = sprintf(
+				/* translators: %s: temp-backup */
+				__( 'Plugins %s directory exists but is not writable' ),
+				'temp-backup'
+			);
+			$result['description'] = sprintf(
+				/* translators: %s: wp-content/upgrade/temp-backup/plugins */
+				'<p>' . __( 'The %s directory exists but is not writable. This directory is used to improve the stability of plugin updates. Please make sure the server has write permissions to this directory.' ) . '</p>',
+				'<code>wp-content/upgrade/temp-backup/plugins</code>'
+			);
+			return $result;
+		}
+
+		if ( $themes_dir_exists && ! $themes_dir_is_writable ) {
+			$result['status']      = 'critical';
+			$result['label']       = sprintf(
+				/* translators: %s: temp-backup */
+				__( 'Themes %s directory exists but is not writable' ),
+				'temp-backup'
+			);
+			$result['description'] = sprintf(
+				/* translators: %s: wp-content/upgrade/temp-backup/themes */
+				'<p>' . __( 'The %s directory exists but is not writable. This directory is used to improve the stability of theme updates. Please make sure the server has write permissions to this directory.' ) . '</p>',
+				'<code>wp-content/upgrade/temp-backup/themes</code>'
+			);
+			return $result;
+		}
+
+		if ( ( ! $plugins_dir_exists || ! $themes_dir_exists ) && $backup_dir_exists && ! $backup_dir_is_writable ) {
+			$result['status']      = 'critical';
+			$result['label']       = sprintf(
+				/* translators: %s: temp-backup */
+				__( 'The %s directory exists but is not writable' ),
+				'temp-backup'
+			);
+			$result['description'] = sprintf(
+				/* translators: %s: wp-content/upgrade/temp-backup */
+				'<p>' . __( 'The %s directory exists but is not writable. This directory is used to improve the stability of plugin and theme updates. Please make sure the server has write permissions to this directory.' ) . '</p>',
+				'<code>wp-content/upgrade/temp-backup</code>'
+			);
+			return $result;
+		}
+
+		if ( ! $backup_dir_exists && $upgrade_dir_exists && ! $upgrade_dir_is_writable ) {
+			$result['status']      = 'critical';
+			$result['label']       = sprintf(
+				/* translators: %s: upgrade */
+				__( 'The %s directory exists but is not writable' ),
+				'upgrade'
+			);
+			$result['description'] = sprintf(
+				/* translators: %s: wp-content/upgrade */
+				'<p>' . __( 'The %s directory exists but is not writable. This directory is used for plugin and theme updates. Please make sure the server has write permissions to this directory.' ) . '</p>',
+				'<code>wp-content/upgrade</code>'
+			);
+			return $result;
+		}
+
+		if ( ! $upgrade_dir_exists && ! $wp_filesystem->is_writable( $wp_content ) ) {
+			$result['status']      = 'critical';
+			$result['label']       = sprintf(
+				/* translators: %s: upgrade */
+				__( 'The %s directory cannot be created' ),
+				'upgrade'
+			);
+			$result['description'] = sprintf(
+				/* translators: 1: wp-content/upgrade, 2: wp-content. */
+				'<p>' . __( 'The %1$s directory does not exist, and the server does not have write permissions in %2$s to create it. This directory is used for plugin and theme updates. Please make sure the server has write permissions in %2$s.' ) . '</p>',
+				'<code>wp-content/upgrade</code>',
+				'<code>wp-content</code>'
+			);
+			return $result;
+		}
+
+		return $result;
+	}
+
 	/**
 	 * Test if loopbacks work as expected.
 	 *
@@ -2266,71 +2456,80 @@ public function get_test_authorization_header() {
 	public static function get_tests() {
 		$tests = array(
 			'direct' => array(
-				'wordpress_version'         => array(
+				'wordpress_version'            => array(
 					'label' => __( 'WordPress Version' ),
 					'test'  => 'wordpress_version',
 				),
-				'plugin_version'            => array(
+				'plugin_version'               => array(
 					'label' => __( 'Plugin Versions' ),
 					'test'  => 'plugin_version',
 				),
-				'theme_version'             => array(
+				'theme_version'                => array(
 					'label' => __( 'Theme Versions' ),
 					'test'  => 'theme_version',
 				),
-				'php_version'               => array(
+				'php_version'                  => array(
 					'label' => __( 'PHP Version' ),
 					'test'  => 'php_version',
 				),
-				'php_extensions'            => array(
+				'php_extensions'               => array(
 					'label' => __( 'PHP Extensions' ),
 					'test'  => 'php_extensions',
 				),
-				'php_default_timezone'      => array(
+				'php_default_timezone'         => array(
 					'label' => __( 'PHP Default Timezone' ),
 					'test'  => 'php_default_timezone',
 				),
-				'php_sessions'              => array(
+				'php_sessions'                 => array(
 					'label' => __( 'PHP Sessions' ),
 					'test'  => 'php_sessions',
 				),
-				'sql_server'                => array(
+				'sql_server'                   => array(
 					'label' => __( 'Database Server version' ),
 					'test'  => 'sql_server',
 				),
-				'utf8mb4_support'           => array(
+				'utf8mb4_support'              => array(
 					'label' => __( 'MySQL utf8mb4 support' ),
 					'test'  => 'utf8mb4_support',
 				),
-				'ssl_support'               => array(
+				'ssl_support'                  => array(
 					'label' => __( 'Secure communication' ),
 					'test'  => 'ssl_support',
 				),
-				'scheduled_events'          => array(
+				'scheduled_events'             => array(
 					'label' => __( 'Scheduled events' ),
 					'test'  => 'scheduled_events',
 				),
-				'http_requests'             => array(
+				'http_requests'                => array(
 					'label' => __( 'HTTP Requests' ),
 					'test'  => 'http_requests',
 				),
-				'rest_availability'         => array(
+				'rest_availability'            => array(
 					'label'     => __( 'REST API availability' ),
 					'test'      => 'rest_availability',
 					'skip_cron' => true,
 				),
-				'debug_enabled'             => array(
+				'debug_enabled'                => array(
 					'label' => __( 'Debugging enabled' ),
 					'test'  => 'is_in_debug_mode',
 				),
-				'file_uploads'              => array(
+				'file_uploads'                 => array(
 					'label' => __( 'File uploads' ),
 					'test'  => 'file_uploads',
 				),
-				'plugin_theme_auto_updates' => array(
+				'plugin_theme_auto_updates'    => array(
 					'label' => __( 'Plugin and theme auto-updates' ),
 					'test'  => 'plugin_theme_auto_updates',
 				),
+				'update_temp_backup_writable'  => array(
+					/* translators: %s: temp-backup */
+					'label' => sprintf( __( 'Updates %s directory access' ), 'temp-backup' ),
+					'test'  => 'update_temp_backup_writable',
+				),
+				'available_updates_disk_space' => array(
+					'label' => __( 'Available disk space' ),
+					'test'  => 'available_updates_disk_space',
+				),
 			),
 			'async'  => array(
 				'dotorg_communication' => array(
diff --git a/src/wp-admin/includes/class-wp-upgrader.php b/src/wp-admin/includes/class-wp-upgrader.php
index 72424cf407543..2843d8dd0ba31 100644
--- a/src/wp-admin/includes/class-wp-upgrader.php
+++ b/src/wp-admin/includes/class-wp-upgrader.php
@@ -133,11 +133,25 @@ public function __construct( $skin = null ) {
 	 * This will set the relationship between the skin being used and this upgrader,
 	 * and also add the generic strings to `WP_Upgrader::$strings`.
 	 *
+	 * Additionally, it will schedule a weekly task to clean up the temp-backup directory.
+	 *
 	 * @since 2.8.0
+	 * @since 5.9.0 Added the `schedule_temp_backup_cleanup()` task.
 	 */
 	public function init() {
 		$this->skin->set_upgrader( $this );
 		$this->generic_strings();
+		$this->schedule_temp_backup_cleanup();
+	}
+
+	/**
+	 * Schedule cleanup of the temp-backup directory.
+	 *
+	 * @since 5.9.0
+	 */
+	protected function schedule_temp_backup_cleanup() {
+		wp_schedule_event( time(), 'weekly', 'delete_temp_updater_backups' );
+		add_action( 'delete_temp_updater_backups', array( $this, 'delete_all_temp_backups' ) );
 	}
 
 	/**
@@ -166,6 +180,13 @@ public function generic_strings() {
 
 		$this->strings['maintenance_start'] = __( 'Enabling Maintenance mode&#8230;' );
 		$this->strings['maintenance_end']   = __( 'Disabling Maintenance mode&#8230;' );
+
+		/* translators: %s: temp-backup */
+		$this->strings['temp_backup_mkdir_failed'] = sprintf( __( 'Could not create the %s directory.' ), 'temp-backup' );
+		/* translators: %s: temp-backup */
+		$this->strings['temp_backup_move_failed']    = sprintf( __( 'Could not move old version to the %s directory.' ), 'temp-backup' );
+		$this->strings['temp_backup_restore_failed'] = __( 'Could not restore original version.' );
+
 	}
 
 	/**
@@ -313,6 +334,9 @@ public function unpack_package( $package, $delete_package = true ) {
 		$upgrade_files = $wp_filesystem->dirlist( $upgrade_folder );
 		if ( ! empty( $upgrade_files ) ) {
 			foreach ( $upgrade_files as $file ) {
+				if ( 'temp-backup' === $file['name'] ) {
+					continue;
+				}
 				$wp_filesystem->delete( $upgrade_folder . $file['name'], true );
 			}
 		}
@@ -493,6 +517,13 @@ public function install_package( $args = array() ) {
 			return $res;
 		}
 
+		if ( ! empty( $args['hook_extra']['temp_backup'] ) ) {
+			$temp_backup = $this->move_to_temp_backup_dir( $args['hook_extra']['temp_backup'] );
+			if ( is_wp_error( $temp_backup ) ) {
+				return $temp_backup;
+			}
+		}
+
 		// Retain the original source and destinations.
 		$remote_source     = $args['source'];
 		$local_destination = $destination;
@@ -811,6 +842,9 @@ public function run( $options ) {
 
 		$this->skin->set_result( $result );
 		if ( is_wp_error( $result ) ) {
+			if ( ! empty( $options['hook_extra']['temp_backup'] ) ) {
+				$this->restore_temp_backup( $options['hook_extra']['temp_backup'] );
+			}
 			$this->skin->error( $result );
 
 			if ( ! method_exists( $this->skin, 'hide_process_failed' ) || ! $this->skin->hide_process_failed( $result ) ) {
@@ -823,6 +857,11 @@ public function run( $options ) {
 
 		$this->skin->after();
 
+		// Clean up the backup kept in the temp-backup directory.
+		if ( ! empty( $options['hook_extra']['temp_backup'] ) ) {
+			$this->delete_temp_backup( $options['hook_extra']['temp_backup'] );
+		}
+
 		if ( ! $options['is_multi'] ) {
 
 			/**
@@ -948,6 +987,154 @@ public static function release_lock( $lock_name ) {
 		return delete_option( $lock_name . '.lock' );
 	}
 
+	/**
+	 * Moves the plugin/theme being updated into a temp-backup directory.
+	 *
+	 * @since 5.9.0
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
+	 *
+	 * @param array $args Array of data for the temp-backup. Must include a slug, the source, and directory.
+	 * @return bool|WP_Error
+	 */
+	public function move_to_temp_backup_dir( $args ) {
+		global $wp_filesystem;
+
+		if ( empty( $args['slug'] ) || empty( $args['src'] ) || empty( $args['dir'] ) ) {
+			return false;
+		}
+
+		$dest_dir = $wp_filesystem->wp_content_dir() . 'upgrade/temp-backup/';
+		// Create the temp-backup directory if it doesn't exist.
+		if ( (
+				! $wp_filesystem->is_dir( $dest_dir )
+				&& ! $wp_filesystem->mkdir( $dest_dir )
+			) || (
+				! $wp_filesystem->is_dir( $dest_dir . $args['dir'] . '/' )
+				&& ! $wp_filesystem->mkdir( $dest_dir . $args['dir'] . '/' )
+			)
+		) {
+			return new WP_Error( 'fs_temp_backup_mkdir', $this->strings['temp_backup_mkdir_failed'] );
+		}
+
+		$src  = trailingslashit( $args['src'] ) . $args['slug'];
+		$dest = $dest_dir . $args['dir'] . '/' . $args['slug'];
+
+		// Delete the temp-backup directory if it already exists.
+		if ( $wp_filesystem->is_dir( $dest ) ) {
+			$wp_filesystem->delete( $dest, true );
+		}
+
+		// Move to the temp-backup directory.
+		if ( ! $wp_filesystem->move( $src, $dest, true ) ) {
+			return new WP_Error( 'fs_temp_backup_move', $this->strings['temp_backup_move_failed'] );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Restores the plugin/theme from the temp-backup directory.
+	 *
+	 * @since 5.9.0
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
+	 *
+	 * @param array $args Array of data for the temp-backup. Must include a slug, the source, and directory.
+	 * @return bool|WP_Error
+	 */
+	public function restore_temp_backup( $args ) {
+		global $wp_filesystem;
+
+		if ( empty( $args['slug'] ) || empty( $args['src'] ) || empty( $args['dir'] ) ) {
+			return false;
+		}
+
+		$src  = $wp_filesystem->wp_content_dir() . 'upgrade/temp-backup/' . $args['dir'] . '/' . $args['slug'];
+		$dest = trailingslashit( $args['src'] ) . $args['slug'];
+
+		if ( $wp_filesystem->is_dir( $src ) ) {
+			// Cleanup.
+			if ( $wp_filesystem->is_dir( $dest ) && ! $wp_filesystem->delete( $dest, true ) ) {
+				return new WP_Error( 'fs_temp_backup_delete', $this->strings['temp_backup_restore_failed'] );
+			}
+
+			// Move it.
+			if ( ! $wp_filesystem->move( $src, $dest, true ) ) {
+				return new WP_Error( 'fs_temp_backup_delete', $this->strings['temp_backup_restore_failed'] );
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Deletes a temp-backup.
+	 *
+	 * @since 5.9.0
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
+	 *
+	 * @param array $args Array of data for the temp-backup. Must include a slug, the source, and directory.
+	 * @return bool
+	 */
+	public function delete_temp_backup( $args ) {
+		global $wp_filesystem;
+
+		if ( empty( $args['slug'] ) || empty( $args['dir'] ) ) {
+			return false;
+		}
+
+		return $wp_filesystem->delete(
+			$wp_filesystem->wp_content_dir() . "upgrade/temp-backup/{$args['dir']}/{$args['slug']}",
+			true
+		);
+	}
+
+	/**
+	 * Deletes all contents of the temp-backup directory.
+	 *
+	 * @since 5.9.0
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
+	 */
+	public function delete_all_temp_backups() {
+		/*
+		 * Check if there's a lock, or if currently performing an Ajax request,
+		 * in which case there's a chance we're doing an update.
+		 * Reschedule for an hour from now and exit early.
+		 */
+		if ( get_option( 'core_updater.lock' ) || get_option( 'auto_updater.lock' ) || wp_doing_ajax() ) {
+			wp_schedule_single_event( time() + HOUR_IN_SECONDS, 'delete_temp_updater_backups' );
+			return;
+		}
+
+		add_action(
+			'shutdown',
+			/*
+			 * This action runs on shutdown to make sure there's no plugin updates currently running.
+			 * Using a closure in this case is OK since the action can be removed by removing the parent hook.
+			 */
+			function() {
+				global $wp_filesystem;
+
+				if ( ! $wp_filesystem ) {
+					include_once ABSPATH . '/wp-admin/includes/file.php';
+					WP_Filesystem();
+				}
+
+				$dirlist = $wp_filesystem->dirlist( $wp_filesystem->wp_content_dir() . 'upgrade/temp-backup/' );
+
+				foreach ( array_keys( $dirlist ) as $dir ) {
+					if ( '.' === $dir || '..' === $dir ) {
+						continue;
+					}
+
+					$wp_filesystem->delete( $wp_filesystem->wp_content_dir() . 'upgrade/temp-backup/' . $dir, true );
+				}
+			}
+		);
+	}
 }
 
 /** Plugin_Upgrader class */

From c0b328a74d090f73f13c93094c69c4c1ea3d18e3 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Wed, 15 Sep 2021 19:05:20 +0000
Subject: [PATCH 134/257] Media: Fix `$content` parameter default value in
 `img_caption_shortcode()`.

The shortcode content is expected to be a string, not `null`. `do_shortcode()` expects a string for `$content`.

The `img_caption_shortcode()` also expects a string for the `$content` parameter and is expected to return a string for the HTML content to display the caption.

Prior to this commit:
The default value for the `$content` parameter was set to `null`. If no `$content` was passed, the function:
- could return `null` when the `$atts['width'] < 1` or there was no caption
- else, it invoked `do_shortcode( $content )` passing `null` which on PHP 8.1+ triggers a deprecation notice:
{{{
strpos(): Passing null to parameter #1 ($haystack) of type string is deprecated
}}}

This commit:

- Fixes the default `$content` value to align to the expected shortcode content of `string`, not `null`.
- Fixes the PHP 8.1 deprecation notice when `null` was being passed to `do_shortcode()`.
- Changes the assertion in a couple of tests to check for the empty string instead of `null.

Follow-up to [8196], [8925], [8239], [26915], [31530], [42704].

Props jrf, hellofromTonya, azaozz, joedolson.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51816 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/media.php     | 5 +++--
 tests/phpunit/tests/media.php | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/wp-includes/media.php b/src/wp-includes/media.php
index 340ddc3bb4883..43795c9084463 100644
--- a/src/wp-includes/media.php
+++ b/src/wp-includes/media.php
@@ -2085,6 +2085,7 @@ function _wp_post_thumbnail_class_filter_remove( $attr ) {
  * @since 2.6.0
  * @since 3.9.0 The `class` attribute was added.
  * @since 5.1.0 The `caption_id` attribute was added.
+ * @since 5.9.0 The `$content` parameter default value changed from `null` to `''`.
  *
  * @param array  $attr {
  *     Attributes of the caption shortcode.
@@ -2097,10 +2098,10 @@ function _wp_post_thumbnail_class_filter_remove( $attr ) {
  *     @type string $caption    The caption text.
  *     @type string $class      Additional class name(s) added to the caption container.
  * }
- * @param string $content Shortcode content.
+ * @param string $content Optional. Shortcode content. Default empty string.
  * @return string HTML content to display the caption.
  */
-function img_caption_shortcode( $attr, $content = null ) {
+function img_caption_shortcode( $attr, $content = '' ) {
 	// New-style shortcode with the caption inside the shortcode with the link and image tags.
 	if ( ! isset( $attr['caption'] ) ) {
 		if ( preg_match( '#((?:<a [^>]+>\s*)?<img [^>]+>(?:\s*</a>)?)(.*)#is', $content, $matches ) ) {
diff --git a/tests/phpunit/tests/media.php b/tests/phpunit/tests/media.php
index 79cc067712d4d..1be2526ff47d9 100644
--- a/tests/phpunit/tests/media.php
+++ b/tests/phpunit/tests/media.php
@@ -84,7 +84,7 @@ function test_img_caption_shortcode_added() {
 
 	function test_img_caption_shortcode_with_empty_params() {
 		$result = img_caption_shortcode( array() );
-		$this->assertNull( $result );
+		$this->assertSame( '', $result );
 	}
 
 	/**
@@ -134,7 +134,7 @@ function test_img_caption_shortcode_empty_caption() {
 				'caption' => '',
 			)
 		);
-		$this->assertNull( $result );
+		$this->assertSame( '', $result );
 	}
 
 	/**

From 07a7b4262ba797a40edd3a134c0eb7cebc747251 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Wed, 15 Sep 2021 21:21:58 +0000
Subject: [PATCH 135/257] Build/Test Tools: Reworks
 `Tests_Option_Option::test_bad_option_names()` into data provider.

The existing tests were running multiple functions through a `foreach()`. If any test failed, it would bail out and not test against the other scenarios.

This commit:

- Moves the scenarios to a data provider with named data sets, i.e. to ensure all scenarios are run and tested regardless if any fail.
- Splits each function under test into individual test methods.
- Adds a float scenario.
- Adds method visibility modifiers.

Follow-up to [25002].

Props jrf, hellofromTonya, pbearne.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51817 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/option/option.php | 63 ++++++++++++++++++++++++---
 1 file changed, 56 insertions(+), 7 deletions(-)

diff --git a/tests/phpunit/tests/option/option.php b/tests/phpunit/tests/option/option.php
index 0f67fa9490f48..79331f9a241e4 100644
--- a/tests/phpunit/tests/option/option.php
+++ b/tests/phpunit/tests/option/option.php
@@ -89,14 +89,63 @@ function test_serialized_data() {
 
 	/**
 	 * @ticket 23289
+	 *
+	 * @dataProvider data_bad_option_names
+	 *
+	 * @param mixed $option_name Option name.
+	 */
+	public function test_get_option_bad_option_name( $option_name ) {
+		$this->assertFalse( get_option( $option_name ) );
+	}
+
+	/**
+	 * @ticket 23289
+	 *
+	 * @dataProvider data_bad_option_names
+	 *
+	 * @param mixed $option_name Option name.
+	 */
+	public function test_add_option_bad_option_name( $option_name ) {
+		$this->assertFalse( add_option( $option_name, '' ) );
+	}
+
+	/**
+	 * @ticket 23289
+	 *
+	 * @dataProvider data_bad_option_names
+	 *
+	 * @param mixed $option_name Option name.
+	 */
+	public function test_update_option_bad_option_name( $option_name ) {
+		$this->assertFalse( update_option( $option_name, '' ) );
+	}
+
+	/**
+	 * @ticket 23289
+	 *
+	 * @dataProvider data_bad_option_names
+	 *
+	 * @param mixed $option_name Option name.
 	 */
-	function test_bad_option_names() {
-		foreach ( array( '', '0', ' ', 0, false, null ) as $empty ) {
-			$this->assertFalse( get_option( $empty ) );
-			$this->assertFalse( add_option( $empty, '' ) );
-			$this->assertFalse( update_option( $empty, '' ) );
-			$this->assertFalse( delete_option( $empty ) );
-		}
+	public function test_delete_option_bad_option_name( $option_name ) {
+		$this->assertFalse( delete_option( $option_name ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_bad_option_names() {
+		return array(
+			'empty string'        => array( '' ),
+			'string 0'            => array( '0' ),
+			'string single space' => array( ' ' ),
+			'integer 0'           => array( 0 ),
+			'float 0.0'           => array( 0.0 ),
+			'boolean false'       => array( false ),
+			'null'                => array( null ),
+		);
 	}
 
 	/**

From 97790af164b20a72640b3497af4c5a3986d8cf32 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Wed, 15 Sep 2021 22:18:36 +0000
Subject: [PATCH 136/257] Options, Meta APIs: Fix "passing null to
 non-nullable" deprecations to `(get|add|update|delete)_option()`.

In all four of the `get_option()`, `add_option()`, `update_option()` and `delete_option()` functions, the `$option` parameter (i.e. the option name) is passed to the PHP native `trim()` function without prior input validation.

In PHP 8.1, this could lead to a `trim(): Passing null to parameter #1 ($string) of type string is deprecated` for each of these functions.

`trim()`:

- expects a text string and is only useful when ''passed'' a text string as no other variable type can contain whitespace.
- will always return a `string`, which means that in practice for any non-string values passed, it would effectively function as a type cast to string.

This commit:
- Adds a check to verify the `$option` name is a scalar before processing it with `trim()`.
- The "type cast" behavior is maintained.
- If the given `$option` name is not a scalar, such as `null`, the fix prevents the PHP 8.1 deprecation notice.
- Tests are added for valid but undesired option names to safeguard against regressions.

This issue is already covered by:
- the existing `Tests_Option_Option::test_bad_option_names()` test group.
- the new `test_valid_but_undesired_option_names()` tests.

Follow-up to [13858], [22633], [23510], [25002], [51817].

Props jrf, hellofromTonya, pbearne.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51818 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/option.php            | 20 +++++++--
 tests/phpunit/tests/option/option.php | 60 +++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/src/wp-includes/option.php b/src/wp-includes/option.php
index ec41b060ae6cf..dc2195949f480 100644
--- a/src/wp-includes/option.php
+++ b/src/wp-includes/option.php
@@ -77,7 +77,10 @@
 function get_option( $option, $default = false ) {
 	global $wpdb;
 
-	$option = trim( $option );
+	if ( is_scalar( $option ) ) {
+		$option = trim( $option );
+	}
+
 	if ( empty( $option ) ) {
 		return false;
 	}
@@ -378,7 +381,10 @@ function wp_load_core_site_options( $network_id = null ) {
 function update_option( $option, $value, $autoload = null ) {
 	global $wpdb;
 
-	$option = trim( $option );
+	if ( is_scalar( $option ) ) {
+		$option = trim( $option );
+	}
+
 	if ( empty( $option ) ) {
 		return false;
 	}
@@ -565,7 +571,10 @@ function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' )
 		_deprecated_argument( __FUNCTION__, '2.3.0' );
 	}
 
-	$option = trim( $option );
+	if ( is_scalar( $option ) ) {
+		$option = trim( $option );
+	}
+
 	if ( empty( $option ) ) {
 		return false;
 	}
@@ -687,7 +696,10 @@ function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' )
 function delete_option( $option ) {
 	global $wpdb;
 
-	$option = trim( $option );
+	if ( is_scalar( $option ) ) {
+		$option = trim( $option );
+	}
+
 	if ( empty( $option ) ) {
 		return false;
 	}
diff --git a/tests/phpunit/tests/option/option.php b/tests/phpunit/tests/option/option.php
index 79331f9a241e4..a2145f1c1845e 100644
--- a/tests/phpunit/tests/option/option.php
+++ b/tests/phpunit/tests/option/option.php
@@ -148,6 +148,66 @@ public function data_bad_option_names() {
 		);
 	}
 
+	/**
+	 * @ticket 53635
+	 *
+	 * @dataProvider data_valid_but_undesired_option_names
+	 *
+	 * @param mixed $option_name Option name.
+	 */
+	public function test_get_option_valid_but_undesired_option_names( $option_name ) {
+		$this->assertFalse( get_option( $option_name ) );
+	}
+
+	/**
+	 * @ticket 53635
+	 *
+	 * @dataProvider data_valid_but_undesired_option_names
+	 *
+	 * @param mixed $option_name Option name.
+	 */
+	public function test_add_option_valid_but_undesired_option_names( $option_name ) {
+		$this->assertTrue( add_option( $option_name, '' ) );
+	}
+
+	/**
+	 * @ticket 53635
+	 *
+	 * @dataProvider data_valid_but_undesired_option_names
+	 *
+	 * @param mixed $option_name Option name.
+	 */
+	public function test_update_option_valid_but_undesired_option_names( $option_name ) {
+		$this->assertTrue( update_option( $option_name, '' ) );
+	}
+
+	/**
+	 * @ticket 53635
+	 *
+	 * @dataProvider data_valid_but_undesired_option_names
+	 *
+	 * @param mixed $option_name Option name.
+	 */
+	public function test_delete_option_valid_but_undesired_option_names( $option_name ) {
+		$this->assertFalse( delete_option( $option_name ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_valid_but_undesired_option_names() {
+		return array(
+			'string 123'   => array( '123' ),
+			'integer 123'  => array( 123 ),
+			'integer -123' => array( -123 ),
+			'float 12.3'   => array( 12.3 ),
+			'float -1.23'  => array( -1.23 ),
+			'boolean true' => array( true ),
+		);
+	}
+
 	/**
 	 * @ticket 23289
 	 */

From 57ad9f16dff35a879e856566489266472589ea04 Mon Sep 17 00:00:00 2001
From: Jorge Costa <jorgefilipecosta@git.wordpress.org>
Date: Thu, 16 Sep 2021 18:03:04 +0000
Subject: [PATCH 137/257] Block editor: Cache global stylesheet by theme key.

Global styles are used in a few different contexts (front, editor, customizer, the theme directory). In the last two contexts, it's important that switching themes immediately refreshes the global stylesheet, to avoid situations in which the styles of the previous theme load with the new one. This was brought up at WordPress/gutenberg#34531 (customizer) and at meta.trac.wordpress.org/ticket/5818 (theme directory).
This commit makes sure the stylesheet is regenerated upon switching themes.

Props oandregal, dd32.
See #53175.

git-svn-id: https://develop.svn.wordpress.org/trunk@51819 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/script-loader.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index 9e0d5cb721973..0a6ce2637c523 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -2300,8 +2300,9 @@ function wp_enqueue_global_styles() {
 	);
 
 	$stylesheet = null;
+	$transient_name = 'global_styles_' . get_stylesheet();
 	if ( $can_use_cache ) {
-		$cache = get_transient( 'global_styles' );
+		$cache = get_transient( $transient_name );
 		if ( $cache ) {
 			$stylesheet = $cache;
 		}
@@ -2313,7 +2314,7 @@ function wp_enqueue_global_styles() {
 		$stylesheet = $theme_json->get_stylesheet();
 
 		if ( $can_use_cache ) {
-			set_transient( 'global_styles', $stylesheet, MINUTE_IN_SECONDS );
+			set_transient( $transient_name, $stylesheet, MINUTE_IN_SECONDS );
 		}
 	}
 

From ecad6ae28cf0b9755945d1d6a09e807a43fba6a2 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Thu, 16 Sep 2021 21:30:36 +0000
Subject: [PATCH 138/257] Twenty Twenty-One: Add missing escaping for the
 "Secondary menu" label.

Props muhammadfaizanhaidar, teucrium, sabernhardt, mukesh27, SergeyBiryukov.
Fixes #54127.

git-svn-id: https://develop.svn.wordpress.org/trunk@51820 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-content/themes/twentytwentyone/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-content/themes/twentytwentyone/functions.php b/src/wp-content/themes/twentytwentyone/functions.php
index df98fef838270..74d1d339f5963 100644
--- a/src/wp-content/themes/twentytwentyone/functions.php
+++ b/src/wp-content/themes/twentytwentyone/functions.php
@@ -74,7 +74,7 @@ function twenty_twenty_one_setup() {
 		register_nav_menus(
 			array(
 				'primary' => esc_html__( 'Primary menu', 'twentytwentyone' ),
-				'footer'  => __( 'Secondary menu', 'twentytwentyone' ),
+				'footer'  => esc_html__( 'Secondary menu', 'twentytwentyone' ),
 			)
 		);
 

From ab9b51e5e31a565c6da5398d4af51d4749168a90 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <pento@git.wordpress.org>
Date: Fri, 17 Sep 2021 03:12:35 +0000
Subject: [PATCH 139/257] Embeds: Add Pinterest as a trusted oEmbed provider.

Props ayeshrajans, pento.

Fixes #53448.


git-svn-id: https://develop.svn.wordpress.org/trunk@51821 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-oembed.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/wp-includes/class-wp-oembed.php b/src/wp-includes/class-wp-oembed.php
index 4226e8163eaf4..2efb8903058d0 100644
--- a/src/wp-includes/class-wp-oembed.php
+++ b/src/wp-includes/class-wp-oembed.php
@@ -102,6 +102,7 @@ public function __construct() {
 			'#https?://www\.someecards\.com/usercards/viewcard/.+#i' => array( 'https://www.someecards.com/v2/oembed/', true ),
 			'#https?://some\.ly\/.+#i'                     => array( 'https://www.someecards.com/v2/oembed/', true ),
 			'#https?://(www\.)?tiktok\.com/.*/video/.*#i'  => array( 'https://www.tiktok.com/oembed', true ),
+			'#https?://([a-z]{2}|www)\.pinterest\.com(\.(au|mx))?/.*#i' => array( 'https://www.pinterest.com/oembed.json', true ),
 		);
 
 		if ( ! empty( self::$early_providers['add'] ) ) {
@@ -179,6 +180,7 @@ public function __construct() {
 		 * | Someecards   | some.ly                                   | 4.9.0   |
 		 * | Crowdsignal  | survey.fm                                 | 5.1.0   |
 		 * | TikTok       | tiktok.com                                | 5.4.0   |
+		 * | Pinterest    | pinterest.com                             | 5.9.0   |
 		 *
 		 * No longer supported providers:
 		 *

From f386f6f5edb68d7f6d104e05f6454c1cb89bfeb9 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sat, 18 Sep 2021 19:54:30 +0000
Subject: [PATCH 140/257] Coding Standards: Use strict comparison in
 `wp-inclues/class-wp-http-cookie.php`.

Follow-up to [10512].

See #53359.

git-svn-id: https://develop.svn.wordpress.org/trunk@51822 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-http-cookie.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/class-wp-http-cookie.php b/src/wp-includes/class-wp-http-cookie.php
index 1e78e3697991c..a80bc48a9f1ff 100644
--- a/src/wp-includes/class-wp-http-cookie.php
+++ b/src/wp-includes/class-wp-http-cookie.php
@@ -187,7 +187,7 @@ public function test( $url ) {
 
 		// Host - very basic check that the request URL ends with the domain restriction (minus leading dot).
 		$domain = ( '.' === substr( $domain, 0, 1 ) ) ? substr( $domain, 1 ) : $domain;
-		if ( substr( $url['host'], -strlen( $domain ) ) != $domain ) {
+		if ( substr( $url['host'], -strlen( $domain ) ) !== $domain ) {
 			return false;
 		}
 
@@ -197,7 +197,7 @@ public function test( $url ) {
 		}
 
 		// Path - request path must start with path restriction.
-		if ( substr( $url['path'], 0, strlen( $path ) ) != $path ) {
+		if ( substr( $url['path'], 0, strlen( $path ) ) !== $path ) {
 			return false;
 		}
 

From be12fd20efd7e48edd424a3894a114fae2d7edcf Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sun, 19 Sep 2021 16:57:46 +0000
Subject: [PATCH 141/257] Coding Standards: Rename the `$arrURL` variable to
 `$parsed_url` in `WP_Http::request()`.

This fixes a `Variable "$arrURL" is not in valid snake_case format` WPCS warning.

Follow-up to [10509], [45667].

See #53359.

git-svn-id: https://develop.svn.wordpress.org/trunk@51823 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-http.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/class-http.php b/src/wp-includes/class-http.php
index 24b7724b89cb5..320b4fcf1c188 100644
--- a/src/wp-includes/class-http.php
+++ b/src/wp-includes/class-http.php
@@ -269,9 +269,9 @@ public function request( $url, $args = array() ) {
 			}
 		}
 
-		$arrURL = parse_url( $url );
+		$parsed_url = parse_url( $url );
 
-		if ( empty( $url ) || empty( $arrURL['scheme'] ) ) {
+		if ( empty( $url ) || empty( $parsed_url['scheme'] ) ) {
 			$response = new WP_Error( 'http_request_failed', __( 'A valid URL was not provided.' ) );
 			/** This action is documented in wp-includes/class-http.php */
 			do_action( 'http_api_debug', $response, 'response', 'Requests', $parsed_args, $url );

From 4d669c9ec5ba4c7000b44099ec16bedbd060ce87 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sun, 19 Sep 2021 16:58:43 +0000
Subject: [PATCH 142/257] Coding Standards: Rename the `$arrURL` variable to
 `$parsed_url` in `WP_Http_Cookie::__construct()`.

This fixes a `Variable "$arrURL" is not in valid snake_case format` WPCS warning.

Follow-up to [10509], [25044], [45667], [51823].

See #53359.

git-svn-id: https://develop.svn.wordpress.org/trunk@51824 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-http-cookie.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wp-includes/class-wp-http-cookie.php b/src/wp-includes/class-wp-http-cookie.php
index a80bc48a9f1ff..ec3425d83b7bc 100644
--- a/src/wp-includes/class-wp-http-cookie.php
+++ b/src/wp-includes/class-wp-http-cookie.php
@@ -93,12 +93,12 @@ class WP_Http_Cookie {
 	 */
 	public function __construct( $data, $requested_url = '' ) {
 		if ( $requested_url ) {
-			$arrURL = parse_url( $requested_url );
+			$parsed_url = parse_url( $requested_url );
 		}
-		if ( isset( $arrURL['host'] ) ) {
-			$this->domain = $arrURL['host'];
+		if ( isset( $parsed_url['host'] ) ) {
+			$this->domain = $parsed_url['host'];
 		}
-		$this->path = isset( $arrURL['path'] ) ? $arrURL['path'] : '/';
+		$this->path = isset( $parsed_url['path'] ) ? $parsed_url['path'] : '/';
 		if ( '/' !== substr( $this->path, -1 ) ) {
 			$this->path = dirname( $this->path ) . '/';
 		}

From a6408603aa9df68d0c68c18a6cb3dba65ff1137a Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sun, 19 Sep 2021 16:59:35 +0000
Subject: [PATCH 143/257] Coding Standards: Rename the `$arrURL` variable to
 `$parsed_url` in `WP_Http_Streams::request()`.

This fixes a `Variable "$arrURL" is not in valid snake_case format` WPCS warning.

Follow-up to [8620], [10509], [25044], [25224], [45667], [51823], [51824].

See #53359.

git-svn-id: https://develop.svn.wordpress.org/trunk@51825 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-http-streams.php | 42 +++++++++++------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/wp-includes/class-wp-http-streams.php b/src/wp-includes/class-wp-http-streams.php
index 93933d7be781f..95ff2a1a20622 100644
--- a/src/wp-includes/class-wp-http-streams.php
+++ b/src/wp-includes/class-wp-http-streams.php
@@ -51,30 +51,30 @@ public function request( $url, $args = array() ) {
 		// Construct Cookie: header if any cookies are set.
 		WP_Http::buildCookieHeader( $parsed_args );
 
-		$arrURL = parse_url( $url );
+		$parsed_url = parse_url( $url );
 
-		$connect_host = $arrURL['host'];
+		$connect_host = $parsed_url['host'];
 
-		$secure_transport = ( 'ssl' === $arrURL['scheme'] || 'https' === $arrURL['scheme'] );
-		if ( ! isset( $arrURL['port'] ) ) {
-			if ( 'ssl' === $arrURL['scheme'] || 'https' === $arrURL['scheme'] ) {
-				$arrURL['port']   = 443;
-				$secure_transport = true;
+		$secure_transport = ( 'ssl' === $parsed_url['scheme'] || 'https' === $parsed_url['scheme'] );
+		if ( ! isset( $parsed_url['port'] ) ) {
+			if ( 'ssl' === $parsed_url['scheme'] || 'https' === $parsed_url['scheme'] ) {
+				$parsed_url['port'] = 443;
+				$secure_transport   = true;
 			} else {
-				$arrURL['port'] = 80;
+				$parsed_url['port'] = 80;
 			}
 		}
 
 		// Always pass a path, defaulting to the root in cases such as http://example.com.
-		if ( ! isset( $arrURL['path'] ) ) {
-			$arrURL['path'] = '/';
+		if ( ! isset( $parsed_url['path'] ) ) {
+			$parsed_url['path'] = '/';
 		}
 
 		if ( isset( $parsed_args['headers']['Host'] ) || isset( $parsed_args['headers']['host'] ) ) {
 			if ( isset( $parsed_args['headers']['Host'] ) ) {
-				$arrURL['host'] = $parsed_args['headers']['Host'];
+				$parsed_url['host'] = $parsed_args['headers']['Host'];
 			} else {
-				$arrURL['host'] = $parsed_args['headers']['host'];
+				$parsed_url['host'] = $parsed_args['headers']['host'];
 			}
 			unset( $parsed_args['headers']['Host'], $parsed_args['headers']['host'] );
 		}
@@ -114,7 +114,7 @@ public function request( $url, $args = array() ) {
 			array(
 				'ssl' => array(
 					'verify_peer'       => $ssl_verify,
-					// 'CN_match' => $arrURL['host'], // This is handled by self::verify_ssl_certificate().
+					// 'CN_match' => $parsed_url['host'], // This is handled by self::verify_ssl_certificate().
 					'capture_peer_cert' => $ssl_verify,
 					'SNI_enabled'       => true,
 					'cafile'            => $parsed_args['sslcertificates'],
@@ -144,7 +144,7 @@ public function request( $url, $args = array() ) {
 				$handle = @stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
 			} else {
 				// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-				$handle = @stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+				$handle = @stream_socket_client( $connect_host . ':' . $parsed_url['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
 			}
 
 			if ( $secure_transport ) {
@@ -154,7 +154,7 @@ public function request( $url, $args = array() ) {
 			if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
 				$handle = stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
 			} else {
-				$handle = stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+				$handle = stream_socket_client( $connect_host . ':' . $parsed_url['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
 			}
 		}
 
@@ -169,7 +169,7 @@ public function request( $url, $args = array() ) {
 
 		// Verify that the SSL certificate is valid for this request.
 		if ( $secure_transport && $ssl_verify && ! $proxy->is_enabled() ) {
-			if ( ! self::verify_ssl_certificate( $handle, $arrURL['host'] ) ) {
+			if ( ! self::verify_ssl_certificate( $handle, $parsed_url['host'] ) ) {
 				return new WP_Error( 'http_request_failed', __( 'The SSL certificate for the host could not be verified.' ) );
 			}
 		}
@@ -179,21 +179,21 @@ public function request( $url, $args = array() ) {
 		if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) { // Some proxies require full URL in this field.
 			$requestPath = $url;
 		} else {
-			$requestPath = $arrURL['path'] . ( isset( $arrURL['query'] ) ? '?' . $arrURL['query'] : '' );
+			$requestPath = $parsed_url['path'] . ( isset( $parsed_url['query'] ) ? '?' . $parsed_url['query'] : '' );
 		}
 
 		$strHeaders = strtoupper( $parsed_args['method'] ) . ' ' . $requestPath . ' HTTP/' . $parsed_args['httpversion'] . "\r\n";
 
 		$include_port_in_host_header = (
 			( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) ||
-			( 'http' === $arrURL['scheme'] && 80 != $arrURL['port'] ) ||
-			( 'https' === $arrURL['scheme'] && 443 != $arrURL['port'] )
+			( 'http' === $parsed_url['scheme'] && 80 != $parsed_url['port'] ) ||
+			( 'https' === $parsed_url['scheme'] && 443 != $parsed_url['port'] )
 		);
 
 		if ( $include_port_in_host_header ) {
-			$strHeaders .= 'Host: ' . $arrURL['host'] . ':' . $arrURL['port'] . "\r\n";
+			$strHeaders .= 'Host: ' . $parsed_url['host'] . ':' . $parsed_url['port'] . "\r\n";
 		} else {
-			$strHeaders .= 'Host: ' . $arrURL['host'] . "\r\n";
+			$strHeaders .= 'Host: ' . $parsed_url['host'] . "\r\n";
 		}
 
 		if ( isset( $parsed_args['user-agent'] ) ) {

From 8873b17424d19e3d1ffba29d9f914b184b8e5066 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 20 Sep 2021 12:05:20 +0000
Subject: [PATCH 144/257] Coding Standards: Rename the `$processedHeaders`
 variable to `$processed_headers` in `WP_Http::request()`.

This fixes a `Variable "$processedHeaders" is not in valid snake_case format` WPCS warning.

Follow-up to [8620], [51823].

See #53359.

git-svn-id: https://develop.svn.wordpress.org/trunk@51826 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-http.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/class-http.php b/src/wp-includes/class-http.php
index 320b4fcf1c188..861d1d0e4b277 100644
--- a/src/wp-includes/class-http.php
+++ b/src/wp-includes/class-http.php
@@ -309,8 +309,8 @@ public function request( $url, $args = array() ) {
 
 		// WP allows passing in headers as a string, weirdly.
 		if ( ! is_array( $parsed_args['headers'] ) ) {
-			$processedHeaders       = WP_Http::processHeaders( $parsed_args['headers'] );
-			$parsed_args['headers'] = $processedHeaders['headers'];
+			$processed_headers      = WP_Http::processHeaders( $parsed_args['headers'] );
+			$parsed_args['headers'] = $processed_headers['headers'];
 		}
 
 		// Setup arguments.

From e881178e78c11f9cd243f884e268143bf6721bbb Mon Sep 17 00:00:00 2001
From: John James Jacoby <johnjamesjacoby@git.wordpress.org>
Date: Mon, 20 Sep 2021 16:18:04 +0000
Subject: [PATCH 145/257] Docs: Remove deprecated option groups from
 `register_setting()` and `add_option_update_handler()`.

* `misc` was deprecated in version 3.0.0.
* `privacy` was deprecated in version 3.5.0.

See #53399.



git-svn-id: https://develop.svn.wordpress.org/trunk@51827 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/deprecated.php | 2 +-
 src/wp-includes/option.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/includes/deprecated.php b/src/wp-admin/includes/deprecated.php
index 75c0ed3d87b41..27ce1d4e4f110 100644
--- a/src/wp-admin/includes/deprecated.php
+++ b/src/wp-admin/includes/deprecated.php
@@ -165,7 +165,7 @@ function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $le
  *
  * @param string $option_group A settings group name. Should correspond to an allowed option key name.
  *                             Default allowed option key names include 'general', 'discussion', 'media',
- *                             'reading', 'writing', 'misc', 'options', and 'privacy'.
+ *                             'reading', 'writing', and 'options'.
  * @param string $option_name The name of an option to sanitize and save.
  * @param callable $sanitize_callback A callback function that sanitizes the option's value.
  */
diff --git a/src/wp-includes/option.php b/src/wp-includes/option.php
index dc2195949f480..1aec64c2534f8 100644
--- a/src/wp-includes/option.php
+++ b/src/wp-includes/option.php
@@ -2259,7 +2259,7 @@ function register_initial_settings() {
  *
  * @param string $option_group A settings group name. Should correspond to an allowed option key name.
  *                             Default allowed option key names include 'general', 'discussion', 'media',
- *                             'reading', 'writing', 'misc', 'options', and 'privacy'.
+ *                             'reading', 'writing', and 'options'.
  * @param string $option_name The name of an option to sanitize and save.
  * @param array  $args {
  *     Data used to describe the setting when registered.

From fe9f6a29ac9f28ac75c3d3335a2daa856fd0eb4d Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Mon, 20 Sep 2021 16:44:00 +0000
Subject: [PATCH 146/257] Build/Test Tools: Improve Composer update command in
 bootstrap error messages.

Refines the test bootstrap error message to include the `-W` in the Composer update command.

Why?

To also update the chain of dependencies for the tests' dependencies.

`composer update` will update the tests' direct dependencies.

`composer update -W` will update the dependencies including *their* dependencies, which is the recommended course of action for WP.

Follow-up to [51598], [51811], [51813].

Props jrf.
See #46149.

git-svn-id: https://develop.svn.wordpress.org/trunk@51828 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/includes/bootstrap.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/phpunit/includes/bootstrap.php b/tests/phpunit/includes/bootstrap.php
index 5d6ded0bcb969..f366c8ce0379a 100644
--- a/tests/phpunit/includes/bootstrap.php
+++ b/tests/phpunit/includes/bootstrap.php
@@ -66,7 +66,7 @@
  * {@link https://make.wordpress.org/core/handbook/testing/automated-testing/phpunit/#test-running-workflow-options}
  *
  * Plugin/theme integration tests can handle this in any of the following ways:
- * - When using a full WP install: run `composer update` for the WP install prior to running the tests.
+ * - When using a full WP install: run `composer update -W` for the WP install prior to running the tests.
  * - When using a partial WP test suite install:
  *   - Add a `yoast/phpunit-polyfills` (dev) requirement to the plugin/theme's own `composer.json` file.
  *   - And then:
@@ -112,7 +112,7 @@
 			echo 'The WP_TESTS_PHPUNIT_POLYFILLS_PATH constant should contain an absolute path to the root directory'
 				. ' of the PHPUnit Polyfills library.' . PHP_EOL;
 		} elseif ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS ) {
-			echo 'You need to run `composer update` before running the tests.' . PHP_EOL;
+			echo 'You need to run `composer update -W` before running the tests.' . PHP_EOL;
 			echo 'Once the dependencies are installed, you can run the tests using the Composer-installed version'
 				. ' of PHPUnit or using a PHPUnit phar file, but the dependencies do need to be installed'
 				. ' whichever way the tests are run.' . PHP_EOL;
@@ -123,7 +123,7 @@
 				. ' or set the absolute path to the PHPUnit Polyfills library in a "WP_TESTS_PHPUNIT_POLYFILLS_PATH"'
 				. ' constant to allow the WP Core bootstrap to load the Polyfills.' . PHP_EOL . PHP_EOL;
 			echo 'If you are trying to run the WP Core tests, make sure to set the "WP_RUN_CORE_TESTS" constant'
-				. ' to 1 and run `composer update` before running the tests.' . PHP_EOL;
+				. ' to 1 and run `composer update -W` before running the tests.' . PHP_EOL;
 			echo 'Once the dependencies are installed, you can run the tests using the Composer-installed'
 				. ' version of PHPUnit or using a PHPUnit phar file, but the dependencies do need to be'
 				. ' installed whichever way the tests are run.' . PHP_EOL;
@@ -157,7 +157,7 @@
 			$phpunit_polyfills_minimum_version
 		);
 	} elseif ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS ) {
-		echo 'Please run `composer update` to install the latest version.' . PHP_EOL;
+		echo 'Please run `composer update -W` to install the latest version.' . PHP_EOL;
 	}
 	exit( 1 );
 }

From 506aa746b58527dbe8ecaa115e156525cdf6f31d Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Mon, 20 Sep 2021 18:21:32 +0000
Subject: [PATCH 147/257] Login and Registration: Fix "passing null to
 non-nullable" deprecation for `authorize_application` error message.

If there is no URL query in the `$_GET['redirect_to'], `wp_parse_url()` will return `null`. Passing `null` to `parse_str()` results in a PHP 8.1 deprecation notice
{{{
Deprecated: parse_str(): Passing null to parameter #1 ($string) of type string is deprecated
}}}

This commit:
- Fixes the deprecation notice.
- Skips doing the `parse_str()` when there's no URL query.
- Provides a micro-optimization performance boost.

Follow-up to [49109].

Props jrf, hellofromTonya, BinaryKitten.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51829 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-login.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/wp-login.php b/src/wp-login.php
index 11517dac21a67..0d030863ed1f7 100644
--- a/src/wp-login.php
+++ b/src/wp-login.php
@@ -1267,7 +1267,10 @@ function wp_login_viewport_meta() {
 				$errors->add( 'enter_recovery_mode', __( 'Recovery Mode Initialized. Please log in to continue.' ), 'message' );
 			} elseif ( isset( $_GET['redirect_to'] ) && false !== strpos( $_GET['redirect_to'], 'wp-admin/authorize-application.php' ) ) {
 				$query_component = wp_parse_url( $_GET['redirect_to'], PHP_URL_QUERY );
-				parse_str( $query_component, $query );
+				$query           = array();
+				if ( $query_component ) {
+					parse_str( $query_component, $query );
+				}
 
 				if ( ! empty( $query['app_name'] ) ) {
 					/* translators: 1: Website name, 2: Application name. */

From cece2cca5e56f20080782edb82e94d87f2f30ef9 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Mon, 20 Sep 2021 18:48:47 +0000
Subject: [PATCH 148/257] REST API: Fix autovivification deprecation notice in
 `WP_Test_REST_Widgets_Controller::set_up()`.

If the `'widget_testwidget'` option does not exist, `false` was returned from `get_option()`. The `set_up()` logic expects an `array()` and assigns values to keys without checking for an array. The automatic creation of an array (autovivification) triggers a `Deprecated: Automatic conversion of false to array is deprecated in` deprecation notice on PHP 8.1.

This commit:
- Fixes the deprecation notice by making the default value an empty array.
- Moves getting the option within the conditional where it's needed.
- Provides a micro-optimization by only getting the options when the conditions are correct for processing.
- Makes the code consistent within the `set_up()` for both `get_option()` instances.

Follow-up to [51029].

Props jrf, hellofromTonya, BinaryKitten.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51830 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/rest-api/rest-widgets-controller.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/phpunit/tests/rest-api/rest-widgets-controller.php b/tests/phpunit/tests/rest-api/rest-widgets-controller.php
index a44512cf5ab94..be0d84e430bcd 100644
--- a/tests/phpunit/tests/rest-api/rest-widgets-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-widgets-controller.php
@@ -109,10 +109,10 @@ public function set_up() {
 			'testwidget',
 			'WP test widget',
 			static function () {
-				$settings = get_option( 'widget_testwidget' );
-
 				// check if anything's been sent.
 				if ( isset( $_POST['update_testwidget'] ) ) {
+					$settings = get_option( 'widget_testwidget', array() );
+
 					$settings['id']    = $_POST['test_id'];
 					$settings['title'] = $_POST['test_title'];
 
@@ -129,7 +129,7 @@ static function () {
 			'WP test widget',
 			static function () {
 				$settings = wp_parse_args(
-					get_option( 'widget_testwidget' ),
+					get_option( 'widget_testwidget', array() ),
 					array(
 						'id'    => 'Default id',
 						'title' => 'Default text',

From 81ade4da656e1676d12b3e781785b032afefbd08 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Mon, 20 Sep 2021 19:58:09 +0000
Subject: [PATCH 149/257] Build/Test Tools: Fix null handling and string type
 casting in `WP_UnitTestCase_Base::assertSameIgnoreEOL()`.

Basically, the whole `assertSameIgnoreEOL()` assertion was fundamentally flawed. The assertion contends that it checks that the expected and actual values are of the same type and value, but the reality was very different.

* The function uses `map_deep()` to potentially handle all sorts of inputs.
* `map_deep()` handles arrays and objects with special casing, but will call the callback on everything else without further distinction.
* The callback used passes the expected/actual value on to the `str_replace()` function to remove potential new line differences.
* And the `str_replace()` function will - with a non-array input for the `$subject` - always return a string.
* The output of these calls to `map_deep()` will therefore have "normalized" _all properties_ in objects, _all values_ in arrays and _all non-object, non-array values_ to strings.
* And a call to `assertSame()` will therefore NEVER do a proper type check as the type of all input has already, unintentionally, been "normalized" to string.

Aside from this clear flaw in the design of the assertion, PHP 8.1 now exposes a further issue as a `null` value for an object property, an array value or a plain value, will now yield a ` str_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated` notice.

To fix both these issues, the fix in this PR ensures that the call to `str_replace()` will now only be made if the input is a text string.
All other values passed to the callback are left in their original type.

This ensures that a proper value AND type comparison can be done as well as prevents the PHP 8.1 deprecation notices.

Ref:
* https://developer.wordpress.org/reference/functions/map_deep/
* https://www.php.net/manual/en/function.str-replace.php

This commit:
- Fixes type-casting of non-string values to `string` (the flawed part of this assertion) by invoking `str_replace()` when the value is of string type.
- Fixes the PHP 8.1 `str_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated` deprecation notice.
- Micro-optimization: skips `map_deep()` when actual and/or expected are `null` (no need to process).
- Adjusts the method documentation for both this method and the `assertEqualsIgnoreEOL()` alias method to document that the `$expected` and `$actual` parameters can be of any type.

Follow-up to [48937], [51135], [51478].

Props jrf, hellofromTonya.
See #53363, #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51831 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/includes/abstract-testcase.php | 46 ++++++++++++--------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/tests/phpunit/includes/abstract-testcase.php b/tests/phpunit/includes/abstract-testcase.php
index cbd8c31f30b99..49dfc0fef7416 100644
--- a/tests/phpunit/includes/abstract-testcase.php
+++ b/tests/phpunit/includes/abstract-testcase.php
@@ -724,24 +724,36 @@ public function assertDiscardWhitespace( $expected, $actual, $message = '' ) {
 	 * @since 5.8.0 Added support for nested arrays.
 	 * @since 5.9.0 Added the `$message` parameter.
 	 *
-	 * @param string|array $expected The expected value.
-	 * @param string|array $actual   The actual value.
-	 * @param string       $message  Optional. Message to display when the assertion fails.
+	 * @param mixed  $expected The expected value.
+	 * @param mixed  $actual   The actual value.
+	 * @param string $message  Optional. Message to display when the assertion fails.
 	 */
 	public function assertSameIgnoreEOL( $expected, $actual, $message = '' ) {
-		$expected = map_deep(
-			$expected,
-			static function ( $value ) {
-				return str_replace( "\r\n", "\n", $value );
-			}
-		);
+		if ( null !== $expected ) {
+			$expected = map_deep(
+				$expected,
+				static function ( $value ) {
+					if ( is_string( $value ) ) {
+						return str_replace( "\r\n", "\n", $value );
+					}
+
+					return $value;
+				}
+			);
+		}
 
-		$actual = map_deep(
-			$actual,
-			static function ( $value ) {
-				return str_replace( "\r\n", "\n", $value );
-			}
-		);
+		if ( null !== $actual ) {
+			$actual = map_deep(
+				$actual,
+				static function ( $value ) {
+					if ( is_string( $value ) ) {
+						return str_replace( "\r\n", "\n", $value );
+					}
+
+					return $value;
+				}
+			);
+		}
 
 		$this->assertSame( $expected, $actual, $message );
 	}
@@ -753,8 +765,8 @@ static function ( $value ) {
 	 * @since 5.6.0 Turned into an alias for `::assertSameIgnoreEOL()`.
 	 * @since 5.9.0 Added the `$message` parameter.
 	 *
-	 * @param string $expected The expected value.
-	 * @param string $actual   The actual value.
+	 * @param mixed  $expected The expected value.
+	 * @param mixed  $actual   The actual value.
 	 * @param string $message  Optional. Message to display when the assertion fails.
 	 */
 	public function assertEqualsIgnoreEOL( $expected, $actual, $message = '' ) {

From 0f0089391b0f92d4508b8a4df567df2052161340 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 21 Sep 2021 13:20:20 +0000
Subject: [PATCH 150/257] Docs: Add `@since` notes to `register_setting()` for
 the deprecated `misc` and `privacy` option groups.

Follow-up to [13745], [13746], [13749], [21838], [51827].

See #53399.

git-svn-id: https://develop.svn.wordpress.org/trunk@51832 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/option.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/wp-includes/option.php b/src/wp-includes/option.php
index 1aec64c2534f8..6cc4e00b1ac7b 100644
--- a/src/wp-includes/option.php
+++ b/src/wp-includes/option.php
@@ -2250,6 +2250,8 @@ function register_initial_settings() {
  * Registers a setting and its data.
  *
  * @since 2.7.0
+ * @since 3.0.0 The `misc` option group was deprecated.
+ * @since 3.5.0 The `privacy` option group was deprecated.
  * @since 4.7.0 `$args` can be passed to set flags on the setting, similar to `register_meta()`.
  * @since 5.5.0 `$new_whitelist_options` was renamed to `$new_allowed_options`.
  *              Please consider writing more inclusive code.

From d7b91f9da6a8156e3d7c4ba66d19a1e44e9242b8 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Tue, 21 Sep 2021 18:19:19 +0000
Subject: [PATCH 151/257] Docs: Document some more common names for dynamic
 hooks and standardise the phrasing used.

Fixes #53581


git-svn-id: https://develop.svn.wordpress.org/trunk@51837 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/admin-header.php                 |  2 +-
 .../class-wp-plugin-install-list-table.php    |  2 ++
 src/wp-admin/includes/media.php               |  2 +-
 src/wp-admin/includes/meta-boxes.php          |  2 +-
 src/wp-admin/includes/misc.php                |  2 +-
 src/wp-admin/plugin-install.php               | 30 +++++++++++++---
 src/wp-admin/user-edit.php                    |  2 +-
 src/wp-includes/category-template.php         |  2 +-
 src/wp-includes/comment-template.php          |  2 +-
 src/wp-includes/comment.php                   | 24 +++++++++++--
 src/wp-includes/l10n.php                      |  8 ++---
 src/wp-includes/meta.php                      | 36 +++++++++----------
 src/wp-includes/post.php                      |  6 ++++
 src/wp-includes/taxonomy.php                  | 10 +++---
 14 files changed, 90 insertions(+), 40 deletions(-)

diff --git a/src/wp-admin/admin-header.php b/src/wp-admin/admin-header.php
index 7ee3d03b74cc1..2f7ae3b8c5009 100644
--- a/src/wp-admin/admin-header.php
+++ b/src/wp-admin/admin-header.php
@@ -132,7 +132,7 @@
 /**
  * Fires in head section for a specific admin page.
  *
- * The dynamic portion of the hook, `$hook_suffix`, refers to the hook suffix
+ * The dynamic portion of the hook name, `$hook_suffix`, refers to the hook suffix
  * for the admin page.
  *
  * @since 2.1.0
diff --git a/src/wp-admin/includes/class-wp-plugin-install-list-table.php b/src/wp-admin/includes/class-wp-plugin-install-list-table.php
index 59bce7b8d1d72..c214cd333b3f7 100644
--- a/src/wp-admin/includes/class-wp-plugin-install-list-table.php
+++ b/src/wp-admin/includes/class-wp-plugin-install-list-table.php
@@ -225,6 +225,8 @@ public function prepare_items() {
 		 *  - `install_plugins_table_api_args_popular`
 		 *  - `install_plugins_table_api_args_recommended`
 		 *  - `install_plugins_table_api_args_upload`
+		 *  - `install_plugins_table_api_args_search`
+		 *  - `install_plugins_table_api_args_beta`
 		 *
 		 * @since 3.7.0
 		 *
diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php
index 7ad34a4566c0e..3cb96b2bb4106 100644
--- a/src/wp-admin/includes/media.php
+++ b/src/wp-admin/includes/media.php
@@ -577,7 +577,7 @@ function wp_iframe( $content_func, ...$args ) {
 		 * Fires in the admin header for each specific form tab in the legacy
 		 * (pre-3.5.0) media upload popup.
 		 *
-		 * The dynamic portion of the hook, `$content_func`, refers to the form
+		 * The dynamic portion of the hook name, `$content_func`, refers to the form
 		 * callback for the media upload type.
 		 *
 		 * @since 2.5.0
diff --git a/src/wp-admin/includes/meta-boxes.php b/src/wp-admin/includes/meta-boxes.php
index 0dcc9f5e5cb3f..193877ce96de6 100644
--- a/src/wp-admin/includes/meta-boxes.php
+++ b/src/wp-admin/includes/meta-boxes.php
@@ -1581,7 +1581,7 @@ function register_and_do_post_meta_boxes( $post ) {
 	/**
 	 * Fires after all built-in meta boxes have been added, contextually for the given post type.
 	 *
-	 * The dynamic portion of the hook, `$post_type`, refers to the post type of the post.
+	 * The dynamic portion of the hook name, `$post_type`, refers to the post type of the post.
 	 *
 	 * Possible hook names include:
 	 *
diff --git a/src/wp-admin/includes/misc.php b/src/wp-admin/includes/misc.php
index 61d7698310446..70f6edde2b098 100644
--- a/src/wp-admin/includes/misc.php
+++ b/src/wp-admin/includes/misc.php
@@ -716,7 +716,7 @@ function set_screen_options() {
 				/**
 				 * Filters a screen option value before it is set.
 				 *
-				 * The dynamic portion of the hook, `$option`, refers to the option name.
+				 * The dynamic portion of the hook name, `$option`, refers to the option name.
 				 *
 				 * Returning false from the filter will skip saving the current option.
 				 *
diff --git a/src/wp-admin/plugin-install.php b/src/wp-admin/plugin-install.php
index 0e01c441610a4..a8b4e333ab138 100644
--- a/src/wp-admin/plugin-install.php
+++ b/src/wp-admin/plugin-install.php
@@ -63,8 +63,19 @@
 /**
  * Fires before each tab on the Install Plugins screen is loaded.
  *
- * The dynamic portion of the action hook, `$tab`, allows for targeting
- * individual tabs, for instance 'install_plugins_pre_plugin-information'.
+ * The dynamic portion of the hook name, `$tab`, allows for targeting
+ * individual tabs.
+ *
+ * Possible hook names include:
+ *
+ *  - `install_plugins_pre_beta`
+ *  - `install_plugins_pre_favorites`
+ *  - `install_plugins_pre_featured`
+ *  - `install_plugins_pre_plugin-information`
+ *  - `install_plugins_pre_popular`
+ *  - `install_plugins_pre_recommended`
+ *  - `install_plugins_pre_search`
+ *  - `install_plugins_pre_upload`
  *
  * @since 2.7.0
  */
@@ -164,8 +175,19 @@
 /**
  * Fires after the plugins list table in each tab of the Install Plugins screen.
  *
- * The dynamic portion of the action hook, `$tab`, allows for targeting
- * individual tabs, for instance 'install_plugins_plugin-information'.
+ * The dynamic portion of the hook name, `$tab`, allows for targeting
+ * individual tabs.
+ *
+ * Possible hook names include:
+ *
+ *  - `install_plugins_beta`
+ *  - `install_plugins_favorites`
+ *  - `install_plugins_featured`
+ *  - `install_plugins_plugin-information`
+ *  - `install_plugins_popular`
+ *  - `install_plugins_recommended`
+ *  - `install_plugins_search`
+ *  - `install_plugins_upload`
  *
  * @since 2.7.0
  *
diff --git a/src/wp-admin/user-edit.php b/src/wp-admin/user-edit.php
index 0cd381caf2181..9485aab20fe41 100644
--- a/src/wp-admin/user-edit.php
+++ b/src/wp-admin/user-edit.php
@@ -553,7 +553,7 @@
 			/**
 			 * Filters a user contactmethod label.
 			 *
-			 * The dynamic portion of the filter hook, `$name`, refers to
+			 * The dynamic portion of the hook name, `$name`, refers to
 			 * each of the keys in the contact methods array.
 			 *
 			 * @since 2.9.0
diff --git a/src/wp-includes/category-template.php b/src/wp-includes/category-template.php
index a10f9533c320c..38c52a79a9da7 100644
--- a/src/wp-includes/category-template.php
+++ b/src/wp-includes/category-template.php
@@ -1343,7 +1343,7 @@ function get_the_term_list( $post_id, $taxonomy, $before = '', $sep = '', $after
 	/**
 	 * Filters the term links for a given taxonomy.
 	 *
-	 * The dynamic portion of the filter name, `$taxonomy`, refers
+	 * The dynamic portion of the hook name, `$taxonomy`, refers
 	 * to the taxonomy slug.
 	 *
 	 * Possible hook names include:
diff --git a/src/wp-includes/comment-template.php b/src/wp-includes/comment-template.php
index a40a98d1706ce..e45088729f557 100644
--- a/src/wp-includes/comment-template.php
+++ b/src/wp-includes/comment-template.php
@@ -2646,7 +2646,7 @@ function comment_form( $args = array(), $post_id = null ) {
 					/**
 					 * Filters a comment form field for display.
 					 *
-					 * The dynamic portion of the filter hook, `$name`, refers to the name
+					 * The dynamic portion of the hook name, `$name`, refers to the name
 					 * of the comment form field.
 					 *
 					 * Possible hook names include:
diff --git a/src/wp-includes/comment.php b/src/wp-includes/comment.php
index 5c4f2b5f3e8f9..113bb2e719008 100644
--- a/src/wp-includes/comment.php
+++ b/src/wp-includes/comment.php
@@ -1826,6 +1826,15 @@ function wp_transition_comment_status( $new_status, $old_status, $comment ) {
 		 * The dynamic portions of the hook name, `$old_status`, and `$new_status`,
 		 * refer to the old and new comment statuses, respectively.
 		 *
+		 * Possible hook names include:
+		 *
+		 *  - `comment_unapproved_to_approved`
+		 *  - `comment_spam_to_approved`
+		 *  - `comment_approved_to_unapproved`
+		 *  - `comment_spam_to_unapproved`
+		 *  - `comment_unapproved_to_spam`
+		 *  - `comment_approved_to_spam`
+		 *
 		 * @since 2.7.0
 		 *
 		 * @param WP_Comment $comment Comment object.
@@ -1838,8 +1847,19 @@ function wp_transition_comment_status( $new_status, $old_status, $comment ) {
 	 * The dynamic portions of the hook name, `$new_status`, and `$comment->comment_type`,
 	 * refer to the new comment status, and the type of comment, respectively.
 	 *
-	 * Typical comment types include an empty string (standard comment), 'pingback',
-	 * or 'trackback'.
+	 * Typical comment types include 'comment', 'pingback', or 'trackback'.
+	 *
+	 * Possible hook names include:
+	 *
+	 *  - `comment_approved_comment`
+	 *  - `comment_approved_pingback`
+	 *  - `comment_approved_trackback`
+	 *  - `comment_unapproved_comment`
+	 *  - `comment_unapproved_pingback`
+	 *  - `comment_unapproved_trackback`
+	 *  - `comment_spam_comment`
+	 *  - `comment_spam_pingback`
+	 *  - `comment_spam_trackback`
 	 *
 	 * @since 2.7.0
 	 *
diff --git a/src/wp-includes/l10n.php b/src/wp-includes/l10n.php
index 7699d92b1efc9..8347c226faa5c 100644
--- a/src/wp-includes/l10n.php
+++ b/src/wp-includes/l10n.php
@@ -191,7 +191,7 @@ function translate( $text, $domain = 'default' ) {
 	/**
 	 * Filters text with its translation for a domain.
 	 *
-	 * The dynamic portion of the hook, `$domain`, refers to the text domain.
+	 * The dynamic portion of the hook name, `$domain`, refers to the text domain.
 	 *
 	 * @since 5.5.0
 	 *
@@ -259,7 +259,7 @@ function translate_with_gettext_context( $text, $context, $domain = 'default' )
 	/**
 	 * Filters text with its translation based on context information for a domain.
 	 *
-	 * The dynamic portion of the hook, `$domain`, refers to the text domain.
+	 * The dynamic portion of the hook name, `$domain`, refers to the text domain.
 	 *
 	 * @since 5.5.0
 	 *
@@ -482,7 +482,7 @@ function _n( $single, $plural, $number, $domain = 'default' ) {
 	/**
 	 * Filters the singular or plural form of a string for a domain.
 	 *
-	 * The dynamic portion of the hook, `$domain`, refers to the text domain.
+	 * The dynamic portion of the hook name, `$domain`, refers to the text domain.
 	 *
 	 * @since 5.5.0
 	 *
@@ -542,7 +542,7 @@ function _nx( $single, $plural, $number, $context, $domain = 'default' ) {
 	/**
 	 * Filters the singular or plural form of a string with gettext context for a domain.
 	 *
-	 * The dynamic portion of the hook, `$domain`, refers to the text domain.
+	 * The dynamic portion of the hook name, `$domain`, refers to the text domain.
 	 *
 	 * @since 5.5.0
 	 *
diff --git a/src/wp-includes/meta.php b/src/wp-includes/meta.php
index fc7d125fceab2..310b10f933250 100644
--- a/src/wp-includes/meta.php
+++ b/src/wp-includes/meta.php
@@ -56,7 +56,7 @@ function add_metadata( $meta_type, $object_id, $meta_key, $meta_value, $unique =
 	/**
 	 * Short-circuits adding metadata of a specific type.
 	 *
-	 * The dynamic portion of the hook, `$meta_type`, refers to the meta object type
+	 * The dynamic portion of the hook name, `$meta_type`, refers to the meta object type
 	 * (post, comment, term, user, or any other type with an associated meta table).
 	 * Returning a non-null value will effectively short-circuit the function.
 	 *
@@ -96,7 +96,7 @@ function add_metadata( $meta_type, $object_id, $meta_key, $meta_value, $unique =
 	/**
 	 * Fires immediately before meta of a specific type is added.
 	 *
-	 * The dynamic portion of the hook, `$meta_type`, refers to the meta object type
+	 * The dynamic portion of the hook name, `$meta_type`, refers to the meta object type
 	 * (post, comment, term, user, or any other type with an associated meta table).
 	 *
 	 * Possible hook names include:
@@ -134,7 +134,7 @@ function add_metadata( $meta_type, $object_id, $meta_key, $meta_value, $unique =
 	/**
 	 * Fires immediately after meta of a specific type is added.
 	 *
-	 * The dynamic portion of the hook, `$meta_type`, refers to the meta object type
+	 * The dynamic portion of the hook name, `$meta_type`, refers to the meta object type
 	 * (post, comment, term, user, or any other type with an associated meta table).
 	 *
 	 * Possible hook names include:
@@ -209,7 +209,7 @@ function update_metadata( $meta_type, $object_id, $meta_key, $meta_value, $prev_
 	/**
 	 * Short-circuits updating metadata of a specific type.
 	 *
-	 * The dynamic portion of the hook, `$meta_type`, refers to the meta object type
+	 * The dynamic portion of the hook name, `$meta_type`, refers to the meta object type
 	 * (post, comment, term, user, or any other type with an associated meta table).
 	 * Returning a non-null value will effectively short-circuit the function.
 	 *
@@ -268,7 +268,7 @@ function update_metadata( $meta_type, $object_id, $meta_key, $meta_value, $prev_
 		/**
 		 * Fires immediately before updating metadata of a specific type.
 		 *
-		 * The dynamic portion of the hook, `$meta_type`, refers to the meta object type
+		 * The dynamic portion of the hook name, `$meta_type`, refers to the meta object type
 		 * (post, comment, term, user, or any other type with an associated meta table).
 		 *
 		 * Possible hook names include:
@@ -314,7 +314,7 @@ function update_metadata( $meta_type, $object_id, $meta_key, $meta_value, $prev_
 		/**
 		 * Fires immediately after updating metadata of a specific type.
 		 *
-		 * The dynamic portion of the hook, `$meta_type`, refers to the meta object type
+		 * The dynamic portion of the hook name, `$meta_type`, refers to the meta object type
 		 * (post, comment, term, user, or any other type with an associated meta table).
 		 *
 		 * Possible hook names include:
@@ -401,7 +401,7 @@ function delete_metadata( $meta_type, $object_id, $meta_key, $meta_value = '', $
 	/**
 	 * Short-circuits deleting metadata of a specific type.
 	 *
-	 * The dynamic portion of the hook, `$meta_type`, refers to the meta object type
+	 * The dynamic portion of the hook name, `$meta_type`, refers to the meta object type
 	 * (post, comment, term, user, or any other type with an associated meta table).
 	 * Returning a non-null value will effectively short-circuit the function.
 	 *
@@ -456,7 +456,7 @@ function delete_metadata( $meta_type, $object_id, $meta_key, $meta_value = '', $
 	/**
 	 * Fires immediately before deleting metadata of a specific type.
 	 *
-	 * The dynamic portion of the hook, `$meta_type`, refers to the meta object type
+	 * The dynamic portion of the hook name, `$meta_type`, refers to the meta object type
 	 * (post, comment, term, user, or any other type with an associated meta table).
 	 *
 	 * Possible hook names include:
@@ -506,7 +506,7 @@ function delete_metadata( $meta_type, $object_id, $meta_key, $meta_value = '', $
 	/**
 	 * Fires immediately after deleting metadata of a specific type.
 	 *
-	 * The dynamic portion of the hook, `$meta_type`, refers to the meta object type
+	 * The dynamic portion of the hook name, `$meta_type`, refers to the meta object type
 	 * (post, comment, term, user, or any other type with an associated meta table).
 	 *
 	 * Possible hook names include:
@@ -608,7 +608,7 @@ function get_metadata_raw( $meta_type, $object_id, $meta_key = '', $single = fal
 	/**
 	 * Short-circuits the return value of a meta field.
 	 *
-	 * The dynamic portion of the hook, `$meta_type`, refers to the meta object type
+	 * The dynamic portion of the hook name, `$meta_type`, refers to the meta object type
 	 * (post, comment, term, user, or any other type with an associated meta table).
 	 * Returning a non-null value will effectively short-circuit the function.
 	 *
@@ -692,7 +692,7 @@ function get_metadata_default( $meta_type, $object_id, $meta_key, $single = fals
 	/**
 	 * Filters the default metadata value for a specified meta key and object.
 	 *
-	 * The dynamic portion of the hook, `$meta_type`, refers to the meta object type
+	 * The dynamic portion of the hook name, `$meta_type`, refers to the meta object type
 	 * (post, comment, term, user, or any other type with an associated meta table).
 	 *
 	 * Possible filter names include:
@@ -805,7 +805,7 @@ function get_metadata_by_mid( $meta_type, $meta_id ) {
 	/**
 	 * Short-circuits the return value when fetching a meta field by meta ID.
 	 *
-	 * The dynamic portion of the hook, `$meta_type`, refers to the meta object type
+	 * The dynamic portion of the hook name, `$meta_type`, refers to the meta object type
 	 * (post, comment, term, user, or any other type with an associated meta table).
 	 * Returning a non-null value will effectively short-circuit the function.
 	 *
@@ -879,7 +879,7 @@ function update_metadata_by_mid( $meta_type, $meta_id, $meta_value, $meta_key =
 	/**
 	 * Short-circuits updating metadata of a specific type by meta ID.
 	 *
-	 * The dynamic portion of the hook, `$meta_type`, refers to the meta object type
+	 * The dynamic portion of the hook name, `$meta_type`, refers to the meta object type
 	 * (post, comment, term, user, or any other type with an associated meta table).
 	 * Returning a non-null value will effectively short-circuit the function.
 	 *
@@ -1002,7 +1002,7 @@ function delete_metadata_by_mid( $meta_type, $meta_id ) {
 	/**
 	 * Short-circuits deleting metadata of a specific type by meta ID.
 	 *
-	 * The dynamic portion of the hook, `$meta_type`, refers to the meta object type
+	 * The dynamic portion of the hook name, `$meta_type`, refers to the meta object type
 	 * (post, comment, term, user, or any other type with an associated meta table).
 	 * Returning a non-null value will effectively short-circuit the function.
 	 *
@@ -1036,7 +1036,7 @@ function delete_metadata_by_mid( $meta_type, $meta_id ) {
 			/**
 			 * Fires immediately before deleting post or comment metadata of a specific type.
 			 *
-			 * The dynamic portion of the hook, `$meta_type`, refers to the meta
+			 * The dynamic portion of the hook name, `$meta_type`, refers to the meta
 			 * object type (post or comment).
 			 *
 			 * Possible hook names include:
@@ -1067,7 +1067,7 @@ function delete_metadata_by_mid( $meta_type, $meta_id ) {
 			/**
 			 * Fires immediately after deleting post or comment metadata of a specific type.
 			 *
-			 * The dynamic portion of the hook, `$meta_type`, refers to the meta
+			 * The dynamic portion of the hook name, `$meta_type`, refers to the meta
 			 * object type (post or comment).
 			 *
 			 * Possible hook names include:
@@ -1128,7 +1128,7 @@ function update_meta_cache( $meta_type, $object_ids ) {
 	/**
 	 * Short-circuits updating the metadata cache of a specific type.
 	 *
-	 * The dynamic portion of the hook, `$meta_type`, refers to the meta object type
+	 * The dynamic portion of the hook name, `$meta_type`, refers to the meta object type
 	 * (post, comment, term, user, or any other type with an associated meta table).
 	 * Returning a non-null value will effectively short-circuit the function.
 	 *
@@ -1774,7 +1774,7 @@ function get_object_subtype( $object_type, $object_id ) {
 	/**
 	 * Filters the object subtype identifier for a non-standard object type.
 	 *
-	 * The dynamic portion of the hook, `$object_type`, refers to the meta object type
+	 * The dynamic portion of the hook name, `$object_type`, refers to the meta object type
 	 * (post, comment, term, user, or any other type with an associated meta table).
 	 *
 	 * Possible hook names include:
diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php
index 3ec68625a5f08..1adc89908a798 100644
--- a/src/wp-includes/post.php
+++ b/src/wp-includes/post.php
@@ -5112,6 +5112,12 @@ function wp_transition_post_status( $new_status, $old_status, $post ) {
 	 * The dynamic portions of the hook name, `$new_status` and `$old_status`,
 	 * refer to the old and new post statuses, respectively.
 	 *
+	 * Possible hook names include:
+	 *
+	 *  - `draft_to_publish`
+	 *  - `publish_to_trash`
+	 *  - `pending_to_draft`
+	 *
 	 * @since 2.3.0
 	 *
 	 * @param WP_Post $post Post object.
diff --git a/src/wp-includes/taxonomy.php b/src/wp-includes/taxonomy.php
index 531a6f537bc9b..104da64a8761f 100644
--- a/src/wp-includes/taxonomy.php
+++ b/src/wp-includes/taxonomy.php
@@ -945,7 +945,7 @@ function get_term( $term, $taxonomy = '', $output = OBJECT, $filter = 'raw' ) {
 	/**
 	 * Filters a taxonomy term object.
 	 *
-	 * The dynamic portion of the filter name, `$taxonomy`, refers
+	 * The dynamic portion of the hook name, `$taxonomy`, refers
 	 * to the slug of the term's taxonomy.
 	 *
 	 * Possible hook names include:
@@ -1659,7 +1659,7 @@ function sanitize_term_field( $field, $value, $term_id, $taxonomy, $context ) {
 		/**
 		 * Filters a term field to edit before it is sanitized.
 		 *
-		 * The dynamic portion of the filter name, `$field`, refers to the term field.
+		 * The dynamic portion of the hook name, `$field`, refers to the term field.
 		 *
 		 * @since 2.3.0
 		 *
@@ -1692,7 +1692,7 @@ function sanitize_term_field( $field, $value, $term_id, $taxonomy, $context ) {
 		/**
 		 * Filters a term field value before it is sanitized.
 		 *
-		 * The dynamic portion of the filter name, `$field`, refers to the term field.
+		 * The dynamic portion of the hook name, `$field`, refers to the term field.
 		 *
 		 * @since 2.3.0
 		 *
@@ -1731,7 +1731,7 @@ function sanitize_term_field( $field, $value, $term_id, $taxonomy, $context ) {
 		/**
 		 * Filters the term field for use in RSS.
 		 *
-		 * The dynamic portion of the filter name, `$field`, refers to the term field.
+		 * The dynamic portion of the hook name, `$field`, refers to the term field.
 		 *
 		 * @since 2.3.0
 		 *
@@ -1757,7 +1757,7 @@ function sanitize_term_field( $field, $value, $term_id, $taxonomy, $context ) {
 		/**
 		 * Filters the term field sanitized for display.
 		 *
-		 * The dynamic portion of the filter name, `$field`, refers to the term field name.
+		 * The dynamic portion of the hook name, `$field`, refers to the term field name.
 		 *
 		 * @since 2.3.0
 		 *

From 9269cbd7e845b2fd6865646b0cbf70d73c8f6f61 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Tue, 21 Sep 2021 21:31:35 +0000
Subject: [PATCH 152/257] Formatting: Pass the block instance as a parameter to
 the `render_block` filters.

This allows filters to access properties and methods on the block instance.

Fixes #53596


git-svn-id: https://develop.svn.wordpress.org/trunk@51841 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-block.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/wp-includes/class-wp-block.php b/src/wp-includes/class-wp-block.php
index a8ae6747c40f4..189ce4e6152b5 100644
--- a/src/wp-includes/class-wp-block.php
+++ b/src/wp-includes/class-wp-block.php
@@ -241,11 +241,13 @@ public function render( $options = array() ) {
 		 * Filters the content of a single block.
 		 *
 		 * @since 5.0.0
+		 * @since 5.9.0 The `$instance` parameter was added.
 		 *
-		 * @param string $block_content The block content about to be appended.
-		 * @param array  $block         The full block, including name and attributes.
+		 * @param string   $block_content The block content about to be appended.
+		 * @param array    $block         The full block, including name and attributes.
+		 * @param WP_Block $instance      The block instance.
 		 */
-		$block_content = apply_filters( 'render_block', $block_content, $this->parsed_block );
+		$block_content = apply_filters( 'render_block', $block_content, $this->parsed_block, $this );
 
 		/**
 		 * Filters the content of a single block.
@@ -254,11 +256,13 @@ public function render( $options = array() ) {
 		 * the block name, e.g. "core/paragraph".
 		 *
 		 * @since 5.7.0
+		 * @since 5.9.0 The `$instance` parameter was added.
 		 *
-		 * @param string $block_content The block content about to be appended.
-		 * @param array  $block         The full block, including name and attributes.
+		 * @param string   $block_content The block content about to be appended.
+		 * @param array    $block         The full block, including name and attributes.
+		 * @param WP_Block $instance      The block instance.
 		 */
-		$block_content = apply_filters( "render_block_{$this->name}", $block_content, $this->parsed_block );
+		$block_content = apply_filters( "render_block_{$this->name}", $block_content, $this->parsed_block, $this );
 
 		return $block_content;
 	}

From d05ecf236f8ad0c4c31317e8946e80c2304c4561 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Tue, 21 Sep 2021 22:12:18 +0000
Subject: [PATCH 153/257] Update and enhance the docs for `retrieve_widgets()`.

Props zieladam, hellofromtonya.
Fixes #53811.

git-svn-id: https://develop.svn.wordpress.org/trunk@51842 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/widgets.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/wp-includes/widgets.php b/src/wp-includes/widgets.php
index 61caf6af56d6a..1102105c8d3bf 100644
--- a/src/wp-includes/widgets.php
+++ b/src/wp-includes/widgets.php
@@ -1255,7 +1255,15 @@ function _wp_sidebars_changed() {
 }
 
 /**
- * Look for "lost" widgets, this has to run at least on each theme change.
+ * Validates and remaps any "orphaned" widgets to wp_inactive_sidgets sidebar, and saves the widget settings.
+ * This has to run at least on each theme change.
+ *
+ * For example, let's say theme A has a "footer" sidebar, and theme B doesn't have one.
+ * After switching from theme A to theme B, all the widgets previously assigned to the footer would be inaccessible.
+ * This function detects this scenario, and moves all the widgets previously assigned to the footer under wp_inactive_widgets.
+ *
+ * Despite the word "retrieve" in the name, this function actually updates the database and the global $sidebars_widgets.
+ * For that reason it should not be run from the front end unless the param value is 'customize' (to bypass the database write).
  *
  * @since 2.8.0
  *
@@ -1310,6 +1318,7 @@ function retrieve_widgets( $theme_changed = false ) {
 	$sidebars_widgets['wp_inactive_widgets'] = array_merge( $lost_widgets, (array) $sidebars_widgets['wp_inactive_widgets'] );
 
 	if ( 'customize' !== $theme_changed ) {
+		// Update the widgets settings in the database.
 		wp_set_sidebars_widgets( $sidebars_widgets );
 	}
 

From cb5e2611a618e8de608469c5d56a6569cb6a1a01 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 22 Sep 2021 14:09:19 +0000
Subject: [PATCH 154/257] Docs: Update description for `retrieve_widgets()` per
 the documentation standards.

Follow-up to [51842].

See #53811.

git-svn-id: https://develop.svn.wordpress.org/trunk@51849 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/widgets.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/wp-includes/widgets.php b/src/wp-includes/widgets.php
index 1102105c8d3bf..10f5017957125 100644
--- a/src/wp-includes/widgets.php
+++ b/src/wp-includes/widgets.php
@@ -1255,15 +1255,17 @@ function _wp_sidebars_changed() {
 }
 
 /**
- * Validates and remaps any "orphaned" widgets to wp_inactive_sidgets sidebar, and saves the widget settings.
- * This has to run at least on each theme change.
+ * Validates and remaps any "orphaned" widgets to wp_inactive_widgets sidebar,
+ * and saves the widget settings. This has to run at least on each theme change.
  *
  * For example, let's say theme A has a "footer" sidebar, and theme B doesn't have one.
- * After switching from theme A to theme B, all the widgets previously assigned to the footer would be inaccessible.
- * This function detects this scenario, and moves all the widgets previously assigned to the footer under wp_inactive_widgets.
+ * After switching from theme A to theme B, all the widgets previously assigned
+ * to the footer would be inaccessible. This function detects this scenario, and
+ * moves all the widgets previously assigned to the footer under wp_inactive_widgets.
  *
- * Despite the word "retrieve" in the name, this function actually updates the database and the global $sidebars_widgets.
- * For that reason it should not be run from the front end unless the param value is 'customize' (to bypass the database write).
+ * Despite the word "retrieve" in the name, this function actually updates the database
+ * and the global `$sidebars_widgets`. For that reason it should not be run on front end,
+ * unless the `$theme_changed` value is 'customize' (to bypass the database write).
  *
  * @since 2.8.0
  *

From 5c18b5f64225b18e2d34be268d48d51c3e07d43a Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Wed, 22 Sep 2021 20:59:15 +0000
Subject: [PATCH 155/257] General: Fix code quality issues which were
 identified by static analysis.

This fixes minor issues that could cause PHP notices under the right conditions, and fixes some general incorrectness.

Props jrf, hellofromTonya for review

See #52217


git-svn-id: https://develop.svn.wordpress.org/trunk@51850 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/edit.php                                 | 2 +-
 src/wp-admin/includes/class-wp-list-table.php         | 6 +++++-
 src/wp-includes/class-wp-http-curl.php                | 2 +-
 src/wp-includes/class-wp-http-streams.php             | 2 +-
 src/wp-includes/post.php                              | 4 ++++
 src/wp-includes/widgets.php                           | 7 ++++---
 src/wp-includes/widgets/class-wp-widget-tag-cloud.php | 2 ++
 src/wp-mail.php                                       | 3 +++
 8 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/wp-admin/edit.php b/src/wp-admin/edit.php
index 2b917b994da7b..bd537bd49e575 100644
--- a/src/wp-admin/edit.php
+++ b/src/wp-admin/edit.php
@@ -154,7 +154,7 @@
 			}
 			$sendback = add_query_arg( 'untrashed', $untrashed, $sendback );
 
-			remove_filter( 'wp_untrash_post_status', 'wp_untrash_post_set_previous_status', 10, 3 );
+			remove_filter( 'wp_untrash_post_status', 'wp_untrash_post_set_previous_status', 10 );
 
 			break;
 		case 'delete':
diff --git a/src/wp-admin/includes/class-wp-list-table.php b/src/wp-admin/includes/class-wp-list-table.php
index 535f5d5f81cdc..2cae7f695a78c 100644
--- a/src/wp-admin/includes/class-wp-list-table.php
+++ b/src/wp-admin/includes/class-wp-list-table.php
@@ -207,12 +207,14 @@ public function __set( $name, $value ) {
 	 * @since 4.0.0
 	 *
 	 * @param string $name Property to check if set.
-	 * @return bool Whether the property is set.
+	 * @return bool Whether the property is a back-compat property and it is set.
 	 */
 	public function __isset( $name ) {
 		if ( in_array( $name, $this->compat_fields, true ) ) {
 			return isset( $this->$name );
 		}
+
+		return false;
 	}
 
 	/**
@@ -313,6 +315,8 @@ public function get_pagination_arg( $key ) {
 		if ( isset( $this->_pagination_args[ $key ] ) ) {
 			return $this->_pagination_args[ $key ];
 		}
+
+		return 0;
 	}
 
 	/**
diff --git a/src/wp-includes/class-wp-http-curl.php b/src/wp-includes/class-wp-http-curl.php
index 9b6e0eb10bd51..64ff7efb834ab 100644
--- a/src/wp-includes/class-wp-http-curl.php
+++ b/src/wp-includes/class-wp-http-curl.php
@@ -307,7 +307,7 @@ public function request( $url, $args = array() ) {
 		);
 
 		// Handle redirects.
-		$redirect_response = WP_HTTP::handle_redirects( $url, $parsed_args, $response );
+		$redirect_response = WP_Http::handle_redirects( $url, $parsed_args, $response );
 		if ( false !== $redirect_response ) {
 			return $redirect_response;
 		}
diff --git a/src/wp-includes/class-wp-http-streams.php b/src/wp-includes/class-wp-http-streams.php
index 95ff2a1a20622..d6cfc53359308 100644
--- a/src/wp-includes/class-wp-http-streams.php
+++ b/src/wp-includes/class-wp-http-streams.php
@@ -470,6 +470,6 @@ public static function test( $args = array() ) {
  * @since 2.7.0
  * @deprecated 3.7.0 Please use WP_HTTP::request() directly
  */
-class WP_HTTP_Fsockopen extends WP_HTTP_Streams {
+class WP_HTTP_Fsockopen extends WP_Http_Streams {
 	// For backward compatibility for users who are using the class directly.
 }
diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php
index 1adc89908a798..2487e5b4c2bfd 100644
--- a/src/wp-includes/post.php
+++ b/src/wp-includes/post.php
@@ -5506,6 +5506,8 @@ function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) {
 	if ( $foundid ) {
 		return get_post( $foundid, $output );
 	}
+
+	return null;
 }
 
 /**
@@ -5563,6 +5565,8 @@ function get_page_by_title( $page_title, $output = OBJECT, $post_type = 'page' )
 	if ( $page ) {
 		return get_post( $page, $output );
 	}
+
+	return null;
 }
 
 /**
diff --git a/src/wp-includes/widgets.php b/src/wp-includes/widgets.php
index 10f5017957125..de15317d1b7d0 100644
--- a/src/wp-includes/widgets.php
+++ b/src/wp-includes/widgets.php
@@ -1739,11 +1739,12 @@ function wp_widget_rss_process( $widget_rss, $check_feed = true ) {
 	$show_summary = isset( $widget_rss['show_summary'] ) ? (int) $widget_rss['show_summary'] : 0;
 	$show_author  = isset( $widget_rss['show_author'] ) ? (int) $widget_rss['show_author'] : 0;
 	$show_date    = isset( $widget_rss['show_date'] ) ? (int) $widget_rss['show_date'] : 0;
+	$error        = false;
+	$link         = '';
 
 	if ( $check_feed ) {
-		$rss   = fetch_feed( $url );
-		$error = false;
-		$link  = '';
+		$rss = fetch_feed( $url );
+
 		if ( is_wp_error( $rss ) ) {
 			$error = $rss->get_error_message();
 		} else {
diff --git a/src/wp-includes/widgets/class-wp-widget-tag-cloud.php b/src/wp-includes/widgets/class-wp-widget-tag-cloud.php
index fb17e69a1679f..52b06d9b60026 100644
--- a/src/wp-includes/widgets/class-wp-widget-tag-cloud.php
+++ b/src/wp-includes/widgets/class-wp-widget-tag-cloud.php
@@ -53,6 +53,8 @@ public function widget( $args, $instance ) {
 			}
 		}
 
+		$default_title = $title;
+
 		$show_count = ! empty( $instance['count'] );
 
 		$tag_cloud = wp_tag_cloud(
diff --git a/src/wp-mail.php b/src/wp-mail.php
index 1d5fbedf03987..c3f921ad69c6e 100644
--- a/src/wp-mail.php
+++ b/src/wp-mail.php
@@ -77,6 +77,9 @@
 	$content_transfer_encoding = '';
 	$post_author               = 1;
 	$author_found              = false;
+	$post_date                 = null;
+	$post_date_gmt             = null;
+
 	foreach ( $message as $line ) {
 		// Body signal.
 		if ( strlen( $line ) < 3 ) {

From e0f5dfd91ba7e4fda8625ef455383f527ef1c301 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Wed, 22 Sep 2021 21:21:40 +0000
Subject: [PATCH 156/257] Docs: Miscellaneous docblock corrections and
 improvements.

See #52217, #53399


git-svn-id: https://develop.svn.wordpress.org/trunk@51851 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-http-cookie.php      | 17 +++-
 src/wp-includes/class-wp-user.php             |  1 +
 src/wp-includes/class.wp-dependencies.php     | 35 ++++++---
 .../widgets/class-wp-widget-media.php         |  1 -
 src/wp-includes/wp-db.php                     | 77 +++++++++++++++++++
 5 files changed, 117 insertions(+), 14 deletions(-)

diff --git a/src/wp-includes/class-wp-http-cookie.php b/src/wp-includes/class-wp-http-cookie.php
index ec3425d83b7bc..5fa2de7644082 100644
--- a/src/wp-includes/class-wp-http-cookie.php
+++ b/src/wp-includes/class-wp-http-cookie.php
@@ -24,6 +24,7 @@ class WP_Http_Cookie {
 	 * Cookie name.
 	 *
 	 * @since 2.8.0
+	 *
 	 * @var string
 	 */
 	public $name;
@@ -32,6 +33,7 @@ class WP_Http_Cookie {
 	 * Cookie value.
 	 *
 	 * @since 2.8.0
+	 *
 	 * @var string
 	 */
 	public $value;
@@ -40,6 +42,7 @@ class WP_Http_Cookie {
 	 * When the cookie expires. Unix timestamp or formatted date.
 	 *
 	 * @since 2.8.0
+	 *
 	 * @var string|int|null
 	 */
 	public $expires;
@@ -48,6 +51,7 @@ class WP_Http_Cookie {
 	 * Cookie URL path.
 	 *
 	 * @since 2.8.0
+	 *
 	 * @var string
 	 */
 	public $path;
@@ -56,14 +60,25 @@ class WP_Http_Cookie {
 	 * Cookie Domain.
 	 *
 	 * @since 2.8.0
+	 *
 	 * @var string
 	 */
 	public $domain;
 
+	/**
+	 * Cookie port or comma-separated list of ports.
+	 *
+	 * @since 2.8.0
+	 *
+	 * @var int|string
+	 */
+	public $port;
+
 	/**
 	 * host-only flag.
 	 *
 	 * @since 5.2.0
+	 *
 	 * @var bool
 	 */
 	public $host_only;
@@ -85,7 +100,7 @@ class WP_Http_Cookie {
 	 *     @type string|int|null $expires   Optional. Unix timestamp or formatted date. Default null.
 	 *     @type string          $path      Optional. Path. Default '/'.
 	 *     @type string          $domain    Optional. Domain. Default host of parsed $requested_url.
-	 *     @type int             $port      Optional. Port. Default null.
+	 *     @type int|string      $port      Optional. Port or comma-separated list of ports. Default null.
 	 *     @type bool            $host_only Optional. host-only storage flag. Default true.
 	 * }
 	 * @param string       $requested_url The URL which the cookie was set on, used for default $domain
diff --git a/src/wp-includes/class-wp-user.php b/src/wp-includes/class-wp-user.php
index 195bc24341a98..b2f8687828abf 100644
--- a/src/wp-includes/class-wp-user.php
+++ b/src/wp-includes/class-wp-user.php
@@ -34,6 +34,7 @@
  * @property string $locale
  * @property string $rich_editing
  * @property string $syntax_highlighting
+ * @property string $use_ssl
  */
 class WP_User {
 	/**
diff --git a/src/wp-includes/class.wp-dependencies.php b/src/wp-includes/class.wp-dependencies.php
index 9ed26568edfb0..e9f701b727bc6 100644
--- a/src/wp-includes/class.wp-dependencies.php
+++ b/src/wp-includes/class.wp-dependencies.php
@@ -17,33 +17,37 @@
  */
 class WP_Dependencies {
 	/**
-	 * An array of registered handle objects.
+	 * An array of all registered dependencies keyed by handle.
 	 *
 	 * @since 2.6.8
-	 * @var array
+	 *
+	 * @var _WP_Dependency[]
 	 */
 	public $registered = array();
 
 	/**
-	 * An array of handles of queued objects.
+	 * An array of handles of queued dependencies.
 	 *
 	 * @since 2.6.8
+	 *
 	 * @var string[]
 	 */
 	public $queue = array();
 
 	/**
-	 * An array of handles of objects to queue.
+	 * An array of handles of dependencies to queue.
 	 *
 	 * @since 2.6.0
+	 *
 	 * @var string[]
 	 */
 	public $to_do = array();
 
 	/**
-	 * An array of handles of objects already queued.
+	 * An array of handles of dependencies already queued.
 	 *
 	 * @since 2.6.0
+	 *
 	 * @var string[]
 	 */
 	public $done = array();
@@ -54,15 +58,20 @@ class WP_Dependencies {
 	 * Arguments are appended to the item query string.
 	 *
 	 * @since 2.6.0
+	 *
 	 * @var array
 	 */
 	public $args = array();
 
 	/**
-	 * An array of handle groups to enqueue.
+	 * An array of dependency groups to enqueue.
+	 *
+	 * Each entry is keyed by handle and represents the integer group level or boolean
+	 * false if the handle has no group.
 	 *
 	 * @since 2.8.0
-	 * @var array
+	 *
+	 * @var (int|false)[]
 	 */
 	public $groups = array();
 
@@ -70,6 +79,7 @@ class WP_Dependencies {
 	 * A handle group to enqueue.
 	 *
 	 * @since 2.8.0
+	 *
 	 * @deprecated 4.5.0
 	 * @var int
 	 */
@@ -79,6 +89,7 @@ class WP_Dependencies {
 	 * Cached lookup array of flattened queued items and dependencies.
 	 *
 	 * @since 5.4.0
+	 *
 	 * @var array
 	 */
 	private $all_queued_deps;
@@ -94,7 +105,7 @@ class WP_Dependencies {
 	 * @param string|string[]|false $handles Optional. Items to be processed: queue (false),
 	 *                                       single item (string), or multiple items (array of strings).
 	 *                                       Default false.
-	 * @param int|false             $group   Optional. Group level: level (int), no groups (false).
+	 * @param int|false             $group   Optional. Group level: level (int), no group (false).
 	 * @return string[] Array of handles of items that have been processed.
 	 */
 	public function do_items( $handles = false, $group = false ) {
@@ -131,7 +142,7 @@ public function do_items( $handles = false, $group = false ) {
 	 * @since 5.5.0 Added the `$group` parameter.
 	 *
 	 * @param string    $handle Name of the item. Should be unique.
-	 * @param int|false $group  Optional. Group level: level (int), no groups (false).
+	 * @param int|false $group  Optional. Group level: level (int), no group (false).
 	 *                          Default false.
 	 * @return bool True on success, false if not set.
 	 */
@@ -152,7 +163,7 @@ public function do_item( $handle, $group = false ) {
 	 * @param string|string[] $handles   Item handle (string) or item handles (array of strings).
 	 * @param bool            $recursion Optional. Internal flag that function is calling itself.
 	 *                                   Default false.
-	 * @param int|false       $group     Optional. Group level: level (int), no groups (false).
+	 * @param int|false       $group     Optional. Group level: level (int), no group (false).
 	 *                                   Default false.
 	 * @return bool True on success, false on failure.
 	 */
@@ -354,7 +365,7 @@ public function dequeue( $handles ) {
 	}
 
 	/**
-	 * Recursively search the passed dependency tree for $handle.
+	 * Recursively search the passed dependency tree for a handle.
 	 *
 	 * @since 4.0.0
 	 *
@@ -434,7 +445,7 @@ public function query( $handle, $list = 'registered' ) {
 	 *
 	 * @param string    $handle    Name of the item. Should be unique.
 	 * @param bool      $recursion Internal flag that calling function was called recursively.
-	 * @param int|false $group     Group level: level (int), no groups (false).
+	 * @param int|false $group     Group level: level (int), no group (false).
 	 * @return bool Not already in the group or a lower group.
 	 */
 	public function set_group( $handle, $recursion, $group ) {
diff --git a/src/wp-includes/widgets/class-wp-widget-media.php b/src/wp-includes/widgets/class-wp-widget-media.php
index b6eaff793e18b..cd633e2908239 100644
--- a/src/wp-includes/widgets/class-wp-widget-media.php
+++ b/src/wp-includes/widgets/class-wp-widget-media.php
@@ -317,7 +317,6 @@ public function update( $new_instance, $old_instance ) {
 	 * @since 4.8.0
 	 *
 	 * @param array $instance Widget instance props.
-	 * @return string
 	 */
 	abstract public function render_media( $instance );
 
diff --git a/src/wp-includes/wp-db.php b/src/wp-includes/wp-db.php
index 340a6f5861e5b..13efeb0eaaf3a 100644
--- a/src/wp-includes/wp-db.php
+++ b/src/wp-includes/wp-db.php
@@ -59,6 +59,7 @@ class wpdb {
 	 * Default is to show errors if both WP_DEBUG and WP_DEBUG_DISPLAY evaluate to true.
 	 *
 	 * @since 0.71
+	 *
 	 * @var bool
 	 */
 	public $show_errors = false;
@@ -67,6 +68,7 @@ class wpdb {
 	 * Whether to suppress errors during the DB bootstrapping. Default false.
 	 *
 	 * @since 2.5.0
+	 *
 	 * @var bool
 	 */
 	public $suppress_errors = false;
@@ -75,6 +77,7 @@ class wpdb {
 	 * The error encountered during the last query.
 	 *
 	 * @since 2.5.0
+	 *
 	 * @var string
 	 */
 	public $last_error = '';
@@ -83,6 +86,7 @@ class wpdb {
 	 * The number of queries made.
 	 *
 	 * @since 1.2.0
+	 *
 	 * @var int
 	 */
 	public $num_queries = 0;
@@ -91,6 +95,7 @@ class wpdb {
 	 * Count of rows returned by the last query.
 	 *
 	 * @since 0.71
+	 *
 	 * @var int
 	 */
 	public $num_rows = 0;
@@ -99,6 +104,7 @@ class wpdb {
 	 * Count of rows affected by the last query.
 	 *
 	 * @since 0.71
+	 *
 	 * @var int
 	 */
 	public $rows_affected = 0;
@@ -107,6 +113,7 @@ class wpdb {
 	 * The ID generated for an AUTO_INCREMENT column by the last query (usually INSERT).
 	 *
 	 * @since 0.71
+	 *
 	 * @var int
 	 */
 	public $insert_id = 0;
@@ -115,6 +122,7 @@ class wpdb {
 	 * The last query made.
 	 *
 	 * @since 0.71
+	 *
 	 * @var string
 	 */
 	public $last_query;
@@ -123,6 +131,7 @@ class wpdb {
 	 * Results of the last query.
 	 *
 	 * @since 0.71
+	 *
 	 * @var array|null
 	 */
 	public $last_result;
@@ -131,6 +140,7 @@ class wpdb {
 	 * MySQL result, which is either a resource or boolean.
 	 *
 	 * @since 0.71
+	 *
 	 * @var mixed
 	 */
 	protected $result;
@@ -139,6 +149,7 @@ class wpdb {
 	 * Cached column info, for sanity checking data before inserting.
 	 *
 	 * @since 4.2.0
+	 *
 	 * @var array
 	 */
 	protected $col_meta = array();
@@ -147,6 +158,7 @@ class wpdb {
 	 * Calculated character sets on tables.
 	 *
 	 * @since 4.2.0
+	 *
 	 * @var array
 	 */
 	protected $table_charset = array();
@@ -155,6 +167,7 @@ class wpdb {
 	 * Whether text fields in the current query need to be sanity checked. Default false.
 	 *
 	 * @since 4.2.0
+	 *
 	 * @var bool
 	 */
 	protected $check_current_query = true;
@@ -163,6 +176,7 @@ class wpdb {
 	 * Flag to ensure we don't run into recursion problems when checking the collation.
 	 *
 	 * @since 4.2.0
+	 *
 	 * @see wpdb::check_safe_collation()
 	 * @var bool
 	 */
@@ -172,6 +186,7 @@ class wpdb {
 	 * Saved info on the table column.
 	 *
 	 * @since 0.71
+	 *
 	 * @var array
 	 */
 	protected $col_info;
@@ -204,6 +219,7 @@ class wpdb {
 	 * The number of times to retry reconnecting before dying. Default 5.
 	 *
 	 * @since 3.9.0
+	 *
 	 * @see wpdb::check_connection()
 	 * @var int
 	 */
@@ -216,6 +232,7 @@ class wpdb {
 	 * The second reason is for possible security precautions.
 	 *
 	 * @since 2.5.0
+	 *
 	 * @var string
 	 */
 	public $prefix = '';
@@ -224,6 +241,7 @@ class wpdb {
 	 * WordPress base table prefix.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @var string
 	 */
 	public $base_prefix;
@@ -232,6 +250,7 @@ class wpdb {
 	 * Whether the database queries are ready to start executing.
 	 *
 	 * @since 2.3.2
+	 *
 	 * @var bool
 	 */
 	public $ready = false;
@@ -240,6 +259,7 @@ class wpdb {
 	 * Blog ID.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @var int
 	 */
 	public $blogid = 0;
@@ -248,6 +268,7 @@ class wpdb {
 	 * Site ID.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @var int
 	 */
 	public $siteid = 0;
@@ -256,6 +277,7 @@ class wpdb {
 	 * List of WordPress per-blog tables.
 	 *
 	 * @since 2.5.0
+	 *
 	 * @see wpdb::tables()
 	 * @var array
 	 */
@@ -278,6 +300,7 @@ class wpdb {
 	 * 'categories', 'post2cat', and 'link2cat' were deprecated in 2.3.0, db version 5539.
 	 *
 	 * @since 2.9.0
+	 *
 	 * @see wpdb::tables()
 	 * @var array
 	 */
@@ -287,6 +310,7 @@ class wpdb {
 	 * List of WordPress global tables.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @see wpdb::tables()
 	 * @var array
 	 */
@@ -296,6 +320,7 @@ class wpdb {
 	 * List of Multisite global tables.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @see wpdb::tables()
 	 * @var array
 	 */
@@ -313,6 +338,7 @@ class wpdb {
 	 * WordPress Comments table.
 	 *
 	 * @since 1.5.0
+	 *
 	 * @var string
 	 */
 	public $comments;
@@ -321,6 +347,7 @@ class wpdb {
 	 * WordPress Comment Metadata table.
 	 *
 	 * @since 2.9.0
+	 *
 	 * @var string
 	 */
 	public $commentmeta;
@@ -329,6 +356,7 @@ class wpdb {
 	 * WordPress Links table.
 	 *
 	 * @since 1.5.0
+	 *
 	 * @var string
 	 */
 	public $links;
@@ -337,6 +365,7 @@ class wpdb {
 	 * WordPress Options table.
 	 *
 	 * @since 1.5.0
+	 *
 	 * @var string
 	 */
 	public $options;
@@ -345,6 +374,7 @@ class wpdb {
 	 * WordPress Post Metadata table.
 	 *
 	 * @since 1.5.0
+	 *
 	 * @var string
 	 */
 	public $postmeta;
@@ -353,6 +383,7 @@ class wpdb {
 	 * WordPress Posts table.
 	 *
 	 * @since 1.5.0
+	 *
 	 * @var string
 	 */
 	public $posts;
@@ -361,6 +392,7 @@ class wpdb {
 	 * WordPress Terms table.
 	 *
 	 * @since 2.3.0
+	 *
 	 * @var string
 	 */
 	public $terms;
@@ -369,6 +401,7 @@ class wpdb {
 	 * WordPress Term Relationships table.
 	 *
 	 * @since 2.3.0
+	 *
 	 * @var string
 	 */
 	public $term_relationships;
@@ -377,6 +410,7 @@ class wpdb {
 	 * WordPress Term Taxonomy table.
 	 *
 	 * @since 2.3.0
+	 *
 	 * @var string
 	 */
 	public $term_taxonomy;
@@ -385,6 +419,7 @@ class wpdb {
 	 * WordPress Term Meta table.
 	 *
 	 * @since 4.4.0
+	 *
 	 * @var string
 	 */
 	public $termmeta;
@@ -397,6 +432,7 @@ class wpdb {
 	 * WordPress User Metadata table.
 	 *
 	 * @since 2.3.0
+	 *
 	 * @var string
 	 */
 	public $usermeta;
@@ -405,6 +441,7 @@ class wpdb {
 	 * WordPress Users table.
 	 *
 	 * @since 1.5.0
+	 *
 	 * @var string
 	 */
 	public $users;
@@ -413,6 +450,7 @@ class wpdb {
 	 * Multisite Blogs table.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @var string
 	 */
 	public $blogs;
@@ -421,6 +459,7 @@ class wpdb {
 	 * Multisite Blog Metadata table.
 	 *
 	 * @since 5.1.0
+	 *
 	 * @var string
 	 */
 	public $blogmeta;
@@ -429,6 +468,7 @@ class wpdb {
 	 * Multisite Registration Log table.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @var string
 	 */
 	public $registration_log;
@@ -437,6 +477,7 @@ class wpdb {
 	 * Multisite Signups table.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @var string
 	 */
 	public $signups;
@@ -445,6 +486,7 @@ class wpdb {
 	 * Multisite Sites table.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @var string
 	 */
 	public $site;
@@ -453,6 +495,7 @@ class wpdb {
 	 * Multisite Sitewide Terms table.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @var string
 	 */
 	public $sitecategories;
@@ -461,6 +504,7 @@ class wpdb {
 	 * Multisite Site Metadata table.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @var string
 	 */
 	public $sitemeta;
@@ -472,6 +516,7 @@ class wpdb {
 	 * Keys are column names, values are format types: 'ID' => '%d'.
 	 *
 	 * @since 2.8.0
+	 *
 	 * @see wpdb::prepare()
 	 * @see wpdb::insert()
 	 * @see wpdb::update()
@@ -485,6 +530,7 @@ class wpdb {
 	 * Database table columns charset.
 	 *
 	 * @since 2.2.0
+	 *
 	 * @var string
 	 */
 	public $charset;
@@ -493,6 +539,7 @@ class wpdb {
 	 * Database table columns collate.
 	 *
 	 * @since 2.2.0
+	 *
 	 * @var string
 	 */
 	public $collate;
@@ -501,6 +548,7 @@ class wpdb {
 	 * Database Username.
 	 *
 	 * @since 2.9.0
+	 *
 	 * @var string
 	 */
 	protected $dbuser;
@@ -509,6 +557,7 @@ class wpdb {
 	 * Database Password.
 	 *
 	 * @since 3.1.0
+	 *
 	 * @var string
 	 */
 	protected $dbpassword;
@@ -517,6 +566,7 @@ class wpdb {
 	 * Database Name.
 	 *
 	 * @since 3.1.0
+	 *
 	 * @var string
 	 */
 	protected $dbname;
@@ -525,6 +575,7 @@ class wpdb {
 	 * Database Host.
 	 *
 	 * @since 3.1.0
+	 *
 	 * @var string
 	 */
 	protected $dbhost;
@@ -533,6 +584,7 @@ class wpdb {
 	 * Database Handle.
 	 *
 	 * @since 0.71
+	 *
 	 * @var string
 	 */
 	protected $dbh;
@@ -541,6 +593,7 @@ class wpdb {
 	 * A textual description of the last query/get_row/get_var call.
 	 *
 	 * @since 3.0.0
+	 *
 	 * @var string
 	 */
 	public $func_call;
@@ -554,6 +607,7 @@ class wpdb {
 	 * will force the checks to occur.
 	 *
 	 * @since 3.3.0
+	 *
 	 * @var bool
 	 */
 	public $is_mysql = null;
@@ -562,6 +616,7 @@ class wpdb {
 	 * A list of incompatible SQL modes.
 	 *
 	 * @since 3.9.0
+	 *
 	 * @var array
 	 */
 	protected $incompatible_modes = array(
@@ -577,6 +632,7 @@ class wpdb {
 	 * Whether to use mysqli over mysql. Default false.
 	 *
 	 * @since 3.9.0
+	 *
 	 * @var bool
 	 */
 	private $use_mysqli = false;
@@ -585,10 +641,31 @@ class wpdb {
 	 * Whether we've managed to successfully connect at some point.
 	 *
 	 * @since 3.9.0
+	 *
 	 * @var bool
 	 */
 	private $has_connected = false;
 
+	/**
+	 * Time when the last query was performed.
+	 *
+	 * Only set when `SAVEQUERIES` is defined and truthy.
+	 *
+	 * @since 1.5.0
+	 *
+	 * @var float
+	 */
+	public $time_start = null;
+
+	/**
+	 * The last SQL error that was encountered.
+	 *
+	 * @since 2.5.0
+	 *
+	 * @var WP_Error|string
+	 */
+	public $error = null;
+
 	/**
 	 * Connects to the database server and selects a database.
 	 *

From 237efb530448bdaac3d2aa0d7db94500bcf1c144 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Wed, 22 Sep 2021 23:05:59 +0000
Subject: [PATCH 157/257] Build/Test Tools: Splits and improves `compat` tests.

Splits the tests in the `tests/phpunit/tests/compat.php` file up into individual test classes for each function being tested.

Improvements to individual test cases:
* Adds `@covers` tags.
* Adds visibility modifiers to all methods.
* Adds function availability test.
* Where relevant, fixes the assertion parameter order.
* Data provider:
   * Where relevant, reworks a test to use a data provider.
   * Where relevant, renames data provider methods to have a more obvious link to the test it applies to.
   * Makes the data provider more readable by adding keys within the data sets.
   * Moves the data provider below its associated tests.
   * Adds/removes data sets in data providers.
* Makes the actual test code more readable by using descriptive variables and multi-line function calls.
* Adds the `$message` parameter to all assertions when a test method contains more than one assertion.

Specifically for the `_mb_substr()` tests:
* Splits the `test_mb_substr_phpcore()` method into two test methods based on the PHP Core test files they are emulating.
* Makes the actual test code within the `test_mb_substr_phpcore_basic()` method more readable by using descriptive variables and multi-line function calls.
* Splits the data used for the second part of the `test_mb_substr_phpcore()` function, now `test_mb_substr_phpcore_input_type_handling()`, off into a separate data provider with named data sets.
* Removes duplicate data sets from the `data_mb_substr_phpcore_input_type_handling()`.
   * Why? The PHP native tests test against upper/lowercase `false`, `true`, `null` and some other text string single quote/double quote variations. As things were, those differentiations had been undone when the coding standards were put in place, so in effect those weren't being tested anymore. And as this is userland code, there's no point in adding these differentiations back as they will be handled the same by PHP anyway (and that is safeguarded via the PHP native tests).
* Removes the "undefined variable" and "unset variable" test cases as, while those are relevant to the C code in which PHP is written, they are not relevant for testing userland code and will behave the same as the test passing `null`.

Follow-to [25002], [32364], [42228], [42343], [43034], [43036], [43220], [43571], [45607], [47122], [47198], [48937], [48996], [51415], [51563], [51594].

Props jrf, hellofromTonya.
See #39265, #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51852 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/compat.php                | 325 ------------------
 tests/phpunit/tests/compat/hashHmac.php       |  65 ++++
 tests/phpunit/tests/compat/isCountable.php    | 117 +++++++
 tests/phpunit/tests/compat/isIterable.php     |  77 +++++
 .../phpunit/tests/compat/jsonEncodeDecode.php |  28 ++
 tests/phpunit/tests/compat/mbStrlen.php       |  91 +++++
 tests/phpunit/tests/compat/mbSubstr.php       | 241 +++++++++++++
 7 files changed, 619 insertions(+), 325 deletions(-)
 delete mode 100644 tests/phpunit/tests/compat.php
 create mode 100644 tests/phpunit/tests/compat/hashHmac.php
 create mode 100644 tests/phpunit/tests/compat/isCountable.php
 create mode 100644 tests/phpunit/tests/compat/isIterable.php
 create mode 100644 tests/phpunit/tests/compat/jsonEncodeDecode.php
 create mode 100644 tests/phpunit/tests/compat/mbStrlen.php
 create mode 100644 tests/phpunit/tests/compat/mbSubstr.php

diff --git a/tests/phpunit/tests/compat.php b/tests/phpunit/tests/compat.php
deleted file mode 100644
index ab75d6256ba37..0000000000000
--- a/tests/phpunit/tests/compat.php
+++ /dev/null
@@ -1,325 +0,0 @@
-<?php
-
-/**
- * @group compat
- * @group security-153
- */
-class Tests_Compat extends WP_UnitTestCase {
-	function utf8_string_lengths() {
-		return array(
-			// String, character_length, byte_length.
-			array( 'баба', 4, 8 ),
-			array( 'баб', 3, 6 ),
-			array( 'I am your б', 11, 12 ),
-			array( '1111111111', 10, 10 ),
-			array( '²²²²²²²²²²', 10, 20 ),
-			array( '３３３３３３３３３３', 10, 30 ),
-			array( '𝟜𝟜𝟜𝟜𝟜𝟜𝟜𝟜𝟜𝟜', 10, 40 ),
-			array( '1²３𝟜1²３𝟜1²３𝟜', 12, 30 ),
-		);
-	}
-
-	function utf8_substrings() {
-		return array(
-			// String, start, length, character_substring, byte_substring.
-			array( 'баба', 0, 3, 'баб', "б\xD0" ),
-			array( 'баба', 0, -1, 'баб', "баб\xD0" ),
-			array( 'баба', 1, null, 'аба', "\xB1аба" ),
-			array( 'баба', -3, null, 'аба', "\xB1а" ),
-			array( 'баба', -3, 2, 'аб', "\xB1\xD0" ),
-			array( 'баба', -1, 2, 'а', "\xB0" ),
-			array( 'I am your баба', 0, 11, 'I am your б', "I am your \xD0" ),
-		);
-	}
-
-	/**
-	 * @dataProvider utf8_string_lengths
-	 */
-	function test_mb_strlen( $string, $expected_character_length ) {
-		$this->assertSame( $expected_character_length, _mb_strlen( $string, 'UTF-8' ) );
-	}
-
-	/**
-	 * @dataProvider utf8_string_lengths
-	 */
-	function test_mb_strlen_via_regex( $string, $expected_character_length ) {
-		_wp_can_use_pcre_u( false );
-		$this->assertSame( $expected_character_length, _mb_strlen( $string, 'UTF-8' ) );
-		_wp_can_use_pcre_u( 'reset' );
-	}
-
-	/**
-	 * @dataProvider utf8_string_lengths
-	 */
-	function test_8bit_mb_strlen( $string, $expected_character_length, $expected_byte_length ) {
-		$this->assertSame( $expected_byte_length, _mb_strlen( $string, '8bit' ) );
-	}
-
-	/**
-	 * @dataProvider utf8_substrings
-	 */
-	function test_mb_substr( $string, $start, $length, $expected_character_substring ) {
-		$this->assertSame( $expected_character_substring, _mb_substr( $string, $start, $length, 'UTF-8' ) );
-	}
-
-	/**
-	 * @dataProvider utf8_substrings
-	 */
-	function test_mb_substr_via_regex( $string, $start, $length, $expected_character_substring ) {
-		_wp_can_use_pcre_u( false );
-		$this->assertSame( $expected_character_substring, _mb_substr( $string, $start, $length, 'UTF-8' ) );
-		_wp_can_use_pcre_u( 'reset' );
-	}
-
-	/**
-	 * @dataProvider utf8_substrings
-	 */
-	function test_8bit_mb_substr( $string, $start, $length, $expected_character_substring, $expected_byte_substring ) {
-		$this->assertSame( $expected_byte_substring, _mb_substr( $string, $start, $length, '8bit' ) );
-	}
-
-	function test_mb_substr_phpcore() {
-		/* https://github.com/php/php-src/blob/php-5.6.8/ext/mbstring/tests/mb_substr_basic.phpt */
-		$string_ascii = 'ABCDEF';
-		$string_mb    = base64_decode( '5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=' );
-
-		$this->assertSame( 'DEF', _mb_substr( $string_ascii, 3 ) );
-		$this->assertSame( 'DEF', _mb_substr( $string_ascii, 3, 5, 'ISO-8859-1' ) );
-
-		// Specific latin-1 as that is the default the core PHP test operates under.
-		$this->assertSame( 'peacrOiqng==', base64_encode( _mb_substr( $string_mb, 2, 7, 'latin-1' ) ) );
-		$this->assertSame( '6Kqe44OG44Kt44K544OI44Gn44GZ', base64_encode( _mb_substr( $string_mb, 2, 7, 'utf-8' ) ) );
-
-		/* https://github.com/php/php-src/blob/php-5.6.8/ext/mbstring/tests/mb_substr_variation1.phpt */
-		$start     = 0;
-		$length    = 5;
-		$unset_var = 10;
-		unset( $unset_var );
-		$heredoc  = <<<EOT
-hello world
-EOT;
-		$inputs   = array(
-			0,
-			1,
-			12345,
-			-2345,
-			// Float data.
-			10.5,
-			-10.5,
-			12.3456789000e10,
-			12.3456789000E-10,
-			.5,
-			// Null data.
-			null,
-			null,
-			// Boolean data.
-			true,
-			false,
-			true,
-			false,
-			// Empty data.
-			'',
-			'',
-			// String data.
-			'string',
-			'string',
-			$heredoc,
-			// Object data.
-			new ClassA(),
-			// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged -- intentionally undefined data
-			@$undefined_var,
-			// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged -- intentionally unset data
-			@$unset_var,
-		);
-		$outputs  = array(
-			'0',
-			'1',
-			'12345',
-			'-2345',
-			'10.5',
-			'-10.5',
-			'12345',
-			'1.234',
-			'0.5',
-			'',
-			'',
-			'1',
-			'',
-			'1',
-			'',
-			'',
-			'',
-			'strin',
-			'strin',
-			'hello',
-			'Class',
-			'',
-			'',
-		);
-		$iterator = 0;
-		foreach ( $inputs as $input ) {
-			$this->assertSame( $outputs[ $iterator ], _mb_substr( $input, $start, $length ) );
-			$iterator++;
-		}
-
-	}
-
-	function test_hash_hmac_simple() {
-		$this->assertSame( '140d1cb79fa12e2a31f32d35ad0a2723', _hash_hmac( 'md5', 'simple', 'key' ) );
-		$this->assertSame( '993003b95758e0ac2eba451a4c5877eb1bb7b92a', _hash_hmac( 'sha1', 'simple', 'key' ) );
-	}
-
-	function test_hash_hmac_padding() {
-		$this->assertSame( '3c1399103807cf12ec38228614416a8c', _hash_hmac( 'md5', 'simple', '65 character key 65 character key 65 character key 65 character k' ) );
-		$this->assertSame( '4428826d20003e309d6c2a6515891370daf184ea', _hash_hmac( 'sha1', 'simple', '65 character key 65 character key 65 character key 65 character k' ) );
-	}
-
-	function test_hash_hmac_output() {
-		$this->assertSame( array( 1 => '140d1cb79fa12e2a31f32d35ad0a2723' ), unpack( 'H32', _hash_hmac( 'md5', 'simple', 'key', true ) ) );
-		$this->assertSame( array( 1 => '993003b95758e0ac2eba451a4c5877eb1bb7b92a' ), unpack( 'H40', _hash_hmac( 'sha1', 'simple', 'key', true ) ) );
-	}
-
-	function test_json_encode_decode() {
-		$this->expectDeprecation();
-
-		require_once ABSPATH . WPINC . '/class-json.php';
-		$json = new Services_JSON();
-		// Super basic test to verify Services_JSON is intact and working.
-		$this->assertSame( '["foo"]', $json->encodeUnsafe( array( 'foo' ) ) );
-		$this->assertSame( array( 'foo' ), $json->decode( '["foo"]' ) );
-	}
-
-	/**
-	 * Test that is_countable() is always available (either from PHP or WP).
-	 *
-	 * @ticket 43583
-	 */
-	function test_is_countable_availability() {
-		$this->assertTrue( function_exists( 'is_countable' ) );
-	}
-
-	/**
-	 * Test is_countable() polyfill.
-	 *
-	 * @ticket 43583
-	 *
-	 * @dataProvider countable_variable_test_data
-	 *
-	 * @param mixed $variable     Variable to check.
-	 * @param bool  $is_countable The expected return value of PHP 7.3 is_countable() function.
-	 */
-	function test_is_countable_functionality( $variable, $is_countable ) {
-		$this->assertSame( is_countable( $variable ), $is_countable );
-	}
-
-	/**
-	 * Data provider for test_is_countable_functionality().
-	 *
-	 * @ticket 43583
-	 *
-	 * @return array {
-	 *     @type array {
-	 *         @type mixed $variable     Variable to check.
-	 *         @type bool  $is_countable The expected return value of PHP 7.3 is_countable() function.
-	 *     }
-	 * }
-	 */
-	public function countable_variable_test_data() {
-		return array(
-			array( true, false ),
-			array( new stdClass(), false ),
-			array( new ArrayIteratorFake(), true ),
-			array( new CountableFake(), true ),
-			array( 16, false ),
-			array( null, false ),
-			array( array( 1, 2, 3 ), true ),
-			array( (array) 1, true ),
-			array( (object) array( 'foo', 'bar', 'baz' ), false ),
-		);
-	}
-
-	/**
-	 * Test is_countable() polyfill for ResourceBundle.
-	 *
-	 * @ticket 43583
-	 *
-	 * @requires extension intl
-	 */
-	function test_is_countable_ResourceBundle() {
-		$this->assertTrue( is_countable( new ResourceBundle( 'en', null ) ) );
-	}
-
-	/**
-	 * Test is_countable() polyfill for SimpleXMLElement.
-	 *
-	 * @ticket 43583
-	 *
-	 * @requires extension simplexml
-	 */
-	function test_is_countable_SimpleXMLElement() {
-		$this->assertTrue( is_countable( new SimpleXMLElement( '<xml><tag>1</tag><tag>2</tag></xml>' ) ) );
-	}
-
-	/**
-	 * Test that is_iterable() is always available (either from PHP or WP).
-	 *
-	 * @ticket 43619
-	 */
-	function test_is_iterable_availability() {
-		$this->assertTrue( function_exists( 'is_iterable' ) );
-	}
-
-	/**
-	 * Test is_iterable() polyfill.
-	 *
-	 * @ticket 43619
-	 *
-	 * @dataProvider iterable_variable_test_data
-	 *
-	 * @param mixed $variable    Variable to check.
-	 * @param bool  $is_iterable The expected return value of PHP 7.1 is_iterable() function.
-	 */
-	function test_is_iterable_functionality( $variable, $is_iterable ) {
-		$this->assertSame( is_iterable( $variable ), $is_iterable );
-	}
-
-	/**
-	 * Data provider for test_is_iterable_functionality().
-	 *
-	 * @ticket 43619
-	 *
-	 * @return array {
-	 *     @type array {
-	 *         @type mixed $variable    Variable to check.
-	 *         @type bool  $is_iterable The expected return value of PHP 7.1 is_iterable() function.
-	 *     }
-	 * }
-	 */
-	public function iterable_variable_test_data() {
-		return array(
-			array( array(), true ),
-			array( array( 1, 2, 3 ), true ),
-			array( new ArrayIterator( array( 1, 2, 3 ) ), true ),
-			array( 1, false ),
-			array( 3.14, false ),
-			array( new stdClass(), false ),
-		);
-	}
-}
-
-/* used in test_mb_substr_phpcore */
-class ClassA {
-	public function __toString() {
-		return 'Class A object';
-	}
-}
-
-class ArrayIteratorFake extends ArrayIterator {
-}
-
-class CountableFake implements Countable {
-	#[ReturnTypeWillChange]
-	public function count() {
-		return 16;
-	}
-}
diff --git a/tests/phpunit/tests/compat/hashHmac.php b/tests/phpunit/tests/compat/hashHmac.php
new file mode 100644
index 0000000000000..f9a61d5faca63
--- /dev/null
+++ b/tests/phpunit/tests/compat/hashHmac.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @group compat
+ *
+ * @covers ::hash_hmac
+ * @covers ::_hash_hmac
+ */
+class Tests_Compat_hashHmac extends WP_UnitTestCase {
+
+	/**
+	 * Test that hash_hmac() is always available (either from PHP or WP).
+	 */
+	public function test_hash_hmac_availability() {
+		$this->assertTrue( function_exists( 'hash_hmac' ) );
+	}
+
+	public function test_hash_hmac_simple() {
+		$data = 'simple';
+		$key  = 'key';
+
+		$this->assertSame(
+			'140d1cb79fa12e2a31f32d35ad0a2723',
+			_hash_hmac( 'md5', $data, $key ),
+			'MD5 hash does not match'
+		);
+		$this->assertSame(
+			'993003b95758e0ac2eba451a4c5877eb1bb7b92a',
+			_hash_hmac( 'sha1', $data, $key ),
+			'sha1 hash does not match'
+		);
+	}
+
+	public function test_hash_hmac_padding() {
+		$data = 'simple';
+		$key  = '65 character key 65 character key 65 character key 65 character k';
+
+		$this->assertSame(
+			'3c1399103807cf12ec38228614416a8c',
+			_hash_hmac( 'md5', $data, $key ),
+			'MD5 hash does not match'
+		);
+		$this->assertSame(
+			'4428826d20003e309d6c2a6515891370daf184ea',
+			_hash_hmac( 'sha1', $data, $key ),
+			'sha1 hash does not match'
+		);
+	}
+
+	public function test_hash_hmac_output() {
+		$data = 'simple';
+		$key  = 'key';
+
+		$this->assertSame(
+			array( 1 => '140d1cb79fa12e2a31f32d35ad0a2723' ),
+			unpack( 'H32', _hash_hmac( 'md5', $data, $key, true ) ),
+			'unpacked MD5 hash does not match'
+		);
+		$this->assertSame(
+			array( 1 => '993003b95758e0ac2eba451a4c5877eb1bb7b92a' ),
+			unpack( 'H40', _hash_hmac( 'sha1', $data, $key, true ) ),
+			'unpacked sha1 hash does not match'
+		);
+	}
+}
diff --git a/tests/phpunit/tests/compat/isCountable.php b/tests/phpunit/tests/compat/isCountable.php
new file mode 100644
index 0000000000000..66bf3c8c6c09f
--- /dev/null
+++ b/tests/phpunit/tests/compat/isCountable.php
@@ -0,0 +1,117 @@
+<?php
+
+/**
+ * @group compat
+ *
+ * @covers ::is_countable
+ */
+class Tests_Compat_isCountable extends WP_UnitTestCase {
+
+	/**
+	 * Test that is_countable() is always available (either from PHP or WP).
+	 *
+	 * @ticket 43583
+	 */
+	public function test_is_countable_availability() {
+		$this->assertTrue( function_exists( 'is_countable' ) );
+	}
+
+	/**
+	 * Test is_countable() polyfill.
+	 *
+	 * @ticket 43583
+	 *
+	 * @dataProvider data_is_countable_functionality
+	 *
+	 * @param mixed $variable     Variable to check.
+	 * @param bool  $is_countable The expected return value of PHP 7.3 is_countable() function.
+	 */
+	public function test_is_countable_functionality( $variable, $is_countable ) {
+		$this->assertSame( $is_countable, is_countable( $variable ) );
+	}
+
+	/**
+	 * Data provider for test_is_countable_functionality().
+	 *
+	 * @ticket 43583
+	 *
+	 * @return array {
+	 *     @type array {
+	 *         @type mixed $variable     Variable to check.
+	 *         @type bool  $is_countable The expected return value of PHP 7.3 is_countable() function.
+	 *     }
+	 * }
+	 */
+	public function data_is_countable_functionality() {
+		return array(
+			'boolean true'                     => array(
+				'variable'     => true,
+				'is_countable' => false,
+			),
+			'plain stdClass object'            => array(
+				'variable'     => new stdClass(),
+				'is_countable' => false,
+			),
+			'Array iterator object'            => array(
+				'variable'     => new ArrayIteratorFakeForIsCountable(),
+				'is_countable' => true,
+			),
+			'Countable object'                 => array(
+				'variable'     => new CountableFakeForIsCountable(),
+				'is_countable' => true,
+			),
+			'integer 16'                       => array(
+				'variable'     => 16,
+				'is_countable' => false,
+			),
+			'null'                             => array(
+				'variable'     => null,
+				'is_countable' => false,
+			),
+			'non-empty array, 3 items'         => array(
+				'variable'     => array( 1, 2, 3 ),
+				'is_countable' => true,
+			),
+			'non-empty array, 1 item via cast' => array(
+				'variable'     => (array) 1,
+				'is_countable' => true,
+			),
+			'array cast to object'             => array(
+				'variable'     => (object) array( 'foo', 'bar', 'baz' ),
+				'is_countable' => false,
+			),
+		);
+	}
+
+	/**
+	 * Test is_countable() polyfill for ResourceBundle.
+	 *
+	 * @ticket 43583
+	 *
+	 * @requires extension intl
+	 */
+	public function test_is_countable_ResourceBundle() {
+		$this->assertTrue( is_countable( new ResourceBundle( 'en', null ) ) );
+	}
+
+	/**
+	 * Test is_countable() polyfill for SimpleXMLElement.
+	 *
+	 * @ticket 43583
+	 *
+	 * @requires extension simplexml
+	 */
+	public function test_is_countable_SimpleXMLElement() {
+		$this->assertTrue( is_countable( new SimpleXMLElement( '<xml><tag>1</tag><tag>2</tag></xml>' ) ) );
+	}
+}
+
+class ArrayIteratorFakeForIsCountable extends ArrayIterator {
+}
+
+class CountableFakeForIsCountable implements Countable {
+	#[ReturnTypeWillChange]
+	public function count() {
+		return 16;
+	}
+}
diff --git a/tests/phpunit/tests/compat/isIterable.php b/tests/phpunit/tests/compat/isIterable.php
new file mode 100644
index 0000000000000..e09bb18278ccb
--- /dev/null
+++ b/tests/phpunit/tests/compat/isIterable.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * @group compat
+ *
+ * @covers ::is_iterable
+ */
+class Tests_Compat_isIterable extends WP_UnitTestCase {
+
+	/**
+	 * Test that is_iterable() is always available (either from PHP or WP).
+	 *
+	 * @ticket 43619
+	 */
+	public function test_is_iterable_availability() {
+		$this->assertTrue( function_exists( 'is_iterable' ) );
+	}
+
+	/**
+	 * Test is_iterable() polyfill.
+	 *
+	 * @ticket 43619
+	 *
+	 * @dataProvider data_is_iterable_functionality
+	 *
+	 * @param mixed $variable    Variable to check.
+	 * @param bool  $is_iterable The expected return value of PHP 7.1 is_iterable() function.
+	 */
+	public function test_is_iterable_functionality( $variable, $is_iterable ) {
+		$this->assertSame( $is_iterable, is_iterable( $variable ) );
+	}
+
+	/**
+	 * Data provider for test_is_iterable_functionality().
+	 *
+	 * @ticket 43619
+	 *
+	 * @return array {
+	 *     @type array {
+	 *         @type mixed $variable    Variable to check.
+	 *         @type bool  $is_iterable The expected return value of PHP 7.1 is_iterable() function.
+	 *     }
+	 * }
+	 */
+	public function data_is_iterable_functionality() {
+		return array(
+			'empty array'           => array(
+				'variable'    => array(),
+				'is_iterable' => true,
+			),
+			'non-empty array'       => array(
+				'variable'    => array( 1, 2, 3 ),
+				'is_iterable' => true,
+			),
+			'Iterator object'       => array(
+				'variable'    => new ArrayIterator( array( 1, 2, 3 ) ),
+				'is_iterable' => true,
+			),
+			'null'                  => array(
+				'variable'    => null,
+				'is_iterable' => false,
+			),
+			'integer 1'             => array(
+				'variable'    => 1,
+				'is_iterable' => false,
+			),
+			'float 3.14'            => array(
+				'variable'    => 3.14,
+				'is_iterable' => false,
+			),
+			'plain stdClass object' => array(
+				'variable'    => new stdClass(),
+				'is_iterable' => false,
+			),
+		);
+	}
+}
diff --git a/tests/phpunit/tests/compat/jsonEncodeDecode.php b/tests/phpunit/tests/compat/jsonEncodeDecode.php
new file mode 100644
index 0000000000000..475af85b9f4b4
--- /dev/null
+++ b/tests/phpunit/tests/compat/jsonEncodeDecode.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * @group compat
+ *
+ * @covers Services_JSON
+ */
+class Tests_Compat_jsonEncodeDecode extends WP_UnitTestCase {
+
+	public function test_json_encode_decode() {
+		$this->expectDeprecation();
+
+		require_once ABSPATH . WPINC . '/class-json.php';
+		$json = new Services_JSON();
+
+		// Super basic test to verify Services_JSON is intact and working.
+		$this->assertSame(
+			'["foo"]',
+			$json->encodeUnsafe( array( 'foo' ) ),
+			'encodeUnsafe() did not return expected output'
+		);
+		$this->assertSame(
+			array( 'foo' ),
+			$json->decode( '["foo"]' ),
+			'decode() did not return expected output'
+		);
+	}
+}
diff --git a/tests/phpunit/tests/compat/mbStrlen.php b/tests/phpunit/tests/compat/mbStrlen.php
new file mode 100644
index 0000000000000..e34b44534b1e4
--- /dev/null
+++ b/tests/phpunit/tests/compat/mbStrlen.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * @group compat
+ * @group security-153
+ *
+ * @covers ::mb_strlen
+ * @covers ::_mb_strlen
+ */
+class Tests_Compat_mbStrlen extends WP_UnitTestCase {
+
+	/**
+	 * Test that mb_strlen() is always available (either from PHP or WP).
+	 */
+	public function test_mb_strlen_availability() {
+		$this->assertTrue( function_exists( 'mb_strlen' ) );
+	}
+
+	/**
+	 * @dataProvider utf8_string_lengths
+	 */
+	public function test_mb_strlen( $string, $expected_character_length ) {
+		$this->assertSame( $expected_character_length, _mb_strlen( $string, 'UTF-8' ) );
+	}
+
+	/**
+	 * @dataProvider utf8_string_lengths
+	 */
+	public function test_mb_strlen_via_regex( $string, $expected_character_length ) {
+		_wp_can_use_pcre_u( false );
+		$this->assertSame( $expected_character_length, _mb_strlen( $string, 'UTF-8' ) );
+		_wp_can_use_pcre_u( 'reset' );
+	}
+
+	/**
+	 * @dataProvider utf8_string_lengths
+	 */
+	public function test_8bit_mb_strlen( $string, $expected_character_length, $expected_byte_length ) {
+		$this->assertSame( $expected_byte_length, _mb_strlen( $string, '8bit' ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function utf8_string_lengths() {
+		return array(
+			array(
+				'string'                    => 'баба',
+				'expected_character_length' => 4,
+				'expected_byte_length'      => 8,
+			),
+			array(
+				'string'                    => 'баб',
+				'expected_character_length' => 3,
+				'expected_byte_length'      => 6,
+			),
+			array(
+				'string'                    => 'I am your б',
+				'expected_character_length' => 11,
+				'expected_byte_length'      => 12,
+			),
+			array(
+				'string'                    => '1111111111',
+				'expected_character_length' => 10,
+				'expected_byte_length'      => 10,
+			),
+			array(
+				'string'                    => '²²²²²²²²²²',
+				'expected_character_length' => 10,
+				'expected_byte_length'      => 20,
+			),
+			array(
+				'string'                    => '３３３３３３３３３３',
+				'expected_character_length' => 10,
+				'expected_byte_length'      => 30,
+			),
+			array(
+				'string'                    => '𝟜𝟜𝟜𝟜𝟜𝟜𝟜𝟜𝟜𝟜',
+				'expected_character_length' => 10,
+				'expected_byte_length'      => 40,
+			),
+			array(
+				'string'                    => '1²３𝟜1²３𝟜1²３𝟜',
+				'expected_character_length' => 12,
+				'expected_byte_length'      => 30,
+			),
+		);
+	}
+}
diff --git a/tests/phpunit/tests/compat/mbSubstr.php b/tests/phpunit/tests/compat/mbSubstr.php
new file mode 100644
index 0000000000000..f03f5f0f193bf
--- /dev/null
+++ b/tests/phpunit/tests/compat/mbSubstr.php
@@ -0,0 +1,241 @@
+<?php
+
+/**
+ * @group compat
+ * @group security-153
+ *
+ * @covers ::mb_substr
+ * @covers ::_mb_substr
+ */
+class Tests_Compat_mbSubstr extends WP_UnitTestCase {
+
+	/**
+	 * Test that mb_substr() is always available (either from PHP or WP).
+	 */
+	public function test_mb_substr_availability() {
+		$this->assertTrue( function_exists( 'mb_substr' ) );
+	}
+
+	/**
+	 * @dataProvider utf8_substrings
+	 */
+	public function test_mb_substr( $string, $start, $length, $expected_character_substring ) {
+		$this->assertSame( $expected_character_substring, _mb_substr( $string, $start, $length, 'UTF-8' ) );
+	}
+
+	/**
+	 * @dataProvider utf8_substrings
+	 */
+	public function test_mb_substr_via_regex( $string, $start, $length, $expected_character_substring ) {
+		_wp_can_use_pcre_u( false );
+		$this->assertSame( $expected_character_substring, _mb_substr( $string, $start, $length, 'UTF-8' ) );
+		_wp_can_use_pcre_u( 'reset' );
+	}
+
+	/**
+	 * @dataProvider utf8_substrings
+	 */
+	public function test_8bit_mb_substr( $string, $start, $length, $expected_character_substring, $expected_byte_substring ) {
+		$this->assertSame( $expected_byte_substring, _mb_substr( $string, $start, $length, '8bit' ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function utf8_substrings() {
+		return array(
+			array(
+				'string'                       => 'баба',
+				'start'                        => 0,
+				'length'                       => 3,
+				'expected_character_substring' => 'баб',
+				'expected_byte_substring'      => "б\xD0",
+			),
+			array(
+				'string'                       => 'баба',
+				'start'                        => 0,
+				'length'                       => -1,
+				'expected_character_substring' => 'баб',
+				'expected_byte_substring'      => "баб\xD0",
+			),
+			array(
+				'string'                       => 'баба',
+				'start'                        => 1,
+				'length'                       => null,
+				'expected_character_substring' => 'аба',
+				'expected_byte_substring'      => "\xB1аба",
+			),
+			array(
+				'string'                       => 'баба',
+				'start'                        => -3,
+				'length'                       => null,
+				'expected_character_substring' => 'аба',
+				'expected_byte_substring'      => "\xB1а",
+			),
+			array(
+				'string'                       => 'баба',
+				'start'                        => -3,
+				'length'                       => 2,
+				'expected_character_substring' => 'аб',
+				'expected_byte_substring'      => "\xB1\xD0",
+			),
+			array(
+				'string'                       => 'баба',
+				'start'                        => -1,
+				'length'                       => 2,
+				'expected_character_substring' => 'а',
+				'expected_byte_substring'      => "\xB0",
+			),
+			array(
+				'string'                       => 'I am your баба',
+				'start'                        => 0,
+				'length'                       => 11,
+				'expected_character_substring' => 'I am your б',
+				'expected_byte_substring'      => "I am your \xD0",
+			),
+		);
+	}
+
+	/**
+	 * @link https://github.com/php/php-src/blob/php-5.6.8/ext/mbstring/tests/mb_substr_basic.phpt
+	 */
+	public function test_mb_substr_phpcore_basic() {
+		$string_ascii = 'ABCDEF';
+		$string_mb    = base64_decode( '5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=' );
+
+		$this->assertSame(
+			'DEF',
+			_mb_substr( $string_ascii, 3 ),
+			'Substring does not match expected for offset 3'
+		);
+		$this->assertSame(
+			'DEF',
+			_mb_substr( $string_ascii, 3, 5, 'ISO-8859-1' ),
+			'Substring does not match expected for offset 3, length 5, with iso charset'
+		);
+
+		// Specific latin-1 as that is the default the core PHP test operates under.
+		$this->assertSame(
+			'peacrOiqng==',
+			base64_encode( _mb_substr( $string_mb, 2, 7, 'latin-1' ) ),
+			'Substring does not match expected for offset 2, length 7, with latin-1 charset'
+		);
+		$this->assertSame(
+			'6Kqe44OG44Kt44K544OI44Gn44GZ',
+			base64_encode( _mb_substr( $string_mb, 2, 7, 'utf-8' ) ),
+			'Substring does not match expected for offset 2, length 7, with utf-8 charset'
+		);
+	}
+
+	/**
+	 * @link https://github.com/php/php-src/blob/php-5.6.8/ext/mbstring/tests/mb_substr_variation1.phpt
+	 *
+	 * @dataProvider data_mb_substr_phpcore_input_type_handling
+	 *
+	 * @param mixed  $input    Input to pass to the function.
+	 * @param string $expected Expected function output.
+	 */
+	public function test_mb_substr_phpcore_input_type_handling( $input, $expected ) {
+		$start  = 0;
+		$length = 5;
+
+		$this->assertSame( $expected, _mb_substr( $input, $start, $length ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_mb_substr_phpcore_input_type_handling() {
+		$heredoc = <<<EOT
+hello world
+EOT;
+
+		return array(
+			'integer zero'                   => array(
+				'input'    => 0,
+				'expected' => '0',
+			),
+			'integer 1'                      => array(
+				'input'    => 1,
+				'expected' => '1',
+			),
+			'positive integer'               => array(
+				'input'    => 12345,
+				'expected' => '12345',
+			),
+			'negative integer'               => array(
+				'input'    => -2345,
+				'expected' => '-2345',
+			),
+			// Float data.
+			'positive float with fraction'   => array(
+				'input'    => 10.5,
+				'expected' => '10.5',
+			),
+			'negative float with fraction'   => array(
+				'input'    => -10.5,
+				'expected' => '-10.5',
+			),
+			'float scientific whole number'  => array(
+				'input'    => 12.3456789000e10,
+				'expected' => '12345',
+			),
+			'float scientific with fraction' => array(
+				'input'    => 12.3456789000E-10,
+				'expected' => '1.234',
+			),
+			'float, fraction only'           => array(
+				'input'    => .5,
+				'expected' => '0.5',
+			),
+			// Null data.
+			'null'                           => array(
+				'input'    => null,
+				'expected' => '',
+			),
+			// Boolean data.
+			'boolean true'                   => array(
+				'input'    => true,
+				'expected' => '1',
+			),
+			'boolean false'                  => array(
+				'input'    => false,
+				'expected' => '',
+			),
+			// Empty data.
+			'empty string'                   => array(
+				'input'    => '',
+				'expected' => '',
+			),
+			// String data.
+			'double quoted string'           => array(
+				'input'    => "string'",
+				'expected' => 'strin',
+			),
+			'single quoted string'           => array(
+				'input'    => 'string',
+				'expected' => 'strin',
+			),
+			'heredoc string'                 => array(
+				'input'    => $heredoc,
+				'expected' => 'hello',
+			),
+			// Object data.
+			'object with __toString method'  => array(
+				'input'    => new ClassWithToStringForMbSubstr(),
+				'expected' => 'Class',
+			),
+		);
+	}
+}
+
+/* used in data_mb_substr_phpcore_input_type_handling() */
+class ClassWithToStringForMbSubstr {
+	public function __toString() {
+		return 'Class object';
+	}
+}

From 6b2e2bf8d7dcaa6a739ef96d7a11a6e92e0af061 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Wed, 22 Sep 2021 23:33:24 +0000
Subject: [PATCH 158/257] Code Modernization: Fix "passing null to
 non-nullable" deprecation in `_mb_substr()`.

The `_mb_substr()` function expects a string for the `$str` parameter, but does not do input validation. This function contains a `preg_match_all()` which also expects a string type for the given subject (i.e. `$str`).

Passing `null` to this parameter results in `preg_match_all(): Passing null to parameter #2 ($subject) of type string is deprecated` notice on PHP 8.1.

To maintain the same behaviour as before, a guard clause is added to bail out early when `$str` is passed as `null`. The outcome will, in that case, only ever be an empty string.

Note: this does mean that the `_mb_substr()` function now has a subtle difference in behaviour compared to the PHP native `mb_substr()` function as the latter ''will'' throw the deprecation notice.

The existing tests already cover this issue.

Follow-up to [17621], [36017], [32364].

Props jrf, hellofromTonya.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51853 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/compat.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/wp-includes/compat.php b/src/wp-includes/compat.php
index 6fe5ab37e17d8..b95275455ceae 100644
--- a/src/wp-includes/compat.php
+++ b/src/wp-includes/compat.php
@@ -79,6 +79,10 @@ function mb_substr( $str, $start, $length = null, $encoding = null ) {
  * @return string Extracted substring.
  */
 function _mb_substr( $str, $start, $length = null, $encoding = null ) {
+	if ( null === $str ) {
+		return '';
+	}
+
 	if ( null === $encoding ) {
 		$encoding = get_option( 'blog_charset' );
 	}

From 36ed6d5107e86429763e79d266e627cef5be8824 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Thu, 23 Sep 2021 14:21:07 +0000
Subject: [PATCH 159/257] Docs: Fix typo in the `$clear_working` parameter
 description in `WP_Upgrader` methods.

Follow-up to [30758], [51527].

Props zenithcity, aezazshekh, pbiron, mukesh27.
Fixes #54163.

git-svn-id: https://develop.svn.wordpress.org/trunk@51854 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-upgrader.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-upgrader.php b/src/wp-admin/includes/class-wp-upgrader.php
index 2843d8dd0ba31..ed9302feb2d16 100644
--- a/src/wp-admin/includes/class-wp-upgrader.php
+++ b/src/wp-admin/includes/class-wp-upgrader.php
@@ -464,8 +464,8 @@ public function clear_destination( $remote_destination ) {
 	 *                                               Default empty.
 	 *     @type bool   $clear_destination           Whether to delete any files already in the destination
 	 *                                               folder. Default false.
-	 *     @type bool   $clear_working               Whether to delete the files form the working directory
-	 *                                               after copying to the destination. Default false.
+	 *     @type bool   $clear_working               Whether to delete the files from the working directory
+	 *                                               after copying them to the destination. Default false.
 	 *     @type bool   $abort_if_destination_exists Whether to abort the installation if
 	 *                                               the destination folder already exists. Default true.
 	 *     @type array  $hook_extra                  Extra arguments to pass to the filter hooks called by
@@ -681,8 +681,8 @@ public function install_package( $args = array() ) {
 	 *                                               Default empty.
 	 *     @type bool   $clear_destination           Whether to delete any files already in the
 	 *                                               destination folder. Default false.
-	 *     @type bool   $clear_working               Whether to delete the files form the working
-	 *                                               directory after copying to the destination.
+	 *     @type bool   $clear_working               Whether to delete the files from the working
+	 *                                               directory after copying them to the destination.
 	 *                                               Default false.
 	 *     @type bool   $abort_if_destination_exists Whether to abort the installation if the destination
 	 *                                               folder already exists. When true, `$clear_destination`

From 5bc27525241d425fed20ebf67ca7b84205b8cb43 Mon Sep 17 00:00:00 2001
From: Jake Spurlock <whyisjake@git.wordpress.org>
Date: Thu, 23 Sep 2021 20:26:28 +0000
Subject: [PATCH 160/257] Posts, Post Types: Don't add a trailing number when
 there is a unique post parent.

WordPress tries to avoid an issue where slugs might match an existing slug of a page/post.
If we are in a hierarchical post type, there will be a level, and we can leave it the same.

Props stormrockwell, SergeyBiryukov, terriann, tubys, jeremyfelt, Daschmi, MaximeCulea, knutsp, whyisjake.
Fixes #51147.
See also #44112 and #45260.


git-svn-id: https://develop.svn.wordpress.org/trunk@51855 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/ms.php                  |  3 +
 .../tests/multisite/msPermalinkCollision.php  | 82 +++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 tests/phpunit/tests/multisite/msPermalinkCollision.php

diff --git a/src/wp-admin/includes/ms.php b/src/wp-admin/includes/ms.php
index 7796745a2ed93..76af47f8affa1 100644
--- a/src/wp-admin/includes/ms.php
+++ b/src/wp-admin/includes/ms.php
@@ -736,6 +736,9 @@ function avoid_blog_page_permalink_collision( $data, $postarr ) {
 	if ( ! is_main_site() ) {
 		return $data;
 	}
+	if ( isset( $data['post_parent'] ) && $data['post_parent'] ) {
+		return $data;
+	}
 
 	$post_name = $data['post_name'];
 	$c         = 0;
diff --git a/tests/phpunit/tests/multisite/msPermalinkCollision.php b/tests/phpunit/tests/multisite/msPermalinkCollision.php
new file mode 100644
index 0000000000000..1a8c25a75ca6b
--- /dev/null
+++ b/tests/phpunit/tests/multisite/msPermalinkCollision.php
@@ -0,0 +1,82 @@
+<?php
+
+if ( is_multisite() ) :
+
+	/**
+	 * Tests specific to `avoid_blog_page_permalink_collision()` in multisite.
+	 *
+	 * @group multisite
+	 * @group only
+	 */
+	class Tests_Multisite_MS_Permalink_Collision extends WP_UnitTestCase {
+		protected $suppress = false;
+		protected static $site_id;
+		protected static $root_page;
+		protected static $child_page;
+		protected static $post_and_blog_path = 'permalink-collison';
+
+		/**
+		 * Create a blog and the pages we need to test the collision.
+		 */
+		public static function wpSetUpBeforeClass( $factory ) {
+			self::$site_id = self::factory()->blog->create(
+				array(
+					'path' => '/' . self::$post_and_blog_path,
+				)
+			);
+
+			self::$root_page = self::factory()->post->create_and_get(
+				array(
+					'post_type'   => 'page',
+					'post_title'  => 'Bar',
+					'post_name'   => self::$post_and_blog_path,
+				)
+			);
+
+			self::$child_page = self::factory()->post->create_and_get(
+				array(
+					'post_parent' => self::$root_page->ID,
+					'post_type'   => 'page',
+					'post_title'  => 'Bar',
+					'post_name'   => self::$post_and_blog_path,
+				)
+			);
+		}
+
+		public function setUp() {
+			global $wpdb;
+			parent::setUp();
+			$this->suppress = $wpdb->suppress_errors();
+		}
+
+		public function tearDown() {
+			global $wpdb;
+			$wpdb->suppress_errors( $this->suppress );
+			parent::tearDown();
+		}
+
+		/**
+		 * Delete blog and pages we created.
+		 */
+		public static function wpTearDownAfterClass() {
+			wp_delete_site( self::$site_id );
+
+			wp_delete_post( self::$root_page->ID );
+			wp_delete_post( self::$child_page->ID );
+		}
+
+		public function test_avoid_blog_page_permalink_collision_renames_post_name() {
+			$this->assertNotEquals( self::$post_and_blog_path, self::$root_page->post_name );
+		}
+
+		/**
+		 * Ensure `avoid_blog_page_permalink_collision()` doesn't rename child pages post_name.
+		 *
+		 * @ticket 51147
+		 */
+		public function test_avoid_blog_page_permalink_collision_doesnt_rename_child_pages() {
+			$this->assertEquals( self::$post_and_blog_path, self::$child_page->post_name );
+		}
+	}
+
+endif;

From bf705d99e6e938cf4fbf0b8ca4794b68b5817736 Mon Sep 17 00:00:00 2001
From: Jake Spurlock <whyisjake@git.wordpress.org>
Date: Thu, 23 Sep 2021 20:33:57 +0000
Subject: [PATCH 161/257] Coding Standards: Fix the alignment of the array.

Unprops: whyisjake.
See [51855].


git-svn-id: https://develop.svn.wordpress.org/trunk@51856 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/multisite/msPermalinkCollision.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/phpunit/tests/multisite/msPermalinkCollision.php b/tests/phpunit/tests/multisite/msPermalinkCollision.php
index 1a8c25a75ca6b..1471eb9e5e492 100644
--- a/tests/phpunit/tests/multisite/msPermalinkCollision.php
+++ b/tests/phpunit/tests/multisite/msPermalinkCollision.php
@@ -27,9 +27,9 @@ public static function wpSetUpBeforeClass( $factory ) {
 
 			self::$root_page = self::factory()->post->create_and_get(
 				array(
-					'post_type'   => 'page',
-					'post_title'  => 'Bar',
-					'post_name'   => self::$post_and_blog_path,
+					'post_type'  => 'page',
+					'post_title' => 'Bar',
+					'post_name'  => self::$post_and_blog_path,
 				)
 			);
 

From 3f6ba8aeb38269fba6b9adc60eac4220655f1179 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Thu, 23 Sep 2021 21:29:07 +0000
Subject: [PATCH 162/257] Build/Test Tools: Upgrades
 `Tests_Multisite_MS_Permalink_Collision` fixture methods and strict
 assertion.

Improvements include:

- Upgrades the test fixture methods to the new snake_case methods.
- Reorders the fixture methods for consistency.
- Uses strict assertions of assertSame and assertNotSame.

Follow-up to [51855-51856].

Props hellofromTonya.
See #51147.

git-svn-id: https://develop.svn.wordpress.org/trunk@51857 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../tests/multisite/msPermalinkCollision.php  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/phpunit/tests/multisite/msPermalinkCollision.php b/tests/phpunit/tests/multisite/msPermalinkCollision.php
index 1471eb9e5e492..794edab6a9e42 100644
--- a/tests/phpunit/tests/multisite/msPermalinkCollision.php
+++ b/tests/phpunit/tests/multisite/msPermalinkCollision.php
@@ -43,18 +43,6 @@ public static function wpSetUpBeforeClass( $factory ) {
 			);
 		}
 
-		public function setUp() {
-			global $wpdb;
-			parent::setUp();
-			$this->suppress = $wpdb->suppress_errors();
-		}
-
-		public function tearDown() {
-			global $wpdb;
-			$wpdb->suppress_errors( $this->suppress );
-			parent::tearDown();
-		}
-
 		/**
 		 * Delete blog and pages we created.
 		 */
@@ -65,8 +53,20 @@ public static function wpTearDownAfterClass() {
 			wp_delete_post( self::$child_page->ID );
 		}
 
+		public function set_up() {
+			global $wpdb;
+			parent::set_up();
+			$this->suppress = $wpdb->suppress_errors();
+		}
+
+		public function tear_down() {
+			global $wpdb;
+			$wpdb->suppress_errors( $this->suppress );
+			parent::tear_down();
+		}
+
 		public function test_avoid_blog_page_permalink_collision_renames_post_name() {
-			$this->assertNotEquals( self::$post_and_blog_path, self::$root_page->post_name );
+			$this->assertNotSame( self::$post_and_blog_path, self::$root_page->post_name );
 		}
 
 		/**
@@ -75,7 +75,7 @@ public function test_avoid_blog_page_permalink_collision_renames_post_name() {
 		 * @ticket 51147
 		 */
 		public function test_avoid_blog_page_permalink_collision_doesnt_rename_child_pages() {
-			$this->assertEquals( self::$post_and_blog_path, self::$child_page->post_name );
+			$this->assertSame( self::$post_and_blog_path, self::$child_page->post_name );
 		}
 	}
 

From a12706381b1efd3391a4df11d86625c7874f78b8 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Fri, 24 Sep 2021 00:12:47 +0000
Subject: [PATCH 163/257] Tests: Correct the `@ticket` reference in
 `wp_terms_checklist()` tests.

Follow-up to [48880].

See #53363, #51137.

git-svn-id: https://develop.svn.wordpress.org/trunk@51858 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/admin/includesTemplate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/phpunit/tests/admin/includesTemplate.php b/tests/phpunit/tests/admin/includesTemplate.php
index 6e345514cedbd..c5e73d59e3ad0 100644
--- a/tests/phpunit/tests/admin/includesTemplate.php
+++ b/tests/phpunit/tests/admin/includesTemplate.php
@@ -5,7 +5,7 @@
 class Tests_Admin_IncludesTemplate extends WP_UnitTestCase {
 
 	/**
-	 * @ticket 51147
+	 * @ticket 51137
 	 * @dataProvider data_wp_terms_checklist_with_selected_cats
 	 */
 	public function test_wp_terms_checklist_with_selected_cats( $term_id ) {
@@ -21,7 +21,7 @@ public function test_wp_terms_checklist_with_selected_cats( $term_id ) {
 	}
 
 	/**
-	 * @ticket 51147
+	 * @ticket 51137
 	 * @dataProvider data_wp_terms_checklist_with_selected_cats
 	 */
 	public function test_wp_terms_checklist_with_popular_cats( $term_id ) {

From 80a345f5b28192e90abc36986933ca7a09a9496a Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Fri, 24 Sep 2021 00:29:46 +0000
Subject: [PATCH 164/257] Tests: Further improve the tests for
 `avoid_blog_page_permalink_collision()`:

* Rename the test filename and class to match the name of the function being tested.
* Remove unnecessary `setUp()` and `tearDown()` methods.
* Replace the `only` test group with `post`.

Follow-up to [51855-51857].

See #51147.

git-svn-id: https://develop.svn.wordpress.org/trunk@51859 602fd350-edb4-49c9-b593-d223f7449a82
---
 ...hp => avoidBlogPagePermalinkCollision.php} | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)
 rename tests/phpunit/tests/multisite/{msPermalinkCollision.php => avoidBlogPagePermalinkCollision.php} (81%)

diff --git a/tests/phpunit/tests/multisite/msPermalinkCollision.php b/tests/phpunit/tests/multisite/avoidBlogPagePermalinkCollision.php
similarity index 81%
rename from tests/phpunit/tests/multisite/msPermalinkCollision.php
rename to tests/phpunit/tests/multisite/avoidBlogPagePermalinkCollision.php
index 794edab6a9e42..137dff5b79394 100644
--- a/tests/phpunit/tests/multisite/msPermalinkCollision.php
+++ b/tests/phpunit/tests/multisite/avoidBlogPagePermalinkCollision.php
@@ -6,10 +6,9 @@
 	 * Tests specific to `avoid_blog_page_permalink_collision()` in multisite.
 	 *
 	 * @group multisite
-	 * @group only
+	 * @group post
 	 */
-	class Tests_Multisite_MS_Permalink_Collision extends WP_UnitTestCase {
-		protected $suppress = false;
+	class Tests_Multisite_AvoidBlogPagePermalinkCollision extends WP_UnitTestCase {
 		protected static $site_id;
 		protected static $root_page;
 		protected static $child_page;
@@ -53,24 +52,12 @@ public static function wpTearDownAfterClass() {
 			wp_delete_post( self::$child_page->ID );
 		}
 
-		public function set_up() {
-			global $wpdb;
-			parent::set_up();
-			$this->suppress = $wpdb->suppress_errors();
-		}
-
-		public function tear_down() {
-			global $wpdb;
-			$wpdb->suppress_errors( $this->suppress );
-			parent::tear_down();
-		}
-
 		public function test_avoid_blog_page_permalink_collision_renames_post_name() {
 			$this->assertNotSame( self::$post_and_blog_path, self::$root_page->post_name );
 		}
 
 		/**
-		 * Ensure `avoid_blog_page_permalink_collision()` doesn't rename child pages post_name.
+		 * Ensure `avoid_blog_page_permalink_collision()` doesn't rename child pages' post_name.
 		 *
 		 * @ticket 51147
 		 */

From 3546c694e9eeab44c5dbbe87f33e830b532a78c9 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Fri, 24 Sep 2021 00:45:43 +0000
Subject: [PATCH 165/257] Tests: Rename classes in `phpunit/tests/multisite/`
 per the naming conventions.

https://make.wordpress.org/core/handbook/testing/automated-testing/writing-phpunit-tests/#naming-and-organization

Follow-up to [47780], [48911], [49327], [50291], [50292], [50342], [50452], [50453], [50456], [50967], [50968], [50969], [51491], [51492], [51493], [51623], [51639], [51646], [51650], [51651].

See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51860 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/multisite/cleanDirsizeCache.php             | 2 +-
 tests/phpunit/tests/multisite/getBlogDetails.php                | 2 +-
 tests/phpunit/tests/multisite/getIdFromBlogname.php             | 2 +-
 tests/phpunit/tests/multisite/getMainSiteId.php                 | 2 +-
 tests/phpunit/tests/multisite/getSite.php                       | 2 +-
 tests/phpunit/tests/multisite/getSpaceAllowed.php               | 2 +-
 tests/phpunit/tests/multisite/getSpaceUsed.php                  | 2 +-
 tests/phpunit/tests/multisite/isUploadSpaceAvailable.php        | 2 +-
 .../multisite/{ms-files-rewriting.php => msFilesRewriting.php}  | 2 +-
 tests/phpunit/tests/multisite/siteDetails.php                   | 2 +-
 tests/phpunit/tests/multisite/siteMeta.php                      | 2 +-
 tests/phpunit/tests/multisite/updateBlogDetails.php             | 2 +-
 tests/phpunit/tests/multisite/uploadIsUserOverQuota.php         | 2 +-
 tests/phpunit/tests/multisite/wpGetSites.php                    | 2 +-
 tests/phpunit/tests/multisite/wpInstallDefaults.php             | 2 +-
 .../{wpMSSitesListTable.php => wpMsSitesListTable.php}          | 2 +-
 .../tests/multisite/{networkQuery.php => wpNetworkQuery.php}    | 2 +-
 .../phpunit/tests/multisite/{siteQuery.php => wpSiteQuery.php}  | 2 +-
 tests/phpunit/tests/multisite/wpmuValidateBlogSignup.php        | 2 +-
 tests/phpunit/tests/multisite/wpmuValidateUserSignup.php        | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)
 rename tests/phpunit/tests/multisite/{ms-files-rewriting.php => msFilesRewriting.php} (97%)
 rename tests/phpunit/tests/multisite/{wpMSSitesListTable.php => wpMsSitesListTable.php} (98%)
 rename tests/phpunit/tests/multisite/{networkQuery.php => wpNetworkQuery.php} (99%)
 rename tests/phpunit/tests/multisite/{siteQuery.php => wpSiteQuery.php} (99%)

diff --git a/tests/phpunit/tests/multisite/cleanDirsizeCache.php b/tests/phpunit/tests/multisite/cleanDirsizeCache.php
index 8aaa596d39ceb..958908f4687fe 100644
--- a/tests/phpunit/tests/multisite/cleanDirsizeCache.php
+++ b/tests/phpunit/tests/multisite/cleanDirsizeCache.php
@@ -8,7 +8,7 @@
 	 * @ticket 19879
 	 * @group multisite
 	 */
-	class Tests_Multisite_Dirsize_Cache extends WP_UnitTestCase {
+	class Tests_Multisite_CleanDirsizeCache extends WP_UnitTestCase {
 		protected $suppress = false;
 
 		function set_up() {
diff --git a/tests/phpunit/tests/multisite/getBlogDetails.php b/tests/phpunit/tests/multisite/getBlogDetails.php
index 358499e55a19e..b4c456f082147 100644
--- a/tests/phpunit/tests/multisite/getBlogDetails.php
+++ b/tests/phpunit/tests/multisite/getBlogDetails.php
@@ -7,7 +7,7 @@
 	 * @group ms-site
 	 * @group multisite
 	 */
-	class Tests_Multisite_Get_Blog_Details extends WP_UnitTestCase {
+	class Tests_Multisite_GetBlogDetails extends WP_UnitTestCase {
 		protected static $network_ids;
 		protected static $site_ids;
 
diff --git a/tests/phpunit/tests/multisite/getIdFromBlogname.php b/tests/phpunit/tests/multisite/getIdFromBlogname.php
index 29d7c8c761122..49b4bf6f85c49 100644
--- a/tests/phpunit/tests/multisite/getIdFromBlogname.php
+++ b/tests/phpunit/tests/multisite/getIdFromBlogname.php
@@ -8,7 +8,7 @@
 	 * @group ms-site
 	 * @group multisite
 	 */
-	class Tests_Multisite_Get_Id_From_Blogname extends WP_UnitTestCase {
+	class Tests_Multisite_GetIdFromBlogname extends WP_UnitTestCase {
 		protected static $network_ids;
 		protected static $site_ids;
 
diff --git a/tests/phpunit/tests/multisite/getMainSiteId.php b/tests/phpunit/tests/multisite/getMainSiteId.php
index 63e68ef16344d..3a6e9c4d8c0a0 100644
--- a/tests/phpunit/tests/multisite/getMainSiteId.php
+++ b/tests/phpunit/tests/multisite/getMainSiteId.php
@@ -8,7 +8,7 @@
 	 * @group ms-site
 	 * @group multisite
 	 */
-	class Tests_Multisite_Get_Main_Site_ID extends WP_UnitTestCase {
+	class Tests_Multisite_GetMainSiteId extends WP_UnitTestCase {
 		protected static $network_ids;
 		protected static $site_ids;
 
diff --git a/tests/phpunit/tests/multisite/getSite.php b/tests/phpunit/tests/multisite/getSite.php
index f1c4779d6be9e..46a5121247fd9 100644
--- a/tests/phpunit/tests/multisite/getSite.php
+++ b/tests/phpunit/tests/multisite/getSite.php
@@ -7,7 +7,7 @@
 	 * @group ms-site
 	 * @group multisite
 	 */
-	class Tests_Multisite_Get_Site extends WP_UnitTestCase {
+	class Tests_Multisite_GetSite extends WP_UnitTestCase {
 		protected static $site_ids;
 
 		public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
diff --git a/tests/phpunit/tests/multisite/getSpaceAllowed.php b/tests/phpunit/tests/multisite/getSpaceAllowed.php
index 735e4320c257b..97b09ab00c835 100644
--- a/tests/phpunit/tests/multisite/getSpaceAllowed.php
+++ b/tests/phpunit/tests/multisite/getSpaceAllowed.php
@@ -7,7 +7,7 @@
 	 *
 	 * @group multisite
 	 */
-	class Tests_Multisite_Get_Space_Allowed extends WP_UnitTestCase {
+	class Tests_Multisite_GetSpaceAllowed extends WP_UnitTestCase {
 		protected $suppress = false;
 
 		public function set_up() {
diff --git a/tests/phpunit/tests/multisite/getSpaceUsed.php b/tests/phpunit/tests/multisite/getSpaceUsed.php
index b6492d661ec3f..7bad089572163 100644
--- a/tests/phpunit/tests/multisite/getSpaceUsed.php
+++ b/tests/phpunit/tests/multisite/getSpaceUsed.php
@@ -6,7 +6,7 @@
 	 * @group multisite
 	 * @covers ::get_space_used
 	 */
-	class Tests_Multisite_Get_Space_Used extends WP_UnitTestCase {
+	class Tests_Multisite_GetSpaceUsed extends WP_UnitTestCase {
 		protected $suppress = false;
 
 		function set_up() {
diff --git a/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php b/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php
index d520791879e17..796bf0f73653b 100644
--- a/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php
+++ b/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php
@@ -10,7 +10,7 @@
 	 *
 	 * @group multisite
 	 */
-	class Tests_Multisite_Is_Upload_Space_Available extends WP_UnitTestCase {
+	class Tests_Multisite_IsUploadSpaceAvailable extends WP_UnitTestCase {
 		protected $suppress = false;
 
 		public function set_up() {
diff --git a/tests/phpunit/tests/multisite/ms-files-rewriting.php b/tests/phpunit/tests/multisite/msFilesRewriting.php
similarity index 97%
rename from tests/phpunit/tests/multisite/ms-files-rewriting.php
rename to tests/phpunit/tests/multisite/msFilesRewriting.php
index 4288d2ef61104..050ae44bb94eb 100644
--- a/tests/phpunit/tests/multisite/ms-files-rewriting.php
+++ b/tests/phpunit/tests/multisite/msFilesRewriting.php
@@ -11,7 +11,7 @@
 	 * @group ms-files
 	 * @group multisite
 	 */
-	class Tests_Multisite_MS_Files_Rewriting extends WP_UnitTestCase {
+	class Tests_Multisite_msFilesRewriting extends WP_UnitTestCase {
 		protected $suppress = false;
 
 		function set_up() {
diff --git a/tests/phpunit/tests/multisite/siteDetails.php b/tests/phpunit/tests/multisite/siteDetails.php
index 78b392c487426..d8eb84382b6b3 100644
--- a/tests/phpunit/tests/multisite/siteDetails.php
+++ b/tests/phpunit/tests/multisite/siteDetails.php
@@ -7,7 +7,7 @@
 	 * @group ms-site
 	 * @group multisite
 	 */
-	class Tests_Multisite_Site_Details extends WP_UnitTestCase {
+	class Tests_Multisite_SiteDetails extends WP_UnitTestCase {
 		/**
 		 * @dataProvider data_allowed_options
 		 *
diff --git a/tests/phpunit/tests/multisite/siteMeta.php b/tests/phpunit/tests/multisite/siteMeta.php
index 72d86f6a47247..4a1a30fee2e81 100644
--- a/tests/phpunit/tests/multisite/siteMeta.php
+++ b/tests/phpunit/tests/multisite/siteMeta.php
@@ -8,7 +8,7 @@
 	 * @group meta
 	 * @ticket 37923
 	 */
-	class Tests_Multisite_Site_Meta extends WP_UnitTestCase {
+	class Tests_Multisite_SiteMeta extends WP_UnitTestCase {
 		protected static $site_id;
 		protected static $site_id2;
 		protected static $flag_was_set;
diff --git a/tests/phpunit/tests/multisite/updateBlogDetails.php b/tests/phpunit/tests/multisite/updateBlogDetails.php
index c3bd0e3cdff51..7a983fc7de154 100644
--- a/tests/phpunit/tests/multisite/updateBlogDetails.php
+++ b/tests/phpunit/tests/multisite/updateBlogDetails.php
@@ -6,7 +6,7 @@
 	 * @group ms-site
 	 * @group multisite
 	 */
-	class Tests_Multisite_Update_Blog_Details extends WP_UnitTestCase {
+	class Tests_Multisite_UpdateBlogDetails extends WP_UnitTestCase {
 		/**
 		 * If `update_blog_details()` is called with any kind of empty arguments, it
 		 * should return false.
diff --git a/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php b/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php
index 544e632da4d4c..2de3f6b4725e1 100644
--- a/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php
+++ b/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php
@@ -10,7 +10,7 @@
 	 *
 	 * @group multisite
 	 */
-	class Tests_Multisite_Upload_Is_User_Over_Quota extends WP_UnitTestCase {
+	class Tests_Multisite_UploadIsUserOverQuota extends WP_UnitTestCase {
 		protected $suppress = false;
 
 		public function set_up() {
diff --git a/tests/phpunit/tests/multisite/wpGetSites.php b/tests/phpunit/tests/multisite/wpGetSites.php
index 163a4714dd283..1abcb595152cb 100644
--- a/tests/phpunit/tests/multisite/wpGetSites.php
+++ b/tests/phpunit/tests/multisite/wpGetSites.php
@@ -7,7 +7,7 @@
 	 * @group ms-site
 	 * @group multisite
 	 */
-	class Tests_Multisite_WP_Get_Sites extends WP_UnitTestCase {
+	class Tests_Multisite_wpGetSites extends WP_UnitTestCase {
 		protected static $site_ids;
 
 		public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
diff --git a/tests/phpunit/tests/multisite/wpInstallDefaults.php b/tests/phpunit/tests/multisite/wpInstallDefaults.php
index 05371f215941b..c48a832a05cdc 100644
--- a/tests/phpunit/tests/multisite/wpInstallDefaults.php
+++ b/tests/phpunit/tests/multisite/wpInstallDefaults.php
@@ -8,7 +8,7 @@
 	 * @group ms-site
 	 * @group multisite
 	 */
-	class Tests_Multisite_Install_Defaults extends WP_UnitTestCase {
+	class Tests_Multisite_wpInstallDefaults extends WP_UnitTestCase {
 		/**
 		 * @ticket 40036
 		 */
diff --git a/tests/phpunit/tests/multisite/wpMSSitesListTable.php b/tests/phpunit/tests/multisite/wpMsSitesListTable.php
similarity index 98%
rename from tests/phpunit/tests/multisite/wpMSSitesListTable.php
rename to tests/phpunit/tests/multisite/wpMsSitesListTable.php
index 9b26e35a36d37..a14fcf5dca199 100644
--- a/tests/phpunit/tests/multisite/wpMSSitesListTable.php
+++ b/tests/phpunit/tests/multisite/wpMsSitesListTable.php
@@ -6,7 +6,7 @@
 	 * @group admin
 	 * @group network-admin
 	 */
-	class Tests_WP_MS_Sites_List_Table extends WP_UnitTestCase {
+	class Tests_Multisite_wpMsSitesListTable extends WP_UnitTestCase {
 		protected static $site_ids;
 
 		/**
diff --git a/tests/phpunit/tests/multisite/networkQuery.php b/tests/phpunit/tests/multisite/wpNetworkQuery.php
similarity index 99%
rename from tests/phpunit/tests/multisite/networkQuery.php
rename to tests/phpunit/tests/multisite/wpNetworkQuery.php
index a69bc2210c7d8..978a2471d96af 100644
--- a/tests/phpunit/tests/multisite/networkQuery.php
+++ b/tests/phpunit/tests/multisite/wpNetworkQuery.php
@@ -9,7 +9,7 @@
 	 * @group ms-network-query
 	 * @group multisite
 	 */
-	class Tests_Multisite_Network_Query extends WP_UnitTestCase {
+	class Tests_Multisite_wpNetworkQuery extends WP_UnitTestCase {
 		protected static $network_ids;
 
 		protected $suppress = false;
diff --git a/tests/phpunit/tests/multisite/siteQuery.php b/tests/phpunit/tests/multisite/wpSiteQuery.php
similarity index 99%
rename from tests/phpunit/tests/multisite/siteQuery.php
rename to tests/phpunit/tests/multisite/wpSiteQuery.php
index 1a4108c10d720..ccfd6c9cb9283 100644
--- a/tests/phpunit/tests/multisite/siteQuery.php
+++ b/tests/phpunit/tests/multisite/wpSiteQuery.php
@@ -8,7 +8,7 @@
 	 * @group ms-site
 	 * @group multisite
 	 */
-	class Tests_Multisite_Site_Query extends WP_UnitTestCase {
+	class Tests_Multisite_wpSiteQuery extends WP_UnitTestCase {
 		protected static $network_ids;
 		protected static $site_ids;
 
diff --git a/tests/phpunit/tests/multisite/wpmuValidateBlogSignup.php b/tests/phpunit/tests/multisite/wpmuValidateBlogSignup.php
index 576822c12f24e..fc5c5fe445cbb 100644
--- a/tests/phpunit/tests/multisite/wpmuValidateBlogSignup.php
+++ b/tests/phpunit/tests/multisite/wpmuValidateBlogSignup.php
@@ -5,7 +5,7 @@
 	/**
 	 * @group multisite
 	 */
-	class Tests_Multisite_WpmuValidateBlogSignup extends WP_UnitTestCase {
+	class Tests_Multisite_wpmuValidateBlogSignup extends WP_UnitTestCase {
 		protected static $super_admin_id;
 
 		protected static $existing_user_login = 'existinguserfoo';
diff --git a/tests/phpunit/tests/multisite/wpmuValidateUserSignup.php b/tests/phpunit/tests/multisite/wpmuValidateUserSignup.php
index 7e0ad2750fbf6..f88ed0ff788ce 100644
--- a/tests/phpunit/tests/multisite/wpmuValidateUserSignup.php
+++ b/tests/phpunit/tests/multisite/wpmuValidateUserSignup.php
@@ -5,7 +5,7 @@
 	/**
 	 * @group multisite
 	 */
-	class Tests_Multisite_WpmuValidateUserSignup extends WP_UnitTestCase {
+	class Tests_Multisite_wpmuValidateUserSignup extends WP_UnitTestCase {
 		/**
 		 * @dataProvider data_user_name
 		 */

From 284764c658d9c68a59e88ab03f48eab3efb30aec Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Fri, 24 Sep 2021 16:54:42 +0000
Subject: [PATCH 166/257] Build/Test Tools: Remove the PHPUnit container from
 local Docker environment.

This commit:

* Removes the PHPUnit `wordpressdevelop/phpunit` container as a service to the Docker environment.
* Updates `test:php` (the default way to run tests) to run the Composer PHPUnit package  default.
* Removes the `test:php-composer` script.

There is no longer a need for core to keep the `wordpressdevelop/phpunit` container as a service in `docker-compose.yml`. Removing it will reduce the overhead and bandwidth needed to set up WordPress locally and remove confusion about its use.

Follow-up to [45783-45784], [49099], [49362], [51545], [51736], [51685].

Props johnbillion, hellofromTonya.
Fixes #54112.

git-svn-id: https://develop.svn.wordpress.org/trunk@51868 602fd350-edb4-49c9-b593-d223f7449a82
---
 .env                                | 22 --------------------
 .github/workflows/phpunit-tests.yml | 16 +++++++--------
 .github/workflows/test-coverage.yml |  4 ++--
 docker-compose.yml                  | 32 -----------------------------
 package.json                        |  3 +--
 5 files changed, 11 insertions(+), 66 deletions(-)

diff --git a/.env b/.env
index 8af24c4816363..9affb93f5321e 100644
--- a/.env
+++ b/.env
@@ -6,7 +6,6 @@
 #
 # Below, the following substitutions can be made:
 # - '{version}': any major.minor PHP version from 5.2 onwards.
-# - '{phpunit_version}': any major PHPUnit version starting with 4.
 ##
 
 # The site will be available at http://localhost:LOCAL_PORT
@@ -18,27 +17,6 @@ LOCAL_DIR=src
 # The PHP version to use. Valid options are 'latest', and '{version}-fpm'.
 LOCAL_PHP=latest
 
-##
-# The PHPUnit version to use when running tests.
-#
-# Support for new PHPUnit versions is not backported to past versions, so some old WordPress branches require an older
-# version to run tests.
-#
-# Valid versions are:
-# - 'latest' for the highest version of PHPUnit supported on the highest version of PHP supported.
-# - '{version}-fpm' for the highest version of PHPUnit supported on the specified version of PHP.
-# - '{phpunit_version}-php-{version}-fpm' for a specific version of PHPUnit on the specified version of PHP. This format
-# is only available for PHP versions 5.6 and higher.
-#
-# For the full list of available options, see https://hub.docker.com/r/wordpressdevelop/phpunit/tags.
-#
-# For full documentation on PHPUnit compatibility and WordPress versions, see
-# https://make.wordpress.org/core/handbook/references/phpunit-compatibility-and-wordpress-versions/.
-#
-# This defaults to the value assigned to the value of LOCAL_PHP.
-##
-LOCAL_PHPUNIT=${LOCAL_PHP}
-
 # Whether or not to enable XDebug.
 LOCAL_PHP_XDEBUG=false
 
diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
index efad1739d62ca..921d4971e134c 100644
--- a/.github/workflows/phpunit-tests.yml
+++ b/.github/workflows/phpunit-tests.yml
@@ -191,41 +191,41 @@ jobs:
 
       - name: Run slow PHPUnit tests
         if: ${{ matrix.split_slow }}
-        run: node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ${{ env.SLOW_TESTS }}
+        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ${{ env.SLOW_TESTS }}
 
       - name: Run PHPUnit tests for single site excluding slow tests
         if: ${{ matrix.php < '7.0' && ! matrix.split_slow && ! matrix.multisite }}
-        run: node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-required
+        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-required
 
       - name: Run PHPUnit tests for Multisite excluding slow tests
         if: ${{ matrix.php < '7.0' && ! matrix.split_slow && matrix.multisite }}
-        run: node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-excluded,oembed-headers
+        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-excluded,oembed-headers
 
       - name: Run PHPUnit tests
         if: ${{ matrix.php >= '7.0' }}
         continue-on-error: ${{ matrix.php == '8.1' }}
-        run: node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }}
+        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }}
 
       - name: Run AJAX tests
         if: ${{ ! matrix.split_slow }}
         continue-on-error: ${{ matrix.php == '8.1' }}
-        run: node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ajax
+        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ajax
 
       - name: Run ms-files tests as a multisite install
         if: ${{ matrix.multisite && ! matrix.split_slow }}
         continue-on-error: ${{ matrix.php == '8.1' }}
-        run: node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit --verbose -c tests/phpunit/multisite.xml --group ms-files
+        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c tests/phpunit/multisite.xml --group ms-files
 
       - name: Run external HTTP tests
         if: ${{ ! matrix.multisite && ! matrix.split_slow }}
         continue-on-error: ${{ matrix.php == '8.1' }}
-        run: node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit --verbose -c phpunit.xml.dist --group external-http
+        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c phpunit.xml.dist --group external-http
 
       # __fakegroup__ is excluded to force PHPUnit to ignore the <exclude> settings in phpunit.xml.dist.
       - name: Run (xDebug) tests
         if: ${{ ! matrix.split_slow }}
         continue-on-error: ${{ matrix.php == '8.1' }}
-        run: LOCAL_PHP_XDEBUG=true node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit -v --group xdebug --exclude-group __fakegroup__
+        run: LOCAL_PHP_XDEBUG=true node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit -v --group xdebug --exclude-group __fakegroup__
 
       - name: Ensure version-controlled files are not modified or deleted
         run: git diff --exit-code
diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml
index 6df3d5189a3f0..31f20b8bd3e71 100644
--- a/.github/workflows/test-coverage.yml
+++ b/.github/workflows/test-coverage.yml
@@ -143,7 +143,7 @@ jobs:
 
       - name: Run tests as a single site
         if: ${{ ! matrix.multisite }}
-        run: npm run test:php-composer -- --verbose -c phpunit.xml.dist --coverage-clover wp-code-coverage-single-clover-${{ github.sha }}.xml
+        run: npm run test:php -- --verbose -c phpunit.xml.dist --coverage-clover wp-code-coverage-single-clover-${{ github.sha }}.xml
 
       - name: Ensure version-controlled files are not modified during the tests
         run: git diff --exit-code
@@ -157,7 +157,7 @@ jobs:
 
       - name: Run tests as a multisite install
         if: ${{ matrix.multisite }}
-        run: npm run test:php-composer -- --verbose -c tests/phpunit/multisite.xml --coverage-clover wp-code-coverage-multisite-clover-${{ github.sha }}.xml
+        run: npm run test:php -- --verbose -c tests/phpunit/multisite.xml --coverage-clover wp-code-coverage-multisite-clover-${{ github.sha }}.xml
 
       - name: Ensure version-controlled files are not modified during the tests
         run: git diff --exit-code
diff --git a/docker-compose.yml b/docker-compose.yml
index a77a309d7e1ab..7fe9b524c7aab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -92,41 +92,9 @@ services:
     # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly.
     init: true
 
-  ##
-  # The PHPUnit container.
-  ##
-  phpunit:
-    image: wordpressdevelop/phpunit:${LOCAL_PHPUNIT-latest}
-
-    networks:
-      - wpdevnet
-
-    environment:
-      - LOCAL_PHP_XDEBUG=${LOCAL_PHP_XDEBUG-false}
-      - LOCAL_PHP_MEMCACHED=${LOCAL_PHP_MEMCACHED-false}
-      - PHP_FPM_UID=${PHP_FPM_UID-1000}
-      - PHP_FPM_GID=${PHP_FPM_GID-1000}
-      - LOCAL_DIR=${LOCAL_DIR-src}
-      - WP_MULTISITE=${WP_MULTISITE-false}
-      - GITHUB_REF=${GITHUB_REF-false}
-      - GITHUB_EVENT_NAME=${GITHUB_EVENT_NAME-false}
-
-    volumes:
-      - ./tools/local-env/phpunit-config.ini:/usr/local/etc/php/conf.d/phpunit-config.ini
-      - ./:/var/www
-      - phpunit-uploads:/var/www/${LOCAL_DIR-src}/wp-content/uploads
-
-    # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly.
-    init: true
-
-    depends_on:
-      - mysql
-
 volumes:
   # So that sites aren't wiped every time containers are restarted, MySQL uses a persistent volume.
   mysql: {}
-  # Using a volume for the uploads directory improves PHPUnit performance.
-  phpunit-uploads: {}
 
 networks:
   # Creating our own network allows us to connect between containers using their service name.
diff --git a/package.json b/package.json
index f87b9b26fcc99..1614f4a34c8d2 100644
--- a/package.json
+++ b/package.json
@@ -170,8 +170,7 @@
 		"env:cli": "node ./tools/local-env/scripts/docker.js run cli",
 		"env:logs": "node ./tools/local-env/scripts/docker.js logs",
 		"env:pull": "node ./tools/local-env/scripts/docker.js pull",
-		"test:php": "node ./tools/local-env/scripts/docker.js run -T php composer update -W && node ./tools/local-env/scripts/docker.js run --rm phpunit phpunit",
-		"test:php-composer": "node ./tools/local-env/scripts/docker.js run -T php composer update -W && node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit",
+		"test:php": "node ./tools/local-env/scripts/docker.js run -T php composer update -W && node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit",
 		"test:e2e": "node ./tests/e2e/run-tests.js",
 		"wp-packages-update": "wp-scripts packages-update"
 	}

From 364dfec36919318127e0e87cd06819c362ed8693 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sat, 25 Sep 2021 01:27:47 +0000
Subject: [PATCH 167/257] Tests: Remove unnecessary `setUp()` and `tearDown()`
 methods in multisite tests.

These were originally added in [26252] to suppress database errors on `setUp()` and restore on `tearDown()` for tests that call `wpmu_create_blog()`, blog factory, or installation code that attempts to clear transients.

As the multisite test coverage expanded, these methods ended up being unnecessarily copied into other test classes, where database error suppression is not required.

Follow-up to [26252], [29916], [30286], [33184], [34898], [34899], [34901], [37234], [37477], [37894], [49212], [49616], [51859].

See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51869 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/multisite.php             | 13 -------------
 .../tests/multisite/cleanDirsizeCache.php     | 13 -------------
 .../tests/multisite/getSpaceAllowed.php       | 14 --------------
 .../phpunit/tests/multisite/getSpaceUsed.php  | 13 -------------
 .../multisite/isUploadSpaceAvailable.php      | 11 -----------
 .../tests/multisite/msFilesRewriting.php      | 12 ------------
 tests/phpunit/tests/multisite/network.php     | 16 ++++++----------
 .../tests/multisite/uploadIsUserOverQuota.php | 10 ----------
 .../tests/multisite/wpNetworkQuery.php        | 14 --------------
 tests/phpunit/tests/multisite/wpSiteQuery.php | 14 --------------
 tests/phpunit/tests/option/multisite.php      | 13 -------------
 tests/phpunit/tests/user/multisite.php        | 19 +++++--------------
 12 files changed, 11 insertions(+), 151 deletions(-)

diff --git a/tests/phpunit/tests/multisite.php b/tests/phpunit/tests/multisite.php
index deb45b4fe4e9c..22beb7f53ccbc 100644
--- a/tests/phpunit/tests/multisite.php
+++ b/tests/phpunit/tests/multisite.php
@@ -8,19 +8,6 @@
 	 * @group multisite
 	 */
 	class Tests_Multisite extends WP_UnitTestCase {
-		protected $suppress = false;
-
-		function set_up() {
-			global $wpdb;
-			parent::set_up();
-			$this->suppress = $wpdb->suppress_errors();
-		}
-
-		function tear_down() {
-			global $wpdb;
-			$wpdb->suppress_errors( $this->suppress );
-			parent::tear_down();
-		}
 
 		function test_wpmu_log_new_registrations() {
 			global $wpdb;
diff --git a/tests/phpunit/tests/multisite/cleanDirsizeCache.php b/tests/phpunit/tests/multisite/cleanDirsizeCache.php
index 958908f4687fe..b190acd2266c0 100644
--- a/tests/phpunit/tests/multisite/cleanDirsizeCache.php
+++ b/tests/phpunit/tests/multisite/cleanDirsizeCache.php
@@ -9,19 +9,6 @@
 	 * @group multisite
 	 */
 	class Tests_Multisite_CleanDirsizeCache extends WP_UnitTestCase {
-		protected $suppress = false;
-
-		function set_up() {
-			global $wpdb;
-			parent::set_up();
-			$this->suppress = $wpdb->suppress_errors();
-		}
-
-		function tear_down() {
-			global $wpdb;
-			$wpdb->suppress_errors( $this->suppress );
-			parent::tear_down();
-		}
 
 		/**
 		 * Test whether dirsize_cache values are used correctly with a more complex dirsize cache mock.
diff --git a/tests/phpunit/tests/multisite/getSpaceAllowed.php b/tests/phpunit/tests/multisite/getSpaceAllowed.php
index 97b09ab00c835..5e87fc0087bae 100644
--- a/tests/phpunit/tests/multisite/getSpaceAllowed.php
+++ b/tests/phpunit/tests/multisite/getSpaceAllowed.php
@@ -8,20 +8,6 @@
 	 * @group multisite
 	 */
 	class Tests_Multisite_GetSpaceAllowed extends WP_UnitTestCase {
-		protected $suppress = false;
-
-		public function set_up() {
-			global $wpdb;
-			parent::set_up();
-			$this->suppress = $wpdb->suppress_errors();
-		}
-
-		public function tear_down() {
-			global $wpdb;
-
-			$wpdb->suppress_errors( $this->suppress );
-			parent::tear_down();
-		}
 
 		/**
 		 * When no option exists for the site or the network, a fallback of
diff --git a/tests/phpunit/tests/multisite/getSpaceUsed.php b/tests/phpunit/tests/multisite/getSpaceUsed.php
index 7bad089572163..d243fc8efa625 100644
--- a/tests/phpunit/tests/multisite/getSpaceUsed.php
+++ b/tests/phpunit/tests/multisite/getSpaceUsed.php
@@ -7,19 +7,6 @@
 	 * @covers ::get_space_used
 	 */
 	class Tests_Multisite_GetSpaceUsed extends WP_UnitTestCase {
-		protected $suppress = false;
-
-		function set_up() {
-			global $wpdb;
-			parent::set_up();
-			$this->suppress = $wpdb->suppress_errors();
-		}
-
-		function tear_down() {
-			global $wpdb;
-			$wpdb->suppress_errors( $this->suppress );
-			parent::tear_down();
-		}
 
 		function test_get_space_used_switched_site() {
 			$blog_id = self::factory()->blog->create();
diff --git a/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php b/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php
index 796bf0f73653b..bc983d5d464b9 100644
--- a/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php
+++ b/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php
@@ -11,23 +11,12 @@
 	 * @group multisite
 	 */
 	class Tests_Multisite_IsUploadSpaceAvailable extends WP_UnitTestCase {
-		protected $suppress = false;
 
 		public function set_up() {
-			global $wpdb;
 			parent::set_up();
-			$this->suppress = $wpdb->suppress_errors();
-
 			update_site_option( 'upload_space_check_disabled', false );
 		}
 
-		public function tear_down() {
-			global $wpdb;
-
-			$wpdb->suppress_errors( $this->suppress );
-			parent::tear_down();
-		}
-
 		/**
 		 * A default of 100MB is used when no `blog_upload_space` option
 		 * exists at the site or network level.
diff --git a/tests/phpunit/tests/multisite/msFilesRewriting.php b/tests/phpunit/tests/multisite/msFilesRewriting.php
index 050ae44bb94eb..4964d7ed8a416 100644
--- a/tests/phpunit/tests/multisite/msFilesRewriting.php
+++ b/tests/phpunit/tests/multisite/msFilesRewriting.php
@@ -12,25 +12,13 @@
 	 * @group multisite
 	 */
 	class Tests_Multisite_msFilesRewriting extends WP_UnitTestCase {
-		protected $suppress = false;
 
 		function set_up() {
-			global $wpdb;
 			parent::set_up();
-			$this->suppress = $wpdb->suppress_errors();
-
 			update_site_option( 'ms_files_rewriting', 1 );
 			ms_upload_constants();
 		}
 
-		function tear_down() {
-			global $wpdb;
-
-			$wpdb->suppress_errors( $this->suppress );
-
-			parent::tear_down();
-		}
-
 		function test_switch_upload_dir() {
 			$this->assertTrue( is_main_site() );
 
diff --git a/tests/phpunit/tests/multisite/network.php b/tests/phpunit/tests/multisite/network.php
index 656db4fbb15f7..bad6626b56e21 100644
--- a/tests/phpunit/tests/multisite/network.php
+++ b/tests/phpunit/tests/multisite/network.php
@@ -10,20 +10,12 @@
 	 */
 	class Tests_Multisite_Network extends WP_UnitTestCase {
 		protected $plugin_hook_count = 0;
-		protected $suppress          = false;
 
 		protected static $different_network_id;
 		protected static $different_site_ids = array();
 
-		function set_up() {
-			global $wpdb;
-			parent::set_up();
-			$this->suppress = $wpdb->suppress_errors();
-		}
-
 		function tear_down() {
-			global $wpdb, $current_site;
-			$wpdb->suppress_errors( $this->suppress );
+			global $current_site;
 			$current_site->id = 1;
 			parent::tear_down();
 		}
@@ -590,9 +582,13 @@ public function filter_wp_is_large_network_on_different_network( $is_large_netwo
 		 * @ticket 38699
 		 */
 		public function test_wpmu_create_blog_updates_correct_network_site_count() {
+			global $wpdb;
+
 			$original_count = get_blog_count( self::$different_network_id );
 
-			$site_id = wpmu_create_blog( 'example.org', '/', '', 1, array(), self::$different_network_id );
+			$suppress = $wpdb->suppress_errors();
+			$site_id  = wpmu_create_blog( 'example.org', '/', '', 1, array(), self::$different_network_id );
+			$wpdb->suppress_errors( $suppress );
 
 			$result = get_blog_count( self::$different_network_id );
 
diff --git a/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php b/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php
index 2de3f6b4725e1..5b08569091cbe 100644
--- a/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php
+++ b/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php
@@ -11,22 +11,12 @@
 	 * @group multisite
 	 */
 	class Tests_Multisite_UploadIsUserOverQuota extends WP_UnitTestCase {
-		protected $suppress = false;
 
 		public function set_up() {
-			global $wpdb;
 			parent::set_up();
-			$this->suppress = $wpdb->suppress_errors();
-
 			update_site_option( 'upload_space_check_disabled', false );
 		}
 
-		public function tear_down() {
-			global $wpdb;
-			$wpdb->suppress_errors( $this->suppress );
-			parent::tear_down();
-		}
-
 		public function test_upload_is_user_over_quota_allowed_0_used_5() {
 			add_filter( 'get_space_allowed', '__return_zero' );
 			add_filter( 'pre_get_space_used', array( $this, '_filter_space_5' ) );
diff --git a/tests/phpunit/tests/multisite/wpNetworkQuery.php b/tests/phpunit/tests/multisite/wpNetworkQuery.php
index 978a2471d96af..42fcc21f96182 100644
--- a/tests/phpunit/tests/multisite/wpNetworkQuery.php
+++ b/tests/phpunit/tests/multisite/wpNetworkQuery.php
@@ -12,20 +12,6 @@
 	class Tests_Multisite_wpNetworkQuery extends WP_UnitTestCase {
 		protected static $network_ids;
 
-		protected $suppress = false;
-
-		function set_up() {
-			global $wpdb;
-			parent::set_up();
-			$this->suppress = $wpdb->suppress_errors();
-		}
-
-		function tear_down() {
-			global $wpdb;
-			$wpdb->suppress_errors( $this->suppress );
-			parent::tear_down();
-		}
-
 		public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 			self::$network_ids = array(
 				'wordpress.org/'      => array(
diff --git a/tests/phpunit/tests/multisite/wpSiteQuery.php b/tests/phpunit/tests/multisite/wpSiteQuery.php
index ccfd6c9cb9283..f48667f23fc89 100644
--- a/tests/phpunit/tests/multisite/wpSiteQuery.php
+++ b/tests/phpunit/tests/multisite/wpSiteQuery.php
@@ -12,20 +12,6 @@ class Tests_Multisite_wpSiteQuery extends WP_UnitTestCase {
 		protected static $network_ids;
 		protected static $site_ids;
 
-		protected $suppress = false;
-
-		function set_up() {
-			global $wpdb;
-			parent::set_up();
-			$this->suppress = $wpdb->suppress_errors();
-		}
-
-		function tear_down() {
-			global $wpdb;
-			$wpdb->suppress_errors( $this->suppress );
-			parent::tear_down();
-		}
-
 		public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 			self::$network_ids = array(
 				'wordpress.org/'      => array(
diff --git a/tests/phpunit/tests/option/multisite.php b/tests/phpunit/tests/option/multisite.php
index 54388d0144842..4a16bb9748933 100644
--- a/tests/phpunit/tests/option/multisite.php
+++ b/tests/phpunit/tests/option/multisite.php
@@ -10,19 +10,6 @@
 	 * @group multisite
 	 */
 	class Tests_Multisite_Option extends WP_UnitTestCase {
-		protected $suppress = false;
-
-		function set_up() {
-			global $wpdb;
-			parent::set_up();
-			$this->suppress = $wpdb->suppress_errors();
-		}
-
-		function tear_down() {
-			global $wpdb;
-			$wpdb->suppress_errors( $this->suppress );
-			parent::tear_down();
-		}
 
 		function test_from_same_site() {
 			$key    = __FUNCTION__ . '_1';
diff --git a/tests/phpunit/tests/user/multisite.php b/tests/phpunit/tests/user/multisite.php
index 0b2b1d380a8e2..c73a0bc12b899 100644
--- a/tests/phpunit/tests/user/multisite.php
+++ b/tests/phpunit/tests/user/multisite.php
@@ -10,19 +10,6 @@
 	 * @group multisite
 	 */
 	class Tests_Multisite_User extends WP_UnitTestCase {
-		protected $suppress = false;
-
-		function set_up() {
-			global $wpdb;
-			parent::set_up();
-			$this->suppress = $wpdb->suppress_errors();
-		}
-
-		function tear_down() {
-			global $wpdb;
-			$wpdb->suppress_errors( $this->suppress );
-			parent::tear_down();
-		}
 
 		function test_remove_user_from_blog() {
 			$user1 = self::factory()->user->create_and_get();
@@ -395,9 +382,13 @@ public function test_add_user_to_blog_subscriber() {
 		 * @ticket 38356
 		 */
 		public function test_add_user_to_blog_invalid_user() {
+			global $wpdb;
+
 			$site_id = self::factory()->blog->create();
 
-			$result = add_user_to_blog( 73622, $site_id, 'subscriber' );
+			$suppress = $wpdb->suppress_errors();
+			$result   = add_user_to_blog( 73622, $site_id, 'subscriber' );
+			$wpdb->suppress_errors( $suppress );
 
 			wp_delete_site( $site_id );
 

From e0359da2c154d524f284aa3dad5523d6d61ff1b0 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sun, 26 Sep 2021 00:12:56 +0000
Subject: [PATCH 168/257] Tests: Don't skip some Ajax tests on multisite, add
 them to the `ms-excluded` group instead.

Follow-up to [46693], [49835].

See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51870 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/ajax/Attachments.php  | 3 +--
 tests/phpunit/tests/ajax/DeletePlugin.php | 4 +++-
 tests/phpunit/tests/ajax/ManageThemes.php | 8 ++++++--
 tests/phpunit/tests/ajax/UpdatePlugin.php | 4 +++-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/tests/phpunit/tests/ajax/Attachments.php b/tests/phpunit/tests/ajax/Attachments.php
index 0b2cb09451f29..657213d27841d 100644
--- a/tests/phpunit/tests/ajax/Attachments.php
+++ b/tests/phpunit/tests/ajax/Attachments.php
@@ -63,10 +63,9 @@ public function test_wp_ajax_send_attachment_to_editor_should_return_an_image()
 
 	/**
 	 * @ticket 36578
+	 * @group ms-excluded
 	 */
 	public function test_wp_ajax_send_attachment_to_editor_should_return_a_link() {
-		$this->skipWithMultisite();
-
 		// Become an administrator.
 		$post    = $_POST;
 		$user_id = self::factory()->user->create(
diff --git a/tests/phpunit/tests/ajax/DeletePlugin.php b/tests/phpunit/tests/ajax/DeletePlugin.php
index d84f401a17ffa..c42e238499327 100644
--- a/tests/phpunit/tests/ajax/DeletePlugin.php
+++ b/tests/phpunit/tests/ajax/DeletePlugin.php
@@ -125,8 +125,10 @@ public function test_invalid_file() {
 		$this->assertSameSets( $expected, $response );
 	}
 
+	/**
+	 * @group ms-excluded
+	 */
 	public function test_delete_plugin() {
-		$this->skipWithMultisite();
 		$this->_setRole( 'administrator' );
 
 		$_POST['_ajax_nonce'] = wp_create_nonce( 'updates' );
diff --git a/tests/phpunit/tests/ajax/ManageThemes.php b/tests/phpunit/tests/ajax/ManageThemes.php
index 8d0f9c5b7f401..89f2a9f9783cb 100644
--- a/tests/phpunit/tests/ajax/ManageThemes.php
+++ b/tests/phpunit/tests/ajax/ManageThemes.php
@@ -101,8 +101,10 @@ public function test_missing_capability() {
 		$this->assertSameSets( $expected, $response );
 	}
 
+	/**
+	 * @group ms-excluded
+	 */
 	public function test_update_theme() {
-		$this->skipWithMultisite();
 		$this->_setRole( 'administrator' );
 
 		$_POST['_ajax_nonce'] = wp_create_nonce( 'updates' );
@@ -139,8 +141,10 @@ public function test_update_theme() {
 		$this->assertSameSets( $expected, $response );
 	}
 
+	/**
+	 * @group ms-excluded
+	 */
 	function test_uppercase_theme_slug() {
-		$this->skipWithMultisite();
 		$this->_setRole( 'administrator' );
 
 		$_POST['_ajax_nonce'] = wp_create_nonce( 'updates' );
diff --git a/tests/phpunit/tests/ajax/UpdatePlugin.php b/tests/phpunit/tests/ajax/UpdatePlugin.php
index ceab32bfeb451..44ce630633a41 100644
--- a/tests/phpunit/tests/ajax/UpdatePlugin.php
+++ b/tests/phpunit/tests/ajax/UpdatePlugin.php
@@ -129,8 +129,10 @@ public function test_invalid_file() {
 		$this->assertSameSets( $expected, $response );
 	}
 
+	/**
+	 * @group ms-excluded
+	 */
 	public function test_update_plugin() {
-		$this->skipWithMultisite();
 		$this->_setRole( 'administrator' );
 
 		$_POST['_ajax_nonce'] = wp_create_nonce( 'updates' );

From 7c2b54e0275201a07c145de5c705545ef58ebda7 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sun, 26 Sep 2021 03:11:18 +0000
Subject: [PATCH 169/257] Build/Test Tools: Update PHPUnit configuration for
 PHPUnit 9.5.10/8.5.21+.

Since PHPUnit 9.5.10 and 8.5.21, PHP deprecations are no longer converted to exceptions by default (`convertDeprecationsToExceptions="true"` can be configured to enable this).

Reference: [https://github.com/sebastianbergmann/phpunit/commit/fac02620f6b38ae54d47fe840e0095e68226a56c Do not convert PHP deprecations to exceptions by default]; [https://github.com/sebastianbergmann/phpunit/blob/9.5.10/ChangeLog-9.5.md#9510---2021-09-25 PHPUnit 9.5.10 changelog].

Let's unpack this:

Previously (PHPUnit < 9.5.10/8.5.21), if PHPUnit would encounter a PHP native deprecation notice, it would:
1. Show a test which causes a deprecation notice to be thrown as **"errored"**,
2. Show the **first** deprecation notice it encountered and
3. PHPUnit would exit with a **non-0 exit code** (2), which will fail a CI build.

As of PHPUnit 9.5.10/8.5.21, if PHPUnit encounters a PHP native deprecation notice, it will no longer do so. Instead PHPUnit will:
1. Show a test which causes a PHP deprecation notice to be thrown as **"risky"**,
2. Show the **all** deprecation notices it encountered and
3. PHPUnit will exit with a **0 exit code**, which will show a CI build as passing.

This commit reverts PHPUnit to the previous behaviour by adding `convertDeprecationsToExceptions="true"` to the PHPUnit configuration. It also adds the other related directives for consistency.

Props jrf, netweb, costdev, SergeyBiryukov.
See #54183.

git-svn-id: https://develop.svn.wordpress.org/trunk@51871 602fd350-edb4-49c9-b593-d223f7449a82
---
 phpunit.xml.dist            | 4 ++++
 tests/phpunit/multisite.xml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 5669bb3506d62..20267a5e9113d 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -6,6 +6,10 @@
 		colors="true"
 		beStrictAboutTestsThatDoNotTestAnything="true"
 		beStrictAboutOutputDuringTests="true"
+		convertErrorsToExceptions="true"
+		convertWarningsToExceptions="true"
+		convertNoticesToExceptions="true"
+		convertDeprecationsToExceptions="true"
 		>
 	<testsuites>
 		<!-- Default test suite to run all tests. -->
diff --git a/tests/phpunit/multisite.xml b/tests/phpunit/multisite.xml
index ea9fa9d203bfe..5bb20a759da27 100644
--- a/tests/phpunit/multisite.xml
+++ b/tests/phpunit/multisite.xml
@@ -6,6 +6,10 @@
 		colors="true"
 		beStrictAboutTestsThatDoNotTestAnything="true"
 		beStrictAboutOutputDuringTests="true"
+		convertErrorsToExceptions="true"
+		convertWarningsToExceptions="true"
+		convertNoticesToExceptions="true"
+		convertDeprecationsToExceptions="true"
 		>
 	<php>
 		<const name="WP_TESTS_MULTISITE" value="1" />

From 90b6ae994322514aa049afd1cec654416be5043a Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sun, 26 Sep 2021 03:27:10 +0000
Subject: [PATCH 170/257] Tests: Update the `Services_JSON` test for PHPUnit
 9.5.10/8.5.21+.

Since PHPUnit 9.5.10 and 8.5.21, PHP deprecations are no longer converted to exceptions by default (`convertDeprecationsToExceptions="true"` can be configured to enable this).

Reference: [https://github.com/sebastianbergmann/phpunit/commit/fac02620f6b38ae54d47fe840e0095e68226a56c Do not convert PHP deprecations to exceptions by default]; [https://github.com/sebastianbergmann/phpunit/blob/9.5.10/ChangeLog-9.5.md#9510---2021-09-25 PHPUnit 9.5.10 changelog].

With this change, the test for the `Services_JSON` compat class started failing:
{{{
There was 1 failure:

1) Tests_Compat_jsonEncodeDecode::test_json_encode_decode
Failed asserting that exception of type "PHPUnit\Framework\Error\Deprecated" is thrown.
}}}

This converts the native PHPUnit `::expectDeprecation()` method call in the test to a set of individual WP-specific `::setExpectedDeprecated()` method calls in order to not depend on PHPUnit behavior that is no longer the default.

Additionally, this commit includes support for catching deprecation notices from `_deprecated_file()` function calls to the `WP_UnitTestCase_Base::expectDeprecated()` method.

Follow-up to [46205], [46625], [48996], [51563], [51852], [51871].

Props jrf, netweb, SergeyBiryukov.
See #54183, #54029, #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51872 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/includes/abstract-testcase.php    |  2 ++
 tests/phpunit/tests/compat/jsonEncodeDecode.php | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/phpunit/includes/abstract-testcase.php b/tests/phpunit/includes/abstract-testcase.php
index 49dfc0fef7416..3cfe3991ea0af 100644
--- a/tests/phpunit/includes/abstract-testcase.php
+++ b/tests/phpunit/includes/abstract-testcase.php
@@ -503,10 +503,12 @@ public function expectDeprecated() {
 		}
 		add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
 		add_action( 'deprecated_argument_run', array( $this, 'deprecated_function_run' ) );
+		add_action( 'deprecated_file_included', array( $this, 'deprecated_function_run' ) );
 		add_action( 'deprecated_hook_run', array( $this, 'deprecated_function_run' ) );
 		add_action( 'doing_it_wrong_run', array( $this, 'doing_it_wrong_run' ) );
 		add_action( 'deprecated_function_trigger_error', '__return_false' );
 		add_action( 'deprecated_argument_trigger_error', '__return_false' );
+		add_action( 'deprecated_file_trigger_error', '__return_false' );
 		add_action( 'deprecated_hook_trigger_error', '__return_false' );
 		add_action( 'doing_it_wrong_trigger_error', '__return_false' );
 	}
diff --git a/tests/phpunit/tests/compat/jsonEncodeDecode.php b/tests/phpunit/tests/compat/jsonEncodeDecode.php
index 475af85b9f4b4..be51c6022b193 100644
--- a/tests/phpunit/tests/compat/jsonEncodeDecode.php
+++ b/tests/phpunit/tests/compat/jsonEncodeDecode.php
@@ -8,7 +8,15 @@
 class Tests_Compat_jsonEncodeDecode extends WP_UnitTestCase {
 
 	public function test_json_encode_decode() {
-		$this->expectDeprecation();
+		$this->setExpectedDeprecated( 'class-json.php' );
+		$this->setExpectedDeprecated( 'Services_JSON::__construct' );
+		$this->setExpectedDeprecated( 'Services_JSON::encodeUnsafe' );
+		$this->setExpectedDeprecated( 'Services_JSON::_encode' );
+		$this->setExpectedDeprecated( 'Services_JSON::reduce_string' );
+		$this->setExpectedDeprecated( 'Services_JSON::decode' );
+		$this->setExpectedDeprecated( 'Services_JSON::isError' );
+		$this->setExpectedDeprecated( 'Services_JSON::strlen8' );
+		$this->setExpectedDeprecated( 'Services_JSON::substr8' );
 
 		require_once ABSPATH . WPINC . '/class-json.php';
 		$json = new Services_JSON();

From 863b9f0f8bcced9273986e48ab7c5582e56c038b Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 27 Sep 2021 00:35:38 +0000
Subject: [PATCH 171/257] Coding Standards: Remove duplicate assignment from a
 ternary operator in `WP_MS_Sites_List_Table::site_states()`.

Adjust similar code in `_post_states()` and `_media_states()` for consistency.

Follow-up to:
* [12897], [15491], [32755], [46153], [48424] for `WP_MS_Sites_List_Table::site_states()`.
* [17793], [47775], [49223] for `_media_states()`.
* [9153], [46309] for `_post_states()`.

Props joelcj91, audrasjb, desrosj.
Fixes #38296.

git-svn-id: https://develop.svn.wordpress.org/trunk@51873 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../includes/class-wp-ms-sites-list-table.php      |  9 +++++++--
 src/wp-admin/includes/template.php                 | 14 ++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-ms-sites-list-table.php b/src/wp-admin/includes/class-wp-ms-sites-list-table.php
index 64cab8cecbdc4..b185664bd69d6 100644
--- a/src/wp-admin/includes/class-wp-ms-sites-list-table.php
+++ b/src/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -643,11 +643,16 @@ protected function site_states( $site ) {
 
 		if ( ! empty( $site_states ) ) {
 			$state_count = count( $site_states );
-			$i           = 0;
+
+			$i = 0;
+
 			echo ' &mdash; ';
+
 			foreach ( $site_states as $state ) {
 				++$i;
-				( $i == $state_count ) ? $sep = '' : $sep = ', ';
+
+				$sep = ( $i < $state_count ) ? ', ' : '';
+
 				echo "<span class='post-state'>{$state}{$sep}</span>";
 			}
 		}
diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php
index 83df709754808..4228d931baebc 100644
--- a/src/wp-admin/includes/template.php
+++ b/src/wp-admin/includes/template.php
@@ -2145,12 +2145,15 @@ function _post_states( $post, $echo = true ) {
 
 	if ( ! empty( $post_states ) ) {
 		$state_count = count( $post_states );
-		$i           = 0;
+
+		$i = 0;
 
 		$post_states_string .= ' &mdash; ';
 
 		foreach ( $post_states as $state ) {
-			$sep = ( ++$i === $state_count ) ? '' : ', ';
+			++$i;
+
+			$sep = ( $i < $state_count ) ? ', ' : '';
 
 			$post_states_string .= "<span class='post-state'>$state$sep</span>";
 		}
@@ -2255,12 +2258,15 @@ function _media_states( $post, $echo = true ) {
 
 	if ( ! empty( $media_states ) ) {
 		$state_count = count( $media_states );
-		$i           = 0;
+
+		$i = 0;
 
 		$media_states_string .= ' &mdash; ';
 
 		foreach ( $media_states as $state ) {
-			$sep = ( ++$i === $state_count ) ? '' : ', ';
+			++$i;
+
+			$sep = ( $i < $state_count ) ? ', ' : '';
 
 			$media_states_string .= "<span class='post-state'>$state$sep</span>";
 		}

From ab501af2b5027393e19636d5724fb1ef5599fdfa Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 28 Sep 2021 09:59:48 +0000
Subject: [PATCH 172/257] Twenty Twenty: Remove duplicate class name from
 localized `font-family` elements.

Follow-up to [46613].

Props tmatsuur, aezazshekh.
Fixes #54196.

git-svn-id: https://develop.svn.wordpress.org/trunk@51874 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../classes/class-twentytwenty-non-latin-languages.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php
index a0845a4a70d98..0c4951ef4842e 100644
--- a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php
+++ b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php
@@ -118,7 +118,7 @@ public static function get_non_latin_css( $type = 'front-end' ) {
 			$elements = apply_filters(
 				'twentytwenty_get_localized_font_family_elements',
 				array(
-					'front-end'      => array( 'body', 'input', 'textarea', 'button', '.button', '.faux-button', '.wp-block-button__link', '.wp-block-file__button', '.has-drop-cap:not(:focus)::first-letter', '.has-drop-cap:not(:focus)::first-letter', '.entry-content .wp-block-archives', '.entry-content .wp-block-categories', '.entry-content .wp-block-cover-image', '.entry-content .wp-block-latest-comments', '.entry-content .wp-block-latest-posts', '.entry-content .wp-block-pullquote', '.entry-content .wp-block-quote.is-large', '.entry-content .wp-block-quote.is-style-large', '.entry-content .wp-block-archives *', '.entry-content .wp-block-categories *', '.entry-content .wp-block-latest-posts *', '.entry-content .wp-block-latest-comments *', '.entry-content p', '.entry-content ol', '.entry-content ul', '.entry-content dl', '.entry-content dt', '.entry-content cite', '.entry-content figcaption', '.entry-content .wp-caption-text', '.comment-content p', '.comment-content ol', '.comment-content ul', '.comment-content dl', '.comment-content dt', '.comment-content cite', '.comment-content figcaption', '.comment-content .wp-caption-text', '.widget_text p', '.widget_text ol', '.widget_text ul', '.widget_text dl', '.widget_text dt', '.widget-content .rssSummary', '.widget-content cite', '.widget-content figcaption', '.widget-content .wp-caption-text' ),
+					'front-end'      => array( 'body', 'input', 'textarea', 'button', '.button', '.faux-button', '.wp-block-button__link', '.wp-block-file__button', '.has-drop-cap:not(:focus)::first-letter', '.entry-content .wp-block-archives', '.entry-content .wp-block-categories', '.entry-content .wp-block-cover-image', '.entry-content .wp-block-latest-comments', '.entry-content .wp-block-latest-posts', '.entry-content .wp-block-pullquote', '.entry-content .wp-block-quote.is-large', '.entry-content .wp-block-quote.is-style-large', '.entry-content .wp-block-archives *', '.entry-content .wp-block-categories *', '.entry-content .wp-block-latest-posts *', '.entry-content .wp-block-latest-comments *', '.entry-content p', '.entry-content ol', '.entry-content ul', '.entry-content dl', '.entry-content dt', '.entry-content cite', '.entry-content figcaption', '.entry-content .wp-caption-text', '.comment-content p', '.comment-content ol', '.comment-content ul', '.comment-content dl', '.comment-content dt', '.comment-content cite', '.comment-content figcaption', '.comment-content .wp-caption-text', '.widget_text p', '.widget_text ol', '.widget_text ul', '.widget_text dl', '.widget_text dt', '.widget-content .rssSummary', '.widget-content cite', '.widget-content figcaption', '.widget-content .wp-caption-text' ),
 					'block-editor'   => array( '.editor-styles-wrapper > *', '.editor-styles-wrapper p', '.editor-styles-wrapper ol', '.editor-styles-wrapper ul', '.editor-styles-wrapper dl', '.editor-styles-wrapper dt', '.editor-post-title__block .editor-post-title__input', '.editor-styles-wrapper .wp-block h1', '.editor-styles-wrapper .wp-block h2', '.editor-styles-wrapper .wp-block h3', '.editor-styles-wrapper .wp-block h4', '.editor-styles-wrapper .wp-block h5', '.editor-styles-wrapper .wp-block h6', '.editor-styles-wrapper .has-drop-cap:not(:focus)::first-letter', '.editor-styles-wrapper cite', '.editor-styles-wrapper figcaption', '.editor-styles-wrapper .wp-caption-text' ),
 					'classic-editor' => array( 'body#tinymce.wp-editor', 'body#tinymce.wp-editor p', 'body#tinymce.wp-editor ol', 'body#tinymce.wp-editor ul', 'body#tinymce.wp-editor dl', 'body#tinymce.wp-editor dt', 'body#tinymce.wp-editor figcaption', 'body#tinymce.wp-editor .wp-caption-text', 'body#tinymce.wp-editor .wp-caption-dd', 'body#tinymce.wp-editor cite', 'body#tinymce.wp-editor table' ),
 				)

From 48f2966c95ec3dbdf1030c170e5a86d76b90097b Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 28 Sep 2021 10:01:33 +0000
Subject: [PATCH 173/257] Twenty Twenty-One: Remove duplicate class name from
 localized `font-family` elements.

Follow-up to [46613], [49216], [51874].

Props tmatsuur, aezazshekh.
See #54196.

git-svn-id: https://develop.svn.wordpress.org/trunk@51875 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../themes/twentytwentyone/inc/template-functions.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-content/themes/twentytwentyone/inc/template-functions.php b/src/wp-content/themes/twentytwentyone/inc/template-functions.php
index 839a77a36865b..2bee7d6f95fad 100644
--- a/src/wp-content/themes/twentytwentyone/inc/template-functions.php
+++ b/src/wp-content/themes/twentytwentyone/inc/template-functions.php
@@ -315,7 +315,7 @@ function twenty_twenty_one_get_non_latin_css( $type = 'front-end' ) {
 	$elements = apply_filters(
 		'twenty_twenty_one_get_localized_font_family_elements',
 		array(
-			'front-end'      => array( 'body', 'input', 'textarea', 'button', '.button', '.faux-button', '.wp-block-button__link', '.wp-block-file__button', '.has-drop-cap:not(:focus)::first-letter', '.has-drop-cap:not(:focus)::first-letter', '.entry-content .wp-block-archives', '.entry-content .wp-block-categories', '.entry-content .wp-block-cover-image', '.entry-content .wp-block-latest-comments', '.entry-content .wp-block-latest-posts', '.entry-content .wp-block-pullquote', '.entry-content .wp-block-quote.is-large', '.entry-content .wp-block-quote.is-style-large', '.entry-content .wp-block-archives *', '.entry-content .wp-block-categories *', '.entry-content .wp-block-latest-posts *', '.entry-content .wp-block-latest-comments *', '.entry-content p', '.entry-content ol', '.entry-content ul', '.entry-content dl', '.entry-content dt', '.entry-content cite', '.entry-content figcaption', '.entry-content .wp-caption-text', '.comment-content p', '.comment-content ol', '.comment-content ul', '.comment-content dl', '.comment-content dt', '.comment-content cite', '.comment-content figcaption', '.comment-content .wp-caption-text', '.widget_text p', '.widget_text ol', '.widget_text ul', '.widget_text dl', '.widget_text dt', '.widget-content .rssSummary', '.widget-content cite', '.widget-content figcaption', '.widget-content .wp-caption-text' ),
+			'front-end'      => array( 'body', 'input', 'textarea', 'button', '.button', '.faux-button', '.wp-block-button__link', '.wp-block-file__button', '.has-drop-cap:not(:focus)::first-letter', '.entry-content .wp-block-archives', '.entry-content .wp-block-categories', '.entry-content .wp-block-cover-image', '.entry-content .wp-block-latest-comments', '.entry-content .wp-block-latest-posts', '.entry-content .wp-block-pullquote', '.entry-content .wp-block-quote.is-large', '.entry-content .wp-block-quote.is-style-large', '.entry-content .wp-block-archives *', '.entry-content .wp-block-categories *', '.entry-content .wp-block-latest-posts *', '.entry-content .wp-block-latest-comments *', '.entry-content p', '.entry-content ol', '.entry-content ul', '.entry-content dl', '.entry-content dt', '.entry-content cite', '.entry-content figcaption', '.entry-content .wp-caption-text', '.comment-content p', '.comment-content ol', '.comment-content ul', '.comment-content dl', '.comment-content dt', '.comment-content cite', '.comment-content figcaption', '.comment-content .wp-caption-text', '.widget_text p', '.widget_text ol', '.widget_text ul', '.widget_text dl', '.widget_text dt', '.widget-content .rssSummary', '.widget-content cite', '.widget-content figcaption', '.widget-content .wp-caption-text' ),
 			'block-editor'   => array( '.editor-styles-wrapper > *', '.editor-styles-wrapper p', '.editor-styles-wrapper ol', '.editor-styles-wrapper ul', '.editor-styles-wrapper dl', '.editor-styles-wrapper dt', '.editor-post-title__block .editor-post-title__input', '.editor-styles-wrapper .wp-block h1', '.editor-styles-wrapper .wp-block h2', '.editor-styles-wrapper .wp-block h3', '.editor-styles-wrapper .wp-block h4', '.editor-styles-wrapper .wp-block h5', '.editor-styles-wrapper .wp-block h6', '.editor-styles-wrapper .has-drop-cap:not(:focus)::first-letter', '.editor-styles-wrapper cite', '.editor-styles-wrapper figcaption', '.editor-styles-wrapper .wp-caption-text' ),
 			'classic-editor' => array( 'body#tinymce.wp-editor', 'body#tinymce.wp-editor p', 'body#tinymce.wp-editor ol', 'body#tinymce.wp-editor ul', 'body#tinymce.wp-editor dl', 'body#tinymce.wp-editor dt', 'body#tinymce.wp-editor figcaption', 'body#tinymce.wp-editor .wp-caption-text', 'body#tinymce.wp-editor .wp-caption-dd', 'body#tinymce.wp-editor cite', 'body#tinymce.wp-editor table' ),
 		)

From 2bcff1d6a220ec7e08a10bc0818c6c5414267e04 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 29 Sep 2021 13:38:21 +0000
Subject: [PATCH 174/257] Docs: Improve documentation for `WP_Admin_Bar`
 methods.

Add some missing descriptions and `@since` tags.

Follow-up to [15671], [19120], [19429], [19501], [19558], [25475], [25478], [25563], [32534], [35157], [40947], [45821], [48826].

Props yagniksangani, hellofromTonya, audrasjb, sabernhardt, mukesh27, rehanali, SergeyBiryukov.
Fixes #54191.

git-svn-id: https://develop.svn.wordpress.org/trunk@51876 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-admin-bar.php | 39 ++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/wp-includes/class-wp-admin-bar.php b/src/wp-includes/class-wp-admin-bar.php
index 7d3470f538ad0..2d8814e59043f 100644
--- a/src/wp-includes/class-wp-admin-bar.php
+++ b/src/wp-includes/class-wp-admin-bar.php
@@ -18,6 +18,8 @@ class WP_Admin_Bar {
 	public $user;
 
 	/**
+	 * @since 3.3.0
+	 *
 	 * @param string $name
 	 * @return string|array|void
 	 */
@@ -33,6 +35,9 @@ public function __get( $name ) {
 	}
 
 	/**
+	 * Initializes the admin bar.
+	 *
+	 * @since 3.1.0
 	 */
 	public function initialize() {
 		$this->user = new stdClass;
@@ -82,7 +87,7 @@ public function initialize() {
 	}
 
 	/**
-	 * Add a node (menu item) to the Admin Bar menu.
+	 * Adds a node (menu item) to the admin bar menu.
 	 *
 	 * @since 3.3.0
 	 *
@@ -93,7 +98,7 @@ public function add_menu( $node ) {
 	}
 
 	/**
-	 * Remove a node from the admin bar.
+	 * Removes a node from the admin bar.
 	 *
 	 * @since 3.1.0
 	 *
@@ -179,6 +184,8 @@ public function add_node( $args ) {
 	}
 
 	/**
+	 * @since 3.3.0
+	 *
 	 * @param array $args
 	 */
 	final protected function _set_node( $args ) {
@@ -188,6 +195,8 @@ final protected function _set_node( $args ) {
 	/**
 	 * Gets a node.
 	 *
+	 * @since 3.3.0
+	 *
 	 * @param string $id
 	 * @return object|void Node.
 	 */
@@ -199,6 +208,8 @@ final public function get_node( $id ) {
 	}
 
 	/**
+	 * @since 3.3.0
+	 *
 	 * @param string $id
 	 * @return object|void
 	 */
@@ -217,6 +228,8 @@ final protected function _get_node( $id ) {
 	}
 
 	/**
+	 * @since 3.3.0
+	 *
 	 * @return array|void
 	 */
 	final public function get_nodes() {
@@ -232,6 +245,8 @@ final public function get_nodes() {
 	}
 
 	/**
+	 * @since 3.3.0
+	 *
 	 * @return array|void
 	 */
 	final protected function _get_nodes() {
@@ -243,7 +258,7 @@ final protected function _get_nodes() {
 	}
 
 	/**
-	 * Add a group to a toolbar menu node.
+	 * Adds a group to a toolbar menu node.
 	 *
 	 * Groups can be used to organize toolbar items into distinct sections of a toolbar menu.
 	 *
@@ -267,6 +282,8 @@ final public function add_group( $args ) {
 	/**
 	 * Remove a node.
 	 *
+	 * @since 3.1.0
+	 *
 	 * @param string $id The ID of the item.
 	 */
 	public function remove_node( $id ) {
@@ -274,6 +291,8 @@ public function remove_node( $id ) {
 	}
 
 	/**
+	 * @since 3.3.0
+	 *
 	 * @param string $id
 	 */
 	final protected function _unset_node( $id ) {
@@ -281,6 +300,7 @@ final protected function _unset_node( $id ) {
 	}
 
 	/**
+	 * @since 3.1.0
 	 */
 	public function render() {
 		$root = $this->_bind();
@@ -290,6 +310,8 @@ public function render() {
 	}
 
 	/**
+	 * @since 3.3.0
+	 *
 	 * @return object|void
 	 */
 	final protected function _bind() {
@@ -426,6 +448,8 @@ final protected function _bind() {
 	}
 
 	/**
+	 * @since 3.3.0
+	 *
 	 * @param object $root
 	 */
 	final protected function _render( $root ) {
@@ -457,6 +481,8 @@ final protected function _render( $root ) {
 	}
 
 	/**
+	 * @since 3.3.0
+	 *
 	 * @param object $node
 	 */
 	final protected function _render_container( $node ) {
@@ -472,6 +498,8 @@ final protected function _render_container( $node ) {
 	}
 
 	/**
+	 * @since 3.3.0
+	 *
 	 * @param object $node
 	 */
 	final protected function _render_group( $node ) {
@@ -497,6 +525,8 @@ final protected function _render_group( $node ) {
 	}
 
 	/**
+	 * @since 3.3.0
+	 *
 	 * @param object $node
 	 */
 	final protected function _render_item( $node ) {
@@ -596,6 +626,9 @@ public function recursive_render( $id, $node ) {
 	}
 
 	/**
+	 * Adds menus to the admin bar.
+	 *
+	 * @since 3.1.0
 	 */
 	public function add_menus() {
 		// User-related, aligned right.

From 48c68e5dac074b4b5b059180c0715c820efd1e45 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Thu, 30 Sep 2021 14:03:17 +0000
Subject: [PATCH 175/257] Coding Standards: Use strict comparison in
 `wp-includes/class-http.php`.

Follow-up to [10625], [10864], [13274], [29661], [33748], [47508], [47808].

See #53359.

git-svn-id: https://develop.svn.wordpress.org/trunk@51877 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-http.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/class-http.php b/src/wp-includes/class-http.php
index 861d1d0e4b277..d998d30e0dae6 100644
--- a/src/wp-includes/class-http.php
+++ b/src/wp-includes/class-http.php
@@ -881,7 +881,7 @@ public function block_request( $uri ) {
 		$home = parse_url( get_option( 'siteurl' ) );
 
 		// Don't block requests back to ourselves by default.
-		if ( 'localhost' === $check['host'] || ( isset( $home['host'] ) && $home['host'] == $check['host'] ) ) {
+		if ( 'localhost' === $check['host'] || ( isset( $home['host'] ) && $home['host'] === $check['host'] ) ) {
 			/**
 			 * Filters whether to block local HTTP API requests.
 			 *

From f6755ded9f9efffe2fea46eb08e94fc2b423d919 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Fri, 1 Oct 2021 13:47:59 +0000
Subject: [PATCH 176/257] App Passwords: Remove placeholder from the app
 password name input field.

In [49294, 49752], the `placeholder` attribute changed to `"WordPress App on My Phone"`. This change causes confusion as the field can be used in a variety of ways and is not limited to a phone.

Given a label exists for each field and clearly identifies its purpose, this commit removes the `placeholder` attribute from the `input` field.

Follow-up to [49109], [49294], [49752].

Props seedsca, audrasjb, joedolson, rehanali.
Fixes #54047.

git-svn-id: https://develop.svn.wordpress.org/trunk@51878 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/authorize-application.php | 2 +-
 src/wp-admin/user-edit.php             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/authorize-application.php b/src/wp-admin/authorize-application.php
index 1d56b47e7d540..d4104297ef120 100644
--- a/src/wp-admin/authorize-application.php
+++ b/src/wp-admin/authorize-application.php
@@ -225,7 +225,7 @@
 
 				<div class="form-field">
 					<label for="app_name"><?php _e( 'New Application Password Name' ); ?></label>
-					<input type="text" id="app_name" name="app_name" value="<?php echo esc_attr( $app_name ); ?>" placeholder="<?php esc_attr_e( 'WordPress App on My Phone' ); ?>" required />
+					<input type="text" id="app_name" name="app_name" value="<?php echo esc_attr( $app_name ); ?>" required />
 				</div>
 
 				<?php
diff --git a/src/wp-admin/user-edit.php b/src/wp-admin/user-edit.php
index 9485aab20fe41..30bc5c8e46859 100644
--- a/src/wp-admin/user-edit.php
+++ b/src/wp-admin/user-edit.php
@@ -767,7 +767,7 @@
 			<div class="create-application-password form-wrap">
 				<div class="form-field">
 					<label for="new_application_password_name"><?php _e( 'New Application Password Name' ); ?></label>
-					<input type="text" size="30" id="new_application_password_name" name="new_application_password_name" placeholder="<?php esc_attr_e( 'WordPress App on My Phone' ); ?>" class="input" aria-required="true" aria-describedby="new_application_password_name_desc" />
+					<input type="text" size="30" id="new_application_password_name" name="new_application_password_name" class="input" aria-required="true" aria-describedby="new_application_password_name_desc" />
 					<p class="description" id="new_application_password_name_desc"><?php _e( 'Required to create an Application Password, but not to update the user.' ); ?></p>
 				</div>
 

From 4226e71828b4da5f7d0b9ffaa571680a9f0d51ab Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Fri, 1 Oct 2021 14:59:31 +0000
Subject: [PATCH 177/257] Coding Standards: Use strict comparison in
 `wp-includes/class-wp-http-ixr-client.php`.

Follow-up to [16064], [16871], [17928].

See #53359.

git-svn-id: https://develop.svn.wordpress.org/trunk@51879 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-http-ixr-client.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/class-wp-http-ixr-client.php b/src/wp-includes/class-wp-http-ixr-client.php
index 5de31618fa97c..fef16e831d98b 100644
--- a/src/wp-includes/class-wp-http-ixr-client.php
+++ b/src/wp-includes/class-wp-http-ixr-client.php
@@ -97,7 +97,7 @@ public function query( ...$args ) {
 			return false;
 		}
 
-		if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
+		if ( 200 !== wp_remote_retrieve_response_code( $response ) ) {
 			$this->error = new IXR_Error( -32301, 'transport error - HTTP status code was not 200 (' . wp_remote_retrieve_response_code( $response ) . ')' );
 			return false;
 		}

From 1f0aed81a66ea9adbd4f1c93ebb12489cc3d0c66 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Fri, 1 Oct 2021 18:38:52 +0000
Subject: [PATCH 178/257] Administration: Enable first and last page buttons in
 `WP_List_Table::pagination()`.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously the first and last page pagination buttons were disabled when on their next or previous page respectively. This commit removes that unnecessary logic to keep these buttons enabled and avoid confusion in the user's navigation workflow.

New behavior:
- When on page 2, the go to first page `«` button is enabled
- When on the page before the last page, the go to last page `»` button is enabled

Follow-up to [32948], [47219].

Props wp_kc, ronakganatra, knutsp, sabernhardt, Hareesh Pillai, audrasjb, hellofromTonya.
Fixes #42763.

git-svn-id: https://develop.svn.wordpress.org/trunk@51880 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-list-table.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-list-table.php b/src/wp-admin/includes/class-wp-list-table.php
index 2cae7f695a78c..3a658b9ace18d 100644
--- a/src/wp-admin/includes/class-wp-list-table.php
+++ b/src/wp-admin/includes/class-wp-list-table.php
@@ -910,16 +910,10 @@ protected function pagination( $which ) {
 			$disable_first = true;
 			$disable_prev  = true;
 		}
-		if ( 2 == $current ) {
-			$disable_first = true;
-		}
 		if ( $total_pages == $current ) {
 			$disable_last = true;
 			$disable_next = true;
 		}
-		if ( $total_pages - 1 == $current ) {
-			$disable_last = true;
-		}
 
 		if ( $disable_first ) {
 			$page_links[] = '<span class="tablenav-pages-navspan button disabled" aria-hidden="true">&laquo;</span>';

From f660632c9c0b437979d20422e7b2e3dece886062 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sat, 2 Oct 2021 17:04:52 +0000
Subject: [PATCH 179/257] Twenty Twenty-One: Keep the closing `</span>` tag in
 footer links.

When the `link_after` value is emptied to reset any description markup, make sure not to remove the closing tag within footer links.

Follow-up to [49216].

Props sabernhardt, mukesh27.
Fixes #54209.

git-svn-id: https://develop.svn.wordpress.org/trunk@51881 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../themes/twentytwentyone/inc/menu-functions.php           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/wp-content/themes/twentytwentyone/inc/menu-functions.php b/src/wp-content/themes/twentytwentyone/inc/menu-functions.php
index 0299c58c41b08..c461047c77c6f 100644
--- a/src/wp-content/themes/twentytwentyone/inc/menu-functions.php
+++ b/src/wp-content/themes/twentytwentyone/inc/menu-functions.php
@@ -87,11 +87,15 @@ function twenty_twenty_one_nav_menu_social_icons( $item_output, $item, $depth, $
  * @return stdClass
  */
 function twenty_twenty_one_add_menu_description_args( $args, $item, $depth ) {
-	$args->link_after = '';
+	if ( '</span>' !== $args->link_after ) {
+		$args->link_after = '';
+	}
+
 	if ( 0 === $depth && isset( $item->description ) && $item->description ) {
 		// The extra <span> element is here for styling purposes: Allows the description to not be underlined on hover.
 		$args->link_after = '<p class="menu-item-description"><span>' . $item->description . '</span></p>';
 	}
+
 	return $args;
 }
 add_filter( 'nav_menu_item_args', 'twenty_twenty_one_add_menu_description_args', 10, 3 );

From 6194de49dcd79c9aeae7bd96722d69f752076f6f Mon Sep 17 00:00:00 2001
From: Timothy Jacobs <timothyblynjacobs@git.wordpress.org>
Date: Sat, 2 Oct 2021 21:43:26 +0000
Subject: [PATCH 180/257] REST API: Sort widget types by their id.

Fixes #53303.
Props spacedmonkey.


git-svn-id: https://develop.svn.wordpress.org/trunk@51882 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../class-wp-rest-widget-types-controller.php    |  2 ++
 .../rest-api/rest-widget-types-controller.php    | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php
index 39405664673d2..82c3a5255ee84 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php
@@ -237,6 +237,8 @@ protected function get_widgets() {
 			$widgets[ $widget['id'] ] = $widget;
 		}
 
+		ksort( $widgets );
+
 		return $widgets;
 	}
 
diff --git a/tests/phpunit/tests/rest-api/rest-widget-types-controller.php b/tests/phpunit/tests/rest-api/rest-widget-types-controller.php
index fd0b3007ec3b5..a7d1d47d61f9e 100644
--- a/tests/phpunit/tests/rest-api/rest-widget-types-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-widget-types-controller.php
@@ -125,6 +125,22 @@ public function test_get_items() {
 		}
 	}
 
+	/**
+	 * @ticket 53303
+	 */
+	public function test_get_items_ordering() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/widget-types' );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+		$this->assertGreaterThan( 1, count( $data ) );
+		$ids    = wp_list_pluck( $data, 'id' );
+		$sorted = $ids;
+		sort( $sorted );
+
+		$this->assertSame( $sorted, $ids );
+	}
+
 	/**
 	 * @ticket 53305
 	 */

From 3ae66a3cd1b262d40930b47432c10a4f3babe1c3 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sun, 3 Oct 2021 17:50:01 +0000
Subject: [PATCH 181/257] HTTP: Remove the DST Root CA X3 certificate expired
 on September 30, 2021.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

> The currently recommended certificate chain as presented to Let’s Encrypt ACME clients when new certificates are issued contains an intermediate certificate (ISRG Root X1) that is signed by an old DST Root CA X3 certificate that expires on 2021-09-30. In some cases the OpenSSL 1.0.2 version will regard the certificates issued by the Let’s Encrypt CA as having an expired trust chain.
>
> Most up-to-date CA cert trusted bundles, as provided by operating systems, contain this soon-to-be-expired certificate. The current CA cert bundles also contain an ISRG Root X1 self-signed certificate. This means that clients verifying certificate chains can find the alternative non-expired path to the ISRG Root X1 self-signed certificate in their trust store.
>
> Unfortunately this does not apply to OpenSSL 1.0.2 which always prefers the untrusted chain and if that chain contains a path that leads to an expired trusted root certificate (DST Root CA X3), it will be selected for the certificate verification and the expiration will be reported.

References:
* [https://www.openssl.org/blog/blog/2021/09/13/LetsEncryptRootCertExpire/ Old Let’s Encrypt Root Certificate Expiration and OpenSSL 1.0.2]
* [https://letsencrypt.org/docs/dst-root-ca-x3-expiration-september-2021/ DST Root CA X3 Expiration (September 2021)]

Follow-up to [25224], [25426], [25569], [27307], [30491], [30765], [34283], [35919], [36570], [46094].

Props bradleyt, fierevere.
Fixes #54207. See #50828.

git-svn-id: https://develop.svn.wordpress.org/trunk@51883 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/certificates/ca-bundle.crt | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/src/wp-includes/certificates/ca-bundle.crt b/src/wp-includes/certificates/ca-bundle.crt
index e6fab76e71bfd..c8a4358d3eb5f 100644
--- a/src/wp-includes/certificates/ca-bundle.crt
+++ b/src/wp-includes/certificates/ca-bundle.crt
@@ -736,26 +736,6 @@ mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
 vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
 -----END CERTIFICATE-----
 
-DST Root CA X3
-==============
------BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
-ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
-DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
-cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
-rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
-UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
-xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
-utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
-AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
-MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
-dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
-GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
-RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
-fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
------END CERTIFICATE-----
-
 SwissSign Gold CA - G2
 ======================
 -----BEGIN CERTIFICATE-----

From c69c34273a7537ba969c8e93d359735a1b58bb3a Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 4 Oct 2021 11:44:49 +0000
Subject: [PATCH 182/257] Build/Test Tools: Update the
 `@wordress/e2e-test-utils` package to version 5.4.3.

This is needed in order to use the [https://github.com/WordPress/gutenberg/blob/7a33cd43a2bece645bd759993f3f942806e45470/packages/e2e-test-utils/src/rest-api.js REST API functions] implemented in a recent version in Core e2e tests.

Props justinahinon.
Fixes #54215.

git-svn-id: https://develop.svn.wordpress.org/trunk@51884 602fd350-edb4-49c9-b593-d223f7449a82
---
 package-lock.json | 84 +++++++++++++++++++++++++++++++++++++++++++----
 package.json      |  2 +-
 2 files changed, 79 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6e4e117da14ae..ff9f23a55ca6a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3711,16 +3711,88 @@
 			}
 		},
 		"@wordpress/e2e-test-utils": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils/-/e2e-test-utils-5.3.1.tgz",
-			"integrity": "sha512-9ZAqA/HbmoxTFc8xI5S0+qVuaLLUMUdOnDHITs5W3iF3MHJcTPZLbI2NwXu/Kt3TultLNVQmK8Pxv2kzWwH7XA==",
+			"version": "5.4.3",
+			"resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils/-/e2e-test-utils-5.4.3.tgz",
+			"integrity": "sha512-DDLIO/QZipMLpqfiYB570nVtxOGlC9ByZkyd/+dqjwViBc7ST9pWMQzQPahlGjkArU2EMB96fvPumPnjrReZOA==",
 			"dev": true,
 			"requires": {
 				"@babel/runtime": "^7.13.10",
-				"@wordpress/keycodes": "^3.1.2",
-				"@wordpress/url": "^3.1.2",
+				"@wordpress/api-fetch": "^5.2.2",
+				"@wordpress/keycodes": "^3.2.2",
+				"@wordpress/url": "^3.2.2",
+				"form-data": "^4.0.0",
 				"lodash": "^4.17.21",
 				"node-fetch": "^2.6.0"
+			},
+			"dependencies": {
+				"@wordpress/api-fetch": {
+					"version": "5.2.2",
+					"resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-5.2.2.tgz",
+					"integrity": "sha512-WwJHOe6qiI4Oa1BSSo+Fpietdtm/0UgaN5A9k/TlEkARqIE+Fh56sfbC3JbjJDfQxz9TsAxMm+WWO5aNapantQ==",
+					"dev": true,
+					"requires": {
+						"@babel/runtime": "^7.13.10",
+						"@wordpress/i18n": "^4.2.2",
+						"@wordpress/url": "^3.2.2"
+					}
+				},
+				"@wordpress/hooks": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-3.2.0.tgz",
+					"integrity": "sha512-nVR6V9kPxl8+aYQzQJdoDt+aKBKHHD0zplcYZbu2MHxjmHMvppAeL9mjzVhQZj/3n10NR2Ftk94mHQzHWfhCCg==",
+					"dev": true,
+					"requires": {
+						"@babel/runtime": "^7.13.10"
+					}
+				},
+				"@wordpress/i18n": {
+					"version": "4.2.2",
+					"resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.2.2.tgz",
+					"integrity": "sha512-6PrfTDpeW5dfWyuqUx4Z5ApKFbh45CAbCs/G3PuZLlKJlXs/8p2Oq6Zxs0gLZk1QfHkw0t5qMx61lDlxWQhuPw==",
+					"dev": true,
+					"requires": {
+						"@babel/runtime": "^7.13.10",
+						"@wordpress/hooks": "^3.2.0",
+						"gettext-parser": "^1.3.1",
+						"lodash": "^4.17.21",
+						"memize": "^1.1.0",
+						"sprintf-js": "^1.1.1",
+						"tannin": "^1.2.0"
+					}
+				},
+				"@wordpress/keycodes": {
+					"version": "3.2.2",
+					"resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-3.2.2.tgz",
+					"integrity": "sha512-z4B4vby+iGciJ9gvUBIozsseDkdQXDNuWm5szMnG5g1Nn7UGDWmfCNc9IHNs3alXySmAFev6d0T/o/zgm9BBvQ==",
+					"dev": true,
+					"requires": {
+						"@babel/runtime": "^7.13.10",
+						"@wordpress/i18n": "^4.2.2",
+						"lodash": "^4.17.21"
+					}
+				},
+				"@wordpress/url": {
+					"version": "3.2.2",
+					"resolved": "https://registry.npmjs.org/@wordpress/url/-/url-3.2.2.tgz",
+					"integrity": "sha512-TYWE7V9F8nj0ZkCJy1eFD0crdDTS7iB3cVNW2yIDOn1RTWJJtzINXQFMASokVsjuh+NetAIOu8ru2mIfoRMG8Q==",
+					"dev": true,
+					"requires": {
+						"@babel/runtime": "^7.13.10",
+						"lodash": "^4.17.21",
+						"react-native-url-polyfill": "^1.1.2"
+					}
+				},
+				"form-data": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+					"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+					"dev": true,
+					"requires": {
+						"asynckit": "^0.4.0",
+						"combined-stream": "^1.0.8",
+						"mime-types": "^2.1.12"
+					}
+				}
 			}
 		},
 		"@wordpress/edit-post": {
@@ -6870,7 +6942,7 @@
 		},
 		"browserify-aes": {
 			"version": "1.2.0",
-			"resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
 			"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
 			"dev": true,
 			"requires": {
diff --git a/package.json b/package.json
index 1614f4a34c8d2..172cb074be67b 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
 		"@wordpress/babel-preset-default": "6.2.1",
 		"@wordpress/custom-templated-path-webpack-plugin": "2.0.5",
 		"@wordpress/dependency-extraction-webpack-plugin": "3.1.4",
-		"@wordpress/e2e-test-utils": "5.3.1",
+		"@wordpress/e2e-test-utils": "5.4.3",
 		"@wordpress/library-export-default-webpack-plugin": "2.0.5",
 		"@wordpress/scripts": "16.1.5",
 		"autoprefixer": "^9.8.6",

From 4bf908449ad3be738e893d35faa449293d3ccb19 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Mon, 4 Oct 2021 20:42:54 +0000
Subject: [PATCH 183/257] Docs: Miscellaneous inline documentation
 improvements, including:

* Document the post statuses global as an array of `stdClass` objects
* Document the taxonomies global as an array of `WP_Taxonomy` objects
* Document the return value of the post count functions as `stdClass` objects
* Fix some typos

See #53399


git-svn-id: https://develop.svn.wordpress.org/trunk@51885 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../class-wp-customize-nav-menus.php          |  2 +-
 src/wp-includes/class-wp-query.php            |  2 +-
 src/wp-includes/functions.php                 |  2 +-
 src/wp-includes/post.php                      | 26 +++++++++----------
 src/wp-includes/taxonomy.php                  | 16 ++++++------
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/wp-includes/class-wp-customize-nav-menus.php b/src/wp-includes/class-wp-customize-nav-menus.php
index 7eee959ecb562..f438e358fde9d 100644
--- a/src/wp-includes/class-wp-customize-nav-menus.php
+++ b/src/wp-includes/class-wp-customize-nav-menus.php
@@ -1334,7 +1334,7 @@ public function customize_preview_init() {
 	 *
 	 * @since 4.7.0
 	 *
-	 * @global array $wp_post_statuses List of post statuses.
+	 * @global stdClass[] $wp_post_statuses List of post statuses.
 	 */
 	public function make_auto_draft_status_previewable() {
 		global $wp_post_statuses;
diff --git a/src/wp-includes/class-wp-query.php b/src/wp-includes/class-wp-query.php
index 08d0b5cd51267..1f9516eec472e 100644
--- a/src/wp-includes/class-wp-query.php
+++ b/src/wp-includes/class-wp-query.php
@@ -3855,7 +3855,7 @@ public function is_tag( $tag = '' ) {
 	 *
 	 * @since 3.1.0
 	 *
-	 * @global array $wp_taxonomies
+	 * @global WP_Taxonomy[] $wp_taxonomies Registered taxonomies.
 	 *
 	 * @param string|string[]           $taxonomy Optional. Taxonomy slug or slugs to check against.
 	 *                                            Default empty.
diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index f75c396328691..aa507bb0045ea 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -1533,7 +1533,7 @@ function get_num_queries() {
  * @since 1.0.0
  *
  * @param string $yn Character string containing either 'y' (yes) or 'n' (no).
- * @return bool True if yes, false on anything else.
+ * @return bool True if 'y', false on anything else.
  */
 function bool_from_yn( $yn ) {
 	return ( 'y' === strtolower( $yn ) );
diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php
index 2487e5b4c2bfd..2bcd72c6d4339 100644
--- a/src/wp-includes/post.php
+++ b/src/wp-includes/post.php
@@ -949,7 +949,7 @@ function get_post_mime_type( $post = null ) {
  *
  * @since 2.0.0
  *
- * @param int|WP_Post $post Optional. Post ID or post object. Defaults to global $post..
+ * @param int|WP_Post $post Optional. Post ID or post object. Defaults to global $post.
  * @return string|false Post status on success, false on failure.
  */
 function get_post_status( $post = null ) {
@@ -1077,7 +1077,7 @@ function _wp_privacy_statuses() {
  *
  * @since 3.0.0
  *
- * @global array $wp_post_statuses Inserts new post status object into the list
+ * @global stdClass[] $wp_post_statuses Inserts new post status object into the list
  *
  * @param string       $post_status Name of the post status.
  * @param array|string $args {
@@ -1201,12 +1201,12 @@ function register_post_status( $post_status, $args = array() ) {
  *
  * @since 3.0.0
  *
- * @global array $wp_post_statuses List of post statuses.
+ * @global stdClass[] $wp_post_statuses List of post statuses.
  *
  * @see register_post_status()
  *
  * @param string $post_status The name of a registered post status.
- * @return object|null A post status object.
+ * @return stdClass|null A post status object.
  */
 function get_post_status_object( $post_status ) {
 	global $wp_post_statuses;
@@ -1223,7 +1223,7 @@ function get_post_status_object( $post_status ) {
  *
  * @since 3.0.0
  *
- * @global array $wp_post_statuses List of post statuses.
+ * @global stdClass[] $wp_post_statuses List of post statuses.
  *
  * @see register_post_status()
  *
@@ -2817,7 +2817,7 @@ function _count_posts_cache_key( $type = 'post', $perm = '' ) {
  *
  * @param string $type Optional. Post type to retrieve count. Default 'post'.
  * @param string $perm Optional. 'readable' or empty. Default empty.
- * @return object Number of posts for each status.
+ * @return stdClass Number of posts for each status.
  */
 function wp_count_posts( $type = 'post', $perm = '' ) {
 	global $wpdb;
@@ -2870,11 +2870,11 @@ function wp_count_posts( $type = 'post', $perm = '' ) {
 	 *
 	 * @since 3.7.0
 	 *
-	 * @param object $counts An object containing the current post_type's post
-	 *                       counts by status.
-	 * @param string $type   Post type.
-	 * @param string $perm   The permission to determine if the posts are 'readable'
-	 *                       by the current user.
+	 * @param stdClass $counts An object containing the current post_type's post
+	 *                         counts by status.
+	 * @param string   $type   Post type.
+	 * @param string   $perm   The permission to determine if the posts are 'readable'
+	 *                         by the current user.
 	 */
 	return apply_filters( 'wp_count_posts', $counts, $type, $perm );
 }
@@ -2893,7 +2893,7 @@ function wp_count_posts( $type = 'post', $perm = '' ) {
  *
  * @param string|string[] $mime_type Optional. Array or comma-separated list of
  *                                   MIME patterns. Default empty.
- * @return object An object containing the attachment counts by mime type.
+ * @return stdClass An object containing the attachment counts by mime type.
  */
 function wp_count_attachments( $mime_type = '' ) {
 	global $wpdb;
@@ -2912,7 +2912,7 @@ function wp_count_attachments( $mime_type = '' ) {
 	 *
 	 * @since 3.7.0
 	 *
-	 * @param object          $counts    An object containing the attachment counts by
+	 * @param stdClass        $counts    An object containing the attachment counts by
 	 *                                   mime type.
 	 * @param string|string[] $mime_type Array or comma-separated list of MIME patterns.
 	 */
diff --git a/src/wp-includes/taxonomy.php b/src/wp-includes/taxonomy.php
index 104da64a8761f..f81af0351ec4d 100644
--- a/src/wp-includes/taxonomy.php
+++ b/src/wp-includes/taxonomy.php
@@ -198,7 +198,7 @@ function create_initial_taxonomies() {
  *
  * @since 3.0.0
  *
- * @global array $wp_taxonomies The registered taxonomies.
+ * @global WP_Taxonomy[] $wp_taxonomies The registered taxonomies.
  *
  * @param array  $args     Optional. An array of `key => value` arguments to match against the taxonomy objects.
  *                         Default empty array.
@@ -231,7 +231,7 @@ function get_taxonomies( $args = array(), $output = 'names', $operator = 'and' )
  *
  * @since 2.3.0
  *
- * @global array $wp_taxonomies The registered taxonomies.
+ * @global WP_Taxonomy[] $wp_taxonomies The registered taxonomies.
  *
  * @param string|string[]|WP_Post $object Name of the type of taxonomy object, or an object (row from posts)
  * @param string                  $output Optional. The type of output to return in the array. Accepts either
@@ -272,7 +272,7 @@ function get_object_taxonomies( $object, $output = 'names' ) {
  *
  * @since 2.3.0
  *
- * @global array $wp_taxonomies The registered taxonomies.
+ * @global WP_Taxonomy[] $wp_taxonomies The registered taxonomies.
  *
  * @param string $taxonomy Name of taxonomy object to return.
  * @return WP_Taxonomy|false The Taxonomy Object or false if $taxonomy doesn't exist.
@@ -298,7 +298,7 @@ function get_taxonomy( $taxonomy ) {
  *
  * @since 3.0.0
  *
- * @global array $wp_taxonomies The registered taxonomies.
+ * @global WP_Taxonomy[] $wp_taxonomies The registered taxonomies.
  *
  * @param string $taxonomy Name of taxonomy object.
  * @return bool Whether the taxonomy exists.
@@ -356,7 +356,7 @@ function is_taxonomy_hierarchical( $taxonomy ) {
  * @since 5.4.0 Added the registered taxonomy object as a return value.
  * @since 5.5.0 Introduced `default_term` argument.
  *
- * @global array $wp_taxonomies Registered taxonomies.
+ * @global WP_Taxonomy[] $wp_taxonomies Registered taxonomies.
  *
  * @param string       $taxonomy    Taxonomy key, must not exceed 32 characters.
  * @param array|string $object_type Object type or array of object types with which the taxonomy should be associated.
@@ -507,7 +507,7 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
  * @since 4.5.0
  *
  * @global WP    $wp            Current WordPress environment instance.
- * @global array $wp_taxonomies List of taxonomies.
+ * @global WP_Taxonomy[] $wp_taxonomies List of taxonomies.
  *
  * @param string $taxonomy Taxonomy name.
  * @return true|WP_Error True on success, WP_Error on failure or if the taxonomy doesn't exist.
@@ -684,7 +684,7 @@ function get_taxonomy_labels( $tax ) {
  *
  * @since 3.0.0
  *
- * @global array $wp_taxonomies The registered taxonomies.
+ * @global WP_Taxonomy[] $wp_taxonomies The registered taxonomies.
  *
  * @param string $taxonomy    Name of taxonomy object.
  * @param string $object_type Name of the object type.
@@ -726,7 +726,7 @@ function register_taxonomy_for_object_type( $taxonomy, $object_type ) {
  *
  * @since 3.7.0
  *
- * @global array $wp_taxonomies The registered taxonomies.
+ * @global WP_Taxonomy[] $wp_taxonomies The registered taxonomies.
  *
  * @param string $taxonomy    Name of taxonomy object.
  * @param string $object_type Name of the object type.

From de822e8fb02e65bea74e9fa75b889461ef234bb3 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Mon, 4 Oct 2021 20:45:36 +0000
Subject: [PATCH 184/257] Docs: Improve various inline documentation for admin
 bar functions and hooks.

Props audrasjb

See #53399


git-svn-id: https://develop.svn.wordpress.org/trunk@51886 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/admin-bar.php | 74 +++++++++++++++++------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/wp-includes/admin-bar.php b/src/wp-includes/admin-bar.php
index b35a49fe1a8cd..ba85e1f1aeb57 100644
--- a/src/wp-includes/admin-bar.php
+++ b/src/wp-includes/admin-bar.php
@@ -8,7 +8,7 @@
  */
 
 /**
- * Instantiate the admin bar object and set it up as a global for access elsewhere.
+ * Instantiates the admin bar object and set it up as a global for access elsewhere.
  *
  * UNHOOKING THIS FUNCTION WILL NOT PROPERLY REMOVE THE ADMIN BAR.
  * For that, use show_admin_bar(false) or the {@see 'show_admin_bar'} filter.
@@ -84,13 +84,13 @@ function wp_admin_bar_render() {
 	}
 
 	/**
-	 * Load all necessary admin bar items.
+	 * Loads all necessary admin bar items.
 	 *
 	 * This is the hook used to add, remove, or manipulate admin bar items.
 	 *
 	 * @since 3.1.0
 	 *
-	 * @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance, passed by reference
+	 * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance, passed by reference.
 	 */
 	do_action_ref_array( 'admin_bar_menu', array( &$wp_admin_bar ) );
 
@@ -114,11 +114,11 @@ function wp_admin_bar_render() {
 }
 
 /**
- * Add the WordPress logo menu.
+ * Adds the WordPress logo menu.
  *
  * @since 3.3.0
  *
- * @param WP_Admin_Bar $wp_admin_bar
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
  */
 function wp_admin_bar_wp_menu( $wp_admin_bar ) {
 	if ( current_user_can( 'read' ) ) {
@@ -198,11 +198,11 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) {
 }
 
 /**
- * Add the sidebar toggle button.
+ * Adds the sidebar toggle button.
  *
  * @since 3.8.0
  *
- * @param WP_Admin_Bar $wp_admin_bar
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
  */
 function wp_admin_bar_sidebar_toggle( $wp_admin_bar ) {
 	if ( is_admin() ) {
@@ -217,11 +217,11 @@ function wp_admin_bar_sidebar_toggle( $wp_admin_bar ) {
 }
 
 /**
- * Add the "My Account" item.
+ * Adds the "My Account" item.
  *
  * @since 3.3.0
  *
- * @param WP_Admin_Bar $wp_admin_bar
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
  */
 function wp_admin_bar_my_account_item( $wp_admin_bar ) {
 	$user_id      = get_current_user_id();
@@ -258,11 +258,11 @@ function wp_admin_bar_my_account_item( $wp_admin_bar ) {
 }
 
 /**
- * Add the "My Account" submenu items.
+ * Adds the "My Account" submenu items.
  *
  * @since 3.1.0
  *
- * @param WP_Admin_Bar $wp_admin_bar
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
  */
 function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
 	$user_id      = get_current_user_id();
@@ -328,11 +328,11 @@ function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
 }
 
 /**
- * Add the "Site Name" menu.
+ * Adds the "Site Name" menu.
  *
  * @since 3.3.0
  *
- * @param WP_Admin_Bar $wp_admin_bar
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
  */
 function wp_admin_bar_site_menu( $wp_admin_bar ) {
 	// Don't show for logged out users.
@@ -413,7 +413,7 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) {
  *
  * @since 4.3.0
  *
- * @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance.
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
  * @global WP_Customize_Manager $wp_customize
  */
 function wp_admin_bar_customize_menu( $wp_admin_bar ) {
@@ -455,11 +455,11 @@ function wp_admin_bar_customize_menu( $wp_admin_bar ) {
 }
 
 /**
- * Add the "My Sites/[Site Name]" menu and all submenus.
+ * Adds the "My Sites/[Site Name]" menu and all submenus.
  *
  * @since 3.1.0
  *
- * @param WP_Admin_Bar $wp_admin_bar
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
  */
 function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
 	// Don't show for logged out users or single site mode.
@@ -665,11 +665,11 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
 }
 
 /**
- * Provide a shortlink.
+ * Provides a shortlink.
  *
  * @since 3.1.0
  *
- * @param WP_Admin_Bar $wp_admin_bar
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
  */
 function wp_admin_bar_shortlink_menu( $wp_admin_bar ) {
 	$short = wp_get_shortlink( 0, 'query' );
@@ -692,7 +692,7 @@ function wp_admin_bar_shortlink_menu( $wp_admin_bar ) {
 }
 
 /**
- * Provide an edit link for posts and terms.
+ * Provides an edit link for posts and terms.
  *
  * @since 3.1.0
  * @since 5.5.0 Added a "View Post" link on Comments screen for a single post.
@@ -703,7 +703,7 @@ function wp_admin_bar_shortlink_menu( $wp_admin_bar ) {
  *                                global $user_ID, which contains the ID of the current user.
  * @global int      $post_id      The ID of the post when editing comments for a single post.
  *
- * @param WP_Admin_Bar $wp_admin_bar
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
  */
 function wp_admin_bar_edit_menu( $wp_admin_bar ) {
 	global $tag, $wp_the_query, $user_id, $post_id;
@@ -836,11 +836,11 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) {
 }
 
 /**
- * Add "Add New" menu.
+ * Adds "Add New" menu.
  *
  * @since 3.1.0
  *
- * @param WP_Admin_Bar $wp_admin_bar
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
  */
 function wp_admin_bar_new_content_menu( $wp_admin_bar ) {
 	$actions = array();
@@ -912,11 +912,11 @@ function wp_admin_bar_new_content_menu( $wp_admin_bar ) {
 }
 
 /**
- * Add edit comments link with awaiting moderation count bubble.
+ * Adds edit comments link with awaiting moderation count bubble.
  *
  * @since 3.1.0
  *
- * @param WP_Admin_Bar $wp_admin_bar
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
  */
 function wp_admin_bar_comments_menu( $wp_admin_bar ) {
 	if ( ! current_user_can( 'edit_posts' ) ) {
@@ -945,11 +945,11 @@ function wp_admin_bar_comments_menu( $wp_admin_bar ) {
 }
 
 /**
- * Add appearance submenu items to the "Site Name" menu.
+ * Adds appearance submenu items to the "Site Name" menu.
  *
  * @since 3.1.0
  *
- * @param WP_Admin_Bar $wp_admin_bar
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
  */
 function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
 	$wp_admin_bar->add_group(
@@ -1027,11 +1027,11 @@ function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
 }
 
 /**
- * Provide an update link if theme/plugin/core updates are available.
+ * Provides an update link if theme/plugin/core updates are available.
  *
  * @since 3.1.0
  *
- * @param WP_Admin_Bar $wp_admin_bar
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
  */
 function wp_admin_bar_updates_menu( $wp_admin_bar ) {
 
@@ -1061,11 +1061,11 @@ function wp_admin_bar_updates_menu( $wp_admin_bar ) {
 }
 
 /**
- * Add search form.
+ * Adds search form.
  *
  * @since 3.3.0
  *
- * @param WP_Admin_Bar $wp_admin_bar
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
  */
 function wp_admin_bar_search_menu( $wp_admin_bar ) {
 	if ( is_admin() ) {
@@ -1092,11 +1092,11 @@ function wp_admin_bar_search_menu( $wp_admin_bar ) {
 }
 
 /**
- * Add a link to exit recovery mode when Recovery Mode is active.
+ * Adds a link to exit recovery mode when Recovery Mode is active.
  *
  * @since 5.2.0
  *
- * @param WP_Admin_Bar $wp_admin_bar
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
  */
 function wp_admin_bar_recovery_mode_menu( $wp_admin_bar ) {
 	if ( ! wp_is_recovery_mode() ) {
@@ -1118,11 +1118,11 @@ function wp_admin_bar_recovery_mode_menu( $wp_admin_bar ) {
 }
 
 /**
- * Add secondary menus.
+ * Adds secondary menus.
  *
  * @since 3.3.0
  *
- * @param WP_Admin_Bar $wp_admin_bar
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
  */
 function wp_admin_bar_add_secondary_groups( $wp_admin_bar ) {
 	$wp_admin_bar->add_group(
@@ -1146,7 +1146,7 @@ function wp_admin_bar_add_secondary_groups( $wp_admin_bar ) {
 }
 
 /**
- * Style and scripts for the admin bar.
+ * Prints style and scripts for the admin bar.
  *
  * @since 3.1.0
  */
@@ -1158,7 +1158,7 @@ function wp_admin_bar_header() {
 }
 
 /**
- * Default admin bar callback.
+ * Prints default admin bar callback.
  *
  * @since 3.1.0
  */
@@ -1246,7 +1246,7 @@ function is_admin_bar_showing() {
 }
 
 /**
- * Retrieve the admin bar display preference of a user.
+ * Retrieves the admin bar display preference of a user.
  *
  * @since 3.1.0
  * @access private

From f2d146d3f1ebd5661af2efd3099b0c988df538c8 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Tue, 5 Oct 2021 15:05:15 +0000
Subject: [PATCH 185/257] Administration: Allow plugin action links row to
 wrap.

When there are several action links or the text for these links is long, the plugin name column's width extends causing the other columns to shrink in width. This case is a less than desirable user experience.

The plugin name's column has `white-space: nowrap` (on larger screens). This commit changes the `white-space` to `normal`, allowing the plugin action links row to wrap into more than one line.

Follow-up to [41695].

Props ankit-k-gupta, nekojonez, sabernhardt, sergeybiryukov.
Fixes #53275.

git-svn-id: https://develop.svn.wordpress.org/trunk@51887 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/list-tables.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/wp-admin/css/list-tables.css b/src/wp-admin/css/list-tables.css
index 55145b598dbad..a39a3b725cd34 100644
--- a/src/wp-admin/css/list-tables.css
+++ b/src/wp-admin/css/list-tables.css
@@ -1254,6 +1254,11 @@ ul.cat-checklist {
 	padding: 0 0 5px;
 }
 
+.plugins .row-actions {
+	white-space: normal;
+	min-width: 12em;
+}
+
 .plugins .update .second,
 .plugins .update .row-actions,
 .plugins .updated .second,

From 374adaafe6832e57c2f15d817d69a776942972b9 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Tue, 5 Oct 2021 16:51:15 +0000
Subject: [PATCH 186/257] Coding Standards: Use strict type check for
 `in_array()` in `register_block_script_handle()`.

Follow-up to [51501].

Props aristath, sergeybiryukov.
Fixes #54206. See #53359.

git-svn-id: https://develop.svn.wordpress.org/trunk@51888 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/blocks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php
index c94a5d5e5e45c..a7919090cfbeb 100644
--- a/src/wp-includes/blocks.php
+++ b/src/wp-includes/blocks.php
@@ -116,7 +116,7 @@ function register_block_script_handle( $metadata, $field_name ) {
 		return false;
 	}
 
-	if ( ! empty( $metadata['textdomain'] ) && in_array( 'wp-i18n', $script_dependencies ) ) {
+	if ( ! empty( $metadata['textdomain'] ) && in_array( 'wp-i18n', $script_dependencies, true ) ) {
 		wp_set_script_translations( $script_handle, $metadata['textdomain'] );
 	}
 

From be25c1bf2593326671a12a11bf965ad4f1bec18b Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Tue, 5 Oct 2021 17:33:11 +0000
Subject: [PATCH 187/257] Build/Test Tools: Change the patch version used for
 testing the 5.6 branch of PHP.

This unpins the version of PHP 5.6.20 used when testing the 5.6 branch of PHP.

Using 5.6.20 was an intentional decision in [49162], as that patch version is the oldest version of PHP 5.6 still supported by WordPress. However, as of September 30, 2021, the `5.6.20` image contains a version of OpenSSL with an expired certificate, sometimes resulting in an expired trust chain.

Props Clorith, hellofromTonya, SergeyBiryukov, desrosj.
Merges [51889] to `trunk`.
Fixes #54223.

git-svn-id: https://develop.svn.wordpress.org/trunk@51890 602fd350-edb4-49c9-b593-d223f7449a82
---
 .github/workflows/phpunit-tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
index 921d4971e134c..ae6abc3ce7518 100644
--- a/.github/workflows/phpunit-tests.yml
+++ b/.github/workflows/phpunit-tests.yml
@@ -66,19 +66,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '5.6.20', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
+        php: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
         os: [ ubuntu-latest ]
         memcached: [ false ]
         split_slow: [ false ]
         multisite: [ false, true ]
         include:
           # Additional "slow" jobs for PHP 5.6.
-          - php: '5.6.20'
+          - php: '5.6'
             os: ubuntu-latest
             memcached: false
             multisite: false
             split_slow: true
-          - php: '5.6.20'
+          - php: '5.6'
             os: ubuntu-latest
             memcached: false
             multisite: true

From a86f7c7defdb165798c18687cf49090c31de1fc8 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 5 Oct 2021 20:30:11 +0000
Subject: [PATCH 188/257] Accessibility: Privacy: Use red color for action
 buttons on the Erase Personal Data screen:

* "Erase Personal Data" button in the Next Steps column.
* "Force Erase Personal Data" row action.

This highlights the destructive nature of those buttons to avoid an accidental erasure, and is consistent with other similar UI elements in the admin, e.g. various "Delete", "Spam", or "Trash" buttons.

Props arena, sabernhardt, carike, azaozz, joedolson, audrasjb, SergeyBiryukov.
Fixes #49603.

git-svn-id: https://develop.svn.wordpress.org/trunk@51891 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/common.css | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
index 50eb94d98e242..f75d9b55e1ef6 100644
--- a/src/wp-admin/css/common.css
+++ b/src/wp-admin/css/common.css
@@ -883,7 +883,8 @@ hr {
 #media-items a.delete-permanently,
 #nav-menu-footer .menu-delete,
 #delete-link a.delete,
-a#remove-post-thumbnail {
+a#remove-post-thumbnail,
+.privacy_requests .remove-personal-data .remove-personal-data-handle {
 	color: #b32d2e;
 }
 
@@ -901,7 +902,8 @@ span.required,
 #media-items a.delete-permanently:hover,
 #nav-menu-footer .menu-delete:hover,
 #delete-link a.delete:hover,
-a#remove-post-thumbnail:hover {
+a#remove-post-thumbnail:hover,
+.privacy_requests .remove-personal-data .remove-personal-data-handle:hover {
 	color: #b32d2e;
 	border: none;
 }

From 83b2339a0e39deb15a4fb7a74f68a819e5fada71 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Tue, 5 Oct 2021 23:09:21 +0000
Subject: [PATCH 189/257] Permalinks: Move the Nginx documentation link to help
 sidebar in `wp-admin/options-permalink.php`.

The "Documentation on Nginx configuration." link is out of place being below the "Save Changes" button on the Settings > Permalinks UI.

This commit relocates the link to join the other support related content links in the help tab's "For more information:" right sidebar area.

Follow-up to [34691], [45674].

Props audrasjb, hellofromTonya, johnjamesjacoby, mukesh27, peterwilsoncc, timlappe.
Fixes #39258.

git-svn-id: https://develop.svn.wordpress.org/trunk@51892 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/options-permalink.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/wp-admin/options-permalink.php b/src/wp-admin/options-permalink.php
index 4275a4a2c6453..17a9083cb6371 100644
--- a/src/wp-admin/options-permalink.php
+++ b/src/wp-admin/options-permalink.php
@@ -56,12 +56,18 @@
 	)
 );
 
-get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/settings-permalinks-screen/">Documentation on Permalinks Settings</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/using-permalinks/">Documentation on Using Permalinks</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
-);
+$help_sidebar_content = '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+						'<p>' . __( '<a href="https://wordpress.org/support/article/settings-permalinks-screen/">Documentation on Permalinks Settings</a>' ) . '</p>' .
+						'<p>' . __( '<a href="https://wordpress.org/support/article/using-permalinks/">Documentation on Using Permalinks</a>' ) . '</p>';
+
+if ( $is_nginx ) {
+	$help_sidebar_content .= '<p>' . __( '<a href="https://wordpress.org/support/article/nginx/">Documentation on Nginx configuration</a>.' ) . '</p>';
+}
+
+$help_sidebar_content .= '<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>';
+
+get_current_screen()->set_help_sidebar( $help_sidebar_content );
+unset( $help_sidebar_content );
 
 $home_path           = get_home_path();
 $iis7_permalinks     = iis7_supports_permalinks();
@@ -410,9 +416,7 @@ class="button button-secondary"
 </p>
 		<?php endif; ?>
 	<?php endif; ?>
-<?php elseif ( $is_nginx ) : ?>
-	<p><?php _e( '<a href="https://wordpress.org/support/article/nginx/">Documentation on Nginx configuration</a>.' ); ?></p>
-	<?php
+		<?php
 else :
 	if ( $permalink_structure && ! $using_index_permalinks && ! $writable && $htaccess_update_required ) :
 		?>

From 411eaea04fee0170e9b4f02c25342ad0ae9f6238 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 6 Oct 2021 15:37:36 +0000
Subject: [PATCH 190/257] Twenty Twenty-One: Remove duplicate `width` and
 `height` values from social icons.

These values are added dynamically by the `Twenty_Twenty_One_SVG_Icons::get_svg()` method and are not needed in the source array.

Follow-up to [49216].

Props max-dayala, laxman-prajapati, sabernhardt, Presskopp, mukesh27.
Fixes #54208.

git-svn-id: https://develop.svn.wordpress.org/trunk@51893 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../class-twenty-twenty-one-svg-icons.php     | 76 +++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-svg-icons.php b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-svg-icons.php
index 34a408f7c7df2..3a82cf76ab4c4 100644
--- a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-svg-icons.php
+++ b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-svg-icons.php
@@ -45,44 +45,44 @@ class Twenty_Twenty_One_SVG_Icons {
 	 * @var array
 	 */
 	protected static $social_icons = array(
-		'500px'      => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M6.94026,15.1412c.00437.01213.108.29862.168.44064a6.55008,6.55008,0,1,0,6.03191-9.09557,6.68654,6.68654,0,0,0-2.58357.51467A8.53914,8.53914,0,0,0,8.21268,8.61344L8.209,8.61725V3.22948l9.0504-.00008c.32934-.0036.32934-.46353.32934-.61466s0-.61091-.33035-.61467L7.47248,2a.43.43,0,0,0-.43131.42692v7.58355c0,.24466.30476.42131.58793.4819.553.11812.68074-.05864.81617-.2457l.018-.02481A10.52673,10.52673,0,0,1,9.32258,9.258a5.35268,5.35268,0,1,1,7.58985,7.54976,5.417,5.417,0,0,1-3.80867,1.56365,5.17483,5.17483,0,0,1-2.69822-.74478l.00342-4.61111a2.79372,2.79372,0,0,1,.71372-1.78792,2.61611,2.61611,0,0,1,1.98282-.89477,2.75683,2.75683,0,0,1,1.95525.79477,2.66867,2.66867,0,0,1,.79656,1.909,2.724,2.724,0,0,1-2.75849,2.748,4.94651,4.94651,0,0,1-.86254-.13719c-.31234-.093-.44519.34058-.48892.48349-.16811.54966.08453.65862.13687.67489a3.75751,3.75751,0,0,0,1.25234.18375,3.94634,3.94634,0,1,0-2.82444-6.742,3.67478,3.67478,0,0,0-1.13028,2.584l-.00041.02323c-.0035.11667-.00579,2.881-.00644,3.78811l-.00407-.00451a6.18521,6.18521,0,0,1-1.0851-1.86092c-.10544-.27856-.34358-.22925-.66857-.12917-.14192.04372-.57386.17677-.47833.489Zm4.65165-1.08338a.51346.51346,0,0,0,.19513.31818l.02276.022a.52945.52945,0,0,0,.3517.18416.24242.24242,0,0,0,.16577-.0611c.05473-.05082.67382-.67812.73287-.738l.69041.68819a.28978.28978,0,0,0,.21437.11032.53239.53239,0,0,0,.35708-.19486c.29792-.30419.14885-.46821.07676-.54751l-.69954-.69975.72952-.73469c.16-.17311.01874-.35708-.12218-.498-.20461-.20461-.402-.25742-.52855-.14083l-.7254.72665-.73354-.73375a.20128.20128,0,0,0-.14179-.05695.54135.54135,0,0,0-.34379.19648c-.22561.22555-.274.38149-.15656.5059l.73374.7315-.72942.73072A.26589.26589,0,0,0,11.59191,14.05782Zm1.59866-9.915A8.86081,8.86081,0,0,0,9.854,4.776a.26169.26169,0,0,0-.16938.22759.92978.92978,0,0,0,.08619.42094c.05682.14524.20779.531.50006.41955a8.40969,8.40969,0,0,1,2.91968-.55484,7.87875,7.87875,0,0,1,3.086.62286,8.61817,8.61817,0,0,1,2.30562,1.49315.2781.2781,0,0,0,.18318.07586c.15529,0,.30425-.15253.43167-.29551.21268-.23861.35873-.4369.1492-.63538a8.50425,8.50425,0,0,0-2.62312-1.694A9.0177,9.0177,0,0,0,13.19058,4.14283ZM19.50945,18.6236h0a.93171.93171,0,0,0-.36642-.25406.26589.26589,0,0,0-.27613.06613l-.06943.06929A7.90606,7.90606,0,0,1,7.60639,18.505a7.57284,7.57284,0,0,1-1.696-2.51537,8.58715,8.58715,0,0,1-.5147-1.77754l-.00871-.04864c-.04939-.25873-.28755-.27684-.62981-.22448-.14234.02178-.5755.088-.53426.39969l.001.00712a9.08807,9.08807,0,0,0,15.406,4.99094c.00193-.00192.04753-.04718.0725-.07436C19.79425,19.16234,19.87422,18.98728,19.50945,18.6236Z"></path></svg>',
-		'amazon'     => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M13.582,8.182C11.934,8.367,9.78,8.49,8.238,9.166c-1.781,0.769-3.03,2.337-3.03,4.644 c0,2.953,1.86,4.429,4.253,4.429c2.02,0,3.125-0.477,4.685-2.065c0.516,0.747,0.685,1.109,1.629,1.894 c0.212,0.114,0.483,0.103,0.672-0.066l0.006,0.006c0.567-0.505,1.599-1.401,2.18-1.888c0.231-0.188,0.19-0.496,0.009-0.754 c-0.52-0.718-1.072-1.303-1.072-2.634V8.305c0-1.876,0.133-3.599-1.249-4.891C15.23,2.369,13.422,2,12.04,2 C9.336,2,6.318,3.01,5.686,6.351C5.618,6.706,5.877,6.893,6.109,6.945l2.754,0.298C9.121,7.23,9.308,6.977,9.357,6.72 c0.236-1.151,1.2-1.706,2.284-1.706c0.584,0,1.249,0.215,1.595,0.738c0.398,0.584,0.346,1.384,0.346,2.061V8.182z M13.049,14.088 c-0.451,0.8-1.169,1.291-1.967,1.291c-1.09,0-1.728-0.83-1.728-2.061c0-2.42,2.171-2.86,4.227-2.86v0.615 C13.582,12.181,13.608,13.104,13.049,14.088z M20.683,19.339C18.329,21.076,14.917,22,11.979,22c-4.118,0-7.826-1.522-10.632-4.057 c-0.22-0.199-0.024-0.471,0.241-0.317c3.027,1.762,6.771,2.823,10.639,2.823c2.608,0,5.476-0.541,8.115-1.66 C20.739,18.62,21.072,19.051,20.683,19.339z M21.336,21.043c-0.194,0.163-0.379,0.076-0.293-0.139 c0.284-0.71,0.92-2.298,0.619-2.684c-0.301-0.386-1.99-0.183-2.749-0.092c-0.23,0.027-0.266-0.173-0.059-0.319 c1.348-0.946,3.555-0.673,3.811-0.356C22.925,17.773,22.599,19.986,21.336,21.043z"></path></svg>',
-		'bandcamp'   => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M15.27 17.289 3 17.289 8.73 6.711 21 6.711 15.27 17.289"></path></svg>',
-		'behance'    => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M7.799,5.698c0.589,0,1.12,0.051,1.606,0.156c0.482,0.102,0.894,0.273,1.241,0.507c0.344,0.235,0.612,0.546,0.804,0.938 c0.188,0.387,0.281,0.871,0.281,1.443c0,0.619-0.141,1.137-0.421,1.551c-0.284,0.413-0.7,0.751-1.255,1.014 c0.756,0.218,1.317,0.601,1.689,1.146c0.374,0.549,0.557,1.205,0.557,1.975c0,0.623-0.12,1.161-0.359,1.612 c-0.241,0.457-0.569,0.828-0.973,1.114c-0.408,0.288-0.876,0.5-1.399,0.637C9.052,17.931,8.514,18,7.963,18H2V5.698H7.799 M7.449,10.668c0.481,0,0.878-0.114,1.192-0.345c0.311-0.228,0.463-0.603,0.463-1.119c0-0.286-0.051-0.523-0.152-0.707 C8.848,8.315,8.711,8.171,8.536,8.07C8.362,7.966,8.166,7.894,7.94,7.854c-0.224-0.044-0.457-0.06-0.697-0.06H4.709v2.874H7.449z M7.6,15.905c0.267,0,0.521-0.024,0.759-0.077c0.243-0.053,0.457-0.137,0.637-0.261c0.182-0.12,0.332-0.283,0.441-0.491 C9.547,14.87,9.6,14.602,9.6,14.278c0-0.633-0.18-1.084-0.533-1.357c-0.356-0.27-0.83-0.404-1.413-0.404H4.709v3.388L7.6,15.905z M16.162,15.864c0.367,0.358,0.897,0.538,1.583,0.538c0.493,0,0.92-0.125,1.277-0.374c0.354-0.248,0.571-0.514,0.654-0.79h2.155 c-0.347,1.072-0.872,1.838-1.589,2.299C19.534,18,18.67,18.23,17.662,18.23c-0.701,0-1.332-0.113-1.899-0.337 c-0.567-0.227-1.041-0.544-1.439-0.958c-0.389-0.415-0.689-0.907-0.904-1.484c-0.213-0.574-0.32-1.21-0.32-1.899 c0-0.666,0.11-1.288,0.329-1.863c0.222-0.577,0.529-1.075,0.933-1.492c0.406-0.42,0.885-0.751,1.444-0.994 c0.558-0.241,1.175-0.363,1.857-0.363c0.754,0,1.414,0.145,1.98,0.44c0.563,0.291,1.026,0.686,1.389,1.181 c0.363,0.493,0.622,1.057,0.783,1.69c0.16,0.632,0.217,1.292,0.171,1.983h-6.428C15.557,14.84,15.795,15.506,16.162,15.864 M18.973,11.184c-0.291-0.321-0.783-0.496-1.384-0.496c-0.39,0-0.714,0.066-0.973,0.2c-0.254,0.132-0.461,0.297-0.621,0.491 c-0.157,0.197-0.265,0.405-0.328,0.628c-0.063,0.217-0.101,0.413-0.111,0.587h3.98C19.478,11.969,19.265,11.509,18.973,11.184z M15.057,7.738h4.985V6.524h-4.985L15.057,7.738z"></path></svg>',
-		'codepen'    => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M22.016,8.84c-0.002-0.013-0.005-0.025-0.007-0.037c-0.005-0.025-0.008-0.048-0.015-0.072 c-0.003-0.015-0.01-0.028-0.013-0.042c-0.008-0.02-0.015-0.04-0.023-0.062c-0.007-0.015-0.013-0.028-0.02-0.042 c-0.008-0.02-0.018-0.037-0.03-0.057c-0.007-0.013-0.017-0.027-0.025-0.038c-0.012-0.018-0.023-0.035-0.035-0.052 c-0.01-0.013-0.02-0.025-0.03-0.037c-0.015-0.017-0.028-0.032-0.043-0.045c-0.01-0.012-0.022-0.023-0.035-0.035 c-0.015-0.015-0.032-0.028-0.048-0.04c-0.012-0.01-0.025-0.02-0.037-0.03c-0.005-0.003-0.01-0.008-0.015-0.012l-9.161-6.096 c-0.289-0.192-0.666-0.192-0.955,0L2.359,8.237C2.354,8.24,2.349,8.245,2.344,8.249L2.306,8.277 c-0.017,0.013-0.033,0.027-0.048,0.04C2.246,8.331,2.234,8.342,2.222,8.352c-0.015,0.015-0.028,0.03-0.042,0.047 c-0.012,0.013-0.022,0.023-0.03,0.037C2.139,8.453,2.125,8.471,2.115,8.488C2.107,8.501,2.099,8.514,2.09,8.526 C2.079,8.548,2.069,8.565,2.06,8.585C2.054,8.6,2.047,8.613,2.04,8.626C2.032,8.648,2.025,8.67,2.019,8.69 c-0.005,0.013-0.01,0.027-0.013,0.042C1.999,8.755,1.995,8.778,1.99,8.803C1.989,8.817,1.985,8.828,1.984,8.84 C1.978,8.879,1.975,8.915,1.975,8.954v6.093c0,0.037,0.003,0.075,0.008,0.112c0.002,0.012,0.005,0.025,0.007,0.038 c0.005,0.023,0.008,0.047,0.015,0.072c0.003,0.015,0.008,0.028,0.013,0.04c0.007,0.022,0.013,0.042,0.022,0.063 c0.007,0.015,0.013,0.028,0.02,0.04c0.008,0.02,0.018,0.038,0.03,0.058c0.007,0.013,0.015,0.027,0.025,0.038 c0.012,0.018,0.023,0.035,0.035,0.052c0.01,0.013,0.02,0.025,0.03,0.037c0.013,0.015,0.028,0.032,0.042,0.045 c0.012,0.012,0.023,0.023,0.035,0.035c0.015,0.013,0.032,0.028,0.048,0.04l0.038,0.03c0.005,0.003,0.01,0.007,0.013,0.01 l9.163,6.095C11.668,21.953,11.833,22,12,22c0.167,0,0.332-0.047,0.478-0.144l9.163-6.095l0.015-0.01 c0.013-0.01,0.027-0.02,0.037-0.03c0.018-0.013,0.035-0.028,0.048-0.04c0.013-0.012,0.025-0.023,0.035-0.035 c0.017-0.015,0.03-0.032,0.043-0.045c0.01-0.013,0.02-0.025,0.03-0.037c0.013-0.018,0.025-0.035,0.035-0.052 c0.008-0.013,0.018-0.027,0.025-0.038c0.012-0.02,0.022-0.038,0.03-0.058c0.007-0.013,0.013-0.027,0.02-0.04 c0.008-0.022,0.015-0.042,0.023-0.063c0.003-0.013,0.01-0.027,0.013-0.04c0.007-0.025,0.01-0.048,0.015-0.072 c0.002-0.013,0.005-0.027,0.007-0.037c0.003-0.042,0.007-0.079,0.007-0.117V8.954C22.025,8.915,22.022,8.879,22.016,8.84z M12.862,4.464l6.751,4.49l-3.016,2.013l-3.735-2.492V4.464z M11.138,4.464v4.009l-3.735,2.494L4.389,8.954L11.138,4.464z M3.699,10.562L5.853,12l-2.155,1.438V10.562z M11.138,19.536l-6.749-4.491l3.015-2.011l3.735,2.492V19.536z M12,14.035L8.953,12 L12,9.966L15.047,12L12,14.035z M12.862,19.536v-4.009l3.735-2.492l3.016,2.011L12.862,19.536z M20.303,13.438L18.147,12 l2.156-1.438L20.303,13.438z"></path></svg>',
-		'deviantart' => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M 18.19 5.636 18.19 2 18.188 2 14.553 2 14.19 2.366 12.474 5.636 11.935 6 5.81 6 5.81 10.994 9.177 10.994 9.477 11.357 5.81 18.363 5.81 22 5.811 22 9.447 22 9.81 21.634 11.526 18.364 12.065 18 18.19 18 18.19 13.006 14.823 13.006 14.523 12.641 18.19 5.636z"></path></svg>',
-		'dribbble'   => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12,22C6.486,22,2,17.514,2,12S6.486,2,12,2c5.514,0,10,4.486,10,10S17.514,22,12,22z M20.434,13.369 c-0.292-0.092-2.644-0.794-5.32-0.365c1.117,3.07,1.572,5.57,1.659,6.09C18.689,17.798,20.053,15.745,20.434,13.369z M15.336,19.876c-0.127-0.749-0.623-3.361-1.822-6.477c-0.019,0.006-0.038,0.013-0.056,0.019c-4.818,1.679-6.547,5.02-6.701,5.334 c1.448,1.129,3.268,1.803,5.243,1.803C13.183,20.555,14.311,20.313,15.336,19.876z M5.654,17.724 c0.193-0.331,2.538-4.213,6.943-5.637c0.111-0.036,0.224-0.07,0.337-0.102c-0.214-0.485-0.448-0.971-0.692-1.45 c-4.266,1.277-8.405,1.223-8.778,1.216c-0.003,0.087-0.004,0.174-0.004,0.261C3.458,14.207,4.29,16.21,5.654,17.724z M3.639,10.264 c0.382,0.005,3.901,0.02,7.897-1.041c-1.415-2.516-2.942-4.631-3.167-4.94C5.979,5.41,4.193,7.613,3.639,10.264z M9.998,3.709 c0.236,0.316,1.787,2.429,3.187,5c3.037-1.138,4.323-2.867,4.477-3.085C16.154,4.286,14.17,3.471,12,3.471 C11.311,3.471,10.641,3.554,9.998,3.709z M18.612,6.612C18.432,6.855,17,8.69,13.842,9.979c0.199,0.407,0.389,0.821,0.567,1.237 c0.063,0.148,0.124,0.295,0.184,0.441c2.842-0.357,5.666,0.215,5.948,0.275C20.522,9.916,19.801,8.065,18.612,6.612z"></path></svg>',
-		'dropbox'    => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12,6.134L6.069,9.797L2,6.54l5.883-3.843L12,6.134z M2,13.054l5.883,3.843L12,13.459L6.069,9.797L2,13.054z M12,13.459 l4.116,3.439L22,13.054l-4.069-3.257L12,13.459z M22,6.54l-5.884-3.843L12,6.134l5.931,3.663L22,6.54z M12.011,14.2l-4.129,3.426 l-1.767-1.153v1.291l5.896,3.539l5.897-3.539v-1.291l-1.769,1.153L12.011,14.2z"></path></svg>',
-		'etsy'       => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M9.16033,4.038c0-.27174.02717-.43478.48913-.43478h6.22283c1.087,0,1.68478.92391,2.11957,2.663l.35326,1.38587h1.05978C19.59511,3.712,19.75815,2,19.75815,2s-2.663.29891-4.23913.29891h-7.962L3.29076,2.163v1.1413L4.731,3.57609c1.00543.19022,1.25.40761,1.33152,1.33152,0,0,.08152,2.71739.08152,7.20109s-.08152,7.17391-.08152,7.17391c0,.81522-.32609,1.11413-1.33152,1.30435l-1.44022.27174V22l4.2663-.13587h7.11957c1.60326,0,5.32609.13587,5.32609.13587.08152-.97826.625-5.40761.70652-5.89674H19.7038L18.644,18.52174c-.84239,1.90217-2.06522,2.038-3.42391,2.038H11.1712c-1.3587,0-2.01087-.54348-2.01087-1.712V12.65217s3.0163,0,3.99457.08152c.76087.05435,1.22283.27174,1.46739,1.33152l.32609,1.413h1.16848l-.08152-3.55978.163-3.587H15.02989l-.38043,1.57609c-.24457,1.03261-.40761,1.22283-1.46739,1.33152-1.38587.13587-4.02174.1087-4.02174.1087Z"></path></svg>',
-		'facebook'   => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12 2C6.5 2 2 6.5 2 12c0 5 3.7 9.1 8.4 9.9v-7H7.9V12h2.5V9.8c0-2.5 1.5-3.9 3.8-3.9 1.1 0 2.2.2 2.2.2v2.5h-1.3c-1.2 0-1.6.8-1.6 1.6V12h2.8l-.4 2.9h-2.3v7C18.3 21.1 22 17 22 12c0-5.5-4.5-10-10-10z"></path></svg>',
-		'feed'       => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M2,8.667V12c5.515,0,10,4.485,10,10h3.333C15.333,14.637,9.363,8.667,2,8.667z M2,2v3.333 c9.19,0,16.667,7.477,16.667,16.667H22C22,10.955,13.045,2,2,2z M4.5,17C3.118,17,2,18.12,2,19.5S3.118,22,4.5,22S7,20.88,7,19.5 S5.882,17,4.5,17z"></path></svg>',
-		'flickr'     => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M6.5,7c-2.75,0-5,2.25-5,5s2.25,5,5,5s5-2.25,5-5S9.25,7,6.5,7z M17.5,7c-2.75,0-5,2.25-5,5s2.25,5,5,5s5-2.25,5-5 S20.25,7,17.5,7z"></path></svg>',
-		'foursquare' => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M17.573,2c0,0-9.197,0-10.668,0S5,3.107,5,3.805s0,16.948,0,16.948c0,0.785,0.422,1.077,0.66,1.172 c0.238,0.097,0.892,0.177,1.285-0.275c0,0,5.035-5.843,5.122-5.93c0.132-0.132,0.132-0.132,0.262-0.132h3.26 c1.368,0,1.588-0.977,1.732-1.552c0.078-0.318,0.692-3.428,1.225-6.122l0.675-3.368C19.56,2.893,19.14,2,17.573,2z M16.495,7.22 c-0.053,0.252-0.372,0.518-0.665,0.518c-0.293,0-4.157,0-4.157,0c-0.467,0-0.802,0.318-0.802,0.787v0.508 c0,0.467,0.337,0.798,0.805,0.798c0,0,3.197,0,3.528,0s0.655,0.362,0.583,0.715c-0.072,0.353-0.407,2.102-0.448,2.295 c-0.04,0.193-0.262,0.523-0.655,0.523c-0.33,0-2.88,0-2.88,0c-0.523,0-0.683,0.068-1.033,0.503 c-0.35,0.437-3.505,4.223-3.505,4.223c-0.032,0.035-0.063,0.027-0.063-0.015V4.852c0-0.298,0.26-0.648,0.648-0.648 c0,0,8.228,0,8.562,0c0.315,0,0.61,0.297,0.528,0.683L16.495,7.22z"></path></svg>',
-		'goodreads'  => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M17.3,17.5c-0.2,0.8-0.5,1.4-1,1.9c-0.4,0.5-1,0.9-1.7,1.2C13.9,20.9,13.1,21,12,21c-0.6,0-1.3-0.1-1.9-0.2 c-0.6-0.1-1.1-0.4-1.6-0.7c-0.5-0.3-0.9-0.7-1.2-1.2c-0.3-0.5-0.5-1.1-0.5-1.7h1.5c0.1,0.5,0.2,0.9,0.5,1.2 c0.2,0.3,0.5,0.6,0.9,0.8c0.3,0.2,0.7,0.3,1.1,0.4c0.4,0.1,0.8,0.1,1.2,0.1c1.4,0,2.5-0.4,3.1-1.2c0.6-0.8,1-2,1-3.5v-1.7h0 c-0.4,0.8-0.9,1.4-1.6,1.9c-0.7,0.5-1.5,0.7-2.4,0.7c-1,0-1.9-0.2-2.6-0.5C8.7,15,8.1,14.5,7.7,14c-0.5-0.6-0.8-1.3-1-2.1 c-0.2-0.8-0.3-1.6-0.3-2.5c0-0.9,0.1-1.7,0.4-2.5c0.3-0.8,0.6-1.5,1.1-2c0.5-0.6,1.1-1,1.8-1.4C10.3,3.2,11.1,3,12,3 c0.5,0,0.9,0.1,1.3,0.2c0.4,0.1,0.8,0.3,1.1,0.5c0.3,0.2,0.6,0.5,0.9,0.8c0.3,0.3,0.5,0.6,0.6,1h0V3.4h1.5V15 C17.6,15.9,17.5,16.7,17.3,17.5z M13.8,14.1c0.5-0.3,0.9-0.7,1.3-1.1c0.3-0.5,0.6-1,0.8-1.6c0.2-0.6,0.3-1.2,0.3-1.9 c0-0.6-0.1-1.2-0.2-1.9c-0.1-0.6-0.4-1.2-0.7-1.7c-0.3-0.5-0.7-0.9-1.3-1.2c-0.5-0.3-1.1-0.5-1.9-0.5s-1.4,0.2-1.9,0.5 c-0.5,0.3-1,0.7-1.3,1.2C8.5,6.4,8.3,7,8.1,7.6C8,8.2,7.9,8.9,7.9,9.5c0,0.6,0.1,1.3,0.2,1.9C8.3,12,8.6,12.5,8.9,13 c0.3,0.5,0.8,0.8,1.3,1.1c0.5,0.3,1.1,0.4,1.9,0.4C12.7,14.5,13.3,14.4,13.8,14.1z"></path></svg>',
-		'google'     => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12.02,10.18v3.72v0.01h5.51c-0.26,1.57-1.67,4.22-5.5,4.22c-3.31,0-6.01-2.75-6.01-6.12s2.7-6.12,6.01-6.12 c1.87,0,3.13,0.8,3.85,1.48l2.84-2.76C16.99,2.99,14.73,2,12.03,2c-5.52,0-10,4.48-10,10s4.48,10,10,10c5.77,0,9.6-4.06,9.6-9.77 c0-0.83-0.11-1.42-0.25-2.05H12.02z"></path></svg>',
-		'github'     => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12,2C6.477,2,2,6.477,2,12c0,4.419,2.865,8.166,6.839,9.489c0.5,0.09,0.682-0.218,0.682-0.484 c0-0.236-0.009-0.866-0.014-1.699c-2.782,0.602-3.369-1.34-3.369-1.34c-0.455-1.157-1.11-1.465-1.11-1.465 c-0.909-0.62,0.069-0.608,0.069-0.608c1.004,0.071,1.532,1.03,1.532,1.03c0.891,1.529,2.341,1.089,2.91,0.833 c0.091-0.647,0.349-1.086,0.635-1.337c-2.22-0.251-4.555-1.111-4.555-4.943c0-1.091,0.39-1.984,1.03-2.682 C6.546,8.54,6.202,7.524,6.746,6.148c0,0,0.84-0.269,2.75,1.025C10.295,6.95,11.15,6.84,12,6.836 c0.85,0.004,1.705,0.114,2.504,0.336c1.909-1.294,2.748-1.025,2.748-1.025c0.546,1.376,0.202,2.394,0.1,2.646 c0.64,0.699,1.026,1.591,1.026,2.682c0,3.841-2.337,4.687-4.565,4.935c0.359,0.307,0.679,0.917,0.679,1.852 c0,1.335-0.012,2.415-0.012,2.741c0,0.269,0.18,0.579,0.688,0.481C19.138,20.161,22,16.416,22,12C22,6.477,17.523,2,12,2z"></path></svg>',
-		'instagram'  => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12,4.622c2.403,0,2.688,0.009,3.637,0.052c0.877,0.04,1.354,0.187,1.671,0.31c0.42,0.163,0.72,0.358,1.035,0.673 c0.315,0.315,0.51,0.615,0.673,1.035c0.123,0.317,0.27,0.794,0.31,1.671c0.043,0.949,0.052,1.234,0.052,3.637 s-0.009,2.688-0.052,3.637c-0.04,0.877-0.187,1.354-0.31,1.671c-0.163,0.42-0.358,0.72-0.673,1.035 c-0.315,0.315-0.615,0.51-1.035,0.673c-0.317,0.123-0.794,0.27-1.671,0.31c-0.949,0.043-1.233,0.052-3.637,0.052 s-2.688-0.009-3.637-0.052c-0.877-0.04-1.354-0.187-1.671-0.31c-0.42-0.163-0.72-0.358-1.035-0.673 c-0.315-0.315-0.51-0.615-0.673-1.035c-0.123-0.317-0.27-0.794-0.31-1.671C4.631,14.688,4.622,14.403,4.622,12 s0.009-2.688,0.052-3.637c0.04-0.877,0.187-1.354,0.31-1.671c0.163-0.42,0.358-0.72,0.673-1.035 c0.315-0.315,0.615-0.51,1.035-0.673c0.317-0.123,0.794-0.27,1.671-0.31C9.312,4.631,9.597,4.622,12,4.622 M12,3 C9.556,3,9.249,3.01,8.289,3.054C7.331,3.098,6.677,3.25,6.105,3.472C5.513,3.702,5.011,4.01,4.511,4.511 c-0.5,0.5-0.808,1.002-1.038,1.594C3.25,6.677,3.098,7.331,3.054,8.289C3.01,9.249,3,9.556,3,12c0,2.444,0.01,2.751,0.054,3.711 c0.044,0.958,0.196,1.612,0.418,2.185c0.23,0.592,0.538,1.094,1.038,1.594c0.5,0.5,1.002,0.808,1.594,1.038 c0.572,0.222,1.227,0.375,2.185,0.418C9.249,20.99,9.556,21,12,21s2.751-0.01,3.711-0.054c0.958-0.044,1.612-0.196,2.185-0.418 c0.592-0.23,1.094-0.538,1.594-1.038c0.5-0.5,0.808-1.002,1.038-1.594c0.222-0.572,0.375-1.227,0.418-2.185 C20.99,14.751,21,14.444,21,12s-0.01-2.751-0.054-3.711c-0.044-0.958-0.196-1.612-0.418-2.185c-0.23-0.592-0.538-1.094-1.038-1.594 c-0.5-0.5-1.002-0.808-1.594-1.038c-0.572-0.222-1.227-0.375-2.185-0.418C14.751,3.01,14.444,3,12,3L12,3z M12,7.378 c-2.552,0-4.622,2.069-4.622,4.622S9.448,16.622,12,16.622s4.622-2.069,4.622-4.622S14.552,7.378,12,7.378z M12,15 c-1.657,0-3-1.343-3-3s1.343-3,3-3s3,1.343,3,3S13.657,15,12,15z M16.804,6.116c-0.596,0-1.08,0.484-1.08,1.08 s0.484,1.08,1.08,1.08c0.596,0,1.08-0.484,1.08-1.08S17.401,6.116,16.804,6.116z"></path></svg>',
-		'lastfm'     => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M10.5002,0 C4.7006,0 0,4.70109753 0,10.4998496 C0,16.2989526 4.7006,21 10.5002,21 C16.299,21 21,16.2989526 21,10.4998496 C21,4.70109753 16.299,0 10.5002,0 Z M14.69735,14.7204413 C13.3164,14.7151781 12.4346,14.0870017 11.83445,12.6859357 L11.6816001,12.3451305 L10.35405,9.31011397 C9.92709997,8.26875064 8.85260001,7.57120012 7.68010001,7.57120012 C6.06945001,7.57120012 4.75925001,8.88509738 4.75925001,10.5009524 C4.75925001,12.1164565 6.06945001,13.4303036 7.68010001,13.4303036 C8.77200001,13.4303036 9.76514999,12.827541 10.2719501,11.8567047 C10.2893,11.8235214 10.3239,11.8019673 10.36305,11.8038219 C10.4007,11.8053759 10.43535,11.8287847 10.4504,11.8631709 L10.98655,13.1045863 C11.0016,13.1389726 10.9956,13.17782 10.97225,13.2068931 C10.1605001,14.1995341 8.96020001,14.7683115 7.68010001,14.7683115 C5.33305,14.7683115 3.42340001,12.8535563 3.42340001,10.5009524 C3.42340001,8.14679459 5.33300001,6.23203946 7.68010001,6.23203946 C9.45720002,6.23203946 10.8909,7.19074535 11.6138,8.86359341 C11.6205501,8.88018505 12.3412,10.5707777 12.97445,12.0190621 C13.34865,12.8739575 13.64615,13.3959676 14.6288,13.4291508 C15.5663001,13.4612814 16.25375,12.9121534 16.25375,12.1484869 C16.25375,11.4691321 15.8320501,11.3003585 14.8803,10.98216 C13.2365,10.4397989 12.34495,9.88605929 12.34495,8.51817658 C12.34495,7.1809207 13.26665,6.31615054 14.692,6.31615054 C15.62875,6.31615054 16.3155,6.7286858 16.79215,7.5768142 C16.80495,7.60062396 16.8079001,7.62814302 16.8004001,7.65420843 C16.7929,7.68027384 16.7748,7.70212868 16.7507001,7.713808 L15.86145,8.16900031 C15.8178001,8.19200805 15.7643,8.17807308 15.73565,8.13847371 C15.43295,7.71345711 15.0956,7.52513451 14.6423,7.52513451 C14.05125,7.52513451 13.6220001,7.92899802 13.6220001,8.48649708 C13.6220001,9.17382194 14.1529001,9.34144259 15.0339,9.61923972 C15.14915,9.65578139 15.26955,9.69397731 15.39385,9.73432853 C16.7763,10.1865133 17.57675,10.7311301 17.57675,12.1836251 C17.57685,13.629654 16.3389,14.7204413 14.69735,14.7204413 Z"></path></svg>',
-		'linkedin'   => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M19.7,3H4.3C3.582,3,3,3.582,3,4.3v15.4C3,20.418,3.582,21,4.3,21h15.4c0.718,0,1.3-0.582,1.3-1.3V4.3 C21,3.582,20.418,3,19.7,3z M8.339,18.338H5.667v-8.59h2.672V18.338z M7.004,8.574c-0.857,0-1.549-0.694-1.549-1.548 c0-0.855,0.691-1.548,1.549-1.548c0.854,0,1.547,0.694,1.547,1.548C8.551,7.881,7.858,8.574,7.004,8.574z M18.339,18.338h-2.669 v-4.177c0-0.996-0.017-2.278-1.387-2.278c-1.389,0-1.601,1.086-1.601,2.206v4.249h-2.667v-8.59h2.559v1.174h0.037 c0.356-0.675,1.227-1.387,2.526-1.387c2.703,0,3.203,1.779,3.203,4.092V18.338z"></path></svg>',
-		'mail'       => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M20,4H4C2.895,4,2,4.895,2,6v12c0,1.105,0.895,2,2,2h16c1.105,0,2-0.895,2-2V6C22,4.895,21.105,4,20,4z M20,8.236l-8,4.882 L4,8.236V6h16V8.236z"></path></svg>',
-		'mastodon'   => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M23.193 7.879c0-5.206-3.411-6.732-3.411-6.732C18.062.357 15.108.025 12.041 0h-.076c-3.068.025-6.02.357-7.74 1.147 0 0-3.411 1.526-3.411 6.732 0 1.192-.023 2.618.015 4.129.124 5.092.934 10.109 5.641 11.355 2.17.574 4.034.695 5.535.612 2.722-.15 4.25-.972 4.25-.972l-.09-1.975s-1.945.613-4.129.539c-2.165-.074-4.449-.233-4.799-2.891a5.499 5.499 0 0 1-.048-.745s2.125.52 4.817.643c1.646.075 3.19-.097 4.758-.283 3.007-.359 5.625-2.212 5.954-3.905.517-2.665.475-6.507.475-6.507zm-4.024 6.709h-2.497V8.469c0-1.29-.543-1.944-1.628-1.944-1.2 0-1.802.776-1.802 2.312v3.349h-2.483v-3.35c0-1.536-.602-2.312-1.802-2.312-1.085 0-1.628.655-1.628 1.944v6.119H4.832V8.284c0-1.289.328-2.313.987-3.07.68-.758 1.569-1.146 2.674-1.146 1.278 0 2.246.491 2.886 1.474L12 6.585l.622-1.043c.64-.983 1.608-1.474 2.886-1.474 1.104 0 1.994.388 2.674 1.146.658.757.986 1.781.986 3.07v6.304z"/></svg>',
-		'medium'     => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M20.962,7.257l-5.457,8.867l-3.923-6.375l3.126-5.08c0.112-0.182,0.319-0.286,0.527-0.286c0.05,0,0.1,0.008,0.149,0.02 c0.039,0.01,0.078,0.023,0.114,0.041l5.43,2.715l0.006,0.003c0.004,0.002,0.007,0.006,0.011,0.008 C20.971,7.191,20.98,7.227,20.962,7.257z M9.86,8.592v5.783l5.14,2.57L9.86,8.592z M15.772,17.331l4.231,2.115 C20.554,19.721,21,19.529,21,19.016V8.835L15.772,17.331z M8.968,7.178L3.665,4.527C3.569,4.479,3.478,4.456,3.395,4.456 C3.163,4.456,3,4.636,3,4.938v11.45c0,0.306,0.224,0.669,0.498,0.806l4.671,2.335c0.12,0.06,0.234,0.088,0.337,0.088 c0.29,0,0.494-0.225,0.494-0.602V7.231C9,7.208,8.988,7.188,8.968,7.178z"></path></svg>',
-		'meetup'     => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M19.24775,14.722a3.57032,3.57032,0,0,1-2.94457,3.52073,3.61886,3.61886,0,0,1-.64652.05634c-.07314-.0008-.10187.02846-.12507.09547A2.38881,2.38881,0,0,1,13.49453,20.094a2.33092,2.33092,0,0,1-1.827-.50716.13635.13635,0,0,0-.19878-.00408,3.191,3.191,0,0,1-2.104.60248,3.26309,3.26309,0,0,1-3.00324-2.71993,2.19076,2.19076,0,0,1-.03512-.30865c-.00156-.08579-.03413-.1189-.11608-.13493a2.86421,2.86421,0,0,1-1.23189-.56111,2.945,2.945,0,0,1-1.166-2.05749,2.97484,2.97484,0,0,1,.87524-2.50774.112.112,0,0,0,.02091-.16107,2.7213,2.7213,0,0,1-.36648-1.48A2.81256,2.81256,0,0,1,6.57673,7.58838a.35764.35764,0,0,0,.28869-.22819,4.2208,4.2208,0,0,1,6.02892-1.90111.25161.25161,0,0,0,.22023.0243,3.65608,3.65608,0,0,1,3.76031.90678A3.57244,3.57244,0,0,1,17.95918,8.626a2.97339,2.97339,0,0,1,.01829.57356.10637.10637,0,0,0,.0853.12792,1.97669,1.97669,0,0,1,1.27939,1.33733,2.00266,2.00266,0,0,1-.57112,2.12652c-.05284.05166-.04168.08328-.01173.13489A3.51189,3.51189,0,0,1,19.24775,14.722Zm-6.35959-.27836a1.6984,1.6984,0,0,0,1.14556,1.61113,3.82039,3.82039,0,0,0,1.036.17935,1.46888,1.46888,0,0,0,.73509-.12255.44082.44082,0,0,0,.26057-.44274.45312.45312,0,0,0-.29211-.43375.97191.97191,0,0,0-.20678-.063c-.21326-.03806-.42754-.0701-.63973-.11215a.54787.54787,0,0,1-.50172-.60926,2.75864,2.75864,0,0,1,.1773-.901c.1763-.535.414-1.045.64183-1.55913A12.686,12.686,0,0,0,15.85,10.47863a1.58461,1.58461,0,0,0,.04861-.87208,1.04531,1.04531,0,0,0-.85432-.83981,1.60658,1.60658,0,0,0-1.23654.16594.27593.27593,0,0,1-.36286-.03413c-.085-.0747-.16594-.15379-.24918-.23055a.98682.98682,0,0,0-1.33577-.04933,6.1468,6.1468,0,0,1-.4989.41615.47762.47762,0,0,1-.51535.03566c-.17448-.09307-.35512-.175-.53531-.25665a1.74949,1.74949,0,0,0-.56476-.2016,1.69943,1.69943,0,0,0-1.61654.91787,8.05815,8.05815,0,0,0-.32952.80126c-.45471,1.2557-.82507,2.53825-1.20838,3.81639a1.24151,1.24151,0,0,0,.51532,1.44389,1.42659,1.42659,0,0,0,1.22008.17166,1.09728,1.09728,0,0,0,.66994-.69764c.44145-1.04111.839-2.09989,1.25981-3.14926.11581-.28876.22792-.57874.35078-.86438a.44548.44548,0,0,1,.69189-.19539.50521.50521,0,0,1,.15044.43836,1.75625,1.75625,0,0,1-.14731.50453c-.27379.69219-.55265,1.38236-.82766,2.074a2.0836,2.0836,0,0,0-.14038.42876.50719.50719,0,0,0,.27082.57722.87236.87236,0,0,0,.66145.02739.99137.99137,0,0,0,.53406-.532q.61571-1.20914,1.228-2.42031.28423-.55863.57585-1.1133a.87189.87189,0,0,1,.29055-.35253.34987.34987,0,0,1,.37634-.01265.30291.30291,0,0,1,.12434.31459.56716.56716,0,0,1-.04655.1915c-.05318.12739-.10286.25669-.16183.38156-.34118.71775-.68754,1.43273-1.02568,2.152A2.00213,2.00213,0,0,0,12.88816,14.44366Zm4.78568,5.28972a.88573.88573,0,0,0-1.77139.00465.8857.8857,0,0,0,1.77139-.00465Zm-14.83838-7.296a.84329.84329,0,1,0,.00827-1.68655.8433.8433,0,0,0-.00827,1.68655Zm10.366-9.43673a.83506.83506,0,1,0-.0091,1.67.83505.83505,0,0,0,.0091-1.67Zm6.85014,5.22a.71651.71651,0,0,0-1.433.0093.71656.71656,0,0,0,1.433-.0093ZM5.37528,6.17908A.63823.63823,0,1,0,6.015,5.54483.62292.62292,0,0,0,5.37528,6.17908Zm6.68214,14.80843a.54949.54949,0,1,0-.55052.541A.54556.54556,0,0,0,12.05742,20.98752Zm8.53235-8.49689a.54777.54777,0,0,0-.54027.54023.53327.53327,0,0,0,.532.52293.51548.51548,0,0,0,.53272-.5237A.53187.53187,0,0,0,20.58977,12.49063ZM7.82846,2.4715a.44927.44927,0,1,0,.44484.44766A.43821.43821,0,0,0,7.82846,2.4715Zm13.775,7.60492a.41186.41186,0,0,0-.40065.39623.40178.40178,0,0,0,.40168.40168A.38994.38994,0,0,0,22,10.48172.39946.39946,0,0,0,21.60349,10.07642ZM5.79193,17.96207a.40469.40469,0,0,0-.397-.39646.399.399,0,0,0-.396.405.39234.39234,0,0,0,.39939.389A.39857.39857,0,0,0,5.79193,17.96207Z"></path></svg>',
-		'pinterest'  => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12.289,2C6.617,2,3.606,5.648,3.606,9.622c0,1.846,1.025,4.146,2.666,4.878c0.25,0.111,0.381,0.063,0.439-0.169 c0.044-0.175,0.267-1.029,0.365-1.428c0.032-0.128,0.017-0.237-0.091-0.362C6.445,11.911,6.01,10.75,6.01,9.668 c0-2.777,2.194-5.464,5.933-5.464c3.23,0,5.49,2.108,5.49,5.122c0,3.407-1.794,5.768-4.13,5.768c-1.291,0-2.257-1.021-1.948-2.277 c0.372-1.495,1.089-3.112,1.089-4.191c0-0.967-0.542-1.775-1.663-1.775c-1.319,0-2.379,1.309-2.379,3.059 c0,1.115,0.394,1.869,0.394,1.869s-1.302,5.279-1.54,6.261c-0.405,1.666,0.053,4.368,0.094,4.604 c0.021,0.126,0.167,0.169,0.25,0.063c0.129-0.165,1.699-2.419,2.142-4.051c0.158-0.59,0.817-2.995,0.817-2.995 c0.43,0.784,1.681,1.446,3.013,1.446c3.963,0,6.822-3.494,6.822-7.833C20.394,5.112,16.849,2,12.289,2"></path></svg>',
-		'pocket'     => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M21.927,4.194C21.667,3.48,20.982,3,20.222,3h-0.01h-1.721H3.839C3.092,3,2.411,3.47,2.145,4.17 C2.066,4.378,2.026,4.594,2.026,4.814v6.035l0.069,1.2c0.29,2.73,1.707,5.115,3.899,6.778c0.039,0.03,0.079,0.059,0.119,0.089 l0.025,0.018c1.175,0.859,2.491,1.441,3.91,1.727c0.655,0.132,1.325,0.2,1.991,0.2c0.615,0,1.232-0.057,1.839-0.17 c0.073-0.014,0.145-0.028,0.219-0.044c0.02-0.004,0.042-0.012,0.064-0.023c1.359-0.297,2.621-0.864,3.753-1.691l0.025-0.018 c0.04-0.029,0.08-0.058,0.119-0.089c2.192-1.664,3.609-4.049,3.898-6.778l0.069-1.2V4.814C22.026,4.605,22,4.398,21.927,4.194z M17.692,10.481l-4.704,4.512c-0.266,0.254-0.608,0.382-0.949,0.382c-0.342,0-0.684-0.128-0.949-0.382l-4.705-4.512 C5.838,9.957,5.82,9.089,6.344,8.542c0.524-0.547,1.392-0.565,1.939-0.04l3.756,3.601l3.755-3.601 c0.547-0.524,1.415-0.506,1.939,0.04C18.256,9.089,18.238,9.956,17.692,10.481z"></path></svg>',
-		'reddit'     => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M22,11.816c0-1.256-1.021-2.277-2.277-2.277c-0.593,0-1.122,0.24-1.526,0.614c-1.481-0.965-3.455-1.594-5.647-1.69 l1.171-3.702l3.18,0.748c0.008,1.028,0.846,1.862,1.876,1.862c1.035,0,1.877-0.842,1.877-1.878c0-1.035-0.842-1.877-1.877-1.877 c-0.769,0-1.431,0.466-1.72,1.13l-3.508-0.826c-0.203-0.047-0.399,0.067-0.46,0.261l-1.35,4.268 c-2.316,0.038-4.411,0.67-5.97,1.671C5.368,9.765,4.853,9.539,4.277,9.539C3.021,9.539,2,10.56,2,11.816 c0,0.814,0.433,1.523,1.078,1.925c-0.037,0.221-0.061,0.444-0.061,0.672c0,3.292,4.011,5.97,8.941,5.97s8.941-2.678,8.941-5.97 c0-0.214-0.02-0.424-0.053-0.632C21.533,13.39,22,12.661,22,11.816z M18.776,4.394c0.606,0,1.1,0.493,1.1,1.1s-0.493,1.1-1.1,1.1 s-1.1-0.494-1.1-1.1S18.169,4.394,18.776,4.394z M2.777,11.816c0-0.827,0.672-1.5,1.499-1.5c0.313,0,0.598,0.103,0.838,0.269 c-0.851,0.676-1.477,1.479-1.812,2.36C2.983,12.672,2.777,12.27,2.777,11.816z M11.959,19.606c-4.501,0-8.164-2.329-8.164-5.193 S7.457,9.22,11.959,9.22s8.164,2.329,8.164,5.193S16.46,19.606,11.959,19.606z M20.636,13.001c-0.326-0.89-0.948-1.701-1.797-2.384 c0.248-0.186,0.55-0.301,0.883-0.301c0.827,0,1.5,0.673,1.5,1.5C21.223,12.299,20.992,12.727,20.636,13.001z M8.996,14.704 c-0.76,0-1.397-0.616-1.397-1.376c0-0.76,0.637-1.397,1.397-1.397c0.76,0,1.376,0.637,1.376,1.397 C10.372,14.088,9.756,14.704,8.996,14.704z M16.401,13.328c0,0.76-0.616,1.376-1.376,1.376c-0.76,0-1.399-0.616-1.399-1.376 c0-0.76,0.639-1.397,1.399-1.397C15.785,11.931,16.401,12.568,16.401,13.328z M15.229,16.708c0.152,0.152,0.152,0.398,0,0.55 c-0.674,0.674-1.727,1.002-3.219,1.002c-0.004,0-0.007-0.002-0.011-0.002c-0.004,0-0.007,0.002-0.011,0.002 c-1.492,0-2.544-0.328-3.218-1.002c-0.152-0.152-0.152-0.398,0-0.55c0.152-0.152,0.399-0.151,0.55,0 c0.521,0.521,1.394,0.775,2.669,0.775c0.004,0,0.007,0.002,0.011,0.002c0.004,0,0.007-0.002,0.011-0.002 c1.275,0,2.148-0.253,2.669-0.775C14.831,16.556,15.078,16.556,15.229,16.708z"></path></svg>',
-		'skype'      => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M10.113,2.699c0.033-0.006,0.067-0.013,0.1-0.02c0.033,0.017,0.066,0.033,0.098,0.051L10.113,2.699z M2.72,10.223 c-0.006,0.034-0.011,0.069-0.017,0.103c0.018,0.032,0.033,0.064,0.051,0.095L2.72,10.223z M21.275,13.771 c0.007-0.035,0.011-0.071,0.018-0.106c-0.018-0.031-0.033-0.064-0.052-0.095L21.275,13.771z M13.563,21.199 c0.032,0.019,0.065,0.035,0.096,0.053c0.036-0.006,0.071-0.011,0.105-0.017L13.563,21.199z M22,16.386 c0,1.494-0.581,2.898-1.637,3.953c-1.056,1.057-2.459,1.637-3.953,1.637c-0.967,0-1.914-0.251-2.75-0.725 c0.036-0.006,0.071-0.011,0.105-0.017l-0.202-0.035c0.032,0.019,0.065,0.035,0.096,0.053c-0.543,0.096-1.099,0.147-1.654,0.147 c-1.275,0-2.512-0.25-3.676-0.743c-1.125-0.474-2.135-1.156-3.002-2.023c-0.867-0.867-1.548-1.877-2.023-3.002 c-0.493-1.164-0.743-2.401-0.743-3.676c0-0.546,0.049-1.093,0.142-1.628c0.018,0.032,0.033,0.064,0.051,0.095L2.72,10.223 c-0.006,0.034-0.011,0.069-0.017,0.103C2.244,9.5,2,8.566,2,7.615c0-1.493,0.582-2.898,1.637-3.953 c1.056-1.056,2.46-1.638,3.953-1.638c0.915,0,1.818,0.228,2.622,0.655c-0.033,0.007-0.067,0.013-0.1,0.02l0.199,0.031 c-0.032-0.018-0.066-0.034-0.098-0.051c0.002,0,0.003-0.001,0.004-0.001c0.586-0.112,1.187-0.169,1.788-0.169 c1.275,0,2.512,0.249,3.676,0.742c1.124,0.476,2.135,1.156,3.002,2.024c0.868,0.867,1.548,1.877,2.024,3.002 c0.493,1.164,0.743,2.401,0.743,3.676c0,0.575-0.054,1.15-0.157,1.712c-0.018-0.031-0.033-0.064-0.052-0.095l0.034,0.201 c0.007-0.035,0.011-0.071,0.018-0.106C21.754,14.494,22,15.432,22,16.386z M16.817,14.138c0-1.331-0.613-2.743-3.033-3.282 l-2.209-0.49c-0.84-0.192-1.807-0.444-1.807-1.237c0-0.794,0.679-1.348,1.903-1.348c2.468,0,2.243,1.696,3.468,1.696 c0.645,0,1.209-0.379,1.209-1.031c0-1.521-2.435-2.663-4.5-2.663c-2.242,0-4.63,0.952-4.63,3.488c0,1.221,0.436,2.521,2.839,3.123 l2.984,0.745c0.903,0.223,1.129,0.731,1.129,1.189c0,0.762-0.758,1.507-2.129,1.507c-2.679,0-2.307-2.062-3.743-2.062 c-0.645,0-1.113,0.444-1.113,1.078c0,1.236,1.501,2.886,4.856,2.886C15.236,17.737,16.817,16.199,16.817,14.138z"></path></svg>',
-		'snapchat'   => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12.065,2a5.526,5.526,0,0,1,3.132.892A5.854,5.854,0,0,1,17.326,5.4a5.821,5.821,0,0,1,.351,2.33q0,.612-.117,2.487a.809.809,0,0,0,.365.091,1.93,1.93,0,0,0,.664-.176,1.93,1.93,0,0,1,.664-.176,1.3,1.3,0,0,1,.729.234.7.7,0,0,1,.351.6.839.839,0,0,1-.41.7,2.732,2.732,0,0,1-.9.41,3.192,3.192,0,0,0-.9.378.728.728,0,0,0-.41.618,1.575,1.575,0,0,0,.156.56,6.9,6.9,0,0,0,1.334,1.953,5.6,5.6,0,0,0,1.881,1.315,5.875,5.875,0,0,0,1.042.3.42.42,0,0,1,.365.456q0,.911-2.852,1.341a1.379,1.379,0,0,0-.143.507,1.8,1.8,0,0,1-.182.605.451.451,0,0,1-.429.241,5.878,5.878,0,0,1-.807-.085,5.917,5.917,0,0,0-.833-.085,4.217,4.217,0,0,0-.807.065,2.42,2.42,0,0,0-.82.293,6.682,6.682,0,0,0-.755.5q-.351.267-.755.527a3.886,3.886,0,0,1-.989.436A4.471,4.471,0,0,1,11.831,22a4.307,4.307,0,0,1-1.256-.176,3.784,3.784,0,0,1-.976-.436q-.4-.26-.749-.527a6.682,6.682,0,0,0-.755-.5,2.422,2.422,0,0,0-.807-.293,4.432,4.432,0,0,0-.82-.065,5.089,5.089,0,0,0-.853.1,5,5,0,0,1-.762.1.474.474,0,0,1-.456-.241,1.819,1.819,0,0,1-.182-.618,1.411,1.411,0,0,0-.143-.521q-2.852-.429-2.852-1.341a.42.42,0,0,1,.365-.456,5.793,5.793,0,0,0,1.042-.3,5.524,5.524,0,0,0,1.881-1.315,6.789,6.789,0,0,0,1.334-1.953A1.575,1.575,0,0,0,6,12.9a.728.728,0,0,0-.41-.618,3.323,3.323,0,0,0-.9-.384,2.912,2.912,0,0,1-.9-.41.814.814,0,0,1-.41-.684.71.71,0,0,1,.338-.593,1.208,1.208,0,0,1,.716-.241,1.976,1.976,0,0,1,.625.169,2.008,2.008,0,0,0,.69.169.919.919,0,0,0,.416-.091q-.117-1.849-.117-2.474A5.861,5.861,0,0,1,6.385,5.4,5.516,5.516,0,0,1,8.625,2.819,7.075,7.075,0,0,1,12.062,2Z"></path></svg>',
-		'soundcloud' => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M8.9,16.1L9,14L8.9,9.5c0-0.1,0-0.1-0.1-0.1c0,0-0.1-0.1-0.1-0.1c-0.1,0-0.1,0-0.1,0.1c0,0-0.1,0.1-0.1,0.1L8.3,14l0.1,2.1 c0,0.1,0,0.1,0.1,0.1c0,0,0.1,0.1,0.1,0.1C8.8,16.3,8.9,16.3,8.9,16.1z M11.4,15.9l0.1-1.8L11.4,9c0-0.1,0-0.2-0.1-0.2 c0,0-0.1,0-0.1,0s-0.1,0-0.1,0c-0.1,0-0.1,0.1-0.1,0.2l0,0.1l-0.1,5c0,0,0,0.7,0.1,2v0c0,0.1,0,0.1,0.1,0.1c0.1,0.1,0.1,0.1,0.2,0.1 c0.1,0,0.1,0,0.2-0.1c0.1,0,0.1-0.1,0.1-0.2L11.4,15.9z M2.4,12.9L2.5,14l-0.2,1.1c0,0.1,0,0.1-0.1,0.1c0,0-0.1,0-0.1-0.1L2.1,14 l0.1-1.1C2.2,12.9,2.3,12.9,2.4,12.9C2.3,12.9,2.4,12.9,2.4,12.9z M3.1,12.2L3.3,14l-0.2,1.8c0,0.1,0,0.1-0.1,0.1 c-0.1,0-0.1,0-0.1-0.1L2.8,14L3,12.2C3,12.2,3,12.2,3.1,12.2C3.1,12.2,3.1,12.2,3.1,12.2z M3.9,11.9L4.1,14l-0.2,2.1 c0,0.1,0,0.1-0.1,0.1c-0.1,0-0.1,0-0.1-0.1L3.5,14l0.2-2.1c0-0.1,0-0.1,0.1-0.1C3.9,11.8,3.9,11.8,3.9,11.9z M4.7,11.9L4.9,14 l-0.2,2.1c0,0.1-0.1,0.1-0.1,0.1c-0.1,0-0.1,0-0.1-0.1L4.3,14l0.2-2.2c0-0.1,0-0.1,0.1-0.1C4.7,11.7,4.7,11.8,4.7,11.9z M5.6,12 l0.2,2l-0.2,2.1c0,0.1-0.1,0.1-0.1,0.1c0,0-0.1,0-0.1,0c0,0,0-0.1,0-0.1L5.1,14l0.2-2c0,0,0-0.1,0-0.1s0.1,0,0.1,0 C5.5,11.9,5.5,11.9,5.6,12L5.6,12z M6.4,10.7L6.6,14l-0.2,2.1c0,0,0,0.1,0,0.1c0,0-0.1,0-0.1,0c-0.1,0-0.1-0.1-0.2-0.2L5.9,14 l0.2-3.3c0-0.1,0.1-0.2,0.2-0.2c0,0,0.1,0,0.1,0C6.4,10.7,6.4,10.7,6.4,10.7z M7.2,10l0.2,4.1l-0.2,2.1c0,0,0,0.1,0,0.1 c0,0-0.1,0-0.1,0c-0.1,0-0.2-0.1-0.2-0.2l-0.1-2.1L6.8,10c0-0.1,0.1-0.2,0.2-0.2c0,0,0.1,0,0.1,0S7.2,9.9,7.2,10z M8,9.6L8.2,14 L8,16.1c0,0.1-0.1,0.2-0.2,0.2c-0.1,0-0.2-0.1-0.2-0.2L7.5,14l0.1-4.4c0-0.1,0-0.1,0.1-0.1c0,0,0.1-0.1,0.1-0.1c0.1,0,0.1,0,0.1,0.1 C8,9.6,8,9.6,8,9.6z M11.4,16.1L11.4,16.1L11.4,16.1z M9.7,9.6L9.8,14l-0.1,2.1c0,0.1,0,0.1-0.1,0.2s-0.1,0.1-0.2,0.1 c-0.1,0-0.1,0-0.1-0.1s-0.1-0.1-0.1-0.2L9.2,14l0.1-4.4c0-0.1,0-0.1,0.1-0.2s0.1-0.1,0.2-0.1c0.1,0,0.1,0,0.2,0.1S9.7,9.5,9.7,9.6 L9.7,9.6z M10.6,9.8l0.1,4.3l-0.1,2c0,0.1,0,0.1-0.1,0.2c0,0-0.1,0.1-0.2,0.1c-0.1,0-0.1,0-0.2-0.1c0,0-0.1-0.1-0.1-0.2L10,14 l0.1-4.3c0-0.1,0-0.1,0.1-0.2c0,0,0.1-0.1,0.2-0.1c0.1,0,0.1,0,0.2,0.1S10.6,9.7,10.6,9.8z M12.4,14l-0.1,2c0,0.1,0,0.1-0.1,0.2 c-0.1,0.1-0.1,0.1-0.2,0.1c-0.1,0-0.1,0-0.2-0.1c-0.1-0.1-0.1-0.1-0.1-0.2l-0.1-1l-0.1-1l0.1-5.5v0c0-0.1,0-0.2,0.1-0.2 c0.1,0,0.1-0.1,0.2-0.1c0,0,0.1,0,0.1,0c0.1,0,0.1,0.1,0.1,0.2L12.4,14z M22.1,13.9c0,0.7-0.2,1.3-0.7,1.7c-0.5,0.5-1.1,0.7-1.7,0.7 h-6.8c-0.1,0-0.1,0-0.2-0.1c-0.1-0.1-0.1-0.1-0.1-0.2V8.2c0-0.1,0.1-0.2,0.2-0.3c0.5-0.2,1-0.3,1.6-0.3c1.1,0,2.1,0.4,2.9,1.1 c0.8,0.8,1.3,1.7,1.4,2.8c0.3-0.1,0.6-0.2,1-0.2c0.7,0,1.3,0.2,1.7,0.7C21.8,12.6,22.1,13.2,22.1,13.9L22.1,13.9z"></path></svg>',
-		'spotify'    => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10c5.523,0,10-4.477,10-10C22,6.477,17.523,2,12,2 M16.586,16.424 c-0.18,0.295-0.563,0.387-0.857,0.207c-2.348-1.435-5.304-1.76-8.785-0.964c-0.335,0.077-0.67-0.133-0.746-0.469 c-0.077-0.335,0.132-0.67,0.469-0.746c3.809-0.871,7.077-0.496,9.713,1.115C16.673,15.746,16.766,16.13,16.586,16.424 M17.81,13.7 c-0.226,0.367-0.706,0.482-1.072,0.257c-2.687-1.652-6.785-2.131-9.965-1.166C6.36,12.917,5.925,12.684,5.8,12.273 C5.675,11.86,5.908,11.425,6.32,11.3c3.632-1.102,8.147-0.568,11.234,1.328C17.92,12.854,18.035,13.335,17.81,13.7 M17.915,10.865 c-3.223-1.914-8.54-2.09-11.618-1.156C5.804,9.859,5.281,9.58,5.131,9.086C4.982,8.591,5.26,8.069,5.755,7.919 c3.532-1.072,9.404-0.865,13.115,1.338c0.445,0.264,0.59,0.838,0.327,1.282C18.933,10.983,18.359,11.129,17.915,10.865"></path></svg>',
-		'tumblr'     => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M16.749,17.396c-0.357,0.17-1.041,0.319-1.551,0.332c-1.539,0.041-1.837-1.081-1.85-1.896V9.847h3.861V6.937h-3.847V2.039 c0,0-2.77,0-2.817,0c-0.046,0-0.127,0.041-0.138,0.144c-0.165,1.499-0.867,4.13-3.783,5.181v2.484h1.945v6.282 c0,2.151,1.587,5.206,5.775,5.135c1.413-0.024,2.982-0.616,3.329-1.126L16.749,17.396z"></path></svg>',
-		'twitch'     => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M16.499,8.089h-1.636v4.91h1.636V8.089z M12,8.089h-1.637v4.91H12V8.089z M4.228,3.178L3,6.451v13.092h4.499V22h2.456 l2.454-2.456h3.681L21,14.636V3.178H4.228z M19.364,13.816l-2.864,2.865H12l-2.453,2.453V16.68H5.863V4.814h13.501V13.816z"></path></svg>',
-		'twitter'    => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M22.23,5.924c-0.736,0.326-1.527,0.547-2.357,0.646c0.847-0.508,1.498-1.312,1.804-2.27 c-0.793,0.47-1.671,0.812-2.606,0.996C18.324,4.498,17.257,4,16.077,4c-2.266,0-4.103,1.837-4.103,4.103 c0,0.322,0.036,0.635,0.106,0.935C8.67,8.867,5.647,7.234,3.623,4.751C3.27,5.357,3.067,6.062,3.067,6.814 c0,1.424,0.724,2.679,1.825,3.415c-0.673-0.021-1.305-0.206-1.859-0.513c0,0.017,0,0.034,0,0.052c0,1.988,1.414,3.647,3.292,4.023 c-0.344,0.094-0.707,0.144-1.081,0.144c-0.264,0-0.521-0.026-0.772-0.074c0.522,1.63,2.038,2.816,3.833,2.85 c-1.404,1.1-3.174,1.756-5.096,1.756c-0.331,0-0.658-0.019-0.979-0.057c1.816,1.164,3.973,1.843,6.29,1.843 c7.547,0,11.675-6.252,11.675-11.675c0-0.178-0.004-0.355-0.012-0.531C20.985,7.47,21.68,6.747,22.23,5.924z"></path></svg>',
-		'vimeo'      => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M22.396,7.164c-0.093,2.026-1.507,4.799-4.245,8.32C15.322,19.161,12.928,21,10.97,21c-1.214,0-2.24-1.119-3.079-3.359 c-0.56-2.053-1.119-4.106-1.68-6.159C5.588,9.243,4.921,8.122,4.206,8.122c-0.156,0-0.701,0.328-1.634,0.98L1.594,7.841 c1.027-0.902,2.04-1.805,3.037-2.708C6.001,3.95,7.03,3.327,7.715,3.264c1.619-0.156,2.616,0.951,2.99,3.321 c0.404,2.557,0.685,4.147,0.841,4.769c0.467,2.121,0.981,3.181,1.542,3.181c0.435,0,1.09-0.688,1.963-2.065 c0.871-1.376,1.338-2.422,1.401-3.142c0.125-1.187-0.343-1.782-1.401-1.782c-0.498,0-1.012,0.115-1.541,0.341 c1.023-3.35,2.977-4.977,5.862-4.884C21.511,3.066,22.52,4.453,22.396,7.164z"></path></svg>',
-		'vk'         => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M22,7.1c0.2,0.4-0.4,1.5-1.6,3.1c-0.2,0.2-0.4,0.5-0.7,0.9c-0.5,0.7-0.9,1.1-0.9,1.4c-0.1,0.3-0.1,0.6,0.1,0.8 c0.1,0.1,0.4,0.4,0.8,0.9h0l0,0c1,0.9,1.6,1.7,2,2.3c0,0,0,0.1,0.1,0.1c0,0.1,0,0.1,0.1,0.3c0,0.1,0,0.2,0,0.4 c0,0.1-0.1,0.2-0.3,0.3c-0.1,0.1-0.4,0.1-0.6,0.1l-2.7,0c-0.2,0-0.4,0-0.6-0.1c-0.2-0.1-0.4-0.1-0.5-0.2l-0.2-0.1 c-0.2-0.1-0.5-0.4-0.7-0.7s-0.5-0.6-0.7-0.8c-0.2-0.2-0.4-0.4-0.6-0.6C14.8,15,14.6,15,14.4,15c0,0,0,0-0.1,0c0,0-0.1,0.1-0.2,0.2 c-0.1,0.1-0.2,0.2-0.2,0.3c-0.1,0.1-0.1,0.3-0.2,0.5c-0.1,0.2-0.1,0.5-0.1,0.8c0,0.1,0,0.2,0,0.3c0,0.1-0.1,0.2-0.1,0.2l0,0.1 c-0.1,0.1-0.3,0.2-0.6,0.2h-1.2c-0.5,0-1,0-1.5-0.2c-0.5-0.1-1-0.3-1.4-0.6s-0.7-0.5-1.1-0.7s-0.6-0.4-0.7-0.6l-0.3-0.3 c-0.1-0.1-0.2-0.2-0.3-0.3s-0.4-0.5-0.7-0.9s-0.7-1-1.1-1.6c-0.4-0.6-0.8-1.3-1.3-2.2C2.9,9.4,2.5,8.5,2.1,7.5C2,7.4,2,7.3,2,7.2 c0-0.1,0-0.1,0-0.2l0-0.1c0.1-0.1,0.3-0.2,0.6-0.2l2.9,0c0.1,0,0.2,0,0.2,0.1S5.9,6.9,5.9,7L6,7c0.1,0.1,0.2,0.2,0.3,0.3 C6.4,7.7,6.5,8,6.7,8.4C6.9,8.8,7,9,7.1,9.2l0.2,0.3c0.2,0.4,0.4,0.8,0.6,1.1c0.2,0.3,0.4,0.5,0.5,0.7s0.3,0.3,0.4,0.4 c0.1,0.1,0.3,0.1,0.4,0.1c0.1,0,0.2,0,0.3-0.1c0,0,0,0,0.1-0.1c0,0,0.1-0.1,0.1-0.2c0.1-0.1,0.1-0.3,0.1-0.5c0-0.2,0.1-0.5,0.1-0.8 c0-0.4,0-0.8,0-1.3c0-0.3,0-0.5-0.1-0.8c0-0.2-0.1-0.4-0.1-0.5L9.6,7.6C9.4,7.3,9.1,7.2,8.7,7.1C8.6,7.1,8.6,7,8.7,6.9 C8.9,6.7,9,6.6,9.1,6.5c0.4-0.2,1.2-0.3,2.5-0.3c0.6,0,1,0.1,1.4,0.1c0.1,0,0.3,0.1,0.3,0.1c0.1,0.1,0.2,0.1,0.2,0.3 c0,0.1,0.1,0.2,0.1,0.3s0,0.3,0,0.5c0,0.2,0,0.4,0,0.6c0,0.2,0,0.4,0,0.7c0,0.3,0,0.6,0,0.9c0,0.1,0,0.2,0,0.4c0,0.2,0,0.4,0,0.5 c0,0.1,0,0.3,0,0.4s0.1,0.3,0.1,0.4c0.1,0.1,0.1,0.2,0.2,0.3c0.1,0,0.1,0,0.2,0c0.1,0,0.2,0,0.3-0.1c0.1-0.1,0.2-0.2,0.4-0.4 s0.3-0.4,0.5-0.7c0.2-0.3,0.5-0.7,0.7-1.1c0.4-0.7,0.8-1.5,1.1-2.3c0-0.1,0.1-0.1,0.1-0.2c0-0.1,0.1-0.1,0.1-0.1l0,0l0.1,0 c0,0,0,0,0.1,0s0.2,0,0.2,0l3,0c0.3,0,0.5,0,0.7,0S21.9,7,21.9,7L22,7.1z"></path></svg>',
-		'wordpress'  => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12.158,12.786L9.46,20.625c0.806,0.237,1.657,0.366,2.54,0.366c1.047,0,2.051-0.181,2.986-0.51 c-0.024-0.038-0.046-0.079-0.065-0.124L12.158,12.786z M3.009,12c0,3.559,2.068,6.634,5.067,8.092L3.788,8.341 C3.289,9.459,3.009,10.696,3.009,12z M18.069,11.546c0-1.112-0.399-1.881-0.741-2.48c-0.456-0.741-0.883-1.368-0.883-2.109 c0-0.826,0.627-1.596,1.51-1.596c0.04,0,0.078,0.005,0.116,0.007C16.472,3.904,14.34,3.009,12,3.009 c-3.141,0-5.904,1.612-7.512,4.052c0.211,0.007,0.41,0.011,0.579,0.011c0.94,0,2.396-0.114,2.396-0.114 C7.947,6.93,8.004,7.642,7.52,7.699c0,0-0.487,0.057-1.029,0.085l3.274,9.739l1.968-5.901l-1.401-3.838 C9.848,7.756,9.389,7.699,9.389,7.699C8.904,7.67,8.961,6.93,9.446,6.958c0,0,1.484,0.114,2.368,0.114 c0.94,0,2.397-0.114,2.397-0.114c0.485-0.028,0.542,0.684,0.057,0.741c0,0-0.488,0.057-1.029,0.085l3.249,9.665l0.897-2.996 C17.841,13.284,18.069,12.316,18.069,11.546z M19.889,7.686c0.039,0.286,0.06,0.593,0.06,0.924c0,0.912-0.171,1.938-0.684,3.22 l-2.746,7.94c2.673-1.558,4.47-4.454,4.47-7.771C20.991,10.436,20.591,8.967,19.889,7.686z M12,22C6.486,22,2,17.514,2,12 C2,6.486,6.486,2,12,2c5.514,0,10,4.486,10,10C22,17.514,17.514,22,12,22z"></path></svg>',
-		'yelp'       => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12.271,16.718v1.417q-.011,3.257-.067,3.4a.707.707,0,0,1-.569.446,4.637,4.637,0,0,1-2.024-.424A4.609,4.609,0,0,1,7.8,20.565a.844.844,0,0,1-.19-.4.692.692,0,0,1,.044-.29,3.181,3.181,0,0,1,.379-.524q.335-.412,2.019-2.409.011,0,.669-.781a.757.757,0,0,1,.44-.274.965.965,0,0,1,.552.039.945.945,0,0,1,.418.324.732.732,0,0,1,.139.468Zm-1.662-2.8a.783.783,0,0,1-.58.781l-1.339.435q-3.067.981-3.257.981a.711.711,0,0,1-.6-.4,2.636,2.636,0,0,1-.19-.836,9.134,9.134,0,0,1,.011-1.857,3.559,3.559,0,0,1,.335-1.389.659.659,0,0,1,.625-.357,22.629,22.629,0,0,1,2.253.859q.781.324,1.283.524l.937.379a.771.771,0,0,1,.4.34A.982.982,0,0,1,10.609,13.917Zm9.213,3.313a4.467,4.467,0,0,1-1.021,1.8,4.559,4.559,0,0,1-1.512,1.417.671.671,0,0,1-.7-.078q-.156-.112-2.052-3.2l-.524-.859a.761.761,0,0,1-.128-.513.957.957,0,0,1,.217-.513.774.774,0,0,1,.926-.29q.011.011,1.327.446,2.264.736,2.7.887a2.082,2.082,0,0,1,.524.229.673.673,0,0,1,.245.68Zm-7.5-7.049q.056,1.137-.6,1.361-.647.19-1.272-.792L6.237,4.08a.7.7,0,0,1,.212-.691,5.788,5.788,0,0,1,2.314-1,5.928,5.928,0,0,1,2.5-.352.681.681,0,0,1,.547.5q.034.2.245,3.407T12.327,10.181Zm7.384,1.2a.679.679,0,0,1-.29.658q-.167.112-3.67.959-.747.167-1.015.257l.011-.022a.769.769,0,0,1-.513-.044.914.914,0,0,1-.413-.357.786.786,0,0,1,0-.971q.011-.011.836-1.137,1.394-1.908,1.673-2.275a2.423,2.423,0,0,1,.379-.435A.7.7,0,0,1,17.435,8a4.482,4.482,0,0,1,1.372,1.489,4.81,4.81,0,0,1,.9,1.868v.034Z"></path></svg>',
-		'youtube'    => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M21.8,8.001c0,0-0.195-1.378-0.795-1.985c-0.76-0.797-1.613-0.801-2.004-0.847c-2.799-0.202-6.997-0.202-6.997-0.202 h-0.009c0,0-4.198,0-6.997,0.202C4.608,5.216,3.756,5.22,2.995,6.016C2.395,6.623,2.2,8.001,2.2,8.001S2,9.62,2,11.238v1.517 c0,1.618,0.2,3.237,0.2,3.237s0.195,1.378,0.795,1.985c0.761,0.797,1.76,0.771,2.205,0.855c1.6,0.153,6.8,0.201,6.8,0.201 s4.203-0.006,7.001-0.209c0.391-0.047,1.243-0.051,2.004-0.847c0.6-0.607,0.795-1.985,0.795-1.985s0.2-1.618,0.2-3.237v-1.517 C22,9.62,21.8,8.001,21.8,8.001z M9.935,14.594l-0.001-5.62l5.404,2.82L9.935,14.594z"></path></svg>',
+		'500px'      => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M6.94026,15.1412c.00437.01213.108.29862.168.44064a6.55008,6.55008,0,1,0,6.03191-9.09557,6.68654,6.68654,0,0,0-2.58357.51467A8.53914,8.53914,0,0,0,8.21268,8.61344L8.209,8.61725V3.22948l9.0504-.00008c.32934-.0036.32934-.46353.32934-.61466s0-.61091-.33035-.61467L7.47248,2a.43.43,0,0,0-.43131.42692v7.58355c0,.24466.30476.42131.58793.4819.553.11812.68074-.05864.81617-.2457l.018-.02481A10.52673,10.52673,0,0,1,9.32258,9.258a5.35268,5.35268,0,1,1,7.58985,7.54976,5.417,5.417,0,0,1-3.80867,1.56365,5.17483,5.17483,0,0,1-2.69822-.74478l.00342-4.61111a2.79372,2.79372,0,0,1,.71372-1.78792,2.61611,2.61611,0,0,1,1.98282-.89477,2.75683,2.75683,0,0,1,1.95525.79477,2.66867,2.66867,0,0,1,.79656,1.909,2.724,2.724,0,0,1-2.75849,2.748,4.94651,4.94651,0,0,1-.86254-.13719c-.31234-.093-.44519.34058-.48892.48349-.16811.54966.08453.65862.13687.67489a3.75751,3.75751,0,0,0,1.25234.18375,3.94634,3.94634,0,1,0-2.82444-6.742,3.67478,3.67478,0,0,0-1.13028,2.584l-.00041.02323c-.0035.11667-.00579,2.881-.00644,3.78811l-.00407-.00451a6.18521,6.18521,0,0,1-1.0851-1.86092c-.10544-.27856-.34358-.22925-.66857-.12917-.14192.04372-.57386.17677-.47833.489Zm4.65165-1.08338a.51346.51346,0,0,0,.19513.31818l.02276.022a.52945.52945,0,0,0,.3517.18416.24242.24242,0,0,0,.16577-.0611c.05473-.05082.67382-.67812.73287-.738l.69041.68819a.28978.28978,0,0,0,.21437.11032.53239.53239,0,0,0,.35708-.19486c.29792-.30419.14885-.46821.07676-.54751l-.69954-.69975.72952-.73469c.16-.17311.01874-.35708-.12218-.498-.20461-.20461-.402-.25742-.52855-.14083l-.7254.72665-.73354-.73375a.20128.20128,0,0,0-.14179-.05695.54135.54135,0,0,0-.34379.19648c-.22561.22555-.274.38149-.15656.5059l.73374.7315-.72942.73072A.26589.26589,0,0,0,11.59191,14.05782Zm1.59866-9.915A8.86081,8.86081,0,0,0,9.854,4.776a.26169.26169,0,0,0-.16938.22759.92978.92978,0,0,0,.08619.42094c.05682.14524.20779.531.50006.41955a8.40969,8.40969,0,0,1,2.91968-.55484,7.87875,7.87875,0,0,1,3.086.62286,8.61817,8.61817,0,0,1,2.30562,1.49315.2781.2781,0,0,0,.18318.07586c.15529,0,.30425-.15253.43167-.29551.21268-.23861.35873-.4369.1492-.63538a8.50425,8.50425,0,0,0-2.62312-1.694A9.0177,9.0177,0,0,0,13.19058,4.14283ZM19.50945,18.6236h0a.93171.93171,0,0,0-.36642-.25406.26589.26589,0,0,0-.27613.06613l-.06943.06929A7.90606,7.90606,0,0,1,7.60639,18.505a7.57284,7.57284,0,0,1-1.696-2.51537,8.58715,8.58715,0,0,1-.5147-1.77754l-.00871-.04864c-.04939-.25873-.28755-.27684-.62981-.22448-.14234.02178-.5755.088-.53426.39969l.001.00712a9.08807,9.08807,0,0,0,15.406,4.99094c.00193-.00192.04753-.04718.0725-.07436C19.79425,19.16234,19.87422,18.98728,19.50945,18.6236Z"></path></svg>',
+		'amazon'     => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M13.582,8.182C11.934,8.367,9.78,8.49,8.238,9.166c-1.781,0.769-3.03,2.337-3.03,4.644 c0,2.953,1.86,4.429,4.253,4.429c2.02,0,3.125-0.477,4.685-2.065c0.516,0.747,0.685,1.109,1.629,1.894 c0.212,0.114,0.483,0.103,0.672-0.066l0.006,0.006c0.567-0.505,1.599-1.401,2.18-1.888c0.231-0.188,0.19-0.496,0.009-0.754 c-0.52-0.718-1.072-1.303-1.072-2.634V8.305c0-1.876,0.133-3.599-1.249-4.891C15.23,2.369,13.422,2,12.04,2 C9.336,2,6.318,3.01,5.686,6.351C5.618,6.706,5.877,6.893,6.109,6.945l2.754,0.298C9.121,7.23,9.308,6.977,9.357,6.72 c0.236-1.151,1.2-1.706,2.284-1.706c0.584,0,1.249,0.215,1.595,0.738c0.398,0.584,0.346,1.384,0.346,2.061V8.182z M13.049,14.088 c-0.451,0.8-1.169,1.291-1.967,1.291c-1.09,0-1.728-0.83-1.728-2.061c0-2.42,2.171-2.86,4.227-2.86v0.615 C13.582,12.181,13.608,13.104,13.049,14.088z M20.683,19.339C18.329,21.076,14.917,22,11.979,22c-4.118,0-7.826-1.522-10.632-4.057 c-0.22-0.199-0.024-0.471,0.241-0.317c3.027,1.762,6.771,2.823,10.639,2.823c2.608,0,5.476-0.541,8.115-1.66 C20.739,18.62,21.072,19.051,20.683,19.339z M21.336,21.043c-0.194,0.163-0.379,0.076-0.293-0.139 c0.284-0.71,0.92-2.298,0.619-2.684c-0.301-0.386-1.99-0.183-2.749-0.092c-0.23,0.027-0.266-0.173-0.059-0.319 c1.348-0.946,3.555-0.673,3.811-0.356C22.925,17.773,22.599,19.986,21.336,21.043z"></path></svg>',
+		'bandcamp'   => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M15.27 17.289 3 17.289 8.73 6.711 21 6.711 15.27 17.289"></path></svg>',
+		'behance'    => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M7.799,5.698c0.589,0,1.12,0.051,1.606,0.156c0.482,0.102,0.894,0.273,1.241,0.507c0.344,0.235,0.612,0.546,0.804,0.938 c0.188,0.387,0.281,0.871,0.281,1.443c0,0.619-0.141,1.137-0.421,1.551c-0.284,0.413-0.7,0.751-1.255,1.014 c0.756,0.218,1.317,0.601,1.689,1.146c0.374,0.549,0.557,1.205,0.557,1.975c0,0.623-0.12,1.161-0.359,1.612 c-0.241,0.457-0.569,0.828-0.973,1.114c-0.408,0.288-0.876,0.5-1.399,0.637C9.052,17.931,8.514,18,7.963,18H2V5.698H7.799 M7.449,10.668c0.481,0,0.878-0.114,1.192-0.345c0.311-0.228,0.463-0.603,0.463-1.119c0-0.286-0.051-0.523-0.152-0.707 C8.848,8.315,8.711,8.171,8.536,8.07C8.362,7.966,8.166,7.894,7.94,7.854c-0.224-0.044-0.457-0.06-0.697-0.06H4.709v2.874H7.449z M7.6,15.905c0.267,0,0.521-0.024,0.759-0.077c0.243-0.053,0.457-0.137,0.637-0.261c0.182-0.12,0.332-0.283,0.441-0.491 C9.547,14.87,9.6,14.602,9.6,14.278c0-0.633-0.18-1.084-0.533-1.357c-0.356-0.27-0.83-0.404-1.413-0.404H4.709v3.388L7.6,15.905z M16.162,15.864c0.367,0.358,0.897,0.538,1.583,0.538c0.493,0,0.92-0.125,1.277-0.374c0.354-0.248,0.571-0.514,0.654-0.79h2.155 c-0.347,1.072-0.872,1.838-1.589,2.299C19.534,18,18.67,18.23,17.662,18.23c-0.701,0-1.332-0.113-1.899-0.337 c-0.567-0.227-1.041-0.544-1.439-0.958c-0.389-0.415-0.689-0.907-0.904-1.484c-0.213-0.574-0.32-1.21-0.32-1.899 c0-0.666,0.11-1.288,0.329-1.863c0.222-0.577,0.529-1.075,0.933-1.492c0.406-0.42,0.885-0.751,1.444-0.994 c0.558-0.241,1.175-0.363,1.857-0.363c0.754,0,1.414,0.145,1.98,0.44c0.563,0.291,1.026,0.686,1.389,1.181 c0.363,0.493,0.622,1.057,0.783,1.69c0.16,0.632,0.217,1.292,0.171,1.983h-6.428C15.557,14.84,15.795,15.506,16.162,15.864 M18.973,11.184c-0.291-0.321-0.783-0.496-1.384-0.496c-0.39,0-0.714,0.066-0.973,0.2c-0.254,0.132-0.461,0.297-0.621,0.491 c-0.157,0.197-0.265,0.405-0.328,0.628c-0.063,0.217-0.101,0.413-0.111,0.587h3.98C19.478,11.969,19.265,11.509,18.973,11.184z M15.057,7.738h4.985V6.524h-4.985L15.057,7.738z"></path></svg>',
+		'codepen'    => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M22.016,8.84c-0.002-0.013-0.005-0.025-0.007-0.037c-0.005-0.025-0.008-0.048-0.015-0.072 c-0.003-0.015-0.01-0.028-0.013-0.042c-0.008-0.02-0.015-0.04-0.023-0.062c-0.007-0.015-0.013-0.028-0.02-0.042 c-0.008-0.02-0.018-0.037-0.03-0.057c-0.007-0.013-0.017-0.027-0.025-0.038c-0.012-0.018-0.023-0.035-0.035-0.052 c-0.01-0.013-0.02-0.025-0.03-0.037c-0.015-0.017-0.028-0.032-0.043-0.045c-0.01-0.012-0.022-0.023-0.035-0.035 c-0.015-0.015-0.032-0.028-0.048-0.04c-0.012-0.01-0.025-0.02-0.037-0.03c-0.005-0.003-0.01-0.008-0.015-0.012l-9.161-6.096 c-0.289-0.192-0.666-0.192-0.955,0L2.359,8.237C2.354,8.24,2.349,8.245,2.344,8.249L2.306,8.277 c-0.017,0.013-0.033,0.027-0.048,0.04C2.246,8.331,2.234,8.342,2.222,8.352c-0.015,0.015-0.028,0.03-0.042,0.047 c-0.012,0.013-0.022,0.023-0.03,0.037C2.139,8.453,2.125,8.471,2.115,8.488C2.107,8.501,2.099,8.514,2.09,8.526 C2.079,8.548,2.069,8.565,2.06,8.585C2.054,8.6,2.047,8.613,2.04,8.626C2.032,8.648,2.025,8.67,2.019,8.69 c-0.005,0.013-0.01,0.027-0.013,0.042C1.999,8.755,1.995,8.778,1.99,8.803C1.989,8.817,1.985,8.828,1.984,8.84 C1.978,8.879,1.975,8.915,1.975,8.954v6.093c0,0.037,0.003,0.075,0.008,0.112c0.002,0.012,0.005,0.025,0.007,0.038 c0.005,0.023,0.008,0.047,0.015,0.072c0.003,0.015,0.008,0.028,0.013,0.04c0.007,0.022,0.013,0.042,0.022,0.063 c0.007,0.015,0.013,0.028,0.02,0.04c0.008,0.02,0.018,0.038,0.03,0.058c0.007,0.013,0.015,0.027,0.025,0.038 c0.012,0.018,0.023,0.035,0.035,0.052c0.01,0.013,0.02,0.025,0.03,0.037c0.013,0.015,0.028,0.032,0.042,0.045 c0.012,0.012,0.023,0.023,0.035,0.035c0.015,0.013,0.032,0.028,0.048,0.04l0.038,0.03c0.005,0.003,0.01,0.007,0.013,0.01 l9.163,6.095C11.668,21.953,11.833,22,12,22c0.167,0,0.332-0.047,0.478-0.144l9.163-6.095l0.015-0.01 c0.013-0.01,0.027-0.02,0.037-0.03c0.018-0.013,0.035-0.028,0.048-0.04c0.013-0.012,0.025-0.023,0.035-0.035 c0.017-0.015,0.03-0.032,0.043-0.045c0.01-0.013,0.02-0.025,0.03-0.037c0.013-0.018,0.025-0.035,0.035-0.052 c0.008-0.013,0.018-0.027,0.025-0.038c0.012-0.02,0.022-0.038,0.03-0.058c0.007-0.013,0.013-0.027,0.02-0.04 c0.008-0.022,0.015-0.042,0.023-0.063c0.003-0.013,0.01-0.027,0.013-0.04c0.007-0.025,0.01-0.048,0.015-0.072 c0.002-0.013,0.005-0.027,0.007-0.037c0.003-0.042,0.007-0.079,0.007-0.117V8.954C22.025,8.915,22.022,8.879,22.016,8.84z M12.862,4.464l6.751,4.49l-3.016,2.013l-3.735-2.492V4.464z M11.138,4.464v4.009l-3.735,2.494L4.389,8.954L11.138,4.464z M3.699,10.562L5.853,12l-2.155,1.438V10.562z M11.138,19.536l-6.749-4.491l3.015-2.011l3.735,2.492V19.536z M12,14.035L8.953,12 L12,9.966L15.047,12L12,14.035z M12.862,19.536v-4.009l3.735-2.492l3.016,2.011L12.862,19.536z M20.303,13.438L18.147,12 l2.156-1.438L20.303,13.438z"></path></svg>',
+		'deviantart' => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M 18.19 5.636 18.19 2 18.188 2 14.553 2 14.19 2.366 12.474 5.636 11.935 6 5.81 6 5.81 10.994 9.177 10.994 9.477 11.357 5.81 18.363 5.81 22 5.811 22 9.447 22 9.81 21.634 11.526 18.364 12.065 18 18.19 18 18.19 13.006 14.823 13.006 14.523 12.641 18.19 5.636z"></path></svg>',
+		'dribbble'   => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12,22C6.486,22,2,17.514,2,12S6.486,2,12,2c5.514,0,10,4.486,10,10S17.514,22,12,22z M20.434,13.369 c-0.292-0.092-2.644-0.794-5.32-0.365c1.117,3.07,1.572,5.57,1.659,6.09C18.689,17.798,20.053,15.745,20.434,13.369z M15.336,19.876c-0.127-0.749-0.623-3.361-1.822-6.477c-0.019,0.006-0.038,0.013-0.056,0.019c-4.818,1.679-6.547,5.02-6.701,5.334 c1.448,1.129,3.268,1.803,5.243,1.803C13.183,20.555,14.311,20.313,15.336,19.876z M5.654,17.724 c0.193-0.331,2.538-4.213,6.943-5.637c0.111-0.036,0.224-0.07,0.337-0.102c-0.214-0.485-0.448-0.971-0.692-1.45 c-4.266,1.277-8.405,1.223-8.778,1.216c-0.003,0.087-0.004,0.174-0.004,0.261C3.458,14.207,4.29,16.21,5.654,17.724z M3.639,10.264 c0.382,0.005,3.901,0.02,7.897-1.041c-1.415-2.516-2.942-4.631-3.167-4.94C5.979,5.41,4.193,7.613,3.639,10.264z M9.998,3.709 c0.236,0.316,1.787,2.429,3.187,5c3.037-1.138,4.323-2.867,4.477-3.085C16.154,4.286,14.17,3.471,12,3.471 C11.311,3.471,10.641,3.554,9.998,3.709z M18.612,6.612C18.432,6.855,17,8.69,13.842,9.979c0.199,0.407,0.389,0.821,0.567,1.237 c0.063,0.148,0.124,0.295,0.184,0.441c2.842-0.357,5.666,0.215,5.948,0.275C20.522,9.916,19.801,8.065,18.612,6.612z"></path></svg>',
+		'dropbox'    => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12,6.134L6.069,9.797L2,6.54l5.883-3.843L12,6.134z M2,13.054l5.883,3.843L12,13.459L6.069,9.797L2,13.054z M12,13.459 l4.116,3.439L22,13.054l-4.069-3.257L12,13.459z M22,6.54l-5.884-3.843L12,6.134l5.931,3.663L22,6.54z M12.011,14.2l-4.129,3.426 l-1.767-1.153v1.291l5.896,3.539l5.897-3.539v-1.291l-1.769,1.153L12.011,14.2z"></path></svg>',
+		'etsy'       => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M9.16033,4.038c0-.27174.02717-.43478.48913-.43478h6.22283c1.087,0,1.68478.92391,2.11957,2.663l.35326,1.38587h1.05978C19.59511,3.712,19.75815,2,19.75815,2s-2.663.29891-4.23913.29891h-7.962L3.29076,2.163v1.1413L4.731,3.57609c1.00543.19022,1.25.40761,1.33152,1.33152,0,0,.08152,2.71739.08152,7.20109s-.08152,7.17391-.08152,7.17391c0,.81522-.32609,1.11413-1.33152,1.30435l-1.44022.27174V22l4.2663-.13587h7.11957c1.60326,0,5.32609.13587,5.32609.13587.08152-.97826.625-5.40761.70652-5.89674H19.7038L18.644,18.52174c-.84239,1.90217-2.06522,2.038-3.42391,2.038H11.1712c-1.3587,0-2.01087-.54348-2.01087-1.712V12.65217s3.0163,0,3.99457.08152c.76087.05435,1.22283.27174,1.46739,1.33152l.32609,1.413h1.16848l-.08152-3.55978.163-3.587H15.02989l-.38043,1.57609c-.24457,1.03261-.40761,1.22283-1.46739,1.33152-1.38587.13587-4.02174.1087-4.02174.1087Z"></path></svg>',
+		'facebook'   => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12 2C6.5 2 2 6.5 2 12c0 5 3.7 9.1 8.4 9.9v-7H7.9V12h2.5V9.8c0-2.5 1.5-3.9 3.8-3.9 1.1 0 2.2.2 2.2.2v2.5h-1.3c-1.2 0-1.6.8-1.6 1.6V12h2.8l-.4 2.9h-2.3v7C18.3 21.1 22 17 22 12c0-5.5-4.5-10-10-10z"></path></svg>',
+		'feed'       => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M2,8.667V12c5.515,0,10,4.485,10,10h3.333C15.333,14.637,9.363,8.667,2,8.667z M2,2v3.333 c9.19,0,16.667,7.477,16.667,16.667H22C22,10.955,13.045,2,2,2z M4.5,17C3.118,17,2,18.12,2,19.5S3.118,22,4.5,22S7,20.88,7,19.5 S5.882,17,4.5,17z"></path></svg>',
+		'flickr'     => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M6.5,7c-2.75,0-5,2.25-5,5s2.25,5,5,5s5-2.25,5-5S9.25,7,6.5,7z M17.5,7c-2.75,0-5,2.25-5,5s2.25,5,5,5s5-2.25,5-5 S20.25,7,17.5,7z"></path></svg>',
+		'foursquare' => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M17.573,2c0,0-9.197,0-10.668,0S5,3.107,5,3.805s0,16.948,0,16.948c0,0.785,0.422,1.077,0.66,1.172 c0.238,0.097,0.892,0.177,1.285-0.275c0,0,5.035-5.843,5.122-5.93c0.132-0.132,0.132-0.132,0.262-0.132h3.26 c1.368,0,1.588-0.977,1.732-1.552c0.078-0.318,0.692-3.428,1.225-6.122l0.675-3.368C19.56,2.893,19.14,2,17.573,2z M16.495,7.22 c-0.053,0.252-0.372,0.518-0.665,0.518c-0.293,0-4.157,0-4.157,0c-0.467,0-0.802,0.318-0.802,0.787v0.508 c0,0.467,0.337,0.798,0.805,0.798c0,0,3.197,0,3.528,0s0.655,0.362,0.583,0.715c-0.072,0.353-0.407,2.102-0.448,2.295 c-0.04,0.193-0.262,0.523-0.655,0.523c-0.33,0-2.88,0-2.88,0c-0.523,0-0.683,0.068-1.033,0.503 c-0.35,0.437-3.505,4.223-3.505,4.223c-0.032,0.035-0.063,0.027-0.063-0.015V4.852c0-0.298,0.26-0.648,0.648-0.648 c0,0,8.228,0,8.562,0c0.315,0,0.61,0.297,0.528,0.683L16.495,7.22z"></path></svg>',
+		'goodreads'  => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M17.3,17.5c-0.2,0.8-0.5,1.4-1,1.9c-0.4,0.5-1,0.9-1.7,1.2C13.9,20.9,13.1,21,12,21c-0.6,0-1.3-0.1-1.9-0.2 c-0.6-0.1-1.1-0.4-1.6-0.7c-0.5-0.3-0.9-0.7-1.2-1.2c-0.3-0.5-0.5-1.1-0.5-1.7h1.5c0.1,0.5,0.2,0.9,0.5,1.2 c0.2,0.3,0.5,0.6,0.9,0.8c0.3,0.2,0.7,0.3,1.1,0.4c0.4,0.1,0.8,0.1,1.2,0.1c1.4,0,2.5-0.4,3.1-1.2c0.6-0.8,1-2,1-3.5v-1.7h0 c-0.4,0.8-0.9,1.4-1.6,1.9c-0.7,0.5-1.5,0.7-2.4,0.7c-1,0-1.9-0.2-2.6-0.5C8.7,15,8.1,14.5,7.7,14c-0.5-0.6-0.8-1.3-1-2.1 c-0.2-0.8-0.3-1.6-0.3-2.5c0-0.9,0.1-1.7,0.4-2.5c0.3-0.8,0.6-1.5,1.1-2c0.5-0.6,1.1-1,1.8-1.4C10.3,3.2,11.1,3,12,3 c0.5,0,0.9,0.1,1.3,0.2c0.4,0.1,0.8,0.3,1.1,0.5c0.3,0.2,0.6,0.5,0.9,0.8c0.3,0.3,0.5,0.6,0.6,1h0V3.4h1.5V15 C17.6,15.9,17.5,16.7,17.3,17.5z M13.8,14.1c0.5-0.3,0.9-0.7,1.3-1.1c0.3-0.5,0.6-1,0.8-1.6c0.2-0.6,0.3-1.2,0.3-1.9 c0-0.6-0.1-1.2-0.2-1.9c-0.1-0.6-0.4-1.2-0.7-1.7c-0.3-0.5-0.7-0.9-1.3-1.2c-0.5-0.3-1.1-0.5-1.9-0.5s-1.4,0.2-1.9,0.5 c-0.5,0.3-1,0.7-1.3,1.2C8.5,6.4,8.3,7,8.1,7.6C8,8.2,7.9,8.9,7.9,9.5c0,0.6,0.1,1.3,0.2,1.9C8.3,12,8.6,12.5,8.9,13 c0.3,0.5,0.8,0.8,1.3,1.1c0.5,0.3,1.1,0.4,1.9,0.4C12.7,14.5,13.3,14.4,13.8,14.1z"></path></svg>',
+		'google'     => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12.02,10.18v3.72v0.01h5.51c-0.26,1.57-1.67,4.22-5.5,4.22c-3.31,0-6.01-2.75-6.01-6.12s2.7-6.12,6.01-6.12 c1.87,0,3.13,0.8,3.85,1.48l2.84-2.76C16.99,2.99,14.73,2,12.03,2c-5.52,0-10,4.48-10,10s4.48,10,10,10c5.77,0,9.6-4.06,9.6-9.77 c0-0.83-0.11-1.42-0.25-2.05H12.02z"></path></svg>',
+		'github'     => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12,2C6.477,2,2,6.477,2,12c0,4.419,2.865,8.166,6.839,9.489c0.5,0.09,0.682-0.218,0.682-0.484 c0-0.236-0.009-0.866-0.014-1.699c-2.782,0.602-3.369-1.34-3.369-1.34c-0.455-1.157-1.11-1.465-1.11-1.465 c-0.909-0.62,0.069-0.608,0.069-0.608c1.004,0.071,1.532,1.03,1.532,1.03c0.891,1.529,2.341,1.089,2.91,0.833 c0.091-0.647,0.349-1.086,0.635-1.337c-2.22-0.251-4.555-1.111-4.555-4.943c0-1.091,0.39-1.984,1.03-2.682 C6.546,8.54,6.202,7.524,6.746,6.148c0,0,0.84-0.269,2.75,1.025C10.295,6.95,11.15,6.84,12,6.836 c0.85,0.004,1.705,0.114,2.504,0.336c1.909-1.294,2.748-1.025,2.748-1.025c0.546,1.376,0.202,2.394,0.1,2.646 c0.64,0.699,1.026,1.591,1.026,2.682c0,3.841-2.337,4.687-4.565,4.935c0.359,0.307,0.679,0.917,0.679,1.852 c0,1.335-0.012,2.415-0.012,2.741c0,0.269,0.18,0.579,0.688,0.481C19.138,20.161,22,16.416,22,12C22,6.477,17.523,2,12,2z"></path></svg>',
+		'instagram'  => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12,4.622c2.403,0,2.688,0.009,3.637,0.052c0.877,0.04,1.354,0.187,1.671,0.31c0.42,0.163,0.72,0.358,1.035,0.673 c0.315,0.315,0.51,0.615,0.673,1.035c0.123,0.317,0.27,0.794,0.31,1.671c0.043,0.949,0.052,1.234,0.052,3.637 s-0.009,2.688-0.052,3.637c-0.04,0.877-0.187,1.354-0.31,1.671c-0.163,0.42-0.358,0.72-0.673,1.035 c-0.315,0.315-0.615,0.51-1.035,0.673c-0.317,0.123-0.794,0.27-1.671,0.31c-0.949,0.043-1.233,0.052-3.637,0.052 s-2.688-0.009-3.637-0.052c-0.877-0.04-1.354-0.187-1.671-0.31c-0.42-0.163-0.72-0.358-1.035-0.673 c-0.315-0.315-0.51-0.615-0.673-1.035c-0.123-0.317-0.27-0.794-0.31-1.671C4.631,14.688,4.622,14.403,4.622,12 s0.009-2.688,0.052-3.637c0.04-0.877,0.187-1.354,0.31-1.671c0.163-0.42,0.358-0.72,0.673-1.035 c0.315-0.315,0.615-0.51,1.035-0.673c0.317-0.123,0.794-0.27,1.671-0.31C9.312,4.631,9.597,4.622,12,4.622 M12,3 C9.556,3,9.249,3.01,8.289,3.054C7.331,3.098,6.677,3.25,6.105,3.472C5.513,3.702,5.011,4.01,4.511,4.511 c-0.5,0.5-0.808,1.002-1.038,1.594C3.25,6.677,3.098,7.331,3.054,8.289C3.01,9.249,3,9.556,3,12c0,2.444,0.01,2.751,0.054,3.711 c0.044,0.958,0.196,1.612,0.418,2.185c0.23,0.592,0.538,1.094,1.038,1.594c0.5,0.5,1.002,0.808,1.594,1.038 c0.572,0.222,1.227,0.375,2.185,0.418C9.249,20.99,9.556,21,12,21s2.751-0.01,3.711-0.054c0.958-0.044,1.612-0.196,2.185-0.418 c0.592-0.23,1.094-0.538,1.594-1.038c0.5-0.5,0.808-1.002,1.038-1.594c0.222-0.572,0.375-1.227,0.418-2.185 C20.99,14.751,21,14.444,21,12s-0.01-2.751-0.054-3.711c-0.044-0.958-0.196-1.612-0.418-2.185c-0.23-0.592-0.538-1.094-1.038-1.594 c-0.5-0.5-1.002-0.808-1.594-1.038c-0.572-0.222-1.227-0.375-2.185-0.418C14.751,3.01,14.444,3,12,3L12,3z M12,7.378 c-2.552,0-4.622,2.069-4.622,4.622S9.448,16.622,12,16.622s4.622-2.069,4.622-4.622S14.552,7.378,12,7.378z M12,15 c-1.657,0-3-1.343-3-3s1.343-3,3-3s3,1.343,3,3S13.657,15,12,15z M16.804,6.116c-0.596,0-1.08,0.484-1.08,1.08 s0.484,1.08,1.08,1.08c0.596,0,1.08-0.484,1.08-1.08S17.401,6.116,16.804,6.116z"></path></svg>',
+		'lastfm'     => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M10.5002,0 C4.7006,0 0,4.70109753 0,10.4998496 C0,16.2989526 4.7006,21 10.5002,21 C16.299,21 21,16.2989526 21,10.4998496 C21,4.70109753 16.299,0 10.5002,0 Z M14.69735,14.7204413 C13.3164,14.7151781 12.4346,14.0870017 11.83445,12.6859357 L11.6816001,12.3451305 L10.35405,9.31011397 C9.92709997,8.26875064 8.85260001,7.57120012 7.68010001,7.57120012 C6.06945001,7.57120012 4.75925001,8.88509738 4.75925001,10.5009524 C4.75925001,12.1164565 6.06945001,13.4303036 7.68010001,13.4303036 C8.77200001,13.4303036 9.76514999,12.827541 10.2719501,11.8567047 C10.2893,11.8235214 10.3239,11.8019673 10.36305,11.8038219 C10.4007,11.8053759 10.43535,11.8287847 10.4504,11.8631709 L10.98655,13.1045863 C11.0016,13.1389726 10.9956,13.17782 10.97225,13.2068931 C10.1605001,14.1995341 8.96020001,14.7683115 7.68010001,14.7683115 C5.33305,14.7683115 3.42340001,12.8535563 3.42340001,10.5009524 C3.42340001,8.14679459 5.33300001,6.23203946 7.68010001,6.23203946 C9.45720002,6.23203946 10.8909,7.19074535 11.6138,8.86359341 C11.6205501,8.88018505 12.3412,10.5707777 12.97445,12.0190621 C13.34865,12.8739575 13.64615,13.3959676 14.6288,13.4291508 C15.5663001,13.4612814 16.25375,12.9121534 16.25375,12.1484869 C16.25375,11.4691321 15.8320501,11.3003585 14.8803,10.98216 C13.2365,10.4397989 12.34495,9.88605929 12.34495,8.51817658 C12.34495,7.1809207 13.26665,6.31615054 14.692,6.31615054 C15.62875,6.31615054 16.3155,6.7286858 16.79215,7.5768142 C16.80495,7.60062396 16.8079001,7.62814302 16.8004001,7.65420843 C16.7929,7.68027384 16.7748,7.70212868 16.7507001,7.713808 L15.86145,8.16900031 C15.8178001,8.19200805 15.7643,8.17807308 15.73565,8.13847371 C15.43295,7.71345711 15.0956,7.52513451 14.6423,7.52513451 C14.05125,7.52513451 13.6220001,7.92899802 13.6220001,8.48649708 C13.6220001,9.17382194 14.1529001,9.34144259 15.0339,9.61923972 C15.14915,9.65578139 15.26955,9.69397731 15.39385,9.73432853 C16.7763,10.1865133 17.57675,10.7311301 17.57675,12.1836251 C17.57685,13.629654 16.3389,14.7204413 14.69735,14.7204413 Z"></path></svg>',
+		'linkedin'   => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M19.7,3H4.3C3.582,3,3,3.582,3,4.3v15.4C3,20.418,3.582,21,4.3,21h15.4c0.718,0,1.3-0.582,1.3-1.3V4.3 C21,3.582,20.418,3,19.7,3z M8.339,18.338H5.667v-8.59h2.672V18.338z M7.004,8.574c-0.857,0-1.549-0.694-1.549-1.548 c0-0.855,0.691-1.548,1.549-1.548c0.854,0,1.547,0.694,1.547,1.548C8.551,7.881,7.858,8.574,7.004,8.574z M18.339,18.338h-2.669 v-4.177c0-0.996-0.017-2.278-1.387-2.278c-1.389,0-1.601,1.086-1.601,2.206v4.249h-2.667v-8.59h2.559v1.174h0.037 c0.356-0.675,1.227-1.387,2.526-1.387c2.703,0,3.203,1.779,3.203,4.092V18.338z"></path></svg>',
+		'mail'       => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M20,4H4C2.895,4,2,4.895,2,6v12c0,1.105,0.895,2,2,2h16c1.105,0,2-0.895,2-2V6C22,4.895,21.105,4,20,4z M20,8.236l-8,4.882 L4,8.236V6h16V8.236z"></path></svg>',
+		'mastodon'   => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M23.193 7.879c0-5.206-3.411-6.732-3.411-6.732C18.062.357 15.108.025 12.041 0h-.076c-3.068.025-6.02.357-7.74 1.147 0 0-3.411 1.526-3.411 6.732 0 1.192-.023 2.618.015 4.129.124 5.092.934 10.109 5.641 11.355 2.17.574 4.034.695 5.535.612 2.722-.15 4.25-.972 4.25-.972l-.09-1.975s-1.945.613-4.129.539c-2.165-.074-4.449-.233-4.799-2.891a5.499 5.499 0 0 1-.048-.745s2.125.52 4.817.643c1.646.075 3.19-.097 4.758-.283 3.007-.359 5.625-2.212 5.954-3.905.517-2.665.475-6.507.475-6.507zm-4.024 6.709h-2.497V8.469c0-1.29-.543-1.944-1.628-1.944-1.2 0-1.802.776-1.802 2.312v3.349h-2.483v-3.35c0-1.536-.602-2.312-1.802-2.312-1.085 0-1.628.655-1.628 1.944v6.119H4.832V8.284c0-1.289.328-2.313.987-3.07.68-.758 1.569-1.146 2.674-1.146 1.278 0 2.246.491 2.886 1.474L12 6.585l.622-1.043c.64-.983 1.608-1.474 2.886-1.474 1.104 0 1.994.388 2.674 1.146.658.757.986 1.781.986 3.07v6.304z"/></svg>',
+		'medium'     => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M20.962,7.257l-5.457,8.867l-3.923-6.375l3.126-5.08c0.112-0.182,0.319-0.286,0.527-0.286c0.05,0,0.1,0.008,0.149,0.02 c0.039,0.01,0.078,0.023,0.114,0.041l5.43,2.715l0.006,0.003c0.004,0.002,0.007,0.006,0.011,0.008 C20.971,7.191,20.98,7.227,20.962,7.257z M9.86,8.592v5.783l5.14,2.57L9.86,8.592z M15.772,17.331l4.231,2.115 C20.554,19.721,21,19.529,21,19.016V8.835L15.772,17.331z M8.968,7.178L3.665,4.527C3.569,4.479,3.478,4.456,3.395,4.456 C3.163,4.456,3,4.636,3,4.938v11.45c0,0.306,0.224,0.669,0.498,0.806l4.671,2.335c0.12,0.06,0.234,0.088,0.337,0.088 c0.29,0,0.494-0.225,0.494-0.602V7.231C9,7.208,8.988,7.188,8.968,7.178z"></path></svg>',
+		'meetup'     => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M19.24775,14.722a3.57032,3.57032,0,0,1-2.94457,3.52073,3.61886,3.61886,0,0,1-.64652.05634c-.07314-.0008-.10187.02846-.12507.09547A2.38881,2.38881,0,0,1,13.49453,20.094a2.33092,2.33092,0,0,1-1.827-.50716.13635.13635,0,0,0-.19878-.00408,3.191,3.191,0,0,1-2.104.60248,3.26309,3.26309,0,0,1-3.00324-2.71993,2.19076,2.19076,0,0,1-.03512-.30865c-.00156-.08579-.03413-.1189-.11608-.13493a2.86421,2.86421,0,0,1-1.23189-.56111,2.945,2.945,0,0,1-1.166-2.05749,2.97484,2.97484,0,0,1,.87524-2.50774.112.112,0,0,0,.02091-.16107,2.7213,2.7213,0,0,1-.36648-1.48A2.81256,2.81256,0,0,1,6.57673,7.58838a.35764.35764,0,0,0,.28869-.22819,4.2208,4.2208,0,0,1,6.02892-1.90111.25161.25161,0,0,0,.22023.0243,3.65608,3.65608,0,0,1,3.76031.90678A3.57244,3.57244,0,0,1,17.95918,8.626a2.97339,2.97339,0,0,1,.01829.57356.10637.10637,0,0,0,.0853.12792,1.97669,1.97669,0,0,1,1.27939,1.33733,2.00266,2.00266,0,0,1-.57112,2.12652c-.05284.05166-.04168.08328-.01173.13489A3.51189,3.51189,0,0,1,19.24775,14.722Zm-6.35959-.27836a1.6984,1.6984,0,0,0,1.14556,1.61113,3.82039,3.82039,0,0,0,1.036.17935,1.46888,1.46888,0,0,0,.73509-.12255.44082.44082,0,0,0,.26057-.44274.45312.45312,0,0,0-.29211-.43375.97191.97191,0,0,0-.20678-.063c-.21326-.03806-.42754-.0701-.63973-.11215a.54787.54787,0,0,1-.50172-.60926,2.75864,2.75864,0,0,1,.1773-.901c.1763-.535.414-1.045.64183-1.55913A12.686,12.686,0,0,0,15.85,10.47863a1.58461,1.58461,0,0,0,.04861-.87208,1.04531,1.04531,0,0,0-.85432-.83981,1.60658,1.60658,0,0,0-1.23654.16594.27593.27593,0,0,1-.36286-.03413c-.085-.0747-.16594-.15379-.24918-.23055a.98682.98682,0,0,0-1.33577-.04933,6.1468,6.1468,0,0,1-.4989.41615.47762.47762,0,0,1-.51535.03566c-.17448-.09307-.35512-.175-.53531-.25665a1.74949,1.74949,0,0,0-.56476-.2016,1.69943,1.69943,0,0,0-1.61654.91787,8.05815,8.05815,0,0,0-.32952.80126c-.45471,1.2557-.82507,2.53825-1.20838,3.81639a1.24151,1.24151,0,0,0,.51532,1.44389,1.42659,1.42659,0,0,0,1.22008.17166,1.09728,1.09728,0,0,0,.66994-.69764c.44145-1.04111.839-2.09989,1.25981-3.14926.11581-.28876.22792-.57874.35078-.86438a.44548.44548,0,0,1,.69189-.19539.50521.50521,0,0,1,.15044.43836,1.75625,1.75625,0,0,1-.14731.50453c-.27379.69219-.55265,1.38236-.82766,2.074a2.0836,2.0836,0,0,0-.14038.42876.50719.50719,0,0,0,.27082.57722.87236.87236,0,0,0,.66145.02739.99137.99137,0,0,0,.53406-.532q.61571-1.20914,1.228-2.42031.28423-.55863.57585-1.1133a.87189.87189,0,0,1,.29055-.35253.34987.34987,0,0,1,.37634-.01265.30291.30291,0,0,1,.12434.31459.56716.56716,0,0,1-.04655.1915c-.05318.12739-.10286.25669-.16183.38156-.34118.71775-.68754,1.43273-1.02568,2.152A2.00213,2.00213,0,0,0,12.88816,14.44366Zm4.78568,5.28972a.88573.88573,0,0,0-1.77139.00465.8857.8857,0,0,0,1.77139-.00465Zm-14.83838-7.296a.84329.84329,0,1,0,.00827-1.68655.8433.8433,0,0,0-.00827,1.68655Zm10.366-9.43673a.83506.83506,0,1,0-.0091,1.67.83505.83505,0,0,0,.0091-1.67Zm6.85014,5.22a.71651.71651,0,0,0-1.433.0093.71656.71656,0,0,0,1.433-.0093ZM5.37528,6.17908A.63823.63823,0,1,0,6.015,5.54483.62292.62292,0,0,0,5.37528,6.17908Zm6.68214,14.80843a.54949.54949,0,1,0-.55052.541A.54556.54556,0,0,0,12.05742,20.98752Zm8.53235-8.49689a.54777.54777,0,0,0-.54027.54023.53327.53327,0,0,0,.532.52293.51548.51548,0,0,0,.53272-.5237A.53187.53187,0,0,0,20.58977,12.49063ZM7.82846,2.4715a.44927.44927,0,1,0,.44484.44766A.43821.43821,0,0,0,7.82846,2.4715Zm13.775,7.60492a.41186.41186,0,0,0-.40065.39623.40178.40178,0,0,0,.40168.40168A.38994.38994,0,0,0,22,10.48172.39946.39946,0,0,0,21.60349,10.07642ZM5.79193,17.96207a.40469.40469,0,0,0-.397-.39646.399.399,0,0,0-.396.405.39234.39234,0,0,0,.39939.389A.39857.39857,0,0,0,5.79193,17.96207Z"></path></svg>',
+		'pinterest'  => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12.289,2C6.617,2,3.606,5.648,3.606,9.622c0,1.846,1.025,4.146,2.666,4.878c0.25,0.111,0.381,0.063,0.439-0.169 c0.044-0.175,0.267-1.029,0.365-1.428c0.032-0.128,0.017-0.237-0.091-0.362C6.445,11.911,6.01,10.75,6.01,9.668 c0-2.777,2.194-5.464,5.933-5.464c3.23,0,5.49,2.108,5.49,5.122c0,3.407-1.794,5.768-4.13,5.768c-1.291,0-2.257-1.021-1.948-2.277 c0.372-1.495,1.089-3.112,1.089-4.191c0-0.967-0.542-1.775-1.663-1.775c-1.319,0-2.379,1.309-2.379,3.059 c0,1.115,0.394,1.869,0.394,1.869s-1.302,5.279-1.54,6.261c-0.405,1.666,0.053,4.368,0.094,4.604 c0.021,0.126,0.167,0.169,0.25,0.063c0.129-0.165,1.699-2.419,2.142-4.051c0.158-0.59,0.817-2.995,0.817-2.995 c0.43,0.784,1.681,1.446,3.013,1.446c3.963,0,6.822-3.494,6.822-7.833C20.394,5.112,16.849,2,12.289,2"></path></svg>',
+		'pocket'     => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M21.927,4.194C21.667,3.48,20.982,3,20.222,3h-0.01h-1.721H3.839C3.092,3,2.411,3.47,2.145,4.17 C2.066,4.378,2.026,4.594,2.026,4.814v6.035l0.069,1.2c0.29,2.73,1.707,5.115,3.899,6.778c0.039,0.03,0.079,0.059,0.119,0.089 l0.025,0.018c1.175,0.859,2.491,1.441,3.91,1.727c0.655,0.132,1.325,0.2,1.991,0.2c0.615,0,1.232-0.057,1.839-0.17 c0.073-0.014,0.145-0.028,0.219-0.044c0.02-0.004,0.042-0.012,0.064-0.023c1.359-0.297,2.621-0.864,3.753-1.691l0.025-0.018 c0.04-0.029,0.08-0.058,0.119-0.089c2.192-1.664,3.609-4.049,3.898-6.778l0.069-1.2V4.814C22.026,4.605,22,4.398,21.927,4.194z M17.692,10.481l-4.704,4.512c-0.266,0.254-0.608,0.382-0.949,0.382c-0.342,0-0.684-0.128-0.949-0.382l-4.705-4.512 C5.838,9.957,5.82,9.089,6.344,8.542c0.524-0.547,1.392-0.565,1.939-0.04l3.756,3.601l3.755-3.601 c0.547-0.524,1.415-0.506,1.939,0.04C18.256,9.089,18.238,9.956,17.692,10.481z"></path></svg>',
+		'reddit'     => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M22,11.816c0-1.256-1.021-2.277-2.277-2.277c-0.593,0-1.122,0.24-1.526,0.614c-1.481-0.965-3.455-1.594-5.647-1.69 l1.171-3.702l3.18,0.748c0.008,1.028,0.846,1.862,1.876,1.862c1.035,0,1.877-0.842,1.877-1.878c0-1.035-0.842-1.877-1.877-1.877 c-0.769,0-1.431,0.466-1.72,1.13l-3.508-0.826c-0.203-0.047-0.399,0.067-0.46,0.261l-1.35,4.268 c-2.316,0.038-4.411,0.67-5.97,1.671C5.368,9.765,4.853,9.539,4.277,9.539C3.021,9.539,2,10.56,2,11.816 c0,0.814,0.433,1.523,1.078,1.925c-0.037,0.221-0.061,0.444-0.061,0.672c0,3.292,4.011,5.97,8.941,5.97s8.941-2.678,8.941-5.97 c0-0.214-0.02-0.424-0.053-0.632C21.533,13.39,22,12.661,22,11.816z M18.776,4.394c0.606,0,1.1,0.493,1.1,1.1s-0.493,1.1-1.1,1.1 s-1.1-0.494-1.1-1.1S18.169,4.394,18.776,4.394z M2.777,11.816c0-0.827,0.672-1.5,1.499-1.5c0.313,0,0.598,0.103,0.838,0.269 c-0.851,0.676-1.477,1.479-1.812,2.36C2.983,12.672,2.777,12.27,2.777,11.816z M11.959,19.606c-4.501,0-8.164-2.329-8.164-5.193 S7.457,9.22,11.959,9.22s8.164,2.329,8.164,5.193S16.46,19.606,11.959,19.606z M20.636,13.001c-0.326-0.89-0.948-1.701-1.797-2.384 c0.248-0.186,0.55-0.301,0.883-0.301c0.827,0,1.5,0.673,1.5,1.5C21.223,12.299,20.992,12.727,20.636,13.001z M8.996,14.704 c-0.76,0-1.397-0.616-1.397-1.376c0-0.76,0.637-1.397,1.397-1.397c0.76,0,1.376,0.637,1.376,1.397 C10.372,14.088,9.756,14.704,8.996,14.704z M16.401,13.328c0,0.76-0.616,1.376-1.376,1.376c-0.76,0-1.399-0.616-1.399-1.376 c0-0.76,0.639-1.397,1.399-1.397C15.785,11.931,16.401,12.568,16.401,13.328z M15.229,16.708c0.152,0.152,0.152,0.398,0,0.55 c-0.674,0.674-1.727,1.002-3.219,1.002c-0.004,0-0.007-0.002-0.011-0.002c-0.004,0-0.007,0.002-0.011,0.002 c-1.492,0-2.544-0.328-3.218-1.002c-0.152-0.152-0.152-0.398,0-0.55c0.152-0.152,0.399-0.151,0.55,0 c0.521,0.521,1.394,0.775,2.669,0.775c0.004,0,0.007,0.002,0.011,0.002c0.004,0,0.007-0.002,0.011-0.002 c1.275,0,2.148-0.253,2.669-0.775C14.831,16.556,15.078,16.556,15.229,16.708z"></path></svg>',
+		'skype'      => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M10.113,2.699c0.033-0.006,0.067-0.013,0.1-0.02c0.033,0.017,0.066,0.033,0.098,0.051L10.113,2.699z M2.72,10.223 c-0.006,0.034-0.011,0.069-0.017,0.103c0.018,0.032,0.033,0.064,0.051,0.095L2.72,10.223z M21.275,13.771 c0.007-0.035,0.011-0.071,0.018-0.106c-0.018-0.031-0.033-0.064-0.052-0.095L21.275,13.771z M13.563,21.199 c0.032,0.019,0.065,0.035,0.096,0.053c0.036-0.006,0.071-0.011,0.105-0.017L13.563,21.199z M22,16.386 c0,1.494-0.581,2.898-1.637,3.953c-1.056,1.057-2.459,1.637-3.953,1.637c-0.967,0-1.914-0.251-2.75-0.725 c0.036-0.006,0.071-0.011,0.105-0.017l-0.202-0.035c0.032,0.019,0.065,0.035,0.096,0.053c-0.543,0.096-1.099,0.147-1.654,0.147 c-1.275,0-2.512-0.25-3.676-0.743c-1.125-0.474-2.135-1.156-3.002-2.023c-0.867-0.867-1.548-1.877-2.023-3.002 c-0.493-1.164-0.743-2.401-0.743-3.676c0-0.546,0.049-1.093,0.142-1.628c0.018,0.032,0.033,0.064,0.051,0.095L2.72,10.223 c-0.006,0.034-0.011,0.069-0.017,0.103C2.244,9.5,2,8.566,2,7.615c0-1.493,0.582-2.898,1.637-3.953 c1.056-1.056,2.46-1.638,3.953-1.638c0.915,0,1.818,0.228,2.622,0.655c-0.033,0.007-0.067,0.013-0.1,0.02l0.199,0.031 c-0.032-0.018-0.066-0.034-0.098-0.051c0.002,0,0.003-0.001,0.004-0.001c0.586-0.112,1.187-0.169,1.788-0.169 c1.275,0,2.512,0.249,3.676,0.742c1.124,0.476,2.135,1.156,3.002,2.024c0.868,0.867,1.548,1.877,2.024,3.002 c0.493,1.164,0.743,2.401,0.743,3.676c0,0.575-0.054,1.15-0.157,1.712c-0.018-0.031-0.033-0.064-0.052-0.095l0.034,0.201 c0.007-0.035,0.011-0.071,0.018-0.106C21.754,14.494,22,15.432,22,16.386z M16.817,14.138c0-1.331-0.613-2.743-3.033-3.282 l-2.209-0.49c-0.84-0.192-1.807-0.444-1.807-1.237c0-0.794,0.679-1.348,1.903-1.348c2.468,0,2.243,1.696,3.468,1.696 c0.645,0,1.209-0.379,1.209-1.031c0-1.521-2.435-2.663-4.5-2.663c-2.242,0-4.63,0.952-4.63,3.488c0,1.221,0.436,2.521,2.839,3.123 l2.984,0.745c0.903,0.223,1.129,0.731,1.129,1.189c0,0.762-0.758,1.507-2.129,1.507c-2.679,0-2.307-2.062-3.743-2.062 c-0.645,0-1.113,0.444-1.113,1.078c0,1.236,1.501,2.886,4.856,2.886C15.236,17.737,16.817,16.199,16.817,14.138z"></path></svg>',
+		'snapchat'   => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12.065,2a5.526,5.526,0,0,1,3.132.892A5.854,5.854,0,0,1,17.326,5.4a5.821,5.821,0,0,1,.351,2.33q0,.612-.117,2.487a.809.809,0,0,0,.365.091,1.93,1.93,0,0,0,.664-.176,1.93,1.93,0,0,1,.664-.176,1.3,1.3,0,0,1,.729.234.7.7,0,0,1,.351.6.839.839,0,0,1-.41.7,2.732,2.732,0,0,1-.9.41,3.192,3.192,0,0,0-.9.378.728.728,0,0,0-.41.618,1.575,1.575,0,0,0,.156.56,6.9,6.9,0,0,0,1.334,1.953,5.6,5.6,0,0,0,1.881,1.315,5.875,5.875,0,0,0,1.042.3.42.42,0,0,1,.365.456q0,.911-2.852,1.341a1.379,1.379,0,0,0-.143.507,1.8,1.8,0,0,1-.182.605.451.451,0,0,1-.429.241,5.878,5.878,0,0,1-.807-.085,5.917,5.917,0,0,0-.833-.085,4.217,4.217,0,0,0-.807.065,2.42,2.42,0,0,0-.82.293,6.682,6.682,0,0,0-.755.5q-.351.267-.755.527a3.886,3.886,0,0,1-.989.436A4.471,4.471,0,0,1,11.831,22a4.307,4.307,0,0,1-1.256-.176,3.784,3.784,0,0,1-.976-.436q-.4-.26-.749-.527a6.682,6.682,0,0,0-.755-.5,2.422,2.422,0,0,0-.807-.293,4.432,4.432,0,0,0-.82-.065,5.089,5.089,0,0,0-.853.1,5,5,0,0,1-.762.1.474.474,0,0,1-.456-.241,1.819,1.819,0,0,1-.182-.618,1.411,1.411,0,0,0-.143-.521q-2.852-.429-2.852-1.341a.42.42,0,0,1,.365-.456,5.793,5.793,0,0,0,1.042-.3,5.524,5.524,0,0,0,1.881-1.315,6.789,6.789,0,0,0,1.334-1.953A1.575,1.575,0,0,0,6,12.9a.728.728,0,0,0-.41-.618,3.323,3.323,0,0,0-.9-.384,2.912,2.912,0,0,1-.9-.41.814.814,0,0,1-.41-.684.71.71,0,0,1,.338-.593,1.208,1.208,0,0,1,.716-.241,1.976,1.976,0,0,1,.625.169,2.008,2.008,0,0,0,.69.169.919.919,0,0,0,.416-.091q-.117-1.849-.117-2.474A5.861,5.861,0,0,1,6.385,5.4,5.516,5.516,0,0,1,8.625,2.819,7.075,7.075,0,0,1,12.062,2Z"></path></svg>',
+		'soundcloud' => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M8.9,16.1L9,14L8.9,9.5c0-0.1,0-0.1-0.1-0.1c0,0-0.1-0.1-0.1-0.1c-0.1,0-0.1,0-0.1,0.1c0,0-0.1,0.1-0.1,0.1L8.3,14l0.1,2.1 c0,0.1,0,0.1,0.1,0.1c0,0,0.1,0.1,0.1,0.1C8.8,16.3,8.9,16.3,8.9,16.1z M11.4,15.9l0.1-1.8L11.4,9c0-0.1,0-0.2-0.1-0.2 c0,0-0.1,0-0.1,0s-0.1,0-0.1,0c-0.1,0-0.1,0.1-0.1,0.2l0,0.1l-0.1,5c0,0,0,0.7,0.1,2v0c0,0.1,0,0.1,0.1,0.1c0.1,0.1,0.1,0.1,0.2,0.1 c0.1,0,0.1,0,0.2-0.1c0.1,0,0.1-0.1,0.1-0.2L11.4,15.9z M2.4,12.9L2.5,14l-0.2,1.1c0,0.1,0,0.1-0.1,0.1c0,0-0.1,0-0.1-0.1L2.1,14 l0.1-1.1C2.2,12.9,2.3,12.9,2.4,12.9C2.3,12.9,2.4,12.9,2.4,12.9z M3.1,12.2L3.3,14l-0.2,1.8c0,0.1,0,0.1-0.1,0.1 c-0.1,0-0.1,0-0.1-0.1L2.8,14L3,12.2C3,12.2,3,12.2,3.1,12.2C3.1,12.2,3.1,12.2,3.1,12.2z M3.9,11.9L4.1,14l-0.2,2.1 c0,0.1,0,0.1-0.1,0.1c-0.1,0-0.1,0-0.1-0.1L3.5,14l0.2-2.1c0-0.1,0-0.1,0.1-0.1C3.9,11.8,3.9,11.8,3.9,11.9z M4.7,11.9L4.9,14 l-0.2,2.1c0,0.1-0.1,0.1-0.1,0.1c-0.1,0-0.1,0-0.1-0.1L4.3,14l0.2-2.2c0-0.1,0-0.1,0.1-0.1C4.7,11.7,4.7,11.8,4.7,11.9z M5.6,12 l0.2,2l-0.2,2.1c0,0.1-0.1,0.1-0.1,0.1c0,0-0.1,0-0.1,0c0,0,0-0.1,0-0.1L5.1,14l0.2-2c0,0,0-0.1,0-0.1s0.1,0,0.1,0 C5.5,11.9,5.5,11.9,5.6,12L5.6,12z M6.4,10.7L6.6,14l-0.2,2.1c0,0,0,0.1,0,0.1c0,0-0.1,0-0.1,0c-0.1,0-0.1-0.1-0.2-0.2L5.9,14 l0.2-3.3c0-0.1,0.1-0.2,0.2-0.2c0,0,0.1,0,0.1,0C6.4,10.7,6.4,10.7,6.4,10.7z M7.2,10l0.2,4.1l-0.2,2.1c0,0,0,0.1,0,0.1 c0,0-0.1,0-0.1,0c-0.1,0-0.2-0.1-0.2-0.2l-0.1-2.1L6.8,10c0-0.1,0.1-0.2,0.2-0.2c0,0,0.1,0,0.1,0S7.2,9.9,7.2,10z M8,9.6L8.2,14 L8,16.1c0,0.1-0.1,0.2-0.2,0.2c-0.1,0-0.2-0.1-0.2-0.2L7.5,14l0.1-4.4c0-0.1,0-0.1,0.1-0.1c0,0,0.1-0.1,0.1-0.1c0.1,0,0.1,0,0.1,0.1 C8,9.6,8,9.6,8,9.6z M11.4,16.1L11.4,16.1L11.4,16.1z M9.7,9.6L9.8,14l-0.1,2.1c0,0.1,0,0.1-0.1,0.2s-0.1,0.1-0.2,0.1 c-0.1,0-0.1,0-0.1-0.1s-0.1-0.1-0.1-0.2L9.2,14l0.1-4.4c0-0.1,0-0.1,0.1-0.2s0.1-0.1,0.2-0.1c0.1,0,0.1,0,0.2,0.1S9.7,9.5,9.7,9.6 L9.7,9.6z M10.6,9.8l0.1,4.3l-0.1,2c0,0.1,0,0.1-0.1,0.2c0,0-0.1,0.1-0.2,0.1c-0.1,0-0.1,0-0.2-0.1c0,0-0.1-0.1-0.1-0.2L10,14 l0.1-4.3c0-0.1,0-0.1,0.1-0.2c0,0,0.1-0.1,0.2-0.1c0.1,0,0.1,0,0.2,0.1S10.6,9.7,10.6,9.8z M12.4,14l-0.1,2c0,0.1,0,0.1-0.1,0.2 c-0.1,0.1-0.1,0.1-0.2,0.1c-0.1,0-0.1,0-0.2-0.1c-0.1-0.1-0.1-0.1-0.1-0.2l-0.1-1l-0.1-1l0.1-5.5v0c0-0.1,0-0.2,0.1-0.2 c0.1,0,0.1-0.1,0.2-0.1c0,0,0.1,0,0.1,0c0.1,0,0.1,0.1,0.1,0.2L12.4,14z M22.1,13.9c0,0.7-0.2,1.3-0.7,1.7c-0.5,0.5-1.1,0.7-1.7,0.7 h-6.8c-0.1,0-0.1,0-0.2-0.1c-0.1-0.1-0.1-0.1-0.1-0.2V8.2c0-0.1,0.1-0.2,0.2-0.3c0.5-0.2,1-0.3,1.6-0.3c1.1,0,2.1,0.4,2.9,1.1 c0.8,0.8,1.3,1.7,1.4,2.8c0.3-0.1,0.6-0.2,1-0.2c0.7,0,1.3,0.2,1.7,0.7C21.8,12.6,22.1,13.2,22.1,13.9L22.1,13.9z"></path></svg>',
+		'spotify'    => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10c5.523,0,10-4.477,10-10C22,6.477,17.523,2,12,2 M16.586,16.424 c-0.18,0.295-0.563,0.387-0.857,0.207c-2.348-1.435-5.304-1.76-8.785-0.964c-0.335,0.077-0.67-0.133-0.746-0.469 c-0.077-0.335,0.132-0.67,0.469-0.746c3.809-0.871,7.077-0.496,9.713,1.115C16.673,15.746,16.766,16.13,16.586,16.424 M17.81,13.7 c-0.226,0.367-0.706,0.482-1.072,0.257c-2.687-1.652-6.785-2.131-9.965-1.166C6.36,12.917,5.925,12.684,5.8,12.273 C5.675,11.86,5.908,11.425,6.32,11.3c3.632-1.102,8.147-0.568,11.234,1.328C17.92,12.854,18.035,13.335,17.81,13.7 M17.915,10.865 c-3.223-1.914-8.54-2.09-11.618-1.156C5.804,9.859,5.281,9.58,5.131,9.086C4.982,8.591,5.26,8.069,5.755,7.919 c3.532-1.072,9.404-0.865,13.115,1.338c0.445,0.264,0.59,0.838,0.327,1.282C18.933,10.983,18.359,11.129,17.915,10.865"></path></svg>',
+		'tumblr'     => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M16.749,17.396c-0.357,0.17-1.041,0.319-1.551,0.332c-1.539,0.041-1.837-1.081-1.85-1.896V9.847h3.861V6.937h-3.847V2.039 c0,0-2.77,0-2.817,0c-0.046,0-0.127,0.041-0.138,0.144c-0.165,1.499-0.867,4.13-3.783,5.181v2.484h1.945v6.282 c0,2.151,1.587,5.206,5.775,5.135c1.413-0.024,2.982-0.616,3.329-1.126L16.749,17.396z"></path></svg>',
+		'twitch'     => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M16.499,8.089h-1.636v4.91h1.636V8.089z M12,8.089h-1.637v4.91H12V8.089z M4.228,3.178L3,6.451v13.092h4.499V22h2.456 l2.454-2.456h3.681L21,14.636V3.178H4.228z M19.364,13.816l-2.864,2.865H12l-2.453,2.453V16.68H5.863V4.814h13.501V13.816z"></path></svg>',
+		'twitter'    => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M22.23,5.924c-0.736,0.326-1.527,0.547-2.357,0.646c0.847-0.508,1.498-1.312,1.804-2.27 c-0.793,0.47-1.671,0.812-2.606,0.996C18.324,4.498,17.257,4,16.077,4c-2.266,0-4.103,1.837-4.103,4.103 c0,0.322,0.036,0.635,0.106,0.935C8.67,8.867,5.647,7.234,3.623,4.751C3.27,5.357,3.067,6.062,3.067,6.814 c0,1.424,0.724,2.679,1.825,3.415c-0.673-0.021-1.305-0.206-1.859-0.513c0,0.017,0,0.034,0,0.052c0,1.988,1.414,3.647,3.292,4.023 c-0.344,0.094-0.707,0.144-1.081,0.144c-0.264,0-0.521-0.026-0.772-0.074c0.522,1.63,2.038,2.816,3.833,2.85 c-1.404,1.1-3.174,1.756-5.096,1.756c-0.331,0-0.658-0.019-0.979-0.057c1.816,1.164,3.973,1.843,6.29,1.843 c7.547,0,11.675-6.252,11.675-11.675c0-0.178-0.004-0.355-0.012-0.531C20.985,7.47,21.68,6.747,22.23,5.924z"></path></svg>',
+		'vimeo'      => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M22.396,7.164c-0.093,2.026-1.507,4.799-4.245,8.32C15.322,19.161,12.928,21,10.97,21c-1.214,0-2.24-1.119-3.079-3.359 c-0.56-2.053-1.119-4.106-1.68-6.159C5.588,9.243,4.921,8.122,4.206,8.122c-0.156,0-0.701,0.328-1.634,0.98L1.594,7.841 c1.027-0.902,2.04-1.805,3.037-2.708C6.001,3.95,7.03,3.327,7.715,3.264c1.619-0.156,2.616,0.951,2.99,3.321 c0.404,2.557,0.685,4.147,0.841,4.769c0.467,2.121,0.981,3.181,1.542,3.181c0.435,0,1.09-0.688,1.963-2.065 c0.871-1.376,1.338-2.422,1.401-3.142c0.125-1.187-0.343-1.782-1.401-1.782c-0.498,0-1.012,0.115-1.541,0.341 c1.023-3.35,2.977-4.977,5.862-4.884C21.511,3.066,22.52,4.453,22.396,7.164z"></path></svg>',
+		'vk'         => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M22,7.1c0.2,0.4-0.4,1.5-1.6,3.1c-0.2,0.2-0.4,0.5-0.7,0.9c-0.5,0.7-0.9,1.1-0.9,1.4c-0.1,0.3-0.1,0.6,0.1,0.8 c0.1,0.1,0.4,0.4,0.8,0.9h0l0,0c1,0.9,1.6,1.7,2,2.3c0,0,0,0.1,0.1,0.1c0,0.1,0,0.1,0.1,0.3c0,0.1,0,0.2,0,0.4 c0,0.1-0.1,0.2-0.3,0.3c-0.1,0.1-0.4,0.1-0.6,0.1l-2.7,0c-0.2,0-0.4,0-0.6-0.1c-0.2-0.1-0.4-0.1-0.5-0.2l-0.2-0.1 c-0.2-0.1-0.5-0.4-0.7-0.7s-0.5-0.6-0.7-0.8c-0.2-0.2-0.4-0.4-0.6-0.6C14.8,15,14.6,15,14.4,15c0,0,0,0-0.1,0c0,0-0.1,0.1-0.2,0.2 c-0.1,0.1-0.2,0.2-0.2,0.3c-0.1,0.1-0.1,0.3-0.2,0.5c-0.1,0.2-0.1,0.5-0.1,0.8c0,0.1,0,0.2,0,0.3c0,0.1-0.1,0.2-0.1,0.2l0,0.1 c-0.1,0.1-0.3,0.2-0.6,0.2h-1.2c-0.5,0-1,0-1.5-0.2c-0.5-0.1-1-0.3-1.4-0.6s-0.7-0.5-1.1-0.7s-0.6-0.4-0.7-0.6l-0.3-0.3 c-0.1-0.1-0.2-0.2-0.3-0.3s-0.4-0.5-0.7-0.9s-0.7-1-1.1-1.6c-0.4-0.6-0.8-1.3-1.3-2.2C2.9,9.4,2.5,8.5,2.1,7.5C2,7.4,2,7.3,2,7.2 c0-0.1,0-0.1,0-0.2l0-0.1c0.1-0.1,0.3-0.2,0.6-0.2l2.9,0c0.1,0,0.2,0,0.2,0.1S5.9,6.9,5.9,7L6,7c0.1,0.1,0.2,0.2,0.3,0.3 C6.4,7.7,6.5,8,6.7,8.4C6.9,8.8,7,9,7.1,9.2l0.2,0.3c0.2,0.4,0.4,0.8,0.6,1.1c0.2,0.3,0.4,0.5,0.5,0.7s0.3,0.3,0.4,0.4 c0.1,0.1,0.3,0.1,0.4,0.1c0.1,0,0.2,0,0.3-0.1c0,0,0,0,0.1-0.1c0,0,0.1-0.1,0.1-0.2c0.1-0.1,0.1-0.3,0.1-0.5c0-0.2,0.1-0.5,0.1-0.8 c0-0.4,0-0.8,0-1.3c0-0.3,0-0.5-0.1-0.8c0-0.2-0.1-0.4-0.1-0.5L9.6,7.6C9.4,7.3,9.1,7.2,8.7,7.1C8.6,7.1,8.6,7,8.7,6.9 C8.9,6.7,9,6.6,9.1,6.5c0.4-0.2,1.2-0.3,2.5-0.3c0.6,0,1,0.1,1.4,0.1c0.1,0,0.3,0.1,0.3,0.1c0.1,0.1,0.2,0.1,0.2,0.3 c0,0.1,0.1,0.2,0.1,0.3s0,0.3,0,0.5c0,0.2,0,0.4,0,0.6c0,0.2,0,0.4,0,0.7c0,0.3,0,0.6,0,0.9c0,0.1,0,0.2,0,0.4c0,0.2,0,0.4,0,0.5 c0,0.1,0,0.3,0,0.4s0.1,0.3,0.1,0.4c0.1,0.1,0.1,0.2,0.2,0.3c0.1,0,0.1,0,0.2,0c0.1,0,0.2,0,0.3-0.1c0.1-0.1,0.2-0.2,0.4-0.4 s0.3-0.4,0.5-0.7c0.2-0.3,0.5-0.7,0.7-1.1c0.4-0.7,0.8-1.5,1.1-2.3c0-0.1,0.1-0.1,0.1-0.2c0-0.1,0.1-0.1,0.1-0.1l0,0l0.1,0 c0,0,0,0,0.1,0s0.2,0,0.2,0l3,0c0.3,0,0.5,0,0.7,0S21.9,7,21.9,7L22,7.1z"></path></svg>',
+		'wordpress'  => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12.158,12.786L9.46,20.625c0.806,0.237,1.657,0.366,2.54,0.366c1.047,0,2.051-0.181,2.986-0.51 c-0.024-0.038-0.046-0.079-0.065-0.124L12.158,12.786z M3.009,12c0,3.559,2.068,6.634,5.067,8.092L3.788,8.341 C3.289,9.459,3.009,10.696,3.009,12z M18.069,11.546c0-1.112-0.399-1.881-0.741-2.48c-0.456-0.741-0.883-1.368-0.883-2.109 c0-0.826,0.627-1.596,1.51-1.596c0.04,0,0.078,0.005,0.116,0.007C16.472,3.904,14.34,3.009,12,3.009 c-3.141,0-5.904,1.612-7.512,4.052c0.211,0.007,0.41,0.011,0.579,0.011c0.94,0,2.396-0.114,2.396-0.114 C7.947,6.93,8.004,7.642,7.52,7.699c0,0-0.487,0.057-1.029,0.085l3.274,9.739l1.968-5.901l-1.401-3.838 C9.848,7.756,9.389,7.699,9.389,7.699C8.904,7.67,8.961,6.93,9.446,6.958c0,0,1.484,0.114,2.368,0.114 c0.94,0,2.397-0.114,2.397-0.114c0.485-0.028,0.542,0.684,0.057,0.741c0,0-0.488,0.057-1.029,0.085l3.249,9.665l0.897-2.996 C17.841,13.284,18.069,12.316,18.069,11.546z M19.889,7.686c0.039,0.286,0.06,0.593,0.06,0.924c0,0.912-0.171,1.938-0.684,3.22 l-2.746,7.94c2.673-1.558,4.47-4.454,4.47-7.771C20.991,10.436,20.591,8.967,19.889,7.686z M12,22C6.486,22,2,17.514,2,12 C2,6.486,6.486,2,12,2c5.514,0,10,4.486,10,10C22,17.514,17.514,22,12,22z"></path></svg>',
+		'yelp'       => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12.271,16.718v1.417q-.011,3.257-.067,3.4a.707.707,0,0,1-.569.446,4.637,4.637,0,0,1-2.024-.424A4.609,4.609,0,0,1,7.8,20.565a.844.844,0,0,1-.19-.4.692.692,0,0,1,.044-.29,3.181,3.181,0,0,1,.379-.524q.335-.412,2.019-2.409.011,0,.669-.781a.757.757,0,0,1,.44-.274.965.965,0,0,1,.552.039.945.945,0,0,1,.418.324.732.732,0,0,1,.139.468Zm-1.662-2.8a.783.783,0,0,1-.58.781l-1.339.435q-3.067.981-3.257.981a.711.711,0,0,1-.6-.4,2.636,2.636,0,0,1-.19-.836,9.134,9.134,0,0,1,.011-1.857,3.559,3.559,0,0,1,.335-1.389.659.659,0,0,1,.625-.357,22.629,22.629,0,0,1,2.253.859q.781.324,1.283.524l.937.379a.771.771,0,0,1,.4.34A.982.982,0,0,1,10.609,13.917Zm9.213,3.313a4.467,4.467,0,0,1-1.021,1.8,4.559,4.559,0,0,1-1.512,1.417.671.671,0,0,1-.7-.078q-.156-.112-2.052-3.2l-.524-.859a.761.761,0,0,1-.128-.513.957.957,0,0,1,.217-.513.774.774,0,0,1,.926-.29q.011.011,1.327.446,2.264.736,2.7.887a2.082,2.082,0,0,1,.524.229.673.673,0,0,1,.245.68Zm-7.5-7.049q.056,1.137-.6,1.361-.647.19-1.272-.792L6.237,4.08a.7.7,0,0,1,.212-.691,5.788,5.788,0,0,1,2.314-1,5.928,5.928,0,0,1,2.5-.352.681.681,0,0,1,.547.5q.034.2.245,3.407T12.327,10.181Zm7.384,1.2a.679.679,0,0,1-.29.658q-.167.112-3.67.959-.747.167-1.015.257l.011-.022a.769.769,0,0,1-.513-.044.914.914,0,0,1-.413-.357.786.786,0,0,1,0-.971q.011-.011.836-1.137,1.394-1.908,1.673-2.275a2.423,2.423,0,0,1,.379-.435A.7.7,0,0,1,17.435,8a4.482,4.482,0,0,1,1.372,1.489,4.81,4.81,0,0,1,.9,1.868v.034Z"></path></svg>',
+		'youtube'    => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M21.8,8.001c0,0-0.195-1.378-0.795-1.985c-0.76-0.797-1.613-0.801-2.004-0.847c-2.799-0.202-6.997-0.202-6.997-0.202 h-0.009c0,0-4.198,0-6.997,0.202C4.608,5.216,3.756,5.22,2.995,6.016C2.395,6.623,2.2,8.001,2.2,8.001S2,9.62,2,11.238v1.517 c0,1.618,0.2,3.237,0.2,3.237s0.195,1.378,0.795,1.985c0.761,0.797,1.76,0.771,2.205,0.855c1.6,0.153,6.8,0.201,6.8,0.201 s4.203-0.006,7.001-0.209c0.391-0.047,1.243-0.051,2.004-0.847c0.6-0.607,0.795-1.985,0.795-1.985s0.2-1.618,0.2-3.237v-1.517 C22,9.62,21.8,8.001,21.8,8.001z M9.935,14.594l-0.001-5.62l5.404,2.82L9.935,14.594z"></path></svg>',
 	);
 
 	/**

From ed9f437fc098ba2c9ba18eda0fa341ecd0476ca9 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Wed, 6 Oct 2021 18:47:09 +0000
Subject: [PATCH 191/257] Apply the `pre_render_block`, `render_block_data`,
 and `render_block_context` filters when rendering inner/nested blocks.
 Introdices another param to these filters: `$parent_block` that is the
 "parent" WP_Block instance for nested blocks and null for top level blocks.
 Adds unit tests for the filters.

Props noisysocks, gaambo, azaozz.
Fixes #51612.

git-svn-id: https://develop.svn.wordpress.org/trunk@51894 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/blocks.php             | 22 ++++++++------
 src/wp-includes/class-wp-block.php     | 40 ++++++++++++++++++++++++--
 tests/phpunit/tests/blocks/wpBlock.php | 40 ++++++++++++++++++++++++++
 3 files changed, 90 insertions(+), 12 deletions(-)

diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php
index a7919090cfbeb..0ab0e7ca6af03 100644
--- a/src/wp-includes/blocks.php
+++ b/src/wp-includes/blocks.php
@@ -813,16 +813,18 @@ function _excerpt_render_inner_blocks( $parsed_block, $allowed_blocks ) {
  */
 function render_block( $parsed_block ) {
 	global $post;
+	$parent_block = null;
 
 	/**
 	 * Allows render_block() to be short-circuited, by returning a non-null value.
 	 *
 	 * @since 5.1.0
 	 *
-	 * @param string|null $pre_render   The pre-rendered content. Default null.
-	 * @param array       $parsed_block The block being rendered.
+	 * @param string|null   $pre_render   The pre-rendered content. Default null.
+	 * @param array         $parsed_block The block being rendered.
+	 * @param WP_Block|null $parent_block If this is a nested block, a reference to the parent block.
 	 */
-	$pre_render = apply_filters( 'pre_render_block', null, $parsed_block );
+	$pre_render = apply_filters( 'pre_render_block', null, $parsed_block, $parent_block );
 	if ( ! is_null( $pre_render ) ) {
 		return $pre_render;
 	}
@@ -834,10 +836,11 @@ function render_block( $parsed_block ) {
 	 *
 	 * @since 5.1.0
 	 *
-	 * @param array $parsed_block The block being rendered.
-	 * @param array $source_block An un-modified copy of $parsed_block, as it appeared in the source content.
+	 * @param array         $parsed_block The block being rendered.
+	 * @param array         $source_block An un-modified copy of $parsed_block, as it appeared in the source content.
+	 * @param WP_Block|null $parent_block If this is a nested block, a reference to the parent block.
 	 */
-	$parsed_block = apply_filters( 'render_block_data', $parsed_block, $source_block );
+	$parsed_block = apply_filters( 'render_block_data', $parsed_block, $source_block, $parent_block );
 
 	$context = array();
 
@@ -858,10 +861,11 @@ function render_block( $parsed_block ) {
 	 *
 	 * @since 5.5.0
 	 *
-	 * @param array $context      Default context.
-	 * @param array $parsed_block Block being rendered, filtered by `render_block_data`.
+	 * @param array         $context      Default context.
+	 * @param array         $parsed_block Block being rendered, filtered by `render_block_data`.
+	 * @param WP_Block|null $parent_block If this is a nested block, a reference to the parent block.
 	 */
-	$context = apply_filters( 'render_block_context', $context, $parsed_block );
+	$context = apply_filters( 'render_block_context', $context, $parsed_block, $parent_block );
 
 	$block = new WP_Block( $parsed_block, $context );
 
diff --git a/src/wp-includes/class-wp-block.php b/src/wp-includes/class-wp-block.php
index 189ce4e6152b5..ed5b0f0767404 100644
--- a/src/wp-includes/class-wp-block.php
+++ b/src/wp-includes/class-wp-block.php
@@ -57,6 +57,15 @@ class WP_Block {
 	 */
 	protected $available_context;
 
+	/**
+	 * Block type registry.
+	 *
+	 * @since 5.9.0
+	 * @var WP_Block_Type_Registry
+	 * @access protected
+	 */
+	protected $registry;
+
 	/**
 	 * List of inner blocks (of this same class)
 	 *
@@ -115,6 +124,8 @@ public function __construct( $block, $available_context = array(), $registry = n
 			$registry = WP_Block_Type_Registry::get_instance();
 		}
 
+		$this->registry = $registry;
+
 		$this->block_type = $registry->get_registered( $this->name );
 
 		$this->available_context = $available_context;
@@ -205,10 +216,33 @@ public function render( $options = array() ) {
 
 		if ( ! $options['dynamic'] || empty( $this->block_type->skip_inner_blocks ) ) {
 			$index = 0;
+
 			foreach ( $this->inner_content as $chunk ) {
-				$block_content .= is_string( $chunk ) ?
-					$chunk :
-					$this->inner_blocks[ $index++ ]->render();
+				if ( is_string( $chunk ) ) {
+					$block_content .= $chunk;
+				} else {
+					$inner_block  = $this->inner_blocks[ $index ];
+					$parent_block = $this;
+
+					/** This filter is documented in wp-includes/blocks.php */
+					$pre_render = apply_filters( 'pre_render_block', null, $inner_block->parsed_block, $parent_block );
+
+					if ( ! is_null( $pre_render ) ) {
+						$block_content .= $pre_render;
+					} else {
+						$source_block = $inner_block->parsed_block;
+
+						/** This filter is documented in wp-includes/blocks.php */
+						$inner_block->parsed_block = apply_filters( 'render_block_data', $inner_block->parsed_block, $source_block, $parent_block );
+
+						/** This filter is documented in wp-includes/blocks.php */
+						$inner_block->context = apply_filters( 'render_block_context', $inner_block->context, $inner_block->parsed_block, $parent_block );
+
+						$block_content .= $inner_block->render();
+					}
+
+					$index++;
+				}
 			}
 		}
 
diff --git a/tests/phpunit/tests/blocks/wpBlock.php b/tests/phpunit/tests/blocks/wpBlock.php
index e44a96d8b0ba7..0545babd6ab09 100644
--- a/tests/phpunit/tests/blocks/wpBlock.php
+++ b/tests/phpunit/tests/blocks/wpBlock.php
@@ -628,4 +628,44 @@ public function test_block_has_support_provided_defaults() {
 		$gradient_support = block_has_support( $block_type, array( 'color', 'gradient' ), true );
 		$this->assertFalse( $gradient_support );
 	}
+
+	/**
+	 * @ticket 51612
+	 */
+	public function test_block_filters_for_inner_blocks() {
+		$pre_render_callback           = new MockAction();
+		$render_block_data_callback    = new MockAction();
+		$render_block_context_callback = new MockAction();
+
+		$this->registry->register(
+			'core/outer',
+			array(
+				'render_callback' => function( $block_attributes, $content ) {
+					return $content;
+				},
+			)
+		);
+
+		$this->registry->register(
+			'core/inner',
+			array(
+				'render_callback' => function() {
+					return 'b';
+				},
+			)
+		);
+
+		$parsed_blocks = parse_blocks( '<!-- wp:outer -->a<!-- wp:inner /-->c<!-- /wp:outer -->' );
+		$parsed_block  = $parsed_blocks[0];
+
+		add_filter( 'pre_render_block', array( $pre_render_callback, 'filter' ) );
+		add_filter( 'render_block_data', array( $render_block_data_callback, 'filter' ) );
+		add_filter( 'render_block_context', array( $render_block_context_callback, 'filter' ) );
+
+		render_block( $parsed_block );
+
+		$this->assertSame( 2, $pre_render_callback->get_call_count() );
+		$this->assertSame( 2, $render_block_data_callback->get_call_count() );
+		$this->assertSame( 2, $render_block_context_callback->get_call_count() );
+	}
 }

From eda09eccfbb0516175826673aaf325cfed771676 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Thu, 7 Oct 2021 13:14:43 +0000
Subject: [PATCH 192/257] Docs: Add a `@since` note for the new `$parent_block`
 parameter of several filters:

* `pre_render_block`
* `render_block_data`
* `render_block_context`

Follow-up to [51894].

See #51612.

git-svn-id: https://develop.svn.wordpress.org/trunk@51895 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/blocks.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php
index 0ab0e7ca6af03..72330aa578579 100644
--- a/src/wp-includes/blocks.php
+++ b/src/wp-includes/blocks.php
@@ -819,6 +819,7 @@ function render_block( $parsed_block ) {
 	 * Allows render_block() to be short-circuited, by returning a non-null value.
 	 *
 	 * @since 5.1.0
+	 * @since 5.9.0 The `$parent_block` parameter was added.
 	 *
 	 * @param string|null   $pre_render   The pre-rendered content. Default null.
 	 * @param array         $parsed_block The block being rendered.
@@ -835,6 +836,7 @@ function render_block( $parsed_block ) {
 	 * Filters the block being rendered in render_block(), before it's processed.
 	 *
 	 * @since 5.1.0
+	 * @since 5.9.0 The `$parent_block` parameter was added.
 	 *
 	 * @param array         $parsed_block The block being rendered.
 	 * @param array         $source_block An un-modified copy of $parsed_block, as it appeared in the source content.
@@ -860,6 +862,7 @@ function render_block( $parsed_block ) {
 	 * Filters the default context provided to a rendered block.
 	 *
 	 * @since 5.5.0
+	 * @since 5.9.0 The `$parent_block` parameter was added.
 	 *
 	 * @param array         $context      Default context.
 	 * @param array         $parsed_block Block being rendered, filtered by `render_block_data`.

From 440336b73ed718363c7cc1b2b91d76c32e353edb Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Fri, 8 Oct 2021 00:36:18 +0000
Subject: [PATCH 193/257] Taxonomy: Populate the `WP_Terms_List_Table::$items`
 property in `::prepare_items()`.

This allows the parent `WP_List_Table::has_items()` method to work as expected, and the override in the child class can now be removed. It also makes the class more consistent with other list table classes.

As a result of this change, the "Bulk actions" dropdown is no longer unnecessarily displayed if there are no terms.

Follow-up to [15491], [17025], [17026].

Props mattoakley, swissspidy, audrasjb, SergeyBiryukov.
Fixes #54181.

git-svn-id: https://develop.svn.wordpress.org/trunk@51896 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../includes/class-wp-terms-list-table.php    | 75 +++++++------------
 1 file changed, 29 insertions(+), 46 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-terms-list-table.php b/src/wp-admin/includes/class-wp-terms-list-table.php
index e90574908825f..4823d29c9d6d1 100644
--- a/src/wp-admin/includes/class-wp-terms-list-table.php
+++ b/src/wp-admin/includes/class-wp-terms-list-table.php
@@ -77,9 +77,11 @@ public function ajax_user_can() {
 	/**
 	 */
 	public function prepare_items() {
-		$tags_per_page = $this->get_items_per_page( 'edit_' . $this->screen->taxonomy . '_per_page' );
+		$taxonomy = $this->screen->taxonomy;
+
+		$tags_per_page = $this->get_items_per_page( "edit_{$taxonomy}_per_page" );
 
-		if ( 'post_tag' === $this->screen->taxonomy ) {
+		if ( 'post_tag' === $taxonomy ) {
 			/**
 			 * Filters the number of terms displayed per page for the Tags list table.
 			 *
@@ -98,7 +100,7 @@ public function prepare_items() {
 			 * @param int $tags_per_page Number of tags to be displayed. Default 20.
 			 */
 			$tags_per_page = apply_filters_deprecated( 'tagsperpage', array( $tags_per_page ), '2.8.0', 'edit_tags_per_page' );
-		} elseif ( 'category' === $this->screen->taxonomy ) {
+		} elseif ( 'category' === $taxonomy ) {
 			/**
 			 * Filters the number of terms displayed per page for the Categories list table.
 			 *
@@ -112,9 +114,11 @@ public function prepare_items() {
 		$search = ! empty( $_REQUEST['s'] ) ? trim( wp_unslash( $_REQUEST['s'] ) ) : '';
 
 		$args = array(
-			'search' => $search,
-			'page'   => $this->get_pagenum(),
-			'number' => $tags_per_page,
+			'taxonomy'   => $taxonomy,
+			'search'     => $search,
+			'page'       => $this->get_pagenum(),
+			'number'     => $tags_per_page,
+			'hide_empty' => 0,
 		);
 
 		if ( ! empty( $_REQUEST['orderby'] ) ) {
@@ -125,13 +129,24 @@ public function prepare_items() {
 			$args['order'] = trim( wp_unslash( $_REQUEST['order'] ) );
 		}
 
+		$args['offset'] = ( $args['page'] - 1 ) * $args['number'];
+
+		// Save the values because 'number' and 'offset' can be subsequently overridden.
 		$this->callback_args = $args;
 
+		if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $args['orderby'] ) ) {
+			// We'll need the full set of terms then.
+			$args['number'] = 0;
+			$args['offset'] = $args['number'];
+		}
+
+		$this->items = get_terms( $args );
+
 		$this->set_pagination_args(
 			array(
 				'total_items' => wp_count_terms(
 					array(
-						'taxonomy' => $this->screen->taxonomy,
+						'taxonomy' => $taxonomy,
 						'search'   => $search,
 					)
 				),
@@ -140,14 +155,6 @@ public function prepare_items() {
 		);
 	}
 
-	/**
-	 * @return bool
-	 */
-	public function has_items() {
-		// @todo Populate $this->items in prepare_items().
-		return true;
-	}
-
 	/**
 	 */
 	public function no_items() {
@@ -216,45 +223,21 @@ protected function get_sortable_columns() {
 	public function display_rows_or_placeholder() {
 		$taxonomy = $this->screen->taxonomy;
 
-		$args = wp_parse_args(
-			$this->callback_args,
-			array(
-				'taxonomy'   => $taxonomy,
-				'page'       => 1,
-				'number'     => 20,
-				'search'     => '',
-				'hide_empty' => 0,
-			)
-		);
-
-		$page = $args['page'];
-
-		// Set variable because $args['number'] can be subsequently overridden.
-		$number = $args['number'];
-
-		$offset         = ( $page - 1 ) * $number;
-		$args['offset'] = $offset;
+		$number = $this->callback_args['number'];
+		$offset = $this->callback_args['offset'];
 
 		// Convert it to table rows.
 		$count = 0;
 
-		if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $args['orderby'] ) ) {
-			// We'll need the full set of terms then.
-			$args['number'] = 0;
-			$args['offset'] = $args['number'];
-		}
-
-		$terms = get_terms( $args );
-
-		if ( empty( $terms ) || ! is_array( $terms ) ) {
+		if ( empty( $this->items ) || ! is_array( $this->items ) ) {
 			echo '<tr class="no-items"><td class="colspanchange" colspan="' . $this->get_column_count() . '">';
 			$this->no_items();
 			echo '</td></tr>';
 			return;
 		}
 
-		if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $args['orderby'] ) ) {
-			if ( ! empty( $args['search'] ) ) {// Ignore children on searches.
+		if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $this->callback_args['orderby'] ) ) {
+			if ( ! empty( $this->callback_args['search'] ) ) {// Ignore children on searches.
 				$children = array();
 			} else {
 				$children = _get_term_hierarchy( $taxonomy );
@@ -264,9 +247,9 @@ public function display_rows_or_placeholder() {
 			 * Some funky recursion to get the job done (paging & parents mainly) is contained within.
 			 * Skip it for non-hierarchical taxonomies for performance sake.
 			 */
-			$this->_rows( $taxonomy, $terms, $children, $offset, $number, $count );
+			$this->_rows( $taxonomy, $this->items, $children, $offset, $number, $count );
 		} else {
-			foreach ( $terms as $term ) {
+			foreach ( $this->items as $term ) {
 				$this->single_row( $term );
 			}
 		}

From 92ff897931a7016d0278662d4e816b99aea4b8e5 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Fri, 8 Oct 2021 18:04:08 +0000
Subject: [PATCH 194/257] External Libraries: Update jQuery UI to 1.13.0 final.

Props Clorith, mgol, azaozz.
Fixes #52163.

git-svn-id: https://develop.svn.wordpress.org/trunk@51897 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../_enqueues/vendor/jquery/ui/accordion.js   |  4 +-
 .../vendor/jquery/ui/autocomplete.js          |  4 +-
 src/js/_enqueues/vendor/jquery/ui/button.js   |  4 +-
 .../vendor/jquery/ui/checkboxradio.js         |  4 +-
 .../vendor/jquery/ui/controlgroup.js          |  4 +-
 src/js/_enqueues/vendor/jquery/ui/core.js     | 28 +++----
 .../_enqueues/vendor/jquery/ui/datepicker.js  |  6 +-
 src/js/_enqueues/vendor/jquery/ui/dialog.js   |  4 +-
 .../_enqueues/vendor/jquery/ui/draggable.js   |  4 +-
 .../_enqueues/vendor/jquery/ui/droppable.js   |  4 +-
 .../vendor/jquery/ui/effect-blind.js          |  2 +-
 .../vendor/jquery/ui/effect-bounce.js         |  2 +-
 .../_enqueues/vendor/jquery/ui/effect-clip.js |  2 +-
 .../_enqueues/vendor/jquery/ui/effect-drop.js |  2 +-
 .../vendor/jquery/ui/effect-explode.js        |  2 +-
 .../_enqueues/vendor/jquery/ui/effect-fade.js |  2 +-
 .../_enqueues/vendor/jquery/ui/effect-fold.js |  2 +-
 .../vendor/jquery/ui/effect-highlight.js      |  2 +-
 .../_enqueues/vendor/jquery/ui/effect-puff.js |  2 +-
 .../vendor/jquery/ui/effect-pulsate.js        |  2 +-
 .../vendor/jquery/ui/effect-scale.js          |  2 +-
 .../vendor/jquery/ui/effect-shake.js          |  2 +-
 .../_enqueues/vendor/jquery/ui/effect-size.js |  2 +-
 .../vendor/jquery/ui/effect-slide.js          |  2 +-
 .../vendor/jquery/ui/effect-transfer.js       |  2 +-
 src/js/_enqueues/vendor/jquery/ui/effect.js   |  6 +-
 src/js/_enqueues/vendor/jquery/ui/menu.js     |  4 +-
 src/js/_enqueues/vendor/jquery/ui/mouse.js    |  4 +-
 .../_enqueues/vendor/jquery/ui/progressbar.js |  4 +-
 .../_enqueues/vendor/jquery/ui/resizable.js   |  4 +-
 .../_enqueues/vendor/jquery/ui/selectable.js  |  4 +-
 .../_enqueues/vendor/jquery/ui/selectmenu.js  |  4 +-
 src/js/_enqueues/vendor/jquery/ui/slider.js   |  4 +-
 src/js/_enqueues/vendor/jquery/ui/sortable.js |  4 +-
 src/js/_enqueues/vendor/jquery/ui/spinner.js  |  4 +-
 src/js/_enqueues/vendor/jquery/ui/tabs.js     |  4 +-
 src/js/_enqueues/vendor/jquery/ui/tooltip.js  |  4 +-
 src/wp-includes/script-loader.php             | 80 +++++++++----------
 38 files changed, 113 insertions(+), 113 deletions(-)

diff --git a/src/js/_enqueues/vendor/jquery/ui/accordion.js b/src/js/_enqueues/vendor/jquery/ui/accordion.js
index 283380a10b53f..0c1035d82e21d 100644
--- a/src/js/_enqueues/vendor/jquery/ui/accordion.js
+++ b/src/js/_enqueues/vendor/jquery/ui/accordion.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Accordion 1.13.0-rc.2
+ * jQuery UI Accordion 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -37,7 +37,7 @@
 "use strict";
 
 return $.widget( "ui.accordion", {
-	version: "1.13.0-rc.2",
+	version: "1.13.0",
 	options: {
 		active: 0,
 		animate: {},
diff --git a/src/js/_enqueues/vendor/jquery/ui/autocomplete.js b/src/js/_enqueues/vendor/jquery/ui/autocomplete.js
index 7f4117e41a73b..7116629005d8c 100644
--- a/src/js/_enqueues/vendor/jquery/ui/autocomplete.js
+++ b/src/js/_enqueues/vendor/jquery/ui/autocomplete.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Autocomplete 1.13.0-rc.2
+ * jQuery UI Autocomplete 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -36,7 +36,7 @@
 "use strict";
 
 $.widget( "ui.autocomplete", {
-	version: "1.13.0-rc.2",
+	version: "1.13.0",
 	defaultElement: "<input>",
 	options: {
 		appendTo: null,
diff --git a/src/js/_enqueues/vendor/jquery/ui/button.js b/src/js/_enqueues/vendor/jquery/ui/button.js
index a48cc6a3f306b..cb9c8c0c6bbd9 100644
--- a/src/js/_enqueues/vendor/jquery/ui/button.js
+++ b/src/js/_enqueues/vendor/jquery/ui/button.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Button 1.13.0-rc.2
+ * jQuery UI Button 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -41,7 +41,7 @@
 "use strict";
 
 $.widget( "ui.button", {
-	version: "1.13.0-rc.2",
+	version: "1.13.0",
 	defaultElement: "<button>",
 	options: {
 		classes: {
diff --git a/src/js/_enqueues/vendor/jquery/ui/checkboxradio.js b/src/js/_enqueues/vendor/jquery/ui/checkboxradio.js
index 47ec104c3b13d..22e8d03ab7789 100644
--- a/src/js/_enqueues/vendor/jquery/ui/checkboxradio.js
+++ b/src/js/_enqueues/vendor/jquery/ui/checkboxradio.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Checkboxradio 1.13.0-rc.2
+ * jQuery UI Checkboxradio 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -36,7 +36,7 @@
 "use strict";
 
 $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
-	version: "1.13.0-rc.2",
+	version: "1.13.0",
 	options: {
 		disabled: null,
 		label: null,
diff --git a/src/js/_enqueues/vendor/jquery/ui/controlgroup.js b/src/js/_enqueues/vendor/jquery/ui/controlgroup.js
index 9c60b843998b3..828f032221b90 100644
--- a/src/js/_enqueues/vendor/jquery/ui/controlgroup.js
+++ b/src/js/_enqueues/vendor/jquery/ui/controlgroup.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Controlgroup 1.13.0-rc.2
+ * jQuery UI Controlgroup 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -37,7 +37,7 @@
 var controlgroupCornerRegex = /ui-corner-([a-z]){2,6}/g;
 
 return $.widget( "ui.controlgroup", {
-	version: "1.13.0-rc.2",
+	version: "1.13.0",
 	defaultElement: "<div>",
 	options: {
 		direction: "horizontal",
diff --git a/src/js/_enqueues/vendor/jquery/ui/core.js b/src/js/_enqueues/vendor/jquery/ui/core.js
index 5c4223db7ec95..37ba1bea760a2 100644
--- a/src/js/_enqueues/vendor/jquery/ui/core.js
+++ b/src/js/_enqueues/vendor/jquery/ui/core.js
@@ -1,4 +1,4 @@
-/*! jQuery UI - v1.13.0-rc.2 - 2021-09-05
+/*! jQuery UI - v1.13.0 - 2021-10-07
 * http://jqueryui.com
 * Includes: data.js, disable-selection.js, escape-selector.js, focusable.js, form-reset-mixin.js, form.js, ie.js, jquery-1-7.js, keycode.js, labels.js, plugin.js, position.js, safe-active-element.js, safe-blur.js, scroll-parent.js, tabbable.js, unique-id.js, version.js, widget.js
 * Copyright jQuery Foundation and other contributors; Licensed  */
@@ -20,11 +20,11 @@
 // Source: version.js
 $.ui = $.ui || {};
 
-$.ui.version = "1.13.0-rc.2";
+$.ui.version = "1.13.0";
 
 // Source: data.js
 /*!
- * jQuery UI :data 1.13.0-rc.2
+ * jQuery UI :data 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -53,7 +53,7 @@ $.extend( $.expr.pseudos, {
 
 // Source: disable-selection.js
 /*!
- * jQuery UI Disable Selection 1.13.0-rc.2
+ * jQuery UI Disable Selection 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -87,7 +87,7 @@ $.fn.extend( {
 
 // Source: focusable.js
 /*!
- * jQuery UI Focusable 1.13.0-rc.2
+ * jQuery UI Focusable 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -165,7 +165,7 @@ $.fn._form = function() {
 
 // Source: form-reset-mixin.js
 /*!
- * jQuery UI Form Reset Mixin 1.13.0-rc.2
+ * jQuery UI Form Reset Mixin 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -230,7 +230,7 @@ $.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
 
 // Source: jquery-patch.js
 /*!
- * jQuery UI Support for jQuery core 1.8.x and newer 1.13.0-rc.2
+ * jQuery UI Support for jQuery core 1.8.x and newer 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -304,7 +304,7 @@ if ( !$.fn.even || !$.fn.odd ) {
 
 // Source: keycode.js
 /*!
- * jQuery UI Keycode 1.13.0-rc.2
+ * jQuery UI Keycode 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -338,7 +338,7 @@ $.ui.keyCode = {
 
 // Source: labels.js
 /*!
- * jQuery UI Labels 1.13.0-rc.2
+ * jQuery UI Labels 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -424,7 +424,7 @@ $.ui.plugin = {
 
 // Source: position.js
 /*!
- * jQuery UI Position 1.13.0-rc.2
+ * jQuery UI Position 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -957,7 +957,7 @@ $.ui.safeBlur = function( element ) {
 
 // Source: scroll-parent.js
 /*!
- * jQuery UI Scroll Parent 1.13.0-rc.2
+ * jQuery UI Scroll Parent 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -990,7 +990,7 @@ $.fn.scrollParent = function( includeHidden ) {
 
 // Source: tabbable.js
 /*!
- * jQuery UI Tabbable 1.13.0-rc.2
+ * jQuery UI Tabbable 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -1013,7 +1013,7 @@ $.extend( $.expr.pseudos, {
 
 // Source: unique-id.js
 /*!
- * jQuery UI Unique ID 1.13.0-rc.2
+ * jQuery UI Unique ID 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -1050,7 +1050,7 @@ $.fn.extend( {
 
 // Source: widget.js
 /*!
- * jQuery UI Widget 1.13.0-rc.2
+ * jQuery UI Widget 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
diff --git a/src/js/_enqueues/vendor/jquery/ui/datepicker.js b/src/js/_enqueues/vendor/jquery/ui/datepicker.js
index 564839ad1d525..594c0d2ad652c 100644
--- a/src/js/_enqueues/vendor/jquery/ui/datepicker.js
+++ b/src/js/_enqueues/vendor/jquery/ui/datepicker.js
@@ -1,6 +1,6 @@
 /* eslint-disable max-len, camelcase */
 /*!
- * jQuery UI Datepicker 1.13.0-rc.2
+ * jQuery UI Datepicker 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -35,7 +35,7 @@
 } )( function( $ ) {
 "use strict";
 
-$.extend( $.ui, { datepicker: { version: "1.13.0-rc.2" } } );
+$.extend( $.ui, { datepicker: { version: "1.13.0" } } );
 
 var datepicker_instActive;
 
@@ -2232,7 +2232,7 @@ $.fn.datepicker = function( options ) {
 $.datepicker = new Datepicker(); // singleton instance
 $.datepicker.initialized = false;
 $.datepicker.uuid = new Date().getTime();
-$.datepicker.version = "1.13.0-rc.2";
+$.datepicker.version = "1.13.0";
 
 return $.datepicker;
 
diff --git a/src/js/_enqueues/vendor/jquery/ui/dialog.js b/src/js/_enqueues/vendor/jquery/ui/dialog.js
index 5c33f2d1c12b5..4d6483746daed 100644
--- a/src/js/_enqueues/vendor/jquery/ui/dialog.js
+++ b/src/js/_enqueues/vendor/jquery/ui/dialog.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Dialog 1.13.0-rc.2
+ * jQuery UI Dialog 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -39,7 +39,7 @@
 "use strict";
 
 $.widget( "ui.dialog", {
-	version: "1.13.0-rc.2",
+	version: "1.13.0",
 	options: {
 		appendTo: "body",
 		autoOpen: true,
diff --git a/src/js/_enqueues/vendor/jquery/ui/draggable.js b/src/js/_enqueues/vendor/jquery/ui/draggable.js
index 3ba056a75d7d4..63875f0c5942c 100644
--- a/src/js/_enqueues/vendor/jquery/ui/draggable.js
+++ b/src/js/_enqueues/vendor/jquery/ui/draggable.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Draggable 1.13.0-rc.2
+ * jQuery UI Draggable 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -34,7 +34,7 @@
 "use strict";
 
 $.widget( "ui.draggable", $.ui.mouse, {
-	version: "1.13.0-rc.2",
+	version: "1.13.0",
 	widgetEventPrefix: "drag",
 	options: {
 		addClasses: true,
diff --git a/src/js/_enqueues/vendor/jquery/ui/droppable.js b/src/js/_enqueues/vendor/jquery/ui/droppable.js
index 1770ab2f1fea2..05db6c8d09671 100644
--- a/src/js/_enqueues/vendor/jquery/ui/droppable.js
+++ b/src/js/_enqueues/vendor/jquery/ui/droppable.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Droppable 1.13.0-rc.2
+ * jQuery UI Droppable 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -34,7 +34,7 @@
 "use strict";
 
 $.widget( "ui.droppable", {
-	version: "1.13.0-rc.2",
+	version: "1.13.0",
 	widgetEventPrefix: "drop",
 	options: {
 		accept: "*",
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-blind.js b/src/js/_enqueues/vendor/jquery/ui/effect-blind.js
index 6a27d2ef6ccf7..b74dea4bdfcea 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-blind.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-blind.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Blind 1.13.0-rc.2
+ * jQuery UI Effects Blind 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-bounce.js b/src/js/_enqueues/vendor/jquery/ui/effect-bounce.js
index 0f07eed03954d..b8ee5042f2303 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-bounce.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-bounce.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Bounce 1.13.0-rc.2
+ * jQuery UI Effects Bounce 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-clip.js b/src/js/_enqueues/vendor/jquery/ui/effect-clip.js
index b08ae48a2450b..b54415605bf33 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-clip.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-clip.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Clip 1.13.0-rc.2
+ * jQuery UI Effects Clip 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-drop.js b/src/js/_enqueues/vendor/jquery/ui/effect-drop.js
index 9976a933609e6..4e7dd86561019 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-drop.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-drop.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Drop 1.13.0-rc.2
+ * jQuery UI Effects Drop 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-explode.js b/src/js/_enqueues/vendor/jquery/ui/effect-explode.js
index 8ce41aa221252..ec4529284c5a6 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-explode.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-explode.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Explode 1.13.0-rc.2
+ * jQuery UI Effects Explode 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-fade.js b/src/js/_enqueues/vendor/jquery/ui/effect-fade.js
index 6b3aac99cf60f..b0de90b500ca7 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-fade.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-fade.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Fade 1.13.0-rc.2
+ * jQuery UI Effects Fade 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-fold.js b/src/js/_enqueues/vendor/jquery/ui/effect-fold.js
index 982aa98bd6d9f..26c382b6d80ba 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-fold.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-fold.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Fold 1.13.0-rc.2
+ * jQuery UI Effects Fold 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-highlight.js b/src/js/_enqueues/vendor/jquery/ui/effect-highlight.js
index 21e13d45ecac3..36f0e9a721b94 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-highlight.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-highlight.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Highlight 1.13.0-rc.2
+ * jQuery UI Effects Highlight 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-puff.js b/src/js/_enqueues/vendor/jquery/ui/effect-puff.js
index 28f4aa7fa9b20..7a7f0e96dc08d 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-puff.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-puff.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Puff 1.13.0-rc.2
+ * jQuery UI Effects Puff 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-pulsate.js b/src/js/_enqueues/vendor/jquery/ui/effect-pulsate.js
index b236c38f143f1..ad1495d550af7 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-pulsate.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-pulsate.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Pulsate 1.13.0-rc.2
+ * jQuery UI Effects Pulsate 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-scale.js b/src/js/_enqueues/vendor/jquery/ui/effect-scale.js
index 68ce95abcb553..f7a5a84155783 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-scale.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-scale.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Scale 1.13.0-rc.2
+ * jQuery UI Effects Scale 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-shake.js b/src/js/_enqueues/vendor/jquery/ui/effect-shake.js
index 568eca5e8629f..ab942c0d0713b 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-shake.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-shake.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Shake 1.13.0-rc.2
+ * jQuery UI Effects Shake 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-size.js b/src/js/_enqueues/vendor/jquery/ui/effect-size.js
index 28a9d6c9d4503..7e2c8874ba8f0 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-size.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-size.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Size 1.13.0-rc.2
+ * jQuery UI Effects Size 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-slide.js b/src/js/_enqueues/vendor/jquery/ui/effect-slide.js
index 34c2aae29019d..d19b80e75b5b4 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-slide.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-slide.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Slide 1.13.0-rc.2
+ * jQuery UI Effects Slide 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect-transfer.js b/src/js/_enqueues/vendor/jquery/ui/effect-transfer.js
index ecdd495fccc5b..9c0540259aae6 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect-transfer.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect-transfer.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects Transfer 1.13.0-rc.2
+ * jQuery UI Effects Transfer 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
diff --git a/src/js/_enqueues/vendor/jquery/ui/effect.js b/src/js/_enqueues/vendor/jquery/ui/effect.js
index a9952d980a4eb..e8c7ca0089bf5 100644
--- a/src/js/_enqueues/vendor/jquery/ui/effect.js
+++ b/src/js/_enqueues/vendor/jquery/ui/effect.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Effects 1.13.0-rc.2
+ * jQuery UI Effects 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -32,7 +32,7 @@
 
 // Include version.js
 $.ui = $.ui || {};
-$.ui.version = "1.13.0-rc.2";
+$.ui.version = "1.13.0";
 
 // Source: jquery-var-for-color.js
 // Create a local jQuery because jQuery Color relies on it and the
@@ -1119,7 +1119,7 @@ if ( $.uiBackCompat !== false ) {
 }
 
 $.extend( $.effects, {
-	version: "1.13.0-rc.2",
+	version: "1.13.0",
 
 	define: function( name, mode, effect ) {
 		if ( !effect ) {
diff --git a/src/js/_enqueues/vendor/jquery/ui/menu.js b/src/js/_enqueues/vendor/jquery/ui/menu.js
index f06be2c4aec1d..1e43abd09fbb1 100644
--- a/src/js/_enqueues/vendor/jquery/ui/menu.js
+++ b/src/js/_enqueues/vendor/jquery/ui/menu.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Menu 1.13.0-rc.2
+ * jQuery UI Menu 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -35,7 +35,7 @@
 "use strict";
 
 return $.widget( "ui.menu", {
-	version: "1.13.0-rc.2",
+	version: "1.13.0",
 	defaultElement: "<ul>",
 	delay: 300,
 	options: {
diff --git a/src/js/_enqueues/vendor/jquery/ui/mouse.js b/src/js/_enqueues/vendor/jquery/ui/mouse.js
index 425d962bed1dd..c3a6a6edf1a69 100644
--- a/src/js/_enqueues/vendor/jquery/ui/mouse.js
+++ b/src/js/_enqueues/vendor/jquery/ui/mouse.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Mouse 1.13.0-rc.2
+ * jQuery UI Mouse 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -36,7 +36,7 @@ $( document ).on( "mouseup", function() {
 } );
 
 return $.widget( "ui.mouse", {
-	version: "1.13.0-rc.2",
+	version: "1.13.0",
 	options: {
 		cancel: "input, textarea, button, select, option",
 		distance: 1,
diff --git a/src/js/_enqueues/vendor/jquery/ui/progressbar.js b/src/js/_enqueues/vendor/jquery/ui/progressbar.js
index 6c30e97df194b..e1c78112da74e 100644
--- a/src/js/_enqueues/vendor/jquery/ui/progressbar.js
+++ b/src/js/_enqueues/vendor/jquery/ui/progressbar.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Progressbar 1.13.0-rc.2
+ * jQuery UI Progressbar 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -37,7 +37,7 @@
 "use strict";
 
 return $.widget( "ui.progressbar", {
-	version: "1.13.0-rc.2",
+	version: "1.13.0",
 	options: {
 		classes: {
 			"ui-progressbar": "ui-corner-all",
diff --git a/src/js/_enqueues/vendor/jquery/ui/resizable.js b/src/js/_enqueues/vendor/jquery/ui/resizable.js
index acbc73aafff27..5fc38f53b3db8 100644
--- a/src/js/_enqueues/vendor/jquery/ui/resizable.js
+++ b/src/js/_enqueues/vendor/jquery/ui/resizable.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Resizable 1.13.0-rc.2
+ * jQuery UI Resizable 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -36,7 +36,7 @@
 "use strict";
 
 $.widget( "ui.resizable", $.ui.mouse, {
-	version: "1.13.0-rc.2",
+	version: "1.13.0",
 	widgetEventPrefix: "resize",
 	options: {
 		alsoResize: false,
diff --git a/src/js/_enqueues/vendor/jquery/ui/selectable.js b/src/js/_enqueues/vendor/jquery/ui/selectable.js
index 64feccea4515b..ae95624da49ff 100644
--- a/src/js/_enqueues/vendor/jquery/ui/selectable.js
+++ b/src/js/_enqueues/vendor/jquery/ui/selectable.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Selectable 1.13.0-rc.2
+ * jQuery UI Selectable 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -34,7 +34,7 @@
 "use strict";
 
 return $.widget( "ui.selectable", $.ui.mouse, {
-	version: "1.13.0-rc.2",
+	version: "1.13.0",
 	options: {
 		appendTo: "body",
 		autoRefresh: true,
diff --git a/src/js/_enqueues/vendor/jquery/ui/selectmenu.js b/src/js/_enqueues/vendor/jquery/ui/selectmenu.js
index df61b606f8a0f..2db744de1bded 100644
--- a/src/js/_enqueues/vendor/jquery/ui/selectmenu.js
+++ b/src/js/_enqueues/vendor/jquery/ui/selectmenu.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Selectmenu 1.13.0-rc.2
+ * jQuery UI Selectmenu 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -38,7 +38,7 @@
 "use strict";
 
 return $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
-	version: "1.13.0-rc.2",
+	version: "1.13.0",
 	defaultElement: "<select>",
 	options: {
 		appendTo: null,
diff --git a/src/js/_enqueues/vendor/jquery/ui/slider.js b/src/js/_enqueues/vendor/jquery/ui/slider.js
index dd9a9f68b3d09..0de5936353d8f 100644
--- a/src/js/_enqueues/vendor/jquery/ui/slider.js
+++ b/src/js/_enqueues/vendor/jquery/ui/slider.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Slider 1.13.0-rc.2
+ * jQuery UI Slider 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -36,7 +36,7 @@
 "use strict";
 
 return $.widget( "ui.slider", $.ui.mouse, {
-	version: "1.13.0-rc.2",
+	version: "1.13.0",
 	widgetEventPrefix: "slide",
 
 	options: {
diff --git a/src/js/_enqueues/vendor/jquery/ui/sortable.js b/src/js/_enqueues/vendor/jquery/ui/sortable.js
index 9ccce7305118f..fa43254907373 100644
--- a/src/js/_enqueues/vendor/jquery/ui/sortable.js
+++ b/src/js/_enqueues/vendor/jquery/ui/sortable.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Sortable 1.13.0-rc.2
+ * jQuery UI Sortable 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -34,7 +34,7 @@
 "use strict";
 
 return $.widget( "ui.sortable", $.ui.mouse, {
-	version: "1.13.0-rc.2",
+	version: "1.13.0",
 	widgetEventPrefix: "sort",
 	ready: false,
 	options: {
diff --git a/src/js/_enqueues/vendor/jquery/ui/spinner.js b/src/js/_enqueues/vendor/jquery/ui/spinner.js
index de065a4cee510..eca42bf40b67f 100644
--- a/src/js/_enqueues/vendor/jquery/ui/spinner.js
+++ b/src/js/_enqueues/vendor/jquery/ui/spinner.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Spinner 1.13.0-rc.2
+ * jQuery UI Spinner 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -47,7 +47,7 @@ function spinnerModifier( fn ) {
 }
 
 $.widget( "ui.spinner", {
-	version: "1.13.0-rc.2",
+	version: "1.13.0",
 	defaultElement: "<input>",
 	widgetEventPrefix: "spin",
 	options: {
diff --git a/src/js/_enqueues/vendor/jquery/ui/tabs.js b/src/js/_enqueues/vendor/jquery/ui/tabs.js
index b5405c221e748..8cddc5d0e53ef 100644
--- a/src/js/_enqueues/vendor/jquery/ui/tabs.js
+++ b/src/js/_enqueues/vendor/jquery/ui/tabs.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Tabs 1.13.0-rc.2
+ * jQuery UI Tabs 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -35,7 +35,7 @@
 "use strict";
 
 $.widget( "ui.tabs", {
-	version: "1.13.0-rc.2",
+	version: "1.13.0",
 	delay: 300,
 	options: {
 		active: null,
diff --git a/src/js/_enqueues/vendor/jquery/ui/tooltip.js b/src/js/_enqueues/vendor/jquery/ui/tooltip.js
index 1e34fdc268ddc..9665f0763dd7e 100644
--- a/src/js/_enqueues/vendor/jquery/ui/tooltip.js
+++ b/src/js/_enqueues/vendor/jquery/ui/tooltip.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery UI Tooltip 1.13.0-rc.2
+ * jQuery UI Tooltip 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -35,7 +35,7 @@
 "use strict";
 
 $.widget( "ui.tooltip", {
-	version: "1.13.0-rc.2",
+	version: "1.13.0",
 	options: {
 		classes: {
 			"ui-tooltip": "ui-corner-all ui-widget-shadow"
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index 0a6ce2637c523..71c56192ee6c1 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -756,55 +756,55 @@ function wp_default_scripts( $scripts ) {
 	// In order to keep backwards compatibility, and to keep the optimized loading,
 	// the source files were flattened and included with some modifications for AMD loading.
 	// A notable change is that 'jquery-ui-core' now contains 'jquery-ui-position' and 'jquery-ui-widget'.
-	$scripts->add( 'jquery-ui-core', "/wp-includes/js/jquery/ui/core$suffix.js", array( 'jquery' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-effects-core', "/wp-includes/js/jquery/ui/effect$suffix.js", array( 'jquery' ), '1.13.0-rc.2', 1 );
-
-	$scripts->add( 'jquery-effects-blind', "/wp-includes/js/jquery/ui/effect-blind$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-effects-bounce', "/wp-includes/js/jquery/ui/effect-bounce$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-effects-clip', "/wp-includes/js/jquery/ui/effect-clip$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-effects-drop', "/wp-includes/js/jquery/ui/effect-drop$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-effects-explode', "/wp-includes/js/jquery/ui/effect-explode$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-effects-fade', "/wp-includes/js/jquery/ui/effect-fade$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-effects-fold', "/wp-includes/js/jquery/ui/effect-fold$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-effects-highlight', "/wp-includes/js/jquery/ui/effect-highlight$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-effects-puff', "/wp-includes/js/jquery/ui/effect-puff$suffix.js", array( 'jquery-effects-core', 'jquery-effects-scale' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-effects-pulsate', "/wp-includes/js/jquery/ui/effect-pulsate$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-effects-scale', "/wp-includes/js/jquery/ui/effect-scale$suffix.js", array( 'jquery-effects-core', 'jquery-effects-size' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-effects-shake', "/wp-includes/js/jquery/ui/effect-shake$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-effects-size', "/wp-includes/js/jquery/ui/effect-size$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-effects-slide', "/wp-includes/js/jquery/ui/effect-slide$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-effects-transfer', "/wp-includes/js/jquery/ui/effect-transfer$suffix.js", array( 'jquery-effects-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-core', "/wp-includes/js/jquery/ui/core$suffix.js", array( 'jquery' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-effects-core', "/wp-includes/js/jquery/ui/effect$suffix.js", array( 'jquery' ), '1.13.0', 1 );
+
+	$scripts->add( 'jquery-effects-blind', "/wp-includes/js/jquery/ui/effect-blind$suffix.js", array( 'jquery-effects-core' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-effects-bounce', "/wp-includes/js/jquery/ui/effect-bounce$suffix.js", array( 'jquery-effects-core' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-effects-clip', "/wp-includes/js/jquery/ui/effect-clip$suffix.js", array( 'jquery-effects-core' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-effects-drop', "/wp-includes/js/jquery/ui/effect-drop$suffix.js", array( 'jquery-effects-core' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-effects-explode', "/wp-includes/js/jquery/ui/effect-explode$suffix.js", array( 'jquery-effects-core' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-effects-fade', "/wp-includes/js/jquery/ui/effect-fade$suffix.js", array( 'jquery-effects-core' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-effects-fold', "/wp-includes/js/jquery/ui/effect-fold$suffix.js", array( 'jquery-effects-core' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-effects-highlight', "/wp-includes/js/jquery/ui/effect-highlight$suffix.js", array( 'jquery-effects-core' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-effects-puff', "/wp-includes/js/jquery/ui/effect-puff$suffix.js", array( 'jquery-effects-core', 'jquery-effects-scale' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-effects-pulsate', "/wp-includes/js/jquery/ui/effect-pulsate$suffix.js", array( 'jquery-effects-core' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-effects-scale', "/wp-includes/js/jquery/ui/effect-scale$suffix.js", array( 'jquery-effects-core', 'jquery-effects-size' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-effects-shake', "/wp-includes/js/jquery/ui/effect-shake$suffix.js", array( 'jquery-effects-core' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-effects-size', "/wp-includes/js/jquery/ui/effect-size$suffix.js", array( 'jquery-effects-core' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-effects-slide', "/wp-includes/js/jquery/ui/effect-slide$suffix.js", array( 'jquery-effects-core' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-effects-transfer', "/wp-includes/js/jquery/ui/effect-transfer$suffix.js", array( 'jquery-effects-core' ), '1.13.0', 1 );
 
 	// Widgets
-	$scripts->add( 'jquery-ui-accordion', "/wp-includes/js/jquery/ui/accordion$suffix.js", array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-ui-autocomplete', "/wp-includes/js/jquery/ui/autocomplete$suffix.js", array( 'jquery-ui-menu', 'wp-a11y' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-ui-button', "/wp-includes/js/jquery/ui/button$suffix.js", array( 'jquery-ui-core', 'jquery-ui-controlgroup', 'jquery-ui-checkboxradio' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-ui-datepicker', "/wp-includes/js/jquery/ui/datepicker$suffix.js", array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-ui-dialog', "/wp-includes/js/jquery/ui/dialog$suffix.js", array( 'jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-ui-menu', "/wp-includes/js/jquery/ui/menu$suffix.js", array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-ui-mouse', "/wp-includes/js/jquery/ui/mouse$suffix.js", array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-ui-progressbar', "/wp-includes/js/jquery/ui/progressbar$suffix.js", array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-ui-selectmenu', "/wp-includes/js/jquery/ui/selectmenu$suffix.js", array( 'jquery-ui-menu' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-ui-slider', "/wp-includes/js/jquery/ui/slider$suffix.js", array( 'jquery-ui-mouse' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-ui-spinner', "/wp-includes/js/jquery/ui/spinner$suffix.js", array( 'jquery-ui-button' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-ui-tabs', "/wp-includes/js/jquery/ui/tabs$suffix.js", array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-ui-tooltip', "/wp-includes/js/jquery/ui/tooltip$suffix.js", array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-accordion', "/wp-includes/js/jquery/ui/accordion$suffix.js", array( 'jquery-ui-core' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-ui-autocomplete', "/wp-includes/js/jquery/ui/autocomplete$suffix.js", array( 'jquery-ui-menu', 'wp-a11y' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-ui-button', "/wp-includes/js/jquery/ui/button$suffix.js", array( 'jquery-ui-core', 'jquery-ui-controlgroup', 'jquery-ui-checkboxradio' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-ui-datepicker', "/wp-includes/js/jquery/ui/datepicker$suffix.js", array( 'jquery-ui-core' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-ui-dialog', "/wp-includes/js/jquery/ui/dialog$suffix.js", array( 'jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-ui-menu', "/wp-includes/js/jquery/ui/menu$suffix.js", array( 'jquery-ui-core' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-ui-mouse', "/wp-includes/js/jquery/ui/mouse$suffix.js", array( 'jquery-ui-core' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-ui-progressbar', "/wp-includes/js/jquery/ui/progressbar$suffix.js", array( 'jquery-ui-core' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-ui-selectmenu', "/wp-includes/js/jquery/ui/selectmenu$suffix.js", array( 'jquery-ui-menu' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-ui-slider', "/wp-includes/js/jquery/ui/slider$suffix.js", array( 'jquery-ui-mouse' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-ui-spinner', "/wp-includes/js/jquery/ui/spinner$suffix.js", array( 'jquery-ui-button' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-ui-tabs', "/wp-includes/js/jquery/ui/tabs$suffix.js", array( 'jquery-ui-core' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-ui-tooltip', "/wp-includes/js/jquery/ui/tooltip$suffix.js", array( 'jquery-ui-core' ), '1.13.0', 1 );
 
 	// New in 1.12.1
-	$scripts->add( 'jquery-ui-checkboxradio', "/wp-includes/js/jquery/ui/checkboxradio$suffix.js", array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-ui-controlgroup', "/wp-includes/js/jquery/ui/controlgroup$suffix.js", array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-checkboxradio', "/wp-includes/js/jquery/ui/checkboxradio$suffix.js", array( 'jquery-ui-core' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-ui-controlgroup', "/wp-includes/js/jquery/ui/controlgroup$suffix.js", array( 'jquery-ui-core' ), '1.13.0', 1 );
 
 	// Interactions
-	$scripts->add( 'jquery-ui-draggable', "/wp-includes/js/jquery/ui/draggable$suffix.js", array( 'jquery-ui-mouse' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-ui-droppable', "/wp-includes/js/jquery/ui/droppable$suffix.js", array( 'jquery-ui-draggable' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-ui-resizable', "/wp-includes/js/jquery/ui/resizable$suffix.js", array( 'jquery-ui-mouse' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-ui-selectable', "/wp-includes/js/jquery/ui/selectable$suffix.js", array( 'jquery-ui-mouse' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-ui-sortable', "/wp-includes/js/jquery/ui/sortable$suffix.js", array( 'jquery-ui-mouse' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-draggable', "/wp-includes/js/jquery/ui/draggable$suffix.js", array( 'jquery-ui-mouse' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-ui-droppable', "/wp-includes/js/jquery/ui/droppable$suffix.js", array( 'jquery-ui-draggable' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-ui-resizable', "/wp-includes/js/jquery/ui/resizable$suffix.js", array( 'jquery-ui-mouse' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-ui-selectable', "/wp-includes/js/jquery/ui/selectable$suffix.js", array( 'jquery-ui-mouse' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-ui-sortable', "/wp-includes/js/jquery/ui/sortable$suffix.js", array( 'jquery-ui-mouse' ), '1.13.0', 1 );
 
 	// As of 1.12.1 `jquery-ui-position` and `jquery-ui-widget` are part of `jquery-ui-core`.
 	// Listed here for back-compat.
-	$scripts->add( 'jquery-ui-position', false, array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
-	$scripts->add( 'jquery-ui-widget', false, array( 'jquery-ui-core' ), '1.13.0-rc.2', 1 );
+	$scripts->add( 'jquery-ui-position', false, array( 'jquery-ui-core' ), '1.13.0', 1 );
+	$scripts->add( 'jquery-ui-widget', false, array( 'jquery-ui-core' ), '1.13.0', 1 );
 
 	// Strings for 'jquery-ui-autocomplete' live region messages.
 	did_action( 'init' ) && $scripts->localize(

From 4b60c38a3694a6f28f8f6e51334afa13a4415632 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sat, 9 Oct 2021 02:49:02 +0000
Subject: [PATCH 195/257] Site Health: Use an integer value as a fallback in
 the available disk space check.

This avoids a few type problems further in the code: boolean divided by a number, or passing `false` to `size_format()` which is documented to accept integers or strings only.

Follow-up to [51815].

Props TobiasBg.
See #51857.

git-svn-id: https://develop.svn.wordpress.org/trunk@51898 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-site-health.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-admin/includes/class-wp-site-health.php b/src/wp-admin/includes/class-wp-site-health.php
index 8a6fa79827696..6b0a254476daa 100644
--- a/src/wp-admin/includes/class-wp-site-health.php
+++ b/src/wp-admin/includes/class-wp-site-health.php
@@ -1890,7 +1890,7 @@ public function get_test_plugin_theme_auto_updates() {
 	 * @return array The test results.
 	 */
 	public function get_test_available_updates_disk_space() {
-		$available_space       = function_exists( 'disk_free_space' ) ? (int) @disk_free_space( WP_CONTENT_DIR . '/upgrade/' ) : false;
+		$available_space       = function_exists( 'disk_free_space' ) ? (int) @disk_free_space( WP_CONTENT_DIR . '/upgrade/' ) : 0;
 		$available_space_in_mb = $available_space / MB_IN_BYTES;
 
 		$result = array(

From 184e7c15ed498503a2db9146c91ab0f6bf2d5047 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sat, 9 Oct 2021 03:37:41 +0000
Subject: [PATCH 196/257] Upgrade/Install: Introduce a `move_dir()` function.

This replaces the `copy_dir()` usage in `WP_Upgrader::install_package()` and aims to avoid PHP timeout issues when installing or updating large plugins on slower systems like Vagrant or the WP Docker test environment.

The new function attempts a native PHP `rename()` function first and falls back to the previous `copy_dir()`.

Follow-up to [51815], [51898].

Props afragen, aristath, peterwilsoncc, galbaras, noisysocks, pbiron.
Fixes #54166. See #51857.

git-svn-id: https://develop.svn.wordpress.org/trunk@51899 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-upgrader.php |  4 +--
 src/wp-admin/includes/file.php              | 28 +++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-upgrader.php b/src/wp-admin/includes/class-wp-upgrader.php
index ed9302feb2d16..0fab410240dc7 100644
--- a/src/wp-admin/includes/class-wp-upgrader.php
+++ b/src/wp-admin/includes/class-wp-upgrader.php
@@ -623,8 +623,8 @@ public function install_package( $args = array() ) {
 			}
 		}
 
-		// Copy new version of item into place.
-		$result = copy_dir( $source, $remote_destination );
+		// Move new version of item into place.
+		$result = move_dir( $source, $remote_destination );
 		if ( is_wp_error( $result ) ) {
 			if ( $args['clear_working'] ) {
 				$wp_filesystem->delete( $remote_source, true );
diff --git a/src/wp-admin/includes/file.php b/src/wp-admin/includes/file.php
index 8c4797d11398d..50345c63315a0 100644
--- a/src/wp-admin/includes/file.php
+++ b/src/wp-admin/includes/file.php
@@ -1917,6 +1917,34 @@ function copy_dir( $from, $to, $skip_list = array() ) {
 	return true;
 }
 
+/**
+ * Moves a directory from one location to another via the rename() PHP function.
+ * If the renaming failed, falls back to copy_dir().
+ *
+ * Assumes that WP_Filesystem() has already been called and setup.
+ *
+ * @since 5.9.0
+ *
+ * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
+ *
+ * @param string $from Source directory.
+ * @param string $to   Destination directory.
+ * @return true|WP_Error True on success, WP_Error on failure.
+ */
+function move_dir( $from, $to ) {
+	global $wp_filesystem;
+
+	$wp_filesystem->rmdir( $to );
+	if ( @rename( $from, $to ) ) {
+		return true;
+	}
+
+	$wp_filesystem->mkdir( $to );
+	$result = copy_dir( $from, $to );
+
+	return $result;
+}
+
 /**
  * Initializes and connects the WordPress Filesystem Abstraction classes.
  *

From 267b0717ec0c3daf0e24510c63979c2bc995d163 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sun, 10 Oct 2021 00:12:03 +0000
Subject: [PATCH 197/257] External Libraries: Update getID3 to version 1.9.21.

The latest version includes preliminary PHP 8.1 support, as well as a variety of bug fixes.

Release notes: https://github.com/JamesHeinrich/getID3/releases/tag/v1.9.21

A full list of changes in this update can be found on GitHub:
https://github.com/JamesHeinrich/getID3/compare/v1.9.20...v1.9.21

This commit also includes PHPCS adjustments previously made for a passing PHP Compatibility scan.

Follow-up to [47601], [47737], [47902], [48278], [49621], [50714].

Props jrf, SergeyBiryukov.
Fixes #54162.

git-svn-id: https://develop.svn.wordpress.org/trunk@51900 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/ID3/getid3.lib.php            |  91 ++--
 src/wp-includes/ID3/getid3.php                | 198 ++++++++-
 .../ID3/module.audio-video.asf.php            |   7 +-
 .../ID3/module.audio-video.flv.php            |   1 +
 .../ID3/module.audio-video.matroska.php       |  14 +-
 .../ID3/module.audio-video.quicktime.php      | 306 ++++---------
 .../ID3/module.audio-video.riff.php           | 102 ++++-
 src/wp-includes/ID3/module.audio.flac.php     |   1 +
 src/wp-includes/ID3/module.audio.mp3.php      | 418 ++++++++++--------
 src/wp-includes/ID3/module.audio.ogg.php      |  49 +-
 src/wp-includes/ID3/module.tag.apetag.php     |   2 +
 src/wp-includes/ID3/module.tag.id3v1.php      |  58 ++-
 src/wp-includes/ID3/module.tag.id3v2.php      |  66 +--
 src/wp-includes/ID3/module.tag.lyrics3.php    |   3 +
 src/wp-includes/ID3/readme.txt                |   1 +
 15 files changed, 791 insertions(+), 526 deletions(-)

diff --git a/src/wp-includes/ID3/getid3.lib.php b/src/wp-includes/ID3/getid3.lib.php
index 8514e9781f02c..46a39ee3b20e0 100644
--- a/src/wp-includes/ID3/getid3.lib.php
+++ b/src/wp-includes/ID3/getid3.lib.php
@@ -242,7 +242,7 @@ public static function LittleEndian2Float($byteword) {
 	/**
 	 * ANSI/IEEE Standard 754-1985, Standard for Binary Floating Point Arithmetic
 	 *
-	 * @link http://www.psc.edu/general/software/packages/ieee/ieee.html
+	 * @link https://web.archive.org/web/20120325162206/http://www.psc.edu/general/software/packages/ieee/ieee.php
 	 * @link http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/ieee.html
 	 *
 	 * @param string $byteword
@@ -294,12 +294,12 @@ public static function BigEndian2Float($byteword) {
 
 		if (($exponent == (pow(2, $exponentbits) - 1)) && ($fraction != 0)) {
 			// Not a Number
-			$floatvalue = false;
+			$floatvalue = NAN;
 		} elseif (($exponent == (pow(2, $exponentbits) - 1)) && ($fraction == 0)) {
 			if ($signbit == '1') {
-				$floatvalue = '-infinity';
+				$floatvalue = -INF;
 			} else {
-				$floatvalue = '+infinity';
+				$floatvalue = INF;
 			}
 		} elseif (($exponent == 0) && ($fraction == 0)) {
 			if ($signbit == '1') {
@@ -427,14 +427,20 @@ public static function BigEndian2String($number, $minbytes=1, $synchsafe=false,
 	 * @return string
 	 */
 	public static function Dec2Bin($number) {
+		if (!is_numeric($number)) {
+			// https://github.com/JamesHeinrich/getID3/issues/299
+			trigger_error('TypeError: Dec2Bin(): Argument #1 ($number) must be numeric, '.gettype($number).' given', E_USER_WARNING);
+			return '';
+		}
+		$bytes = array();
 		while ($number >= 256) {
-			$bytes[] = (($number / 256) - (floor($number / 256))) * 256;
+			$bytes[] = (int) (($number / 256) - (floor($number / 256))) * 256;
 			$number = floor($number / 256);
 		}
-		$bytes[] = $number;
+		$bytes[] = (int) $number;
 		$binstring = '';
-		for ($i = 0; $i < count($bytes); $i++) {
-			$binstring = (($i == count($bytes) - 1) ? decbin($bytes[$i]) : str_pad(decbin($bytes[$i]), 8, '0', STR_PAD_LEFT)).$binstring;
+		foreach ($bytes as $i => $byte) {
+			$binstring = (($i == count($bytes) - 1) ? decbin($byte) : str_pad(decbin($byte), 8, '0', STR_PAD_LEFT)).$binstring;
 		}
 		return $binstring;
 	}
@@ -665,6 +671,7 @@ public static function CreateDeepArray($ArrayPath, $Separator, $Value) {
 		// or
 		//   $foo['path']['to']['my'] = 'file.txt';
 		$ArrayPath = ltrim($ArrayPath, $Separator);
+		$ReturnedArray = array();
 		if (($pos = strpos($ArrayPath, $Separator)) !== false) {
 			$ReturnedArray[substr($ArrayPath, 0, $pos)] = self::CreateDeepArray(substr($ArrayPath, $pos + 1), $Separator, $Value);
 		} else {
@@ -1538,12 +1545,21 @@ public static function ImageExtFromMime($mime_type) {
 	public static function CopyTagsToComments(&$ThisFileInfo, $option_tags_html=true) {
 		// Copy all entries from ['tags'] into common ['comments']
 		if (!empty($ThisFileInfo['tags'])) {
-			if (isset($ThisFileInfo['tags']['id3v1'])) {
-				// bubble ID3v1 to the end, if present to aid in detecting bad ID3v1 encodings
-				$ID3v1 = $ThisFileInfo['tags']['id3v1'];
-				unset($ThisFileInfo['tags']['id3v1']);
-				$ThisFileInfo['tags']['id3v1'] = $ID3v1;
-				unset($ID3v1);
+
+			// Some tag types can only support limited character sets and may contain data in non-standard encoding (usually ID3v1)
+			// and/or poorly-transliterated tag values that are also in tag formats that do support full-range character sets
+			// To make the output more user-friendly, process the potentially-problematic tag formats last to enhance the chance that
+			// the first entries in [comments] are the most correct and the "bad" ones (if any) come later.
+			// https://github.com/JamesHeinrich/getID3/issues/338
+			$processLastTagTypes = array('id3v1','riff');
+			foreach ($processLastTagTypes as $processLastTagType) {
+				if (isset($ThisFileInfo['tags'][$processLastTagType])) {
+					// bubble ID3v1 to the end, if present to aid in detecting bad ID3v1 encodings
+					$temp = $ThisFileInfo['tags'][$processLastTagType];
+					unset($ThisFileInfo['tags'][$processLastTagType]);
+					$ThisFileInfo['tags'][$processLastTagType] = $temp;
+					unset($temp);
+				}
 			}
 			foreach ($ThisFileInfo['tags'] as $tagtype => $tagarray) {
 				foreach ($tagarray as $tagname => $tagdata) {
@@ -1562,20 +1578,30 @@ public static function CopyTagsToComments(&$ThisFileInfo, $option_tags_html=true
 										// new value is identical but shorter-than (or equal-length to) one already in comments - skip
 										break 2;
 									}
-								}
-								if (function_exists('mb_convert_encoding')) {
-									if (trim($value) == trim(substr(mb_convert_encoding($existingvalue, $ThisFileInfo['id3v1']['encoding'], $ThisFileInfo['encoding']), 0, 30))) {
-										// value stored in ID3v1 appears to be probably the multibyte value transliterated (badly) into ISO-8859-1 in ID3v1.
-										// As an example, Foobar2000 will do this if you tag a file with Chinese or Arabic or Cyrillic or something that doesn't fit into ISO-8859-1 the ID3v1 will consist of mostly "?" characters, one per multibyte unrepresentable character
-										break 2;
+
+									if (function_exists('mb_convert_encoding')) {
+										if (trim($value) == trim(substr(mb_convert_encoding($existingvalue, $ThisFileInfo['id3v1']['encoding'], $ThisFileInfo['encoding']), 0, 30))) {
+											// value stored in ID3v1 appears to be probably the multibyte value transliterated (badly) into ISO-8859-1 in ID3v1.
+											// As an example, Foobar2000 will do this if you tag a file with Chinese or Arabic or Cyrillic or something that doesn't fit into ISO-8859-1 the ID3v1 will consist of mostly "?" characters, one per multibyte unrepresentable character
+											break 2;
+										}
 									}
 								}
 
 							} elseif (!is_array($value)) {
 
-								$newvaluelength = strlen(trim($value));
+								$newvaluelength   =    strlen(trim($value));
+								$newvaluelengthMB = mb_strlen(trim($value));
 								foreach ($ThisFileInfo['comments'][$tagname] as $existingkey => $existingvalue) {
-									$oldvaluelength = strlen(trim($existingvalue));
+									$oldvaluelength   =    strlen(trim($existingvalue));
+									$oldvaluelengthMB = mb_strlen(trim($existingvalue));
+									if (($newvaluelengthMB == $oldvaluelengthMB) && ($existingvalue == getid3_lib::iconv_fallback('UTF-8', 'ASCII', $value))) {
+										// https://github.com/JamesHeinrich/getID3/issues/338
+										// check for tags containing extended characters that may have been forced into limited-character storage (e.g. UTF8 values into ASCII)
+										// which will usually display unrepresentable characters as "?"
+										$ThisFileInfo['comments'][$tagname][$existingkey] = trim($value);
+										break;
+									}
 									if ((strlen($existingvalue) > 10) && ($newvaluelength > $oldvaluelength) && (substr(trim($value), 0, strlen($existingvalue)) == $existingvalue)) {
 										$ThisFileInfo['comments'][$tagname][$existingkey] = trim($value);
 										break;
@@ -1601,14 +1627,16 @@ public static function CopyTagsToComments(&$ThisFileInfo, $option_tags_html=true
 			}
 
 			// attempt to standardize spelling of returned keys
-			$StandardizeFieldNames = array(
-				'tracknumber' => 'track_number',
-				'track'       => 'track_number',
-			);
-			foreach ($StandardizeFieldNames as $badkey => $goodkey) {
-				if (array_key_exists($badkey, $ThisFileInfo['comments']) && !array_key_exists($goodkey, $ThisFileInfo['comments'])) {
-					$ThisFileInfo['comments'][$goodkey] = $ThisFileInfo['comments'][$badkey];
-					unset($ThisFileInfo['comments'][$badkey]);
+			if (!empty($ThisFileInfo['comments'])) {
+				$StandardizeFieldNames = array(
+					'tracknumber' => 'track_number',
+					'track'       => 'track_number',
+				);
+				foreach ($StandardizeFieldNames as $badkey => $goodkey) {
+					if (array_key_exists($badkey, $ThisFileInfo['comments']) && !array_key_exists($goodkey, $ThisFileInfo['comments'])) {
+						$ThisFileInfo['comments'][$goodkey] = $ThisFileInfo['comments'][$badkey];
+						unset($ThisFileInfo['comments'][$badkey]);
+					}
 				}
 			}
 
@@ -1734,6 +1762,7 @@ public static function trimNullByte($string) {
 	 * @return float|bool
 	 */
 	public static function getFileSizeSyscall($path) {
+		$commandline = null;
 		$filesize = false;
 
 		if (GETID3_OS_ISWINDOWS) {
@@ -1795,7 +1824,7 @@ public static function truepath($filename) {
 	 *
 	 * @return string
 	 */
-	public static function mb_basename($path, $suffix = null) {
+	public static function mb_basename($path, $suffix = '') {
 		$splited = preg_split('#/#', rtrim($path, '/ '));
 		return substr(basename('X'.$splited[count($splited) - 1], $suffix), 1);
 	}
diff --git a/src/wp-includes/ID3/getid3.php b/src/wp-includes/ID3/getid3.php
index 5cb3c036c0def..2008025b85bc3 100644
--- a/src/wp-includes/ID3/getid3.php
+++ b/src/wp-includes/ID3/getid3.php
@@ -17,10 +17,6 @@
 if (!defined('GETID3_INCLUDEPATH')) {
 	define('GETID3_INCLUDEPATH', dirname(__FILE__).DIRECTORY_SEPARATOR);
 }
-// Workaround Bug #39923 (https://bugs.php.net/bug.php?id=39923)
-if (!defined('IMG_JPG') && defined('IMAGETYPE_JPEG')) {
-	define('IMG_JPG', IMAGETYPE_JPEG);
-}
 if (!defined('ENT_SUBSTITUTE')) { // PHP5.3 adds ENT_IGNORE, PHP5.4 adds ENT_SUBSTITUTE
 	define('ENT_SUBSTITUTE', (defined('ENT_IGNORE') ? ENT_IGNORE : 8));
 }
@@ -57,7 +53,7 @@
 		if (substr($basedir, -1, 1) != DIRECTORY_SEPARATOR) {
 			$basedir .= DIRECTORY_SEPARATOR;
 		}
-		if (preg_match('#^'.preg_quote($basedir).'#', $temp_dir)) {
+		if (strpos($temp_dir, $basedir) === 0) {
 			$found_valid_tempdir = true;
 			break;
 		}
@@ -214,6 +210,140 @@ class getID3
 	 */
 	public $option_fread_buffer_size = 32768;
 
+
+
+	// module-specific options
+
+	/** archive.rar
+	 * if true use PHP RarArchive extension, if false (non-extension parsing not yet written in getID3)
+	 *
+	 * @var bool
+	 */
+	public $options_archive_rar_use_php_rar_extension = true;
+
+	/** archive.gzip
+	 * Optional file list - disable for speed.
+	 * Decode gzipped files, if possible, and parse recursively (.tar.gz for example).
+	 *
+	 * @var bool
+	 */
+	public $options_archive_gzip_parse_contents = false;
+
+	/** audio.midi
+	 * if false only parse most basic information, much faster for some files but may be inaccurate
+	 *
+	 * @var bool
+	 */
+	public $options_audio_midi_scanwholefile = true;
+
+	/** audio.mp3
+	 * Forces getID3() to scan the file byte-by-byte and log all the valid audio frame headers - extremely slow,
+	 * unrecommended, but may provide data from otherwise-unusable files.
+	 *
+	 * @var bool
+	 */
+	public $options_audio_mp3_allow_bruteforce = false;
+
+	/** audio.mp3
+	 * number of frames to scan to determine if MPEG-audio sequence is valid
+	 * Lower this number to 5-20 for faster scanning
+	 * Increase this number to 50+ for most accurate detection of valid VBR/CBR mpeg-audio streams
+	 *
+	 * @var int
+	 */
+	public $options_audio_mp3_mp3_valid_check_frames = 50;
+
+	/** audio.wavpack
+	 * Avoid scanning all frames (break after finding ID_RIFF_HEADER and ID_CONFIG_BLOCK,
+	 * significantly faster for very large files but other data may be missed
+	 *
+	 * @var bool
+	 */
+	public $options_audio_wavpack_quick_parsing = false;
+
+	/** audio-video.flv
+	 * Break out of the loop if too many frames have been scanned; only scan this
+	 * many if meta frame does not contain useful duration.
+	 *
+	 * @var int
+	 */
+	public $options_audiovideo_flv_max_frames = 100000;
+
+	/** audio-video.matroska
+	 * If true, do not return information about CLUSTER chunks, since there's a lot of them
+	 * and they're not usually useful [default: TRUE].
+	 *
+	 * @var bool
+	 */
+	public $options_audiovideo_matroska_hide_clusters    = true;
+
+	/** audio-video.matroska
+	 * True to parse the whole file, not only header [default: FALSE].
+	 *
+	 * @var bool
+	 */
+	public $options_audiovideo_matroska_parse_whole_file = false;
+
+	/** audio-video.quicktime
+	 * return all parsed data from all atoms if true, otherwise just returned parsed metadata
+	 *
+	 * @var bool
+	 */
+	public $options_audiovideo_quicktime_ReturnAtomData  = false;
+
+	/** audio-video.quicktime
+	 * return all parsed data from all atoms if true, otherwise just returned parsed metadata
+	 *
+	 * @var bool
+	 */
+	public $options_audiovideo_quicktime_ParseAllPossibleAtoms = false;
+
+	/** audio-video.swf
+	 * return all parsed tags if true, otherwise do not return tags not parsed by getID3
+	 *
+	 * @var bool
+	 */
+	public $options_audiovideo_swf_ReturnAllTagData = false;
+
+	/** graphic.bmp
+	 * return BMP palette
+	 *
+	 * @var bool
+	 */
+	public $options_graphic_bmp_ExtractPalette = false;
+
+	/** graphic.bmp
+	 * return image data
+	 *
+	 * @var bool
+	 */
+	public $options_graphic_bmp_ExtractData    = false;
+
+	/** graphic.png
+	 * If data chunk is larger than this do not read it completely (getID3 only needs the first
+	 * few dozen bytes for parsing).
+	 *
+	 * @var int
+	 */
+	public $options_graphic_png_max_data_bytes = 10000000;
+
+	/** misc.pdf
+	 * return full details of PDF Cross-Reference Table (XREF)
+	 *
+	 * @var bool
+	 */
+	public $options_misc_pdf_returnXREF = false;
+
+	/** misc.torrent
+	 * Assume all .torrent files are less than 1MB and just read entire thing into memory for easy processing.
+	 * Override this value if you need to process files larger than 1MB
+	 *
+	 * @var int
+	 */
+	public $options_misc_torrent_max_torrent_filesize = 1048576;
+
+
+
 	// Public variables
 
 	/**
@@ -257,7 +387,7 @@ class getID3
 	 */
 	protected $startup_warning = '';
 
-	const VERSION           = '1.9.20-202006061653';
+	const VERSION           = '1.9.21-202109171300';
 	const FREAD_BUFFER_SIZE = 32768;
 
 	const ATTACHMENTS_NONE   = false;
@@ -637,6 +767,18 @@ public function analyze($filename, $filesize=null, $original_filename='', $fp=nu
 				return $this->error('Format not supported, module "'.$determined_format['include'].'" is corrupt.');
 			}
 			$class = new $class_name($this);
+
+			// set module-specific options
+			foreach (get_object_vars($this) as $getid3_object_vars_key => $getid3_object_vars_value) {
+				if (preg_match('#^options_([^_]+)_([^_]+)_(.+)$#i', $getid3_object_vars_key, $matches)) {
+					list($dummy, $GOVgroup, $GOVmodule, $GOVsetting) = $matches;
+					$GOVgroup = (($GOVgroup == 'audiovideo') ? 'audio-video' : $GOVgroup); // variable names can only contain 0-9a-z_ so standardize here
+					if (($GOVgroup == $determined_format['group']) && ($GOVmodule == $determined_format['module'])) {
+						$class->$GOVsetting = $getid3_object_vars_value;
+					}
+				}
+			}
+
 			$class->Analyze();
 			unset($class);
 
@@ -1355,6 +1497,16 @@ public function GetFileFormatArray() {
 							'fail_ape'  => 'ERROR',
 						),
 
+				// TORRENT             - .torrent
+				'torrent' => array(
+							'pattern'   => '^(d8\\:announce|d7\\:comment)',
+							'group'     => 'misc',
+							'module'    => 'torrent',
+							'mime_type' => 'application/x-bittorrent',
+							'fail_id3'  => 'ERROR',
+							'fail_ape'  => 'ERROR',
+						),
+
 				 // CUE  - data       - CUEsheet (index to single-file disc images)
 				 'cue' => array(
 							'pattern'   => '', // empty pattern means cannot be automatically detected, will fall through all other formats and match based on filename and very basic file contents
@@ -1489,7 +1641,7 @@ public function HandleAllTags() {
 						if (is_string($value)) {
 							$value = trim($value, " \r\n\t"); // do not trim nulls from $value!! Unicode characters will get mangled if trailing nulls are removed!
 						}
-						if ($value) {
+						if (isset($value) && $value !== "") {
 							if (!is_numeric($key)) {
 								$this->info['tags'][trim($tag_name)][trim($tag_key)][$key] = $value;
 							} else {
@@ -2096,19 +2248,25 @@ protected function fseek($bytes, $whence=SEEK_SET) {
 					$this->data_string_position = $this->data_string_length + $bytes;
 					break;
 			}
-			return 0;
-		} else {
-			$pos = $bytes;
-			if ($whence == SEEK_CUR) {
-				$pos = $this->ftell() + $bytes;
-			} elseif ($whence == SEEK_END) {
-				$pos = $this->getid3->info['filesize'] + $bytes;
-			}
-			if (!getid3_lib::intValueSupported($pos)) {
-				throw new getid3_exception('cannot fseek('.$pos.') because beyond PHP filesystem limit', 10);
-			}
+			return 0; // fseek returns 0 on success
+		}
+
+		$pos = $bytes;
+		if ($whence == SEEK_CUR) {
+			$pos = $this->ftell() + $bytes;
+		} elseif ($whence == SEEK_END) {
+			$pos = $this->getid3->info['filesize'] + $bytes;
+		}
+		if (!getid3_lib::intValueSupported($pos)) {
+			throw new getid3_exception('cannot fseek('.$pos.') because beyond PHP filesystem limit', 10);
+		}
+
+		// https://github.com/JamesHeinrich/getID3/issues/327
+		$result = fseek($this->getid3->fp, $bytes, $whence);
+		if ($result !== 0) { // fseek returns 0 on success
+			throw new getid3_exception('cannot fseek('.$pos.'). resource/stream does not appear to support seeking', 10);
 		}
-		return fseek($this->getid3->fp, $bytes, $whence);
+		return $result;
 	}
 
 	/**
@@ -2224,6 +2382,8 @@ protected function notice($text) {
 	 * @throws getid3_exception
 	 */
 	public function saveAttachment($name, $offset, $length, $image_mime=null) {
+		$fp_dest = null;
+		$dest = null;
 		try {
 
 			// do not extract at all
diff --git a/src/wp-includes/ID3/module.audio-video.asf.php b/src/wp-includes/ID3/module.audio-video.asf.php
index fce923c0272ec..85edb7d755e68 100644
--- a/src/wp-includes/ID3/module.audio-video.asf.php
+++ b/src/wp-includes/ID3/module.audio-video.asf.php
@@ -93,6 +93,7 @@ public function Analyze() {
 		$offset = 0;
 		$thisfile_asf_streambitratepropertiesobject = array();
 		$thisfile_asf_codeclistobject = array();
+		$StreamPropertiesObjectData = array();
 
 		for ($HeaderObjectsCounter = 0; $HeaderObjectsCounter < $thisfile_asf_headerobject['headerobjects']; $HeaderObjectsCounter++) {
 			$NextObjectGUID = substr($ASFHeaderData, $offset, 16);
@@ -283,7 +284,7 @@ public function Analyze() {
 					$thisfile_asf_headerextensionobject['reserved_2']          = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
 					$offset += 2;
 					if ($thisfile_asf_headerextensionobject['reserved_2'] != 6) {
-						$this->warning('header_extension_object.reserved_2 ('.getid3_lib::PrintHexBytes($thisfile_asf_headerextensionobject['reserved_2']).') does not match expected value of "6"');
+						$this->warning('header_extension_object.reserved_2 ('.$thisfile_asf_headerextensionobject['reserved_2'].') does not match expected value of "6"');
 						//return false;
 						break;
 					}
@@ -535,7 +536,7 @@ public function Analyze() {
 					$thisfile_asf_markerobject['reserved_2'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
 					$offset += 2;
 					if ($thisfile_asf_markerobject['reserved_2'] != 0) {
-						$this->warning('marker_object.reserved_2 ('.getid3_lib::PrintHexBytes($thisfile_asf_markerobject['reserved_2']).') does not match expected value of "0"');
+						$this->warning('marker_object.reserved_2 ('.$thisfile_asf_markerobject['reserved_2'].') does not match expected value of "0"');
 						break;
 					}
 					$thisfile_asf_markerobject['name_length'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
@@ -1193,7 +1194,7 @@ public function Analyze() {
 					$thisfile_asf_dataobject['reserved']           = getid3_lib::LittleEndian2Int(substr($DataObjectData, $offset, 2));
 					$offset += 2;
 					if ($thisfile_asf_dataobject['reserved'] != 0x0101) {
-						$this->warning('data_object.reserved ('.getid3_lib::PrintHexBytes($thisfile_asf_dataobject['reserved']).') does not match expected value of "0x0101"');
+						$this->warning('data_object.reserved (0x'.sprintf('%04X', $thisfile_asf_dataobject['reserved']).') does not match expected value of "0x0101"');
 						//return false;
 						break;
 					}
diff --git a/src/wp-includes/ID3/module.audio-video.flv.php b/src/wp-includes/ID3/module.audio-video.flv.php
index 7e684072e35f8..3b59e596e331c 100644
--- a/src/wp-includes/ID3/module.audio-video.flv.php
+++ b/src/wp-includes/ID3/module.audio-video.flv.php
@@ -161,6 +161,7 @@ public function Analyze() {
 						$info['flv']['video']['videoCodec'] = $LastHeaderByte & 0x07;
 
 						$FLVvideoHeader = $this->fread(11);
+						$PictureSizeEnc = array();
 
 						if ($info['flv']['video']['videoCodec'] == GETID3_FLV_VIDEO_H264) {
 							// this code block contributed by: moysevichØgmail*com
diff --git a/src/wp-includes/ID3/module.audio-video.matroska.php b/src/wp-includes/ID3/module.audio-video.matroska.php
index a2851085907ca..128e614e2c5cc 100644
--- a/src/wp-includes/ID3/module.audio-video.matroska.php
+++ b/src/wp-includes/ID3/module.audio-video.matroska.php
@@ -224,14 +224,14 @@ class getid3_matroska extends getid3_handler
 	 *
 	 * @var bool
 	 */
-	public static $hide_clusters    = true;
+	public $hide_clusters    = true;
 
 	/**
 	 * True to parse the whole file, not only header [default: FALSE].
 	 *
 	 * @var bool
 	 */
-	public static $parse_whole_file = false;
+	public $parse_whole_file = false;
 
 	/*
 	 * Private parser settings/placeholders.
@@ -586,7 +586,7 @@ private function parseEBML(&$info) {
 					$info['matroska']['segment'][0]['length'] = $top_element['length'];
 
 					while ($this->getEBMLelement($element_data, $top_element['end'])) {
-						if ($element_data['id'] != EBML_ID_CLUSTER || !self::$hide_clusters) { // collect clusters only if required
+						if ($element_data['id'] != EBML_ID_CLUSTER || !$this->hide_clusters) { // collect clusters only if required
 							$info['matroska']['segments'][] = $element_data;
 						}
 						switch ($element_data['id']) {
@@ -618,7 +618,7 @@ private function parseEBML(&$info) {
 												$this->warning('seek_entry[target_id] unexpectedly not set at '.$seek_entry['offset']);
 												break;
 											}
-											if (($seek_entry['target_id'] != EBML_ID_CLUSTER) || !self::$hide_clusters) { // collect clusters only if required
+											if (($seek_entry['target_id'] != EBML_ID_CLUSTER) || !$this->hide_clusters) { // collect clusters only if required
 												$info['matroska']['seek'][] = $seek_entry;
 											}
 											break;
@@ -905,7 +905,7 @@ private function parseEBML(&$info) {
 								break;
 
 							case EBML_ID_CUES: // A top-level element to speed seeking access. All entries are local to the segment. Should be mandatory for non "live" streams.
-								if (self::$hide_clusters) { // do not parse cues if hide clusters is "ON" till they point to clusters anyway
+								if ($this->hide_clusters) { // do not parse cues if hide clusters is "ON" till they point to clusters anyway
 									$this->current_offset = $element_data['end'];
 									break;
 								}
@@ -1246,12 +1246,12 @@ private function parseEBML(&$info) {
 									}
 									$this->current_offset = $subelement['end'];
 								}
-								if (!self::$hide_clusters) {
+								if (!$this->hide_clusters) {
 									$info['matroska']['cluster'][] = $cluster_entry;
 								}
 
 								// check to see if all the data we need exists already, if so, break out of the loop
-								if (!self::$parse_whole_file) {
+								if (!$this->parse_whole_file) {
 									if (isset($info['matroska']['info']) && is_array($info['matroska']['info'])) {
 										if (isset($info['matroska']['tracks']['tracks']) && is_array($info['matroska']['tracks']['tracks'])) {
 											if (count($info['matroska']['track_data_offsets']) == count($info['matroska']['tracks']['tracks'])) {
diff --git a/src/wp-includes/ID3/module.audio-video.quicktime.php b/src/wp-includes/ID3/module.audio-video.quicktime.php
index 1cf1c0590b863..c3bccfd086b04 100644
--- a/src/wp-includes/ID3/module.audio-video.quicktime.php
+++ b/src/wp-includes/ID3/module.audio-video.quicktime.php
@@ -24,7 +24,18 @@
 class getid3_quicktime extends getid3_handler
 {
 
-	public $ReturnAtomData        = true;
+	/** audio-video.quicktime
+	 * return all parsed data from all atoms if true, otherwise just returned parsed metadata
+	 *
+	 * @var bool
+	 */
+	public $ReturnAtomData        = false;
+
+	/** audio-video.quicktime
+	 * return all parsed data from all atoms if true, otherwise just returned parsed metadata
+	 *
+	 * @var bool
+	 */
 	public $ParseAllPossibleAtoms = false;
 
 	/**
@@ -170,7 +181,7 @@ public function Analyze() {
 			}
 		}
 
-		if (!isset($info['bitrate']) && isset($info['playtime_seconds'])) {
+		if (!isset($info['bitrate']) && !empty($info['playtime_seconds'])) {
 			$info['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
 		}
 		if (isset($info['bitrate']) && !isset($info['audio']['bitrate']) && !isset($info['quicktime']['video'])) {
@@ -560,15 +571,28 @@ public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset
 											default:
 												$atom_structure['data'] = substr($boxdata, 8);
 												if ($atomname == 'covr') {
-													// not a foolproof check, but better than nothing
-													if (preg_match('#^\\xFF\\xD8\\xFF#', $atom_structure['data'])) {
-														$atom_structure['image_mime'] = 'image/jpeg';
-													} elseif (preg_match('#^\\x89\\x50\\x4E\\x47\\x0D\\x0A\\x1A\\x0A#', $atom_structure['data'])) {
-														$atom_structure['image_mime'] = 'image/png';
-													} elseif (preg_match('#^GIF#', $atom_structure['data'])) {
-														$atom_structure['image_mime'] = 'image/gif';
+													if (!empty($atom_structure['data'])) {
+														$atom_structure['image_mime'] = 'image/unknown'; // provide default MIME type to ensure array keys exist
+														if (function_exists('getimagesizefromstring') && ($getimagesize = getimagesizefromstring($atom_structure['data'])) && !empty($getimagesize['mime'])) {
+															$atom_structure['image_mime'] = $getimagesize['mime'];
+														} else {
+															// if getimagesizefromstring is not available, or fails for some reason, fall back to simple detection of common image formats
+															$ImageFormatSignatures = array(
+																'image/jpeg' => "\xFF\xD8\xFF",
+																'image/png'  => "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A",
+																'image/gif'  => 'GIF',
+															);
+															foreach ($ImageFormatSignatures as $mime => $image_format_signature) {
+																if (substr($atom_structure['data'], 0, strlen($image_format_signature)) == $image_format_signature) {
+																	$atom_structure['image_mime'] = $mime;
+																	break;
+																}
+															}
+														}
+														$info['quicktime']['comments']['picture'][] = array('image_mime'=>$atom_structure['image_mime'], 'data'=>$atom_structure['data'], 'description'=>'cover');
+													} else {
+														$this->warning('Unknown empty "covr" image at offset '.$baseoffset);
 													}
-													$info['quicktime']['comments']['picture'][] = array('image_mime'=>$atom_structure['image_mime'], 'data'=>$atom_structure['data'], 'description'=>'cover');
 												}
 												break;
 
@@ -728,11 +752,13 @@ public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset
 					$atom_structure['flags']['play_on_open'] = (bool) $atom_structure['play_on_open_flag'];
 					$atom_structure['flags']['slide_show']   = (bool) $atom_structure['slide_show_flag'];
 
-					$ptv_lookup[0] = 'normal';
-					$ptv_lookup[1] = 'double';
-					$ptv_lookup[2] = 'half';
-					$ptv_lookup[3] = 'full';
-					$ptv_lookup[4] = 'current';
+					$ptv_lookup = array(
+						0 => 'normal',
+						1 => 'double',
+						2 => 'half',
+						3 => 'full',
+						4 => 'current'
+					);
 					if (isset($ptv_lookup[$atom_structure['display_size_raw']])) {
 						$atom_structure['display_size'] = $ptv_lookup[$atom_structure['display_size_raw']];
 					} else {
@@ -908,13 +934,13 @@ public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset
 										$atom_structure['sample_description_table'][$i]['video_pixel_color_depth'] =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 66,  2));
 										$atom_structure['sample_description_table'][$i]['video_color_table_id']    =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 68,  2));
 
-										$atom_structure['sample_description_table'][$i]['video_pixel_color_type']  = (($atom_structure['sample_description_table'][$i]['video_pixel_color_depth'] > 32) ? 'grayscale' : 'color');
+										$atom_structure['sample_description_table'][$i]['video_pixel_color_type']  = (((int) $atom_structure['sample_description_table'][$i]['video_pixel_color_depth'] > 32) ? 'grayscale' : 'color');
 										$atom_structure['sample_description_table'][$i]['video_pixel_color_name']  = $this->QuicktimeColorNameLookup($atom_structure['sample_description_table'][$i]['video_pixel_color_depth']);
 
 										if ($atom_structure['sample_description_table'][$i]['video_pixel_color_name'] != 'invalid') {
 											$info['quicktime']['video']['codec_fourcc']        = $atom_structure['sample_description_table'][$i]['data_format'];
 											$info['quicktime']['video']['codec_fourcc_lookup'] = $this->QuicktimeVideoCodecLookup($atom_structure['sample_description_table'][$i]['data_format']);
-											$info['quicktime']['video']['codec']               = (($atom_structure['sample_description_table'][$i]['video_encoder_name_len'] > 0) ? $atom_structure['sample_description_table'][$i]['video_encoder_name'] : $atom_structure['sample_description_table'][$i]['data_format']);
+											$info['quicktime']['video']['codec']               = (((int) $atom_structure['sample_description_table'][$i]['video_encoder_name_len'] > 0) ? $atom_structure['sample_description_table'][$i]['video_encoder_name'] : $atom_structure['sample_description_table'][$i]['data_format']);
 											$info['quicktime']['video']['color_depth']         = $atom_structure['sample_description_table'][$i]['video_pixel_color_depth'];
 											$info['quicktime']['video']['color_depth_name']    = $atom_structure['sample_description_table'][$i]['video_pixel_color_name'];
 
@@ -1598,33 +1624,61 @@ public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset
 					break;
 
 				case 'NCDT':
-					// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html
+					// https://exiftool.org/TagNames/Nikon.html
 					// Nikon-specific QuickTime tags found in the NCDT atom of MOV videos from some Nikon cameras such as the Coolpix S8000 and D5100
 					$atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 4, $atomHierarchy, $ParseAllPossibleAtoms);
 					break;
 				case 'NCTH': // Nikon Camera THumbnail image
 				case 'NCVW': // Nikon Camera preVieW image
-					// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html
+				case 'NCM1': // Nikon Camera preview iMage 1
+				case 'NCM2': // Nikon Camera preview iMage 2
+					// https://exiftool.org/TagNames/Nikon.html
 					if (preg_match('/^\xFF\xD8\xFF/', $atom_data)) {
+						$descriptions = array(
+							'NCTH' => 'Nikon Camera Thumbnail Image',
+							'NCVW' => 'Nikon Camera Preview Image',
+							'NCM1' => 'Nikon Camera Preview Image 1',
+							'NCM2' => 'Nikon Camera Preview Image 2',
+						);
 						$atom_structure['data'] = $atom_data;
 						$atom_structure['image_mime'] = 'image/jpeg';
-						$atom_structure['description'] = (($atomname == 'NCTH') ? 'Nikon Camera Thumbnail Image' : (($atomname == 'NCVW') ? 'Nikon Camera Preview Image' : 'Nikon preview image'));
-						$info['quicktime']['comments']['picture'][] = array('image_mime'=>$atom_structure['image_mime'], 'data'=>$atom_data, 'description'=>$atom_structure['description']);
+						$atom_structure['description'] = isset($descriptions[$atomname]) ? $descriptions[$atomname] : 'Nikon preview image';
+						$info['quicktime']['comments']['picture'][] = array(
+							'image_mime' => $atom_structure['image_mime'],
+							'data' => $atom_data,
+							'description' => $atom_structure['description']
+						);
 					}
 					break;
-				case 'NCTG': // Nikon - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html#NCTG
-					$atom_structure['data'] = $this->QuicktimeParseNikonNCTG($atom_data);
+				case 'NCTG': // Nikon - https://exiftool.org/TagNames/Nikon.html#NCTG
+					getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.nikon-nctg.php', __FILE__, true);
+					$nikonNCTG = new getid3_tag_nikon_nctg($this->getid3);
+
+					$atom_structure['data'] = $nikonNCTG->parse($atom_data);
+					break;
+				case 'NCHD': // Nikon:MakerNoteVersion  - https://exiftool.org/TagNames/Nikon.html
+					$makerNoteVersion = '';
+					for ($i = 0, $iMax = strlen($atom_data); $i < $iMax; ++$i) {
+						if (ord($atom_data[$i]) >= 0x00 && ord($atom_data[$i]) <= 0x1F) {
+							$makerNoteVersion .= ' '.ord($atom_data[$i]);
+						} else {
+							$makerNoteVersion .= $atom_data[$i];
+						}
+					}
+					$makerNoteVersion = rtrim($makerNoteVersion, "\x00");
+					$atom_structure['data'] = array(
+						'MakerNoteVersion' => $makerNoteVersion
+					);
 					break;
-				case 'NCHD': // Nikon:MakerNoteVersion  - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html
-				case 'NCDB': // Nikon                   - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html
-				case 'CNCV': // Canon:CompressorVersion - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Canon.html
+				case 'NCDB': // Nikon                   - https://exiftool.org/TagNames/Nikon.html
+				case 'CNCV': // Canon:CompressorVersion - https://exiftool.org/TagNames/Canon.html
 					$atom_structure['data'] = $atom_data;
 					break;
 
 				case "\x00\x00\x00\x00":
 					// some kind of metacontainer, may contain a big data dump such as:
 					// mdta keys \005 mdtacom.apple.quicktime.make (mdtacom.apple.quicktime.creationdate ,mdtacom.apple.quicktime.location.ISO6709 $mdtacom.apple.quicktime.software !mdtacom.apple.quicktime.model ilst \01D \001 \015data \001DE\010Apple 0 \002 (data \001DE\0102011-05-11T17:54:04+0200 2 \003 *data \001DE\010+52.4936+013.3897+040.247/ \01D \004 \015data \001DE\0104.3.1 \005 \018data \001DE\010iPhone 4
-					// http://www.geocities.com/xhelmboyx/quicktime/formats/qti-layout.txt
+					// https://xhelmboyx.tripod.com/formats/qti-layout.txt
 
 					$atom_structure['version']   =          getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
 					$atom_structure['flags_raw'] =          getid3_lib::BigEndian2Int(substr($atom_data, 1, 3));
@@ -1721,6 +1775,7 @@ public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset
 									'unknown_data'   => array(),
 									'debug_list'     => '',      // Used to debug variables stored as comma delimited strings
 							);
+							$debug_structure = array();
 							$debug_structure['debug_items'] = array();
 							// Can start loop here to decode all sensor data in 32 Byte chunks:
 							foreach (str_split($atom_SENSOR_data, 32) as $sensor_key => $sensor_data) {
@@ -2039,7 +2094,7 @@ public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset
 	 * @return array|false
 	 */
 	public function QuicktimeParseContainerAtom($atom_data, $baseoffset, &$atomHierarchy, $ParseAllPossibleAtoms) {
-		$atom_structure  = false;
+		$atom_structure = array();
 		$subatomoffset  = 0;
 		$subatomcounter = 0;
 		if ((strlen($atom_data) == 4) && (getid3_lib::BigEndian2Int($atom_data) == 0x00000000)) {
@@ -2057,17 +2112,22 @@ public function QuicktimeParseContainerAtom($atom_data, $baseoffset, &$atomHiera
 					$subatomoffset += 4;
 					continue;
 				}
-				return $atom_structure;
+				break;
 			}
 			if (strlen($subatomdata) < ($subatomsize - 8)) {
 			    // we don't have enough data to decode the subatom.
 			    // this may be because we are refusing to parse large subatoms, or it may be because this atom had its size set too large
 			    // so we passed in the start of a following atom incorrectly?
-			    return $atom_structure;
+			    break;
 			}
 			$atom_structure[$subatomcounter++] = $this->QuicktimeParseAtom($subatomname, $subatomsize, $subatomdata, $baseoffset + $subatomoffset, $atomHierarchy, $ParseAllPossibleAtoms);
 			$subatomoffset += $subatomsize;
 		}
+
+		if (empty($atom_structure)) {
+			return false;
+		}
+
 		return $atom_structure;
 	}
 
@@ -2552,8 +2612,9 @@ public function QuicktimeContentRatingLookup($rtng) {
 		static $QuicktimeContentRatingLookup = array();
 		if (empty($QuicktimeContentRatingLookup)) {
 			$QuicktimeContentRatingLookup[0]  = 'None';
+			$QuicktimeContentRatingLookup[1]  = 'Explicit';
 			$QuicktimeContentRatingLookup[2]  = 'Clean';
-			$QuicktimeContentRatingLookup[4]  = 'Explicit';
+			$QuicktimeContentRatingLookup[4]  = 'Explicit (old)';
 		}
 		return (isset($QuicktimeContentRatingLookup[$rtng]) ? $QuicktimeContentRatingLookup[$rtng] : 'invalid');
 	}
@@ -2606,189 +2667,6 @@ public function QuicktimeStoreFrontCodeLookup($sfid) {
 		return (isset($QuicktimeStoreFrontCodeLookup[$sfid]) ? $QuicktimeStoreFrontCodeLookup[$sfid] : 'invalid');
 	}
 
-	/**
-	 * @param string $atom_data
-	 *
-	 * @return array
-	 */
-	public function QuicktimeParseNikonNCTG($atom_data) {
-		// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html#NCTG
-		// Nikon-specific QuickTime tags found in the NCDT atom of MOV videos from some Nikon cameras such as the Coolpix S8000 and D5100
-		// Data is stored as records of:
-		// * 4 bytes record type
-		// * 2 bytes size of data field type:
-		//     0x0001 = flag   (size field *= 1-byte)
-		//     0x0002 = char   (size field *= 1-byte)
-		//     0x0003 = DWORD+ (size field *= 2-byte), values are stored CDAB
-		//     0x0004 = QWORD+ (size field *= 4-byte), values are stored EFGHABCD
-		//     0x0005 = float  (size field *= 8-byte), values are stored aaaabbbb where value is aaaa/bbbb; possibly multiple sets of values appended together
-		//     0x0007 = bytes  (size field *= 1-byte), values are stored as ??????
-		//     0x0008 = ?????  (size field *= 2-byte), values are stored as ??????
-		// * 2 bytes data size field
-		// * ? bytes data (string data may be null-padded; datestamp fields are in the format "2011:05:25 20:24:15")
-		// all integers are stored BigEndian
-
-		$NCTGtagName = array(
-			0x00000001 => 'Make',
-			0x00000002 => 'Model',
-			0x00000003 => 'Software',
-			0x00000011 => 'CreateDate',
-			0x00000012 => 'DateTimeOriginal',
-			0x00000013 => 'FrameCount',
-			0x00000016 => 'FrameRate',
-			0x00000022 => 'FrameWidth',
-			0x00000023 => 'FrameHeight',
-			0x00000032 => 'AudioChannels',
-			0x00000033 => 'AudioBitsPerSample',
-			0x00000034 => 'AudioSampleRate',
-			0x02000001 => 'MakerNoteVersion',
-			0x02000005 => 'WhiteBalance',
-			0x0200000b => 'WhiteBalanceFineTune',
-			0x0200001e => 'ColorSpace',
-			0x02000023 => 'PictureControlData',
-			0x02000024 => 'WorldTime',
-			0x02000032 => 'UnknownInfo',
-			0x02000083 => 'LensType',
-			0x02000084 => 'Lens',
-		);
-
-		$offset = 0;
-		$data = null;
-		$datalength = strlen($atom_data);
-		$parsed = array();
-		while ($offset < $datalength) {
-			$record_type       = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 4));  $offset += 4;
-			$data_size_type    = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 2));  $offset += 2;
-			$data_size         = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 2));  $offset += 2;
-			switch ($data_size_type) {
-				case 0x0001: // 0x0001 = flag   (size field *= 1-byte)
-					$data = getid3_lib::BigEndian2Int(substr($atom_data, $offset, $data_size * 1));
-					$offset += ($data_size * 1);
-					break;
-				case 0x0002: // 0x0002 = char   (size field *= 1-byte)
-					$data = substr($atom_data, $offset, $data_size * 1);
-					$offset += ($data_size * 1);
-					$data = rtrim($data, "\x00");
-					break;
-				case 0x0003: // 0x0003 = DWORD+ (size field *= 2-byte), values are stored CDAB
-					$data = '';
-					for ($i = $data_size - 1; $i >= 0; $i--) {
-						$data .= substr($atom_data, $offset + ($i * 2), 2);
-					}
-					$data = getid3_lib::BigEndian2Int($data);
-					$offset += ($data_size * 2);
-					break;
-				case 0x0004: // 0x0004 = QWORD+ (size field *= 4-byte), values are stored EFGHABCD
-					$data = '';
-					for ($i = $data_size - 1; $i >= 0; $i--) {
-						$data .= substr($atom_data, $offset + ($i * 4), 4);
-					}
-					$data = getid3_lib::BigEndian2Int($data);
-					$offset += ($data_size * 4);
-					break;
-				case 0x0005: // 0x0005 = float  (size field *= 8-byte), values are stored aaaabbbb where value is aaaa/bbbb; possibly multiple sets of values appended together
-					$data = array();
-					for ($i = 0; $i < $data_size; $i++) {
-						$numerator    = getid3_lib::BigEndian2Int(substr($atom_data, $offset + ($i * 8) + 0, 4));
-						$denomninator = getid3_lib::BigEndian2Int(substr($atom_data, $offset + ($i * 8) + 4, 4));
-						if ($denomninator == 0) {
-							$data[$i] = false;
-						} else {
-							$data[$i] = (double) $numerator / $denomninator;
-						}
-					}
-					$offset += (8 * $data_size);
-					if (count($data) == 1) {
-						$data = $data[0];
-					}
-					break;
-				case 0x0007: // 0x0007 = bytes  (size field *= 1-byte), values are stored as ??????
-					$data = substr($atom_data, $offset, $data_size * 1);
-					$offset += ($data_size * 1);
-					break;
-				case 0x0008: // 0x0008 = ?????  (size field *= 2-byte), values are stored as ??????
-					$data = substr($atom_data, $offset, $data_size * 2);
-					$offset += ($data_size * 2);
-					break;
-				default:
-					echo 'QuicktimeParseNikonNCTG()::unknown $data_size_type: '.$data_size_type.'<br>';
-					break 2;
-			}
-
-			switch ($record_type) {
-				case 0x00000011: // CreateDate
-				case 0x00000012: // DateTimeOriginal
-					$data = strtotime($data);
-					break;
-				case 0x0200001e: // ColorSpace
-					switch ($data) {
-						case 1:
-							$data = 'sRGB';
-							break;
-						case 2:
-							$data = 'Adobe RGB';
-							break;
-					}
-					break;
-				case 0x02000023: // PictureControlData
-					$PictureControlAdjust = array(0=>'default', 1=>'quick', 2=>'full');
-					$FilterEffect = array(0x80=>'off', 0x81=>'yellow', 0x82=>'orange',    0x83=>'red', 0x84=>'green',  0xff=>'n/a');
-					$ToningEffect = array(0x80=>'b&w', 0x81=>'sepia',  0x82=>'cyanotype', 0x83=>'red', 0x84=>'yellow', 0x85=>'green', 0x86=>'blue-green', 0x87=>'blue', 0x88=>'purple-blue', 0x89=>'red-purple', 0xff=>'n/a');
-					$data = array(
-						'PictureControlVersion'     =>                           substr($data,  0,  4),
-						'PictureControlName'        =>                     rtrim(substr($data,  4, 20), "\x00"),
-						'PictureControlBase'        =>                     rtrim(substr($data, 24, 20), "\x00"),
-						//'?'                       =>                           substr($data, 44,  4),
-						'PictureControlAdjust'      => $PictureControlAdjust[ord(substr($data, 48,  1))],
-						'PictureControlQuickAdjust' =>                       ord(substr($data, 49,  1)),
-						'Sharpness'                 =>                       ord(substr($data, 50,  1)),
-						'Contrast'                  =>                       ord(substr($data, 51,  1)),
-						'Brightness'                =>                       ord(substr($data, 52,  1)),
-						'Saturation'                =>                       ord(substr($data, 53,  1)),
-						'HueAdjustment'             =>                       ord(substr($data, 54,  1)),
-						'FilterEffect'              =>         $FilterEffect[ord(substr($data, 55,  1))],
-						'ToningEffect'              =>         $ToningEffect[ord(substr($data, 56,  1))],
-						'ToningSaturation'          =>                       ord(substr($data, 57,  1)),
-					);
-					break;
-				case 0x02000024: // WorldTime
-					// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html#WorldTime
-					// timezone is stored as offset from GMT in minutes
-					$timezone = getid3_lib::BigEndian2Int(substr($data, 0, 2));
-					if ($timezone & 0x8000) {
-						$timezone = 0 - (0x10000 - $timezone);
-					}
-					$timezone /= 60;
-
-					$dst = (bool) getid3_lib::BigEndian2Int(substr($data, 2, 1));
-					switch (getid3_lib::BigEndian2Int(substr($data, 3, 1))) {
-						case 2:
-							$datedisplayformat = 'D/M/Y'; break;
-						case 1:
-							$datedisplayformat = 'M/D/Y'; break;
-						case 0:
-						default:
-							$datedisplayformat = 'Y/M/D'; break;
-					}
-
-					$data = array('timezone'=>floatval($timezone), 'dst'=>$dst, 'display'=>$datedisplayformat);
-					break;
-				case 0x02000083: // LensType
-					$data = array(
-						//'_'  => $data,
-						'mf' => (bool) ($data & 0x01),
-						'd'  => (bool) ($data & 0x02),
-						'g'  => (bool) ($data & 0x04),
-						'vr' => (bool) ($data & 0x08),
-					);
-					break;
-			}
-			$tag_name = (isset($NCTGtagName[$record_type]) ? $NCTGtagName[$record_type] : '0x'.str_pad(dechex($record_type), 8, '0', STR_PAD_LEFT));
-			$parsed[$tag_name] = $data;
-		}
-		return $parsed;
-	}
-
 	/**
 	 * @param string $keyname
 	 * @param string|array $data
diff --git a/src/wp-includes/ID3/module.audio-video.riff.php b/src/wp-includes/ID3/module.audio-video.riff.php
index cdf553386bc34..6ef1116ad13ea 100644
--- a/src/wp-includes/ID3/module.audio-video.riff.php
+++ b/src/wp-includes/ID3/module.audio-video.riff.php
@@ -56,6 +56,7 @@ public function Analyze() {
 		$thisfile_riff_video       = &$thisfile_riff['video'];
 		$thisfile_riff_WAVE        = array();
 
+		$Original                 = array();
 		$Original['avdataoffset'] = $info['avdataoffset'];
 		$Original['avdataend']    = $info['avdataend'];
 
@@ -296,9 +297,18 @@ public function Analyze() {
 					// shortcut
 					$thisfile_riff_WAVE_bext_0 = &$thisfile_riff_WAVE['bext'][0];
 
-					$thisfile_riff_WAVE_bext_0['title']          =                         trim(substr($thisfile_riff_WAVE_bext_0['data'],   0, 256));
-					$thisfile_riff_WAVE_bext_0['author']         =                         trim(substr($thisfile_riff_WAVE_bext_0['data'], 256,  32));
-					$thisfile_riff_WAVE_bext_0['reference']      =                         trim(substr($thisfile_riff_WAVE_bext_0['data'], 288,  32));
+					$thisfile_riff_WAVE_bext_0['title']          =                              substr($thisfile_riff_WAVE_bext_0['data'],   0, 256);
+					$thisfile_riff_WAVE_bext_0['author']         =                              substr($thisfile_riff_WAVE_bext_0['data'], 256,  32);
+					$thisfile_riff_WAVE_bext_0['reference']      =                              substr($thisfile_riff_WAVE_bext_0['data'], 288,  32);
+					foreach (array('title','author','reference') as $bext_key) {
+						// Some software (notably Logic Pro) may not blank existing data before writing a null-terminated string to the offsets
+						// assigned for text fields, resulting in a null-terminated string (or possibly just a single null) followed by garbage
+						// Keep only string as far as first null byte, discard rest of fixed-width data
+						// https://github.com/JamesHeinrich/getID3/issues/263
+						$null_terminator_offset = strpos($thisfile_riff_WAVE_bext_0[$bext_key], "\x00");
+						$thisfile_riff_WAVE_bext_0[$bext_key] = substr($thisfile_riff_WAVE_bext_0[$bext_key], 0, $null_terminator_offset);
+					}
+
 					$thisfile_riff_WAVE_bext_0['origin_date']    =                              substr($thisfile_riff_WAVE_bext_0['data'], 320,  10);
 					$thisfile_riff_WAVE_bext_0['origin_time']    =                              substr($thisfile_riff_WAVE_bext_0['data'], 330,   8);
 					$thisfile_riff_WAVE_bext_0['time_reference'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_bext_0['data'], 338,   8));
@@ -307,6 +317,7 @@ public function Analyze() {
 					$thisfile_riff_WAVE_bext_0['coding_history'] =         explode("\r\n", trim(substr($thisfile_riff_WAVE_bext_0['data'], 601)));
 					if (preg_match('#^([0-9]{4}).([0-9]{2}).([0-9]{2})$#', $thisfile_riff_WAVE_bext_0['origin_date'], $matches_bext_date)) {
 						if (preg_match('#^([0-9]{2}).([0-9]{2}).([0-9]{2})$#', $thisfile_riff_WAVE_bext_0['origin_time'], $matches_bext_time)) {
+							$bext_timestamp = array();
 							list($dummy, $bext_timestamp['year'], $bext_timestamp['month'],  $bext_timestamp['day'])    = $matches_bext_date;
 							list($dummy, $bext_timestamp['hour'], $bext_timestamp['minute'], $bext_timestamp['second']) = $matches_bext_time;
 							$thisfile_riff_WAVE_bext_0['origin_date_unix'] = gmmktime($bext_timestamp['hour'], $bext_timestamp['minute'], $bext_timestamp['second'], $bext_timestamp['month'], $bext_timestamp['day'], $bext_timestamp['year']);
@@ -451,7 +462,62 @@ public function Analyze() {
 					}
 				}
 
+				if (isset($thisfile_riff_WAVE['guan'][0]['data'])) {
+					// shortcut
+					$thisfile_riff_WAVE_guan_0 = &$thisfile_riff_WAVE['guan'][0];
+					if (!empty($thisfile_riff_WAVE_guan_0['data']) && (substr($thisfile_riff_WAVE_guan_0['data'], 0, 14) == 'GUANO|Version:')) {
+						$thisfile_riff['guano'] = array();
+						foreach (explode("\n", $thisfile_riff_WAVE_guan_0['data']) as $line) {
+							if ($line) {
+								@list($key, $value) = explode(':', $line, 2);
+								if (substr($value, 0, 3) == '[{"') {
+									if ($decoded = @json_decode($value, true)) {
+										if (!empty($decoded) && (count($decoded) == 1)) {
+											$value = $decoded[0];
+										} else {
+											$value = $decoded;
+										}
+									}
+								}
+								$thisfile_riff['guano'] = array_merge_recursive($thisfile_riff['guano'], getid3_lib::CreateDeepArray($key, '|', $value));
+							}
+						}
+
+						// https://www.wildlifeacoustics.com/SCHEMA/GUANO.html
+						foreach ($thisfile_riff['guano'] as $key => $value) {
+							switch ($key) {
+								case 'Loc Position':
+									if (preg_match('#^([\\+\\-]?[0-9]+\\.[0-9]+) ([\\+\\-]?[0-9]+\\.[0-9]+)$#', $value, $matches)) {
+										list($dummy, $latitude, $longitude) = $matches;
+										$thisfile_riff['comments']['gps_latitude'][0]  = floatval($latitude);
+										$thisfile_riff['comments']['gps_longitude'][0] = floatval($longitude);
+										$thisfile_riff['guano'][$key] = floatval($latitude).' '.floatval($longitude);
+									}
+									break;
+								case 'Loc Elevation': // Elevation/altitude above mean sea level in meters
+									$thisfile_riff['comments']['gps_altitude'][0] = floatval($value);
+									$thisfile_riff['guano'][$key] = (float) $value;
+									break;
+								case 'Filter HP':        // High-pass filter frequency in kHz
+								case 'Filter LP':        // Low-pass filter frequency in kHz
+								case 'Humidity':         // Relative humidity as a percentage
+								case 'Length':           // Recording length in seconds
+								case 'Loc Accuracy':     // Estimated Position Error in meters
+								case 'Temperature Ext':  // External temperature in degrees Celsius outside the recorder's housing
+								case 'Temperature Int':  // Internal temperature in degrees Celsius inside the recorder's housing
+									$thisfile_riff['guano'][$key] = (float) $value;
+									break;
+								case 'Samplerate':       // Recording sample rate, Hz
+								case 'TE':               // Time-expansion factor. If not specified, then 1 (no time-expansion a.k.a. direct-recording) is assumed.
+									$thisfile_riff['guano'][$key] = (int) $value;
+									break;
+							}
+						}
 
+					} else {
+						$this->warning('RIFF.guan data not in expected format');
+					}
+				}
 
 				if (!isset($thisfile_audio['bitrate']) && isset($thisfile_riff_audio[$streamindex]['bitrate'])) {
 					$thisfile_audio['bitrate'] = $thisfile_riff_audio[$streamindex]['bitrate'];
@@ -733,6 +799,7 @@ public function Analyze() {
 				}
 				if (isset($thisfile_riff['AVI ']['hdrl']['strl']['strh'][0]['data'])) {
 					if (is_array($thisfile_riff['AVI ']['hdrl']['strl']['strh'])) {
+						$thisfile_riff_raw_strf_strhfccType_streamindex = null;
 						for ($i = 0; $i < count($thisfile_riff['AVI ']['hdrl']['strl']['strh']); $i++) {
 							if (isset($thisfile_riff['AVI ']['hdrl']['strl']['strh'][$i]['data'])) {
 								$strhData = $thisfile_riff['AVI ']['hdrl']['strl']['strh'][$i]['data'];
@@ -1069,7 +1136,7 @@ public function Analyze() {
 				if (isset($thisfile_riff[$RIFFsubtype]['ID3 '])) {
 					getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v2.php', __FILE__, true);
 					$getid3_temp = new getID3();
-					$getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
+					$getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
 					$getid3_id3v2 = new getid3_id3v2($getid3_temp);
 					$getid3_id3v2->StartingOffset = $thisfile_riff[$RIFFsubtype]['ID3 '][0]['offset'] + 8;
 					if ($thisfile_riff[$RIFFsubtype]['ID3 '][0]['valid'] = $getid3_id3v2->Analyze()) {
@@ -1172,7 +1239,7 @@ public function Analyze() {
 					getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.mpeg.php', __FILE__, true);
 
 					$getid3_temp = new getID3();
-					$getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
+					$getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
 					$getid3_mpeg = new getid3_mpeg($getid3_temp);
 					$getid3_mpeg->Analyze();
 					if (empty($getid3_temp->info['error'])) {
@@ -1258,7 +1325,7 @@ public function Analyze() {
 					getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v2.php', __FILE__, true);
 
 					$getid3_temp = new getID3();
-					$getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
+					$getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
 					$getid3_id3v2 = new getid3_id3v2($getid3_temp);
 					$getid3_id3v2->StartingOffset = $thisfile_riff[$RIFFsubtype]['id3 '][0]['offset'] + 8;
 					if ($thisfile_riff[$RIFFsubtype]['id3 '][0]['valid'] = $getid3_id3v2->Analyze()) {
@@ -1514,6 +1581,9 @@ public function ParseRIFF($startoffset, $maxoffset) {
 
 		$RIFFchunk = false;
 		$FoundAllChunksWeNeed = false;
+		$LISTchunkParent = null;
+		$LISTchunkMaxOffset = null;
+		$AC3syncwordBytes = pack('n', getid3_ac3::syncword); // 0x0B77 -> "\x0B\x77"
 
 		try {
 			$this->fseek($startoffset);
@@ -1557,7 +1627,7 @@ public function ParseRIFF($startoffset, $maxoffset) {
 										// MP3
 										if (getid3_mp3::MPEGaudioHeaderBytesValid($FirstFourBytes)) {
 											$getid3_temp = new getID3();
-											$getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
+											$getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
 											$getid3_temp->info['avdataoffset'] = $this->ftell() - 4;
 											$getid3_temp->info['avdataend']    = $this->ftell() + $AudioChunkSize;
 											$getid3_mp3 = new getid3_mp3($getid3_temp, __CLASS__);
@@ -1575,11 +1645,10 @@ public function ParseRIFF($startoffset, $maxoffset) {
 											unset($getid3_temp, $getid3_mp3);
 										}
 
-									} elseif (strpos($FirstFourBytes, getid3_ac3::syncword) === 0) {
-
+									} elseif (strpos($FirstFourBytes, $AC3syncwordBytes) === 0) {
 										// AC3
 										$getid3_temp = new getID3();
-										$getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
+										$getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
 										$getid3_temp->info['avdataoffset'] = $this->ftell() - 4;
 										$getid3_temp->info['avdataend']    = $this->ftell() + $AudioChunkSize;
 										$getid3_ac3 = new getid3_ac3($getid3_temp);
@@ -1640,7 +1709,7 @@ public function ParseRIFF($startoffset, $maxoffset) {
 									// Probably is MP3 data
 									if (getid3_mp3::MPEGaudioHeaderBytesValid(substr($testData, 0, 4))) {
 										$getid3_temp = new getID3();
-										$getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
+										$getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
 										$getid3_temp->info['avdataoffset'] = $info['avdataoffset'];
 										$getid3_temp->info['avdataend']    = $info['avdataend'];
 										$getid3_mp3 = new getid3_mp3($getid3_temp, __CLASS__);
@@ -1652,12 +1721,12 @@ public function ParseRIFF($startoffset, $maxoffset) {
 										unset($getid3_temp, $getid3_mp3);
 									}
 
-								} elseif (($isRegularAC3 = (substr($testData, 0, 2) == getid3_ac3::syncword)) || substr($testData, 8, 2) == strrev(getid3_ac3::syncword)) {
+								} elseif (($isRegularAC3 = (substr($testData, 0, 2) == $AC3syncwordBytes)) || substr($testData, 8, 2) == strrev($AC3syncwordBytes)) {
 
 									// This is probably AC-3 data
 									$getid3_temp = new getID3();
 									if ($isRegularAC3) {
-										$getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
+										$getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
 										$getid3_temp->info['avdataoffset'] = $info['avdataoffset'];
 										$getid3_temp->info['avdataend']    = $info['avdataend'];
 									}
@@ -1673,6 +1742,8 @@ public function ParseRIFF($startoffset, $maxoffset) {
 											$ac3_data .= substr($testData, 8 + $i + 1, 1);
 											$ac3_data .= substr($testData, 8 + $i + 0, 1);
 										}
+										$getid3_ac3->getid3->info['avdataoffset'] = 0;
+										$getid3_ac3->getid3->info['avdataend']    = strlen($ac3_data);
 										$getid3_ac3->AnalyzeString($ac3_data);
 									}
 
@@ -1691,7 +1762,7 @@ public function ParseRIFF($startoffset, $maxoffset) {
 
 									// This is probably DTS data
 									$getid3_temp = new getID3();
-									$getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
+									$getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
 									$getid3_temp->info['avdataoffset'] = $info['avdataoffset'];
 									$getid3_dts = new getid3_dts($getid3_temp);
 									$getid3_dts->Analyze();
@@ -1732,6 +1803,8 @@ public function ParseRIFF($startoffset, $maxoffset) {
 							case 'indx':
 							case 'MEXT':
 							case 'DISP':
+							case 'wamd':
+							case 'guan':
 								// always read data in
 							case 'JUNK':
 								// should be: never read data in
@@ -2076,6 +2149,7 @@ public function parseWavPackHeader($WavPackChunkData) {
 	 */
 	public static function ParseBITMAPINFOHEADER($BITMAPINFOHEADER, $littleEndian=true) {
 
+		$parsed                    = array();
 		$parsed['biSize']          = substr($BITMAPINFOHEADER,  0, 4); // number of bytes required by the BITMAPINFOHEADER structure
 		$parsed['biWidth']         = substr($BITMAPINFOHEADER,  4, 4); // width of the bitmap in pixels
 		$parsed['biHeight']        = substr($BITMAPINFOHEADER,  8, 4); // height of the bitmap in pixels. If biHeight is positive, the bitmap is a 'bottom-up' DIB and its origin is the lower left corner. If biHeight is negative, the bitmap is a 'top-down' DIB and its origin is the upper left corner
diff --git a/src/wp-includes/ID3/module.audio.flac.php b/src/wp-includes/ID3/module.audio.flac.php
index 1cea4364c2a0e..014061da943c2 100644
--- a/src/wp-includes/ID3/module.audio.flac.php
+++ b/src/wp-includes/ID3/module.audio.flac.php
@@ -402,6 +402,7 @@ private function parseCUESHEET($BlockData) {
 	public function parsePICTURE() {
 		$info = &$this->getid3->info;
 
+		$picture = array();
 		$picture['typeid']         = getid3_lib::BigEndian2Int($this->fread(4));
 		$picture['picturetype']    = self::pictureTypeLookup($picture['typeid']);
 		$picture['image_mime']     = $this->fread(getid3_lib::BigEndian2Int($this->fread(4)));
diff --git a/src/wp-includes/ID3/module.audio.mp3.php b/src/wp-includes/ID3/module.audio.mp3.php
index 26b28068f8b50..1f5a566b831cf 100644
--- a/src/wp-includes/ID3/module.audio.mp3.php
+++ b/src/wp-includes/ID3/module.audio.mp3.php
@@ -18,12 +18,6 @@
 	exit;
 }
 
-// number of frames to scan to determine if MPEG-audio sequence is valid
-// Lower this number to 5-20 for faster scanning
-// Increase this number to 50+ for most accurate detection of valid VBR/CBR
-// mpeg-audio streams
-define('GETID3_MP3_VALID_CHECK_FRAMES', 35);
-
 
 class getid3_mp3 extends getid3_handler
 {
@@ -35,6 +29,15 @@ class getid3_mp3 extends getid3_handler
 	 */
 	public $allow_bruteforce = false;
 
+	/**
+	 * number of frames to scan to determine if MPEG-audio sequence is valid
+	 * Lower this number to 5-20 for faster scanning
+	 * Increase this number to 50+ for most accurate detection of valid VBR/CBR mpeg-audio streams
+	 *
+	 * @var int
+	 */
+	public $mp3_valid_check_frames = 50;
+
 	/**
 	 * @return bool
 	 */
@@ -55,6 +58,7 @@ public function Analyze() {
 			$info['audio']['bitrate_mode'] = strtolower($info['mpeg']['audio']['bitrate_mode']);
 		}
 
+		$CurrentDataLAMEversionString = null;
 		if (((isset($info['id3v2']['headerlength']) && ($info['avdataoffset'] > $info['id3v2']['headerlength'])) || (!isset($info['id3v2']) && ($info['avdataoffset'] > 0) && ($info['avdataoffset'] != $initialOffset)))) {
 
 			$synchoffsetwarning = 'Unknown data before synch ';
@@ -121,6 +125,12 @@ public function Analyze() {
 				if (substr($PossiblyLongerLAMEversion_String, 0, strlen($CurrentDataLAMEversionString)) == $CurrentDataLAMEversionString) {
 					$PossiblyLongerLAMEversion_NewString = substr($PossiblyLongerLAMEversion_String, 0, strspn($PossiblyLongerLAMEversion_String, 'LAME0123456789., (abcdefghijklmnopqrstuvwxyzJFSOND)')); //"LAME3.90.3"  "LAME3.87 (beta 1, Sep 27 2000)" "LAME3.88 (beta)"
 					if (empty($info['audio']['encoder']) || (strlen($PossiblyLongerLAMEversion_NewString) > strlen($info['audio']['encoder']))) {
+						if (!empty($info['audio']['encoder']) && !empty($info['mpeg']['audio']['LAME']['short_version']) && ($info['audio']['encoder'] == $info['mpeg']['audio']['LAME']['short_version'])) {
+							if (preg_match('#^LAME[0-9\\.]+#', $PossiblyLongerLAMEversion_NewString, $matches)) {
+								// "LAME3.100" -> "LAME3.100.1", but avoid including "(alpha)" and similar
+								$info['mpeg']['audio']['LAME']['short_version'] = $matches[0];
+							}
+						}
 						$info['audio']['encoder'] = $PossiblyLongerLAMEversion_NewString;
 					}
 				}
@@ -295,7 +305,7 @@ public function GuessEncoderOptions() {
 		} elseif (!empty($info['audio']['bitrate'])) {
 
 			if ($info['audio']['bitrate_mode'] == 'cbr') {
-				$encoder_options = strtoupper($info['audio']['bitrate_mode']).ceil($info['audio']['bitrate'] / 1000);
+				$encoder_options = strtoupper($info['audio']['bitrate_mode']).round($info['audio']['bitrate'] / 1000);
 			} else {
 				$encoder_options = strtoupper($info['audio']['bitrate_mode']);
 			}
@@ -488,7 +498,7 @@ public function decodeMPEGaudioHeader($offset, &$info, $recursivesearch=true, $S
 		if ($MPEGaudioHeaderValidCache[$head4_key]) {
 			$thisfile_mpeg_audio['raw'] = $MPEGheaderRawArray;
 		} else {
-			$this->error('Invalid MPEG audio header ('.getid3_lib::PrintHexBytes($head4).') at offset '.$offset);
+			$this->warning('Invalid MPEG audio header ('.getid3_lib::PrintHexBytes($head4).') at offset '.$offset);
 			return false;
 		}
 
@@ -722,197 +732,200 @@ public function decodeMPEGaudioHeader($offset, &$info, $recursivesearch=true, $S
 
 					$thisfile_mpeg_audio_lame['long_version']  = substr($headerstring, $VBRidOffset + 120, 20);
 					$thisfile_mpeg_audio_lame['short_version'] = substr($thisfile_mpeg_audio_lame['long_version'], 0, 9);
-					$thisfile_mpeg_audio_lame['numeric_version'] = str_replace('LAME', '', $thisfile_mpeg_audio_lame['short_version']);
-					if (preg_match('#^LAME([0-9\\.a-z]+)#', $thisfile_mpeg_audio_lame['long_version'], $matches)) {
+
+					//$thisfile_mpeg_audio_lame['numeric_version'] = str_replace('LAME', '', $thisfile_mpeg_audio_lame['short_version']);
+					$thisfile_mpeg_audio_lame['numeric_version'] = '';
+					if (preg_match('#^LAME([0-9\\.a-z]*)#', $thisfile_mpeg_audio_lame['long_version'], $matches)) {
 						$thisfile_mpeg_audio_lame['short_version']   = $matches[0];
 						$thisfile_mpeg_audio_lame['numeric_version'] = $matches[1];
 					}
-					foreach (explode('.', $thisfile_mpeg_audio_lame['numeric_version']) as $key => $number) {
-						$thisfile_mpeg_audio_lame['integer_version'][$key] = intval($number);
-					}
-
-					//if ($thisfile_mpeg_audio_lame['short_version'] >= 'LAME3.90') {
-					if ((($thisfile_mpeg_audio_lame['integer_version'][0] * 1000) + $thisfile_mpeg_audio_lame['integer_version'][1]) >= 3090) { // cannot use string version compare, may have "LAME3.90" or "LAME3.100" -- see https://github.com/JamesHeinrich/getID3/issues/207
-
-						// extra 11 chars are not part of version string when LAMEtag present
-						unset($thisfile_mpeg_audio_lame['long_version']);
-
-						// It the LAME tag was only introduced in LAME v3.90
-						// http://www.hydrogenaudio.org/?act=ST&f=15&t=9933
-
-						// Offsets of various bytes in http://gabriel.mp3-tech.org/mp3infotag.html
-						// are assuming a 'Xing' identifier offset of 0x24, which is the case for
-						// MPEG-1 non-mono, but not for other combinations
-						$LAMEtagOffsetContant = $VBRidOffset - 0x24;
-
-						// shortcuts
-						$thisfile_mpeg_audio_lame['RGAD']    = array('track'=>array(), 'album'=>array());
-						$thisfile_mpeg_audio_lame_RGAD       = &$thisfile_mpeg_audio_lame['RGAD'];
-						$thisfile_mpeg_audio_lame_RGAD_track = &$thisfile_mpeg_audio_lame_RGAD['track'];
-						$thisfile_mpeg_audio_lame_RGAD_album = &$thisfile_mpeg_audio_lame_RGAD['album'];
-						$thisfile_mpeg_audio_lame['raw'] = array();
-						$thisfile_mpeg_audio_lame_raw    = &$thisfile_mpeg_audio_lame['raw'];
-
-						// byte $9B  VBR Quality
-						// This field is there to indicate a quality level, although the scale was not precised in the original Xing specifications.
-						// Actually overwrites original Xing bytes
-						unset($thisfile_mpeg_audio['VBR_scale']);
-						$thisfile_mpeg_audio_lame['vbr_quality'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0x9B, 1));
-
-						// bytes $9C-$A4  Encoder short VersionString
-						$thisfile_mpeg_audio_lame['short_version'] = substr($headerstring, $LAMEtagOffsetContant + 0x9C, 9);
-
-						// byte $A5  Info Tag revision + VBR method
-						$LAMEtagRevisionVBRmethod = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA5, 1));
-
-						$thisfile_mpeg_audio_lame['tag_revision']   = ($LAMEtagRevisionVBRmethod & 0xF0) >> 4;
-						$thisfile_mpeg_audio_lame_raw['vbr_method'] =  $LAMEtagRevisionVBRmethod & 0x0F;
-						$thisfile_mpeg_audio_lame['vbr_method']     = self::LAMEvbrMethodLookup($thisfile_mpeg_audio_lame_raw['vbr_method']);
-						$thisfile_mpeg_audio['bitrate_mode']        = substr($thisfile_mpeg_audio_lame['vbr_method'], 0, 3); // usually either 'cbr' or 'vbr', but truncates 'vbr-old / vbr-rh' to 'vbr'
-
-						// byte $A6  Lowpass filter value
-						$thisfile_mpeg_audio_lame['lowpass_frequency'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA6, 1)) * 100;
-
-						// bytes $A7-$AE  Replay Gain
-						// http://privatewww.essex.ac.uk/~djmrob/replaygain/rg_data_format.html
-						// bytes $A7-$AA : 32 bit floating point "Peak signal amplitude"
-						if ($thisfile_mpeg_audio_lame['short_version'] >= 'LAME3.94b') {
-							// LAME 3.94a16 and later - 9.23 fixed point
-							// ie 0x0059E2EE / (2^23) = 5890798 / 8388608 = 0.7022378444671630859375
-							$thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] = (float) ((getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA7, 4))) / 8388608);
-						} else {
-							// LAME 3.94a15 and earlier - 32-bit floating point
-							// Actually 3.94a16 will fall in here too and be WRONG, but is hard to detect 3.94a16 vs 3.94a15
-							$thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] = getid3_lib::LittleEndian2Float(substr($headerstring, $LAMEtagOffsetContant + 0xA7, 4));
-						}
-						if ($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] == 0) {
-							unset($thisfile_mpeg_audio_lame_RGAD['peak_amplitude']);
-						} else {
-							$thisfile_mpeg_audio_lame_RGAD['peak_db'] = getid3_lib::RGADamplitude2dB($thisfile_mpeg_audio_lame_RGAD['peak_amplitude']);
+					if (strlen($thisfile_mpeg_audio_lame['numeric_version']) > 0) {
+						foreach (explode('.', $thisfile_mpeg_audio_lame['numeric_version']) as $key => $number) {
+							$thisfile_mpeg_audio_lame['integer_version'][$key] = intval($number);
 						}
+						//if ($thisfile_mpeg_audio_lame['short_version'] >= 'LAME3.90') {
+						if ((($thisfile_mpeg_audio_lame['integer_version'][0] * 1000) + $thisfile_mpeg_audio_lame['integer_version'][1]) >= 3090) { // cannot use string version compare, may have "LAME3.90" or "LAME3.100" -- see https://github.com/JamesHeinrich/getID3/issues/207
+
+							// extra 11 chars are not part of version string when LAMEtag present
+							unset($thisfile_mpeg_audio_lame['long_version']);
+
+							// It the LAME tag was only introduced in LAME v3.90
+							// http://www.hydrogenaudio.org/?act=ST&f=15&t=9933
+
+							// Offsets of various bytes in http://gabriel.mp3-tech.org/mp3infotag.html
+							// are assuming a 'Xing' identifier offset of 0x24, which is the case for
+							// MPEG-1 non-mono, but not for other combinations
+							$LAMEtagOffsetContant = $VBRidOffset - 0x24;
+
+							// shortcuts
+							$thisfile_mpeg_audio_lame['RGAD']    = array('track'=>array(), 'album'=>array());
+							$thisfile_mpeg_audio_lame_RGAD       = &$thisfile_mpeg_audio_lame['RGAD'];
+							$thisfile_mpeg_audio_lame_RGAD_track = &$thisfile_mpeg_audio_lame_RGAD['track'];
+							$thisfile_mpeg_audio_lame_RGAD_album = &$thisfile_mpeg_audio_lame_RGAD['album'];
+							$thisfile_mpeg_audio_lame['raw'] = array();
+							$thisfile_mpeg_audio_lame_raw    = &$thisfile_mpeg_audio_lame['raw'];
+
+							// byte $9B  VBR Quality
+							// This field is there to indicate a quality level, although the scale was not precised in the original Xing specifications.
+							// Actually overwrites original Xing bytes
+							unset($thisfile_mpeg_audio['VBR_scale']);
+							$thisfile_mpeg_audio_lame['vbr_quality'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0x9B, 1));
+
+							// bytes $9C-$A4  Encoder short VersionString
+							$thisfile_mpeg_audio_lame['short_version'] = substr($headerstring, $LAMEtagOffsetContant + 0x9C, 9);
+
+							// byte $A5  Info Tag revision + VBR method
+							$LAMEtagRevisionVBRmethod = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA5, 1));
+
+							$thisfile_mpeg_audio_lame['tag_revision']   = ($LAMEtagRevisionVBRmethod & 0xF0) >> 4;
+							$thisfile_mpeg_audio_lame_raw['vbr_method'] =  $LAMEtagRevisionVBRmethod & 0x0F;
+							$thisfile_mpeg_audio_lame['vbr_method']     = self::LAMEvbrMethodLookup($thisfile_mpeg_audio_lame_raw['vbr_method']);
+							$thisfile_mpeg_audio['bitrate_mode']        = substr($thisfile_mpeg_audio_lame['vbr_method'], 0, 3); // usually either 'cbr' or 'vbr', but truncates 'vbr-old / vbr-rh' to 'vbr'
+
+							// byte $A6  Lowpass filter value
+							$thisfile_mpeg_audio_lame['lowpass_frequency'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA6, 1)) * 100;
+
+							// bytes $A7-$AE  Replay Gain
+							// http://privatewww.essex.ac.uk/~djmrob/replaygain/rg_data_format.html
+							// bytes $A7-$AA : 32 bit floating point "Peak signal amplitude"
+							if ($thisfile_mpeg_audio_lame['short_version'] >= 'LAME3.94b') {
+								// LAME 3.94a16 and later - 9.23 fixed point
+								// ie 0x0059E2EE / (2^23) = 5890798 / 8388608 = 0.7022378444671630859375
+								$thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] = (float) ((getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA7, 4))) / 8388608);
+							} else {
+								// LAME 3.94a15 and earlier - 32-bit floating point
+								// Actually 3.94a16 will fall in here too and be WRONG, but is hard to detect 3.94a16 vs 3.94a15
+								$thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] = getid3_lib::LittleEndian2Float(substr($headerstring, $LAMEtagOffsetContant + 0xA7, 4));
+							}
+							if ($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] == 0) {
+								unset($thisfile_mpeg_audio_lame_RGAD['peak_amplitude']);
+							} else {
+								$thisfile_mpeg_audio_lame_RGAD['peak_db'] = getid3_lib::RGADamplitude2dB($thisfile_mpeg_audio_lame_RGAD['peak_amplitude']);
+							}
 
-						$thisfile_mpeg_audio_lame_raw['RGAD_track']      =   getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAB, 2));
-						$thisfile_mpeg_audio_lame_raw['RGAD_album']      =   getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAD, 2));
+							$thisfile_mpeg_audio_lame_raw['RGAD_track']      =   getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAB, 2));
+							$thisfile_mpeg_audio_lame_raw['RGAD_album']      =   getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAD, 2));
 
 
-						if ($thisfile_mpeg_audio_lame_raw['RGAD_track'] != 0) {
+							if ($thisfile_mpeg_audio_lame_raw['RGAD_track'] != 0) {
 
-							$thisfile_mpeg_audio_lame_RGAD_track['raw']['name']        = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0xE000) >> 13;
-							$thisfile_mpeg_audio_lame_RGAD_track['raw']['originator']  = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x1C00) >> 10;
-							$thisfile_mpeg_audio_lame_RGAD_track['raw']['sign_bit']    = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x0200) >> 9;
-							$thisfile_mpeg_audio_lame_RGAD_track['raw']['gain_adjust'] =  $thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x01FF;
-							$thisfile_mpeg_audio_lame_RGAD_track['name']       = getid3_lib::RGADnameLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['name']);
-							$thisfile_mpeg_audio_lame_RGAD_track['originator'] = getid3_lib::RGADoriginatorLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['originator']);
-							$thisfile_mpeg_audio_lame_RGAD_track['gain_db']    = getid3_lib::RGADadjustmentLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['gain_adjust'], $thisfile_mpeg_audio_lame_RGAD_track['raw']['sign_bit']);
+								$thisfile_mpeg_audio_lame_RGAD_track['raw']['name']        = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0xE000) >> 13;
+								$thisfile_mpeg_audio_lame_RGAD_track['raw']['originator']  = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x1C00) >> 10;
+								$thisfile_mpeg_audio_lame_RGAD_track['raw']['sign_bit']    = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x0200) >> 9;
+								$thisfile_mpeg_audio_lame_RGAD_track['raw']['gain_adjust'] =  $thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x01FF;
+								$thisfile_mpeg_audio_lame_RGAD_track['name']       = getid3_lib::RGADnameLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['name']);
+								$thisfile_mpeg_audio_lame_RGAD_track['originator'] = getid3_lib::RGADoriginatorLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['originator']);
+								$thisfile_mpeg_audio_lame_RGAD_track['gain_db']    = getid3_lib::RGADadjustmentLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['gain_adjust'], $thisfile_mpeg_audio_lame_RGAD_track['raw']['sign_bit']);
 
-							if (!empty($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'])) {
-								$info['replay_gain']['track']['peak']   = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'];
+								if (!empty($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'])) {
+									$info['replay_gain']['track']['peak']   = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'];
+								}
+								$info['replay_gain']['track']['originator'] = $thisfile_mpeg_audio_lame_RGAD_track['originator'];
+								$info['replay_gain']['track']['adjustment'] = $thisfile_mpeg_audio_lame_RGAD_track['gain_db'];
+							} else {
+								unset($thisfile_mpeg_audio_lame_RGAD['track']);
 							}
-							$info['replay_gain']['track']['originator'] = $thisfile_mpeg_audio_lame_RGAD_track['originator'];
-							$info['replay_gain']['track']['adjustment'] = $thisfile_mpeg_audio_lame_RGAD_track['gain_db'];
-						} else {
-							unset($thisfile_mpeg_audio_lame_RGAD['track']);
-						}
-						if ($thisfile_mpeg_audio_lame_raw['RGAD_album'] != 0) {
-
-							$thisfile_mpeg_audio_lame_RGAD_album['raw']['name']        = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0xE000) >> 13;
-							$thisfile_mpeg_audio_lame_RGAD_album['raw']['originator']  = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x1C00) >> 10;
-							$thisfile_mpeg_audio_lame_RGAD_album['raw']['sign_bit']    = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x0200) >> 9;
-							$thisfile_mpeg_audio_lame_RGAD_album['raw']['gain_adjust'] = $thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x01FF;
-							$thisfile_mpeg_audio_lame_RGAD_album['name']       = getid3_lib::RGADnameLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['name']);
-							$thisfile_mpeg_audio_lame_RGAD_album['originator'] = getid3_lib::RGADoriginatorLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['originator']);
-							$thisfile_mpeg_audio_lame_RGAD_album['gain_db']    = getid3_lib::RGADadjustmentLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['gain_adjust'], $thisfile_mpeg_audio_lame_RGAD_album['raw']['sign_bit']);
-
-							if (!empty($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'])) {
-								$info['replay_gain']['album']['peak']   = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'];
+							if ($thisfile_mpeg_audio_lame_raw['RGAD_album'] != 0) {
+
+								$thisfile_mpeg_audio_lame_RGAD_album['raw']['name']        = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0xE000) >> 13;
+								$thisfile_mpeg_audio_lame_RGAD_album['raw']['originator']  = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x1C00) >> 10;
+								$thisfile_mpeg_audio_lame_RGAD_album['raw']['sign_bit']    = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x0200) >> 9;
+								$thisfile_mpeg_audio_lame_RGAD_album['raw']['gain_adjust'] = $thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x01FF;
+								$thisfile_mpeg_audio_lame_RGAD_album['name']       = getid3_lib::RGADnameLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['name']);
+								$thisfile_mpeg_audio_lame_RGAD_album['originator'] = getid3_lib::RGADoriginatorLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['originator']);
+								$thisfile_mpeg_audio_lame_RGAD_album['gain_db']    = getid3_lib::RGADadjustmentLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['gain_adjust'], $thisfile_mpeg_audio_lame_RGAD_album['raw']['sign_bit']);
+
+								if (!empty($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'])) {
+									$info['replay_gain']['album']['peak']   = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'];
+								}
+								$info['replay_gain']['album']['originator'] = $thisfile_mpeg_audio_lame_RGAD_album['originator'];
+								$info['replay_gain']['album']['adjustment'] = $thisfile_mpeg_audio_lame_RGAD_album['gain_db'];
+							} else {
+								unset($thisfile_mpeg_audio_lame_RGAD['album']);
+							}
+							if (empty($thisfile_mpeg_audio_lame_RGAD)) {
+								unset($thisfile_mpeg_audio_lame['RGAD']);
 							}
-							$info['replay_gain']['album']['originator'] = $thisfile_mpeg_audio_lame_RGAD_album['originator'];
-							$info['replay_gain']['album']['adjustment'] = $thisfile_mpeg_audio_lame_RGAD_album['gain_db'];
-						} else {
-							unset($thisfile_mpeg_audio_lame_RGAD['album']);
-						}
-						if (empty($thisfile_mpeg_audio_lame_RGAD)) {
-							unset($thisfile_mpeg_audio_lame['RGAD']);
-						}
 
 
-						// byte $AF  Encoding flags + ATH Type
-						$EncodingFlagsATHtype = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAF, 1));
-						$thisfile_mpeg_audio_lame['encoding_flags']['nspsytune']   = (bool) ($EncodingFlagsATHtype & 0x10);
-						$thisfile_mpeg_audio_lame['encoding_flags']['nssafejoint'] = (bool) ($EncodingFlagsATHtype & 0x20);
-						$thisfile_mpeg_audio_lame['encoding_flags']['nogap_next']  = (bool) ($EncodingFlagsATHtype & 0x40);
-						$thisfile_mpeg_audio_lame['encoding_flags']['nogap_prev']  = (bool) ($EncodingFlagsATHtype & 0x80);
-						$thisfile_mpeg_audio_lame['ath_type']                      =         $EncodingFlagsATHtype & 0x0F;
-
-						// byte $B0  if ABR {specified bitrate} else {minimal bitrate}
-						$thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB0, 1));
-						if ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 2) { // Average BitRate (ABR)
-							$thisfile_mpeg_audio_lame['bitrate_abr'] = $thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'];
-						} elseif ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 1) { // Constant BitRate (CBR)
-							// ignore
-						} elseif ($thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'] > 0) { // Variable BitRate (VBR) - minimum bitrate
-							$thisfile_mpeg_audio_lame['bitrate_min'] = $thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'];
-						}
+							// byte $AF  Encoding flags + ATH Type
+							$EncodingFlagsATHtype = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAF, 1));
+							$thisfile_mpeg_audio_lame['encoding_flags']['nspsytune']   = (bool) ($EncodingFlagsATHtype & 0x10);
+							$thisfile_mpeg_audio_lame['encoding_flags']['nssafejoint'] = (bool) ($EncodingFlagsATHtype & 0x20);
+							$thisfile_mpeg_audio_lame['encoding_flags']['nogap_next']  = (bool) ($EncodingFlagsATHtype & 0x40);
+							$thisfile_mpeg_audio_lame['encoding_flags']['nogap_prev']  = (bool) ($EncodingFlagsATHtype & 0x80);
+							$thisfile_mpeg_audio_lame['ath_type']                      =         $EncodingFlagsATHtype & 0x0F;
+
+							// byte $B0  if ABR {specified bitrate} else {minimal bitrate}
+							$thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB0, 1));
+							if ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 2) { // Average BitRate (ABR)
+								$thisfile_mpeg_audio_lame['bitrate_abr'] = $thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'];
+							} elseif ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 1) { // Constant BitRate (CBR)
+								// ignore
+							} elseif ($thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'] > 0) { // Variable BitRate (VBR) - minimum bitrate
+								$thisfile_mpeg_audio_lame['bitrate_min'] = $thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'];
+							}
 
-						// bytes $B1-$B3  Encoder delays
-						$EncoderDelays = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB1, 3));
-						$thisfile_mpeg_audio_lame['encoder_delay'] = ($EncoderDelays & 0xFFF000) >> 12;
-						$thisfile_mpeg_audio_lame['end_padding']   =  $EncoderDelays & 0x000FFF;
-
-						// byte $B4  Misc
-						$MiscByte = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB4, 1));
-						$thisfile_mpeg_audio_lame_raw['noise_shaping']       = ($MiscByte & 0x03);
-						$thisfile_mpeg_audio_lame_raw['stereo_mode']         = ($MiscByte & 0x1C) >> 2;
-						$thisfile_mpeg_audio_lame_raw['not_optimal_quality'] = ($MiscByte & 0x20) >> 5;
-						$thisfile_mpeg_audio_lame_raw['source_sample_freq']  = ($MiscByte & 0xC0) >> 6;
-						$thisfile_mpeg_audio_lame['noise_shaping']       = $thisfile_mpeg_audio_lame_raw['noise_shaping'];
-						$thisfile_mpeg_audio_lame['stereo_mode']         = self::LAMEmiscStereoModeLookup($thisfile_mpeg_audio_lame_raw['stereo_mode']);
-						$thisfile_mpeg_audio_lame['not_optimal_quality'] = (bool) $thisfile_mpeg_audio_lame_raw['not_optimal_quality'];
-						$thisfile_mpeg_audio_lame['source_sample_freq']  = self::LAMEmiscSourceSampleFrequencyLookup($thisfile_mpeg_audio_lame_raw['source_sample_freq']);
-
-						// byte $B5  MP3 Gain
-						$thisfile_mpeg_audio_lame_raw['mp3_gain'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB5, 1), false, true);
-						$thisfile_mpeg_audio_lame['mp3_gain_db']     = (getid3_lib::RGADamplitude2dB(2) / 4) * $thisfile_mpeg_audio_lame_raw['mp3_gain'];
-						$thisfile_mpeg_audio_lame['mp3_gain_factor'] = pow(2, ($thisfile_mpeg_audio_lame['mp3_gain_db'] / 6));
-
-						// bytes $B6-$B7  Preset and surround info
-						$PresetSurroundBytes = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB6, 2));
-						// Reserved                                                    = ($PresetSurroundBytes & 0xC000);
-						$thisfile_mpeg_audio_lame_raw['surround_info'] = ($PresetSurroundBytes & 0x3800);
-						$thisfile_mpeg_audio_lame['surround_info']     = self::LAMEsurroundInfoLookup($thisfile_mpeg_audio_lame_raw['surround_info']);
-						$thisfile_mpeg_audio_lame['preset_used_id']    = ($PresetSurroundBytes & 0x07FF);
-						$thisfile_mpeg_audio_lame['preset_used']       = self::LAMEpresetUsedLookup($thisfile_mpeg_audio_lame);
-						if (!empty($thisfile_mpeg_audio_lame['preset_used_id']) && empty($thisfile_mpeg_audio_lame['preset_used'])) {
-							$this->warning('Unknown LAME preset used ('.$thisfile_mpeg_audio_lame['preset_used_id'].') - please report to info@getid3.org');
-						}
-						if (($thisfile_mpeg_audio_lame['short_version'] == 'LAME3.90.') && !empty($thisfile_mpeg_audio_lame['preset_used_id'])) {
-							// this may change if 3.90.4 ever comes out
-							$thisfile_mpeg_audio_lame['short_version'] = 'LAME3.90.3';
-						}
+							// bytes $B1-$B3  Encoder delays
+							$EncoderDelays = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB1, 3));
+							$thisfile_mpeg_audio_lame['encoder_delay'] = ($EncoderDelays & 0xFFF000) >> 12;
+							$thisfile_mpeg_audio_lame['end_padding']   =  $EncoderDelays & 0x000FFF;
+
+							// byte $B4  Misc
+							$MiscByte = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB4, 1));
+							$thisfile_mpeg_audio_lame_raw['noise_shaping']       = ($MiscByte & 0x03);
+							$thisfile_mpeg_audio_lame_raw['stereo_mode']         = ($MiscByte & 0x1C) >> 2;
+							$thisfile_mpeg_audio_lame_raw['not_optimal_quality'] = ($MiscByte & 0x20) >> 5;
+							$thisfile_mpeg_audio_lame_raw['source_sample_freq']  = ($MiscByte & 0xC0) >> 6;
+							$thisfile_mpeg_audio_lame['noise_shaping']       = $thisfile_mpeg_audio_lame_raw['noise_shaping'];
+							$thisfile_mpeg_audio_lame['stereo_mode']         = self::LAMEmiscStereoModeLookup($thisfile_mpeg_audio_lame_raw['stereo_mode']);
+							$thisfile_mpeg_audio_lame['not_optimal_quality'] = (bool) $thisfile_mpeg_audio_lame_raw['not_optimal_quality'];
+							$thisfile_mpeg_audio_lame['source_sample_freq']  = self::LAMEmiscSourceSampleFrequencyLookup($thisfile_mpeg_audio_lame_raw['source_sample_freq']);
+
+							// byte $B5  MP3 Gain
+							$thisfile_mpeg_audio_lame_raw['mp3_gain'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB5, 1), false, true);
+							$thisfile_mpeg_audio_lame['mp3_gain_db']     = (getid3_lib::RGADamplitude2dB(2) / 4) * $thisfile_mpeg_audio_lame_raw['mp3_gain'];
+							$thisfile_mpeg_audio_lame['mp3_gain_factor'] = pow(2, ($thisfile_mpeg_audio_lame['mp3_gain_db'] / 6));
+
+							// bytes $B6-$B7  Preset and surround info
+							$PresetSurroundBytes = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB6, 2));
+							// Reserved                                                    = ($PresetSurroundBytes & 0xC000);
+							$thisfile_mpeg_audio_lame_raw['surround_info'] = ($PresetSurroundBytes & 0x3800);
+							$thisfile_mpeg_audio_lame['surround_info']     = self::LAMEsurroundInfoLookup($thisfile_mpeg_audio_lame_raw['surround_info']);
+							$thisfile_mpeg_audio_lame['preset_used_id']    = ($PresetSurroundBytes & 0x07FF);
+							$thisfile_mpeg_audio_lame['preset_used']       = self::LAMEpresetUsedLookup($thisfile_mpeg_audio_lame);
+							if (!empty($thisfile_mpeg_audio_lame['preset_used_id']) && empty($thisfile_mpeg_audio_lame['preset_used'])) {
+								$this->warning('Unknown LAME preset used ('.$thisfile_mpeg_audio_lame['preset_used_id'].') - please report to info@getid3.org');
+							}
+							if (($thisfile_mpeg_audio_lame['short_version'] == 'LAME3.90.') && !empty($thisfile_mpeg_audio_lame['preset_used_id'])) {
+								// this may change if 3.90.4 ever comes out
+								$thisfile_mpeg_audio_lame['short_version'] = 'LAME3.90.3';
+							}
 
-						// bytes $B8-$BB  MusicLength
-						$thisfile_mpeg_audio_lame['audio_bytes'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB8, 4));
-						$ExpectedNumberOfAudioBytes = (($thisfile_mpeg_audio_lame['audio_bytes'] > 0) ? $thisfile_mpeg_audio_lame['audio_bytes'] : $thisfile_mpeg_audio['VBR_bytes']);
+							// bytes $B8-$BB  MusicLength
+							$thisfile_mpeg_audio_lame['audio_bytes'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB8, 4));
+							$ExpectedNumberOfAudioBytes = (($thisfile_mpeg_audio_lame['audio_bytes'] > 0) ? $thisfile_mpeg_audio_lame['audio_bytes'] : $thisfile_mpeg_audio['VBR_bytes']);
 
-						// bytes $BC-$BD  MusicCRC
-						$thisfile_mpeg_audio_lame['music_crc']    = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xBC, 2));
+							// bytes $BC-$BD  MusicCRC
+							$thisfile_mpeg_audio_lame['music_crc']    = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xBC, 2));
 
-						// bytes $BE-$BF  CRC-16 of Info Tag
-						$thisfile_mpeg_audio_lame['lame_tag_crc'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xBE, 2));
+							// bytes $BE-$BF  CRC-16 of Info Tag
+							$thisfile_mpeg_audio_lame['lame_tag_crc'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xBE, 2));
 
 
-						// LAME CBR
-						if ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 1) {
+							// LAME CBR
+							if ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 1) {
 
-							$thisfile_mpeg_audio['bitrate_mode'] = 'cbr';
-							$thisfile_mpeg_audio['bitrate'] = self::ClosestStandardMP3Bitrate($thisfile_mpeg_audio['bitrate']);
-							$info['audio']['bitrate'] = $thisfile_mpeg_audio['bitrate'];
-							//if (empty($thisfile_mpeg_audio['bitrate']) || (!empty($thisfile_mpeg_audio_lame['bitrate_min']) && ($thisfile_mpeg_audio_lame['bitrate_min'] != 255))) {
-							//	$thisfile_mpeg_audio['bitrate'] = $thisfile_mpeg_audio_lame['bitrate_min'];
-							//}
+								$thisfile_mpeg_audio['bitrate_mode'] = 'cbr';
+								$thisfile_mpeg_audio['bitrate'] = self::ClosestStandardMP3Bitrate($thisfile_mpeg_audio['bitrate']);
+								$info['audio']['bitrate'] = $thisfile_mpeg_audio['bitrate'];
+								//if (empty($thisfile_mpeg_audio['bitrate']) || (!empty($thisfile_mpeg_audio_lame['bitrate_min']) && ($thisfile_mpeg_audio_lame['bitrate_min'] != 255))) {
+								//	$thisfile_mpeg_audio['bitrate'] = $thisfile_mpeg_audio_lame['bitrate_min'];
+								//}
 
-						}
+							}
 
+						}
 					}
 				}
 
@@ -1009,6 +1022,22 @@ public function decodeMPEGaudioHeader($offset, &$info, $recursivesearch=true, $S
 			if (!$this->RecursiveFrameScanning($offset, $nextframetestoffset, $ScanAsCBR)) {
 				return false;
 			}
+			if (!empty($this->getid3->info['mp3_validity_check_bitrates']) && !empty($thisfile_mpeg_audio['bitrate_mode']) && ($thisfile_mpeg_audio['bitrate_mode'] == 'vbr') && !empty($thisfile_mpeg_audio['VBR_bitrate'])) {
+				// https://github.com/JamesHeinrich/getID3/issues/287
+				if (count(array_keys($this->getid3->info['mp3_validity_check_bitrates'])) == 1) {
+					list($cbr_bitrate_in_short_scan) = array_keys($this->getid3->info['mp3_validity_check_bitrates']);
+					$deviation_cbr_from_header_bitrate = abs($thisfile_mpeg_audio['VBR_bitrate'] - $cbr_bitrate_in_short_scan) / $cbr_bitrate_in_short_scan;
+					if ($deviation_cbr_from_header_bitrate < 0.01) {
+						// VBR header bitrate may differ slightly from true bitrate of frames, perhaps accounting for overhead of VBR header frame itself?
+						// If measured CBR bitrate is within 1% of specified bitrate in VBR header then assume that file is truly CBR
+						$thisfile_mpeg_audio['bitrate_mode'] = 'cbr';
+						//$this->warning('VBR header ignored, assuming CBR '.round($cbr_bitrate_in_short_scan / 1000).'kbps based on scan of '.$this->mp3_valid_check_frames.' frames');
+					}
+				}
+			}
+			if (isset($this->getid3->info['mp3_validity_check_bitrates'])) {
+				unset($this->getid3->info['mp3_validity_check_bitrates']);
+			}
 
 		}
 
@@ -1130,8 +1159,9 @@ public function RecursiveFrameScanning(&$offset, &$nextframetestoffset, $ScanAsC
 		$firstframetestarray = array('error' => array(), 'warning'=> array(), 'avdataend' => $info['avdataend'], 'avdataoffset' => $info['avdataoffset']);
 		$this->decodeMPEGaudioHeader($offset, $firstframetestarray, false);
 
-		for ($i = 0; $i < GETID3_MP3_VALID_CHECK_FRAMES; $i++) {
-			// check next GETID3_MP3_VALID_CHECK_FRAMES frames for validity, to make sure we haven't run across a false synch
+		$info['mp3_validity_check_bitrates'] = array();
+		for ($i = 0; $i < $this->mp3_valid_check_frames; $i++) {
+			// check next (default: 50) frames for validity, to make sure we haven't run across a false synch
 			if (($nextframetestoffset + 4) >= $info['avdataend']) {
 				// end of file
 				return true;
@@ -1139,6 +1169,7 @@ public function RecursiveFrameScanning(&$offset, &$nextframetestoffset, $ScanAsC
 
 			$nextframetestarray = array('error' => array(), 'warning' => array(), 'avdataend' => $info['avdataend'], 'avdataoffset'=>$info['avdataoffset']);
 			if ($this->decodeMPEGaudioHeader($nextframetestoffset, $nextframetestarray, false)) {
+				getid3_lib::safe_inc($info['mp3_validity_check_bitrates'][$nextframetestarray['mpeg']['audio']['bitrate']]);
 				if ($ScanAsCBR) {
 					// force CBR mode, used for trying to pick out invalid audio streams with valid(?) VBR headers, or VBR streams with no VBR header
 					if (!isset($nextframetestarray['mpeg']['audio']['bitrate']) || !isset($firstframetestarray['mpeg']['audio']['bitrate']) || ($nextframetestarray['mpeg']['audio']['bitrate'] != $firstframetestarray['mpeg']['audio']['bitrate'])) {
@@ -1273,6 +1304,7 @@ public function getOnlyMPEGaudioInfoBruteForce() {
 		$LongMPEGbitrateLookup        = array();
 		$LongMPEGpaddingLookup        = array();
 		$LongMPEGfrequencyLookup      = array();
+		$Distribution                 = array();
 		$Distribution['bitrate']      = array();
 		$Distribution['frequency']    = array();
 		$Distribution['layer']        = array();
@@ -1433,6 +1465,9 @@ public function getOnlyMPEGaudioInfo($avdataoffset, $BitrateHistogram=false) {
 		$header = $this->fread($sync_seek_buffer_size);
 		$sync_seek_buffer_size = strlen($header);
 		$SynchSeekOffset = 0;
+		$SyncSeekAttempts = 0;
+		$SyncSeekAttemptsMax = 1000;
+		$FirstFrameThisfileInfo = null;
 		while ($SynchSeekOffset < $sync_seek_buffer_size) {
 			if ((($avdataoffset + $SynchSeekOffset)  < $info['avdataend']) && !feof($this->getid3->fp)) {
 
@@ -1471,7 +1506,24 @@ public function getOnlyMPEGaudioInfo($avdataoffset, $BitrateHistogram=false) {
 				return false;
 			}
 
-			if (($header[$SynchSeekOffset] == "\xFF") && ($header[($SynchSeekOffset + 1)] > "\xE0")) { // synch detected
+			if (($header[$SynchSeekOffset] == "\xFF") && ($header[($SynchSeekOffset + 1)] > "\xE0")) { // possible synch detected
+				if (++$SyncSeekAttempts >= $SyncSeekAttemptsMax) {
+					// https://github.com/JamesHeinrich/getID3/issues/286
+					// corrupt files claiming to be MP3, with a large number of 0xFF bytes near the beginning, can cause this loop to take a very long time
+					// should have escape condition to avoid spending too much time scanning a corrupt file
+					// if a synch's not found within the first 128k bytes, then give up
+					$this->error('Could not find valid MPEG audio synch after scanning '.$SyncSeekAttempts.' candidate offsets');
+					if (isset($info['audio']['bitrate'])) {
+						unset($info['audio']['bitrate']);
+					}
+					if (isset($info['mpeg']['audio'])) {
+						unset($info['mpeg']['audio']);
+					}
+					if (empty($info['mpeg'])) {
+						unset($info['mpeg']);
+					}
+					return false;
+				}
 				$FirstFrameAVDataOffset = null;
 				if (!isset($FirstFrameThisfileInfo) && !isset($info['mpeg']['audio'])) {
 					$FirstFrameThisfileInfo = $info;
@@ -1511,9 +1563,9 @@ public function getOnlyMPEGaudioInfo($avdataoffset, $BitrateHistogram=false) {
 							if ($this->decodeMPEGaudioHeader($GarbageOffsetEnd, $dummy, true, true)) {
 								$info = $dummy;
 								$info['avdataoffset'] = $GarbageOffsetEnd;
-								$this->warning('apparently-valid VBR header not used because could not find '.GETID3_MP3_VALID_CHECK_FRAMES.' consecutive MPEG-audio frames immediately after VBR header (garbage data for '.($GarbageOffsetEnd - $GarbageOffsetStart).' bytes between '.$GarbageOffsetStart.' and '.$GarbageOffsetEnd.'), but did find valid CBR stream starting at '.$GarbageOffsetEnd);
+								$this->warning('apparently-valid VBR header not used because could not find '.$this->mp3_valid_check_frames.' consecutive MPEG-audio frames immediately after VBR header (garbage data for '.($GarbageOffsetEnd - $GarbageOffsetStart).' bytes between '.$GarbageOffsetStart.' and '.$GarbageOffsetEnd.'), but did find valid CBR stream starting at '.$GarbageOffsetEnd);
 							} else {
-								$this->warning('using data from VBR header even though could not find '.GETID3_MP3_VALID_CHECK_FRAMES.' consecutive MPEG-audio frames immediately after VBR header (garbage data for '.($GarbageOffsetEnd - $GarbageOffsetStart).' bytes between '.$GarbageOffsetStart.' and '.$GarbageOffsetEnd.')');
+								$this->warning('using data from VBR header even though could not find '.$this->mp3_valid_check_frames.' consecutive MPEG-audio frames immediately after VBR header (garbage data for '.($GarbageOffsetEnd - $GarbageOffsetStart).' bytes between '.$GarbageOffsetStart.' and '.$GarbageOffsetEnd.')');
 							}
 						}
 					}
@@ -1558,6 +1610,7 @@ public function getOnlyMPEGaudioInfo($avdataoffset, $BitrateHistogram=false) {
 						$pct_data_scanned = 0;
 						for ($current_segment = 0; $current_segment < $max_scan_segments; $current_segment++) {
 							$frames_scanned_this_segment = 0;
+							$scan_start_offset = array();
 							if ($this->ftell() >= $info['avdataend']) {
 								break;
 							}
@@ -1887,6 +1940,7 @@ public static function MPEGaudioHeaderDecode($Header4Bytes) {
 			return false;
 		}
 
+		$MPEGrawHeader = array();
 		$MPEGrawHeader['synch']         = (getid3_lib::BigEndian2Int(substr($Header4Bytes, 0, 2)) & 0xFFE0) >> 4;
 		$MPEGrawHeader['version']       = (ord($Header4Bytes[1]) & 0x18) >> 3; //    BB
 		$MPEGrawHeader['layer']         = (ord($Header4Bytes[1]) & 0x06) >> 1; //      CC
diff --git a/src/wp-includes/ID3/module.audio.ogg.php b/src/wp-includes/ID3/module.audio.ogg.php
index fe092d9d94d19..5786fd0d5970f 100644
--- a/src/wp-includes/ID3/module.audio.ogg.php
+++ b/src/wp-includes/ID3/module.audio.ogg.php
@@ -529,6 +529,7 @@ public function ParseOpusPageHeader(&$filedata, &$filedataoffset, &$oggpageinfo)
 	 */
 	public function ParseOggPageHeader() {
 		// http://xiph.org/ogg/vorbis/doc/framing.html
+		$oggheader = array();
 		$oggheader['page_start_offset'] = $this->ftell(); // where we started from in the file
 
 		$filedata = $this->fread($this->getid3->fread_buffer_size());
@@ -680,35 +681,39 @@ public function ParseVorbisComments() {
 
 				$VorbisCommentPage++;
 
-				$oggpageinfo = $this->ParseOggPageHeader();
-				$info['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo;
+				if ($oggpageinfo = $this->ParseOggPageHeader()) {
+					$info['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo;
 
-				// First, save what we haven't read yet
-				$AsYetUnusedData = substr($commentdata, $commentdataoffset);
+					// First, save what we haven't read yet
+					$AsYetUnusedData = substr($commentdata, $commentdataoffset);
 
-				// Then take that data off the end
-				$commentdata     = substr($commentdata, 0, $commentdataoffset);
+					// Then take that data off the end
+					$commentdata     = substr($commentdata, 0, $commentdataoffset);
+
+					// Add [headerlength] bytes of dummy data for the Ogg Page Header, just to keep absolute offsets correct
+					$commentdata .= str_repeat("\x00", 27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
+					$commentdataoffset += (27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
 
-				// Add [headerlength] bytes of dummy data for the Ogg Page Header, just to keep absolute offsets correct
-				$commentdata .= str_repeat("\x00", 27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
-				$commentdataoffset += (27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
+					// Finally, stick the unused data back on the end
+					$commentdata .= $AsYetUnusedData;
 
-				// Finally, stick the unused data back on the end
-				$commentdata .= $AsYetUnusedData;
+					//$commentdata .= $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
+					if (!isset($info['ogg']['pageheader'][$VorbisCommentPage])) {
+						$this->warning('undefined Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell());
+						break;
+					}
+					$readlength = self::OggPageSegmentLength($info['ogg']['pageheader'][$VorbisCommentPage], 1);
+					if ($readlength <= 0) {
+						$this->warning('invalid length Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell());
+						break;
+					}
+					$commentdata .= $this->fread($readlength);
 
-				//$commentdata .= $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
-				if (!isset($info['ogg']['pageheader'][$VorbisCommentPage])) {
-					$this->warning('undefined Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell());
-					break;
-				}
-				$readlength = self::OggPageSegmentLength($info['ogg']['pageheader'][$VorbisCommentPage], 1);
-				if ($readlength <= 0) {
-					$this->warning('invalid length Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell());
+					//$filebaseoffset += $oggpageinfo['header_end_offset'] - $oggpageinfo['page_start_offset'];
+				} else {
+					$this->warning('failed to ParseOggPageHeader() at offset '.$this->ftell());
 					break;
 				}
-				$commentdata .= $this->fread($readlength);
-
-				//$filebaseoffset += $oggpageinfo['header_end_offset'] - $oggpageinfo['page_start_offset'];
 			}
 			$ThisFileInfo_ogg_comments_raw[$i]['offset'] = $commentdataoffset;
 			$commentstring = substr($commentdata, $commentdataoffset, $ThisFileInfo_ogg_comments_raw[$i]['size']);
diff --git a/src/wp-includes/ID3/module.tag.apetag.php b/src/wp-includes/ID3/module.tag.apetag.php
index 26be982c73a25..c5502133fcbb3 100644
--- a/src/wp-includes/ID3/module.tag.apetag.php
+++ b/src/wp-includes/ID3/module.tag.apetag.php
@@ -360,6 +360,7 @@ public function parseAPEheaderFooter($APEheaderFooterData) {
 		// http://www.uni-jena.de/~pfk/mpp/sv8/apeheader.html
 
 		// shortcut
+		$headerfooterinfo = array();
 		$headerfooterinfo['raw'] = array();
 		$headerfooterinfo_raw = &$headerfooterinfo['raw'];
 
@@ -389,6 +390,7 @@ public function parseAPEtagFlags($rawflagint) {
 		// "Note: APE Tags 1.0 do not use any of the APE Tag flags.
 		// All are set to zero on creation and ignored on reading."
 		// http://wiki.hydrogenaud.io/index.php?title=Ape_Tags_Flags
+		$flags                      = array();
 		$flags['header']            = (bool) ($rawflagint & 0x80000000);
 		$flags['footer']            = (bool) ($rawflagint & 0x40000000);
 		$flags['this_is_header']    = (bool) ($rawflagint & 0x20000000);
diff --git a/src/wp-includes/ID3/module.tag.id3v1.php b/src/wp-includes/ID3/module.tag.id3v1.php
index 16dcf253b655d..b1de25784bb92 100644
--- a/src/wp-includes/ID3/module.tag.id3v1.php
+++ b/src/wp-includes/ID3/module.tag.id3v1.php
@@ -31,14 +31,22 @@ public function Analyze() {
 			return false;
 		}
 
-		$this->fseek(-256, SEEK_END);
-		$preid3v1 = $this->fread(128);
-		$id3v1tag = $this->fread(128);
+		if($info['filesize'] < 256) {
+			$this->fseek(-128, SEEK_END);
+			$preid3v1 = '';
+			$id3v1tag = $this->fread(128);
+		} else {
+			$this->fseek(-256, SEEK_END);
+			$preid3v1 = $this->fread(128);
+			$id3v1tag = $this->fread(128);
+		}
+
 
 		if (substr($id3v1tag, 0, 3) == 'TAG') {
 
 			$info['avdataend'] = $info['filesize'] - 128;
 
+			$ParsedID3v1            = array();
 			$ParsedID3v1['title']   = $this->cutfield(substr($id3v1tag,   3, 30));
 			$ParsedID3v1['artist']  = $this->cutfield(substr($id3v1tag,  33, 30));
 			$ParsedID3v1['album']   = $this->cutfield(substr($id3v1tag,  63, 30));
@@ -297,6 +305,50 @@ public static function ArrayOfGenres($allowSCMPXextended=false) {
 			145  => 'Anime',
 			146  => 'JPop',
 			147  => 'Synthpop',
+			148 => 'Abstract',
+			149 => 'Art Rock',
+			150 => 'Baroque',
+			151 => 'Bhangra',
+			152 => 'Big Beat',
+			153 => 'Breakbeat',
+			154 => 'Chillout',
+			155 => 'Downtempo',
+			156 => 'Dub',
+			157 => 'EBM',
+			158 => 'Eclectic',
+			159 => 'Electro',
+			160 => 'Electroclash',
+			161 => 'Emo',
+			162 => 'Experimental',
+			163 => 'Garage',
+			164 => 'Global',
+			165 => 'IDM',
+			166 => 'Illbient',
+			167 => 'Industro-Goth',
+			168 => 'Jam Band',
+			169 => 'Krautrock',
+			170 => 'Leftfield',
+			171 => 'Lounge',
+			172 => 'Math Rock',
+			173 => 'New Romantic',
+			174 => 'Nu-Breakz',
+			175 => 'Post-Punk',
+			176 => 'Post-Rock',
+			177 => 'Psytrance',
+			178 => 'Shoegaze',
+			179 => 'Space Rock',
+			180 => 'Trop Rock',
+			181 => 'World Music',
+			182 => 'Neoclassical',
+			183 => 'Audiobook',
+			184 => 'Audio Theatre',
+			185 => 'Neue Deutsche Welle',
+			186 => 'Podcast',
+			187 => 'Indie-Rock',
+			188 => 'G-Funk',
+			189 => 'Dubstep',
+			190 => 'Garage Rock',
+			191 => 'Psybient',
 
 			255  => 'Unknown',
 
diff --git a/src/wp-includes/ID3/module.tag.id3v2.php b/src/wp-includes/ID3/module.tag.id3v2.php
index 85dd7a147a148..99e56a5fdb066 100644
--- a/src/wp-includes/ID3/module.tag.id3v2.php
+++ b/src/wp-includes/ID3/module.tag.id3v2.php
@@ -345,7 +345,7 @@ public function Analyze() {
 				}
 				if (($frame_size <= strlen($framedata)) && ($this->IsValidID3v2FrameName($frame_name, $id3v2_majorversion))) {
 
-					unset($parsedFrame);
+					$parsedFrame                    = array();
 					$parsedFrame['frame_name']      = $frame_name;
 					$parsedFrame['frame_flags_raw'] = $frame_flags;
 					$parsedFrame['data']            = substr($framedata, 0, $frame_size);
@@ -978,7 +978,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
 
 
 		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'USLT')) || // 4.8   USLT Unsynchronised lyric/text transcription
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'ULT'))) {     // 4.9   ULT  Unsynchronised lyric/text transcription
+				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'ULT'))) {    // 4.9   ULT  Unsynchronised lyric/text transcription
 			//   There may be more than one 'Unsynchronised lyrics/text transcription' frame
 			//   in each tag, but only one with the same language and content descriptor.
 			// <Header for 'Unsynchronised lyrics/text transcription', ID: 'USLT'>
@@ -994,24 +994,28 @@ public function ParseID3v2Frame(&$parsedFrame) {
 				$this->warning('Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding');
 				$frame_textencoding_terminator = "\x00";
 			}
-			$frame_language = substr($parsedFrame['data'], $frame_offset, 3);
-			$frame_offset += 3;
-			$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
-			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
-				$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
-			}
-			$parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			$parsedFrame['description'] = $this->MakeUTF16emptyStringEmpty($parsedFrame['description']);
-			$parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator));
-			$parsedFrame['data'] = $this->RemoveStringTerminator($parsedFrame['data'], $frame_textencoding_terminator);
+			if (strlen($parsedFrame['data']) >= (4 + strlen($frame_textencoding_terminator))) {  // shouldn't be an issue but badly-written files have been spotted in the wild with not only no contents but also missing the required language field, see https://github.com/JamesHeinrich/getID3/issues/315
+				$frame_language = substr($parsedFrame['data'], $frame_offset, 3);
+				$frame_offset += 3;
+				$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+				if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
+					$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
+				}
+				$parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
+				$parsedFrame['description'] = $this->MakeUTF16emptyStringEmpty($parsedFrame['description']);
+				$parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator));
+				$parsedFrame['data'] = $this->RemoveStringTerminator($parsedFrame['data'], $frame_textencoding_terminator);
 
-			$parsedFrame['encodingid']   = $frame_textencoding;
-			$parsedFrame['encoding']     = $this->TextEncodingNameLookup($frame_textencoding);
+				$parsedFrame['encodingid']   = $frame_textencoding;
+				$parsedFrame['encoding']     = $this->TextEncodingNameLookup($frame_textencoding);
 
-			$parsedFrame['language']     = $frame_language;
-			$parsedFrame['languagename'] = $this->LanguageLookup($frame_language, false);
-			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
-				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
+				$parsedFrame['language']     = $frame_language;
+				$parsedFrame['languagename'] = $this->LanguageLookup($frame_language, false);
+				if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
+					$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
+				}
+			} else {
+				$this->warning('Invalid data in frame "'.$parsedFrame['frame_name'].'" at offset '.$parsedFrame['dataoffset']);
 			}
 			unset($parsedFrame['data']);
 
@@ -1370,6 +1374,8 @@ public function ParseID3v2Frame(&$parsedFrame) {
 				$frame_textencoding_terminator = "\x00";
 			}
 
+			$frame_imagetype = null;
+			$frame_mimetype = null;
 			if ($id3v2_majorversion == 2 && strlen($parsedFrame['data']) > $frame_offset) {
 				$frame_imagetype = substr($parsedFrame['data'], $frame_offset, 3);
 				if (strtolower($frame_imagetype) == 'ima') {
@@ -1956,18 +1962,14 @@ public function ParseID3v2Frame(&$parsedFrame) {
 			$frame_offset = 0;
 			$parsedFrame['peakamplitude'] = getid3_lib::BigEndian2Float(substr($parsedFrame['data'], $frame_offset, 4));
 			$frame_offset += 4;
-			$rg_track_adjustment = getid3_lib::Dec2Bin(substr($parsedFrame['data'], $frame_offset, 2));
-			$frame_offset += 2;
-			$rg_album_adjustment = getid3_lib::Dec2Bin(substr($parsedFrame['data'], $frame_offset, 2));
-			$frame_offset += 2;
-			$parsedFrame['raw']['track']['name']       = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 0, 3));
-			$parsedFrame['raw']['track']['originator'] = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 3, 3));
-			$parsedFrame['raw']['track']['signbit']    = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 6, 1));
-			$parsedFrame['raw']['track']['adjustment'] = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 7, 9));
-			$parsedFrame['raw']['album']['name']       = getid3_lib::Bin2Dec(substr($rg_album_adjustment, 0, 3));
-			$parsedFrame['raw']['album']['originator'] = getid3_lib::Bin2Dec(substr($rg_album_adjustment, 3, 3));
-			$parsedFrame['raw']['album']['signbit']    = getid3_lib::Bin2Dec(substr($rg_album_adjustment, 6, 1));
-			$parsedFrame['raw']['album']['adjustment'] = getid3_lib::Bin2Dec(substr($rg_album_adjustment, 7, 9));
+			foreach (array('track','album') as $rgad_entry_type) {
+				$rg_adjustment_word = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 2));
+				$frame_offset += 2;
+				$parsedFrame['raw'][$rgad_entry_type]['name']       = ($rg_adjustment_word & 0xE000) >> 13;
+				$parsedFrame['raw'][$rgad_entry_type]['originator'] = ($rg_adjustment_word & 0x1C00) >> 10;
+				$parsedFrame['raw'][$rgad_entry_type]['signbit']    = ($rg_adjustment_word & 0x0200) >>  9;
+				$parsedFrame['raw'][$rgad_entry_type]['adjustment'] = ($rg_adjustment_word & 0x0100);
+			}
 			$parsedFrame['track']['name']       = getid3_lib::RGADnameLookup($parsedFrame['raw']['track']['name']);
 			$parsedFrame['track']['originator'] = getid3_lib::RGADoriginatorLookup($parsedFrame['raw']['track']['originator']);
 			$parsedFrame['track']['adjustment'] = getid3_lib::RGADadjustmentLookup($parsedFrame['raw']['track']['adjustment'], $parsedFrame['raw']['track']['signbit']);
@@ -2444,7 +2446,8 @@ public function LookupCurrencyUnits($currencyid) {
 			TMM	Manats
 			TND	Dinars
 			TOP	Pa'anga
-			TRL	Liras
+			TRL	Liras (old)
+			TRY	Liras
 			TTD	Dollars
 			TVD	Tuvalu Dollars
 			TWD	New Dollars
@@ -2645,6 +2648,7 @@ public function LookupCurrencyCountry($currencyid) {
 			TND	Tunisia
 			TOP	Tonga
 			TRL	Turkey
+			TRY	Turkey
 			TTD	Trinidad and Tobago
 			TVD	Tuvalu
 			TWD	Taiwan
diff --git a/src/wp-includes/ID3/module.tag.lyrics3.php b/src/wp-includes/ID3/module.tag.lyrics3.php
index b2375057e7910..c8b2cf6305984 100644
--- a/src/wp-includes/ID3/module.tag.lyrics3.php
+++ b/src/wp-includes/ID3/module.tag.lyrics3.php
@@ -33,6 +33,9 @@ public function Analyze() {
 		}
 
 		$this->fseek((0 - 128 - 9 - 6), SEEK_END);          // end - ID3v1 - "LYRICSEND" - [Lyrics3size]
+		$lyrics3offset = null;
+		$lyrics3version = null;
+		$lyrics3size   = null;
 		$lyrics3_id3v1 = $this->fread(128 + 9 + 6);
 		$lyrics3lsz    = (int) substr($lyrics3_id3v1, 0, 6); // Lyrics3size
 		$lyrics3end    = substr($lyrics3_id3v1,  6,   9); // LYRICSEND or LYRICS200
diff --git a/src/wp-includes/ID3/readme.txt b/src/wp-includes/ID3/readme.txt
index e48bcef917e8c..0888bc4de2503 100644
--- a/src/wp-includes/ID3/readme.txt
+++ b/src/wp-includes/ID3/readme.txt
@@ -625,3 +625,4 @@ Reference material:
 * http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html
 * http://www.codeproject.com/Articles/8295/MPEG-Audio-Frame-Header
 * http://dsd-guide.com/sites/default/files/white-papers/DSFFileFormatSpec_E.pdf
+* https://fileformats.fandom.com/wiki/Torrent_file
\ No newline at end of file

From 6367c01844e34dd372b999beb0e370f52d8c42d5 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sun, 10 Oct 2021 01:15:16 +0000
Subject: [PATCH 198/257] External Libraries: Revert [51900] for now to
 investigate test failures.

See #54162.

git-svn-id: https://develop.svn.wordpress.org/trunk@51901 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/ID3/getid3.lib.php            |  91 ++--
 src/wp-includes/ID3/getid3.php                | 198 +--------
 .../ID3/module.audio-video.asf.php            |   7 +-
 .../ID3/module.audio-video.flv.php            |   1 -
 .../ID3/module.audio-video.matroska.php       |  14 +-
 .../ID3/module.audio-video.quicktime.php      | 306 +++++++++----
 .../ID3/module.audio-video.riff.php           | 102 +----
 src/wp-includes/ID3/module.audio.flac.php     |   1 -
 src/wp-includes/ID3/module.audio.mp3.php      | 418 ++++++++----------
 src/wp-includes/ID3/module.audio.ogg.php      |  49 +-
 src/wp-includes/ID3/module.tag.apetag.php     |   2 -
 src/wp-includes/ID3/module.tag.id3v1.php      |  58 +--
 src/wp-includes/ID3/module.tag.id3v2.php      |  66 ++-
 src/wp-includes/ID3/module.tag.lyrics3.php    |   3 -
 src/wp-includes/ID3/readme.txt                |   1 -
 15 files changed, 526 insertions(+), 791 deletions(-)

diff --git a/src/wp-includes/ID3/getid3.lib.php b/src/wp-includes/ID3/getid3.lib.php
index 46a39ee3b20e0..8514e9781f02c 100644
--- a/src/wp-includes/ID3/getid3.lib.php
+++ b/src/wp-includes/ID3/getid3.lib.php
@@ -242,7 +242,7 @@ public static function LittleEndian2Float($byteword) {
 	/**
 	 * ANSI/IEEE Standard 754-1985, Standard for Binary Floating Point Arithmetic
 	 *
-	 * @link https://web.archive.org/web/20120325162206/http://www.psc.edu/general/software/packages/ieee/ieee.php
+	 * @link http://www.psc.edu/general/software/packages/ieee/ieee.html
 	 * @link http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/ieee.html
 	 *
 	 * @param string $byteword
@@ -294,12 +294,12 @@ public static function BigEndian2Float($byteword) {
 
 		if (($exponent == (pow(2, $exponentbits) - 1)) && ($fraction != 0)) {
 			// Not a Number
-			$floatvalue = NAN;
+			$floatvalue = false;
 		} elseif (($exponent == (pow(2, $exponentbits) - 1)) && ($fraction == 0)) {
 			if ($signbit == '1') {
-				$floatvalue = -INF;
+				$floatvalue = '-infinity';
 			} else {
-				$floatvalue = INF;
+				$floatvalue = '+infinity';
 			}
 		} elseif (($exponent == 0) && ($fraction == 0)) {
 			if ($signbit == '1') {
@@ -427,20 +427,14 @@ public static function BigEndian2String($number, $minbytes=1, $synchsafe=false,
 	 * @return string
 	 */
 	public static function Dec2Bin($number) {
-		if (!is_numeric($number)) {
-			// https://github.com/JamesHeinrich/getID3/issues/299
-			trigger_error('TypeError: Dec2Bin(): Argument #1 ($number) must be numeric, '.gettype($number).' given', E_USER_WARNING);
-			return '';
-		}
-		$bytes = array();
 		while ($number >= 256) {
-			$bytes[] = (int) (($number / 256) - (floor($number / 256))) * 256;
+			$bytes[] = (($number / 256) - (floor($number / 256))) * 256;
 			$number = floor($number / 256);
 		}
-		$bytes[] = (int) $number;
+		$bytes[] = $number;
 		$binstring = '';
-		foreach ($bytes as $i => $byte) {
-			$binstring = (($i == count($bytes) - 1) ? decbin($byte) : str_pad(decbin($byte), 8, '0', STR_PAD_LEFT)).$binstring;
+		for ($i = 0; $i < count($bytes); $i++) {
+			$binstring = (($i == count($bytes) - 1) ? decbin($bytes[$i]) : str_pad(decbin($bytes[$i]), 8, '0', STR_PAD_LEFT)).$binstring;
 		}
 		return $binstring;
 	}
@@ -671,7 +665,6 @@ public static function CreateDeepArray($ArrayPath, $Separator, $Value) {
 		// or
 		//   $foo['path']['to']['my'] = 'file.txt';
 		$ArrayPath = ltrim($ArrayPath, $Separator);
-		$ReturnedArray = array();
 		if (($pos = strpos($ArrayPath, $Separator)) !== false) {
 			$ReturnedArray[substr($ArrayPath, 0, $pos)] = self::CreateDeepArray(substr($ArrayPath, $pos + 1), $Separator, $Value);
 		} else {
@@ -1545,21 +1538,12 @@ public static function ImageExtFromMime($mime_type) {
 	public static function CopyTagsToComments(&$ThisFileInfo, $option_tags_html=true) {
 		// Copy all entries from ['tags'] into common ['comments']
 		if (!empty($ThisFileInfo['tags'])) {
-
-			// Some tag types can only support limited character sets and may contain data in non-standard encoding (usually ID3v1)
-			// and/or poorly-transliterated tag values that are also in tag formats that do support full-range character sets
-			// To make the output more user-friendly, process the potentially-problematic tag formats last to enhance the chance that
-			// the first entries in [comments] are the most correct and the "bad" ones (if any) come later.
-			// https://github.com/JamesHeinrich/getID3/issues/338
-			$processLastTagTypes = array('id3v1','riff');
-			foreach ($processLastTagTypes as $processLastTagType) {
-				if (isset($ThisFileInfo['tags'][$processLastTagType])) {
-					// bubble ID3v1 to the end, if present to aid in detecting bad ID3v1 encodings
-					$temp = $ThisFileInfo['tags'][$processLastTagType];
-					unset($ThisFileInfo['tags'][$processLastTagType]);
-					$ThisFileInfo['tags'][$processLastTagType] = $temp;
-					unset($temp);
-				}
+			if (isset($ThisFileInfo['tags']['id3v1'])) {
+				// bubble ID3v1 to the end, if present to aid in detecting bad ID3v1 encodings
+				$ID3v1 = $ThisFileInfo['tags']['id3v1'];
+				unset($ThisFileInfo['tags']['id3v1']);
+				$ThisFileInfo['tags']['id3v1'] = $ID3v1;
+				unset($ID3v1);
 			}
 			foreach ($ThisFileInfo['tags'] as $tagtype => $tagarray) {
 				foreach ($tagarray as $tagname => $tagdata) {
@@ -1578,30 +1562,20 @@ public static function CopyTagsToComments(&$ThisFileInfo, $option_tags_html=true
 										// new value is identical but shorter-than (or equal-length to) one already in comments - skip
 										break 2;
 									}
-
-									if (function_exists('mb_convert_encoding')) {
-										if (trim($value) == trim(substr(mb_convert_encoding($existingvalue, $ThisFileInfo['id3v1']['encoding'], $ThisFileInfo['encoding']), 0, 30))) {
-											// value stored in ID3v1 appears to be probably the multibyte value transliterated (badly) into ISO-8859-1 in ID3v1.
-											// As an example, Foobar2000 will do this if you tag a file with Chinese or Arabic or Cyrillic or something that doesn't fit into ISO-8859-1 the ID3v1 will consist of mostly "?" characters, one per multibyte unrepresentable character
-											break 2;
-										}
+								}
+								if (function_exists('mb_convert_encoding')) {
+									if (trim($value) == trim(substr(mb_convert_encoding($existingvalue, $ThisFileInfo['id3v1']['encoding'], $ThisFileInfo['encoding']), 0, 30))) {
+										// value stored in ID3v1 appears to be probably the multibyte value transliterated (badly) into ISO-8859-1 in ID3v1.
+										// As an example, Foobar2000 will do this if you tag a file with Chinese or Arabic or Cyrillic or something that doesn't fit into ISO-8859-1 the ID3v1 will consist of mostly "?" characters, one per multibyte unrepresentable character
+										break 2;
 									}
 								}
 
 							} elseif (!is_array($value)) {
 
-								$newvaluelength   =    strlen(trim($value));
-								$newvaluelengthMB = mb_strlen(trim($value));
+								$newvaluelength = strlen(trim($value));
 								foreach ($ThisFileInfo['comments'][$tagname] as $existingkey => $existingvalue) {
-									$oldvaluelength   =    strlen(trim($existingvalue));
-									$oldvaluelengthMB = mb_strlen(trim($existingvalue));
-									if (($newvaluelengthMB == $oldvaluelengthMB) && ($existingvalue == getid3_lib::iconv_fallback('UTF-8', 'ASCII', $value))) {
-										// https://github.com/JamesHeinrich/getID3/issues/338
-										// check for tags containing extended characters that may have been forced into limited-character storage (e.g. UTF8 values into ASCII)
-										// which will usually display unrepresentable characters as "?"
-										$ThisFileInfo['comments'][$tagname][$existingkey] = trim($value);
-										break;
-									}
+									$oldvaluelength = strlen(trim($existingvalue));
 									if ((strlen($existingvalue) > 10) && ($newvaluelength > $oldvaluelength) && (substr(trim($value), 0, strlen($existingvalue)) == $existingvalue)) {
 										$ThisFileInfo['comments'][$tagname][$existingkey] = trim($value);
 										break;
@@ -1627,16 +1601,14 @@ public static function CopyTagsToComments(&$ThisFileInfo, $option_tags_html=true
 			}
 
 			// attempt to standardize spelling of returned keys
-			if (!empty($ThisFileInfo['comments'])) {
-				$StandardizeFieldNames = array(
-					'tracknumber' => 'track_number',
-					'track'       => 'track_number',
-				);
-				foreach ($StandardizeFieldNames as $badkey => $goodkey) {
-					if (array_key_exists($badkey, $ThisFileInfo['comments']) && !array_key_exists($goodkey, $ThisFileInfo['comments'])) {
-						$ThisFileInfo['comments'][$goodkey] = $ThisFileInfo['comments'][$badkey];
-						unset($ThisFileInfo['comments'][$badkey]);
-					}
+			$StandardizeFieldNames = array(
+				'tracknumber' => 'track_number',
+				'track'       => 'track_number',
+			);
+			foreach ($StandardizeFieldNames as $badkey => $goodkey) {
+				if (array_key_exists($badkey, $ThisFileInfo['comments']) && !array_key_exists($goodkey, $ThisFileInfo['comments'])) {
+					$ThisFileInfo['comments'][$goodkey] = $ThisFileInfo['comments'][$badkey];
+					unset($ThisFileInfo['comments'][$badkey]);
 				}
 			}
 
@@ -1762,7 +1734,6 @@ public static function trimNullByte($string) {
 	 * @return float|bool
 	 */
 	public static function getFileSizeSyscall($path) {
-		$commandline = null;
 		$filesize = false;
 
 		if (GETID3_OS_ISWINDOWS) {
@@ -1824,7 +1795,7 @@ public static function truepath($filename) {
 	 *
 	 * @return string
 	 */
-	public static function mb_basename($path, $suffix = '') {
+	public static function mb_basename($path, $suffix = null) {
 		$splited = preg_split('#/#', rtrim($path, '/ '));
 		return substr(basename('X'.$splited[count($splited) - 1], $suffix), 1);
 	}
diff --git a/src/wp-includes/ID3/getid3.php b/src/wp-includes/ID3/getid3.php
index 2008025b85bc3..5cb3c036c0def 100644
--- a/src/wp-includes/ID3/getid3.php
+++ b/src/wp-includes/ID3/getid3.php
@@ -17,6 +17,10 @@
 if (!defined('GETID3_INCLUDEPATH')) {
 	define('GETID3_INCLUDEPATH', dirname(__FILE__).DIRECTORY_SEPARATOR);
 }
+// Workaround Bug #39923 (https://bugs.php.net/bug.php?id=39923)
+if (!defined('IMG_JPG') && defined('IMAGETYPE_JPEG')) {
+	define('IMG_JPG', IMAGETYPE_JPEG);
+}
 if (!defined('ENT_SUBSTITUTE')) { // PHP5.3 adds ENT_IGNORE, PHP5.4 adds ENT_SUBSTITUTE
 	define('ENT_SUBSTITUTE', (defined('ENT_IGNORE') ? ENT_IGNORE : 8));
 }
@@ -53,7 +57,7 @@
 		if (substr($basedir, -1, 1) != DIRECTORY_SEPARATOR) {
 			$basedir .= DIRECTORY_SEPARATOR;
 		}
-		if (strpos($temp_dir, $basedir) === 0) {
+		if (preg_match('#^'.preg_quote($basedir).'#', $temp_dir)) {
 			$found_valid_tempdir = true;
 			break;
 		}
@@ -210,140 +214,6 @@ class getID3
 	 */
 	public $option_fread_buffer_size = 32768;
 
-
-
-	// module-specific options
-
-	/** archive.rar
-	 * if true use PHP RarArchive extension, if false (non-extension parsing not yet written in getID3)
-	 *
-	 * @var bool
-	 */
-	public $options_archive_rar_use_php_rar_extension = true;
-
-	/** archive.gzip
-	 * Optional file list - disable for speed.
-	 * Decode gzipped files, if possible, and parse recursively (.tar.gz for example).
-	 *
-	 * @var bool
-	 */
-	public $options_archive_gzip_parse_contents = false;
-
-	/** audio.midi
-	 * if false only parse most basic information, much faster for some files but may be inaccurate
-	 *
-	 * @var bool
-	 */
-	public $options_audio_midi_scanwholefile = true;
-
-	/** audio.mp3
-	 * Forces getID3() to scan the file byte-by-byte and log all the valid audio frame headers - extremely slow,
-	 * unrecommended, but may provide data from otherwise-unusable files.
-	 *
-	 * @var bool
-	 */
-	public $options_audio_mp3_allow_bruteforce = false;
-
-	/** audio.mp3
-	 * number of frames to scan to determine if MPEG-audio sequence is valid
-	 * Lower this number to 5-20 for faster scanning
-	 * Increase this number to 50+ for most accurate detection of valid VBR/CBR mpeg-audio streams
-	 *
-	 * @var int
-	 */
-	public $options_audio_mp3_mp3_valid_check_frames = 50;
-
-	/** audio.wavpack
-	 * Avoid scanning all frames (break after finding ID_RIFF_HEADER and ID_CONFIG_BLOCK,
-	 * significantly faster for very large files but other data may be missed
-	 *
-	 * @var bool
-	 */
-	public $options_audio_wavpack_quick_parsing = false;
-
-	/** audio-video.flv
-	 * Break out of the loop if too many frames have been scanned; only scan this
-	 * many if meta frame does not contain useful duration.
-	 *
-	 * @var int
-	 */
-	public $options_audiovideo_flv_max_frames = 100000;
-
-	/** audio-video.matroska
-	 * If true, do not return information about CLUSTER chunks, since there's a lot of them
-	 * and they're not usually useful [default: TRUE].
-	 *
-	 * @var bool
-	 */
-	public $options_audiovideo_matroska_hide_clusters    = true;
-
-	/** audio-video.matroska
-	 * True to parse the whole file, not only header [default: FALSE].
-	 *
-	 * @var bool
-	 */
-	public $options_audiovideo_matroska_parse_whole_file = false;
-
-	/** audio-video.quicktime
-	 * return all parsed data from all atoms if true, otherwise just returned parsed metadata
-	 *
-	 * @var bool
-	 */
-	public $options_audiovideo_quicktime_ReturnAtomData  = false;
-
-	/** audio-video.quicktime
-	 * return all parsed data from all atoms if true, otherwise just returned parsed metadata
-	 *
-	 * @var bool
-	 */
-	public $options_audiovideo_quicktime_ParseAllPossibleAtoms = false;
-
-	/** audio-video.swf
-	 * return all parsed tags if true, otherwise do not return tags not parsed by getID3
-	 *
-	 * @var bool
-	 */
-	public $options_audiovideo_swf_ReturnAllTagData = false;
-
-	/** graphic.bmp
-	 * return BMP palette
-	 *
-	 * @var bool
-	 */
-	public $options_graphic_bmp_ExtractPalette = false;
-
-	/** graphic.bmp
-	 * return image data
-	 *
-	 * @var bool
-	 */
-	public $options_graphic_bmp_ExtractData    = false;
-
-	/** graphic.png
-	 * If data chunk is larger than this do not read it completely (getID3 only needs the first
-	 * few dozen bytes for parsing).
-	 *
-	 * @var int
-	 */
-	public $options_graphic_png_max_data_bytes = 10000000;
-
-	/** misc.pdf
-	 * return full details of PDF Cross-Reference Table (XREF)
-	 *
-	 * @var bool
-	 */
-	public $options_misc_pdf_returnXREF = false;
-
-	/** misc.torrent
-	 * Assume all .torrent files are less than 1MB and just read entire thing into memory for easy processing.
-	 * Override this value if you need to process files larger than 1MB
-	 *
-	 * @var int
-	 */
-	public $options_misc_torrent_max_torrent_filesize = 1048576;
-
-
-
 	// Public variables
 
 	/**
@@ -387,7 +257,7 @@ class getID3
 	 */
 	protected $startup_warning = '';
 
-	const VERSION           = '1.9.21-202109171300';
+	const VERSION           = '1.9.20-202006061653';
 	const FREAD_BUFFER_SIZE = 32768;
 
 	const ATTACHMENTS_NONE   = false;
@@ -767,18 +637,6 @@ public function analyze($filename, $filesize=null, $original_filename='', $fp=nu
 				return $this->error('Format not supported, module "'.$determined_format['include'].'" is corrupt.');
 			}
 			$class = new $class_name($this);
-
-			// set module-specific options
-			foreach (get_object_vars($this) as $getid3_object_vars_key => $getid3_object_vars_value) {
-				if (preg_match('#^options_([^_]+)_([^_]+)_(.+)$#i', $getid3_object_vars_key, $matches)) {
-					list($dummy, $GOVgroup, $GOVmodule, $GOVsetting) = $matches;
-					$GOVgroup = (($GOVgroup == 'audiovideo') ? 'audio-video' : $GOVgroup); // variable names can only contain 0-9a-z_ so standardize here
-					if (($GOVgroup == $determined_format['group']) && ($GOVmodule == $determined_format['module'])) {
-						$class->$GOVsetting = $getid3_object_vars_value;
-					}
-				}
-			}
-
 			$class->Analyze();
 			unset($class);
 
@@ -1497,16 +1355,6 @@ public function GetFileFormatArray() {
 							'fail_ape'  => 'ERROR',
 						),
 
-				// TORRENT             - .torrent
-				'torrent' => array(
-							'pattern'   => '^(d8\\:announce|d7\\:comment)',
-							'group'     => 'misc',
-							'module'    => 'torrent',
-							'mime_type' => 'application/x-bittorrent',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-						),
-
 				 // CUE  - data       - CUEsheet (index to single-file disc images)
 				 'cue' => array(
 							'pattern'   => '', // empty pattern means cannot be automatically detected, will fall through all other formats and match based on filename and very basic file contents
@@ -1641,7 +1489,7 @@ public function HandleAllTags() {
 						if (is_string($value)) {
 							$value = trim($value, " \r\n\t"); // do not trim nulls from $value!! Unicode characters will get mangled if trailing nulls are removed!
 						}
-						if (isset($value) && $value !== "") {
+						if ($value) {
 							if (!is_numeric($key)) {
 								$this->info['tags'][trim($tag_name)][trim($tag_key)][$key] = $value;
 							} else {
@@ -2248,25 +2096,19 @@ protected function fseek($bytes, $whence=SEEK_SET) {
 					$this->data_string_position = $this->data_string_length + $bytes;
 					break;
 			}
-			return 0; // fseek returns 0 on success
-		}
-
-		$pos = $bytes;
-		if ($whence == SEEK_CUR) {
-			$pos = $this->ftell() + $bytes;
-		} elseif ($whence == SEEK_END) {
-			$pos = $this->getid3->info['filesize'] + $bytes;
-		}
-		if (!getid3_lib::intValueSupported($pos)) {
-			throw new getid3_exception('cannot fseek('.$pos.') because beyond PHP filesystem limit', 10);
-		}
-
-		// https://github.com/JamesHeinrich/getID3/issues/327
-		$result = fseek($this->getid3->fp, $bytes, $whence);
-		if ($result !== 0) { // fseek returns 0 on success
-			throw new getid3_exception('cannot fseek('.$pos.'). resource/stream does not appear to support seeking', 10);
+			return 0;
+		} else {
+			$pos = $bytes;
+			if ($whence == SEEK_CUR) {
+				$pos = $this->ftell() + $bytes;
+			} elseif ($whence == SEEK_END) {
+				$pos = $this->getid3->info['filesize'] + $bytes;
+			}
+			if (!getid3_lib::intValueSupported($pos)) {
+				throw new getid3_exception('cannot fseek('.$pos.') because beyond PHP filesystem limit', 10);
+			}
 		}
-		return $result;
+		return fseek($this->getid3->fp, $bytes, $whence);
 	}
 
 	/**
@@ -2382,8 +2224,6 @@ protected function notice($text) {
 	 * @throws getid3_exception
 	 */
 	public function saveAttachment($name, $offset, $length, $image_mime=null) {
-		$fp_dest = null;
-		$dest = null;
 		try {
 
 			// do not extract at all
diff --git a/src/wp-includes/ID3/module.audio-video.asf.php b/src/wp-includes/ID3/module.audio-video.asf.php
index 85edb7d755e68..fce923c0272ec 100644
--- a/src/wp-includes/ID3/module.audio-video.asf.php
+++ b/src/wp-includes/ID3/module.audio-video.asf.php
@@ -93,7 +93,6 @@ public function Analyze() {
 		$offset = 0;
 		$thisfile_asf_streambitratepropertiesobject = array();
 		$thisfile_asf_codeclistobject = array();
-		$StreamPropertiesObjectData = array();
 
 		for ($HeaderObjectsCounter = 0; $HeaderObjectsCounter < $thisfile_asf_headerobject['headerobjects']; $HeaderObjectsCounter++) {
 			$NextObjectGUID = substr($ASFHeaderData, $offset, 16);
@@ -284,7 +283,7 @@ public function Analyze() {
 					$thisfile_asf_headerextensionobject['reserved_2']          = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
 					$offset += 2;
 					if ($thisfile_asf_headerextensionobject['reserved_2'] != 6) {
-						$this->warning('header_extension_object.reserved_2 ('.$thisfile_asf_headerextensionobject['reserved_2'].') does not match expected value of "6"');
+						$this->warning('header_extension_object.reserved_2 ('.getid3_lib::PrintHexBytes($thisfile_asf_headerextensionobject['reserved_2']).') does not match expected value of "6"');
 						//return false;
 						break;
 					}
@@ -536,7 +535,7 @@ public function Analyze() {
 					$thisfile_asf_markerobject['reserved_2'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
 					$offset += 2;
 					if ($thisfile_asf_markerobject['reserved_2'] != 0) {
-						$this->warning('marker_object.reserved_2 ('.$thisfile_asf_markerobject['reserved_2'].') does not match expected value of "0"');
+						$this->warning('marker_object.reserved_2 ('.getid3_lib::PrintHexBytes($thisfile_asf_markerobject['reserved_2']).') does not match expected value of "0"');
 						break;
 					}
 					$thisfile_asf_markerobject['name_length'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
@@ -1194,7 +1193,7 @@ public function Analyze() {
 					$thisfile_asf_dataobject['reserved']           = getid3_lib::LittleEndian2Int(substr($DataObjectData, $offset, 2));
 					$offset += 2;
 					if ($thisfile_asf_dataobject['reserved'] != 0x0101) {
-						$this->warning('data_object.reserved (0x'.sprintf('%04X', $thisfile_asf_dataobject['reserved']).') does not match expected value of "0x0101"');
+						$this->warning('data_object.reserved ('.getid3_lib::PrintHexBytes($thisfile_asf_dataobject['reserved']).') does not match expected value of "0x0101"');
 						//return false;
 						break;
 					}
diff --git a/src/wp-includes/ID3/module.audio-video.flv.php b/src/wp-includes/ID3/module.audio-video.flv.php
index 3b59e596e331c..7e684072e35f8 100644
--- a/src/wp-includes/ID3/module.audio-video.flv.php
+++ b/src/wp-includes/ID3/module.audio-video.flv.php
@@ -161,7 +161,6 @@ public function Analyze() {
 						$info['flv']['video']['videoCodec'] = $LastHeaderByte & 0x07;
 
 						$FLVvideoHeader = $this->fread(11);
-						$PictureSizeEnc = array();
 
 						if ($info['flv']['video']['videoCodec'] == GETID3_FLV_VIDEO_H264) {
 							// this code block contributed by: moysevichØgmail*com
diff --git a/src/wp-includes/ID3/module.audio-video.matroska.php b/src/wp-includes/ID3/module.audio-video.matroska.php
index 128e614e2c5cc..a2851085907ca 100644
--- a/src/wp-includes/ID3/module.audio-video.matroska.php
+++ b/src/wp-includes/ID3/module.audio-video.matroska.php
@@ -224,14 +224,14 @@ class getid3_matroska extends getid3_handler
 	 *
 	 * @var bool
 	 */
-	public $hide_clusters    = true;
+	public static $hide_clusters    = true;
 
 	/**
 	 * True to parse the whole file, not only header [default: FALSE].
 	 *
 	 * @var bool
 	 */
-	public $parse_whole_file = false;
+	public static $parse_whole_file = false;
 
 	/*
 	 * Private parser settings/placeholders.
@@ -586,7 +586,7 @@ private function parseEBML(&$info) {
 					$info['matroska']['segment'][0]['length'] = $top_element['length'];
 
 					while ($this->getEBMLelement($element_data, $top_element['end'])) {
-						if ($element_data['id'] != EBML_ID_CLUSTER || !$this->hide_clusters) { // collect clusters only if required
+						if ($element_data['id'] != EBML_ID_CLUSTER || !self::$hide_clusters) { // collect clusters only if required
 							$info['matroska']['segments'][] = $element_data;
 						}
 						switch ($element_data['id']) {
@@ -618,7 +618,7 @@ private function parseEBML(&$info) {
 												$this->warning('seek_entry[target_id] unexpectedly not set at '.$seek_entry['offset']);
 												break;
 											}
-											if (($seek_entry['target_id'] != EBML_ID_CLUSTER) || !$this->hide_clusters) { // collect clusters only if required
+											if (($seek_entry['target_id'] != EBML_ID_CLUSTER) || !self::$hide_clusters) { // collect clusters only if required
 												$info['matroska']['seek'][] = $seek_entry;
 											}
 											break;
@@ -905,7 +905,7 @@ private function parseEBML(&$info) {
 								break;
 
 							case EBML_ID_CUES: // A top-level element to speed seeking access. All entries are local to the segment. Should be mandatory for non "live" streams.
-								if ($this->hide_clusters) { // do not parse cues if hide clusters is "ON" till they point to clusters anyway
+								if (self::$hide_clusters) { // do not parse cues if hide clusters is "ON" till they point to clusters anyway
 									$this->current_offset = $element_data['end'];
 									break;
 								}
@@ -1246,12 +1246,12 @@ private function parseEBML(&$info) {
 									}
 									$this->current_offset = $subelement['end'];
 								}
-								if (!$this->hide_clusters) {
+								if (!self::$hide_clusters) {
 									$info['matroska']['cluster'][] = $cluster_entry;
 								}
 
 								// check to see if all the data we need exists already, if so, break out of the loop
-								if (!$this->parse_whole_file) {
+								if (!self::$parse_whole_file) {
 									if (isset($info['matroska']['info']) && is_array($info['matroska']['info'])) {
 										if (isset($info['matroska']['tracks']['tracks']) && is_array($info['matroska']['tracks']['tracks'])) {
 											if (count($info['matroska']['track_data_offsets']) == count($info['matroska']['tracks']['tracks'])) {
diff --git a/src/wp-includes/ID3/module.audio-video.quicktime.php b/src/wp-includes/ID3/module.audio-video.quicktime.php
index c3bccfd086b04..1cf1c0590b863 100644
--- a/src/wp-includes/ID3/module.audio-video.quicktime.php
+++ b/src/wp-includes/ID3/module.audio-video.quicktime.php
@@ -24,18 +24,7 @@
 class getid3_quicktime extends getid3_handler
 {
 
-	/** audio-video.quicktime
-	 * return all parsed data from all atoms if true, otherwise just returned parsed metadata
-	 *
-	 * @var bool
-	 */
-	public $ReturnAtomData        = false;
-
-	/** audio-video.quicktime
-	 * return all parsed data from all atoms if true, otherwise just returned parsed metadata
-	 *
-	 * @var bool
-	 */
+	public $ReturnAtomData        = true;
 	public $ParseAllPossibleAtoms = false;
 
 	/**
@@ -181,7 +170,7 @@ public function Analyze() {
 			}
 		}
 
-		if (!isset($info['bitrate']) && !empty($info['playtime_seconds'])) {
+		if (!isset($info['bitrate']) && isset($info['playtime_seconds'])) {
 			$info['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
 		}
 		if (isset($info['bitrate']) && !isset($info['audio']['bitrate']) && !isset($info['quicktime']['video'])) {
@@ -571,28 +560,15 @@ public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset
 											default:
 												$atom_structure['data'] = substr($boxdata, 8);
 												if ($atomname == 'covr') {
-													if (!empty($atom_structure['data'])) {
-														$atom_structure['image_mime'] = 'image/unknown'; // provide default MIME type to ensure array keys exist
-														if (function_exists('getimagesizefromstring') && ($getimagesize = getimagesizefromstring($atom_structure['data'])) && !empty($getimagesize['mime'])) {
-															$atom_structure['image_mime'] = $getimagesize['mime'];
-														} else {
-															// if getimagesizefromstring is not available, or fails for some reason, fall back to simple detection of common image formats
-															$ImageFormatSignatures = array(
-																'image/jpeg' => "\xFF\xD8\xFF",
-																'image/png'  => "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A",
-																'image/gif'  => 'GIF',
-															);
-															foreach ($ImageFormatSignatures as $mime => $image_format_signature) {
-																if (substr($atom_structure['data'], 0, strlen($image_format_signature)) == $image_format_signature) {
-																	$atom_structure['image_mime'] = $mime;
-																	break;
-																}
-															}
-														}
-														$info['quicktime']['comments']['picture'][] = array('image_mime'=>$atom_structure['image_mime'], 'data'=>$atom_structure['data'], 'description'=>'cover');
-													} else {
-														$this->warning('Unknown empty "covr" image at offset '.$baseoffset);
+													// not a foolproof check, but better than nothing
+													if (preg_match('#^\\xFF\\xD8\\xFF#', $atom_structure['data'])) {
+														$atom_structure['image_mime'] = 'image/jpeg';
+													} elseif (preg_match('#^\\x89\\x50\\x4E\\x47\\x0D\\x0A\\x1A\\x0A#', $atom_structure['data'])) {
+														$atom_structure['image_mime'] = 'image/png';
+													} elseif (preg_match('#^GIF#', $atom_structure['data'])) {
+														$atom_structure['image_mime'] = 'image/gif';
 													}
+													$info['quicktime']['comments']['picture'][] = array('image_mime'=>$atom_structure['image_mime'], 'data'=>$atom_structure['data'], 'description'=>'cover');
 												}
 												break;
 
@@ -752,13 +728,11 @@ public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset
 					$atom_structure['flags']['play_on_open'] = (bool) $atom_structure['play_on_open_flag'];
 					$atom_structure['flags']['slide_show']   = (bool) $atom_structure['slide_show_flag'];
 
-					$ptv_lookup = array(
-						0 => 'normal',
-						1 => 'double',
-						2 => 'half',
-						3 => 'full',
-						4 => 'current'
-					);
+					$ptv_lookup[0] = 'normal';
+					$ptv_lookup[1] = 'double';
+					$ptv_lookup[2] = 'half';
+					$ptv_lookup[3] = 'full';
+					$ptv_lookup[4] = 'current';
 					if (isset($ptv_lookup[$atom_structure['display_size_raw']])) {
 						$atom_structure['display_size'] = $ptv_lookup[$atom_structure['display_size_raw']];
 					} else {
@@ -934,13 +908,13 @@ public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset
 										$atom_structure['sample_description_table'][$i]['video_pixel_color_depth'] =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 66,  2));
 										$atom_structure['sample_description_table'][$i]['video_color_table_id']    =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 68,  2));
 
-										$atom_structure['sample_description_table'][$i]['video_pixel_color_type']  = (((int) $atom_structure['sample_description_table'][$i]['video_pixel_color_depth'] > 32) ? 'grayscale' : 'color');
+										$atom_structure['sample_description_table'][$i]['video_pixel_color_type']  = (($atom_structure['sample_description_table'][$i]['video_pixel_color_depth'] > 32) ? 'grayscale' : 'color');
 										$atom_structure['sample_description_table'][$i]['video_pixel_color_name']  = $this->QuicktimeColorNameLookup($atom_structure['sample_description_table'][$i]['video_pixel_color_depth']);
 
 										if ($atom_structure['sample_description_table'][$i]['video_pixel_color_name'] != 'invalid') {
 											$info['quicktime']['video']['codec_fourcc']        = $atom_structure['sample_description_table'][$i]['data_format'];
 											$info['quicktime']['video']['codec_fourcc_lookup'] = $this->QuicktimeVideoCodecLookup($atom_structure['sample_description_table'][$i]['data_format']);
-											$info['quicktime']['video']['codec']               = (((int) $atom_structure['sample_description_table'][$i]['video_encoder_name_len'] > 0) ? $atom_structure['sample_description_table'][$i]['video_encoder_name'] : $atom_structure['sample_description_table'][$i]['data_format']);
+											$info['quicktime']['video']['codec']               = (($atom_structure['sample_description_table'][$i]['video_encoder_name_len'] > 0) ? $atom_structure['sample_description_table'][$i]['video_encoder_name'] : $atom_structure['sample_description_table'][$i]['data_format']);
 											$info['quicktime']['video']['color_depth']         = $atom_structure['sample_description_table'][$i]['video_pixel_color_depth'];
 											$info['quicktime']['video']['color_depth_name']    = $atom_structure['sample_description_table'][$i]['video_pixel_color_name'];
 
@@ -1624,61 +1598,33 @@ public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset
 					break;
 
 				case 'NCDT':
-					// https://exiftool.org/TagNames/Nikon.html
+					// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html
 					// Nikon-specific QuickTime tags found in the NCDT atom of MOV videos from some Nikon cameras such as the Coolpix S8000 and D5100
 					$atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 4, $atomHierarchy, $ParseAllPossibleAtoms);
 					break;
 				case 'NCTH': // Nikon Camera THumbnail image
 				case 'NCVW': // Nikon Camera preVieW image
-				case 'NCM1': // Nikon Camera preview iMage 1
-				case 'NCM2': // Nikon Camera preview iMage 2
-					// https://exiftool.org/TagNames/Nikon.html
+					// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html
 					if (preg_match('/^\xFF\xD8\xFF/', $atom_data)) {
-						$descriptions = array(
-							'NCTH' => 'Nikon Camera Thumbnail Image',
-							'NCVW' => 'Nikon Camera Preview Image',
-							'NCM1' => 'Nikon Camera Preview Image 1',
-							'NCM2' => 'Nikon Camera Preview Image 2',
-						);
 						$atom_structure['data'] = $atom_data;
 						$atom_structure['image_mime'] = 'image/jpeg';
-						$atom_structure['description'] = isset($descriptions[$atomname]) ? $descriptions[$atomname] : 'Nikon preview image';
-						$info['quicktime']['comments']['picture'][] = array(
-							'image_mime' => $atom_structure['image_mime'],
-							'data' => $atom_data,
-							'description' => $atom_structure['description']
-						);
+						$atom_structure['description'] = (($atomname == 'NCTH') ? 'Nikon Camera Thumbnail Image' : (($atomname == 'NCVW') ? 'Nikon Camera Preview Image' : 'Nikon preview image'));
+						$info['quicktime']['comments']['picture'][] = array('image_mime'=>$atom_structure['image_mime'], 'data'=>$atom_data, 'description'=>$atom_structure['description']);
 					}
 					break;
-				case 'NCTG': // Nikon - https://exiftool.org/TagNames/Nikon.html#NCTG
-					getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.nikon-nctg.php', __FILE__, true);
-					$nikonNCTG = new getid3_tag_nikon_nctg($this->getid3);
-
-					$atom_structure['data'] = $nikonNCTG->parse($atom_data);
-					break;
-				case 'NCHD': // Nikon:MakerNoteVersion  - https://exiftool.org/TagNames/Nikon.html
-					$makerNoteVersion = '';
-					for ($i = 0, $iMax = strlen($atom_data); $i < $iMax; ++$i) {
-						if (ord($atom_data[$i]) >= 0x00 && ord($atom_data[$i]) <= 0x1F) {
-							$makerNoteVersion .= ' '.ord($atom_data[$i]);
-						} else {
-							$makerNoteVersion .= $atom_data[$i];
-						}
-					}
-					$makerNoteVersion = rtrim($makerNoteVersion, "\x00");
-					$atom_structure['data'] = array(
-						'MakerNoteVersion' => $makerNoteVersion
-					);
+				case 'NCTG': // Nikon - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html#NCTG
+					$atom_structure['data'] = $this->QuicktimeParseNikonNCTG($atom_data);
 					break;
-				case 'NCDB': // Nikon                   - https://exiftool.org/TagNames/Nikon.html
-				case 'CNCV': // Canon:CompressorVersion - https://exiftool.org/TagNames/Canon.html
+				case 'NCHD': // Nikon:MakerNoteVersion  - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html
+				case 'NCDB': // Nikon                   - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html
+				case 'CNCV': // Canon:CompressorVersion - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Canon.html
 					$atom_structure['data'] = $atom_data;
 					break;
 
 				case "\x00\x00\x00\x00":
 					// some kind of metacontainer, may contain a big data dump such as:
 					// mdta keys \005 mdtacom.apple.quicktime.make (mdtacom.apple.quicktime.creationdate ,mdtacom.apple.quicktime.location.ISO6709 $mdtacom.apple.quicktime.software !mdtacom.apple.quicktime.model ilst \01D \001 \015data \001DE\010Apple 0 \002 (data \001DE\0102011-05-11T17:54:04+0200 2 \003 *data \001DE\010+52.4936+013.3897+040.247/ \01D \004 \015data \001DE\0104.3.1 \005 \018data \001DE\010iPhone 4
-					// https://xhelmboyx.tripod.com/formats/qti-layout.txt
+					// http://www.geocities.com/xhelmboyx/quicktime/formats/qti-layout.txt
 
 					$atom_structure['version']   =          getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
 					$atom_structure['flags_raw'] =          getid3_lib::BigEndian2Int(substr($atom_data, 1, 3));
@@ -1775,7 +1721,6 @@ public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset
 									'unknown_data'   => array(),
 									'debug_list'     => '',      // Used to debug variables stored as comma delimited strings
 							);
-							$debug_structure = array();
 							$debug_structure['debug_items'] = array();
 							// Can start loop here to decode all sensor data in 32 Byte chunks:
 							foreach (str_split($atom_SENSOR_data, 32) as $sensor_key => $sensor_data) {
@@ -2094,7 +2039,7 @@ public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset
 	 * @return array|false
 	 */
 	public function QuicktimeParseContainerAtom($atom_data, $baseoffset, &$atomHierarchy, $ParseAllPossibleAtoms) {
-		$atom_structure = array();
+		$atom_structure  = false;
 		$subatomoffset  = 0;
 		$subatomcounter = 0;
 		if ((strlen($atom_data) == 4) && (getid3_lib::BigEndian2Int($atom_data) == 0x00000000)) {
@@ -2112,22 +2057,17 @@ public function QuicktimeParseContainerAtom($atom_data, $baseoffset, &$atomHiera
 					$subatomoffset += 4;
 					continue;
 				}
-				break;
+				return $atom_structure;
 			}
 			if (strlen($subatomdata) < ($subatomsize - 8)) {
 			    // we don't have enough data to decode the subatom.
 			    // this may be because we are refusing to parse large subatoms, or it may be because this atom had its size set too large
 			    // so we passed in the start of a following atom incorrectly?
-			    break;
+			    return $atom_structure;
 			}
 			$atom_structure[$subatomcounter++] = $this->QuicktimeParseAtom($subatomname, $subatomsize, $subatomdata, $baseoffset + $subatomoffset, $atomHierarchy, $ParseAllPossibleAtoms);
 			$subatomoffset += $subatomsize;
 		}
-
-		if (empty($atom_structure)) {
-			return false;
-		}
-
 		return $atom_structure;
 	}
 
@@ -2612,9 +2552,8 @@ public function QuicktimeContentRatingLookup($rtng) {
 		static $QuicktimeContentRatingLookup = array();
 		if (empty($QuicktimeContentRatingLookup)) {
 			$QuicktimeContentRatingLookup[0]  = 'None';
-			$QuicktimeContentRatingLookup[1]  = 'Explicit';
 			$QuicktimeContentRatingLookup[2]  = 'Clean';
-			$QuicktimeContentRatingLookup[4]  = 'Explicit (old)';
+			$QuicktimeContentRatingLookup[4]  = 'Explicit';
 		}
 		return (isset($QuicktimeContentRatingLookup[$rtng]) ? $QuicktimeContentRatingLookup[$rtng] : 'invalid');
 	}
@@ -2667,6 +2606,189 @@ public function QuicktimeStoreFrontCodeLookup($sfid) {
 		return (isset($QuicktimeStoreFrontCodeLookup[$sfid]) ? $QuicktimeStoreFrontCodeLookup[$sfid] : 'invalid');
 	}
 
+	/**
+	 * @param string $atom_data
+	 *
+	 * @return array
+	 */
+	public function QuicktimeParseNikonNCTG($atom_data) {
+		// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html#NCTG
+		// Nikon-specific QuickTime tags found in the NCDT atom of MOV videos from some Nikon cameras such as the Coolpix S8000 and D5100
+		// Data is stored as records of:
+		// * 4 bytes record type
+		// * 2 bytes size of data field type:
+		//     0x0001 = flag   (size field *= 1-byte)
+		//     0x0002 = char   (size field *= 1-byte)
+		//     0x0003 = DWORD+ (size field *= 2-byte), values are stored CDAB
+		//     0x0004 = QWORD+ (size field *= 4-byte), values are stored EFGHABCD
+		//     0x0005 = float  (size field *= 8-byte), values are stored aaaabbbb where value is aaaa/bbbb; possibly multiple sets of values appended together
+		//     0x0007 = bytes  (size field *= 1-byte), values are stored as ??????
+		//     0x0008 = ?????  (size field *= 2-byte), values are stored as ??????
+		// * 2 bytes data size field
+		// * ? bytes data (string data may be null-padded; datestamp fields are in the format "2011:05:25 20:24:15")
+		// all integers are stored BigEndian
+
+		$NCTGtagName = array(
+			0x00000001 => 'Make',
+			0x00000002 => 'Model',
+			0x00000003 => 'Software',
+			0x00000011 => 'CreateDate',
+			0x00000012 => 'DateTimeOriginal',
+			0x00000013 => 'FrameCount',
+			0x00000016 => 'FrameRate',
+			0x00000022 => 'FrameWidth',
+			0x00000023 => 'FrameHeight',
+			0x00000032 => 'AudioChannels',
+			0x00000033 => 'AudioBitsPerSample',
+			0x00000034 => 'AudioSampleRate',
+			0x02000001 => 'MakerNoteVersion',
+			0x02000005 => 'WhiteBalance',
+			0x0200000b => 'WhiteBalanceFineTune',
+			0x0200001e => 'ColorSpace',
+			0x02000023 => 'PictureControlData',
+			0x02000024 => 'WorldTime',
+			0x02000032 => 'UnknownInfo',
+			0x02000083 => 'LensType',
+			0x02000084 => 'Lens',
+		);
+
+		$offset = 0;
+		$data = null;
+		$datalength = strlen($atom_data);
+		$parsed = array();
+		while ($offset < $datalength) {
+			$record_type       = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 4));  $offset += 4;
+			$data_size_type    = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 2));  $offset += 2;
+			$data_size         = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 2));  $offset += 2;
+			switch ($data_size_type) {
+				case 0x0001: // 0x0001 = flag   (size field *= 1-byte)
+					$data = getid3_lib::BigEndian2Int(substr($atom_data, $offset, $data_size * 1));
+					$offset += ($data_size * 1);
+					break;
+				case 0x0002: // 0x0002 = char   (size field *= 1-byte)
+					$data = substr($atom_data, $offset, $data_size * 1);
+					$offset += ($data_size * 1);
+					$data = rtrim($data, "\x00");
+					break;
+				case 0x0003: // 0x0003 = DWORD+ (size field *= 2-byte), values are stored CDAB
+					$data = '';
+					for ($i = $data_size - 1; $i >= 0; $i--) {
+						$data .= substr($atom_data, $offset + ($i * 2), 2);
+					}
+					$data = getid3_lib::BigEndian2Int($data);
+					$offset += ($data_size * 2);
+					break;
+				case 0x0004: // 0x0004 = QWORD+ (size field *= 4-byte), values are stored EFGHABCD
+					$data = '';
+					for ($i = $data_size - 1; $i >= 0; $i--) {
+						$data .= substr($atom_data, $offset + ($i * 4), 4);
+					}
+					$data = getid3_lib::BigEndian2Int($data);
+					$offset += ($data_size * 4);
+					break;
+				case 0x0005: // 0x0005 = float  (size field *= 8-byte), values are stored aaaabbbb where value is aaaa/bbbb; possibly multiple sets of values appended together
+					$data = array();
+					for ($i = 0; $i < $data_size; $i++) {
+						$numerator    = getid3_lib::BigEndian2Int(substr($atom_data, $offset + ($i * 8) + 0, 4));
+						$denomninator = getid3_lib::BigEndian2Int(substr($atom_data, $offset + ($i * 8) + 4, 4));
+						if ($denomninator == 0) {
+							$data[$i] = false;
+						} else {
+							$data[$i] = (double) $numerator / $denomninator;
+						}
+					}
+					$offset += (8 * $data_size);
+					if (count($data) == 1) {
+						$data = $data[0];
+					}
+					break;
+				case 0x0007: // 0x0007 = bytes  (size field *= 1-byte), values are stored as ??????
+					$data = substr($atom_data, $offset, $data_size * 1);
+					$offset += ($data_size * 1);
+					break;
+				case 0x0008: // 0x0008 = ?????  (size field *= 2-byte), values are stored as ??????
+					$data = substr($atom_data, $offset, $data_size * 2);
+					$offset += ($data_size * 2);
+					break;
+				default:
+					echo 'QuicktimeParseNikonNCTG()::unknown $data_size_type: '.$data_size_type.'<br>';
+					break 2;
+			}
+
+			switch ($record_type) {
+				case 0x00000011: // CreateDate
+				case 0x00000012: // DateTimeOriginal
+					$data = strtotime($data);
+					break;
+				case 0x0200001e: // ColorSpace
+					switch ($data) {
+						case 1:
+							$data = 'sRGB';
+							break;
+						case 2:
+							$data = 'Adobe RGB';
+							break;
+					}
+					break;
+				case 0x02000023: // PictureControlData
+					$PictureControlAdjust = array(0=>'default', 1=>'quick', 2=>'full');
+					$FilterEffect = array(0x80=>'off', 0x81=>'yellow', 0x82=>'orange',    0x83=>'red', 0x84=>'green',  0xff=>'n/a');
+					$ToningEffect = array(0x80=>'b&w', 0x81=>'sepia',  0x82=>'cyanotype', 0x83=>'red', 0x84=>'yellow', 0x85=>'green', 0x86=>'blue-green', 0x87=>'blue', 0x88=>'purple-blue', 0x89=>'red-purple', 0xff=>'n/a');
+					$data = array(
+						'PictureControlVersion'     =>                           substr($data,  0,  4),
+						'PictureControlName'        =>                     rtrim(substr($data,  4, 20), "\x00"),
+						'PictureControlBase'        =>                     rtrim(substr($data, 24, 20), "\x00"),
+						//'?'                       =>                           substr($data, 44,  4),
+						'PictureControlAdjust'      => $PictureControlAdjust[ord(substr($data, 48,  1))],
+						'PictureControlQuickAdjust' =>                       ord(substr($data, 49,  1)),
+						'Sharpness'                 =>                       ord(substr($data, 50,  1)),
+						'Contrast'                  =>                       ord(substr($data, 51,  1)),
+						'Brightness'                =>                       ord(substr($data, 52,  1)),
+						'Saturation'                =>                       ord(substr($data, 53,  1)),
+						'HueAdjustment'             =>                       ord(substr($data, 54,  1)),
+						'FilterEffect'              =>         $FilterEffect[ord(substr($data, 55,  1))],
+						'ToningEffect'              =>         $ToningEffect[ord(substr($data, 56,  1))],
+						'ToningSaturation'          =>                       ord(substr($data, 57,  1)),
+					);
+					break;
+				case 0x02000024: // WorldTime
+					// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html#WorldTime
+					// timezone is stored as offset from GMT in minutes
+					$timezone = getid3_lib::BigEndian2Int(substr($data, 0, 2));
+					if ($timezone & 0x8000) {
+						$timezone = 0 - (0x10000 - $timezone);
+					}
+					$timezone /= 60;
+
+					$dst = (bool) getid3_lib::BigEndian2Int(substr($data, 2, 1));
+					switch (getid3_lib::BigEndian2Int(substr($data, 3, 1))) {
+						case 2:
+							$datedisplayformat = 'D/M/Y'; break;
+						case 1:
+							$datedisplayformat = 'M/D/Y'; break;
+						case 0:
+						default:
+							$datedisplayformat = 'Y/M/D'; break;
+					}
+
+					$data = array('timezone'=>floatval($timezone), 'dst'=>$dst, 'display'=>$datedisplayformat);
+					break;
+				case 0x02000083: // LensType
+					$data = array(
+						//'_'  => $data,
+						'mf' => (bool) ($data & 0x01),
+						'd'  => (bool) ($data & 0x02),
+						'g'  => (bool) ($data & 0x04),
+						'vr' => (bool) ($data & 0x08),
+					);
+					break;
+			}
+			$tag_name = (isset($NCTGtagName[$record_type]) ? $NCTGtagName[$record_type] : '0x'.str_pad(dechex($record_type), 8, '0', STR_PAD_LEFT));
+			$parsed[$tag_name] = $data;
+		}
+		return $parsed;
+	}
+
 	/**
 	 * @param string $keyname
 	 * @param string|array $data
diff --git a/src/wp-includes/ID3/module.audio-video.riff.php b/src/wp-includes/ID3/module.audio-video.riff.php
index 6ef1116ad13ea..cdf553386bc34 100644
--- a/src/wp-includes/ID3/module.audio-video.riff.php
+++ b/src/wp-includes/ID3/module.audio-video.riff.php
@@ -56,7 +56,6 @@ public function Analyze() {
 		$thisfile_riff_video       = &$thisfile_riff['video'];
 		$thisfile_riff_WAVE        = array();
 
-		$Original                 = array();
 		$Original['avdataoffset'] = $info['avdataoffset'];
 		$Original['avdataend']    = $info['avdataend'];
 
@@ -297,18 +296,9 @@ public function Analyze() {
 					// shortcut
 					$thisfile_riff_WAVE_bext_0 = &$thisfile_riff_WAVE['bext'][0];
 
-					$thisfile_riff_WAVE_bext_0['title']          =                              substr($thisfile_riff_WAVE_bext_0['data'],   0, 256);
-					$thisfile_riff_WAVE_bext_0['author']         =                              substr($thisfile_riff_WAVE_bext_0['data'], 256,  32);
-					$thisfile_riff_WAVE_bext_0['reference']      =                              substr($thisfile_riff_WAVE_bext_0['data'], 288,  32);
-					foreach (array('title','author','reference') as $bext_key) {
-						// Some software (notably Logic Pro) may not blank existing data before writing a null-terminated string to the offsets
-						// assigned for text fields, resulting in a null-terminated string (or possibly just a single null) followed by garbage
-						// Keep only string as far as first null byte, discard rest of fixed-width data
-						// https://github.com/JamesHeinrich/getID3/issues/263
-						$null_terminator_offset = strpos($thisfile_riff_WAVE_bext_0[$bext_key], "\x00");
-						$thisfile_riff_WAVE_bext_0[$bext_key] = substr($thisfile_riff_WAVE_bext_0[$bext_key], 0, $null_terminator_offset);
-					}
-
+					$thisfile_riff_WAVE_bext_0['title']          =                         trim(substr($thisfile_riff_WAVE_bext_0['data'],   0, 256));
+					$thisfile_riff_WAVE_bext_0['author']         =                         trim(substr($thisfile_riff_WAVE_bext_0['data'], 256,  32));
+					$thisfile_riff_WAVE_bext_0['reference']      =                         trim(substr($thisfile_riff_WAVE_bext_0['data'], 288,  32));
 					$thisfile_riff_WAVE_bext_0['origin_date']    =                              substr($thisfile_riff_WAVE_bext_0['data'], 320,  10);
 					$thisfile_riff_WAVE_bext_0['origin_time']    =                              substr($thisfile_riff_WAVE_bext_0['data'], 330,   8);
 					$thisfile_riff_WAVE_bext_0['time_reference'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_bext_0['data'], 338,   8));
@@ -317,7 +307,6 @@ public function Analyze() {
 					$thisfile_riff_WAVE_bext_0['coding_history'] =         explode("\r\n", trim(substr($thisfile_riff_WAVE_bext_0['data'], 601)));
 					if (preg_match('#^([0-9]{4}).([0-9]{2}).([0-9]{2})$#', $thisfile_riff_WAVE_bext_0['origin_date'], $matches_bext_date)) {
 						if (preg_match('#^([0-9]{2}).([0-9]{2}).([0-9]{2})$#', $thisfile_riff_WAVE_bext_0['origin_time'], $matches_bext_time)) {
-							$bext_timestamp = array();
 							list($dummy, $bext_timestamp['year'], $bext_timestamp['month'],  $bext_timestamp['day'])    = $matches_bext_date;
 							list($dummy, $bext_timestamp['hour'], $bext_timestamp['minute'], $bext_timestamp['second']) = $matches_bext_time;
 							$thisfile_riff_WAVE_bext_0['origin_date_unix'] = gmmktime($bext_timestamp['hour'], $bext_timestamp['minute'], $bext_timestamp['second'], $bext_timestamp['month'], $bext_timestamp['day'], $bext_timestamp['year']);
@@ -462,62 +451,7 @@ public function Analyze() {
 					}
 				}
 
-				if (isset($thisfile_riff_WAVE['guan'][0]['data'])) {
-					// shortcut
-					$thisfile_riff_WAVE_guan_0 = &$thisfile_riff_WAVE['guan'][0];
-					if (!empty($thisfile_riff_WAVE_guan_0['data']) && (substr($thisfile_riff_WAVE_guan_0['data'], 0, 14) == 'GUANO|Version:')) {
-						$thisfile_riff['guano'] = array();
-						foreach (explode("\n", $thisfile_riff_WAVE_guan_0['data']) as $line) {
-							if ($line) {
-								@list($key, $value) = explode(':', $line, 2);
-								if (substr($value, 0, 3) == '[{"') {
-									if ($decoded = @json_decode($value, true)) {
-										if (!empty($decoded) && (count($decoded) == 1)) {
-											$value = $decoded[0];
-										} else {
-											$value = $decoded;
-										}
-									}
-								}
-								$thisfile_riff['guano'] = array_merge_recursive($thisfile_riff['guano'], getid3_lib::CreateDeepArray($key, '|', $value));
-							}
-						}
-
-						// https://www.wildlifeacoustics.com/SCHEMA/GUANO.html
-						foreach ($thisfile_riff['guano'] as $key => $value) {
-							switch ($key) {
-								case 'Loc Position':
-									if (preg_match('#^([\\+\\-]?[0-9]+\\.[0-9]+) ([\\+\\-]?[0-9]+\\.[0-9]+)$#', $value, $matches)) {
-										list($dummy, $latitude, $longitude) = $matches;
-										$thisfile_riff['comments']['gps_latitude'][0]  = floatval($latitude);
-										$thisfile_riff['comments']['gps_longitude'][0] = floatval($longitude);
-										$thisfile_riff['guano'][$key] = floatval($latitude).' '.floatval($longitude);
-									}
-									break;
-								case 'Loc Elevation': // Elevation/altitude above mean sea level in meters
-									$thisfile_riff['comments']['gps_altitude'][0] = floatval($value);
-									$thisfile_riff['guano'][$key] = (float) $value;
-									break;
-								case 'Filter HP':        // High-pass filter frequency in kHz
-								case 'Filter LP':        // Low-pass filter frequency in kHz
-								case 'Humidity':         // Relative humidity as a percentage
-								case 'Length':           // Recording length in seconds
-								case 'Loc Accuracy':     // Estimated Position Error in meters
-								case 'Temperature Ext':  // External temperature in degrees Celsius outside the recorder's housing
-								case 'Temperature Int':  // Internal temperature in degrees Celsius inside the recorder's housing
-									$thisfile_riff['guano'][$key] = (float) $value;
-									break;
-								case 'Samplerate':       // Recording sample rate, Hz
-								case 'TE':               // Time-expansion factor. If not specified, then 1 (no time-expansion a.k.a. direct-recording) is assumed.
-									$thisfile_riff['guano'][$key] = (int) $value;
-									break;
-							}
-						}
 
-					} else {
-						$this->warning('RIFF.guan data not in expected format');
-					}
-				}
 
 				if (!isset($thisfile_audio['bitrate']) && isset($thisfile_riff_audio[$streamindex]['bitrate'])) {
 					$thisfile_audio['bitrate'] = $thisfile_riff_audio[$streamindex]['bitrate'];
@@ -799,7 +733,6 @@ public function Analyze() {
 				}
 				if (isset($thisfile_riff['AVI ']['hdrl']['strl']['strh'][0]['data'])) {
 					if (is_array($thisfile_riff['AVI ']['hdrl']['strl']['strh'])) {
-						$thisfile_riff_raw_strf_strhfccType_streamindex = null;
 						for ($i = 0; $i < count($thisfile_riff['AVI ']['hdrl']['strl']['strh']); $i++) {
 							if (isset($thisfile_riff['AVI ']['hdrl']['strl']['strh'][$i]['data'])) {
 								$strhData = $thisfile_riff['AVI ']['hdrl']['strl']['strh'][$i]['data'];
@@ -1136,7 +1069,7 @@ public function Analyze() {
 				if (isset($thisfile_riff[$RIFFsubtype]['ID3 '])) {
 					getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v2.php', __FILE__, true);
 					$getid3_temp = new getID3();
-					$getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
+					$getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
 					$getid3_id3v2 = new getid3_id3v2($getid3_temp);
 					$getid3_id3v2->StartingOffset = $thisfile_riff[$RIFFsubtype]['ID3 '][0]['offset'] + 8;
 					if ($thisfile_riff[$RIFFsubtype]['ID3 '][0]['valid'] = $getid3_id3v2->Analyze()) {
@@ -1239,7 +1172,7 @@ public function Analyze() {
 					getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.mpeg.php', __FILE__, true);
 
 					$getid3_temp = new getID3();
-					$getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
+					$getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
 					$getid3_mpeg = new getid3_mpeg($getid3_temp);
 					$getid3_mpeg->Analyze();
 					if (empty($getid3_temp->info['error'])) {
@@ -1325,7 +1258,7 @@ public function Analyze() {
 					getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v2.php', __FILE__, true);
 
 					$getid3_temp = new getID3();
-					$getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
+					$getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
 					$getid3_id3v2 = new getid3_id3v2($getid3_temp);
 					$getid3_id3v2->StartingOffset = $thisfile_riff[$RIFFsubtype]['id3 '][0]['offset'] + 8;
 					if ($thisfile_riff[$RIFFsubtype]['id3 '][0]['valid'] = $getid3_id3v2->Analyze()) {
@@ -1581,9 +1514,6 @@ public function ParseRIFF($startoffset, $maxoffset) {
 
 		$RIFFchunk = false;
 		$FoundAllChunksWeNeed = false;
-		$LISTchunkParent = null;
-		$LISTchunkMaxOffset = null;
-		$AC3syncwordBytes = pack('n', getid3_ac3::syncword); // 0x0B77 -> "\x0B\x77"
 
 		try {
 			$this->fseek($startoffset);
@@ -1627,7 +1557,7 @@ public function ParseRIFF($startoffset, $maxoffset) {
 										// MP3
 										if (getid3_mp3::MPEGaudioHeaderBytesValid($FirstFourBytes)) {
 											$getid3_temp = new getID3();
-											$getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
+											$getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
 											$getid3_temp->info['avdataoffset'] = $this->ftell() - 4;
 											$getid3_temp->info['avdataend']    = $this->ftell() + $AudioChunkSize;
 											$getid3_mp3 = new getid3_mp3($getid3_temp, __CLASS__);
@@ -1645,10 +1575,11 @@ public function ParseRIFF($startoffset, $maxoffset) {
 											unset($getid3_temp, $getid3_mp3);
 										}
 
-									} elseif (strpos($FirstFourBytes, $AC3syncwordBytes) === 0) {
+									} elseif (strpos($FirstFourBytes, getid3_ac3::syncword) === 0) {
+
 										// AC3
 										$getid3_temp = new getID3();
-										$getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
+										$getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
 										$getid3_temp->info['avdataoffset'] = $this->ftell() - 4;
 										$getid3_temp->info['avdataend']    = $this->ftell() + $AudioChunkSize;
 										$getid3_ac3 = new getid3_ac3($getid3_temp);
@@ -1709,7 +1640,7 @@ public function ParseRIFF($startoffset, $maxoffset) {
 									// Probably is MP3 data
 									if (getid3_mp3::MPEGaudioHeaderBytesValid(substr($testData, 0, 4))) {
 										$getid3_temp = new getID3();
-										$getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
+										$getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
 										$getid3_temp->info['avdataoffset'] = $info['avdataoffset'];
 										$getid3_temp->info['avdataend']    = $info['avdataend'];
 										$getid3_mp3 = new getid3_mp3($getid3_temp, __CLASS__);
@@ -1721,12 +1652,12 @@ public function ParseRIFF($startoffset, $maxoffset) {
 										unset($getid3_temp, $getid3_mp3);
 									}
 
-								} elseif (($isRegularAC3 = (substr($testData, 0, 2) == $AC3syncwordBytes)) || substr($testData, 8, 2) == strrev($AC3syncwordBytes)) {
+								} elseif (($isRegularAC3 = (substr($testData, 0, 2) == getid3_ac3::syncword)) || substr($testData, 8, 2) == strrev(getid3_ac3::syncword)) {
 
 									// This is probably AC-3 data
 									$getid3_temp = new getID3();
 									if ($isRegularAC3) {
-										$getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
+										$getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
 										$getid3_temp->info['avdataoffset'] = $info['avdataoffset'];
 										$getid3_temp->info['avdataend']    = $info['avdataend'];
 									}
@@ -1742,8 +1673,6 @@ public function ParseRIFF($startoffset, $maxoffset) {
 											$ac3_data .= substr($testData, 8 + $i + 1, 1);
 											$ac3_data .= substr($testData, 8 + $i + 0, 1);
 										}
-										$getid3_ac3->getid3->info['avdataoffset'] = 0;
-										$getid3_ac3->getid3->info['avdataend']    = strlen($ac3_data);
 										$getid3_ac3->AnalyzeString($ac3_data);
 									}
 
@@ -1762,7 +1691,7 @@ public function ParseRIFF($startoffset, $maxoffset) {
 
 									// This is probably DTS data
 									$getid3_temp = new getID3();
-									$getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
+									$getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
 									$getid3_temp->info['avdataoffset'] = $info['avdataoffset'];
 									$getid3_dts = new getid3_dts($getid3_temp);
 									$getid3_dts->Analyze();
@@ -1803,8 +1732,6 @@ public function ParseRIFF($startoffset, $maxoffset) {
 							case 'indx':
 							case 'MEXT':
 							case 'DISP':
-							case 'wamd':
-							case 'guan':
 								// always read data in
 							case 'JUNK':
 								// should be: never read data in
@@ -2149,7 +2076,6 @@ public function parseWavPackHeader($WavPackChunkData) {
 	 */
 	public static function ParseBITMAPINFOHEADER($BITMAPINFOHEADER, $littleEndian=true) {
 
-		$parsed                    = array();
 		$parsed['biSize']          = substr($BITMAPINFOHEADER,  0, 4); // number of bytes required by the BITMAPINFOHEADER structure
 		$parsed['biWidth']         = substr($BITMAPINFOHEADER,  4, 4); // width of the bitmap in pixels
 		$parsed['biHeight']        = substr($BITMAPINFOHEADER,  8, 4); // height of the bitmap in pixels. If biHeight is positive, the bitmap is a 'bottom-up' DIB and its origin is the lower left corner. If biHeight is negative, the bitmap is a 'top-down' DIB and its origin is the upper left corner
diff --git a/src/wp-includes/ID3/module.audio.flac.php b/src/wp-includes/ID3/module.audio.flac.php
index 014061da943c2..1cea4364c2a0e 100644
--- a/src/wp-includes/ID3/module.audio.flac.php
+++ b/src/wp-includes/ID3/module.audio.flac.php
@@ -402,7 +402,6 @@ private function parseCUESHEET($BlockData) {
 	public function parsePICTURE() {
 		$info = &$this->getid3->info;
 
-		$picture = array();
 		$picture['typeid']         = getid3_lib::BigEndian2Int($this->fread(4));
 		$picture['picturetype']    = self::pictureTypeLookup($picture['typeid']);
 		$picture['image_mime']     = $this->fread(getid3_lib::BigEndian2Int($this->fread(4)));
diff --git a/src/wp-includes/ID3/module.audio.mp3.php b/src/wp-includes/ID3/module.audio.mp3.php
index 1f5a566b831cf..26b28068f8b50 100644
--- a/src/wp-includes/ID3/module.audio.mp3.php
+++ b/src/wp-includes/ID3/module.audio.mp3.php
@@ -18,6 +18,12 @@
 	exit;
 }
 
+// number of frames to scan to determine if MPEG-audio sequence is valid
+// Lower this number to 5-20 for faster scanning
+// Increase this number to 50+ for most accurate detection of valid VBR/CBR
+// mpeg-audio streams
+define('GETID3_MP3_VALID_CHECK_FRAMES', 35);
+
 
 class getid3_mp3 extends getid3_handler
 {
@@ -29,15 +35,6 @@ class getid3_mp3 extends getid3_handler
 	 */
 	public $allow_bruteforce = false;
 
-	/**
-	 * number of frames to scan to determine if MPEG-audio sequence is valid
-	 * Lower this number to 5-20 for faster scanning
-	 * Increase this number to 50+ for most accurate detection of valid VBR/CBR mpeg-audio streams
-	 *
-	 * @var int
-	 */
-	public $mp3_valid_check_frames = 50;
-
 	/**
 	 * @return bool
 	 */
@@ -58,7 +55,6 @@ public function Analyze() {
 			$info['audio']['bitrate_mode'] = strtolower($info['mpeg']['audio']['bitrate_mode']);
 		}
 
-		$CurrentDataLAMEversionString = null;
 		if (((isset($info['id3v2']['headerlength']) && ($info['avdataoffset'] > $info['id3v2']['headerlength'])) || (!isset($info['id3v2']) && ($info['avdataoffset'] > 0) && ($info['avdataoffset'] != $initialOffset)))) {
 
 			$synchoffsetwarning = 'Unknown data before synch ';
@@ -125,12 +121,6 @@ public function Analyze() {
 				if (substr($PossiblyLongerLAMEversion_String, 0, strlen($CurrentDataLAMEversionString)) == $CurrentDataLAMEversionString) {
 					$PossiblyLongerLAMEversion_NewString = substr($PossiblyLongerLAMEversion_String, 0, strspn($PossiblyLongerLAMEversion_String, 'LAME0123456789., (abcdefghijklmnopqrstuvwxyzJFSOND)')); //"LAME3.90.3"  "LAME3.87 (beta 1, Sep 27 2000)" "LAME3.88 (beta)"
 					if (empty($info['audio']['encoder']) || (strlen($PossiblyLongerLAMEversion_NewString) > strlen($info['audio']['encoder']))) {
-						if (!empty($info['audio']['encoder']) && !empty($info['mpeg']['audio']['LAME']['short_version']) && ($info['audio']['encoder'] == $info['mpeg']['audio']['LAME']['short_version'])) {
-							if (preg_match('#^LAME[0-9\\.]+#', $PossiblyLongerLAMEversion_NewString, $matches)) {
-								// "LAME3.100" -> "LAME3.100.1", but avoid including "(alpha)" and similar
-								$info['mpeg']['audio']['LAME']['short_version'] = $matches[0];
-							}
-						}
 						$info['audio']['encoder'] = $PossiblyLongerLAMEversion_NewString;
 					}
 				}
@@ -305,7 +295,7 @@ public function GuessEncoderOptions() {
 		} elseif (!empty($info['audio']['bitrate'])) {
 
 			if ($info['audio']['bitrate_mode'] == 'cbr') {
-				$encoder_options = strtoupper($info['audio']['bitrate_mode']).round($info['audio']['bitrate'] / 1000);
+				$encoder_options = strtoupper($info['audio']['bitrate_mode']).ceil($info['audio']['bitrate'] / 1000);
 			} else {
 				$encoder_options = strtoupper($info['audio']['bitrate_mode']);
 			}
@@ -498,7 +488,7 @@ public function decodeMPEGaudioHeader($offset, &$info, $recursivesearch=true, $S
 		if ($MPEGaudioHeaderValidCache[$head4_key]) {
 			$thisfile_mpeg_audio['raw'] = $MPEGheaderRawArray;
 		} else {
-			$this->warning('Invalid MPEG audio header ('.getid3_lib::PrintHexBytes($head4).') at offset '.$offset);
+			$this->error('Invalid MPEG audio header ('.getid3_lib::PrintHexBytes($head4).') at offset '.$offset);
 			return false;
 		}
 
@@ -732,200 +722,197 @@ public function decodeMPEGaudioHeader($offset, &$info, $recursivesearch=true, $S
 
 					$thisfile_mpeg_audio_lame['long_version']  = substr($headerstring, $VBRidOffset + 120, 20);
 					$thisfile_mpeg_audio_lame['short_version'] = substr($thisfile_mpeg_audio_lame['long_version'], 0, 9);
-
-					//$thisfile_mpeg_audio_lame['numeric_version'] = str_replace('LAME', '', $thisfile_mpeg_audio_lame['short_version']);
-					$thisfile_mpeg_audio_lame['numeric_version'] = '';
-					if (preg_match('#^LAME([0-9\\.a-z]*)#', $thisfile_mpeg_audio_lame['long_version'], $matches)) {
+					$thisfile_mpeg_audio_lame['numeric_version'] = str_replace('LAME', '', $thisfile_mpeg_audio_lame['short_version']);
+					if (preg_match('#^LAME([0-9\\.a-z]+)#', $thisfile_mpeg_audio_lame['long_version'], $matches)) {
 						$thisfile_mpeg_audio_lame['short_version']   = $matches[0];
 						$thisfile_mpeg_audio_lame['numeric_version'] = $matches[1];
 					}
-					if (strlen($thisfile_mpeg_audio_lame['numeric_version']) > 0) {
-						foreach (explode('.', $thisfile_mpeg_audio_lame['numeric_version']) as $key => $number) {
-							$thisfile_mpeg_audio_lame['integer_version'][$key] = intval($number);
+					foreach (explode('.', $thisfile_mpeg_audio_lame['numeric_version']) as $key => $number) {
+						$thisfile_mpeg_audio_lame['integer_version'][$key] = intval($number);
+					}
+
+					//if ($thisfile_mpeg_audio_lame['short_version'] >= 'LAME3.90') {
+					if ((($thisfile_mpeg_audio_lame['integer_version'][0] * 1000) + $thisfile_mpeg_audio_lame['integer_version'][1]) >= 3090) { // cannot use string version compare, may have "LAME3.90" or "LAME3.100" -- see https://github.com/JamesHeinrich/getID3/issues/207
+
+						// extra 11 chars are not part of version string when LAMEtag present
+						unset($thisfile_mpeg_audio_lame['long_version']);
+
+						// It the LAME tag was only introduced in LAME v3.90
+						// http://www.hydrogenaudio.org/?act=ST&f=15&t=9933
+
+						// Offsets of various bytes in http://gabriel.mp3-tech.org/mp3infotag.html
+						// are assuming a 'Xing' identifier offset of 0x24, which is the case for
+						// MPEG-1 non-mono, but not for other combinations
+						$LAMEtagOffsetContant = $VBRidOffset - 0x24;
+
+						// shortcuts
+						$thisfile_mpeg_audio_lame['RGAD']    = array('track'=>array(), 'album'=>array());
+						$thisfile_mpeg_audio_lame_RGAD       = &$thisfile_mpeg_audio_lame['RGAD'];
+						$thisfile_mpeg_audio_lame_RGAD_track = &$thisfile_mpeg_audio_lame_RGAD['track'];
+						$thisfile_mpeg_audio_lame_RGAD_album = &$thisfile_mpeg_audio_lame_RGAD['album'];
+						$thisfile_mpeg_audio_lame['raw'] = array();
+						$thisfile_mpeg_audio_lame_raw    = &$thisfile_mpeg_audio_lame['raw'];
+
+						// byte $9B  VBR Quality
+						// This field is there to indicate a quality level, although the scale was not precised in the original Xing specifications.
+						// Actually overwrites original Xing bytes
+						unset($thisfile_mpeg_audio['VBR_scale']);
+						$thisfile_mpeg_audio_lame['vbr_quality'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0x9B, 1));
+
+						// bytes $9C-$A4  Encoder short VersionString
+						$thisfile_mpeg_audio_lame['short_version'] = substr($headerstring, $LAMEtagOffsetContant + 0x9C, 9);
+
+						// byte $A5  Info Tag revision + VBR method
+						$LAMEtagRevisionVBRmethod = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA5, 1));
+
+						$thisfile_mpeg_audio_lame['tag_revision']   = ($LAMEtagRevisionVBRmethod & 0xF0) >> 4;
+						$thisfile_mpeg_audio_lame_raw['vbr_method'] =  $LAMEtagRevisionVBRmethod & 0x0F;
+						$thisfile_mpeg_audio_lame['vbr_method']     = self::LAMEvbrMethodLookup($thisfile_mpeg_audio_lame_raw['vbr_method']);
+						$thisfile_mpeg_audio['bitrate_mode']        = substr($thisfile_mpeg_audio_lame['vbr_method'], 0, 3); // usually either 'cbr' or 'vbr', but truncates 'vbr-old / vbr-rh' to 'vbr'
+
+						// byte $A6  Lowpass filter value
+						$thisfile_mpeg_audio_lame['lowpass_frequency'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA6, 1)) * 100;
+
+						// bytes $A7-$AE  Replay Gain
+						// http://privatewww.essex.ac.uk/~djmrob/replaygain/rg_data_format.html
+						// bytes $A7-$AA : 32 bit floating point "Peak signal amplitude"
+						if ($thisfile_mpeg_audio_lame['short_version'] >= 'LAME3.94b') {
+							// LAME 3.94a16 and later - 9.23 fixed point
+							// ie 0x0059E2EE / (2^23) = 5890798 / 8388608 = 0.7022378444671630859375
+							$thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] = (float) ((getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA7, 4))) / 8388608);
+						} else {
+							// LAME 3.94a15 and earlier - 32-bit floating point
+							// Actually 3.94a16 will fall in here too and be WRONG, but is hard to detect 3.94a16 vs 3.94a15
+							$thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] = getid3_lib::LittleEndian2Float(substr($headerstring, $LAMEtagOffsetContant + 0xA7, 4));
+						}
+						if ($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] == 0) {
+							unset($thisfile_mpeg_audio_lame_RGAD['peak_amplitude']);
+						} else {
+							$thisfile_mpeg_audio_lame_RGAD['peak_db'] = getid3_lib::RGADamplitude2dB($thisfile_mpeg_audio_lame_RGAD['peak_amplitude']);
 						}
-						//if ($thisfile_mpeg_audio_lame['short_version'] >= 'LAME3.90') {
-						if ((($thisfile_mpeg_audio_lame['integer_version'][0] * 1000) + $thisfile_mpeg_audio_lame['integer_version'][1]) >= 3090) { // cannot use string version compare, may have "LAME3.90" or "LAME3.100" -- see https://github.com/JamesHeinrich/getID3/issues/207
-
-							// extra 11 chars are not part of version string when LAMEtag present
-							unset($thisfile_mpeg_audio_lame['long_version']);
-
-							// It the LAME tag was only introduced in LAME v3.90
-							// http://www.hydrogenaudio.org/?act=ST&f=15&t=9933
-
-							// Offsets of various bytes in http://gabriel.mp3-tech.org/mp3infotag.html
-							// are assuming a 'Xing' identifier offset of 0x24, which is the case for
-							// MPEG-1 non-mono, but not for other combinations
-							$LAMEtagOffsetContant = $VBRidOffset - 0x24;
-
-							// shortcuts
-							$thisfile_mpeg_audio_lame['RGAD']    = array('track'=>array(), 'album'=>array());
-							$thisfile_mpeg_audio_lame_RGAD       = &$thisfile_mpeg_audio_lame['RGAD'];
-							$thisfile_mpeg_audio_lame_RGAD_track = &$thisfile_mpeg_audio_lame_RGAD['track'];
-							$thisfile_mpeg_audio_lame_RGAD_album = &$thisfile_mpeg_audio_lame_RGAD['album'];
-							$thisfile_mpeg_audio_lame['raw'] = array();
-							$thisfile_mpeg_audio_lame_raw    = &$thisfile_mpeg_audio_lame['raw'];
-
-							// byte $9B  VBR Quality
-							// This field is there to indicate a quality level, although the scale was not precised in the original Xing specifications.
-							// Actually overwrites original Xing bytes
-							unset($thisfile_mpeg_audio['VBR_scale']);
-							$thisfile_mpeg_audio_lame['vbr_quality'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0x9B, 1));
-
-							// bytes $9C-$A4  Encoder short VersionString
-							$thisfile_mpeg_audio_lame['short_version'] = substr($headerstring, $LAMEtagOffsetContant + 0x9C, 9);
-
-							// byte $A5  Info Tag revision + VBR method
-							$LAMEtagRevisionVBRmethod = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA5, 1));
-
-							$thisfile_mpeg_audio_lame['tag_revision']   = ($LAMEtagRevisionVBRmethod & 0xF0) >> 4;
-							$thisfile_mpeg_audio_lame_raw['vbr_method'] =  $LAMEtagRevisionVBRmethod & 0x0F;
-							$thisfile_mpeg_audio_lame['vbr_method']     = self::LAMEvbrMethodLookup($thisfile_mpeg_audio_lame_raw['vbr_method']);
-							$thisfile_mpeg_audio['bitrate_mode']        = substr($thisfile_mpeg_audio_lame['vbr_method'], 0, 3); // usually either 'cbr' or 'vbr', but truncates 'vbr-old / vbr-rh' to 'vbr'
-
-							// byte $A6  Lowpass filter value
-							$thisfile_mpeg_audio_lame['lowpass_frequency'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA6, 1)) * 100;
-
-							// bytes $A7-$AE  Replay Gain
-							// http://privatewww.essex.ac.uk/~djmrob/replaygain/rg_data_format.html
-							// bytes $A7-$AA : 32 bit floating point "Peak signal amplitude"
-							if ($thisfile_mpeg_audio_lame['short_version'] >= 'LAME3.94b') {
-								// LAME 3.94a16 and later - 9.23 fixed point
-								// ie 0x0059E2EE / (2^23) = 5890798 / 8388608 = 0.7022378444671630859375
-								$thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] = (float) ((getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA7, 4))) / 8388608);
-							} else {
-								// LAME 3.94a15 and earlier - 32-bit floating point
-								// Actually 3.94a16 will fall in here too and be WRONG, but is hard to detect 3.94a16 vs 3.94a15
-								$thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] = getid3_lib::LittleEndian2Float(substr($headerstring, $LAMEtagOffsetContant + 0xA7, 4));
-							}
-							if ($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] == 0) {
-								unset($thisfile_mpeg_audio_lame_RGAD['peak_amplitude']);
-							} else {
-								$thisfile_mpeg_audio_lame_RGAD['peak_db'] = getid3_lib::RGADamplitude2dB($thisfile_mpeg_audio_lame_RGAD['peak_amplitude']);
-							}
 
-							$thisfile_mpeg_audio_lame_raw['RGAD_track']      =   getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAB, 2));
-							$thisfile_mpeg_audio_lame_raw['RGAD_album']      =   getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAD, 2));
+						$thisfile_mpeg_audio_lame_raw['RGAD_track']      =   getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAB, 2));
+						$thisfile_mpeg_audio_lame_raw['RGAD_album']      =   getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAD, 2));
 
 
-							if ($thisfile_mpeg_audio_lame_raw['RGAD_track'] != 0) {
+						if ($thisfile_mpeg_audio_lame_raw['RGAD_track'] != 0) {
 
-								$thisfile_mpeg_audio_lame_RGAD_track['raw']['name']        = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0xE000) >> 13;
-								$thisfile_mpeg_audio_lame_RGAD_track['raw']['originator']  = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x1C00) >> 10;
-								$thisfile_mpeg_audio_lame_RGAD_track['raw']['sign_bit']    = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x0200) >> 9;
-								$thisfile_mpeg_audio_lame_RGAD_track['raw']['gain_adjust'] =  $thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x01FF;
-								$thisfile_mpeg_audio_lame_RGAD_track['name']       = getid3_lib::RGADnameLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['name']);
-								$thisfile_mpeg_audio_lame_RGAD_track['originator'] = getid3_lib::RGADoriginatorLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['originator']);
-								$thisfile_mpeg_audio_lame_RGAD_track['gain_db']    = getid3_lib::RGADadjustmentLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['gain_adjust'], $thisfile_mpeg_audio_lame_RGAD_track['raw']['sign_bit']);
+							$thisfile_mpeg_audio_lame_RGAD_track['raw']['name']        = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0xE000) >> 13;
+							$thisfile_mpeg_audio_lame_RGAD_track['raw']['originator']  = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x1C00) >> 10;
+							$thisfile_mpeg_audio_lame_RGAD_track['raw']['sign_bit']    = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x0200) >> 9;
+							$thisfile_mpeg_audio_lame_RGAD_track['raw']['gain_adjust'] =  $thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x01FF;
+							$thisfile_mpeg_audio_lame_RGAD_track['name']       = getid3_lib::RGADnameLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['name']);
+							$thisfile_mpeg_audio_lame_RGAD_track['originator'] = getid3_lib::RGADoriginatorLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['originator']);
+							$thisfile_mpeg_audio_lame_RGAD_track['gain_db']    = getid3_lib::RGADadjustmentLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['gain_adjust'], $thisfile_mpeg_audio_lame_RGAD_track['raw']['sign_bit']);
 
-								if (!empty($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'])) {
-									$info['replay_gain']['track']['peak']   = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'];
-								}
-								$info['replay_gain']['track']['originator'] = $thisfile_mpeg_audio_lame_RGAD_track['originator'];
-								$info['replay_gain']['track']['adjustment'] = $thisfile_mpeg_audio_lame_RGAD_track['gain_db'];
-							} else {
-								unset($thisfile_mpeg_audio_lame_RGAD['track']);
+							if (!empty($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'])) {
+								$info['replay_gain']['track']['peak']   = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'];
 							}
-							if ($thisfile_mpeg_audio_lame_raw['RGAD_album'] != 0) {
-
-								$thisfile_mpeg_audio_lame_RGAD_album['raw']['name']        = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0xE000) >> 13;
-								$thisfile_mpeg_audio_lame_RGAD_album['raw']['originator']  = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x1C00) >> 10;
-								$thisfile_mpeg_audio_lame_RGAD_album['raw']['sign_bit']    = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x0200) >> 9;
-								$thisfile_mpeg_audio_lame_RGAD_album['raw']['gain_adjust'] = $thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x01FF;
-								$thisfile_mpeg_audio_lame_RGAD_album['name']       = getid3_lib::RGADnameLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['name']);
-								$thisfile_mpeg_audio_lame_RGAD_album['originator'] = getid3_lib::RGADoriginatorLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['originator']);
-								$thisfile_mpeg_audio_lame_RGAD_album['gain_db']    = getid3_lib::RGADadjustmentLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['gain_adjust'], $thisfile_mpeg_audio_lame_RGAD_album['raw']['sign_bit']);
-
-								if (!empty($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'])) {
-									$info['replay_gain']['album']['peak']   = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'];
-								}
-								$info['replay_gain']['album']['originator'] = $thisfile_mpeg_audio_lame_RGAD_album['originator'];
-								$info['replay_gain']['album']['adjustment'] = $thisfile_mpeg_audio_lame_RGAD_album['gain_db'];
-							} else {
-								unset($thisfile_mpeg_audio_lame_RGAD['album']);
-							}
-							if (empty($thisfile_mpeg_audio_lame_RGAD)) {
-								unset($thisfile_mpeg_audio_lame['RGAD']);
+							$info['replay_gain']['track']['originator'] = $thisfile_mpeg_audio_lame_RGAD_track['originator'];
+							$info['replay_gain']['track']['adjustment'] = $thisfile_mpeg_audio_lame_RGAD_track['gain_db'];
+						} else {
+							unset($thisfile_mpeg_audio_lame_RGAD['track']);
+						}
+						if ($thisfile_mpeg_audio_lame_raw['RGAD_album'] != 0) {
+
+							$thisfile_mpeg_audio_lame_RGAD_album['raw']['name']        = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0xE000) >> 13;
+							$thisfile_mpeg_audio_lame_RGAD_album['raw']['originator']  = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x1C00) >> 10;
+							$thisfile_mpeg_audio_lame_RGAD_album['raw']['sign_bit']    = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x0200) >> 9;
+							$thisfile_mpeg_audio_lame_RGAD_album['raw']['gain_adjust'] = $thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x01FF;
+							$thisfile_mpeg_audio_lame_RGAD_album['name']       = getid3_lib::RGADnameLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['name']);
+							$thisfile_mpeg_audio_lame_RGAD_album['originator'] = getid3_lib::RGADoriginatorLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['originator']);
+							$thisfile_mpeg_audio_lame_RGAD_album['gain_db']    = getid3_lib::RGADadjustmentLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['gain_adjust'], $thisfile_mpeg_audio_lame_RGAD_album['raw']['sign_bit']);
+
+							if (!empty($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'])) {
+								$info['replay_gain']['album']['peak']   = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'];
 							}
+							$info['replay_gain']['album']['originator'] = $thisfile_mpeg_audio_lame_RGAD_album['originator'];
+							$info['replay_gain']['album']['adjustment'] = $thisfile_mpeg_audio_lame_RGAD_album['gain_db'];
+						} else {
+							unset($thisfile_mpeg_audio_lame_RGAD['album']);
+						}
+						if (empty($thisfile_mpeg_audio_lame_RGAD)) {
+							unset($thisfile_mpeg_audio_lame['RGAD']);
+						}
 
 
-							// byte $AF  Encoding flags + ATH Type
-							$EncodingFlagsATHtype = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAF, 1));
-							$thisfile_mpeg_audio_lame['encoding_flags']['nspsytune']   = (bool) ($EncodingFlagsATHtype & 0x10);
-							$thisfile_mpeg_audio_lame['encoding_flags']['nssafejoint'] = (bool) ($EncodingFlagsATHtype & 0x20);
-							$thisfile_mpeg_audio_lame['encoding_flags']['nogap_next']  = (bool) ($EncodingFlagsATHtype & 0x40);
-							$thisfile_mpeg_audio_lame['encoding_flags']['nogap_prev']  = (bool) ($EncodingFlagsATHtype & 0x80);
-							$thisfile_mpeg_audio_lame['ath_type']                      =         $EncodingFlagsATHtype & 0x0F;
-
-							// byte $B0  if ABR {specified bitrate} else {minimal bitrate}
-							$thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB0, 1));
-							if ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 2) { // Average BitRate (ABR)
-								$thisfile_mpeg_audio_lame['bitrate_abr'] = $thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'];
-							} elseif ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 1) { // Constant BitRate (CBR)
-								// ignore
-							} elseif ($thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'] > 0) { // Variable BitRate (VBR) - minimum bitrate
-								$thisfile_mpeg_audio_lame['bitrate_min'] = $thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'];
-							}
-
-							// bytes $B1-$B3  Encoder delays
-							$EncoderDelays = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB1, 3));
-							$thisfile_mpeg_audio_lame['encoder_delay'] = ($EncoderDelays & 0xFFF000) >> 12;
-							$thisfile_mpeg_audio_lame['end_padding']   =  $EncoderDelays & 0x000FFF;
-
-							// byte $B4  Misc
-							$MiscByte = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB4, 1));
-							$thisfile_mpeg_audio_lame_raw['noise_shaping']       = ($MiscByte & 0x03);
-							$thisfile_mpeg_audio_lame_raw['stereo_mode']         = ($MiscByte & 0x1C) >> 2;
-							$thisfile_mpeg_audio_lame_raw['not_optimal_quality'] = ($MiscByte & 0x20) >> 5;
-							$thisfile_mpeg_audio_lame_raw['source_sample_freq']  = ($MiscByte & 0xC0) >> 6;
-							$thisfile_mpeg_audio_lame['noise_shaping']       = $thisfile_mpeg_audio_lame_raw['noise_shaping'];
-							$thisfile_mpeg_audio_lame['stereo_mode']         = self::LAMEmiscStereoModeLookup($thisfile_mpeg_audio_lame_raw['stereo_mode']);
-							$thisfile_mpeg_audio_lame['not_optimal_quality'] = (bool) $thisfile_mpeg_audio_lame_raw['not_optimal_quality'];
-							$thisfile_mpeg_audio_lame['source_sample_freq']  = self::LAMEmiscSourceSampleFrequencyLookup($thisfile_mpeg_audio_lame_raw['source_sample_freq']);
-
-							// byte $B5  MP3 Gain
-							$thisfile_mpeg_audio_lame_raw['mp3_gain'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB5, 1), false, true);
-							$thisfile_mpeg_audio_lame['mp3_gain_db']     = (getid3_lib::RGADamplitude2dB(2) / 4) * $thisfile_mpeg_audio_lame_raw['mp3_gain'];
-							$thisfile_mpeg_audio_lame['mp3_gain_factor'] = pow(2, ($thisfile_mpeg_audio_lame['mp3_gain_db'] / 6));
-
-							// bytes $B6-$B7  Preset and surround info
-							$PresetSurroundBytes = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB6, 2));
-							// Reserved                                                    = ($PresetSurroundBytes & 0xC000);
-							$thisfile_mpeg_audio_lame_raw['surround_info'] = ($PresetSurroundBytes & 0x3800);
-							$thisfile_mpeg_audio_lame['surround_info']     = self::LAMEsurroundInfoLookup($thisfile_mpeg_audio_lame_raw['surround_info']);
-							$thisfile_mpeg_audio_lame['preset_used_id']    = ($PresetSurroundBytes & 0x07FF);
-							$thisfile_mpeg_audio_lame['preset_used']       = self::LAMEpresetUsedLookup($thisfile_mpeg_audio_lame);
-							if (!empty($thisfile_mpeg_audio_lame['preset_used_id']) && empty($thisfile_mpeg_audio_lame['preset_used'])) {
-								$this->warning('Unknown LAME preset used ('.$thisfile_mpeg_audio_lame['preset_used_id'].') - please report to info@getid3.org');
-							}
-							if (($thisfile_mpeg_audio_lame['short_version'] == 'LAME3.90.') && !empty($thisfile_mpeg_audio_lame['preset_used_id'])) {
-								// this may change if 3.90.4 ever comes out
-								$thisfile_mpeg_audio_lame['short_version'] = 'LAME3.90.3';
-							}
+						// byte $AF  Encoding flags + ATH Type
+						$EncodingFlagsATHtype = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAF, 1));
+						$thisfile_mpeg_audio_lame['encoding_flags']['nspsytune']   = (bool) ($EncodingFlagsATHtype & 0x10);
+						$thisfile_mpeg_audio_lame['encoding_flags']['nssafejoint'] = (bool) ($EncodingFlagsATHtype & 0x20);
+						$thisfile_mpeg_audio_lame['encoding_flags']['nogap_next']  = (bool) ($EncodingFlagsATHtype & 0x40);
+						$thisfile_mpeg_audio_lame['encoding_flags']['nogap_prev']  = (bool) ($EncodingFlagsATHtype & 0x80);
+						$thisfile_mpeg_audio_lame['ath_type']                      =         $EncodingFlagsATHtype & 0x0F;
+
+						// byte $B0  if ABR {specified bitrate} else {minimal bitrate}
+						$thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB0, 1));
+						if ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 2) { // Average BitRate (ABR)
+							$thisfile_mpeg_audio_lame['bitrate_abr'] = $thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'];
+						} elseif ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 1) { // Constant BitRate (CBR)
+							// ignore
+						} elseif ($thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'] > 0) { // Variable BitRate (VBR) - minimum bitrate
+							$thisfile_mpeg_audio_lame['bitrate_min'] = $thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'];
+						}
 
-							// bytes $B8-$BB  MusicLength
-							$thisfile_mpeg_audio_lame['audio_bytes'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB8, 4));
-							$ExpectedNumberOfAudioBytes = (($thisfile_mpeg_audio_lame['audio_bytes'] > 0) ? $thisfile_mpeg_audio_lame['audio_bytes'] : $thisfile_mpeg_audio['VBR_bytes']);
+						// bytes $B1-$B3  Encoder delays
+						$EncoderDelays = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB1, 3));
+						$thisfile_mpeg_audio_lame['encoder_delay'] = ($EncoderDelays & 0xFFF000) >> 12;
+						$thisfile_mpeg_audio_lame['end_padding']   =  $EncoderDelays & 0x000FFF;
+
+						// byte $B4  Misc
+						$MiscByte = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB4, 1));
+						$thisfile_mpeg_audio_lame_raw['noise_shaping']       = ($MiscByte & 0x03);
+						$thisfile_mpeg_audio_lame_raw['stereo_mode']         = ($MiscByte & 0x1C) >> 2;
+						$thisfile_mpeg_audio_lame_raw['not_optimal_quality'] = ($MiscByte & 0x20) >> 5;
+						$thisfile_mpeg_audio_lame_raw['source_sample_freq']  = ($MiscByte & 0xC0) >> 6;
+						$thisfile_mpeg_audio_lame['noise_shaping']       = $thisfile_mpeg_audio_lame_raw['noise_shaping'];
+						$thisfile_mpeg_audio_lame['stereo_mode']         = self::LAMEmiscStereoModeLookup($thisfile_mpeg_audio_lame_raw['stereo_mode']);
+						$thisfile_mpeg_audio_lame['not_optimal_quality'] = (bool) $thisfile_mpeg_audio_lame_raw['not_optimal_quality'];
+						$thisfile_mpeg_audio_lame['source_sample_freq']  = self::LAMEmiscSourceSampleFrequencyLookup($thisfile_mpeg_audio_lame_raw['source_sample_freq']);
+
+						// byte $B5  MP3 Gain
+						$thisfile_mpeg_audio_lame_raw['mp3_gain'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB5, 1), false, true);
+						$thisfile_mpeg_audio_lame['mp3_gain_db']     = (getid3_lib::RGADamplitude2dB(2) / 4) * $thisfile_mpeg_audio_lame_raw['mp3_gain'];
+						$thisfile_mpeg_audio_lame['mp3_gain_factor'] = pow(2, ($thisfile_mpeg_audio_lame['mp3_gain_db'] / 6));
+
+						// bytes $B6-$B7  Preset and surround info
+						$PresetSurroundBytes = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB6, 2));
+						// Reserved                                                    = ($PresetSurroundBytes & 0xC000);
+						$thisfile_mpeg_audio_lame_raw['surround_info'] = ($PresetSurroundBytes & 0x3800);
+						$thisfile_mpeg_audio_lame['surround_info']     = self::LAMEsurroundInfoLookup($thisfile_mpeg_audio_lame_raw['surround_info']);
+						$thisfile_mpeg_audio_lame['preset_used_id']    = ($PresetSurroundBytes & 0x07FF);
+						$thisfile_mpeg_audio_lame['preset_used']       = self::LAMEpresetUsedLookup($thisfile_mpeg_audio_lame);
+						if (!empty($thisfile_mpeg_audio_lame['preset_used_id']) && empty($thisfile_mpeg_audio_lame['preset_used'])) {
+							$this->warning('Unknown LAME preset used ('.$thisfile_mpeg_audio_lame['preset_used_id'].') - please report to info@getid3.org');
+						}
+						if (($thisfile_mpeg_audio_lame['short_version'] == 'LAME3.90.') && !empty($thisfile_mpeg_audio_lame['preset_used_id'])) {
+							// this may change if 3.90.4 ever comes out
+							$thisfile_mpeg_audio_lame['short_version'] = 'LAME3.90.3';
+						}
 
-							// bytes $BC-$BD  MusicCRC
-							$thisfile_mpeg_audio_lame['music_crc']    = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xBC, 2));
+						// bytes $B8-$BB  MusicLength
+						$thisfile_mpeg_audio_lame['audio_bytes'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB8, 4));
+						$ExpectedNumberOfAudioBytes = (($thisfile_mpeg_audio_lame['audio_bytes'] > 0) ? $thisfile_mpeg_audio_lame['audio_bytes'] : $thisfile_mpeg_audio['VBR_bytes']);
 
-							// bytes $BE-$BF  CRC-16 of Info Tag
-							$thisfile_mpeg_audio_lame['lame_tag_crc'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xBE, 2));
+						// bytes $BC-$BD  MusicCRC
+						$thisfile_mpeg_audio_lame['music_crc']    = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xBC, 2));
 
+						// bytes $BE-$BF  CRC-16 of Info Tag
+						$thisfile_mpeg_audio_lame['lame_tag_crc'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xBE, 2));
 
-							// LAME CBR
-							if ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 1) {
 
-								$thisfile_mpeg_audio['bitrate_mode'] = 'cbr';
-								$thisfile_mpeg_audio['bitrate'] = self::ClosestStandardMP3Bitrate($thisfile_mpeg_audio['bitrate']);
-								$info['audio']['bitrate'] = $thisfile_mpeg_audio['bitrate'];
-								//if (empty($thisfile_mpeg_audio['bitrate']) || (!empty($thisfile_mpeg_audio_lame['bitrate_min']) && ($thisfile_mpeg_audio_lame['bitrate_min'] != 255))) {
-								//	$thisfile_mpeg_audio['bitrate'] = $thisfile_mpeg_audio_lame['bitrate_min'];
-								//}
+						// LAME CBR
+						if ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 1) {
 
-							}
+							$thisfile_mpeg_audio['bitrate_mode'] = 'cbr';
+							$thisfile_mpeg_audio['bitrate'] = self::ClosestStandardMP3Bitrate($thisfile_mpeg_audio['bitrate']);
+							$info['audio']['bitrate'] = $thisfile_mpeg_audio['bitrate'];
+							//if (empty($thisfile_mpeg_audio['bitrate']) || (!empty($thisfile_mpeg_audio_lame['bitrate_min']) && ($thisfile_mpeg_audio_lame['bitrate_min'] != 255))) {
+							//	$thisfile_mpeg_audio['bitrate'] = $thisfile_mpeg_audio_lame['bitrate_min'];
+							//}
 
 						}
+
 					}
 				}
 
@@ -1022,22 +1009,6 @@ public function decodeMPEGaudioHeader($offset, &$info, $recursivesearch=true, $S
 			if (!$this->RecursiveFrameScanning($offset, $nextframetestoffset, $ScanAsCBR)) {
 				return false;
 			}
-			if (!empty($this->getid3->info['mp3_validity_check_bitrates']) && !empty($thisfile_mpeg_audio['bitrate_mode']) && ($thisfile_mpeg_audio['bitrate_mode'] == 'vbr') && !empty($thisfile_mpeg_audio['VBR_bitrate'])) {
-				// https://github.com/JamesHeinrich/getID3/issues/287
-				if (count(array_keys($this->getid3->info['mp3_validity_check_bitrates'])) == 1) {
-					list($cbr_bitrate_in_short_scan) = array_keys($this->getid3->info['mp3_validity_check_bitrates']);
-					$deviation_cbr_from_header_bitrate = abs($thisfile_mpeg_audio['VBR_bitrate'] - $cbr_bitrate_in_short_scan) / $cbr_bitrate_in_short_scan;
-					if ($deviation_cbr_from_header_bitrate < 0.01) {
-						// VBR header bitrate may differ slightly from true bitrate of frames, perhaps accounting for overhead of VBR header frame itself?
-						// If measured CBR bitrate is within 1% of specified bitrate in VBR header then assume that file is truly CBR
-						$thisfile_mpeg_audio['bitrate_mode'] = 'cbr';
-						//$this->warning('VBR header ignored, assuming CBR '.round($cbr_bitrate_in_short_scan / 1000).'kbps based on scan of '.$this->mp3_valid_check_frames.' frames');
-					}
-				}
-			}
-			if (isset($this->getid3->info['mp3_validity_check_bitrates'])) {
-				unset($this->getid3->info['mp3_validity_check_bitrates']);
-			}
 
 		}
 
@@ -1159,9 +1130,8 @@ public function RecursiveFrameScanning(&$offset, &$nextframetestoffset, $ScanAsC
 		$firstframetestarray = array('error' => array(), 'warning'=> array(), 'avdataend' => $info['avdataend'], 'avdataoffset' => $info['avdataoffset']);
 		$this->decodeMPEGaudioHeader($offset, $firstframetestarray, false);
 
-		$info['mp3_validity_check_bitrates'] = array();
-		for ($i = 0; $i < $this->mp3_valid_check_frames; $i++) {
-			// check next (default: 50) frames for validity, to make sure we haven't run across a false synch
+		for ($i = 0; $i < GETID3_MP3_VALID_CHECK_FRAMES; $i++) {
+			// check next GETID3_MP3_VALID_CHECK_FRAMES frames for validity, to make sure we haven't run across a false synch
 			if (($nextframetestoffset + 4) >= $info['avdataend']) {
 				// end of file
 				return true;
@@ -1169,7 +1139,6 @@ public function RecursiveFrameScanning(&$offset, &$nextframetestoffset, $ScanAsC
 
 			$nextframetestarray = array('error' => array(), 'warning' => array(), 'avdataend' => $info['avdataend'], 'avdataoffset'=>$info['avdataoffset']);
 			if ($this->decodeMPEGaudioHeader($nextframetestoffset, $nextframetestarray, false)) {
-				getid3_lib::safe_inc($info['mp3_validity_check_bitrates'][$nextframetestarray['mpeg']['audio']['bitrate']]);
 				if ($ScanAsCBR) {
 					// force CBR mode, used for trying to pick out invalid audio streams with valid(?) VBR headers, or VBR streams with no VBR header
 					if (!isset($nextframetestarray['mpeg']['audio']['bitrate']) || !isset($firstframetestarray['mpeg']['audio']['bitrate']) || ($nextframetestarray['mpeg']['audio']['bitrate'] != $firstframetestarray['mpeg']['audio']['bitrate'])) {
@@ -1304,7 +1273,6 @@ public function getOnlyMPEGaudioInfoBruteForce() {
 		$LongMPEGbitrateLookup        = array();
 		$LongMPEGpaddingLookup        = array();
 		$LongMPEGfrequencyLookup      = array();
-		$Distribution                 = array();
 		$Distribution['bitrate']      = array();
 		$Distribution['frequency']    = array();
 		$Distribution['layer']        = array();
@@ -1465,9 +1433,6 @@ public function getOnlyMPEGaudioInfo($avdataoffset, $BitrateHistogram=false) {
 		$header = $this->fread($sync_seek_buffer_size);
 		$sync_seek_buffer_size = strlen($header);
 		$SynchSeekOffset = 0;
-		$SyncSeekAttempts = 0;
-		$SyncSeekAttemptsMax = 1000;
-		$FirstFrameThisfileInfo = null;
 		while ($SynchSeekOffset < $sync_seek_buffer_size) {
 			if ((($avdataoffset + $SynchSeekOffset)  < $info['avdataend']) && !feof($this->getid3->fp)) {
 
@@ -1506,24 +1471,7 @@ public function getOnlyMPEGaudioInfo($avdataoffset, $BitrateHistogram=false) {
 				return false;
 			}
 
-			if (($header[$SynchSeekOffset] == "\xFF") && ($header[($SynchSeekOffset + 1)] > "\xE0")) { // possible synch detected
-				if (++$SyncSeekAttempts >= $SyncSeekAttemptsMax) {
-					// https://github.com/JamesHeinrich/getID3/issues/286
-					// corrupt files claiming to be MP3, with a large number of 0xFF bytes near the beginning, can cause this loop to take a very long time
-					// should have escape condition to avoid spending too much time scanning a corrupt file
-					// if a synch's not found within the first 128k bytes, then give up
-					$this->error('Could not find valid MPEG audio synch after scanning '.$SyncSeekAttempts.' candidate offsets');
-					if (isset($info['audio']['bitrate'])) {
-						unset($info['audio']['bitrate']);
-					}
-					if (isset($info['mpeg']['audio'])) {
-						unset($info['mpeg']['audio']);
-					}
-					if (empty($info['mpeg'])) {
-						unset($info['mpeg']);
-					}
-					return false;
-				}
+			if (($header[$SynchSeekOffset] == "\xFF") && ($header[($SynchSeekOffset + 1)] > "\xE0")) { // synch detected
 				$FirstFrameAVDataOffset = null;
 				if (!isset($FirstFrameThisfileInfo) && !isset($info['mpeg']['audio'])) {
 					$FirstFrameThisfileInfo = $info;
@@ -1563,9 +1511,9 @@ public function getOnlyMPEGaudioInfo($avdataoffset, $BitrateHistogram=false) {
 							if ($this->decodeMPEGaudioHeader($GarbageOffsetEnd, $dummy, true, true)) {
 								$info = $dummy;
 								$info['avdataoffset'] = $GarbageOffsetEnd;
-								$this->warning('apparently-valid VBR header not used because could not find '.$this->mp3_valid_check_frames.' consecutive MPEG-audio frames immediately after VBR header (garbage data for '.($GarbageOffsetEnd - $GarbageOffsetStart).' bytes between '.$GarbageOffsetStart.' and '.$GarbageOffsetEnd.'), but did find valid CBR stream starting at '.$GarbageOffsetEnd);
+								$this->warning('apparently-valid VBR header not used because could not find '.GETID3_MP3_VALID_CHECK_FRAMES.' consecutive MPEG-audio frames immediately after VBR header (garbage data for '.($GarbageOffsetEnd - $GarbageOffsetStart).' bytes between '.$GarbageOffsetStart.' and '.$GarbageOffsetEnd.'), but did find valid CBR stream starting at '.$GarbageOffsetEnd);
 							} else {
-								$this->warning('using data from VBR header even though could not find '.$this->mp3_valid_check_frames.' consecutive MPEG-audio frames immediately after VBR header (garbage data for '.($GarbageOffsetEnd - $GarbageOffsetStart).' bytes between '.$GarbageOffsetStart.' and '.$GarbageOffsetEnd.')');
+								$this->warning('using data from VBR header even though could not find '.GETID3_MP3_VALID_CHECK_FRAMES.' consecutive MPEG-audio frames immediately after VBR header (garbage data for '.($GarbageOffsetEnd - $GarbageOffsetStart).' bytes between '.$GarbageOffsetStart.' and '.$GarbageOffsetEnd.')');
 							}
 						}
 					}
@@ -1610,7 +1558,6 @@ public function getOnlyMPEGaudioInfo($avdataoffset, $BitrateHistogram=false) {
 						$pct_data_scanned = 0;
 						for ($current_segment = 0; $current_segment < $max_scan_segments; $current_segment++) {
 							$frames_scanned_this_segment = 0;
-							$scan_start_offset = array();
 							if ($this->ftell() >= $info['avdataend']) {
 								break;
 							}
@@ -1940,7 +1887,6 @@ public static function MPEGaudioHeaderDecode($Header4Bytes) {
 			return false;
 		}
 
-		$MPEGrawHeader = array();
 		$MPEGrawHeader['synch']         = (getid3_lib::BigEndian2Int(substr($Header4Bytes, 0, 2)) & 0xFFE0) >> 4;
 		$MPEGrawHeader['version']       = (ord($Header4Bytes[1]) & 0x18) >> 3; //    BB
 		$MPEGrawHeader['layer']         = (ord($Header4Bytes[1]) & 0x06) >> 1; //      CC
diff --git a/src/wp-includes/ID3/module.audio.ogg.php b/src/wp-includes/ID3/module.audio.ogg.php
index 5786fd0d5970f..fe092d9d94d19 100644
--- a/src/wp-includes/ID3/module.audio.ogg.php
+++ b/src/wp-includes/ID3/module.audio.ogg.php
@@ -529,7 +529,6 @@ public function ParseOpusPageHeader(&$filedata, &$filedataoffset, &$oggpageinfo)
 	 */
 	public function ParseOggPageHeader() {
 		// http://xiph.org/ogg/vorbis/doc/framing.html
-		$oggheader = array();
 		$oggheader['page_start_offset'] = $this->ftell(); // where we started from in the file
 
 		$filedata = $this->fread($this->getid3->fread_buffer_size());
@@ -681,39 +680,35 @@ public function ParseVorbisComments() {
 
 				$VorbisCommentPage++;
 
-				if ($oggpageinfo = $this->ParseOggPageHeader()) {
-					$info['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo;
+				$oggpageinfo = $this->ParseOggPageHeader();
+				$info['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo;
 
-					// First, save what we haven't read yet
-					$AsYetUnusedData = substr($commentdata, $commentdataoffset);
+				// First, save what we haven't read yet
+				$AsYetUnusedData = substr($commentdata, $commentdataoffset);
 
-					// Then take that data off the end
-					$commentdata     = substr($commentdata, 0, $commentdataoffset);
-
-					// Add [headerlength] bytes of dummy data for the Ogg Page Header, just to keep absolute offsets correct
-					$commentdata .= str_repeat("\x00", 27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
-					$commentdataoffset += (27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
+				// Then take that data off the end
+				$commentdata     = substr($commentdata, 0, $commentdataoffset);
 
-					// Finally, stick the unused data back on the end
-					$commentdata .= $AsYetUnusedData;
+				// Add [headerlength] bytes of dummy data for the Ogg Page Header, just to keep absolute offsets correct
+				$commentdata .= str_repeat("\x00", 27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
+				$commentdataoffset += (27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
 
-					//$commentdata .= $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
-					if (!isset($info['ogg']['pageheader'][$VorbisCommentPage])) {
-						$this->warning('undefined Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell());
-						break;
-					}
-					$readlength = self::OggPageSegmentLength($info['ogg']['pageheader'][$VorbisCommentPage], 1);
-					if ($readlength <= 0) {
-						$this->warning('invalid length Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell());
-						break;
-					}
-					$commentdata .= $this->fread($readlength);
+				// Finally, stick the unused data back on the end
+				$commentdata .= $AsYetUnusedData;
 
-					//$filebaseoffset += $oggpageinfo['header_end_offset'] - $oggpageinfo['page_start_offset'];
-				} else {
-					$this->warning('failed to ParseOggPageHeader() at offset '.$this->ftell());
+				//$commentdata .= $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
+				if (!isset($info['ogg']['pageheader'][$VorbisCommentPage])) {
+					$this->warning('undefined Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell());
 					break;
 				}
+				$readlength = self::OggPageSegmentLength($info['ogg']['pageheader'][$VorbisCommentPage], 1);
+				if ($readlength <= 0) {
+					$this->warning('invalid length Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell());
+					break;
+				}
+				$commentdata .= $this->fread($readlength);
+
+				//$filebaseoffset += $oggpageinfo['header_end_offset'] - $oggpageinfo['page_start_offset'];
 			}
 			$ThisFileInfo_ogg_comments_raw[$i]['offset'] = $commentdataoffset;
 			$commentstring = substr($commentdata, $commentdataoffset, $ThisFileInfo_ogg_comments_raw[$i]['size']);
diff --git a/src/wp-includes/ID3/module.tag.apetag.php b/src/wp-includes/ID3/module.tag.apetag.php
index c5502133fcbb3..26be982c73a25 100644
--- a/src/wp-includes/ID3/module.tag.apetag.php
+++ b/src/wp-includes/ID3/module.tag.apetag.php
@@ -360,7 +360,6 @@ public function parseAPEheaderFooter($APEheaderFooterData) {
 		// http://www.uni-jena.de/~pfk/mpp/sv8/apeheader.html
 
 		// shortcut
-		$headerfooterinfo = array();
 		$headerfooterinfo['raw'] = array();
 		$headerfooterinfo_raw = &$headerfooterinfo['raw'];
 
@@ -390,7 +389,6 @@ public function parseAPEtagFlags($rawflagint) {
 		// "Note: APE Tags 1.0 do not use any of the APE Tag flags.
 		// All are set to zero on creation and ignored on reading."
 		// http://wiki.hydrogenaud.io/index.php?title=Ape_Tags_Flags
-		$flags                      = array();
 		$flags['header']            = (bool) ($rawflagint & 0x80000000);
 		$flags['footer']            = (bool) ($rawflagint & 0x40000000);
 		$flags['this_is_header']    = (bool) ($rawflagint & 0x20000000);
diff --git a/src/wp-includes/ID3/module.tag.id3v1.php b/src/wp-includes/ID3/module.tag.id3v1.php
index b1de25784bb92..16dcf253b655d 100644
--- a/src/wp-includes/ID3/module.tag.id3v1.php
+++ b/src/wp-includes/ID3/module.tag.id3v1.php
@@ -31,22 +31,14 @@ public function Analyze() {
 			return false;
 		}
 
-		if($info['filesize'] < 256) {
-			$this->fseek(-128, SEEK_END);
-			$preid3v1 = '';
-			$id3v1tag = $this->fread(128);
-		} else {
-			$this->fseek(-256, SEEK_END);
-			$preid3v1 = $this->fread(128);
-			$id3v1tag = $this->fread(128);
-		}
-
+		$this->fseek(-256, SEEK_END);
+		$preid3v1 = $this->fread(128);
+		$id3v1tag = $this->fread(128);
 
 		if (substr($id3v1tag, 0, 3) == 'TAG') {
 
 			$info['avdataend'] = $info['filesize'] - 128;
 
-			$ParsedID3v1            = array();
 			$ParsedID3v1['title']   = $this->cutfield(substr($id3v1tag,   3, 30));
 			$ParsedID3v1['artist']  = $this->cutfield(substr($id3v1tag,  33, 30));
 			$ParsedID3v1['album']   = $this->cutfield(substr($id3v1tag,  63, 30));
@@ -305,50 +297,6 @@ public static function ArrayOfGenres($allowSCMPXextended=false) {
 			145  => 'Anime',
 			146  => 'JPop',
 			147  => 'Synthpop',
-			148 => 'Abstract',
-			149 => 'Art Rock',
-			150 => 'Baroque',
-			151 => 'Bhangra',
-			152 => 'Big Beat',
-			153 => 'Breakbeat',
-			154 => 'Chillout',
-			155 => 'Downtempo',
-			156 => 'Dub',
-			157 => 'EBM',
-			158 => 'Eclectic',
-			159 => 'Electro',
-			160 => 'Electroclash',
-			161 => 'Emo',
-			162 => 'Experimental',
-			163 => 'Garage',
-			164 => 'Global',
-			165 => 'IDM',
-			166 => 'Illbient',
-			167 => 'Industro-Goth',
-			168 => 'Jam Band',
-			169 => 'Krautrock',
-			170 => 'Leftfield',
-			171 => 'Lounge',
-			172 => 'Math Rock',
-			173 => 'New Romantic',
-			174 => 'Nu-Breakz',
-			175 => 'Post-Punk',
-			176 => 'Post-Rock',
-			177 => 'Psytrance',
-			178 => 'Shoegaze',
-			179 => 'Space Rock',
-			180 => 'Trop Rock',
-			181 => 'World Music',
-			182 => 'Neoclassical',
-			183 => 'Audiobook',
-			184 => 'Audio Theatre',
-			185 => 'Neue Deutsche Welle',
-			186 => 'Podcast',
-			187 => 'Indie-Rock',
-			188 => 'G-Funk',
-			189 => 'Dubstep',
-			190 => 'Garage Rock',
-			191 => 'Psybient',
 
 			255  => 'Unknown',
 
diff --git a/src/wp-includes/ID3/module.tag.id3v2.php b/src/wp-includes/ID3/module.tag.id3v2.php
index 99e56a5fdb066..85dd7a147a148 100644
--- a/src/wp-includes/ID3/module.tag.id3v2.php
+++ b/src/wp-includes/ID3/module.tag.id3v2.php
@@ -345,7 +345,7 @@ public function Analyze() {
 				}
 				if (($frame_size <= strlen($framedata)) && ($this->IsValidID3v2FrameName($frame_name, $id3v2_majorversion))) {
 
-					$parsedFrame                    = array();
+					unset($parsedFrame);
 					$parsedFrame['frame_name']      = $frame_name;
 					$parsedFrame['frame_flags_raw'] = $frame_flags;
 					$parsedFrame['data']            = substr($framedata, 0, $frame_size);
@@ -978,7 +978,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
 
 
 		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'USLT')) || // 4.8   USLT Unsynchronised lyric/text transcription
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'ULT'))) {    // 4.9   ULT  Unsynchronised lyric/text transcription
+				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'ULT'))) {     // 4.9   ULT  Unsynchronised lyric/text transcription
 			//   There may be more than one 'Unsynchronised lyrics/text transcription' frame
 			//   in each tag, but only one with the same language and content descriptor.
 			// <Header for 'Unsynchronised lyrics/text transcription', ID: 'USLT'>
@@ -994,28 +994,24 @@ public function ParseID3v2Frame(&$parsedFrame) {
 				$this->warning('Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding');
 				$frame_textencoding_terminator = "\x00";
 			}
-			if (strlen($parsedFrame['data']) >= (4 + strlen($frame_textencoding_terminator))) {  // shouldn't be an issue but badly-written files have been spotted in the wild with not only no contents but also missing the required language field, see https://github.com/JamesHeinrich/getID3/issues/315
-				$frame_language = substr($parsedFrame['data'], $frame_offset, 3);
-				$frame_offset += 3;
-				$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
-				if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
-					$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
-				}
-				$parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-				$parsedFrame['description'] = $this->MakeUTF16emptyStringEmpty($parsedFrame['description']);
-				$parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator));
-				$parsedFrame['data'] = $this->RemoveStringTerminator($parsedFrame['data'], $frame_textencoding_terminator);
+			$frame_language = substr($parsedFrame['data'], $frame_offset, 3);
+			$frame_offset += 3;
+			$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
+				$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
+			}
+			$parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
+			$parsedFrame['description'] = $this->MakeUTF16emptyStringEmpty($parsedFrame['description']);
+			$parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator));
+			$parsedFrame['data'] = $this->RemoveStringTerminator($parsedFrame['data'], $frame_textencoding_terminator);
 
-				$parsedFrame['encodingid']   = $frame_textencoding;
-				$parsedFrame['encoding']     = $this->TextEncodingNameLookup($frame_textencoding);
+			$parsedFrame['encodingid']   = $frame_textencoding;
+			$parsedFrame['encoding']     = $this->TextEncodingNameLookup($frame_textencoding);
 
-				$parsedFrame['language']     = $frame_language;
-				$parsedFrame['languagename'] = $this->LanguageLookup($frame_language, false);
-				if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
-					$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
-				}
-			} else {
-				$this->warning('Invalid data in frame "'.$parsedFrame['frame_name'].'" at offset '.$parsedFrame['dataoffset']);
+			$parsedFrame['language']     = $frame_language;
+			$parsedFrame['languagename'] = $this->LanguageLookup($frame_language, false);
+			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
+				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
 			}
 			unset($parsedFrame['data']);
 
@@ -1374,8 +1370,6 @@ public function ParseID3v2Frame(&$parsedFrame) {
 				$frame_textencoding_terminator = "\x00";
 			}
 
-			$frame_imagetype = null;
-			$frame_mimetype = null;
 			if ($id3v2_majorversion == 2 && strlen($parsedFrame['data']) > $frame_offset) {
 				$frame_imagetype = substr($parsedFrame['data'], $frame_offset, 3);
 				if (strtolower($frame_imagetype) == 'ima') {
@@ -1962,14 +1956,18 @@ public function ParseID3v2Frame(&$parsedFrame) {
 			$frame_offset = 0;
 			$parsedFrame['peakamplitude'] = getid3_lib::BigEndian2Float(substr($parsedFrame['data'], $frame_offset, 4));
 			$frame_offset += 4;
-			foreach (array('track','album') as $rgad_entry_type) {
-				$rg_adjustment_word = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 2));
-				$frame_offset += 2;
-				$parsedFrame['raw'][$rgad_entry_type]['name']       = ($rg_adjustment_word & 0xE000) >> 13;
-				$parsedFrame['raw'][$rgad_entry_type]['originator'] = ($rg_adjustment_word & 0x1C00) >> 10;
-				$parsedFrame['raw'][$rgad_entry_type]['signbit']    = ($rg_adjustment_word & 0x0200) >>  9;
-				$parsedFrame['raw'][$rgad_entry_type]['adjustment'] = ($rg_adjustment_word & 0x0100);
-			}
+			$rg_track_adjustment = getid3_lib::Dec2Bin(substr($parsedFrame['data'], $frame_offset, 2));
+			$frame_offset += 2;
+			$rg_album_adjustment = getid3_lib::Dec2Bin(substr($parsedFrame['data'], $frame_offset, 2));
+			$frame_offset += 2;
+			$parsedFrame['raw']['track']['name']       = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 0, 3));
+			$parsedFrame['raw']['track']['originator'] = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 3, 3));
+			$parsedFrame['raw']['track']['signbit']    = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 6, 1));
+			$parsedFrame['raw']['track']['adjustment'] = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 7, 9));
+			$parsedFrame['raw']['album']['name']       = getid3_lib::Bin2Dec(substr($rg_album_adjustment, 0, 3));
+			$parsedFrame['raw']['album']['originator'] = getid3_lib::Bin2Dec(substr($rg_album_adjustment, 3, 3));
+			$parsedFrame['raw']['album']['signbit']    = getid3_lib::Bin2Dec(substr($rg_album_adjustment, 6, 1));
+			$parsedFrame['raw']['album']['adjustment'] = getid3_lib::Bin2Dec(substr($rg_album_adjustment, 7, 9));
 			$parsedFrame['track']['name']       = getid3_lib::RGADnameLookup($parsedFrame['raw']['track']['name']);
 			$parsedFrame['track']['originator'] = getid3_lib::RGADoriginatorLookup($parsedFrame['raw']['track']['originator']);
 			$parsedFrame['track']['adjustment'] = getid3_lib::RGADadjustmentLookup($parsedFrame['raw']['track']['adjustment'], $parsedFrame['raw']['track']['signbit']);
@@ -2446,8 +2444,7 @@ public function LookupCurrencyUnits($currencyid) {
 			TMM	Manats
 			TND	Dinars
 			TOP	Pa'anga
-			TRL	Liras (old)
-			TRY	Liras
+			TRL	Liras
 			TTD	Dollars
 			TVD	Tuvalu Dollars
 			TWD	New Dollars
@@ -2648,7 +2645,6 @@ public function LookupCurrencyCountry($currencyid) {
 			TND	Tunisia
 			TOP	Tonga
 			TRL	Turkey
-			TRY	Turkey
 			TTD	Trinidad and Tobago
 			TVD	Tuvalu
 			TWD	Taiwan
diff --git a/src/wp-includes/ID3/module.tag.lyrics3.php b/src/wp-includes/ID3/module.tag.lyrics3.php
index c8b2cf6305984..b2375057e7910 100644
--- a/src/wp-includes/ID3/module.tag.lyrics3.php
+++ b/src/wp-includes/ID3/module.tag.lyrics3.php
@@ -33,9 +33,6 @@ public function Analyze() {
 		}
 
 		$this->fseek((0 - 128 - 9 - 6), SEEK_END);          // end - ID3v1 - "LYRICSEND" - [Lyrics3size]
-		$lyrics3offset = null;
-		$lyrics3version = null;
-		$lyrics3size   = null;
 		$lyrics3_id3v1 = $this->fread(128 + 9 + 6);
 		$lyrics3lsz    = (int) substr($lyrics3_id3v1, 0, 6); // Lyrics3size
 		$lyrics3end    = substr($lyrics3_id3v1,  6,   9); // LYRICSEND or LYRICS200
diff --git a/src/wp-includes/ID3/readme.txt b/src/wp-includes/ID3/readme.txt
index 0888bc4de2503..e48bcef917e8c 100644
--- a/src/wp-includes/ID3/readme.txt
+++ b/src/wp-includes/ID3/readme.txt
@@ -625,4 +625,3 @@ Reference material:
 * http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html
 * http://www.codeproject.com/Articles/8295/MPEG-Audio-Frame-Header
 * http://dsd-guide.com/sites/default/files/white-papers/DSFFileFormatSpec_E.pdf
-* https://fileformats.fandom.com/wiki/Torrent_file
\ No newline at end of file

From 1227fc51195f6e53273681aa3a3c739e1178d6fa Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 11 Oct 2021 15:07:52 +0000
Subject: [PATCH 199/257] Upgrade/Install: Restore or clean up the temporary
 plugin or theme backup on shutdown.

This allows these actions to run ''after'' the main process, without affecting the update. Actions running on `shutdown` are immune to PHP timeouts, so in case the failure was due to a PHP timeout, we'll still be able to properly restore the previous version.

Follow-up to [51815], [51898], [51899].

Props aristath, peterwilsoncc.
See #54166.

git-svn-id: https://develop.svn.wordpress.org/trunk@51902 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-upgrader.php | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-upgrader.php b/src/wp-admin/includes/class-wp-upgrader.php
index 0fab410240dc7..225a7d4c6952f 100644
--- a/src/wp-admin/includes/class-wp-upgrader.php
+++ b/src/wp-admin/includes/class-wp-upgrader.php
@@ -843,7 +843,18 @@ public function run( $options ) {
 		$this->skin->set_result( $result );
 		if ( is_wp_error( $result ) ) {
 			if ( ! empty( $options['hook_extra']['temp_backup'] ) ) {
-				$this->restore_temp_backup( $options['hook_extra']['temp_backup'] );
+				/*
+				 * Restore the backup on shutdown.
+				 * Actions running on `shutdown` are immune to PHP timeouts,
+				 * so in case the failure was due to a PHP timeout,
+				 * we'll still be able to properly restore the previous version.
+				 */
+				add_action(
+					'shutdown',
+					function() use ( $options ) {
+						$this->restore_temp_backup( $options['hook_extra']['temp_backup'] );
+					}
+				);
 			}
 			$this->skin->error( $result );
 
@@ -859,7 +870,13 @@ public function run( $options ) {
 
 		// Clean up the backup kept in the temp-backup directory.
 		if ( ! empty( $options['hook_extra']['temp_backup'] ) ) {
-			$this->delete_temp_backup( $options['hook_extra']['temp_backup'] );
+			// Delete the backup on `shutdown` to avoid a PHP timeout.
+			add_action(
+				'shutdown',
+				function() use ( $options ) {
+					$this->delete_temp_backup( $options['hook_extra']['temp_backup'] );
+				}
+			);
 		}
 
 		if ( ! $options['is_multi'] ) {

From d96e75674b63c09196e0c82732bb6377408b1cfd Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 12 Oct 2021 16:42:19 +0000
Subject: [PATCH 200/257] I18N: Add context for some Media Library filter
 strings:

* Audio
* Video
* Unattached

This allows for more homogeneous translations in languages where keeping a plural form is important.

Follow-up to [6910], [7397], [8901], [9556], [11749], [13100], [12110], [15491], [15578], [22743], [29426], [29625], [34256], [45651], [46437].

Props jdy68, audrasjb, SergeyBiryukov.
Fixes #54238.

git-svn-id: https://develop.svn.wordpress.org/trunk@51903 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-media-list-table.php | 2 +-
 src/wp-includes/media.php                           | 2 +-
 src/wp-includes/post.php                            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-media-list-table.php b/src/wp-admin/includes/class-wp-media-list-table.php
index cc27e8032492a..d425bccfbfc0f 100644
--- a/src/wp-admin/includes/class-wp-media-list-table.php
+++ b/src/wp-admin/includes/class-wp-media-list-table.php
@@ -151,7 +151,7 @@ protected function get_views() {
 			);
 		}
 
-		$type_links['detached'] = '<option value="detached"' . ( $this->detached ? ' selected="selected"' : '' ) . '>' . __( 'Unattached' ) . '</option>';
+		$type_links['detached'] = '<option value="detached"' . ( $this->detached ? ' selected="selected"' : '' ) . '>' . _x( 'Unattached', 'media items' ) . '</option>';
 
 		$type_links['mine'] = sprintf(
 			'<option value="mine"%s>%s</option>',
diff --git a/src/wp-includes/media.php b/src/wp-includes/media.php
index 43795c9084463..6e7f66760f608 100644
--- a/src/wp-includes/media.php
+++ b/src/wp-includes/media.php
@@ -4456,7 +4456,7 @@ function wp_enqueue_media( $args = array() ) {
 		'allDates'                    => __( 'All dates' ),
 		'noItemsFound'                => __( 'No items found.' ),
 		'insertIntoPost'              => $post_type_object->labels->insert_into_item,
-		'unattached'                  => __( 'Unattached' ),
+		'unattached'                  => _x( 'Unattached', 'media items' ),
 		'mine'                        => _x( 'Mine', 'media items' ),
 		'trash'                       => _x( 'Trash', 'noun' ),
 		'uploadedToThisPost'          => $post_type_object->labels->uploaded_to_this_item,
diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php
index 2bcd72c6d4339..b13942002a2a5 100644
--- a/src/wp-includes/post.php
+++ b/src/wp-includes/post.php
@@ -2939,7 +2939,7 @@ function get_post_mime_types() {
 			),
 		),
 		'audio'       => array(
-			__( 'Audio' ),
+			_x( 'Audio', 'file type group' ),
 			__( 'Manage Audio' ),
 			/* translators: %s: Number of audio files. */
 			_n_noop(
@@ -2948,7 +2948,7 @@ function get_post_mime_types() {
 			),
 		),
 		'video'       => array(
-			__( 'Video' ),
+			_x( 'Video', 'file type group' ),
 			__( 'Manage Video' ),
 			/* translators: %s: Number of video files. */
 			_n_noop(

From 65d9094a475a4b45efb70a79e158cfb08e703f78 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Tue, 12 Oct 2021 18:50:34 +0000
Subject: [PATCH 201/257] Build/Test Tools: Add end-to-end (e2e) tests
 `README.md`.

Adds a readme to the `/tests/e2e/` folder to provide (a) instructions of how to run the tests locally and (b) links to documentation.

Follow-up to [45570].

Props isabel_brison, desrosj, justinahinon.
Fixes #53550.

git-svn-id: https://develop.svn.wordpress.org/trunk@51904 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/e2e/README.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 tests/e2e/README.md

diff --git a/tests/e2e/README.md b/tests/e2e/README.md
new file mode 100644
index 0000000000000..fffb5e6fc4a82
--- /dev/null
+++ b/tests/e2e/README.md
@@ -0,0 +1 @@
+# E2E Tests

End-To-End (E2E) tests for WordPress.


## Running the tests

The e2e tests require a production-like environment to run. By default, they will assume an environment is available at `http://localhost:8889`, with username=admin and password=password.

If you don't already have an environment ready, you can set one up by following [these instructions](https://github.com/WordPress/wordpress-develop/blob/master/README.md).

Then you can launch the tests by running:

```
npm run test:e2e
```

which will run the test suite using a headless browser.

If your environment has a different url, username or password to the default, you can provide the base URL, username and password like this:

```
npm run test:e2e -- --wordpress-base-url=http://mycustomurl --wordpress-username=username --wordpress-password=password
```
**DO NOT run these tests in an actual production environment, as they will delete all your content.**

For debugging purposes, you might want to follow the test visually. You can do so by running the tests in an interactive mode.

```
npm run test:e2e -- --puppeteer-interactive
```

You can also run a single test file separately:

```
npm run test:e2e tests/e2e/specs/hello.test.js
```


## Documentation

* Block Editor Handbook end to end testing overview: https://developer.wordpress.org/block-editor/contributors/code/testing-overview/#end-to-end-testing

* Gutenberg e2e-test-utils package API docs: https://github.com/WordPress/gutenberg/tree/trunk/packages/e2e-test-utils

* Puppeteer API docs: https://github.com/puppeteer/puppeteer#readme (the version we are using is indicated in the @wordpress/scripts package: https://github.com/WordPress/gutenberg/blob/trunk/packages/scripts/package.json)
\ No newline at end of file

From 04044f9aa5e13dac9c14707f4039ccd0db6d4f09 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 13 Oct 2021 19:58:35 +0000
Subject: [PATCH 202/257] Docs: Update documentation for the
 `date_query_valid_columns` filter.

Add a `@since` note for `registered` and `last_updated` as default recognized date query columns.

Follow-up to [25139], [25860], [29933], [29934], [29938], [37477].

Props dimadin, johnjamesjacoby.
See #54248.

git-svn-id: https://develop.svn.wordpress.org/trunk@51905 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-date-query.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/wp-includes/class-wp-date-query.php b/src/wp-includes/class-wp-date-query.php
index 5e916c9165724..b8a5226e71577 100644
--- a/src/wp-includes/class-wp-date-query.php
+++ b/src/wp-includes/class-wp-date-query.php
@@ -494,11 +494,12 @@ public function validate_column( $column ) {
 			 *
 			 * @since 3.7.0
 			 * @since 4.1.0 Added 'user_registered' to the default recognized columns.
+			 * @since 4.6.0 Added 'registered' and 'last_updated' to the default recognized columns.
 			 *
 			 * @param string[] $valid_columns An array of valid date query columns. Defaults
 			 *                                are 'post_date', 'post_date_gmt', 'post_modified',
 			 *                                'post_modified_gmt', 'comment_date', 'comment_date_gmt',
-			 *                                'user_registered'
+			 *                                'user_registered', 'registered', 'last_updated'.
 			 */
 			if ( ! in_array( $column, apply_filters( 'date_query_valid_columns', $valid_columns ), true ) ) {
 				$column = 'post_date';

From ef20d5fdbed832ac1d63c2bc61b70e5e5a4ed3e4 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Thu, 14 Oct 2021 18:03:07 +0000
Subject: [PATCH 203/257] Docs: Update `WP_Date_Query` documentation to reflect
 changes in accepted column names.

Remove outdated list of accepted column name values, add a reference to `WP_Date_Query::validate_column()` and the `date_query_valid_columns` filter instead for a more detailed description.

Follow-up to [25139], [25860], [29933], [29934], [29938], [37477], [51905].

Props dimadin, johnjamesjacoby.
Fixes #54248.

git-svn-id: https://develop.svn.wordpress.org/trunk@51906 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-date-query.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/wp-includes/class-wp-date-query.php b/src/wp-includes/class-wp-date-query.php
index b8a5226e71577..55d3e3f01d66b 100644
--- a/src/wp-includes/class-wp-date-query.php
+++ b/src/wp-includes/class-wp-date-query.php
@@ -74,8 +74,8 @@ class WP_Date_Query {
 	 *
 	 *     @type array ...$0 {
 	 *         @type string $column   Optional. The column to query against. If undefined, inherits the value of
-	 *                                the `$default_column` parameter. Accepts 'post_date', 'post_date_gmt',
-	 *                                'post_modified','post_modified_gmt', 'comment_date', 'comment_date_gmt'.
+	 *                                the `$default_column` parameter. See WP_Date_Query::validate_column() and
+	 *                                the {@see 'date_query_valid_columns'} filter for the list of accepted values.
 	 *                                Default 'post_date'.
 	 *         @type string $compare  Optional. The comparison operator. Accepts '=', '!=', '>', '>=', '<', '<=',
 	 *                                'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN'. Default '='.
@@ -104,11 +104,11 @@ class WP_Date_Query {
 	 *                 @type string $day   Optional when passing array.The day of the month. Accepts numbers 1-31.
 	 *                                     Default (string:empty)|(array:last day of month).
 	 *             }
-	 *             @type string       $column        Optional. Used to add a clause comparing a column other than the
-	 *                                               column specified in the top-level `$column` parameter. Accepts
-	 *                                               'post_date', 'post_date_gmt', 'post_modified', 'post_modified_gmt',
-	 *                                               'comment_date', 'comment_date_gmt'. Default is the value of
-	 *                                               top-level `$column`.
+	 *             @type string       $column        Optional. Used to add a clause comparing a column other than
+	 *                                               the column specified in the top-level `$column` parameter.
+	 *                                               See WP_Date_Query::validate_column() and
+	 *                                               the {@see 'date_query_valid_columns'} filter for the list
+	 *                                               of accepted values. Default is the value of top-level `$column`.
 	 *             @type string       $compare       Optional. The comparison operator. Accepts '=', '!=', '>', '>=',
 	 *                                               '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN'. 'IN',
 	 *                                               'NOT IN', 'BETWEEN', and 'NOT BETWEEN'. Comparisons support
@@ -140,9 +140,9 @@ class WP_Date_Query {
 	 *         }
 	 *     }
 	 * }
-	 * @param string $default_column Optional. Default column to query against. Default 'post_date'.
-	 *                               Accepts 'post_date', 'post_date_gmt', 'post_modified', 'post_modified_gmt',
-	 *                               'comment_date', 'comment_date_gmt'.
+	 * @param string $default_column Optional. Default column to query against. See WP_Date_Query::validate_column()
+	 *                               and the {@see 'date_query_valid_columns'} filter for the list of accepted values.
+	 *                               Default 'post_date'.
 	 */
 	public function __construct( $date_query, $default_column = 'post_date' ) {
 		if ( empty( $date_query ) || ! is_array( $date_query ) ) {

From dc54ceabd8a10a9a7ce40ba5181c6ad910717bf7 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Fri, 15 Oct 2021 00:17:49 +0000
Subject: [PATCH 204/257] Media: Display the unsaved changes dialog in image
 edit form using jQuery `.text()` function.

This ensures that HTML entities like non-breaking spaces are properly displayed instead of being encoded.

Props jdy68, sebastienserre, audrasjb, mukesh27, SergeyBiryukov.
Fixes #54232.

git-svn-id: https://develop.svn.wordpress.org/trunk@51907 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/js/_enqueues/lib/image-edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/_enqueues/lib/image-edit.js b/src/js/_enqueues/lib/image-edit.js
index 099398b4e3407..18d3099f62cf5 100644
--- a/src/js/_enqueues/lib/image-edit.js
+++ b/src/js/_enqueues/lib/image-edit.js
@@ -893,7 +893,7 @@
 			pop = this.intval( $('#imgedit-undone-' + postid).val() );
 
 		if ( pop < history.length ) {
-			if ( confirm( $('#imgedit-leaving-' + postid).html() ) ) {
+			if ( confirm( $('#imgedit-leaving-' + postid).text() ) ) {
 				return false;
 			}
 			return true;

From 66ed91d21406b979f3c8b6f7e321b656896149bc Mon Sep 17 00:00:00 2001
From: Rachel Baker <rachelbaker@git.wordpress.org>
Date: Fri, 15 Oct 2021 02:03:38 +0000
Subject: [PATCH 205/257] REST API: Add text-field and textarea-field as
 available schema formats for string sanitization.

Props ocean90, TimothyBlynJacobs.
Fixes #49960.

git-svn-id: https://develop.svn.wordpress.org/trunk@51908 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/rest-api.php                  |  7 ++
 .../tests/rest-api/rest-controller.php        | 76 +++++++++++++++++--
 .../tests/rest-api/rest-test-controller.php   | 36 +++++----
 3 files changed, 98 insertions(+), 21 deletions(-)

diff --git a/src/wp-includes/rest-api.php b/src/wp-includes/rest-api.php
index fb83e38f4cb18..7e66ecd801218 100644
--- a/src/wp-includes/rest-api.php
+++ b/src/wp-includes/rest-api.php
@@ -2635,6 +2635,7 @@ function rest_validate_integer_value_from_schema( $value, $args, $param ) {
  * @since 4.7.0
  * @since 5.5.0 Added the `$param` parameter.
  * @since 5.6.0 Support the "anyOf" and "oneOf" keywords.
+ * @since 5.9.0 Added `text-field` and `textarea-field` formats.
  *
  * @param mixed  $value The value to sanitize.
  * @param array  $args  Schema array to use for sanitization.
@@ -2777,6 +2778,12 @@ function rest_sanitize_value_from_schema( $value, $args, $param = '' ) {
 
 			case 'uuid':
 				return sanitize_text_field( $value );
+
+			case 'text-field':
+				return sanitize_text_field( $value );
+
+			case 'textarea-field':
+				return sanitize_textarea_field( $value );
 		}
 	}
 
diff --git a/tests/phpunit/tests/rest-api/rest-controller.php b/tests/phpunit/tests/rest-api/rest-controller.php
index 0af9460aa5d2c..270d1f32d191c 100644
--- a/tests/phpunit/tests/rest-api/rest-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-controller.php
@@ -23,35 +23,43 @@ public function set_up() {
 			'/wp/v2/testroute',
 			array(
 				'args' => array(
-					'someinteger' => array(
+					'someinteger'       => array(
 						'type' => 'integer',
 					),
-					'someboolean' => array(
+					'someboolean'       => array(
 						'type' => 'boolean',
 					),
-					'somestring'  => array(
+					'somestring'        => array(
 						'type' => 'string',
 					),
-					'somehex'     => array(
+					'somehex'           => array(
 						'type'   => 'string',
 						'format' => 'hex-color',
 					),
-					'someenum'    => array(
+					'someenum'          => array(
 						'type' => 'string',
 						'enum' => array( 'a' ),
 					),
-					'somedate'    => array(
+					'somedate'          => array(
 						'type'   => 'string',
 						'format' => 'date-time',
 					),
-					'someemail'   => array(
+					'someemail'         => array(
 						'type'   => 'string',
 						'format' => 'email',
 					),
-					'someuuid'    => array(
+					'someuuid'          => array(
 						'type'   => 'string',
 						'format' => 'uuid',
 					),
+					'sometextfield'     => array(
+						'type'   => 'string',
+						'format' => 'text-field',
+					),
+					'sometextareafield' => array(
+						'type'   => 'string',
+						'format' => 'textarea-field',
+					),
 				),
 			)
 		);
@@ -219,6 +227,52 @@ public function test_validate_schema_format_uuid() {
 		);
 	}
 
+	/**
+	 * @ticket 49960
+	 */
+	public function test_validate_schema_format_text_field() {
+		$this->assertTrue(
+			rest_validate_request_arg( 'Hello World', $this->request, 'sometextfield' )
+		);
+
+		$this->assertErrorResponse(
+			'rest_invalid_type',
+			rest_validate_request_arg( false, $this->request, 'sometextfield' )
+		);
+
+		$this->assertSame(
+			'Hello World',
+			rest_sanitize_request_arg( 'Hello World', $this->request, 'sometextfield' )
+		);
+		$this->assertSame(
+			'Hello World',
+			rest_sanitize_request_arg( '<p>Hello World</p>', $this->request, 'sometextfield' )
+		);
+	}
+
+	/**
+	 * @ticket 49960
+	 */
+	public function test_validate_schema_format_textarea_field() {
+		$this->assertTrue(
+			rest_validate_request_arg( "Hello\nWorld", $this->request, 'sometextareafield' )
+		);
+
+		$this->assertErrorResponse(
+			'rest_invalid_type',
+			rest_validate_request_arg( false, $this->request, 'sometextareafield' )
+		);
+
+		$this->assertSame(
+			"Hello\nWorld",
+			rest_sanitize_request_arg( "Hello\nWorld", $this->request, 'sometextareafield' )
+		);
+		$this->assertSame(
+			"Hello\nWorld",
+			rest_sanitize_request_arg( "<p>Hello\nWorld</p>", $this->request, 'sometextareafield' )
+		);
+	}
+
 	/**
 	 * @ticket 50876
 	 */
@@ -234,6 +288,8 @@ public function test_get_endpoint_args_for_item_schema() {
 		$this->assertArrayHasKey( 'someemail', $args );
 		$this->assertArrayHasKey( 'somehex', $args );
 		$this->assertArrayHasKey( 'someuuid', $args );
+		$this->assertArrayHasKey( 'sometextfield', $args );
+		$this->assertArrayHasKey( 'sometextareafield', $args );
 		$this->assertArrayHasKey( 'someenum', $args );
 		$this->assertArrayHasKey( 'someargoptions', $args );
 		$this->assertArrayHasKey( 'somedefault', $args );
@@ -323,6 +379,8 @@ public function test_get_fields_for_response( $param, $expected ) {
 				'someemail',
 				'somehex',
 				'someuuid',
+				'sometextfield',
+				'sometextareafield',
 				'someenum',
 				'someargoptions',
 				'somedefault',
@@ -356,6 +414,8 @@ public function data_get_fields_for_response() {
 					'someemail',
 					'somehex',
 					'someuuid',
+					'sometextfield',
+					'sometextareafield',
 					'someenum',
 					'someargoptions',
 					'somedefault',
diff --git a/tests/phpunit/tests/rest-api/rest-test-controller.php b/tests/phpunit/tests/rest-api/rest-test-controller.php
index d09cb5e7a39bb..f75de9e45899e 100644
--- a/tests/phpunit/tests/rest-api/rest-test-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-test-controller.php
@@ -36,7 +36,7 @@ public function get_item_schema() {
 			'title'      => 'type',
 			'type'       => 'object',
 			'properties' => array(
-				'somestring'     => array(
+				'somestring'        => array(
 					'type'        => 'string',
 					'description' => 'A pretty string.',
 					'minLength'   => 3,
@@ -44,7 +44,7 @@ public function get_item_schema() {
 					'pattern'     => '[a-zA-Z]+',
 					'context'     => array( 'view' ),
 				),
-				'someinteger'    => array(
+				'someinteger'       => array(
 					'type'             => 'integer',
 					'multipleOf'       => 10,
 					'minimum'          => 100,
@@ -53,41 +53,51 @@ public function get_item_schema() {
 					'exclusiveMaximum' => true,
 					'context'          => array( 'view' ),
 				),
-				'someboolean'    => array(
+				'someboolean'       => array(
 					'type'    => 'boolean',
 					'context' => array( 'view' ),
 				),
-				'someurl'        => array(
+				'someurl'           => array(
 					'type'    => 'string',
 					'format'  => 'uri',
 					'context' => array( 'view' ),
 				),
-				'somedate'       => array(
+				'somedate'          => array(
 					'type'    => 'string',
 					'format'  => 'date-time',
 					'context' => array( 'view' ),
 				),
-				'someemail'      => array(
+				'someemail'         => array(
 					'type'    => 'string',
 					'format'  => 'email',
 					'context' => array( 'view' ),
 				),
-				'somehex'        => array(
+				'somehex'           => array(
 					'type'    => 'string',
 					'format'  => 'hex-color',
 					'context' => array( 'view' ),
 				),
-				'someuuid'       => array(
+				'someuuid'          => array(
 					'type'    => 'string',
 					'format'  => 'uuid',
 					'context' => array( 'view' ),
 				),
-				'someenum'       => array(
+				'sometextfield'     => array(
+					'type'    => 'string',
+					'format'  => 'text-field',
+					'context' => array( 'view' ),
+				),
+				'sometextareafield' => array(
+					'type'    => 'string',
+					'format'  => 'textarea-field',
+					'context' => array( 'view' ),
+				),
+				'someenum'          => array(
 					'type'    => 'string',
 					'enum'    => array( 'a', 'b', 'c' ),
 					'context' => array( 'view' ),
 				),
-				'someargoptions' => array(
+				'someargoptions'    => array(
 					'type'        => 'integer',
 					'required'    => true,
 					'arg_options' => array(
@@ -95,13 +105,13 @@ public function get_item_schema() {
 						'sanitize_callback' => '__return_true',
 					),
 				),
-				'somedefault'    => array(
+				'somedefault'       => array(
 					'type'    => 'string',
 					'enum'    => array( 'a', 'b', 'c' ),
 					'context' => array( 'view' ),
 					'default' => 'a',
 				),
-				'somearray'      => array(
+				'somearray'         => array(
 					'type'        => 'array',
 					'items'       => array(
 						'type' => 'string',
@@ -111,7 +121,7 @@ public function get_item_schema() {
 					'uniqueItems' => true,
 					'context'     => array( 'view' ),
 				),
-				'someobject'     => array(
+				'someobject'        => array(
 					'type'                 => 'object',
 					'additionalProperties' => array(
 						'type' => 'string',

From 0800c315181bf6e41e3e21721f9214ba7030d23b Mon Sep 17 00:00:00 2001
From: Gary Pendergast <pento@git.wordpress.org>
Date: Fri, 15 Oct 2021 05:03:17 +0000
Subject: [PATCH 206/257] Embeds: Add Wolfram Notebook as a trusted oEmbed
 provider.

Fixes #53326.



git-svn-id: https://develop.svn.wordpress.org/trunk@51909 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-oembed.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/wp-includes/class-wp-oembed.php b/src/wp-includes/class-wp-oembed.php
index 2efb8903058d0..78297780bc154 100644
--- a/src/wp-includes/class-wp-oembed.php
+++ b/src/wp-includes/class-wp-oembed.php
@@ -103,6 +103,7 @@ public function __construct() {
 			'#https?://some\.ly\/.+#i'                     => array( 'https://www.someecards.com/v2/oembed/', true ),
 			'#https?://(www\.)?tiktok\.com/.*/video/.*#i'  => array( 'https://www.tiktok.com/oembed', true ),
 			'#https?://([a-z]{2}|www)\.pinterest\.com(\.(au|mx))?/.*#i' => array( 'https://www.pinterest.com/oembed.json', true ),
+			'#https?://(www\.)?wolframcloud\.com/obj/.+#i' => array( 'https://www.wolframcloud.com/oembed', true ),
 		);
 
 		if ( ! empty( self::$early_providers['add'] ) ) {
@@ -181,6 +182,7 @@ public function __construct() {
 		 * | Crowdsignal  | survey.fm                                 | 5.1.0   |
 		 * | TikTok       | tiktok.com                                | 5.4.0   |
 		 * | Pinterest    | pinterest.com                             | 5.9.0   |
+		 * | WolframCloud | wolframcloud.com                          | 5.9.0   |
 		 *
 		 * No longer supported providers:
 		 *

From dce6abe7686ee4406ad18efe0ae4b5a789389dbb Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Fri, 15 Oct 2021 22:23:35 +0000
Subject: [PATCH 207/257] FileSystem API: Fix infinite loop on Windows for
 `clean_dirsize_cache()`.

When the PHP native `dirname()` function is used on a Windows disk name - i.e. `C:\`-, it will return the same, i.e, it will return `C:\` again.

The `clean_dirsize_cache()` function didn't have guard clause against this, which meant that on Windows based systems and IIS servers, this function would result in WordPress getting stuck into an infinite loop.

The adjustment to the `while` part of the function fix this by checking if the return value of the `dirname()` function call is the same as the original path passed to `dirname()`, which effectively fixes the infinite loop.

A number of other improvements made:

1. Add input validation for the `$path` parameter to guard against invalid variable types being passed into the function.

2. Guard against an empty `$path` parameter, which would result in an infinite loop on both Windows as well as *nix based systems.

In both these cases, a PHP notice will now be thrown.

3. When a non-empty string, which isn't a path would previously be passed, the `dirname()` function would transform that to a `.` and the `.` key in the transient cache would be cleared out.
This was a bug as there is no relation between a non-path string and the root directory of file system.

This bug has been fixed by checking that something could actually be a path and handling received non-empty, non-path input parameters in a special way, i.e only removing the cache key for the passed string and bowing out from further processing.

Unfortunately, no tests can be added to guard against the infinite loop.

For the other fixes, we have added appropriate unit tests.

Follow-up up [49212], [49616], [49744].

Props jrf, hellofromTonya, raubvogel, sergeybiryukov, codezen8, sjlevy, drosmog, teachlynx, ekojr, bartoszgrzesik, joegasper, janthiel, josephdickson, ocean90, audrasjb.
Fixes #52241.

git-svn-id: https://develop.svn.wordpress.org/trunk@51910 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/functions.php                 | 35 +++++++++++++++++--
 .../tests/functions/cleanDirsizeCache.php     |  1 +
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 tests/phpunit/tests/functions/cleanDirsizeCache.php

diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index aa507bb0045ea..81409e9382be2 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -8221,21 +8221,50 @@ function recurse_dirsize( $directory, $exclude = null, $max_execution_time = nul
  * Removes the current directory and all parent directories from the `dirsize_cache` transient.
  *
  * @since 5.6.0
+ * @since 5.9.0 Added input validation with a notice for invalid input.
  *
  * @param string $path Full path of a directory or file.
  */
 function clean_dirsize_cache( $path ) {
+	if ( ! is_string( $path ) || empty( $path ) ) {
+		trigger_error(
+			sprintf(
+				/* translators: 1: Function name, 2: A variable type, like "boolean" or "integer". */
+				__( '%1$s only accepts a non-empty path string, received %2$s.' ),
+				'<code>clean_dirsize_cache()</code>',
+				'<code>' . gettype( $path ) . '</code>'
+			)
+		);
+		return;
+	}
+
 	$directory_cache = get_transient( 'dirsize_cache' );
 
 	if ( empty( $directory_cache ) ) {
 		return;
 	}
 
-	$path = untrailingslashit( $path );
+	if (
+		strpos( $path, '/' ) === false &&
+		strpos( $path, '\\' ) === false
+	) {
+		unset( $directory_cache[ $path ] );
+		set_transient( 'dirsize_cache', $directory_cache );
+		return;
+	}
+
+	$last_path = null;
+	$path      = untrailingslashit( $path );
 	unset( $directory_cache[ $path ] );
 
-	while ( DIRECTORY_SEPARATOR !== $path && '.' !== $path && '..' !== $path ) {
-		$path = dirname( $path );
+	while (
+		$last_path !== $path &&
+		DIRECTORY_SEPARATOR !== $path &&
+		'.' !== $path &&
+		'..' !== $path
+	) {
+		$last_path = $path;
+		$path      = dirname( $path );
 		unset( $directory_cache[ $path ] );
 	}
 
diff --git a/tests/phpunit/tests/functions/cleanDirsizeCache.php b/tests/phpunit/tests/functions/cleanDirsizeCache.php
new file mode 100644
index 0000000000000..6ae7d6d2dc69a
--- /dev/null
+++ b/tests/phpunit/tests/functions/cleanDirsizeCache.php
@@ -0,0 +1 @@
+<?php

/**
 * Tests specific to the directory size caching.
 *
 * @covers ::clean_dirsize_cache
 * @group functions.php
 */
class Tests_Functions_CleanDirsizeCache extends WP_UnitTestCase {

	/**
	 * Test the handling of invalid data passed as the $path parameter.
	 *
	 * @ticket 52241
	 *
	 * @dataProvider data_clean_dirsize_cache_with_invalid_inputs
	 *
	 * @param mixed  $path             Path input to use in the test.
	 * @param string $expected_message Expected notice message.
	 */
	public function test_clean_dirsize_cache_with_invalid_inputs( $path, $expected_message ) {
		$this->expectNotice();
		$this->expectNoticeMessage( $expected_message );

		clean_dirsize_cache( $path );
	}

	/**
	 * Data provider.
	 *
	 * @return array
	 */
	public function data_clean_dirsize_cache_with_invalid_inputs() {
		return array(
			'null'         => array(
				'path'             => null,
				'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>NULL</code>.',
			),
			'bool false'   => array(
				'path'             => false,
				'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>boolean</code>.',
			),
			'empty string' => array(
				'path'             => '',
				'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>string</code>.',
			),
			'array'        => array(
				'path'             => array( '.', './second/path/' ),
				'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>array</code>.',
			),
		);
	}

	/**
	 * Test the handling of a non-path text string passed as the $path parameter.
	 *
	 * @ticket 52241
	 *
	 * @dataProvider data_clean_dirsize_cache_with_non_path_string
	 *
	 * @param string $path           Path input to use in the test.
	 * @param int    $expected_count Expected number of paths in the cache after cleaning.
	 */
	public function test_clean_dirsize_cache_with_non_path_string( $path, $expected_count ) {
		// Set the dirsize cache to our mock.
		set_transient( 'dirsize_cache', $this->mock_dirsize_cache_with_non_path_string() );

		clean_dirsize_cache( $path );

		$cache = get_transient( 'dirsize_cache' );
		$this->assertIsArray( $cache );
		$this->assertCount( $expected_count, $cache );
	}

	/**
	 * Data provider.
	 *
	 * @return array
	 */
	public function data_clean_dirsize_cache_with_non_path_string() {
		return array(
			'single dot'                        => array(
				'path'           => '.',
				'expected_count' => 1,
			),
			'non-path'                          => array(
				'path'           => 'string',
				'expected_count' => 1,
			),
			'non-existant string, but non-path' => array(
				'path'           => 'doesnotexist',
				'expected_count' => 2,
			),
		);
	}

	private function mock_dirsize_cache_with_non_path_string() {
		return array(
			'.'      => array( 'size' => 50 ),
			'string' => array( 'size' => 42 ),
		);
	}
}
\ No newline at end of file

From f180a0865e8fbd152a21d61a9fa162b692d5f98f Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Fri, 15 Oct 2021 22:52:43 +0000
Subject: [PATCH 208/257] FileSystem API: Fix autovivification deprecation
 notice in `recurse_dirsize()`.

>PHP natively allows for autovivification (auto-creation of arrays from falsey values). This feature is very useful and used in a lot of PHP projects, especially if the variable is undefined. However, there is a little oddity that allows creating an array from a `false` and `null` value.

The above quote is from the PHP 8.1 RFC and the (accepted) RFC changes the behaviour described above to deprecated auto creation of arrays from `false`. As it is deprecated, it _will_ still work for the time being, but as of PHP 9.0, this will become a Fatal Error, so we may as well fix it now.

The `recurse_dirsize()` function retrieves a transient and places it in the `$directory_cache` variable, but the `get_transient()` function in WP returns `false` when the transient doesn't exist, which subsequently can lead to the above mentioned deprecation notice.

By verifying that the `$directory_cache` variable is an array before assigning to it and initializing it to an empty array, if it's not, we prevent the deprecation notice, as well as harden the function against potentially corrupted transients where this transient would not return the expected array format, but some other variable type.

Includes adding dedicated unit tests for both the PHP 8.1 issue, as well as the hardening against corrupted transients.

Includes some girl-scouting: touching up a parameter description and some code layout.

Refs:
* https://wiki.php.net/rfc/autovivification_false
* https://developer.wordpress.org/reference/functions/get_transient/

Follow-up to [49212], [49744].

Props jrf, hellofromTonya.
See #53635.

git-svn-id: https://develop.svn.wordpress.org/trunk@51911 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/functions.php                       | 13 ++++++++++---
 tests/phpunit/tests/functions/cleanDirsizeCache.php |  2 +-
 tests/phpunit/tests/functions/fixtures/dummy.txt    |  1 +
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 tests/phpunit/tests/functions/fixtures/dummy.txt

diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index 81409e9382be2..86a21a8e78e47 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -8120,8 +8120,9 @@ function get_dirsize( $directory, $max_execution_time = null ) {
  * @param string       $directory          Full path of a directory.
  * @param string|array $exclude            Optional. Full path of a subdirectory to exclude from the total,
  *                                         or array of paths. Expected without trailing slash(es).
- * @param int          $max_execution_time Maximum time to run before giving up. In seconds. The timeout is global
- *                                         and is measured from the moment WordPress started to load.
+ * @param int          $max_execution_time Optional. Maximum time to run before giving up. In seconds.
+ *                                         The timeout is global and is measured from the moment
+ *                                         WordPress started to load.
  * @param array        $directory_cache    Optional. Array of cached directory paths.
  *
  * @return int|false|null Size in bytes if a valid directory. False if not. Null if timeout.
@@ -8194,7 +8195,9 @@ function recurse_dirsize( $directory, $exclude = null, $max_execution_time = nul
 						}
 					}
 
-					if ( $max_execution_time > 0 && microtime( true ) - WP_START_TIMESTAMP > $max_execution_time ) {
+					if ( $max_execution_time > 0 &&
+						( microtime( true ) - WP_START_TIMESTAMP ) > $max_execution_time
+					) {
 						// Time exceeded. Give up instead of risking a fatal timeout.
 						$size = null;
 						break;
@@ -8205,6 +8208,10 @@ function recurse_dirsize( $directory, $exclude = null, $max_execution_time = nul
 		}
 	}
 
+	if ( ! is_array( $directory_cache ) ) {
+		$directory_cache = array();
+	}
+
 	$directory_cache[ $directory ] = $size;
 
 	// Only write the transient on the top level call and not on recursive calls.
diff --git a/tests/phpunit/tests/functions/cleanDirsizeCache.php b/tests/phpunit/tests/functions/cleanDirsizeCache.php
index 6ae7d6d2dc69a..d600bdca542eb 100644
--- a/tests/phpunit/tests/functions/cleanDirsizeCache.php
+++ b/tests/phpunit/tests/functions/cleanDirsizeCache.php
@@ -1 +1 @@
-<?php

/**
 * Tests specific to the directory size caching.
 *
 * @covers ::clean_dirsize_cache
 * @group functions.php
 */
class Tests_Functions_CleanDirsizeCache extends WP_UnitTestCase {

	/**
	 * Test the handling of invalid data passed as the $path parameter.
	 *
	 * @ticket 52241
	 *
	 * @dataProvider data_clean_dirsize_cache_with_invalid_inputs
	 *
	 * @param mixed  $path             Path input to use in the test.
	 * @param string $expected_message Expected notice message.
	 */
	public function test_clean_dirsize_cache_with_invalid_inputs( $path, $expected_message ) {
		$this->expectNotice();
		$this->expectNoticeMessage( $expected_message );

		clean_dirsize_cache( $path );
	}

	/**
	 * Data provider.
	 *
	 * @return array
	 */
	public function data_clean_dirsize_cache_with_invalid_inputs() {
		return array(
			'null'         => array(
				'path'             => null,
				'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>NULL</code>.',
			),
			'bool false'   => array(
				'path'             => false,
				'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>boolean</code>.',
			),
			'empty string' => array(
				'path'             => '',
				'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>string</code>.',
			),
			'array'        => array(
				'path'             => array( '.', './second/path/' ),
				'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>array</code>.',
			),
		);
	}

	/**
	 * Test the handling of a non-path text string passed as the $path parameter.
	 *
	 * @ticket 52241
	 *
	 * @dataProvider data_clean_dirsize_cache_with_non_path_string
	 *
	 * @param string $path           Path input to use in the test.
	 * @param int    $expected_count Expected number of paths in the cache after cleaning.
	 */
	public function test_clean_dirsize_cache_with_non_path_string( $path, $expected_count ) {
		// Set the dirsize cache to our mock.
		set_transient( 'dirsize_cache', $this->mock_dirsize_cache_with_non_path_string() );

		clean_dirsize_cache( $path );

		$cache = get_transient( 'dirsize_cache' );
		$this->assertIsArray( $cache );
		$this->assertCount( $expected_count, $cache );
	}

	/**
	 * Data provider.
	 *
	 * @return array
	 */
	public function data_clean_dirsize_cache_with_non_path_string() {
		return array(
			'single dot'                        => array(
				'path'           => '.',
				'expected_count' => 1,
			),
			'non-path'                          => array(
				'path'           => 'string',
				'expected_count' => 1,
			),
			'non-existant string, but non-path' => array(
				'path'           => 'doesnotexist',
				'expected_count' => 2,
			),
		);
	}

	private function mock_dirsize_cache_with_non_path_string() {
		return array(
			'.'      => array( 'size' => 50 ),
			'string' => array( 'size' => 42 ),
		);
	}
}
\ No newline at end of file
+<?php

/**
 * Tests specific to the directory size caching.
 *
 * @group functions.php
 */
class Tests_Functions_CleanDirsizeCache extends WP_UnitTestCase {

	/**
	 * Test the handling of invalid data passed as the $path parameter.
	 *
	 * @ticket 52241
	 *
	 * @covers ::clean_dirsize_cache
	 *
	 * @dataProvider data_clean_dirsize_cache_with_invalid_inputs
	 *
	 * @param mixed  $path             Path input to use in the test.
	 * @param string $expected_message Expected notice message.
	 */
	public function test_clean_dirsize_cache_with_invalid_inputs( $path, $expected_message ) {
		$this->expectNotice();
		$this->expectNoticeMessage( $expected_message );

		clean_dirsize_cache( $path );
	}

	/**
	 * Data provider.
	 *
	 * @return array
	 */
	public function data_clean_dirsize_cache_with_invalid_inputs() {
		return array(
			'null'         => array(
				'path'             => null,
				'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>NULL</code>.',
			),
			'bool false'   => array(
				'path'             => false,
				'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>boolean</code>.',
			),
			'empty string' => array(
				'path'             => '',
				'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>string</code>.',
			),
			'array'        => array(
				'path'             => array( '.', './second/path/' ),
				'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>array</code>.',
			),
		);
	}

	/**
	 * Test the handling of a non-path text string passed as the $path parameter.
	 *
	 * @ticket 52241
	 *
	 * @covers ::clean_dirsize_cache
	 *
	 * @dataProvider data_clean_dirsize_cache_with_non_path_string
	 *
	 * @param string $path           Path input to use in the test.
	 * @param int    $expected_count Expected number of paths in the cache after cleaning.
	 */
	public function test_clean_dirsize_cache_with_non_path_string( $path, $expected_count ) {
		// Set the dirsize cache to our mock.
		set_transient( 'dirsize_cache', $this->mock_dirsize_cache_with_non_path_string() );

		clean_dirsize_cache( $path );

		$cache = get_transient( 'dirsize_cache' );
		$this->assertIsArray( $cache );
		$this->assertCount( $expected_count, $cache );
	}

	/**
	 * Data provider.
	 *
	 * @return array
	 */
	public function data_clean_dirsize_cache_with_non_path_string() {
		return array(
			'single dot'                        => array(
				'path'           => '.',
				'expected_count' => 1,
			),
			'non-path'                          => array(
				'path'           => 'string',
				'expected_count' => 1,
			),
			'non-existant string, but non-path' => array(
				'path'           => 'doesnotexist',
				'expected_count' => 2,
			),
		);
	}

	private function mock_dirsize_cache_with_non_path_string() {
		return array(
			'.'      => array( 'size' => 50 ),
			'string' => array( 'size' => 42 ),
		);
	}

	/**
	 * Test the behaviour of the function when the transient doesn't exist.
	 *
	 * @ticket 52241
	 * @ticket 53635
	 *
	 * @covers ::recurse_dirsize
	 */
	public function test_recurse_dirsize_without_transient() {
		delete_transient( 'dirsize_cache' );

		$size = recurse_dirsize( __DIR__ . '/fixtures' );

		$this->assertGreaterThan( 10, $size );
	}

	/**
	 * Test the behaviour of the function when the transient does exist, but is not an array.
	 *
	 * In particular, this tests that no PHP TypeErrors are being thrown.
	 *
	 * @ticket 52241
	 * @ticket 53635
	 *
	 * @covers ::recurse_dirsize
	 */
	public function test_recurse_dirsize_with_invalid_transient() {
		set_transient( 'dirsize_cache', 'this is not a valid transient for dirsize cache' );

		$size = recurse_dirsize( __DIR__ . '/fixtures' );

		$this->assertGreaterThan( 10, $size );
	}
}
\ No newline at end of file
diff --git a/tests/phpunit/tests/functions/fixtures/dummy.txt b/tests/phpunit/tests/functions/fixtures/dummy.txt
new file mode 100644
index 0000000000000..7cc0f577eecaa
--- /dev/null
+++ b/tests/phpunit/tests/functions/fixtures/dummy.txt
@@ -0,0 +1 @@
+This is a dummy text file which is only used by the `Tests_Multisite_CleanDirsizeCache::test_recurse_dirsize_without_transient()` test.
\ No newline at end of file

From 0a0e8159a88785388452616f921f83a9ede593fd Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Fri, 15 Oct 2021 22:57:47 +0000
Subject: [PATCH 209/257] FileSystem API: Add safeguard for invalid return from
 `get_attached_file()` in `wp_delete_attachment()`.

The `get_attached_file()` function is supposed to return the path to the file, but could:
1. Return `false` if the file doesn't exist.
2. Return literally anything else, as a filter is being applied to the value on return.

As the `clean_dirsize_cache()` now has input validation, passing anything but a non-empty string to `clean_dirsize_cache()` will result in a PHP error notice.

This was exposed by the `Tests_Post_GetPostStatus::wpSetUpBeforeClass()` method which started generating unexpected output (the doing it wrong message) during the test run.

While this indicates that there is a flaw in the mocking being done in the test suite, debugging that is outside of the scope of the current patch.

At the same time, as based on the above point, this ''could'' potentially happen in a real-world situation as well, adding additional conditions to the `if` in the `wp_delete_attachment()` function before calling the `clean_dirsize_cache()` function, is warranted.

As there are no tests for the `wp_delete_attachment()` function at all at this time, we're not adding a test specifically for this change for now. This should however be addressed in the future, when tests will be added to cover the `wp_delete_attachment()` function completely.

Follow-up to [32619], [49212], [51910].

Props jrf, hellofromTonya.
See #52241.

git-svn-id: https://develop.svn.wordpress.org/trunk@51912 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/post.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php
index b13942002a2a5..7073328c0d6dc 100644
--- a/src/wp-includes/post.php
+++ b/src/wp-includes/post.php
@@ -6162,7 +6162,7 @@ function wp_delete_attachment( $post_id, $force_delete = false ) {
 	$backup_sizes = get_post_meta( $post->ID, '_wp_attachment_backup_sizes', true );
 	$file         = get_attached_file( $post_id );
 
-	if ( is_multisite() ) {
+	if ( is_multisite() && is_string( $file ) && ! empty( $file ) ) {
 		clean_dirsize_cache( $file );
 	}
 

From d36e2dd621c81c4ea445020b9587d3323664af9c Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sat, 16 Oct 2021 02:37:39 +0000
Subject: [PATCH 210/257] Docs: Improve documentation for the `tax_input`
 parameter of `wp_insert_post()`.

Follow-up to [10222], [13217], [33922].

Props dingo_d.
Fixes #54264.

git-svn-id: https://develop.svn.wordpress.org/trunk@51913 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/post.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php
index 7073328c0d6dc..fb90f626f43b9 100644
--- a/src/wp-includes/post.php
+++ b/src/wp-includes/post.php
@@ -3823,7 +3823,14 @@ function wp_get_recent_posts( $args = array(), $output = ARRAY_A ) {
  *     @type int[]  $post_category         Array of category IDs.
  *                                         Defaults to value of the 'default_category' option.
  *     @type array  $tags_input            Array of tag names, slugs, or IDs. Default empty.
- *     @type array  $tax_input             Array of taxonomy terms keyed by their taxonomy name. Default empty.
+ *     @type array  $tax_input             An array of taxonomy terms keyed by their taxonomy name.
+ *                                         If the taxonomy is hierarchical, the term list needs to be
+ *                                         either an array of term IDs or a comma-separated string of IDs.
+ *                                         If the taxonomy is non-hierarchical, the term list can be an array
+ *                                         that contains term names or slugs, or a comma-separated string
+ *                                         of names or slugs. This is because, in hierarchical taxonomy,
+ *                                         child terms can have the same names with different parent terms,
+ *                                         so the only way to connect them is using ID. Default empty.
  *     @type array  $meta_input            Array of post meta values keyed by their post meta key. Default empty.
  * }
  * @param bool  $wp_error         Optional. Whether to return a WP_Error on failure. Default false.

From d802fecf979d90b568e3c84d17d521df200cab38 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sun, 17 Oct 2021 20:29:58 +0000
Subject: [PATCH 211/257] Coding Standards: Consistently escape form action URL
 in `wp-admin/update-core.php`.

Follow-up to [10166], [23739], [25806].

Props sabbirshouvo, mukesh27.
Fixes #54278.

git-svn-id: https://develop.svn.wordpress.org/trunk@51914 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/update-core.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-admin/update-core.php b/src/wp-admin/update-core.php
index 6e23d668666a6..a38e43c46f07e 100644
--- a/src/wp-admin/update-core.php
+++ b/src/wp-admin/update-core.php
@@ -154,7 +154,7 @@ function list_core_update( $update ) {
 	echo $message;
 	echo '</p>';
 
-	echo '<form method="post" action="' . $form_action . '" name="upgrade" class="upgrade">';
+	echo '<form method="post" action="' . esc_url( $form_action ) . '" name="upgrade" class="upgrade">';
 	wp_nonce_field( 'upgrade-core' );
 
 	echo '<p>';

From ad9de4547cdba36567eb609e716dcd4aac4e3e38 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Mon, 18 Oct 2021 11:13:32 +0000
Subject: [PATCH 212/257] REST API: Correct the order of the parameters
 documented for `WP_REST_Server::respond_to_request()`.

See #53399


git-svn-id: https://develop.svn.wordpress.org/trunk@51915 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/rest-api/class-wp-rest-server.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/rest-api/class-wp-rest-server.php b/src/wp-includes/rest-api/class-wp-rest-server.php
index 490b057c24c75..55f0ce6fc89ef 100644
--- a/src/wp-includes/rest-api/class-wp-rest-server.php
+++ b/src/wp-includes/rest-api/class-wp-rest-server.php
@@ -1077,8 +1077,8 @@ protected function match_request_to_handler( $request ) {
 	 * @since 5.6.0
 	 *
 	 * @param WP_REST_Request $request  The request object.
-	 * @param array           $handler  The matched route handler.
 	 * @param string          $route    The matched route regex.
+	 * @param array           $handler  The matched route handler.
 	 * @param WP_Error|null   $response The current error object if any.
 	 * @return WP_REST_Response
 	 */

From 94fb97347f31e4c80ab3e393e9cc68f0aaa89528 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Mon, 18 Oct 2021 12:51:00 +0000
Subject: [PATCH 213/257] Cron: Fix malformed cron array in
 `wp_schedule_single_event()` when `_get_cron_array()` returns `false`.

In `wp_schedule_single_event()`, the cron info array is retrieved via a call to `_get_cron_array()` and straight away cast to an array. But as the documentation for that function (correctly) states, the return type of that function is `array|false`, where `false` is returned for a site where no cron jobs have been scheduled (yet).

In the case that `_get_cron_array()` would return `false`, this would now unintentionally create an array with a single entry with key `0` and as the value `false`.

This is a bug. Fixed now by adding validation to the output of `_get_cron_array()` and initializing `$crons` to an empty array if `false` was returned.

Tests added first to prove the bug (a) was introduced in #44818 [44917] and (b) is now fixed.

Follow-up to [44917].

Props jrf, peterwilsoncc.
Fixes #53950.

git-svn-id: https://develop.svn.wordpress.org/trunk@51916 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/cron.php     |  6 +++++-
 tests/phpunit/tests/cron.php | 25 ++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/cron.php b/src/wp-includes/cron.php
index f4810e55a378b..41efeebc44f18 100644
--- a/src/wp-includes/cron.php
+++ b/src/wp-includes/cron.php
@@ -118,7 +118,11 @@ function wp_schedule_single_event( $timestamp, $hook, $args = array(), $wp_error
 	 * current time) all events scheduled within the next ten minutes
 	 * are considered duplicates.
 	 */
-	$crons     = (array) _get_cron_array();
+	$crons = _get_cron_array();
+	if ( ! is_array( $crons ) ) {
+		$crons = array();
+	}
+
 	$key       = md5( serialize( $event->args ) );
 	$duplicate = false;
 
diff --git a/tests/phpunit/tests/cron.php b/tests/phpunit/tests/cron.php
index 26453c01111d4..2940c1708a56f 100644
--- a/tests/phpunit/tests/cron.php
+++ b/tests/phpunit/tests/cron.php
@@ -100,7 +100,6 @@ function test_schedule_event_args() {
 		$this->assertSame( $recur, wp_get_schedule( $hook, $args ) );
 	}
 
-
 	/**
 	 * Tests that a call to wp_schedule_event() on a site without any scheduled events
 	 * does not result in a PHP deprecation warning on PHP 8.1 or higher.
@@ -125,6 +124,30 @@ function test_wp_schedule_event_without_cron_option_does_not_throw_warning() {
 		$this->assertTrue( wp_schedule_event( $timestamp, 'daily', $hook ) );
 	}
 
+	/**
+	 * Tests that a call to wp_schedule_single_event() on a site without any scheduled events
+	 * does not result in the value "false" being added into the cron array.
+	 *
+	 * @ticket 53950
+	 *
+	 * @covers ::wp_schedule_single_event
+	 */
+	function test_wp_schedule_single_event_without_cron_option() {
+		delete_option( 'cron' );
+
+		// Verify that the cause of the error is in place.
+		$this->assertFalse( _get_cron_array(), '_get_cron_array() does not return false' );
+
+		$hook      = __FUNCTION__;
+		$timestamp = strtotime( '+10 minutes' );
+
+		// Add an event.
+		$this->assertTrue( wp_schedule_single_event( $timestamp, $hook ), 'Scheduling single event failed' );
+
+		// Verify that "false" is not a value in the final cron array.
+		$this->assertNotContains( false, get_option( 'cron' ), 'Resulting cron array contains the value "false"' );
+	}
+
 	function test_unschedule_event() {
 		// Schedule an event and make sure it's returned by wp_next_scheduled().
 		$hook      = __FUNCTION__;

From ac18b68a32410aab56dcd1c9c105adc3ef669de8 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Mon, 18 Oct 2021 13:29:47 +0000
Subject: [PATCH 214/257] Cron: Remove errant `false` values in cron array when
 upgrading to 5.9+.

[51916] fixed a bug where `array( `false` )` was added to the cron array when `_get_cron_array()` returned `false`.

This commit:
* Removes any `false` values from the cron array when upgrading to 5.9+.
* Bumps the database version.

Follow-up to [44917], [51916].

Props peterwilsoncc, jrf.
See #53950.

git-svn-id: https://develop.svn.wordpress.org/trunk@51917 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/upgrade.php | 21 +++++++++++++++++++++
 src/wp-includes/version.php       |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php
index 475608efa7908..b5588197715c3 100644
--- a/src/wp-admin/includes/upgrade.php
+++ b/src/wp-admin/includes/upgrade.php
@@ -832,6 +832,10 @@ function upgrade_all() {
 		upgrade_560();
 	}
 
+	if ( $wp_current_db_version < 51917 ) {
+		upgrade_590();
+	}
+
 	maybe_disable_link_manager();
 
 	maybe_disable_automattic_widgets();
@@ -2248,6 +2252,23 @@ function upgrade_560() {
 	}
 }
 
+/**
+ * Executes changes made in WordPress 5.9.0.
+ *
+ * @ignore
+ * @since 5.9.0
+ */
+function upgrade_590() {
+	global $wp_current_db_version;
+
+	if ( $wp_current_db_version < 51917 ) {
+		$crons = _get_cron_array();
+		// Remove errant `false` values, see #53950.
+		$crons = array_filter( $crons );
+		_set_cron_array( $crons );
+	}
+}
+
 /**
  * Executes network-level upgrade routines.
  *
diff --git a/src/wp-includes/version.php b/src/wp-includes/version.php
index 27e14721a9209..87b8638c0aa42 100644
--- a/src/wp-includes/version.php
+++ b/src/wp-includes/version.php
@@ -23,7 +23,7 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 49752;
+$wp_db_version = 51917;
 
 /**
  * Holds the TinyMCE version.

From 4dae388d32ff20d952f42dc85f4a3cff42fd06e6 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 18 Oct 2021 16:52:51 +0000
Subject: [PATCH 215/257] Coding Standards: Add a leading zero in the CSS
 declarations printed by the `print_emoji_styles()` function.

Follow-up to [31733], [31786].

Props audrasjb, sabernhardt.
Fixes #54284.

git-svn-id: https://develop.svn.wordpress.org/trunk@51918 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/formatting.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/formatting.php b/src/wp-includes/formatting.php
index 4f01c511b03a6..2eccfb0fde3e3 100644
--- a/src/wp-includes/formatting.php
+++ b/src/wp-includes/formatting.php
@@ -5650,7 +5650,7 @@ function print_emoji_styles() {
 	box-shadow: none !important;
 	height: 1em !important;
 	width: 1em !important;
-	margin: 0 .07em !important;
+	margin: 0 0.07em !important;
 	vertical-align: -0.1em !important;
 	background: none !important;
 	padding: 0 !important;

From b0cc77854ffdf7b3d7f298ceec77adecf38c2b30 Mon Sep 17 00:00:00 2001
From: Tonya Mork <hellofromtonya@git.wordpress.org>
Date: Mon, 18 Oct 2021 17:51:17 +0000
Subject: [PATCH 216/257] Coding Standards: Add `public` visibility to methods
 in `src` directory.

This commit adds the `public` visibility keyword to each method which did not have an explicit visibility keyword.

Why `public`?

With no visibility previously declared, these methods are implicitly `public` and available for use. Changing them to anything else would be a backwards-compatibility break.

Props costdev, jrf.
See #54177.

git-svn-id: https://develop.svn.wordpress.org/trunk@51919 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-debug-data.php |  4 +-
 .../class-wp-site-health-auto-updates.php     | 10 ++--
 .../includes/class-wp-site-health.php         |  4 +-
 .../themes/twentyeleven/inc/widgets.php       | 12 ++--
 .../themes/twentyfourteen/inc/widgets.php     |  4 +-
 .../class-wp-customize-manager.php            |  4 +-
 .../class-wp-customize-setting.php            |  2 +-
 src/wp-includes/pomo/entry.php                |  6 +-
 src/wp-includes/pomo/mo.php                   | 26 ++++-----
 src/wp-includes/pomo/po.php                   | 18 +++---
 src/wp-includes/pomo/streams.php              | 48 ++++++++--------
 src/wp-includes/pomo/translations.php         | 56 +++++++++----------
 src/wp-includes/wp-db.php                     |  6 +-
 13 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-debug-data.php b/src/wp-admin/includes/class-wp-debug-data.php
index a343196337cb0..b1e72314c5b26 100644
--- a/src/wp-admin/includes/class-wp-debug-data.php
+++ b/src/wp-admin/includes/class-wp-debug-data.php
@@ -13,7 +13,7 @@ class WP_Debug_Data {
 	 *
 	 * @since 5.2.0
 	 */
-	static function check_for_updates() {
+	public static function check_for_updates() {
 		wp_version_check();
 		wp_update_plugins();
 		wp_update_themes();
@@ -32,7 +32,7 @@ static function check_for_updates() {
 	 *
 	 * @return array The debug data for the site.
 	 */
-	static function debug_data() {
+	public static function debug_data() {
 		global $wpdb;
 
 		// Save few function calls.
diff --git a/src/wp-admin/includes/class-wp-site-health-auto-updates.php b/src/wp-admin/includes/class-wp-site-health-auto-updates.php
index fefdd6f229236..ebc3547165505 100644
--- a/src/wp-admin/includes/class-wp-site-health-auto-updates.php
+++ b/src/wp-admin/includes/class-wp-site-health-auto-updates.php
@@ -156,7 +156,7 @@ public function test_wp_automatic_updates_disabled() {
 	 *
 	 * @return array|false The test results. False if the auto-updates failed.
 	 */
-	function test_if_failed_update() {
+	public function test_if_failed_update() {
 		$failed = get_site_option( 'auto_core_update_failed' );
 
 		if ( ! $failed ) {
@@ -272,7 +272,7 @@ public function test_vcs_abspath() {
 	 *
 	 * @return array The test results.
 	 */
-	function test_check_wp_filesystem_method() {
+	public function test_check_wp_filesystem_method() {
 		// Make sure the `request_filesystem_credentials()` function is available during our REST API call.
 		if ( ! function_exists( 'request_filesystem_credentials' ) ) {
 			require_once ABSPATH . '/wp-admin/includes/file.php';
@@ -306,7 +306,7 @@ function test_check_wp_filesystem_method() {
 	 *
 	 * @return array|false The test results. False if they're not writeable.
 	 */
-	function test_all_files_writable() {
+	public function test_all_files_writable() {
 		global $wp_filesystem;
 
 		require ABSPATH . WPINC . '/version.php'; // $wp_version; // x.y.z
@@ -391,7 +391,7 @@ function test_all_files_writable() {
 	 *
 	 * @return array|false The test results. False if it isn't a development version.
 	 */
-	function test_accepts_dev_updates() {
+	public function test_accepts_dev_updates() {
 		require ABSPATH . WPINC . '/version.php'; // $wp_version; // x.y.z
 		// Only for dev versions.
 		if ( false === strpos( $wp_version, '-' ) ) {
@@ -429,7 +429,7 @@ function test_accepts_dev_updates() {
 	 *
 	 * @return array The test results.
 	 */
-	function test_accepts_minor_updates() {
+	public function test_accepts_minor_updates() {
 		if ( defined( 'WP_AUTO_UPDATE_CORE' ) && false === WP_AUTO_UPDATE_CORE ) {
 			return array(
 				'description' => sprintf(
diff --git a/src/wp-admin/includes/class-wp-site-health.php b/src/wp-admin/includes/class-wp-site-health.php
index 6b0a254476daa..c1431d2f85874 100644
--- a/src/wp-admin/includes/class-wp-site-health.php
+++ b/src/wp-admin/includes/class-wp-site-health.php
@@ -2767,7 +2767,7 @@ public function has_late_cron() {
 	 *
 	 * @return object The test results.
 	 */
-	function detect_plugin_theme_auto_update_issues() {
+	public function detect_plugin_theme_auto_update_issues() {
 		$mock_plugin = (object) array(
 			'id'            => 'w.org/plugins/a-fake-plugin',
 			'slug'          => 'a-fake-plugin',
@@ -2850,7 +2850,7 @@ function detect_plugin_theme_auto_update_issues() {
 	 *
 	 * @return object The test results.
 	 */
-	function can_perform_loopback() {
+	public function can_perform_loopback() {
 		$body    = array( 'site-health' => 'loopback-test' );
 		$cookies = wp_unslash( $_COOKIE );
 		$timeout = 10;
diff --git a/src/wp-content/themes/twentyeleven/inc/widgets.php b/src/wp-content/themes/twentyeleven/inc/widgets.php
index ae28fd41aea38..b84b808a3cae4 100644
--- a/src/wp-content/themes/twentyeleven/inc/widgets.php
+++ b/src/wp-content/themes/twentyeleven/inc/widgets.php
@@ -17,7 +17,7 @@ class Twenty_Eleven_Ephemera_Widget extends WP_Widget {
 	 *
 	 * @since Twenty Eleven 2.2
 	 */
-	function __construct() {
+	public function __construct() {
 		parent::__construct(
 			'widget_twentyeleven_ephemera',
 			__( 'Twenty Eleven Ephemera', 'twentyeleven' ),
@@ -40,7 +40,7 @@ function __construct() {
 	 * @since Twenty Eleven 1.0
 	 * @deprecated Twenty Eleven 2.2
 	 */
-	function Twenty_Eleven_Ephemera_Widget() {
+	public function Twenty_Eleven_Ephemera_Widget() {
 		self::__construct();
 	}
 
@@ -52,7 +52,7 @@ function Twenty_Eleven_Ephemera_Widget() {
 	 * @param array $args     An array of standard parameters for widgets in this theme.
 	 * @param array $instance An array of settings for this widget instance.
 	 */
-	function widget( $args, $instance ) {
+	public function widget( $args, $instance ) {
 		$cache = wp_cache_get( 'widget_twentyeleven_ephemera', 'widget' );
 
 		if ( ! is_array( $cache ) ) {
@@ -158,7 +158,7 @@ function widget( $args, $instance ) {
 	 *
 	 * @since Twenty Eleven 1.0
 	 */
-	function update( $new_instance, $old_instance ) {
+	public function update( $new_instance, $old_instance ) {
 		$instance           = $old_instance;
 		$instance['title']  = strip_tags( $new_instance['title'] );
 		$instance['number'] = (int) $new_instance['number'];
@@ -177,7 +177,7 @@ function update( $new_instance, $old_instance ) {
 	 *
 	 * @since Twenty Eleven 1.0
 	 */
-	function flush_widget_cache() {
+	public function flush_widget_cache() {
 		wp_cache_delete( 'widget_twentyeleven_ephemera', 'widget' );
 	}
 
@@ -188,7 +188,7 @@ function flush_widget_cache() {
 	 *
 	 * @since Twenty Eleven 1.0
 	 */
-	function form( $instance ) {
+	public function form( $instance ) {
 		$title  = isset( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
 		$number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 10;
 		?>
diff --git a/src/wp-content/themes/twentyfourteen/inc/widgets.php b/src/wp-content/themes/twentyfourteen/inc/widgets.php
index 397b2fc0d8b96..48844a3730a7c 100644
--- a/src/wp-content/themes/twentyfourteen/inc/widgets.php
+++ b/src/wp-content/themes/twentyfourteen/inc/widgets.php
@@ -269,7 +269,7 @@ public function widget( $args, $instance ) {
 	 * @param array $old_instance Original widget instance.
 	 * @return array Updated widget instance.
 	 */
-	function update( $new_instance, $old_instance ) {
+	public function update( $new_instance, $old_instance ) {
 		$old_instance['title']  = strip_tags( $new_instance['title'] );
 		$old_instance['number'] = empty( $new_instance['number'] ) ? 2 : absint( $new_instance['number'] );
 
@@ -287,7 +287,7 @@ function update( $new_instance, $old_instance ) {
 	 *
 	 * @param array $instance
 	 */
-	function form( $instance ) {
+	public function form( $instance ) {
 		$title  = ! empty( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
 		$number = ! empty( $instance['number'] ) ? absint( $instance['number'] ) : 2;
 		$format = isset( $instance['format'] ) ? $instance['format'] : '';
diff --git a/src/wp-includes/class-wp-customize-manager.php b/src/wp-includes/class-wp-customize-manager.php
index b0da2b0a843f8..faa9487c30b26 100644
--- a/src/wp-includes/class-wp-customize-manager.php
+++ b/src/wp-includes/class-wp-customize-manager.php
@@ -1185,7 +1185,7 @@ public function changeset_data() {
 	 *
 	 * @param array $starter_content Starter content. Defaults to `get_theme_starter_content()`.
 	 */
-	function import_theme_starter_content( $starter_content = array() ) {
+	public function import_theme_starter_content( $starter_content = array() ) {
 		if ( empty( $starter_content ) ) {
 			$starter_content = get_theme_starter_content();
 		}
@@ -2622,7 +2622,7 @@ public function save() {
 	 *
 	 * @return array|WP_Error Returns array on success and WP_Error with array data on error.
 	 */
-	function save_changeset_post( $args = array() ) {
+	public function save_changeset_post( $args = array() ) {
 
 		$args = array_merge(
 			array(
diff --git a/src/wp-includes/class-wp-customize-setting.php b/src/wp-includes/class-wp-customize-setting.php
index c10285e1c35a3..5d7ee228f1d2f 100644
--- a/src/wp-includes/class-wp-customize-setting.php
+++ b/src/wp-includes/class-wp-customize-setting.php
@@ -268,7 +268,7 @@ protected function aggregate_multidimensional() {
 	 * @since 4.5.0
 	 * @ignore
 	 */
-	static public function reset_aggregated_multidimensionals() {
+	public static function reset_aggregated_multidimensionals() {
 		self::$aggregated_multidimensionals = array();
 	}
 
diff --git a/src/wp-includes/pomo/entry.php b/src/wp-includes/pomo/entry.php
index f0226dbc54a48..d30a4bda13e73 100644
--- a/src/wp-includes/pomo/entry.php
+++ b/src/wp-includes/pomo/entry.php
@@ -40,7 +40,7 @@ class Translation_Entry {
 		 *  - references (array) -- places in the code this strings is used, in relative_to_root_path/file.php:linenum form
 		 *  - flags (array) -- flags like php-format
 		 */
-		function __construct( $args = array() ) {
+		public function __construct( $args = array() ) {
 			// If no singular -- empty object.
 			if ( ! isset( $args['singular'] ) ) {
 				return;
@@ -80,7 +80,7 @@ public function Translation_Entry( $args = array() ) {
 		 *
 		 * @return string|bool the key or false if the entry is empty
 		 */
-		function key() {
+		public function key() {
 			if ( null === $this->singular || '' === $this->singular ) {
 				return false;
 			}
@@ -96,7 +96,7 @@ function key() {
 		/**
 		 * @param object $other
 		 */
-		function merge_with( &$other ) {
+		public function merge_with( &$other ) {
 			$this->flags      = array_unique( array_merge( $this->flags, $other->flags ) );
 			$this->references = array_unique( array_merge( $this->references, $other->references ) );
 			if ( $this->extracted_comments != $other->extracted_comments ) {
diff --git a/src/wp-includes/pomo/mo.php b/src/wp-includes/pomo/mo.php
index dce70c0f0fdc4..dcac16c6b34a3 100644
--- a/src/wp-includes/pomo/mo.php
+++ b/src/wp-includes/pomo/mo.php
@@ -37,7 +37,7 @@ public function get_filename() {
 		 * @param string $filename MO file to load
 		 * @return bool True if the import from file was successful, otherwise false.
 		 */
-		function import_from_file( $filename ) {
+		public function import_from_file( $filename ) {
 			$reader = new POMO_FileReader( $filename );
 
 			if ( ! $reader->is_resource() ) {
@@ -53,7 +53,7 @@ function import_from_file( $filename ) {
 		 * @param string $filename
 		 * @return bool
 		 */
-		function export_to_file( $filename ) {
+		public function export_to_file( $filename ) {
 			$fh = fopen( $filename, 'wb' );
 			if ( ! $fh ) {
 				return false;
@@ -66,7 +66,7 @@ function export_to_file( $filename ) {
 		/**
 		 * @return string|false
 		 */
-		function export() {
+		public function export() {
 			$tmp_fh = fopen( 'php://temp', 'r+' );
 			if ( ! $tmp_fh ) {
 				return false;
@@ -80,7 +80,7 @@ function export() {
 		 * @param Translation_Entry $entry
 		 * @return bool
 		 */
-		function is_entry_good_for_export( $entry ) {
+		public function is_entry_good_for_export( $entry ) {
 			if ( empty( $entry->translations ) ) {
 				return false;
 			}
@@ -96,7 +96,7 @@ function is_entry_good_for_export( $entry ) {
 		 * @param resource $fh
 		 * @return true
 		 */
-		function export_to_file_handle( $fh ) {
+		public function export_to_file_handle( $fh ) {
 			$entries = array_filter( $this->entries, array( $this, 'is_entry_good_for_export' ) );
 			ksort( $entries );
 			$magic                     = 0x950412de;
@@ -157,7 +157,7 @@ function export_to_file_handle( $fh ) {
 		 * @param Translation_Entry $entry
 		 * @return string
 		 */
-		function export_original( $entry ) {
+		public function export_original( $entry ) {
 			// TODO: Warnings for control characters.
 			$exported = $entry->singular;
 			if ( $entry->is_plural ) {
@@ -173,7 +173,7 @@ function export_original( $entry ) {
 		 * @param Translation_Entry $entry
 		 * @return string
 		 */
-		function export_translations( $entry ) {
+		public function export_translations( $entry ) {
 			// TODO: Warnings for control characters.
 			return $entry->is_plural ? implode( "\0", $entry->translations ) : $entry->translations[0];
 		}
@@ -181,7 +181,7 @@ function export_translations( $entry ) {
 		/**
 		 * @return string
 		 */
-		function export_headers() {
+		public function export_headers() {
 			$exported = '';
 			foreach ( $this->headers as $header => $value ) {
 				$exported .= "$header: $value\n";
@@ -193,7 +193,7 @@ function export_headers() {
 		 * @param int $magic
 		 * @return string|false
 		 */
-		function get_byteorder( $magic ) {
+		public function get_byteorder( $magic ) {
 			// The magic is 0x950412de.
 
 			// bug in PHP 5.0.2, see https://savannah.nongnu.org/bugs/?func=detailitem&item_id=10565
@@ -214,7 +214,7 @@ function get_byteorder( $magic ) {
 		 * @param POMO_FileReader $reader
 		 * @return bool True if the import was successful, otherwise false.
 		 */
-		function import_from_reader( $reader ) {
+		public function import_from_reader( $reader ) {
 			$endian_string = MO::get_byteorder( $reader->readint32() );
 			if ( false === $endian_string ) {
 				return false;
@@ -311,7 +311,7 @@ function import_from_reader( $reader ) {
 		 *  0x00 as a plural translations separator
 		 * @return Translation_Entry Entry instance.
 		 */
-		function &make_entry( $original, $translation ) {
+		public function &make_entry( $original, $translation ) {
 			$entry = new Translation_Entry();
 			// Look for context, separated by \4.
 			$parts = explode( "\4", $original );
@@ -335,14 +335,14 @@ function &make_entry( $original, $translation ) {
 		 * @param int $count
 		 * @return string
 		 */
-		function select_plural_form( $count ) {
+		public function select_plural_form( $count ) {
 			return $this->gettext_select_plural_form( $count );
 		}
 
 		/**
 		 * @return int
 		 */
-		function get_plural_forms_count() {
+		public function get_plural_forms_count() {
 			return $this->_nplurals;
 		}
 	}
diff --git a/src/wp-includes/pomo/po.php b/src/wp-includes/pomo/po.php
index e4e5849d20019..667ff65567135 100644
--- a/src/wp-includes/pomo/po.php
+++ b/src/wp-includes/pomo/po.php
@@ -36,7 +36,7 @@ class PO extends Gettext_Translations {
 		 *
 		 * @return string msgid/msgstr PO entry for this PO file headers, doesn't contain newline at the end
 		 */
-		function export_headers() {
+		public function export_headers() {
 			$header_string = '';
 			foreach ( $this->headers as $header => $value ) {
 				$header_string .= "$header: $value\n";
@@ -55,7 +55,7 @@ function export_headers() {
 		 *
 		 * @return string sequence of mgsgid/msgstr PO strings, doesn't containt newline at the end
 		 */
-		function export_entries() {
+		public function export_entries() {
 			// TODO: Sorting.
 			return implode( "\n\n", array_map( array( 'PO', 'export_entry' ), $this->entries ) );
 		}
@@ -66,7 +66,7 @@ function export_entries() {
 		 * @param bool $include_headers whether to include the headers in the export
 		 * @return string ready for inclusion in PO file string for headers and all the enrtries
 		 */
-		function export( $include_headers = true ) {
+		public function export( $include_headers = true ) {
 			$res = '';
 			if ( $include_headers ) {
 				$res .= $this->export_headers();
@@ -83,7 +83,7 @@ function export( $include_headers = true ) {
 		 * @param bool   $include_headers Whether to include the headers in the export.
 		 * @return bool true on success, false on error
 		 */
-		function export_to_file( $filename, $include_headers = true ) {
+		public function export_to_file( $filename, $include_headers = true ) {
 			$fh = fopen( $filename, 'w' );
 			if ( false === $fh ) {
 				return false;
@@ -103,7 +103,7 @@ function export_to_file( $filename, $include_headers = true ) {
 		 *
 		 * @param string $text Text to include as a comment.
 		 */
-		function set_comment_before_headers( $text ) {
+		public function set_comment_before_headers( $text ) {
 			$this->comments_before_headers = $text;
 		}
 
@@ -293,7 +293,7 @@ public static function match_begin_and_end_newlines( $translation, $original ) {
 		 * @param string $filename
 		 * @return bool
 		 */
-		function import_from_file( $filename ) {
+		public function import_from_file( $filename ) {
 			$f = fopen( $filename, 'r' );
 			if ( ! $f ) {
 				return false;
@@ -335,7 +335,7 @@ protected static function is_final( $context ) {
 		 * @param int      $lineno
 		 * @return null|false|array
 		 */
-		function read_entry( $f, $lineno = 0 ) {
+		public function read_entry( $f, $lineno = 0 ) {
 			$entry = new Translation_Entry();
 			// Where were we in the last step.
 			// Can be: comment, msgctxt, msgid, msgid_plural, msgstr, msgstr_plural.
@@ -464,7 +464,7 @@ function read_entry( $f, $lineno = 0 ) {
 		 * @param string   $action
 		 * @return bool
 		 */
-		function read_line( $f, $action = 'read' ) {
+		public function read_line( $f, $action = 'read' ) {
 			static $last_line     = '';
 			static $use_last_line = false;
 			if ( 'clear' === $action ) {
@@ -486,7 +486,7 @@ function read_line( $f, $action = 'read' ) {
 		 * @param Translation_Entry $entry
 		 * @param string            $po_comment_line
 		 */
-		function add_comment_to_entry( &$entry, $po_comment_line ) {
+		public function add_comment_to_entry( &$entry, $po_comment_line ) {
 			$first_two = substr( $po_comment_line, 0, 2 );
 			$comment   = trim( substr( $po_comment_line, 2 ) );
 			if ( '#:' === $first_two ) {
diff --git a/src/wp-includes/pomo/streams.php b/src/wp-includes/pomo/streams.php
index a8a3755681640..e95dc1707670f 100644
--- a/src/wp-includes/pomo/streams.php
+++ b/src/wp-includes/pomo/streams.php
@@ -17,7 +17,7 @@ class POMO_Reader {
 		/**
 		 * PHP5 constructor.
 		 */
-		function __construct() {
+		public function __construct() {
 			if ( function_exists( 'mb_substr' )
 				&& ( (int) ini_get( 'mbstring.func_overload' ) & 2 ) // phpcs:ignore PHPCompatibility.IniDirectives.RemovedIniDirectives.mbstring_func_overloadDeprecated
 			) {
@@ -46,7 +46,7 @@ public function POMO_Reader() {
 		 *
 		 * @param string $endian Set the endianness of the file. Accepts 'big', or 'little'.
 		 */
-		function setEndian( $endian ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid
+		public function setEndian( $endian ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid
 			$this->endian = $endian;
 		}
 
@@ -56,7 +56,7 @@ function setEndian( $endian ) { // phpcs:ignore WordPress.NamingConventions.Vali
 		 * @return mixed The integer, corresponding to the next 32 bits from
 		 *  the stream of false if there are not enough bytes or on error
 		 */
-		function readint32() {
+		public function readint32() {
 			$bytes = $this->read( 4 );
 			if ( 4 != $this->strlen( $bytes ) ) {
 				return false;
@@ -73,7 +73,7 @@ function readint32() {
 		 * @return mixed Array of integers or false if there isn't
 		 *  enough data or on error
 		 */
-		function readint32array( $count ) {
+		public function readint32array( $count ) {
 			$bytes = $this->read( 4 * $count );
 			if ( 4 * $count != $this->strlen( $bytes ) ) {
 				return false;
@@ -88,7 +88,7 @@ function readint32array( $count ) {
 		 * @param int    $length
 		 * @return string
 		 */
-		function substr( $string, $start, $length ) {
+		public function substr( $string, $start, $length ) {
 			if ( $this->is_overloaded ) {
 				return mb_substr( $string, $start, $length, 'ascii' );
 			} else {
@@ -100,7 +100,7 @@ function substr( $string, $start, $length ) {
 		 * @param string $string
 		 * @return int
 		 */
-		function strlen( $string ) {
+		public function strlen( $string ) {
 			if ( $this->is_overloaded ) {
 				return mb_strlen( $string, 'ascii' );
 			} else {
@@ -113,7 +113,7 @@ function strlen( $string ) {
 		 * @param int    $chunk_size
 		 * @return array
 		 */
-		function str_split( $string, $chunk_size ) {
+		public function str_split( $string, $chunk_size ) {
 			if ( ! function_exists( 'str_split' ) ) {
 				$length = $this->strlen( $string );
 				$out    = array();
@@ -129,21 +129,21 @@ function str_split( $string, $chunk_size ) {
 		/**
 		 * @return int
 		 */
-		function pos() {
+		public function pos() {
 			return $this->_pos;
 		}
 
 		/**
 		 * @return true
 		 */
-		function is_resource() {
+		public function is_resource() {
 			return true;
 		}
 
 		/**
 		 * @return true
 		 */
-		function close() {
+		public function close() {
 			return true;
 		}
 	}
@@ -155,7 +155,7 @@ class POMO_FileReader extends POMO_Reader {
 		/**
 		 * @param string $filename
 		 */
-		function __construct( $filename ) {
+		public function __construct( $filename ) {
 			parent::__construct();
 			$this->_f = fopen( $filename, 'rb' );
 		}
@@ -176,7 +176,7 @@ public function POMO_FileReader( $filename ) {
 		 * @param int $bytes
 		 * @return string|false Returns read string, otherwise false.
 		 */
-		function read( $bytes ) {
+		public function read( $bytes ) {
 			return fread( $this->_f, $bytes );
 		}
 
@@ -184,7 +184,7 @@ function read( $bytes ) {
 		 * @param int $pos
 		 * @return bool
 		 */
-		function seekto( $pos ) {
+		public function seekto( $pos ) {
 			if ( -1 == fseek( $this->_f, $pos, SEEK_SET ) ) {
 				return false;
 			}
@@ -195,28 +195,28 @@ function seekto( $pos ) {
 		/**
 		 * @return bool
 		 */
-		function is_resource() {
+		public function is_resource() {
 			return is_resource( $this->_f );
 		}
 
 		/**
 		 * @return bool
 		 */
-		function feof() {
+		public function feof() {
 			return feof( $this->_f );
 		}
 
 		/**
 		 * @return bool
 		 */
-		function close() {
+		public function close() {
 			return fclose( $this->_f );
 		}
 
 		/**
 		 * @return string
 		 */
-		function read_all() {
+		public function read_all() {
 			$all = '';
 			while ( ! $this->feof() ) {
 				$all .= $this->read( 4096 );
@@ -238,7 +238,7 @@ class POMO_StringReader extends POMO_Reader {
 		/**
 		 * PHP5 constructor.
 		 */
-		function __construct( $str = '' ) {
+		public function __construct( $str = '' ) {
 			parent::__construct();
 			$this->_str = $str;
 			$this->_pos = 0;
@@ -260,7 +260,7 @@ public function POMO_StringReader( $str = '' ) {
 		 * @param string $bytes
 		 * @return string
 		 */
-		function read( $bytes ) {
+		public function read( $bytes ) {
 			$data        = $this->substr( $this->_str, $this->_pos, $bytes );
 			$this->_pos += $bytes;
 			if ( $this->strlen( $this->_str ) < $this->_pos ) {
@@ -273,7 +273,7 @@ function read( $bytes ) {
 		 * @param int $pos
 		 * @return int
 		 */
-		function seekto( $pos ) {
+		public function seekto( $pos ) {
 			$this->_pos = $pos;
 			if ( $this->strlen( $this->_str ) < $this->_pos ) {
 				$this->_pos = $this->strlen( $this->_str );
@@ -284,14 +284,14 @@ function seekto( $pos ) {
 		/**
 		 * @return int
 		 */
-		function length() {
+		public function length() {
 			return $this->strlen( $this->_str );
 		}
 
 		/**
 		 * @return string
 		 */
-		function read_all() {
+		public function read_all() {
 			return $this->substr( $this->_str, $this->_pos, $this->strlen( $this->_str ) );
 		}
 
@@ -306,7 +306,7 @@ class POMO_CachedFileReader extends POMO_StringReader {
 		/**
 		 * PHP5 constructor.
 		 */
-		function __construct( $filename ) {
+		public function __construct( $filename ) {
 			parent::__construct();
 			$this->_str = file_get_contents( $filename );
 			if ( false === $this->_str ) {
@@ -348,7 +348,7 @@ public function __construct( $filename ) {
 		 *
 		 * @see POMO_CachedIntFileReader::__construct()
 		 */
-		function POMO_CachedIntFileReader( $filename ) {
+		public function POMO_CachedIntFileReader( $filename ) {
 			_deprecated_constructor( self::class, '5.4.0', static::class );
 			self::__construct( $filename );
 		}
diff --git a/src/wp-includes/pomo/translations.php b/src/wp-includes/pomo/translations.php
index d93c6528f441e..0df56ad4fee8e 100644
--- a/src/wp-includes/pomo/translations.php
+++ b/src/wp-includes/pomo/translations.php
@@ -21,7 +21,7 @@ class Translations {
 		 * @param array|Translation_Entry $entry
 		 * @return bool true on success, false if the entry doesn't have a key
 		 */
-		function add_entry( $entry ) {
+		public function add_entry( $entry ) {
 			if ( is_array( $entry ) ) {
 				$entry = new Translation_Entry( $entry );
 			}
@@ -37,7 +37,7 @@ function add_entry( $entry ) {
 		 * @param array|Translation_Entry $entry
 		 * @return bool
 		 */
-		function add_entry_or_merge( $entry ) {
+		public function add_entry_or_merge( $entry ) {
 			if ( is_array( $entry ) ) {
 				$entry = new Translation_Entry( $entry );
 			}
@@ -63,14 +63,14 @@ function add_entry_or_merge( $entry ) {
 		 * @param string $header header name, without trailing :
 		 * @param string $value header value, without trailing \n
 		 */
-		function set_header( $header, $value ) {
+		public function set_header( $header, $value ) {
 			$this->headers[ $header ] = $value;
 		}
 
 		/**
 		 * @param array $headers
 		 */
-		function set_headers( $headers ) {
+		public function set_headers( $headers ) {
 			foreach ( $headers as $header => $value ) {
 				$this->set_header( $header, $value );
 			}
@@ -79,14 +79,14 @@ function set_headers( $headers ) {
 		/**
 		 * @param string $header
 		 */
-		function get_header( $header ) {
+		public function get_header( $header ) {
 			return isset( $this->headers[ $header ] ) ? $this->headers[ $header ] : false;
 		}
 
 		/**
 		 * @param Translation_Entry $entry
 		 */
-		function translate_entry( &$entry ) {
+		public function translate_entry( &$entry ) {
 			$key = $entry->key();
 			return isset( $this->entries[ $key ] ) ? $this->entries[ $key ] : false;
 		}
@@ -96,7 +96,7 @@ function translate_entry( &$entry ) {
 		 * @param string $context
 		 * @return string
 		 */
-		function translate( $singular, $context = null ) {
+		public function translate( $singular, $context = null ) {
 			$entry      = new Translation_Entry(
 				array(
 					'singular' => $singular,
@@ -118,14 +118,14 @@ function translate( $singular, $context = null ) {
 		 *
 		 * @param int $count number of items
 		 */
-		function select_plural_form( $count ) {
+		public function select_plural_form( $count ) {
 			return 1 == $count ? 0 : 1;
 		}
 
 		/**
 		 * @return int
 		 */
-		function get_plural_forms_count() {
+		public function get_plural_forms_count() {
 			return 2;
 		}
 
@@ -135,7 +135,7 @@ function get_plural_forms_count() {
 		 * @param int    $count
 		 * @param string $context
 		 */
-		function translate_plural( $singular, $plural, $count, $context = null ) {
+		public function translate_plural( $singular, $plural, $count, $context = null ) {
 			$entry              = new Translation_Entry(
 				array(
 					'singular' => $singular,
@@ -161,7 +161,7 @@ function translate_plural( $singular, $plural, $count, $context = null ) {
 		 * @param Object $other Another Translation object, whose translations will be merged in this one (passed by reference).
 		 * @return void
 		 */
-		function merge_with( &$other ) {
+		public function merge_with( &$other ) {
 			foreach ( $other->entries as $entry ) {
 				$this->entries[ $entry->key() ] = $entry;
 			}
@@ -170,7 +170,7 @@ function merge_with( &$other ) {
 		/**
 		 * @param object $other
 		 */
-		function merge_originals_with( &$other ) {
+		public function merge_originals_with( &$other ) {
 			foreach ( $other->entries as $entry ) {
 				if ( ! isset( $this->entries[ $entry->key() ] ) ) {
 					$this->entries[ $entry->key() ] = $entry;
@@ -190,7 +190,7 @@ class Gettext_Translations extends Translations {
 		 *
 		 * @param int $count
 		 */
-		function gettext_select_plural_form( $count ) {
+		public function gettext_select_plural_form( $count ) {
 			if ( ! isset( $this->_gettext_select_plural_form ) || is_null( $this->_gettext_select_plural_form ) ) {
 				list( $nplurals, $expression )     = $this->nplurals_and_expression_from_header( $this->get_header( 'Plural-Forms' ) );
 				$this->_nplurals                   = $nplurals;
@@ -203,7 +203,7 @@ function gettext_select_plural_form( $count ) {
 		 * @param string $header
 		 * @return array
 		 */
-		function nplurals_and_expression_from_header( $header ) {
+		public function nplurals_and_expression_from_header( $header ) {
 			if ( preg_match( '/^\s*nplurals\s*=\s*(\d+)\s*;\s+plural\s*=\s*(.+)$/', $header, $matches ) ) {
 				$nplurals   = (int) $matches[1];
 				$expression = trim( $matches[2] );
@@ -220,7 +220,7 @@ function nplurals_and_expression_from_header( $header ) {
 		 * @param int    $nplurals
 		 * @param string $expression
 		 */
-		function make_plural_form_function( $nplurals, $expression ) {
+		public function make_plural_form_function( $nplurals, $expression ) {
 			try {
 				$handler = new Plural_Forms( rtrim( $expression, ';' ) );
 				return array( $handler, 'get' );
@@ -237,7 +237,7 @@ function make_plural_form_function( $nplurals, $expression ) {
 		 * @param string $expression the expression without parentheses
 		 * @return string the expression with parentheses added
 		 */
-		function parenthesize_plural_exression( $expression ) {
+		public function parenthesize_plural_exression( $expression ) {
 			$expression .= ';';
 			$res         = '';
 			$depth       = 0;
@@ -266,7 +266,7 @@ function parenthesize_plural_exression( $expression ) {
 		 * @param string $translation
 		 * @return array
 		 */
-		function make_headers( $translation ) {
+		public function make_headers( $translation ) {
 			$headers = array();
 			// Sometimes \n's are used instead of real new lines.
 			$translation = str_replace( '\n', "\n", $translation );
@@ -285,7 +285,7 @@ function make_headers( $translation ) {
 		 * @param string $header
 		 * @param string $value
 		 */
-		function set_header( $header, $value ) {
+		public function set_header( $header, $value ) {
 			parent::set_header( $header, $value );
 			if ( 'Plural-Forms' === $header ) {
 				list( $nplurals, $expression )     = $this->nplurals_and_expression_from_header( $this->get_header( 'Plural-Forms' ) );
@@ -304,7 +304,7 @@ class NOOP_Translations {
 		public $entries = array();
 		public $headers = array();
 
-		function add_entry( $entry ) {
+		public function add_entry( $entry ) {
 			return true;
 		}
 
@@ -312,20 +312,20 @@ function add_entry( $entry ) {
 		 * @param string $header
 		 * @param string $value
 		 */
-		function set_header( $header, $value ) {
+		public function set_header( $header, $value ) {
 		}
 
 		/**
 		 * @param array $headers
 		 */
-		function set_headers( $headers ) {
+		public function set_headers( $headers ) {
 		}
 
 		/**
 		 * @param string $header
 		 * @return false
 		 */
-		function get_header( $header ) {
+		public function get_header( $header ) {
 			return false;
 		}
 
@@ -333,7 +333,7 @@ function get_header( $header ) {
 		 * @param Translation_Entry $entry
 		 * @return false
 		 */
-		function translate_entry( &$entry ) {
+		public function translate_entry( &$entry ) {
 			return false;
 		}
 
@@ -341,7 +341,7 @@ function translate_entry( &$entry ) {
 		 * @param string $singular
 		 * @param string $context
 		 */
-		function translate( $singular, $context = null ) {
+		public function translate( $singular, $context = null ) {
 			return $singular;
 		}
 
@@ -349,14 +349,14 @@ function translate( $singular, $context = null ) {
 		 * @param int $count
 		 * @return bool
 		 */
-		function select_plural_form( $count ) {
+		public function select_plural_form( $count ) {
 			return 1 == $count ? 0 : 1;
 		}
 
 		/**
 		 * @return int
 		 */
-		function get_plural_forms_count() {
+		public function get_plural_forms_count() {
 			return 2;
 		}
 
@@ -366,14 +366,14 @@ function get_plural_forms_count() {
 		 * @param int    $count
 		 * @param string $context
 		 */
-		function translate_plural( $singular, $plural, $count, $context = null ) {
+		public function translate_plural( $singular, $plural, $count, $context = null ) {
 			return 1 == $count ? $singular : $plural;
 		}
 
 		/**
 		 * @param object $other
 		 */
-		function merge_with( &$other ) {
+		public function merge_with( &$other ) {
 		}
 	}
 endif;
diff --git a/src/wp-includes/wp-db.php b/src/wp-includes/wp-db.php
index 13efeb0eaaf3a..53ba207203944 100644
--- a/src/wp-includes/wp-db.php
+++ b/src/wp-includes/wp-db.php
@@ -1216,7 +1216,7 @@ public function select( $db, $dbh = null ) {
 	 * @param string $string
 	 * @return string
 	 */
-	function _weak_escape( $string ) {
+	public function _weak_escape( $string ) {
 		if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) ) {
 			_deprecated_function( __METHOD__, '3.6.0', 'wpdb::prepare() or esc_sql()' );
 		}
@@ -1234,7 +1234,7 @@ function _weak_escape( $string ) {
 	 * @param string $string String to escape.
 	 * @return string Escaped string.
 	 */
-	function _real_escape( $string ) {
+	public function _real_escape( $string ) {
 		if ( ! is_scalar( $string ) ) {
 			return '';
 		}
@@ -2331,7 +2331,7 @@ public function replace( $table, $data, $format = null ) {
 	 *                             Default 'INSERT'.
 	 * @return int|false The number of rows affected, or false on error.
 	 */
-	function _insert_replace_helper( $table, $data, $format = null, $type = 'INSERT' ) {
+	public function _insert_replace_helper( $table, $data, $format = null, $type = 'INSERT' ) {
 		$this->insert_id = 0;
 
 		if ( ! in_array( strtoupper( $type ), array( 'REPLACE', 'INSERT' ), true ) ) {

From 40fd54aedee161cbfa10d352053082ccc1d2c02a Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 19 Oct 2021 23:07:42 +0000
Subject: [PATCH 217/257] Help/About: Don't output empty `<span>` tags on
 Credits screen.

If the contributor does not have a title, the empty tags are not necessary.

Follow-up to [17877], [17909], [17942], [18162], [19143], [46709].

Props sayedulsayem, audrasjb, mukesh27.
Fixes #54275.

git-svn-id: https://develop.svn.wordpress.org/trunk@51920 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/credits.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-admin/includes/credits.php b/src/wp-admin/includes/credits.php
index c6ff5e79ea238..833b676cec812 100644
--- a/src/wp-admin/includes/credits.php
+++ b/src/wp-admin/includes/credits.php
@@ -154,7 +154,7 @@ function wp_credits_section_list( $credits = array(), $slug = '' ) {
 				$data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size * 2 ) );
 				echo '<span class="wp-person-avatar"><img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="" /></span>' . "\n";
 				echo esc_html( $person_data[0] ) . "</a>\n\t";
-				if ( ! $compact ) {
+				if ( ! $compact && ! empty( $person_data[3] ) ) {
 					// phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
 					echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
 				}

From cbf2a1968f28f9bc3189a23d0b1c8d2d827d200a Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Wed, 20 Oct 2021 14:40:47 +0000
Subject: [PATCH 218/257] Build/Test Tools: Modify the Slack notifications
 workflow to be a reusable one.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The ability to reuse workflow files within GitHub Action workflows was recently added and allows for less code duplication.

In the context of WordPress Core, this also eliminates the need for an additional “Slack Notifications” workflow to run for every completed workflow.

See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51921 602fd350-edb4-49c9-b593-d223f7449a82
---
 .github/workflows/coding-standards.yml    |  6 ++
 .github/workflows/end-to-end-tests.yml    |  6 ++
 .github/workflows/javascript-tests.yml    |  6 ++
 .github/workflows/php-compatibility.yml   |  6 ++
 .github/workflows/phpunit-tests.yml       |  6 ++
 .github/workflows/slack-notifications.yml | 72 +++++++++++++----------
 .github/workflows/test-coverage.yml       |  6 ++
 .github/workflows/test-npm.yml            |  6 ++
 .github/workflows/test-old-branches.yml   |  6 ++
 9 files changed, 89 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index 8edb2f281f7d2..c111159d660fc 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -146,3 +146,9 @@ jobs:
 
       - name: Ensure version-controlled files are not modified or deleted
         run: git diff --exit-code
+
+  slack-notifications:
+    name: Slack Notifications
+    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
+    needs: [ phpcs, jshint ]
+    if: ${{ always() }}
diff --git a/.github/workflows/end-to-end-tests.yml b/.github/workflows/end-to-end-tests.yml
index 9358fc9520b1e..e74a0f36aa2be 100644
--- a/.github/workflows/end-to-end-tests.yml
+++ b/.github/workflows/end-to-end-tests.yml
@@ -116,3 +116,9 @@ jobs:
 
       - name: Ensure version-controlled files are not modified or deleted
         run: git diff --exit-code
+
+  slack-notifications:
+    name: Slack Notifications
+    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
+    needs: [ e2e-tests ]
+    if: ${{ always() }}
diff --git a/.github/workflows/javascript-tests.yml b/.github/workflows/javascript-tests.yml
index b1226baccac0b..8373ff66d6fe4 100644
--- a/.github/workflows/javascript-tests.yml
+++ b/.github/workflows/javascript-tests.yml
@@ -85,3 +85,9 @@ jobs:
 
       - name: Ensure version-controlled files are not modified or deleted
         run: git diff --exit-code
+
+  slack-notifications:
+    name: Slack Notifications
+    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
+    needs: [ test-js ]
+    if: ${{ always() }}
diff --git a/.github/workflows/php-compatibility.yml b/.github/workflows/php-compatibility.yml
index b5316fd1a639c..a6b38f7ff5b5f 100644
--- a/.github/workflows/php-compatibility.yml
+++ b/.github/workflows/php-compatibility.yml
@@ -87,3 +87,9 @@ jobs:
 
       - name: Ensure version-controlled files are not modified or deleted
         run: git diff --exit-code
+
+  slack-notifications:
+    name: Slack Notifications
+    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
+    needs: [ php-compatibility ]
+    if: ${{ always() }}
diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
index ae6abc3ce7518..936c73ce63940 100644
--- a/.github/workflows/phpunit-tests.yml
+++ b/.github/workflows/phpunit-tests.yml
@@ -242,3 +242,9 @@ jobs:
         env:
           WPT_REPORT_API_KEY: "${{ secrets.WPT_REPORT_API_KEY }}"
         run: docker-compose run --rm -e WPT_REPORT_API_KEY -e WPT_PREPARE_DIR=/var/www -e WPT_TEST_DIR=/var/www php php test-runner/report.php
+
+  slack-notifications:
+    name: Slack Notifications
+    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
+    needs: [ test-php ]
+    if: ${{ always() }}
diff --git a/.github/workflows/slack-notifications.yml b/.github/workflows/slack-notifications.yml
index 2be16eb6efdca..7611f72255072 100644
--- a/.github/workflows/slack-notifications.yml
+++ b/.github/workflows/slack-notifications.yml
@@ -1,26 +1,12 @@
 ##
-# Posts messages to the Making WordPress Core Slack Instance by
-# submitting data to Slack webhook URLs received by Slack Workflows.
+# A reusable workflow for posting messages to the Making WordPress
+# Core Slack Instance by submitting data to Slack webhook URLs
+# received by Slack Workflows.
 ##
 name: Slack Notifications
 
 on:
-  workflow_run:
-    workflows:
-      - Code Coverage Report
-      - Coding Standards
-      - End-to-end Tests
-      - JavaScript Tests
-      - PHP Compatibility
-      - PHPUnit Tests
-      - Test NPM
-      - Test old branches
-    types:
-      - completed
-    branches:
-      - master
-      - trunk
-      - '[3-9].[0-9]'
+  workflow_call:
 
 jobs:
   # Gathers the details needed for Slack notifications.
@@ -41,20 +27,44 @@ jobs:
       payload: ${{ steps.create-payload.outputs.payload }}
 
     steps:
+      - name: Get the workflow ID
+        id: current-workflow-id
+        uses: actions/github-script@441359b1a30438de65712c2fbca0abe4816fa667 # v5.0.0
+        with:
+          script: |
+            const workflow_run = await github.actions.getWorkflowRun({
+              owner: '${{ github.repository_owner }}',
+              repo: 'wordpress-develop',
+              run_id: ${{ github.run_id }},
+            });
+            return workflow_run.data.workflow_id;
+
+      - name: Get the workflow URL
+        id: current-workflow-url
+        uses: actions/github-script@441359b1a30438de65712c2fbca0abe4816fa667 # v5.0.0
+        with:
+          script: |
+            const workflow_run = await github.actions.getWorkflowRun({
+              owner: '${{ github.repository_owner }}',
+              repo: 'wordpress-develop',
+              run_id: ${{ github.run_id }},
+            });
+            return workflow_run.data.html_url;
+
       - name: Get details about the previous workflow run
         id: previous-result
-        uses: actions/github-script@a3e7071a34d7e1f219a8a4de9a5e0a34d1ee1293 # v4.0.2
+        uses: actions/github-script@441359b1a30438de65712c2fbca0abe4816fa667 # v5.0.0
         with:
           script: |
-            const workflow_runs = await github.actions.listWorkflowRuns({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              workflow_id: ${{ github.event.workflow_run.workflow_id }},
-              branch: '${{ github.event.workflow_run.head_branch }}',
+            const previous_runs = await github.actions.listWorkflowRuns({
+              owner: '${{ github.repository_owner }}',
+              repo: 'wordpress-develop',
+              workflow_id: ${{ steps.current-workflow-id.outputs.result }},
+              branch: '${{ github.ref_name }}',
               per_page: 1,
               page: 2,
             });
-            return workflow_runs.data.workflow_runs[0].conclusion;
+            return previous_runs.data.workflow_runs[0].conclusion;
 
       - name: Store previous conclusion as an output
         id: previous-conclusion
@@ -64,21 +74,21 @@ jobs:
         id: commit-message
         run: |
           COMMIT_MESSAGE=$(cat <<'EOF' | awk 'NR==1' | sed 's/`/\\`/g' | sed 's/\"/\\\\"/g'
-          ${{ github.event.workflow_run.head_commit.message }}
+          ${{ github.event.head_commit.message }}
           EOF
           )
           echo "::set-output name=commit_message_escaped::${COMMIT_MESSAGE}"
 
       - name: Construct payload and store as an output
         id: create-payload
-        run: echo "::set-output name=payload::{\"workflow_name\":\"${{ github.event.workflow_run.name }}\",\"ref_name\":\"${{ github.event.workflow_run.head_branch }}\",\"run_url\":\"${{ github.event.workflow_run.html_url }}\",\"commit_message\":\"${{ steps.commit-message.outputs.commit_message_escaped }}\"}"
+        run: echo "::set-output name=payload::{\"workflow_name\":\"${{ github.workflow }}\",\"ref_name\":\"${{ github.ref_name }}\",\"run_url\":\"${{ steps.current-workflow-url.outputs.result }}\",\"commit_message\":\"${{ steps.commit-message.outputs.commit_message_escaped }}\"}"
 
   # Posts notifications when a workflow fails.
   failure:
     name: Failure notifications
     runs-on: ubuntu-latest
     needs: [ prepare ]
-    if: ${{ github.event.workflow_run.conclusion == 'failure' }}
+    if: ${{ failure() }}
 
     steps:
       - name: Post failure notifications to Slack
@@ -93,7 +103,7 @@ jobs:
     name: Fixed notifications
     runs-on: ubuntu-latest
     needs: [ prepare ]
-    if: ${{ needs.prepare.outputs.previous_conclusion == 'failure' && github.event.workflow_run.conclusion == 'success' }}
+    if: ${{ needs.prepare.outputs.previous_conclusion == 'failure' && success() }}
 
     steps:
       - name: Post failure notifications to Slack
@@ -108,7 +118,7 @@ jobs:
     name: Success notifications
     runs-on: ubuntu-latest
     needs: [ prepare ]
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    if: ${{ success() }}
 
     steps:
       - name: Post success notifications to Slack
@@ -123,7 +133,7 @@ jobs:
     name: Cancelled notifications
     runs-on: ubuntu-latest
     needs: [ prepare ]
-    if: ${{ github.event.workflow_run.conclusion == 'cancelled' }}
+    if: ${{ cancelled() }}
 
     steps:
       - name: Post cancelled notifications to Slack
diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml
index 31f20b8bd3e71..a0abd2fb2a287 100644
--- a/.github/workflows/test-coverage.yml
+++ b/.github/workflows/test-coverage.yml
@@ -168,3 +168,9 @@ jobs:
         with:
           file: wp-code-coverage-multisite-clover-${{ github.sha }}.xml
           flags: multisite,php
+
+  slack-notifications:
+    name: Slack Notifications
+    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
+    needs: [ test-coverage-report ]
+    if: ${{ always() }}
diff --git a/.github/workflows/test-npm.yml b/.github/workflows/test-npm.yml
index 3774ee2851876..2a121f8efb8be 100644
--- a/.github/workflows/test-npm.yml
+++ b/.github/workflows/test-npm.yml
@@ -154,3 +154,9 @@ jobs:
 
       - name: Ensure version-controlled files are not modified or deleted during building and cleaning
         run: git diff --exit-code
+
+  slack-notifications:
+    name: Slack Notifications
+    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
+    needs: [ test-npm, test-npm-macos ]
+    if: ${{ always() }}
diff --git a/.github/workflows/test-old-branches.yml b/.github/workflows/test-old-branches.yml
index 2bb5664a987be..86b879ad79fe9 100644
--- a/.github/workflows/test-old-branches.yml
+++ b/.github/workflows/test-old-branches.yml
@@ -69,3 +69,9 @@ jobs:
               workflow_id: '${{ matrix.workflow }}',
               ref: '${{ matrix.branch }}'
             });
+
+  slack-notifications:
+    name: Slack Notifications
+    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
+    needs: [ dispatch-workflows-for-old-branches ]
+    if: ${{ always() }}

From caec0f8b4c7d86b9adfe2f2603075be478555ca7 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Wed, 20 Oct 2021 15:35:13 +0000
Subject: [PATCH 219/257] Build/Test Tools: Adjustments as a follow up to
 [51921].

This adjusts the syntax for using the `github-scripts` action.

See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51922 602fd350-edb4-49c9-b593-d223f7449a82
---
 .github/workflows/slack-notifications.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/slack-notifications.yml b/.github/workflows/slack-notifications.yml
index 7611f72255072..6bb5c1f6d3dcf 100644
--- a/.github/workflows/slack-notifications.yml
+++ b/.github/workflows/slack-notifications.yml
@@ -32,7 +32,7 @@ jobs:
         uses: actions/github-script@441359b1a30438de65712c2fbca0abe4816fa667 # v5.0.0
         with:
           script: |
-            const workflow_run = await github.actions.getWorkflowRun({
+            const workflow_run = await github.rest.actions.getWorkflowRun({
               owner: '${{ github.repository_owner }}',
               repo: 'wordpress-develop',
               run_id: ${{ github.run_id }},
@@ -44,7 +44,7 @@ jobs:
         uses: actions/github-script@441359b1a30438de65712c2fbca0abe4816fa667 # v5.0.0
         with:
           script: |
-            const workflow_run = await github.actions.getWorkflowRun({
+            const workflow_run = await github.rest.actions.getWorkflowRun({
               owner: '${{ github.repository_owner }}',
               repo: 'wordpress-develop',
               run_id: ${{ github.run_id }},
@@ -56,7 +56,7 @@ jobs:
         uses: actions/github-script@441359b1a30438de65712c2fbca0abe4816fa667 # v5.0.0
         with:
           script: |
-            const previous_runs = await github.actions.listWorkflowRuns({
+            const previous_runs = await github.rest.actions.listWorkflowRuns({
               owner: '${{ github.repository_owner }}',
               repo: 'wordpress-develop',
               workflow_id: ${{ steps.current-workflow-id.outputs.result }},

From 85d529d10076ad57a6395c217a988510c5e9c4a0 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 20 Oct 2021 19:17:00 +0000
Subject: [PATCH 220/257] Coding Standards: Improve escaping in
 `wp-admin/theme-install.php`.

* Rename a duplicate `$feature_name` variable to `$feature_group` for clarity.
* Escape the remaining `$feature_name` variable.

Follow-up to [27636], [35273].

Props sabbirshouvo, sabernhardt, mukesh27, afragen.
Fixes #54277.

git-svn-id: https://develop.svn.wordpress.org/trunk@51923 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/theme-install.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/wp-admin/theme-install.php b/src/wp-admin/theme-install.php
index 4f0ba2ad662de..cd3a607ea91fd 100644
--- a/src/wp-admin/theme-install.php
+++ b/src/wp-admin/theme-install.php
@@ -221,15 +221,14 @@
 		// and to ensure tags are translated.
 		$feature_list = get_theme_feature_list( false );
 
-		foreach ( $feature_list as $feature_name => $features ) {
+		foreach ( $feature_list as $feature_group => $features ) {
 			echo '<fieldset class="filter-group">';
-			$feature_name = esc_html( $feature_name );
-			echo '<legend>' . $feature_name . '</legend>';
+			echo '<legend>' . esc_html( $feature_group ) . '</legend>';
 			echo '<div class="filter-group-feature">';
 			foreach ( $features as $feature => $feature_name ) {
 				$feature = esc_attr( $feature );
 				echo '<input type="checkbox" id="filter-id-' . $feature . '" value="' . $feature . '" /> ';
-				echo '<label for="filter-id-' . $feature . '">' . $feature_name . '</label>';
+				echo '<label for="filter-id-' . $feature . '">' . esc_html( $feature_name ) . '</label>';
 			}
 			echo '</div>';
 			echo '</fieldset>';

From 3b618332aff053f0e06d11875e0161fd945609e2 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Wed, 20 Oct 2021 19:25:12 +0000
Subject: [PATCH 221/257] Build/Test Tools: Pass required secrets to the Slack
 notifications workflow.

Secrets are not available within callable workflows by default. They must be defined within the callable workflow, and passed from the calling workflow.

Follow up to [51921-51922].

See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51924 602fd350-edb4-49c9-b593-d223f7449a82
---
 .github/workflows/coding-standards.yml    |  5 +++++
 .github/workflows/end-to-end-tests.yml    |  5 +++++
 .github/workflows/javascript-tests.yml    |  5 +++++
 .github/workflows/php-compatibility.yml   |  5 +++++
 .github/workflows/phpunit-tests.yml       |  5 +++++
 .github/workflows/slack-notifications.yml | 13 +++++++++++++
 .github/workflows/test-coverage.yml       |  5 +++++
 .github/workflows/test-npm.yml            |  5 +++++
 .github/workflows/test-old-branches.yml   |  5 +++++
 9 files changed, 53 insertions(+)

diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index c111159d660fc..009d5acf5a245 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -152,3 +152,8 @@ jobs:
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
     needs: [ phpcs, jshint ]
     if: ${{ always() }}
+    with:
+      SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
+      SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
+      SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
+      SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
diff --git a/.github/workflows/end-to-end-tests.yml b/.github/workflows/end-to-end-tests.yml
index e74a0f36aa2be..fc41233eda5ec 100644
--- a/.github/workflows/end-to-end-tests.yml
+++ b/.github/workflows/end-to-end-tests.yml
@@ -122,3 +122,8 @@ jobs:
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
     needs: [ e2e-tests ]
     if: ${{ always() }}
+    secrets:
+      SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
+      SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
+      SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
+      SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
diff --git a/.github/workflows/javascript-tests.yml b/.github/workflows/javascript-tests.yml
index 8373ff66d6fe4..073f5bbd498ef 100644
--- a/.github/workflows/javascript-tests.yml
+++ b/.github/workflows/javascript-tests.yml
@@ -91,3 +91,8 @@ jobs:
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
     needs: [ test-js ]
     if: ${{ always() }}
+    secrets:
+      SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
+      SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
+      SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
+      SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
diff --git a/.github/workflows/php-compatibility.yml b/.github/workflows/php-compatibility.yml
index a6b38f7ff5b5f..30b2f5f00119b 100644
--- a/.github/workflows/php-compatibility.yml
+++ b/.github/workflows/php-compatibility.yml
@@ -93,3 +93,8 @@ jobs:
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
     needs: [ php-compatibility ]
     if: ${{ always() }}
+    secrets:
+      SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
+      SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
+      SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
+      SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
index 936c73ce63940..22d98f3f4ac5b 100644
--- a/.github/workflows/phpunit-tests.yml
+++ b/.github/workflows/phpunit-tests.yml
@@ -248,3 +248,8 @@ jobs:
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
     needs: [ test-php ]
     if: ${{ always() }}
+    secrets:
+      SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
+      SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
+      SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
+      SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
diff --git a/.github/workflows/slack-notifications.yml b/.github/workflows/slack-notifications.yml
index 6bb5c1f6d3dcf..ce8696608ffbe 100644
--- a/.github/workflows/slack-notifications.yml
+++ b/.github/workflows/slack-notifications.yml
@@ -7,6 +7,19 @@ name: Slack Notifications
 
 on:
   workflow_call:
+    secrets:
+      SLACK_GHA_SUCCESS_WEBHOOK:
+        description: 'The Slack webhook URL for a successful build.'
+        required: true
+      SLACK_GHA_CANCELLED_WEBHOOK:
+        description: 'The Slack webhook URL for a cancelled build.'
+        required: true
+      SLACK_GHA_FIXED_WEBHOOK:
+        description: 'The Slack webhook URL for a fixed build.'
+        required: true
+      SLACK_GHA_FAILURE_WEBHOOK:
+        description: 'The Slack webhook URL for a failed build.'
+        required: true
 
 jobs:
   # Gathers the details needed for Slack notifications.
diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml
index a0abd2fb2a287..7d3cdbcd3da67 100644
--- a/.github/workflows/test-coverage.yml
+++ b/.github/workflows/test-coverage.yml
@@ -174,3 +174,8 @@ jobs:
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
     needs: [ test-coverage-report ]
     if: ${{ always() }}
+    secrets:
+      SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
+      SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
+      SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
+      SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
diff --git a/.github/workflows/test-npm.yml b/.github/workflows/test-npm.yml
index 2a121f8efb8be..d2af984d25e47 100644
--- a/.github/workflows/test-npm.yml
+++ b/.github/workflows/test-npm.yml
@@ -160,3 +160,8 @@ jobs:
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
     needs: [ test-npm, test-npm-macos ]
     if: ${{ always() }}
+    secrets:
+      SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
+      SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
+      SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
+      SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
diff --git a/.github/workflows/test-old-branches.yml b/.github/workflows/test-old-branches.yml
index 86b879ad79fe9..5d19130b26eab 100644
--- a/.github/workflows/test-old-branches.yml
+++ b/.github/workflows/test-old-branches.yml
@@ -75,3 +75,8 @@ jobs:
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
     needs: [ dispatch-workflows-for-old-branches ]
     if: ${{ always() }}
+    secrets:
+      SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
+      SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
+      SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
+      SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}

From d428a5b632f5fd927828f2b4294a16f884e2c8b8 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Wed, 20 Oct 2021 19:51:00 +0000
Subject: [PATCH 222/257] Build/Test Tools: Fix syntax for passing secrets to a
 called workflow.

Follow up to [51923].

See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51925 602fd350-edb4-49c9-b593-d223f7449a82
---
 .github/workflows/coding-standards.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index 009d5acf5a245..03e6277cd6417 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -152,7 +152,7 @@ jobs:
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
     needs: [ phpcs, jshint ]
     if: ${{ always() }}
-    with:
+    secrets:
       SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
       SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
       SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}

From 1cf97a3c1479f90a86450f19bd361c71f4b999e3 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Thu, 21 Oct 2021 18:17:20 +0000
Subject: [PATCH 223/257] Coding Standards: Improve escaping in
 `wp_login_form()`.

* Split long concatenated lines using `sprintf()`. This aims to improve readability and avoid multiple `esc_attr()` calls for the same value.
* Escape the form `name` and `id` attributes.

Follow-up to [12696], [18444], [19033].

Props sabbirshouvo, mukesh27, audrasjb, henry.wright, SergeyBiryukov.
Fixes #54279.

git-svn-id: https://develop.svn.wordpress.org/trunk@51926 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/general-template.php | 63 +++++++++++++++++++---------
 1 file changed, 44 insertions(+), 19 deletions(-)

diff --git a/src/wp-includes/general-template.php b/src/wp-includes/general-template.php
index 41b0a174c03fa..4ab79e8ddc48d 100644
--- a/src/wp-includes/general-template.php
+++ b/src/wp-includes/general-template.php
@@ -576,25 +576,50 @@ function wp_login_form( $args = array() ) {
 	 */
 	$login_form_bottom = apply_filters( 'login_form_bottom', '', $args );
 
-	$form = '
-		<form name="' . $args['form_id'] . '" id="' . $args['form_id'] . '" action="' . esc_url( site_url( 'wp-login.php', 'login_post' ) ) . '" method="post">
-			' . $login_form_top . '
-			<p class="login-username">
-				<label for="' . esc_attr( $args['id_username'] ) . '">' . esc_html( $args['label_username'] ) . '</label>
-				<input type="text" name="log" id="' . esc_attr( $args['id_username'] ) . '" class="input" value="' . esc_attr( $args['value_username'] ) . '" size="20" />
-			</p>
-			<p class="login-password">
-				<label for="' . esc_attr( $args['id_password'] ) . '">' . esc_html( $args['label_password'] ) . '</label>
-				<input type="password" name="pwd" id="' . esc_attr( $args['id_password'] ) . '" class="input" value="" size="20" />
-			</p>
-			' . $login_form_middle . '
-			' . ( $args['remember'] ? '<p class="login-remember"><label><input name="rememberme" type="checkbox" id="' . esc_attr( $args['id_remember'] ) . '" value="forever"' . ( $args['value_remember'] ? ' checked="checked"' : '' ) . ' /> ' . esc_html( $args['label_remember'] ) . '</label></p>' : '' ) . '
-			<p class="login-submit">
-				<input type="submit" name="wp-submit" id="' . esc_attr( $args['id_submit'] ) . '" class="button button-primary" value="' . esc_attr( $args['label_log_in'] ) . '" />
-				<input type="hidden" name="redirect_to" value="' . esc_url( $args['redirect'] ) . '" />
-			</p>
-			' . $login_form_bottom . '
-		</form>';
+	$form =
+		sprintf(
+			'<form name="%1$s" id="%1$s" action="%2$s" method="post">',
+			esc_attr( $args['form_id'] ),
+			esc_url( site_url( 'wp-login.php', 'login_post' ) )
+		) .
+		$login_form_top .
+		sprintf(
+			'<p class="login-username">
+				<label for="%1$s">%2$s</label>
+				<input type="text" name="log" id="%1$s" class="input" value="%3$s" size="20" />
+			</p>',
+			esc_attr( $args['id_username'] ),
+			esc_html( $args['label_username'] ),
+			esc_attr( $args['value_username'] )
+		) .
+		sprintf(
+			'<p class="login-password">
+				<label for="%1$s">%2$s</label>
+				<input type="password" name="pwd" id="%1$s" class="input" value="" size="20" />
+			</p>',
+			esc_attr( $args['id_password'] ),
+			esc_html( $args['label_password'] )
+		) .
+		$login_form_middle .
+		( $args['remember'] ?
+			sprintf(
+				'<p class="login-remember"><label><input name="rememberme" type="checkbox" id="%1$s" value="forever"%2$s /> %3$s</label></p>',
+				esc_attr( $args['id_remember'] ),
+				( $args['value_remember'] ? ' checked="checked"' : '' ),
+				esc_html( $args['label_remember'] )
+			) : ''
+		) .
+		sprintf(
+			'<p class="login-submit">
+				<input type="submit" name="wp-submit" id="%1$s" class="button button-primary" value="%2$s" />
+				<input type="hidden" name="redirect_to" value="%3$s" />
+			</p>',
+			esc_attr( $args['id_submit'] ),
+			esc_attr( $args['label_log_in'] ),
+			esc_url( $args['redirect'] )
+		) .
+		$login_form_bottom .
+		'</form>';
 
 	if ( $args['echo'] ) {
 		echo $form;

From 7fb3aa1597a38664d738bca88e37b560e36e6d6b Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Fri, 22 Oct 2021 16:08:10 +0000
Subject: [PATCH 224/257] Coding Standards: Escape `id` attributes in
 `WP_Customize_Control::render_content()` and `::print_template()`.

Follow-up to [30014], [38906].

Props sabbirshouvo.
See #54295.

git-svn-id: https://develop.svn.wordpress.org/trunk@51927 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-customize-control.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wp-includes/class-wp-customize-control.php b/src/wp-includes/class-wp-customize-control.php
index ca82dff71e8b9..dc6d4758df0b2 100644
--- a/src/wp-includes/class-wp-customize-control.php
+++ b/src/wp-includes/class-wp-customize-control.php
@@ -632,8 +632,8 @@ protected function render_content() {
 						?>
 					</button>
 					<div class="new-content-item">
-						<label for="create-input-<?php echo $this->id; ?>"><span class="screen-reader-text"><?php _e( 'New page title' ); ?></span></label>
-						<input type="text" id="create-input-<?php echo $this->id; ?>" class="create-item-input" placeholder="<?php esc_attr_e( 'New page title&hellip;' ); ?>">
+						<label for="create-input-<?php echo esc_attr( $this->id ); ?>"><span class="screen-reader-text"><?php _e( 'New page title' ); ?></span></label>
+						<input type="text" id="create-input-<?php echo esc_attr( $this->id ); ?>" class="create-item-input" placeholder="<?php esc_attr_e( 'New page title&hellip;' ); ?>">
 						<button type="button" class="button add-content"><?php _e( 'Add' ); ?></button>
 					</div>
 				<?php endif; ?>
@@ -675,7 +675,7 @@ protected function render_content() {
 	 */
 	final public function print_template() {
 		?>
-		<script type="text/html" id="tmpl-customize-control-<?php echo $this->type; ?>-content">
+		<script type="text/html" id="tmpl-customize-control-<?php echo esc_attr( $this->type ); ?>-content">
 			<?php $this->content_template(); ?>
 		</script>
 		<?php

From a1a11d6cebd379e8ba95727fafd945f483f5114c Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sat, 23 Oct 2021 12:36:15 +0000
Subject: [PATCH 225/257] Tests: Add `@ticket` references for `page_on_front`
 canonical tests.

Follow-up to [669/tests], [849/tests], [36238], [47760].

See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51928 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/canonical/pageOnFront.php | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/phpunit/tests/canonical/pageOnFront.php b/tests/phpunit/tests/canonical/pageOnFront.php
index 8f6488a9ab2f2..64058ab4fe664 100644
--- a/tests/phpunit/tests/canonical/pageOnFront.php
+++ b/tests/phpunit/tests/canonical/pageOnFront.php
@@ -51,21 +51,21 @@ function data() {
 		 */
 		return array(
 			// Check against an odd redirect.
-			array( '/page/2/', '/page/2/' ),
-			array( '/?page=2', '/page/2/' ),
-			array( '/page/1/', '/' ),
-			array( '/?page=1', '/' ),
+			array( '/page/2/', '/page/2/', 20385 ),
+			array( '/?page=2', '/page/2/', 35344 ),
+			array( '/page/1/', '/', 35344 ),
+			array( '/?page=1', '/', 35344 ),
 
 			// The page designated as the front page should redirect to the front of the site.
-			array( '/front-page/', '/' ),
+			array( '/front-page/', '/', 20385 ),
 			// The front page supports the <!--nextpage--> pagination.
-			array( '/front-page/2/', '/page/2/' ),
-			array( '/front-page/?page=2', '/page/2/' ),
+			array( '/front-page/2/', '/page/2/', 35344 ),
+			array( '/front-page/?page=2', '/page/2/', 35344 ),
 			// The posts page does not support the <!--nextpage--> pagination.
-			array( '/blog-page/2/', '/blog-page/' ),
-			array( '/blog-page/?page=2', '/blog-page/' ),
+			array( '/blog-page/2/', '/blog-page/', 45337 ),
+			array( '/blog-page/?page=2', '/blog-page/', 45337 ),
 			// The posts page supports regular pagination.
-			array( '/blog-page/?paged=2', '/blog-page/page/2/' ),
+			array( '/blog-page/?paged=2', '/blog-page/page/2/', 20385 ),
 		);
 	}
 }

From e6ba58cb68554f08cd7c1d6934fe1b77c5792e41 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sun, 24 Oct 2021 19:21:18 +0000
Subject: [PATCH 226/257] Coding Standards: Rename the `$arrHeaders` variable
 to `$processed_headers` in `WP_Http_Streams::request()`.

This fixes a `Variable "$arrHeaders" is not in valid snake_case format` WPCS warning.

Follow-up to [8516], [51826].

See #53359.

git-svn-id: https://develop.svn.wordpress.org/trunk@51929 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-http-streams.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/wp-includes/class-wp-http-streams.php b/src/wp-includes/class-wp-http-streams.php
index d6cfc53359308..abf16dd44d2e8 100644
--- a/src/wp-includes/class-wp-http-streams.php
+++ b/src/wp-includes/class-wp-http-streams.php
@@ -316,14 +316,14 @@ public function request( $url, $args = array() ) {
 
 		fclose( $handle );
 
-		$arrHeaders = WP_Http::processHeaders( $process['headers'], $url );
+		$processed_headers = WP_Http::processHeaders( $process['headers'], $url );
 
 		$response = array(
-			'headers'  => $arrHeaders['headers'],
+			'headers'  => $processed_headers['headers'],
 			// Not yet processed.
 			'body'     => null,
-			'response' => $arrHeaders['response'],
-			'cookies'  => $arrHeaders['cookies'],
+			'response' => $processed_headers['response'],
+			'cookies'  => $processed_headers['cookies'],
 			'filename' => $parsed_args['filename'],
 		);
 
@@ -334,13 +334,13 @@ public function request( $url, $args = array() ) {
 		}
 
 		// If the body was chunk encoded, then decode it.
-		if ( ! empty( $process['body'] ) && isset( $arrHeaders['headers']['transfer-encoding'] )
-			&& 'chunked' === $arrHeaders['headers']['transfer-encoding']
+		if ( ! empty( $process['body'] ) && isset( $processed_headers['headers']['transfer-encoding'] )
+			&& 'chunked' === $processed_headers['headers']['transfer-encoding']
 		) {
 			$process['body'] = WP_Http::chunkTransferDecode( $process['body'] );
 		}
 
-		if ( true === $parsed_args['decompress'] && true === WP_Http_Encoding::should_decode( $arrHeaders['headers'] ) ) {
+		if ( true === $parsed_args['decompress'] && true === WP_Http_Encoding::should_decode( $processed_headers['headers'] ) ) {
 			$process['body'] = WP_Http_Encoding::decompress( $process['body'] );
 		}
 

From 2238c302f9598b6f8f4ab0c27b175fd9ca7370fd Mon Sep 17 00:00:00 2001
From: Peter Wilson <peterwilsoncc@git.wordpress.org>
Date: Mon, 25 Oct 2021 00:22:41 +0000
Subject: [PATCH 227/257] Docs: Use sign-up & signup consistently in
 `wp-signup.php`.

In the docblocks throughout `wp-signup.php` use sign up for verbs and sign-up for nouns.

Props audrasjb, jeffpaul.
Fixes #54041. See #53399.



git-svn-id: https://develop.svn.wordpress.org/trunk@51930 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-signup.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/wp-signup.php b/src/wp-signup.php
index e13d6e49e771f..375dad9517c56 100644
--- a/src/wp-signup.php
+++ b/src/wp-signup.php
@@ -43,14 +43,14 @@ function do_signup_header() {
 $wp_query->is_404 = false;
 
 /**
- * Fires before the Site Signup page is loaded.
+ * Fires before the Site Sign-up page is loaded.
  *
  * @since 4.4.0
  */
 do_action( 'before_signup_header' );
 
 /**
- * Prints styles for front-end Multisite signup pages.
+ * Prints styles for front-end Multisite Sign-up pages.
  *
  * @since MU (3.0.0)
  */
@@ -79,7 +79,7 @@ function wpmu_signup_stylesheet() {
 get_header( 'wp-signup' );
 
 /**
- * Fires before the site sign-up form.
+ * Fires before the site Sign-up form.
  *
  * @since 3.0.0
  */
@@ -89,7 +89,7 @@ function wpmu_signup_stylesheet() {
 <div class="mu_register wp-signup-container" role="main">
 <?php
 /**
- * Generates and displays the Signup and Create Site forms.
+ * Generates and displays the Sign-up and Create Site forms.
  *
  * @since MU (3.0.0)
  *
@@ -224,7 +224,7 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
 }
 
 /**
- * Validates the new site signup.
+ * Validates the new site sign-up.
  *
  * @since MU (3.0.0)
  *
@@ -288,7 +288,7 @@ function show_user_form( $user_name = '', $user_email = '', $errors = '' ) {
 }
 
 /**
- * Validates user signup name and email.
+ * Validates user sign-up name and email.
  *
  * @since MU (3.0.0)
  *
@@ -394,7 +394,7 @@ function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) {
 }
 
 /**
- * Validates a new site signup for an existing user.
+ * Validates a new site sign-up for an existing user.
  *
  * @since MU (3.0.0)
  *
@@ -629,11 +629,11 @@ function signup_user( $user_name = '', $user_email = '', $errors = '' ) {
 }
 
 /**
- * Validates the new user signup.
+ * Validates the new user sign-up.
  *
  * @since MU (3.0.0)
  *
- * @return bool True if new user signup was validated, false on error.
+ * @return bool True if new user sign-up was validated, false on error.
  */
 function validate_user_signup() {
 	$result     = validate_user_form();
@@ -747,7 +747,7 @@ function signup_blog( $user_name = '', $user_email = '', $blogname = '', $blog_t
 		do_action( 'signup_hidden_fields', 'validate-site' );
 		?>
 		<?php show_blog_form( $blogname, $blog_title, $errors ); ?>
-		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Signup' ); ?>" /></p>
+		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Sign up' ); ?>" /></p>
 	</form>
 	<?php
 }
@@ -757,7 +757,7 @@ function signup_blog( $user_name = '', $user_email = '', $blogname = '', $blog_t
  *
  * @since MU (3.0.0)
  *
- * @return bool True if the site signup was validated, false on error.
+ * @return bool True if the site sign-up was validated, false on error.
  */
 function validate_blog_signup() {
 	// Re-validate user info.
@@ -860,7 +860,7 @@ function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $use
 }
 
 /**
- * Retrieves languages available during the site/user signup process.
+ * Retrieves languages available during the site/user sign-up process.
  *
  * @since 4.4.0
  *
@@ -871,10 +871,10 @@ function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $use
  */
 function signup_get_available_languages() {
 	/**
-	 * Filters the list of available languages for front-end site signups.
+	 * Filters the list of available languages for front-end site sign-ups.
 	 *
 	 * Passing an empty array to this hook will disable output of the setting on the
-	 * signup form, and the default language will be used when creating the site.
+	 * sign-up form, and the default language will be used when creating the site.
 	 *
 	 * Languages not already installed will be stripped.
 	 *

From aa37d5ba15c780420c2d6c3d7af9c527a7476dce Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 25 Oct 2021 16:18:26 +0000
Subject: [PATCH 228/257] Coding Standards: Rename `$theHeaders` variable to
 `$processed_headers` in `WP_Http_Curl::request()`.

This fixes a `Variable "$theHeaders" is not in valid snake_case format` WPCS warning.

Follow-up to [8516], [8520], [51826], [51929].

See #53359.

git-svn-id: https://develop.svn.wordpress.org/trunk@51931 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-http-curl.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/wp-includes/class-wp-http-curl.php b/src/wp-includes/class-wp-http-curl.php
index 64ff7efb834ab..c4505f2e6198e 100644
--- a/src/wp-includes/class-wp-http-curl.php
+++ b/src/wp-includes/class-wp-http-curl.php
@@ -256,7 +256,8 @@ public function request( $url, $args = array() ) {
 		}
 
 		curl_exec( $handle );
-		$theHeaders          = WP_Http::processHeaders( $this->headers, $url );
+
+		$processed_headers   = WP_Http::processHeaders( $this->headers, $url );
 		$theBody             = $this->body;
 		$bytes_written_total = $this->bytes_written_total;
 
@@ -267,7 +268,7 @@ public function request( $url, $args = array() ) {
 		$curl_error = curl_errno( $handle );
 
 		// If an error occurred, or, no response.
-		if ( $curl_error || ( 0 == strlen( $theBody ) && empty( $theHeaders['headers'] ) ) ) {
+		if ( $curl_error || ( 0 == strlen( $theBody ) && empty( $processed_headers['headers'] ) ) ) {
 			if ( CURLE_WRITE_ERROR /* 23 */ == $curl_error ) {
 				if ( ! $this->max_body_length || $this->max_body_length != $bytes_written_total ) {
 					if ( $parsed_args['stream'] ) {
@@ -299,10 +300,10 @@ public function request( $url, $args = array() ) {
 		}
 
 		$response = array(
-			'headers'  => $theHeaders['headers'],
+			'headers'  => $processed_headers['headers'],
 			'body'     => null,
-			'response' => $theHeaders['response'],
-			'cookies'  => $theHeaders['cookies'],
+			'response' => $processed_headers['response'],
+			'cookies'  => $processed_headers['cookies'],
 			'filename' => $parsed_args['filename'],
 		);
 
@@ -312,7 +313,9 @@ public function request( $url, $args = array() ) {
 			return $redirect_response;
 		}
 
-		if ( true === $parsed_args['decompress'] && true === WP_Http_Encoding::should_decode( $theHeaders['headers'] ) ) {
+		if ( true === $parsed_args['decompress']
+			&& true === WP_Http_Encoding::should_decode( $processed_headers['headers'] )
+		) {
 			$theBody = WP_Http_Encoding::decompress( $theBody );
 		}
 

From 22bb0fee98a8eea57ff62933d889eb89f303356f Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Mon, 25 Oct 2021 19:28:04 +0000
Subject: [PATCH 229/257] Build/Test Tools: Restore Slack notifications for
 older branches.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In [51921], the GitHub Actions workflows were updated to utilize the Slack notifications workflow as a callable one instead of on the `workflow_run` event.

This eliminated the need for an additional “Slack Notifications” workflow run for every completed workflow, but only when other workflows are updated as well. This resulted in notifications from older branches breaking, as the changes in [51921] were not backported.

Instead of backporting the needed changes now (the Slack workflow is still being polished), this commit partially restores the `workflow_run` event for older branches so that notifications will resume.

See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51934 602fd350-edb4-49c9-b593-d223f7449a82
---
 .github/workflows/slack-notifications.yml | 40 ++++++++++++++++++-----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/slack-notifications.yml b/.github/workflows/slack-notifications.yml
index ce8696608ffbe..aa944450851f0 100644
--- a/.github/workflows/slack-notifications.yml
+++ b/.github/workflows/slack-notifications.yml
@@ -6,6 +6,22 @@
 name: Slack Notifications
 
 on:
+  workflow_run:
+    workflows:
+      - Code Coverage Report
+      - Coding Standards
+      - End-to-end Tests
+      - JavaScript Tests
+      - PHP Compatibility
+      - PHPUnit Tests
+      - Test NPM
+      - Test old branches
+    types:
+      - completed
+    branches:
+      - '[3-4].[0-9]'
+      - '5.[0-8]'
+
   workflow_call:
     secrets:
       SLACK_GHA_SUCCESS_WEBHOOK:
@@ -21,6 +37,9 @@ on:
         description: 'The Slack webhook URL for a failed build.'
         required: true
 
+env:
+  CURRENT_BRANCH: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.head_branch || github.ref_name }}
+
 jobs:
   # Gathers the details needed for Slack notifications.
   #
@@ -28,8 +47,11 @@ jobs:
   # submit data to Slack webhook URLs configured to post messages.
   #
   # Performs the following steps:
+  # - Retrieves the workflow ID (if necessary).
+  # - Retrieves the workflow URL (if necessary).
   # - Retrieves the previous workflow run and stores its conclusion.
   # - Sets the previous conclusion as an output.
+  # - Prepares the commit message.
   # - Constructs and stores a message payload as an output.
   prepare:
     name: Prepare notifications
@@ -42,6 +64,7 @@ jobs:
     steps:
       - name: Get the workflow ID
         id: current-workflow-id
+        if: ${{ github.event_name == 'push' }}
         uses: actions/github-script@441359b1a30438de65712c2fbca0abe4816fa667 # v5.0.0
         with:
           script: |
@@ -55,6 +78,7 @@ jobs:
       - name: Get the workflow URL
         id: current-workflow-url
         uses: actions/github-script@441359b1a30438de65712c2fbca0abe4816fa667 # v5.0.0
+        if: ${{ github.event_name == 'push' }}
         with:
           script: |
             const workflow_run = await github.rest.actions.getWorkflowRun({
@@ -72,8 +96,8 @@ jobs:
             const previous_runs = await github.rest.actions.listWorkflowRuns({
               owner: '${{ github.repository_owner }}',
               repo: 'wordpress-develop',
-              workflow_id: ${{ steps.current-workflow-id.outputs.result }},
-              branch: '${{ github.ref_name }}',
+              workflow_id: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.workflow_id || steps.current-workflow-id.outputs.result }},
+              branch: '${{ env.CURRENT_BRANCH }}',
               per_page: 1,
               page: 2,
             });
@@ -87,21 +111,21 @@ jobs:
         id: commit-message
         run: |
           COMMIT_MESSAGE=$(cat <<'EOF' | awk 'NR==1' | sed 's/`/\\`/g' | sed 's/\"/\\\\"/g'
-          ${{ github.event.head_commit.message }}
+          ${{ github.event_name == 'workflow_run' && github.event.workflow_run.head_commit.message || github.event.head_commit.message }}
           EOF
           )
           echo "::set-output name=commit_message_escaped::${COMMIT_MESSAGE}"
 
       - name: Construct payload and store as an output
         id: create-payload
-        run: echo "::set-output name=payload::{\"workflow_name\":\"${{ github.workflow }}\",\"ref_name\":\"${{ github.ref_name }}\",\"run_url\":\"${{ steps.current-workflow-url.outputs.result }}\",\"commit_message\":\"${{ steps.commit-message.outputs.commit_message_escaped }}\"}"
+        run: echo "::set-output name=payload::{\"workflow_name\":\"${{ github.workflow }}\",\"ref_name\":\"${{ env.CURRENT_BRANCH }}\",\"run_url\":\"${{ github.event_name == 'workflow_run' && github.event.workflow_run.html_url || steps.current-workflow-url.outputs.result }}\",\"commit_message\":\"${{ steps.commit-message.outputs.commit_message_escaped }}\"}"
 
   # Posts notifications when a workflow fails.
   failure:
     name: Failure notifications
     runs-on: ubuntu-latest
     needs: [ prepare ]
-    if: ${{ failure() }}
+    if: ${{ github.event_name == 'push' && failure() || github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'failure' }}
 
     steps:
       - name: Post failure notifications to Slack
@@ -116,7 +140,7 @@ jobs:
     name: Fixed notifications
     runs-on: ubuntu-latest
     needs: [ prepare ]
-    if: ${{ needs.prepare.outputs.previous_conclusion == 'failure' && success() }}
+    if: ${{ needs.prepare.outputs.previous_conclusion == 'failure' && ( github.event_name == 'push' && success() || github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' ) }}
 
     steps:
       - name: Post failure notifications to Slack
@@ -131,7 +155,7 @@ jobs:
     name: Success notifications
     runs-on: ubuntu-latest
     needs: [ prepare ]
-    if: ${{ success() }}
+    if: ${{ github.event_name == 'push' && success() || github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }}
 
     steps:
       - name: Post success notifications to Slack
@@ -146,7 +170,7 @@ jobs:
     name: Cancelled notifications
     runs-on: ubuntu-latest
     needs: [ prepare ]
-    if: ${{ cancelled() }}
+    if: ${{ github.event_name == 'push' && cancelled() || github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'cancelled' }}
 
     steps:
       - name: Post cancelled notifications to Slack

From e1eb18d5dfcfb7d815b0c783a5bc636939a90889 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Mon, 25 Oct 2021 20:26:45 +0000
Subject: [PATCH 230/257] Build/Test Tools: Use the correct workflow name in
 notifications on `workflow_run`.

When a workflow is triggered through a `workflow_run` event, the context is not the original workflow. The details about the original workflow are passed through the `github.event` context.

This also moves the conditional check controlling whether the Slack workflow is run into the calling workflows to prevent them from running for pull requests.

Follow up to [51921-51922,51924-51925,51934].

See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51937 602fd350-edb4-49c9-b593-d223f7449a82
---
 .github/workflows/coding-standards.yml    | 2 +-
 .github/workflows/end-to-end-tests.yml    | 2 +-
 .github/workflows/javascript-tests.yml    | 2 +-
 .github/workflows/php-compatibility.yml   | 2 +-
 .github/workflows/phpunit-tests.yml       | 2 +-
 .github/workflows/slack-notifications.yml | 2 +-
 .github/workflows/test-coverage.yml       | 2 +-
 .github/workflows/test-npm.yml            | 2 +-
 .github/workflows/test-old-branches.yml   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index 03e6277cd6417..164642e1ad785 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -151,7 +151,7 @@ jobs:
     name: Slack Notifications
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
     needs: [ phpcs, jshint ]
-    if: ${{ always() }}
+    if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
     secrets:
       SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
       SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
diff --git a/.github/workflows/end-to-end-tests.yml b/.github/workflows/end-to-end-tests.yml
index fc41233eda5ec..16ad0c0f99fbb 100644
--- a/.github/workflows/end-to-end-tests.yml
+++ b/.github/workflows/end-to-end-tests.yml
@@ -121,7 +121,7 @@ jobs:
     name: Slack Notifications
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
     needs: [ e2e-tests ]
-    if: ${{ always() }}
+    if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
     secrets:
       SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
       SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
diff --git a/.github/workflows/javascript-tests.yml b/.github/workflows/javascript-tests.yml
index 073f5bbd498ef..a13a3b095e0c7 100644
--- a/.github/workflows/javascript-tests.yml
+++ b/.github/workflows/javascript-tests.yml
@@ -90,7 +90,7 @@ jobs:
     name: Slack Notifications
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
     needs: [ test-js ]
-    if: ${{ always() }}
+    if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
     secrets:
       SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
       SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
diff --git a/.github/workflows/php-compatibility.yml b/.github/workflows/php-compatibility.yml
index 30b2f5f00119b..2121ddeb143d9 100644
--- a/.github/workflows/php-compatibility.yml
+++ b/.github/workflows/php-compatibility.yml
@@ -92,7 +92,7 @@ jobs:
     name: Slack Notifications
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
     needs: [ php-compatibility ]
-    if: ${{ always() }}
+    if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
     secrets:
       SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
       SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
index 22d98f3f4ac5b..ef328a5761f2a 100644
--- a/.github/workflows/phpunit-tests.yml
+++ b/.github/workflows/phpunit-tests.yml
@@ -247,7 +247,7 @@ jobs:
     name: Slack Notifications
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
     needs: [ test-php ]
-    if: ${{ always() }}
+    if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
     secrets:
       SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
       SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
diff --git a/.github/workflows/slack-notifications.yml b/.github/workflows/slack-notifications.yml
index aa944450851f0..b75bc5b01d28f 100644
--- a/.github/workflows/slack-notifications.yml
+++ b/.github/workflows/slack-notifications.yml
@@ -118,7 +118,7 @@ jobs:
 
       - name: Construct payload and store as an output
         id: create-payload
-        run: echo "::set-output name=payload::{\"workflow_name\":\"${{ github.workflow }}\",\"ref_name\":\"${{ env.CURRENT_BRANCH }}\",\"run_url\":\"${{ github.event_name == 'workflow_run' && github.event.workflow_run.html_url || steps.current-workflow-url.outputs.result }}\",\"commit_message\":\"${{ steps.commit-message.outputs.commit_message_escaped }}\"}"
+        run: echo "::set-output name=payload::{\"workflow_name\":\"${{ github.event_name == 'workflow_run' && github.event.workflow_run.name || github.workflow }}\",\"ref_name\":\"${{ env.CURRENT_BRANCH }}\",\"run_url\":\"${{ github.event_name == 'workflow_run' && github.event.workflow_run.html_url || steps.current-workflow-url.outputs.result }}\",\"commit_message\":\"${{ steps.commit-message.outputs.commit_message_escaped }}\"}"
 
   # Posts notifications when a workflow fails.
   failure:
diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml
index 7d3cdbcd3da67..cbf18067e9c00 100644
--- a/.github/workflows/test-coverage.yml
+++ b/.github/workflows/test-coverage.yml
@@ -173,7 +173,7 @@ jobs:
     name: Slack Notifications
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
     needs: [ test-coverage-report ]
-    if: ${{ always() }}
+    if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
     secrets:
       SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
       SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
diff --git a/.github/workflows/test-npm.yml b/.github/workflows/test-npm.yml
index d2af984d25e47..207882513aec9 100644
--- a/.github/workflows/test-npm.yml
+++ b/.github/workflows/test-npm.yml
@@ -159,7 +159,7 @@ jobs:
     name: Slack Notifications
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
     needs: [ test-npm, test-npm-macos ]
-    if: ${{ always() }}
+    if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
     secrets:
       SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
       SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
diff --git a/.github/workflows/test-old-branches.yml b/.github/workflows/test-old-branches.yml
index 5d19130b26eab..7051b727d964b 100644
--- a/.github/workflows/test-old-branches.yml
+++ b/.github/workflows/test-old-branches.yml
@@ -74,7 +74,7 @@ jobs:
     name: Slack Notifications
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
     needs: [ dispatch-workflows-for-old-branches ]
-    if: ${{ always() }}
+    if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
     secrets:
       SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
       SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}

From 98bf67e02b0a4b4aa3848f4e8266c4fd66cdaad0 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 26 Oct 2021 02:02:50 +0000
Subject: [PATCH 231/257] Tests: Some test improvements for
 `clean_dirsize_cache()` tests:

* Move the directory being tested to the `data` directory, for consistency with other test data.
* Set the `svn:eol-style` property to `native`, for consistency with other files.
* Correct the test class name in `dummy.txt`.

Follow-up to [51246], [51910], [51911].

See #52241, #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51938 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/data/functions/dummy.txt        |   1 +
 .../tests/functions/cleanDirsizeCache.php     | 141 +++++++++++++++++-
 .../tests/functions/fixtures/dummy.txt        |   1 -
 3 files changed, 141 insertions(+), 2 deletions(-)
 create mode 100644 tests/phpunit/data/functions/dummy.txt
 delete mode 100644 tests/phpunit/tests/functions/fixtures/dummy.txt

diff --git a/tests/phpunit/data/functions/dummy.txt b/tests/phpunit/data/functions/dummy.txt
new file mode 100644
index 0000000000000..7614ea709c87a
--- /dev/null
+++ b/tests/phpunit/data/functions/dummy.txt
@@ -0,0 +1 @@
+This is a dummy text file which is only used by the `Tests_Functions_CleanDirsizeCache::test_recurse_dirsize_without_transient()` test.
diff --git a/tests/phpunit/tests/functions/cleanDirsizeCache.php b/tests/phpunit/tests/functions/cleanDirsizeCache.php
index d600bdca542eb..27aacda62b9b9 100644
--- a/tests/phpunit/tests/functions/cleanDirsizeCache.php
+++ b/tests/phpunit/tests/functions/cleanDirsizeCache.php
@@ -1 +1,140 @@
-<?php

/**
 * Tests specific to the directory size caching.
 *
 * @group functions.php
 */
class Tests_Functions_CleanDirsizeCache extends WP_UnitTestCase {

	/**
	 * Test the handling of invalid data passed as the $path parameter.
	 *
	 * @ticket 52241
	 *
	 * @covers ::clean_dirsize_cache
	 *
	 * @dataProvider data_clean_dirsize_cache_with_invalid_inputs
	 *
	 * @param mixed  $path             Path input to use in the test.
	 * @param string $expected_message Expected notice message.
	 */
	public function test_clean_dirsize_cache_with_invalid_inputs( $path, $expected_message ) {
		$this->expectNotice();
		$this->expectNoticeMessage( $expected_message );

		clean_dirsize_cache( $path );
	}

	/**
	 * Data provider.
	 *
	 * @return array
	 */
	public function data_clean_dirsize_cache_with_invalid_inputs() {
		return array(
			'null'         => array(
				'path'             => null,
				'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>NULL</code>.',
			),
			'bool false'   => array(
				'path'             => false,
				'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>boolean</code>.',
			),
			'empty string' => array(
				'path'             => '',
				'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>string</code>.',
			),
			'array'        => array(
				'path'             => array( '.', './second/path/' ),
				'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>array</code>.',
			),
		);
	}

	/**
	 * Test the handling of a non-path text string passed as the $path parameter.
	 *
	 * @ticket 52241
	 *
	 * @covers ::clean_dirsize_cache
	 *
	 * @dataProvider data_clean_dirsize_cache_with_non_path_string
	 *
	 * @param string $path           Path input to use in the test.
	 * @param int    $expected_count Expected number of paths in the cache after cleaning.
	 */
	public function test_clean_dirsize_cache_with_non_path_string( $path, $expected_count ) {
		// Set the dirsize cache to our mock.
		set_transient( 'dirsize_cache', $this->mock_dirsize_cache_with_non_path_string() );

		clean_dirsize_cache( $path );

		$cache = get_transient( 'dirsize_cache' );
		$this->assertIsArray( $cache );
		$this->assertCount( $expected_count, $cache );
	}

	/**
	 * Data provider.
	 *
	 * @return array
	 */
	public function data_clean_dirsize_cache_with_non_path_string() {
		return array(
			'single dot'                        => array(
				'path'           => '.',
				'expected_count' => 1,
			),
			'non-path'                          => array(
				'path'           => 'string',
				'expected_count' => 1,
			),
			'non-existant string, but non-path' => array(
				'path'           => 'doesnotexist',
				'expected_count' => 2,
			),
		);
	}

	private function mock_dirsize_cache_with_non_path_string() {
		return array(
			'.'      => array( 'size' => 50 ),
			'string' => array( 'size' => 42 ),
		);
	}

	/**
	 * Test the behaviour of the function when the transient doesn't exist.
	 *
	 * @ticket 52241
	 * @ticket 53635
	 *
	 * @covers ::recurse_dirsize
	 */
	public function test_recurse_dirsize_without_transient() {
		delete_transient( 'dirsize_cache' );

		$size = recurse_dirsize( __DIR__ . '/fixtures' );

		$this->assertGreaterThan( 10, $size );
	}

	/**
	 * Test the behaviour of the function when the transient does exist, but is not an array.
	 *
	 * In particular, this tests that no PHP TypeErrors are being thrown.
	 *
	 * @ticket 52241
	 * @ticket 53635
	 *
	 * @covers ::recurse_dirsize
	 */
	public function test_recurse_dirsize_with_invalid_transient() {
		set_transient( 'dirsize_cache', 'this is not a valid transient for dirsize cache' );

		$size = recurse_dirsize( __DIR__ . '/fixtures' );

		$this->assertGreaterThan( 10, $size );
	}
}
\ No newline at end of file
+<?php
+
+/**
+ * Tests specific to the directory size caching.
+ *
+ * @group functions.php
+ */
+class Tests_Functions_CleanDirsizeCache extends WP_UnitTestCase {
+
+	/**
+	 * Test the handling of invalid data passed as the $path parameter.
+	 *
+	 * @ticket 52241
+	 *
+	 * @covers ::clean_dirsize_cache
+	 *
+	 * @dataProvider data_clean_dirsize_cache_with_invalid_inputs
+	 *
+	 * @param mixed  $path             Path input to use in the test.
+	 * @param string $expected_message Expected notice message.
+	 */
+	public function test_clean_dirsize_cache_with_invalid_inputs( $path, $expected_message ) {
+		$this->expectNotice();
+		$this->expectNoticeMessage( $expected_message );
+
+		clean_dirsize_cache( $path );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_clean_dirsize_cache_with_invalid_inputs() {
+		return array(
+			'null'         => array(
+				'path'             => null,
+				'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>NULL</code>.',
+			),
+			'bool false'   => array(
+				'path'             => false,
+				'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>boolean</code>.',
+			),
+			'empty string' => array(
+				'path'             => '',
+				'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>string</code>.',
+			),
+			'array'        => array(
+				'path'             => array( '.', './second/path/' ),
+				'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>array</code>.',
+			),
+		);
+	}
+
+	/**
+	 * Test the handling of a non-path text string passed as the $path parameter.
+	 *
+	 * @ticket 52241
+	 *
+	 * @covers ::clean_dirsize_cache
+	 *
+	 * @dataProvider data_clean_dirsize_cache_with_non_path_string
+	 *
+	 * @param string $path           Path input to use in the test.
+	 * @param int    $expected_count Expected number of paths in the cache after cleaning.
+	 */
+	public function test_clean_dirsize_cache_with_non_path_string( $path, $expected_count ) {
+		// Set the dirsize cache to our mock.
+		set_transient( 'dirsize_cache', $this->mock_dirsize_cache_with_non_path_string() );
+
+		clean_dirsize_cache( $path );
+
+		$cache = get_transient( 'dirsize_cache' );
+		$this->assertIsArray( $cache );
+		$this->assertCount( $expected_count, $cache );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_clean_dirsize_cache_with_non_path_string() {
+		return array(
+			'single dot'                        => array(
+				'path'           => '.',
+				'expected_count' => 1,
+			),
+			'non-path'                          => array(
+				'path'           => 'string',
+				'expected_count' => 1,
+			),
+			'non-existant string, but non-path' => array(
+				'path'           => 'doesnotexist',
+				'expected_count' => 2,
+			),
+		);
+	}
+
+	private function mock_dirsize_cache_with_non_path_string() {
+		return array(
+			'.'      => array( 'size' => 50 ),
+			'string' => array( 'size' => 42 ),
+		);
+	}
+
+	/**
+	 * Test the behaviour of the function when the transient doesn't exist.
+	 *
+	 * @ticket 52241
+	 * @ticket 53635
+	 *
+	 * @covers ::recurse_dirsize
+	 */
+	public function test_recurse_dirsize_without_transient() {
+		delete_transient( 'dirsize_cache' );
+
+		$size = recurse_dirsize( DIR_TESTDATA . '/functions' );
+
+		$this->assertGreaterThan( 10, $size );
+	}
+
+	/**
+	 * Test the behaviour of the function when the transient does exist, but is not an array.
+	 *
+	 * In particular, this tests that no PHP TypeErrors are being thrown.
+	 *
+	 * @ticket 52241
+	 * @ticket 53635
+	 *
+	 * @covers ::recurse_dirsize
+	 */
+	public function test_recurse_dirsize_with_invalid_transient() {
+		set_transient( 'dirsize_cache', 'this is not a valid transient for dirsize cache' );
+
+		$size = recurse_dirsize( DIR_TESTDATA . '/functions' );
+
+		$this->assertGreaterThan( 10, $size );
+	}
+}
diff --git a/tests/phpunit/tests/functions/fixtures/dummy.txt b/tests/phpunit/tests/functions/fixtures/dummy.txt
deleted file mode 100644
index 7cc0f577eecaa..0000000000000
--- a/tests/phpunit/tests/functions/fixtures/dummy.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is a dummy text file which is only used by the `Tests_Multisite_CleanDirsizeCache::test_recurse_dirsize_without_transient()` test.
\ No newline at end of file

From 9b6c18b75658d27fb9d8098f2291b7e1b4eaef34 Mon Sep 17 00:00:00 2001
From: John James Jacoby <johnjamesjacoby@git.wordpress.org>
Date: Wed, 27 Oct 2021 14:58:24 +0000
Subject: [PATCH 232/257] Admin/HTTP API: add suggested filename support to
 `download_url()`.

This change allows for external clients to supply a suggested filename via a `Content-Disposition` response header. This filename is processed through `sanitize_file_name()` to ensure it is allowable (on the server, MIME's, etc...) and `validate_file()` to prevent directory traversal.

If the suggested filename fails the above processing/checks, that suggestion is discarded and the standard temporary filename (generated by WordPress) is used.

If no `Content-Disposition` header is found in the response headers, the standard temporary filename continues to be used as per normal.

Included in this change are 6 additional PHPUnit tests with 9 assertions. These tests confirm that valid filename values are correctly saved, and invalid filename values are correctly rejected.

Props cklosows, costdev, dd32, johnjamesjacoby, ocean90, psrpinto.

Fixes #38231.

git-svn-id: https://develop.svn.wordpress.org/trunk@51939 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/file.php             |  24 +++
 tests/phpunit/tests/admin/includesFile.php | 171 +++++++++++++++++++++
 2 files changed, 195 insertions(+)

diff --git a/src/wp-admin/includes/file.php b/src/wp-admin/includes/file.php
index 50345c63315a0..8a28c63adca5f 100644
--- a/src/wp-admin/includes/file.php
+++ b/src/wp-admin/includes/file.php
@@ -1112,6 +1112,7 @@ function wp_handle_sideload( &$file, $overrides = false, $time = null ) {
  *
  * @since 2.5.0
  * @since 5.2.0 Signature Verification with SoftFail was added.
+ * @since 5.9.0 Support for Content-Disposition filename was added.
  *
  * @param string $url                    The URL of the file to download.
  * @param int    $timeout                The timeout for the request to download the file.
@@ -1182,6 +1183,29 @@ function download_url( $url, $timeout = 300, $signature_verification = false ) {
 		return new WP_Error( 'http_404', trim( wp_remote_retrieve_response_message( $response ) ), $data );
 	}
 
+	$content_disposition = wp_remote_retrieve_header( $response, 'content-disposition' );
+
+	if ( $content_disposition ) {
+		$content_disposition = strtolower( $content_disposition );
+
+		if ( 0 === strpos( $content_disposition, 'attachment; filename=' ) ) {
+			$tmpfname_disposition = sanitize_file_name( substr( $content_disposition, 21 ) );
+		} else {
+			$tmpfname_disposition = '';
+		}
+
+		// Potential file name must be valid string
+		if ( $tmpfname_disposition && is_string( $tmpfname_disposition ) && ( 0 === validate_file( $tmpfname_disposition ) ) ) {
+			if ( rename( $tmpfname, $tmpfname_disposition ) ) {
+				$tmpfname = $tmpfname_disposition;
+			}
+
+			if ( ( $tmpfname !== $tmpfname_disposition ) && file_exists( $tmpfname_disposition ) ) {
+				unlink( $tmpfname_disposition );
+			}
+		}
+	}
+
 	$content_md5 = wp_remote_retrieve_header( $response, 'content-md5' );
 
 	if ( $content_md5 ) {
diff --git a/tests/phpunit/tests/admin/includesFile.php b/tests/phpunit/tests/admin/includesFile.php
index 59299409550fd..db17f834b55ea 100644
--- a/tests/phpunit/tests/admin/includesFile.php
+++ b/tests/phpunit/tests/admin/includesFile.php
@@ -78,6 +78,177 @@ public function __return_5() {
 		return 5;
 	}
 
+	/**
+	 * @ticket 38231
+	 * @dataProvider data_download_url_should_respect_filename_from_content_disposition_header
+	 *
+	 * @covers ::download_url
+	 *
+	 * @param $filter  A callback containing a fake Content-Disposition header.
+	 */
+	public function test_download_url_should_respect_filename_from_content_disposition_header( $filter ) {
+		add_filter( 'pre_http_request', array( $this, $filter ), 10, 3 );
+
+		$filename = download_url( 'url_with_content_disposition_header' );
+		$this->assertStringContainsString( 'filename-from-content-disposition-header', $filename );
+		$this->assertFileExists( $filename );
+		$this->unlink( $filename );
+
+		remove_filter( 'pre_http_request', array( $this, $filter ) );
+	}
+
+	/**
+	 * Data provider for test_download_url_should_respect_filename_from_content_disposition_header.
+	 *
+	 * @return array
+	 */
+	public function data_download_url_should_respect_filename_from_content_disposition_header() {
+		return array(
+			'valid parameters' => array( 'filter_content_disposition_header_with_filename' ),
+			'path traversal'   => array( 'filter_content_disposition_header_with_filename_with_path_traversal' ),
+			'no quotes'        => array( 'filter_content_disposition_header_with_filename_without_quotes' ),
+		);
+	}
+
+	/**
+	 * Filter callback for data_download_url_should_respect_filename_from_content_disposition_header.
+	 *
+	 * @since 5.9.0
+	 *
+	 * @return array
+	 */
+	public function filter_content_disposition_header_with_filename( $response, $args, $url ) {
+		return array(
+			'response' => array(
+				'code' => 200,
+			),
+			'headers'  => array(
+				'content-disposition' => 'attachment; filename="filename-from-content-disposition-header.txt"',
+			),
+		);
+	}
+
+	/**
+	 * Filter callback for data_download_url_should_respect_filename_from_content_disposition_header.
+	 *
+	 * @since 5.9.0
+	 *
+	 * @return array
+	 */
+	public function filter_content_disposition_header_with_filename_with_path_traversal( $response, $args, $url ) {
+		return array(
+			'response' => array(
+				'code' => 200,
+			),
+			'headers'  => array(
+				'content-disposition' => 'attachment; filename="../../filename-from-content-disposition-header.txt"',
+			),
+		);
+	}
+
+	/**
+	 * Filter callback for data_download_url_should_respect_filename_from_content_disposition_header.
+	 *
+	 * @since 5.9.0
+	 *
+	 * @return array
+	 */
+	public function filter_content_disposition_header_with_filename_without_quotes( $response, $args, $url ) {
+		return array(
+			'response' => array(
+				'code' => 200,
+			),
+			'headers'  => array(
+				'content-disposition' => 'attachment; filename=filename-from-content-disposition-header.txt',
+			),
+		);
+	}
+
+	/**
+	 * @ticket 38231
+	 * @dataProvider data_download_url_should_reject_filename_from_invalid_content_disposition_header
+	 *
+	 * @covers ::download_url
+	 *
+	 * @param $filter  A callback containing a fake Content-Disposition header.
+	 */
+	public function test_download_url_should_reject_filename_from_invalid_content_disposition_header( $filter ) {
+		add_filter( 'pre_http_request', array( $this, $filter ), 10, 3 );
+
+		$filename = download_url( 'url_with_content_disposition_header' );
+		$this->assertStringContainsString( 'url_with_content_disposition_header', $filename );
+		$this->unlink( $filename );
+
+		remove_filter( 'pre_http_request', array( $this, $filter ) );
+	}
+
+	/**
+	 * Data provider for test_download_url_should_reject_filename_from_invalid_content_disposition_header.
+	 *
+	 * @return array
+	 */
+	public function data_download_url_should_reject_filename_from_invalid_content_disposition_header() {
+		return array(
+			'no context'        => array( 'filter_content_disposition_header_with_filename_without_context' ),
+			'inline context'    => array( 'filter_content_disposition_header_with_filename_with_inline_context' ),
+			'form-data context' => array( 'filter_content_disposition_header_with_filename_with_form_data_context' ),
+		);
+	}
+
+	/**
+	 * Filter callback for data_download_url_should_reject_filename_from_invalid_content_disposition_header.
+	 *
+	 * @since 5.9.0
+	 *
+	 * @return array
+	 */
+	public function filter_content_disposition_header_with_filename_without_context( $response, $args, $url ) {
+		return array(
+			'response' => array(
+				'code' => 200,
+			),
+			'headers'  => array(
+				'content-disposition' => 'filename="filename-from-content-disposition-header.txt"',
+			),
+		);
+	}
+
+	/**
+	 * Filter callback for data_download_url_should_reject_filename_from_invalid_content_disposition_header.
+	 *
+	 * @since 5.9.0
+	 *
+	 * @return array
+	 */
+	public function filter_content_disposition_header_with_filename_with_inline_context( $response, $args, $url ) {
+		return array(
+			'response' => array(
+				'code' => 200,
+			),
+			'headers'  => array(
+				'content-disposition' => 'inline; filename="filename-from-content-disposition-header.txt"',
+			),
+		);
+	}
+
+	/**
+	 * Filter callback for data_download_url_should_reject_filename_from_invalid_content_disposition_header.
+	 *
+	 * @since 5.9.0
+	 *
+	 * @return array
+	 */
+	public function filter_content_disposition_header_with_filename_with_form_data_context( $response, $args, $url ) {
+		return array(
+			'response' => array(
+				'code' => 200,
+			),
+			'headers'  => array(
+				'content-disposition' => 'form-data; name="file"; filename="filename-from-content-disposition-header.txt"',
+			),
+		);
+	}
+
 	/**
 	 * Verify that a WP_Error object is returned when invalid input is passed as the `$url` parameter.
 	 *

From 28a1ec5f5920dd54481d31f1d3fb2f21901084e4 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 27 Oct 2021 15:02:04 +0000
Subject: [PATCH 233/257] Coding Standards: Rename the `$process` variable to
 `$processed_response` for clarity in `WP_Http_Streams::request()`.

Includes minor code layout fixes for better readability.

Follow-up to [8516], [51826], [51929], [51931].

See #53359.

git-svn-id: https://develop.svn.wordpress.org/trunk@51940 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-http-streams.php | 95 +++++++++++++++++------
 1 file changed, 72 insertions(+), 23 deletions(-)

diff --git a/src/wp-includes/class-wp-http-streams.php b/src/wp-includes/class-wp-http-streams.php
index abf16dd44d2e8..1014460376bda 100644
--- a/src/wp-includes/class-wp-http-streams.php
+++ b/src/wp-includes/class-wp-http-streams.php
@@ -92,6 +92,7 @@ public function request( $url, $args = array() ) {
 
 		$is_local   = isset( $parsed_args['local'] ) && $parsed_args['local'];
 		$ssl_verify = isset( $parsed_args['sslverify'] ) && $parsed_args['sslverify'];
+
 		if ( $is_local ) {
 			/**
 			 * Filters whether SSL should be verified for local HTTP API requests.
@@ -141,10 +142,24 @@ public function request( $url, $args = array() ) {
 
 			if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
 				// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-				$handle = @stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+				$handle = @stream_socket_client(
+					'tcp://' . $proxy->host() . ':' . $proxy->port(),
+					$connection_error,
+					$connection_error_str,
+					$connect_timeout,
+					STREAM_CLIENT_CONNECT,
+					$context
+				);
 			} else {
 				// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-				$handle = @stream_socket_client( $connect_host . ':' . $parsed_url['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+				$handle = @stream_socket_client(
+					$connect_host . ':' . $parsed_url['port'],
+					$connection_error,
+					$connection_error_str,
+					$connect_timeout,
+					STREAM_CLIENT_CONNECT,
+					$context
+				);
 			}
 
 			if ( $secure_transport ) {
@@ -152,9 +167,23 @@ public function request( $url, $args = array() ) {
 			}
 		} else {
 			if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
-				$handle = stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+				$handle = stream_socket_client(
+					'tcp://' . $proxy->host() . ':' . $proxy->port(),
+					$connection_error,
+					$connection_error_str,
+					$connect_timeout,
+					STREAM_CLIENT_CONNECT,
+					$context
+				);
 			} else {
-				$handle = stream_socket_client( $connect_host . ':' . $parsed_url['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+				$handle = stream_socket_client(
+					$connect_host . ':' . $parsed_url['port'],
+					$connection_error,
+					$connection_error_str,
+					$connect_timeout,
+					STREAM_CLIENT_CONNECT,
+					$context
+				);
 			}
 		}
 
@@ -185,9 +214,9 @@ public function request( $url, $args = array() ) {
 		$strHeaders = strtoupper( $parsed_args['method'] ) . ' ' . $requestPath . ' HTTP/' . $parsed_args['httpversion'] . "\r\n";
 
 		$include_port_in_host_header = (
-			( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) ||
-			( 'http' === $parsed_url['scheme'] && 80 != $parsed_url['port'] ) ||
-			( 'https' === $parsed_url['scheme'] && 443 != $parsed_url['port'] )
+			( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
+			|| ( 'http' === $parsed_url['scheme'] && 80 != $parsed_url['port'] )
+			|| ( 'https' === $parsed_url['scheme'] && 443 != $parsed_url['port'] )
 		);
 
 		if ( $include_port_in_host_header ) {
@@ -238,6 +267,7 @@ public function request( $url, $args = array() ) {
 		$bodyStarted  = false;
 		$keep_reading = true;
 		$block_size   = 4096;
+
 		if ( isset( $parsed_args['limit_response_size'] ) ) {
 			$block_size = min( $block_size, $parsed_args['limit_response_size'] );
 		}
@@ -249,6 +279,7 @@ public function request( $url, $args = array() ) {
 			} else {
 				$stream_handle = fopen( $parsed_args['filename'], 'w+' );
 			}
+
 			if ( ! $stream_handle ) {
 				return new WP_Error(
 					'http_request_failed',
@@ -262,22 +293,25 @@ public function request( $url, $args = array() ) {
 			}
 
 			$bytes_written = 0;
+
 			while ( ! feof( $handle ) && $keep_reading ) {
 				$block = fread( $handle, $block_size );
 				if ( ! $bodyStarted ) {
 					$strResponse .= $block;
 					if ( strpos( $strResponse, "\r\n\r\n" ) ) {
-						$process     = WP_Http::processResponse( $strResponse );
-						$bodyStarted = true;
-						$block       = $process['body'];
+						$processed_response = WP_Http::processResponse( $strResponse );
+						$bodyStarted        = true;
+						$block              = $processed_response['body'];
 						unset( $strResponse );
-						$process['body'] = '';
+						$processed_response['body'] = '';
 					}
 				}
 
 				$this_block_size = strlen( $block );
 
-				if ( isset( $parsed_args['limit_response_size'] ) && ( $bytes_written + $this_block_size ) > $parsed_args['limit_response_size'] ) {
+				if ( isset( $parsed_args['limit_response_size'] )
+					&& ( $bytes_written + $this_block_size ) > $parsed_args['limit_response_size']
+				) {
 					$this_block_size = ( $parsed_args['limit_response_size'] - $bytes_written );
 					$block           = substr( $block, 0, $this_block_size );
 				}
@@ -292,31 +326,41 @@ public function request( $url, $args = array() ) {
 
 				$bytes_written += $bytes_written_to_file;
 
-				$keep_reading = ! isset( $parsed_args['limit_response_size'] ) || $bytes_written < $parsed_args['limit_response_size'];
+				$keep_reading = (
+					! isset( $parsed_args['limit_response_size'] )
+					|| $bytes_written < $parsed_args['limit_response_size']
+				);
 			}
 
 			fclose( $stream_handle );
 
 		} else {
 			$header_length = 0;
+
 			while ( ! feof( $handle ) && $keep_reading ) {
 				$block        = fread( $handle, $block_size );
 				$strResponse .= $block;
+
 				if ( ! $bodyStarted && strpos( $strResponse, "\r\n\r\n" ) ) {
 					$header_length = strpos( $strResponse, "\r\n\r\n" ) + 4;
 					$bodyStarted   = true;
 				}
-				$keep_reading = ( ! $bodyStarted || ! isset( $parsed_args['limit_response_size'] ) || strlen( $strResponse ) < ( $header_length + $parsed_args['limit_response_size'] ) );
+
+				$keep_reading = (
+					! $bodyStarted
+					|| ! isset( $parsed_args['limit_response_size'] )
+					|| strlen( $strResponse ) < ( $header_length + $parsed_args['limit_response_size'] )
+				);
 			}
 
-			$process = WP_Http::processResponse( $strResponse );
+			$processed_response = WP_Http::processResponse( $strResponse );
 			unset( $strResponse );
 
 		}
 
 		fclose( $handle );
 
-		$processed_headers = WP_Http::processHeaders( $process['headers'], $url );
+		$processed_headers = WP_Http::processHeaders( $processed_response['headers'], $url );
 
 		$response = array(
 			'headers'  => $processed_headers['headers'],
@@ -334,21 +378,26 @@ public function request( $url, $args = array() ) {
 		}
 
 		// If the body was chunk encoded, then decode it.
-		if ( ! empty( $process['body'] ) && isset( $processed_headers['headers']['transfer-encoding'] )
+		if ( ! empty( $processed_response['body'] )
+			&& isset( $processed_headers['headers']['transfer-encoding'] )
 			&& 'chunked' === $processed_headers['headers']['transfer-encoding']
 		) {
-			$process['body'] = WP_Http::chunkTransferDecode( $process['body'] );
+			$processed_response['body'] = WP_Http::chunkTransferDecode( $processed_response['body'] );
 		}
 
-		if ( true === $parsed_args['decompress'] && true === WP_Http_Encoding::should_decode( $processed_headers['headers'] ) ) {
-			$process['body'] = WP_Http_Encoding::decompress( $process['body'] );
+		if ( true === $parsed_args['decompress']
+			&& true === WP_Http_Encoding::should_decode( $processed_headers['headers'] )
+		) {
+			$processed_response['body'] = WP_Http_Encoding::decompress( $processed_response['body'] );
 		}
 
-		if ( isset( $parsed_args['limit_response_size'] ) && strlen( $process['body'] ) > $parsed_args['limit_response_size'] ) {
-			$process['body'] = substr( $process['body'], 0, $parsed_args['limit_response_size'] );
+		if ( isset( $parsed_args['limit_response_size'] )
+			&& strlen( $processed_response['body'] ) > $parsed_args['limit_response_size']
+		) {
+			$processed_response['body'] = substr( $processed_response['body'], 0, $parsed_args['limit_response_size'] );
 		}
 
-		$response['body'] = $process['body'];
+		$response['body'] = $processed_response['body'];
 
 		return $response;
 	}

From 489260a45ae44b7a7ad6282040542079cb756782 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 27 Oct 2021 17:08:15 +0000
Subject: [PATCH 234/257] Script Loader: Correct the number of arguments passed
 to the closure in `enqueue_block_styles_assets()`.

This avoids an `Uncaught ArgumentCountError: Too few arguments to function {closure}(), 1 passed` PHP fatal error when registering a block style with the `should_load_separate_core_block_assets` filter enabled.

Follow-up to [51471].

Props aristath, shimon246, jrf, gziolo.
Fixes #54323.

git-svn-id: https://develop.svn.wordpress.org/trunk@51941 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/script-loader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index 71c56192ee6c1..f90390e5c37d8 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -2448,7 +2448,7 @@ function enqueue_block_styles_assets() {
 				if ( wp_should_load_separate_core_block_assets() ) {
 					add_filter(
 						'render_block',
-						function( $html, $block ) use ( $style_properties ) {
+						function( $html ) use ( $style_properties ) {
 							wp_enqueue_style( $style_properties['style_handle'] );
 							return $html;
 						}

From c043d409006957852791facfe5a16c7a6ea1017d Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 27 Oct 2021 18:20:58 +0000
Subject: [PATCH 235/257] Docs: Document the usage of some globals in
 `wp-includes/script-loader.php`.

Follow-up to [44114], [44262], [49080], [50761], [51471].

See #53399.

git-svn-id: https://develop.svn.wordpress.org/trunk@51942 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/script-loader.php | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index f90390e5c37d8..fa757b4fed1ed 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -39,11 +39,16 @@
  *
  * @since 5.0.0
  *
+ * @global string $tinymce_version
+ * @global bool   $concatenate_scripts
+ * @global bool   $compress_scripts
+ *
  * @param WP_Scripts $scripts            WP_Scripts object.
  * @param bool       $force_uncompressed Whether to forcibly prevent gzip compression. Default false.
  */
 function wp_register_tinymce_scripts( $scripts, $force_uncompressed = false ) {
 	global $tinymce_version, $concatenate_scripts, $compress_scripts;
+
 	$suffix     = wp_scripts_get_suffix();
 	$dev_suffix = wp_scripts_get_suffix( 'dev' );
 
@@ -72,6 +77,8 @@ function wp_register_tinymce_scripts( $scripts, $force_uncompressed = false ) {
  *
  * @since 5.0.0
  *
+ * @global WP_Locale $wp_locale WordPress date and time locale object.
+ *
  * @param WP_Scripts $scripts WP_Scripts object.
  */
 function wp_default_packages_vendor( $scripts ) {
@@ -277,6 +284,8 @@ function wp_default_packages_scripts( $scripts ) {
  *
  * @since 5.0.0
  *
+ * @global WP_Locale $wp_locale WordPress date and time locale object.
+ *
  * @param WP_Scripts $scripts WP_Scripts object.
  */
 function wp_default_packages_inline_scripts( $scripts ) {
@@ -1379,9 +1388,13 @@ function wp_default_scripts( $scripts ) {
  *
  * @since 2.6.0
  *
+ * @global array $editor_styles
+ *
  * @param WP_Styles $styles
  */
 function wp_default_styles( $styles ) {
+	global $editor_styles;
+
 	// Include an unmodified $wp_version.
 	require ABSPATH . WPINC . '/version.php';
 
@@ -1534,7 +1547,6 @@ function wp_default_styles( $styles ) {
 		$wp_edit_blocks_dependencies[] = 'wp-editor-classic-layout-styles';
 	}
 
-	global $editor_styles;
 	if ( ! is_array( $editor_styles ) || count( $editor_styles ) === 0 ) {
 		// Include opinionated block styles if no $editor_styles are declared, so the editor never appears broken.
 		$wp_edit_blocks_dependencies[] = 'wp-block-library-theme';
@@ -2032,16 +2044,17 @@ function _print_scripts() {
  * @return array
  */
 function wp_print_head_scripts() {
+	global $wp_scripts;
+
 	if ( ! did_action( 'wp_print_scripts' ) ) {
 		/** This action is documented in wp-includes/functions.wp-scripts.php */
 		do_action( 'wp_print_scripts' );
 	}
 
-	global $wp_scripts;
-
 	if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
 		return array(); // No need to run if nothing is queued.
 	}
+
 	return print_head_scripts();
 }
 
@@ -2243,8 +2256,6 @@ function script_concat_settings() {
  * the editor and the front-end.
  *
  * @since 5.0.0
- *
- * @global WP_Screen $current_screen WordPress current screen object.
  */
 function wp_common_block_scripts_and_styles() {
 	if ( is_admin() && ! wp_should_load_block_editor_scripts_and_styles() ) {
@@ -2333,6 +2344,8 @@ function wp_enqueue_global_styles() {
  *
  * @since 5.6.0
  *
+ * @global WP_Screen $current_screen WordPress current screen object.
+ *
  * @return bool Whether scripts and styles should be enqueued.
  */
 function wp_should_load_block_editor_scripts_and_styles() {
@@ -2436,8 +2449,12 @@ function wp_enqueue_registered_block_scripts_and_styles() {
  * Function responsible for enqueuing the styles required for block styles functionality on the editor and on the frontend.
  *
  * @since 5.3.0
+ *
+ * @global WP_Styles $wp_styles
  */
 function enqueue_block_styles_assets() {
+	global $wp_styles;
+
 	$block_styles = WP_Block_Styles_Registry::get_instance()->get_all_registered();
 
 	foreach ( $block_styles as $block_name => $styles ) {
@@ -2465,7 +2482,7 @@ function( $html ) use ( $style_properties ) {
 				// If the site loads separate styles per-block, check if the block has a stylesheet registered.
 				if ( wp_should_load_separate_core_block_assets() ) {
 					$block_stylesheet_handle = generate_block_asset_handle( $block_name, 'style' );
-					global $wp_styles;
+
 					if ( isset( $wp_styles->registered[ $block_stylesheet_handle ] ) ) {
 						$handle = $block_stylesheet_handle;
 					}

From 0cf6d3e48d18b4e8cb932fa02bb82bf5de14a48c Mon Sep 17 00:00:00 2001
From: Pascal Birchler <swissspidy@git.wordpress.org>
Date: Wed, 27 Oct 2021 18:42:13 +0000
Subject: [PATCH 236/257] Role/Capability: Add support for capability queries
 in `WP_User_Query`.

Similar to the existing `role`/`role__in`/`role__not_in` query arguments, this adds support for three new query arguments in `WP_User_Query`:

* `capability`
* `capability__in`
* `capability__not_in`

These can be used to fetch users with (or without) a specific set of capabilities, for example to get all users
with the capability to edit a certain post type.

Under the hood, this will check all existing roles on the site and perform a `LIKE` query against the `capabilities` user meta field to find:

* all users with a role that has this capability
* all users with the capability being assigned directly

Note: In WordPress, not all capabilities are stored in the database. Capabilities can also be modified using filters like `map_meta_cap`. These new query arguments do NOT work for such capabilities.

The prime use case for capability queries is to get all "authors", i.e. users with the capability to edit a certain post type.

Until now, `'who' => 'authors'` was used for this, which relies on user levels. However, user levels were deprecated a long time ago and thus never added to custom roles. This led to constant frustration due to users with custom roles missing from places like author dropdowns.

This updates any usage of `'who' => 'authors'` in core to use capability queries instead.

Subsequently, `'who' => 'authors'` queries are being **deprecated** in favor of these new query arguments.

Also adds a new `capabilities` parameter (mapping to `capability__in` in `WP_User_Query`) to the REST API users controller.

Also updates `twentyfourteen_list_authors()` in Twenty Fourteen to make use of this new functionality, adding a new `twentyfourteen_list_authors_query_args` filter to make it easier to override this behavior.

Props scribu, lgladdly, boonebgorges, spacedmonkey, peterwilsoncc, SergeyBiryukov, swissspidy.
Fixes #16841.


git-svn-id: https://develop.svn.wordpress.org/trunk@51943 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../includes/class-wp-posts-list-table.php    |   2 +-
 src/wp-admin/includes/meta-boxes.php          |   4 +-
 .../themes/twentyfourteen/functions.php       |  23 +-
 src/wp-includes/class-wp-user-query.php       | 134 ++++++++++
 .../class-wp-rest-users-controller.php        |  32 ++-
 src/wp-includes/user.php                      |  21 +-
 .../tests/rest-api/rest-users-controller.php  | 114 ++++++---
 tests/phpunit/tests/user/query.php            | 241 ++++++++++++++++++
 tests/phpunit/tests/xmlrpc/wp/getUsers.php    |   3 +
 tests/qunit/fixtures/wp-api-generated.js      |   8 +
 10 files changed, 535 insertions(+), 47 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-posts-list-table.php b/src/wp-admin/includes/class-wp-posts-list-table.php
index 19686959e20b6..213ca201d95f9 100644
--- a/src/wp-admin/includes/class-wp-posts-list-table.php
+++ b/src/wp-admin/includes/class-wp-posts-list-table.php
@@ -1660,7 +1660,7 @@ public function inline_edit() {
 					if ( current_user_can( $post_type_object->cap->edit_others_posts ) ) {
 						$users_opt = array(
 							'hide_if_only_one_author' => false,
-							'who'                     => 'authors',
+							'capability'              => array( $post_type_object->cap->edit_posts ),
 							'name'                    => 'post_author',
 							'class'                   => 'authors',
 							'multi'                   => 1,
diff --git a/src/wp-admin/includes/meta-boxes.php b/src/wp-admin/includes/meta-boxes.php
index 193877ce96de6..c14ae52ddc02b 100644
--- a/src/wp-admin/includes/meta-boxes.php
+++ b/src/wp-admin/includes/meta-boxes.php
@@ -903,12 +903,14 @@ function post_slug_meta_box( $post ) {
  */
 function post_author_meta_box( $post ) {
 	global $user_ID;
+
+	$post_type_object = get_post_type_object( $post->post_type );
 	?>
 <label class="screen-reader-text" for="post_author_override"><?php _e( 'Author' ); ?></label>
 	<?php
 	wp_dropdown_users(
 		array(
-			'who'              => 'authors',
+			'capability'       => array( $post_type_object->cap->edit_posts ),
 			'name'             => 'post_author_override',
 			'selected'         => empty( $post->ID ) ? $user_ID : $post->post_author,
 			'include_selected' => true,
diff --git a/src/wp-content/themes/twentyfourteen/functions.php b/src/wp-content/themes/twentyfourteen/functions.php
index f39296b1ba33f..892d6ac939aef 100644
--- a/src/wp-content/themes/twentyfourteen/functions.php
+++ b/src/wp-content/themes/twentyfourteen/functions.php
@@ -491,15 +491,24 @@ function twentyfourteen_the_attached_image() {
 	 * @since Twenty Fourteen 1.0
 	 */
 	function twentyfourteen_list_authors() {
-		$contributor_ids = get_users(
-			array(
-				'fields'  => 'ID',
-				'orderby' => 'post_count',
-				'order'   => 'DESC',
-				'who'     => 'authors',
-			)
+		$args = array(
+			'fields'     => 'ID',
+			'orderby'    => 'post_count',
+			'order'      => 'DESC',
+			'capability' => array( 'edit_posts' ),
 		);
 
+		/**
+		 * Filters query arguments for listing authors.
+		 *
+		 * @since 3.3
+		 *
+		 * @param array $args Query arguments.
+		 */
+		$args = apply_filters( 'twentyfourteen_list_authors_query_args', $args );
+
+		$contributor_ids = get_users( $args );
+
 		foreach ( $contributor_ids as $contributor_id ) :
 			$post_count = count_user_posts( $contributor_id );
 
diff --git a/src/wp-includes/class-wp-user-query.php b/src/wp-includes/class-wp-user-query.php
index f760c252886f0..936ffe89bf708 100644
--- a/src/wp-includes/class-wp-user-query.php
+++ b/src/wp-includes/class-wp-user-query.php
@@ -93,6 +93,9 @@ public static function fill_query_vars( $args ) {
 			'role'                => '',
 			'role__in'            => array(),
 			'role__not_in'        => array(),
+			'capability'          => '',
+			'capability__in'      => array(),
+			'capability__not_in'  => array(),
 			'meta_key'            => '',
 			'meta_value'          => '',
 			'meta_compare'        => '',
@@ -133,6 +136,7 @@ public static function fill_query_vars( $args ) {
 	 *              querying for all users with using -1.
 	 * @since 4.7.0 Added 'nicename', 'nicename__in', 'nicename__not_in', 'login', 'login__in',
 	 *              and 'login__not_in' parameters.
+	 * @since 5.9.0 Added 'capability', 'capability__in', and 'capability__not_in' parameters.
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 * @global int  $blog_id
@@ -148,6 +152,19 @@ public static function fill_query_vars( $args ) {
 	 *                                             roles. Default empty array.
 	 *     @type string[]     $role__not_in        An array of role names to exclude. Users matching one or more of these
 	 *                                             roles will not be included in results. Default empty array.
+	 *     @type string       $capability          An array or a comma-separated list of capability names that users must match
+	 *                                             to be included in results. Note that this is an inclusive list: users
+	 *                                             must match *each* capability.
+	 *                                             Does NOT work for capabilities not in the database or filtered via {@see 'map_meta_cap'}.
+	 *                                             Default empty.
+	 *     @type string[]     $capability__in      An array of capability names. Matched users must have at least one of these
+	 *                                             capabilities.
+	 *                                             Does NOT work for capabilities not in the database or filtered via {@see 'map_meta_cap'}.
+	 *                                             Default empty array.
+	 *     @type string[]     $capability__not_in  An array of capability names to exclude. Users matching one or more of these
+	 *                                             capabilities will not be included in results.
+	 *                                             Does NOT work for capabilities not in the database or filtered via {@see 'map_meta_cap'}.
+	 *                                             Default empty array.
 	 *     @type string       $meta_key            User meta key. Default empty.
 	 *     @type string       $meta_value          User meta value. Default empty.
 	 *     @type string       $meta_compare        Comparison operator to test the `$meta_value`. Accepts '=', '!=',
@@ -320,6 +337,17 @@ public function prepare_query( $query = array() ) {
 		$this->meta_query->parse_query_vars( $qv );
 
 		if ( isset( $qv['who'] ) && 'authors' === $qv['who'] && $blog_id ) {
+			_deprecated_argument(
+				'WP_User_Query',
+				'5.9.0',
+				sprintf(
+					/* translators: 1: who, 2: capability */
+					__( '%1$s is deprecated. Use %2$s instead.' ),
+					'<code>who</code>',
+					'<code>capability</code>'
+				)
+			);
+
 			$who_query = array(
 				'key'     => $wpdb->get_blog_prefix( $blog_id ) . 'user_level',
 				'value'   => 0,
@@ -343,6 +371,7 @@ public function prepare_query( $query = array() ) {
 			$this->meta_query->parse_query_vars( $this->meta_query->queries );
 		}
 
+		// Roles.
 		$roles = array();
 		if ( isset( $qv['role'] ) ) {
 			if ( is_array( $qv['role'] ) ) {
@@ -362,6 +391,111 @@ public function prepare_query( $query = array() ) {
 			$role__not_in = (array) $qv['role__not_in'];
 		}
 
+		// Capabilities.
+		$available_roles = array();
+
+		if ( ! empty( $qv['capability'] ) || ! empty( $qv['capability__in'] ) || ! empty( $qv['capability__not_in'] ) ) {
+			global $wp_roles;
+
+			$wp_roles->for_site( $blog_id );
+			$available_roles = $wp_roles->roles;
+		}
+
+		$capabilities = array();
+		if ( ! empty( $qv['capability'] ) ) {
+			if ( is_array( $qv['capability'] ) ) {
+				$capabilities = $qv['capability'];
+			} elseif ( is_string( $qv['capability'] ) ) {
+				$capabilities = array_map( 'trim', explode( ',', $qv['capability'] ) );
+			}
+		}
+
+		$capability__in = array();
+		if ( ! empty( $qv['capability__in'] ) ) {
+			$capability__in = (array) $qv['capability__in'];
+		}
+
+		$capability__not_in = array();
+		if ( ! empty( $qv['capability__not_in'] ) ) {
+			$capability__not_in = (array) $qv['capability__not_in'];
+		}
+
+		// Keep track of all capabilities and the roles they're added on.
+		$caps_with_roles = array();
+
+		foreach ( $available_roles as $role => $role_data ) {
+			$role_caps = array_keys( array_filter( $role_data['capabilities'] ) );
+
+			foreach ( $capabilities as $cap ) {
+				if ( in_array( $cap, $role_caps, true ) ) {
+					$caps_with_roles[ $cap ][] = $role;
+					break;
+				}
+			}
+
+			foreach ( $capability__in as $cap ) {
+				if ( in_array( $cap, $role_caps, true ) ) {
+					$role__in[] = $role;
+					break;
+				}
+			}
+
+			foreach ( $capability__not_in as $cap ) {
+				if ( in_array( $cap, $role_caps, true ) ) {
+					$role__not_in[] = $role;
+					break;
+				}
+			}
+		}
+
+		$role__in     = array_merge( $role__in, $capability__in );
+		$role__not_in = array_merge( $role__not_in, $capability__not_in );
+
+		$roles        = array_unique( $roles );
+		$role__in     = array_unique( $role__in );
+		$role__not_in = array_unique( $role__not_in );
+
+		// Support querying by capabilities added directly to users.
+		if ( $blog_id && ! empty( $capabilities ) ) {
+			$capabilities_clauses = array( 'relation' => 'AND' );
+
+			foreach ( $capabilities as $cap ) {
+				$clause = array( 'relation' => 'OR' );
+
+				$clause[] = array(
+					'key'     => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
+					'value'   => '"' . $cap . '"',
+					'compare' => 'LIKE',
+				);
+
+				if ( ! empty( $caps_with_roles[ $cap ] ) ) {
+					foreach ( $caps_with_roles[ $cap ] as $role ) {
+						$clause[] = array(
+							'key'     => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
+							'value'   => '"' . $role . '"',
+							'compare' => 'LIKE',
+						);
+					}
+				}
+
+				$capabilities_clauses[] = $clause;
+			}
+
+			$role_queries[] = $capabilities_clauses;
+
+			if ( empty( $this->meta_query->queries ) ) {
+				$this->meta_query->queries[] = $capabilities_clauses;
+			} else {
+				// Append the cap query to the original queries and reparse the query.
+				$this->meta_query->queries = array(
+					'relation' => 'AND',
+					array( $this->meta_query->queries, array( $capabilities_clauses ) ),
+				);
+			}
+
+			$this->meta_query->parse_query_vars( $this->meta_query->queries );
+		}
+
 		if ( $blog_id && ( ! empty( $roles ) || ! empty( $role__in ) || ! empty( $role__not_in ) || is_multisite() ) ) {
 			$role_queries = array();
 
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
index b3cdfc2e31e93..e3e5d935d7a1a 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
@@ -198,6 +198,15 @@ public function get_items_permissions_check( $request ) {
 			);
 		}
 
+		// Check if capabilities is specified in GET request and if user can list users.
+		if ( ! empty( $request['capabilities'] ) && ! current_user_can( 'list_users' ) ) {
+			return new WP_Error(
+				'rest_user_cannot_view',
+				__( 'Sorry, you are not allowed to filter users by capability.' ),
+				array( 'status' => rest_authorization_required_code() )
+			);
+		}
+
 		if ( 'edit' === $request['context'] && ! current_user_can( 'list_users' ) ) {
 			return new WP_Error(
 				'rest_forbidden_context',
@@ -254,13 +263,14 @@ public function get_items( $request ) {
 		 * present in $registered will be set.
 		 */
 		$parameter_mappings = array(
-			'exclude'  => 'exclude',
-			'include'  => 'include',
-			'order'    => 'order',
-			'per_page' => 'number',
-			'search'   => 'search',
-			'roles'    => 'role__in',
-			'slug'     => 'nicename__in',
+			'exclude'      => 'exclude',
+			'include'      => 'include',
+			'order'        => 'order',
+			'per_page'     => 'number',
+			'search'       => 'search',
+			'roles'        => 'role__in',
+			'capabilities' => 'capability__in',
+			'slug'         => 'nicename__in',
 		);
 
 		$prepared_args = array();
@@ -1554,6 +1564,14 @@ public function get_collection_params() {
 			),
 		);
 
+		$query_params['capabilities'] = array(
+			'description' => __( 'Limit result set to users matching at least one specific capability provided. Accepts csv list or single capability.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'type' => 'string',
+			),
+		);
+
 		$query_params['who'] = array(
 			'description' => __( 'Limit result set to users who are considered authors.' ),
 			'type'        => 'string',
diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php
index 55bd546568fe1..018c960c031b1 100644
--- a/src/wp-includes/user.php
+++ b/src/wp-includes/user.php
@@ -1320,13 +1320,32 @@ function wp_dropdown_users( $args = '' ) {
 		'role'                    => '',
 		'role__in'                => array(),
 		'role__not_in'            => array(),
+		'capability'              => '',
+		'capability__in'          => array(),
+		'capability__not_in'      => array(),
 	);
 
 	$defaults['selected'] = is_author() ? get_query_var( 'author' ) : 0;
 
 	$parsed_args = wp_parse_args( $args, $defaults );
 
-	$query_args = wp_array_slice_assoc( $parsed_args, array( 'blog_id', 'include', 'exclude', 'orderby', 'order', 'who', 'role', 'role__in', 'role__not_in' ) );
+	$query_args = wp_array_slice_assoc(
+		$parsed_args,
+		array(
+			'blog_id',
+			'include',
+			'exclude',
+			'orderby',
+			'order',
+			'who',
+			'role',
+			'role__in',
+			'role__not_in',
+			'capability',
+			'capability__in',
+			'capability__not_in',
+		)
+	);
 
 	$fields = array( 'ID', 'user_login' );
 
diff --git a/tests/phpunit/tests/rest-api/rest-users-controller.php b/tests/phpunit/tests/rest-api/rest-users-controller.php
index 1705cba2eb699..478148ed56229 100644
--- a/tests/phpunit/tests/rest-api/rest-users-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-users-controller.php
@@ -15,6 +15,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
 	protected static $editor;
 	protected static $draft_editor;
 	protected static $subscriber;
+	protected static $author;
 
 	protected static $authors     = array();
 	protected static $posts       = array();
@@ -55,6 +56,13 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 				'user_email'   => 'subscriber@example.com',
 			)
 		);
+		self::$author       = $factory->user->create(
+			array(
+				'display_name' => 'author',
+				'role'         => 'author',
+				'user_email'   => 'author@example.com',
+			)
+		);
 
 		foreach ( array( true, false ) as $show_in_rest ) {
 			foreach ( array( true, false ) as $public ) {
@@ -107,7 +115,7 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 		}
 
 		// Set up users for pagination tests.
-		for ( $i = 0; $i < self::$total_users - 10; $i++ ) {
+		for ( $i = 0; $i < self::$total_users - 11; $i++ ) {
 			self::$user_ids[] = $factory->user->create(
 				array(
 					'role'         => 'contributor',
@@ -121,6 +129,7 @@ public static function wpTearDownAfterClass() {
 		self::delete_user( self::$user );
 		self::delete_user( self::$editor );
 		self::delete_user( self::$draft_editor );
+		self::delete_user( self::$author );
 
 		foreach ( self::$posts as $post ) {
 			wp_delete_post( $post, true );
@@ -183,8 +192,7 @@ public function test_registered_query_params() {
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
 		$keys     = array_keys( $data['endpoints'][0]['args'] );
-		sort( $keys );
-		$this->assertSame(
+		$this->assertEqualSets(
 			array(
 				'context',
 				'exclude',
@@ -195,6 +203,7 @@ public function test_registered_query_params() {
 				'page',
 				'per_page',
 				'roles',
+				'capabilities',
 				'search',
 				'slug',
 				'who',
@@ -795,32 +804,19 @@ public function test_get_items_slug_csv_query() {
 	public function test_get_items_roles() {
 		wp_set_current_user( self::$user );
 
-		$tango = $this->factory->user->create(
-			array(
-				'display_name' => 'tango',
-				'role'         => 'subscriber',
-			)
-		);
-		$yolo  = $this->factory->user->create(
-			array(
-				'display_name' => 'yolo',
-				'role'         => 'author',
-			)
-		);
-
 		$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
 		$request->set_param( 'roles', 'author,subscriber' );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
-		$this->assertCount( 3, $data );
-		$this->assertSame( $tango, $data[1]['id'] );
-		$this->assertSame( $yolo, $data[2]['id'] );
+		$this->assertCount( 2, $data );
+		$this->assertSame( self::$author, $data[0]['id'] );
+		$this->assertSame( self::$subscriber, $data[1]['id'] );
 
 		$request->set_param( 'roles', 'author' );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
 		$this->assertCount( 1, $data );
-		$this->assertSame( $yolo, $data[0]['id'] );
+		$this->assertSame( self::$author, $data[0]['id'] );
 
 		wp_set_current_user( 0 );
 
@@ -838,28 +834,86 @@ public function test_get_items_roles() {
 	public function test_get_items_invalid_roles() {
 		wp_set_current_user( self::$user );
 
-		$lolz = $this->factory->user->create(
-			array(
-				'display_name' => 'lolz',
-				'role'         => 'author',
-			)
-		);
-
 		$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
 		$request->set_param( 'roles', 'ilovesteak,author' );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
 		$this->assertCount( 1, $data );
-		$this->assertSame( $lolz, $data[0]['id'] );
+		$this->assertSame( self::$author, $data[0]['id'] );
 
 		$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
 		$request->set_param( 'roles', 'steakisgood' );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
-		$this->assertCount( 0, $data );
-		$this->assertSame( array(), $data );
+		$this->assertIsArray( $data );
+		$this->assertEmpty( $data );
 	}
 
+	/**
+	 * @ticket 16841
+	 */
+	public function test_get_items_capabilities() {
+		wp_set_current_user( self::$user );
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
+		$request->set_param( 'capabilities', 'edit_posts' );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertNotEmpty( $data );
+		foreach ( $data as $user ) {
+			$this->assertTrue( user_can( $user['id'], 'edit_posts' ) );
+		}
+	}
+
+	/**
+	 * @ticket 16841
+	 */
+	public function test_get_items_capabilities_no_permission_no_user() {
+		wp_set_current_user( 0 );
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
+		$request->set_param( 'capabilities', 'edit_posts' );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_user_cannot_view', $response, 401 );
+	}
+
+	/**
+	 * @ticket 16841
+	 */
+	public function test_get_items_capabilities_no_permission_editor() {
+		wp_set_current_user( self::$editor );
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
+		$request->set_param( 'capabilities', 'edit_posts' );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_user_cannot_view', $response, 403 );
+	}
+
+	/**
+	 * @ticket 16841
+	 */
+	public function test_get_items_invalid_capabilities() {
+		wp_set_current_user( self::$user );
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
+		$request->set_param( 'roles', 'ilovesteak,author' );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+		$this->assertCount( 1, $data );
+		$this->assertSame( self::$author, $data[0]['id'] );
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
+		$request->set_param( 'capabilities', 'steakisgood' );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+		$this->assertIsArray( $data );
+		$this->assertEmpty( $data );
+	}
+
+	/**
+	 * @expectedDeprecated WP_User_Query
+	 */
 	public function test_get_items_who_author_query() {
 		wp_set_current_user( self::$superadmin );
 
diff --git a/tests/phpunit/tests/user/query.php b/tests/phpunit/tests/user/query.php
index f0a0827038625..170e5b24a2ff0 100644
--- a/tests/phpunit/tests/user/query.php
+++ b/tests/phpunit/tests/user/query.php
@@ -730,6 +730,7 @@ public function test_roles_and_caps_should_be_populated_for_explicit_value_of_di
 	/**
 	 * @ticket 32019
 	 * @group ms-required
+	 * @expectedDeprecated WP_User_Query
 	 */
 	public function test_who_authors() {
 		$b = self::factory()->blog->create();
@@ -755,6 +756,7 @@ public function test_who_authors() {
 	/**
 	 * @ticket 32019
 	 * @group ms-required
+	 * @expectedDeprecated WP_User_Query
 	 */
 	public function test_who_authors_should_work_alongside_meta_query() {
 		$b = self::factory()->blog->create();
@@ -789,6 +791,7 @@ public function test_who_authors_should_work_alongside_meta_query() {
 	/**
 	 * @ticket 36724
 	 * @group ms-required
+	 * @expectedDeprecated WP_User_Query
 	 */
 	public function test_who_authors_should_work_alongside_meta_params() {
 		$b = self::factory()->blog->create();
@@ -1725,4 +1728,242 @@ public static function filter_users_pre_query( $posts, $query ) {
 
 		return array( 555 );
 	}
+
+	/**
+	 * @ticket 16841
+	 * @group ms-excluded
+	 */
+	public function test_get_single_capability_by_string() {
+		$wp_user_search = new WP_User_Query( array( 'capability' => 'install_plugins' ) );
+		$users          = $wp_user_search->get_results();
+
+		$this->assertNotEmpty( $users );
+		foreach ( $users as $user ) {
+			// User has the capability, but on Multisite they would also need to be a super admin.
+			// Hence using get_role_caps() instead of has_cap().
+			$role_caps = $user->get_role_caps();
+			$this->assertArrayHasKey( 'install_plugins', $role_caps );
+			$this->assertTrue( $role_caps['install_plugins'] );
+		}
+	}
+
+	/**
+	 * @ticket 16841
+	 * @group ms-required
+	 */
+	public function test_get_single_capability_by_string_multisite() {
+		$wp_user_search = new WP_User_Query( array( 'capability' => array( 'install_plugins' ) ) );
+		$users          = $wp_user_search->get_results();
+
+		$this->assertNotEmpty( $users );
+		foreach ( $users as $user ) {
+			$role_caps = $user->get_role_caps();
+			$this->assertArrayHasKey( 'install_plugins', $role_caps );
+			$this->assertTrue( $role_caps['install_plugins'] );
+			// While the user can have the capability, on Multisite they also need to be a super admin.
+			if ( is_super_admin( $user->ID ) ) {
+				$this->assertTrue( $user->has_cap( 'install_plugins' ) );
+			} else {
+				$this->assertFalse( $user->has_cap( 'install_plugins' ) );
+			}
+		}
+	}
+
+	/**
+	 * @ticket 16841
+	 */
+	public function test_get_single_capability_invalid() {
+		$wp_user_search = new WP_User_Query( array( 'capability' => 'foo_bar' ) );
+		$users          = $wp_user_search->get_results();
+
+		$this->assertEmpty( $users );
+	}
+
+	/**
+	 * @ticket 16841
+	 */
+	public function test_get_single_capability_by_array() {
+		$wp_user_search = new WP_User_Query( array( 'capability' => array( 'install_plugins' ) ) );
+		$users          = $wp_user_search->get_results();
+
+		$this->assertNotEmpty( $users );
+		foreach ( $users as $user ) {
+			// User has the capability, but on Multisite they would also need to be a super admin.
+			// Hence using get_role_caps() instead of has_cap().
+			$role_caps = $user->get_role_caps();
+			$this->assertArrayHasKey( 'install_plugins', $role_caps );
+			$this->assertTrue( $role_caps['install_plugins'] );
+		}
+	}
+
+	/**
+	 * @ticket 16841
+	 */
+	public function test_get_single_capability_added_to_user() {
+		foreach ( self::$sub_ids as $subscriber ) {
+			$subscriber = get_user_by( 'ID', $subscriber );
+			$subscriber->add_cap( 'custom_cap' );
+		}
+
+		$wp_user_search = new WP_User_Query( array( 'capability' => 'custom_cap' ) );
+		$users          = $wp_user_search->get_results();
+
+		$this->assertCount( 2, $users );
+		$this->assertEqualSets( self::$sub_ids, wp_list_pluck( $users, 'ID' ) );
+
+		foreach ( $users as $user ) {
+			$this->assertTrue( $user->has_cap( 'custom_cap' ) );
+		}
+	}
+
+	/**
+	 * @ticket 16841
+	 */
+	public function test_get_multiple_capabilities_should_only_match_users_who_have_each_capability_test() {
+		wp_roles()->add_role( 'role_1', 'Role 1', array( 'role_1_cap' => true ) );
+		wp_roles()->add_role( 'role_2', 'Role 2', array( 'role_2_cap' => true ) );
+
+		$subscriber1 = get_user_by( 'ID', self::$sub_ids[0] );
+		$subscriber1->add_role( 'role_1' );
+
+		$subscriber2 = get_user_by( 'ID', self::$sub_ids[1] );
+		$subscriber2->add_role( 'role_1' );
+		$subscriber2->add_role( 'role_2' );
+
+		$wp_user_search = new WP_User_Query( array( 'capability' => array( 'role_1_cap', 'role_2_cap' ) ) );
+		$users          = $wp_user_search->get_results();
+
+		$this->assertCount( 1, $users );
+		$this->assertSame( $users[0]->ID, $subscriber2->ID );
+		foreach ( $users as $user ) {
+			$this->assertTrue( $user->has_cap( 'role_1_cap' ) );
+			$this->assertTrue( $user->has_cap( 'role_2_cap' ) );
+		}
+	}
+
+	/**
+	 * @ticket 16841
+	 */
+	public function test_get_multiple_capabilities_should_only_match_users_who_have_each_capability_added_to_user() {
+		$admin1 = get_user_by( 'ID', self::$admin_ids[0] );
+		$admin1->add_cap( 'custom_cap' );
+
+		$wp_user_search = new WP_User_Query( array( 'capability' => array( 'manage_options', 'custom_cap' ) ) );
+		$users          = $wp_user_search->get_results();
+
+		$this->assertCount( 1, $users );
+		$this->assertSame( $users[0]->ID, $admin1->ID );
+		$this->assertTrue( $users[0]->has_cap( 'custom_cap' ) );
+		$this->assertTrue( $users[0]->has_cap( 'manage_options' ) );
+	}
+
+	/**
+	 * @ticket 16841
+	 */
+	public function test_get_multiple_capabilities_or() {
+		$wp_user_search = new WP_User_Query( array( 'capability__in' => array( 'publish_posts', 'edit_posts' ) ) );
+		$users          = $wp_user_search->get_results();
+
+		$this->assertNotEmpty( $users );
+		foreach ( $users as $user ) {
+			$this->assertTrue( $user->has_cap( 'publish_posts' ) || $user->has_cap( 'edit_posts' ) );
+		}
+	}
+
+	/**
+	 * @ticket 16841
+	 */
+	public function test_get_multiple_capabilities_or_added_to_user() {
+		$user = self::factory()->user->create_and_get( array( 'role' => 'subscriber' ) );
+		$user->add_cap( 'custom_cap' );
+
+		$wp_user_search = new WP_User_Query( array( 'capability__in' => array( 'publish_posts', 'custom_cap' ) ) );
+		$users          = $wp_user_search->get_results();
+
+		$this->assertNotEmpty( $users );
+		foreach ( $users as $user ) {
+			$this->assertTrue( $user->has_cap( 'publish_posts' ) || $user->has_cap( 'custom_cap' ) );
+		}
+	}
+
+	/**
+	 * @ticket 16841
+	 */
+	public function test_capability_exclusion() {
+		$wp_user_search = new WP_User_Query( array( 'capability__not_in' => array( 'publish_posts', 'edit_posts' ) ) );
+		$users          = $wp_user_search->get_results();
+
+		$this->assertNotEmpty( $users );
+		foreach ( $users as $user ) {
+			$this->assertFalse( $user->has_cap( 'publish_posts' ) );
+			$this->assertFalse( $user->has_cap( 'edit_posts' ) );
+		}
+	}
+
+	/**
+	 * @ticket 16841
+	 */
+	public function test_capability_exclusion_added_to_user() {
+		$user = self::factory()->user->create_and_get( array( 'role' => 'subscriber' ) );
+		$user->add_cap( 'custom_cap' );
+
+		$wp_user_search = new WP_User_Query( array( 'capability__not_in' => array( 'publish_posts', 'custom_cap' ) ) );
+		$users          = $wp_user_search->get_results();
+
+		$this->assertNotEmpty( $users );
+		foreach ( $users as $user ) {
+			$this->assertFalse( $user->has_cap( 'publish_posts' ) );
+			$this->assertFalse( $user->has_cap( 'custom_cap' ) );
+		}
+	}
+
+	/**
+	 * @ticket 16841
+	 */
+	public function test_capability__in_capability__not_in_combined() {
+		$wp_user_search = new WP_User_Query(
+			array(
+				'capability__in'     => array( 'read' ),
+				'capability__not_in' => array( 'manage_options' ),
+			)
+		);
+		$users          = $wp_user_search->get_results();
+
+		$this->assertNotEmpty( $users );
+		foreach ( $users as $user ) {
+			$this->assertTrue( $user->has_cap( 'read' ) );
+			$this->assertFalse( $user->has_cap( 'manage_options' ) );
+		}
+	}
+
+	/**
+	 * @ticket 16841
+	 * @group ms-required
+	 */
+	public function test_get_single_capability_multisite_blog_id() {
+		$blog_id = self::factory()->blog->create();
+
+		add_user_to_blog( $blog_id, self::$author_ids[0], 'subscriber' );
+		add_user_to_blog( $blog_id, self::$author_ids[1], 'author' );
+		add_user_to_blog( $blog_id, self::$author_ids[2], 'editor' );
+
+		$wp_user_search = new WP_User_Query(
+			array(
+				'capability' => 'publish_posts',
+				'blog_id'    => $blog_id,
+			)
+		);
+		$users          = $wp_user_search->get_results();
+
+		$found = wp_list_pluck( $wp_user_search->get_results(), 'ID' );
+
+		$this->assertNotEmpty( $users );
+		foreach ( $users as $user ) {
+			$this->assertTrue( $user->has_cap( 'publish_posts' ) );
+		}
+
+		$this->assertNotContains( self::$author_ids[0], $found );
+		$this->assertContains( self::$author_ids[1], $found );
+		$this->assertContains( self::$author_ids[2], $found );
+	}
 }
diff --git a/tests/phpunit/tests/xmlrpc/wp/getUsers.php b/tests/phpunit/tests/xmlrpc/wp/getUsers.php
index 627facea5ce35..4975b68381051 100644
--- a/tests/phpunit/tests/xmlrpc/wp/getUsers.php
+++ b/tests/phpunit/tests/xmlrpc/wp/getUsers.php
@@ -54,6 +54,9 @@ function test_invalid_role() {
 		$this->assertSame( 403, $results->code );
 	}
 
+	/**
+	 * @expectedDeprecated WP_User_Query
+	 */
 	function test_role_filter() {
 		$author_id        = $this->make_user_by_role( 'author' );
 		$editor_id        = $this->make_user_by_role( 'editor' );
diff --git a/tests/qunit/fixtures/wp-api-generated.js b/tests/qunit/fixtures/wp-api-generated.js
index 63dbf37f05c88..0d5b2230e0b47 100644
--- a/tests/qunit/fixtures/wp-api-generated.js
+++ b/tests/qunit/fixtures/wp-api-generated.js
@@ -5357,6 +5357,14 @@ mockedApiResponse.Schema = {
                             },
                             "required": false
                         },
+                        "capabilities": {
+                            "description": "Limit result set to users matching at least one specific capability provided. Accepts csv list or single capability.",
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            },
+                            "required": false
+                        },
                         "who": {
                             "description": "Limit result set to users who are considered authors.",
                             "type": "string",

From 39479eb86a4cdfac9d508f455d99de95662dd828 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Thu, 28 Oct 2021 14:09:07 +0000
Subject: [PATCH 237/257] Coding Standards: Correct alignment in
 `wp_enqueue_global_styles()`.

This fixes an `Equals sign not aligned with surrounding assignments; expected 5 spaces but found 1 space` WPCS warning.

Follow-up to [50973], [51819].

See #53359.

git-svn-id: https://develop.svn.wordpress.org/trunk@51944 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/script-loader.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index fa757b4fed1ed..7b66e1befa031 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -2310,8 +2310,9 @@ function wp_enqueue_global_styles() {
 		! is_admin()
 	);
 
-	$stylesheet = null;
+	$stylesheet     = null;
 	$transient_name = 'global_styles_' . get_stylesheet();
+
 	if ( $can_use_cache ) {
 		$cache = get_transient( $transient_name );
 		if ( $cache ) {

From 548829f2717de01fea971c740380e89a80fe7543 Mon Sep 17 00:00:00 2001
From: Joe Dolson <joedolson@git.wordpress.org>
Date: Thu, 28 Oct 2021 16:06:20 +0000
Subject: [PATCH 238/257] Media: Close attachment details modal with esc key.

The event that fired closing the attachment details modal also removed the keydown event listener, so subsequent modals could not be closed with the escape key.

Props vondelphia, sourovroy, sabernhardt
Fixes #53924.

git-svn-id: https://develop.svn.wordpress.org/trunk@51945 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/js/media/views/modal.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/js/media/views/modal.js b/src/js/media/views/modal.js
index 42fc7c9f6056f..f28c92e7e6500 100644
--- a/src/js/media/views/modal.js
+++ b/src/js/media/views/modal.js
@@ -138,8 +138,8 @@ Modal = wp.media.View.extend(/** @lends wp.media.view.Modal.prototype */{
 		// Enable page scrolling.
 		$( 'body' ).removeClass( 'modal-open' );
 
-		// Hide modal and remove restricted media modal tab focus once it's closed.
-		this.$el.hide().off( 'keydown' );
+		// Hide the modal element by adding display none.
+		this.$el.hide();
 
 		/*
 		 * Make visible again to assistive technologies all body children that

From fe81c8fb358baf46d20ddc85bb0a03e6c5a97aef Mon Sep 17 00:00:00 2001
From: Joe Dolson <joedolson@git.wordpress.org>
Date: Thu, 28 Oct 2021 17:27:04 +0000
Subject: [PATCH 239/257] Administration: Hide mobile menu on focusout.

Closes the admin menu on mobile devices when keyboard focus moves outside of the menu or menu toggle elements. Improves the usability of the menu on mobile by allowing closure anywhere outside the menu rather than only on the toggle.

Props kaneva, costdev, sabernhardt
Fixes #53587.

git-svn-id: https://develop.svn.wordpress.org/trunk@51946 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/js/_enqueues/admin/common.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/js/_enqueues/admin/common.js b/src/js/_enqueues/admin/common.js
index 636237f0b4f2d..9c583f3d79efe 100644
--- a/src/js/_enqueues/admin/common.js
+++ b/src/js/_enqueues/admin/common.js
@@ -1695,6 +1695,25 @@ $( function() {
 				}
 			} );
 
+			// Close sidebar when focus moves outside of toggle and sidebar.
+			$( '#wp-admin-bar-menu-toggle, #adminmenumain' ).on( 'focusout', function() {
+				var focusIsInToggle, focusIsInSidebar;
+
+				if ( ! $wpwrap.hasClass( 'wp-responsive-open' ) ) {
+					return;
+				}
+
+				// A brief delay is required to allow focus to switch to another element.
+				setTimeout( function() {
+					focusIsInToggle  = $.contains( $( '#wp-admin-bar-menu-toggle' )[0], $( ':focus' )[0] );
+					focusIsInSidebar = $.contains( $( '#adminmenumain' )[0], $( ':focus' )[0] );
+
+					if ( ! focusIsInToggle && ! focusIsInSidebar ) {
+						$( '#wp-admin-bar-menu-toggle' ).trigger( 'click.wp-responsive' );
+					}
+				}, 10 );
+			} );
+
 			// Add menu events.
 			$adminmenu.on( 'click.wp-responsive', 'li.wp-has-submenu > a', function( event ) {
 				if ( ! $adminmenu.data('wp-responsive') ) {

From 965a38fc82d998ac921d42dc20f7614583688fc7 Mon Sep 17 00:00:00 2001
From: Joe Dolson <joedolson@git.wordpress.org>
Date: Thu, 28 Oct 2021 17:49:08 +0000
Subject: [PATCH 240/257] Media: Remove deprecated click function in media
 uploader.

Replace the call to jQuery's deprecated click handler.

Props kapilpaul.
Fixes #53261.

git-svn-id: https://develop.svn.wordpress.org/trunk@51947 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/js/_enqueues/vendor/plupload/handlers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/js/_enqueues/vendor/plupload/handlers.js b/src/js/_enqueues/vendor/plupload/handlers.js
index 2560495b7690d..fa602daf434ab 100644
--- a/src/js/_enqueues/vendor/plupload/handlers.js
+++ b/src/js/_enqueues/vendor/plupload/handlers.js
@@ -149,7 +149,7 @@ function prepareMediaItemInit( fileObj ) {
 	jQuery( '.filename.original', item ).replaceWith( jQuery( '.filename.new', item ) );
 
 	// Bind Ajax to the new Delete button.
-	jQuery( 'a.delete', item ).click( function(){
+	jQuery( 'a.delete', item ).on( 'click', function(){
 		// Tell the server to delete it. TODO: Handle exceptions.
 		jQuery.ajax({
 			url: ajaxurl,
@@ -167,7 +167,7 @@ function prepareMediaItemInit( fileObj ) {
 	});
 
 	// Bind Ajax to the new Undo button.
-	jQuery( 'a.undo', item ).click( function(){
+	jQuery( 'a.undo', item ).on( 'click', function(){
 		// Tell the server to untrash it. TODO: Handle exceptions.
 		jQuery.ajax({
 			url: ajaxurl,

From 59dc04981624986286ebfd66fb428017659987d9 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Fri, 29 Oct 2021 15:33:18 +0000
Subject: [PATCH 241/257] Site Health: Correct and improve the documentation
 for the `debug_information` hook.

This corrects the structure of the documentation so it accurately reflects the array elements contained within.

See #53399.


git-svn-id: https://develop.svn.wordpress.org/trunk@51949 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-debug-data.php | 52 +++++++++++--------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-debug-data.php b/src/wp-admin/includes/class-wp-debug-data.php
index b1e72314c5b26..4746546b968c6 100644
--- a/src/wp-admin/includes/class-wp-debug-data.php
+++ b/src/wp-admin/includes/class-wp-debug-data.php
@@ -1408,7 +1408,7 @@ public static function debug_data() {
 		}
 
 		/**
-		 * Add or modify the debug information.
+		 * Add to or modify the debug information shown on the Tools -> Site Health -> Info screen.
 		 *
 		 * Plugin or themes may wish to introduce their own debug information without creating additional admin pages
 		 * they can utilize this filter to introduce their own sections or add more data to existing sections.
@@ -1417,35 +1417,43 @@ public static function debug_data() {
 		 * a prefix, both for consistency as well as avoiding key collisions. Note that the array keys are used as labels
 		 * for the copied data.
 		 *
-		 * All strings are expected to be plain text except $description that can contain inline HTML tags (see below).
+		 * All strings are expected to be plain text except `$description` that can contain inline HTML tags (see below).
 		 *
 		 * @since 5.2.0
 		 *
 		 * @param array $args {
 		 *     The debug information to be added to the core information page.
 		 *
-		 *     This is an associative multi-dimensional array, up to three levels deep. The topmost array holds the sections.
-		 *     Each section has a `$fields` associative array (see below), and each `$value` in `$fields` can be
-		 *     another associative array of name/value pairs when there is more structured data to display.
+		 *     This is an associative multi-dimensional array, up to three levels deep. The topmost array holds the sections, keyed by section ID.
 		 *
-		 *     @type string  $label        The title for this section of the debug output.
-		 *     @type string  $description  Optional. A description for your information section which may contain basic HTML
-		 *                                 markup, inline tags only as it is outputted in a paragraph.
-		 *     @type boolean $show_count   Optional. If set to `true` the amount of fields will be included in the title for
-		 *                                 this section.
-		 *     @type boolean $private      Optional. If set to `true` the section and all associated fields will be excluded
-		 *                                 from the copied data.
-		 *     @type array   $fields {
-		 *         An associative array containing the data to be displayed.
+		 *     @type array ...$0 {
+		 *         Each section has a `$fields` associative array (see below), and each `$value` in `$fields` can be
+		 *         another associative array of name/value pairs when there is more structured data to display.
 		 *
-		 *         @type string  $label    The label for this piece of information.
-		 *         @type string  $value    The output that is displayed for this field. Text should be translated. Can be
-		 *                                 an associative array that is displayed as name/value pairs.
-		 *         @type string  $debug    Optional. The output that is used for this field when the user copies the data.
-		 *                                 It should be more concise and not translated. If not set, the content of `$value` is used.
-		 *                                 Note that the array keys are used as labels for the copied data.
-		 *         @type boolean $private  Optional. If set to `true` the field will not be included in the copied data
-		 *                                 allowing you to show, for example, API keys here.
+		 *         @type string $label       Required. The title for this section of the debug output.
+		 *         @type string $description Optional. A description for your information section which may contain basic HTML
+		 *                                   markup, inline tags only as it is outputted in a paragraph.
+		 *         @type bool   $show_count  Optional. If set to `true` the amount of fields will be included in the title for
+		 *                                   this section.
+		 *         @type bool   $private     Optional. If set to `true` the section and all associated fields will be excluded
+		 *                                   from the copied data. Default false.
+		 *         @type array  $fields {
+		 *             Required. An associative array containing the fields to be displayed in the section, keyed by field ID.
+		 *
+		 *             @type array ...$0 {
+		 *                 An associative array containing the data to be displayed for the field.
+		 *
+		 *                 @type string $label    Required. The label for this piece of information.
+		 *                 @type mixed  $value    Required. The output that is displayed for this field. Text should be translated. Can be
+		 *                                        an associative array that is displayed as name/value pairs.
+		 *                                        Accepted types: `string|int|float|(string|int|float)[]`.
+		 *                 @type string $debug    Optional. The output that is used for this field when the user copies the data.
+		 *                                        It should be more concise and not translated. If not set, the content of `$value` is used.
+		 *                                        Note that the array keys are used as labels for the copied data.
+		 *                 @type bool   $private  Optional. If set to `true` the field will not be included in the copied data
+		 *                                        allowing you to show, for example, API keys here. Default false.
+		 *             }
+		 *         }
 		 *     }
 		 * }
 		 */

From c92c8df5d8968b5b0979f2340e1d188f98570a82 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Fri, 29 Oct 2021 16:50:29 +0000
Subject: [PATCH 242/257] Date/Time: Improve the docblocks for various date and
 time related functions.

See #53399, #28992, #40653


git-svn-id: https://develop.svn.wordpress.org/trunk@51950 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/functions.php | 46 +++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index 86a21a8e78e47..5101e142bfa51 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -10,9 +10,9 @@
 /**
  * Convert given MySQL date string into a different format.
  *
- * `$format` should be a PHP date format string.
- * 'U' and 'G' formats will return a sum of timestamp with timezone offset.
- * `$date` is expected to be local time in MySQL format (`Y-m-d H:i:s`).
+ *  - `$format` should be a PHP date format string.
+ *  - 'U' and 'G' formats will return an integer sum of timestamp with timezone offset.
+ *  - `$date` is expected to be local time in MySQL format (`Y-m-d H:i:s`).
  *
  * Historically UTC time could be passed to the function to produce Unix timestamp.
  *
@@ -24,7 +24,7 @@
  * @param string $format    Format of the date to return.
  * @param string $date      Date string to convert.
  * @param bool   $translate Whether the return date should be translated. Default true.
- * @return string|int|false Formatted date string or sum of Unix timestamp and timezone offset.
+ * @return string|int|false Integer if `$format` is 'U' or 'G', string otherwise.
  *                          False on failure.
  */
 function mysql2date( $format, $date, $translate = true ) {
@@ -53,20 +53,21 @@ function mysql2date( $format, $date, $translate = true ) {
 /**
  * Retrieves the current time based on specified type.
  *
- * The 'mysql' type will return the time in the format for MySQL DATETIME field.
- * The 'timestamp' type will return the current timestamp or a sum of timestamp
- * and timezone offset, depending on `$gmt`.
- * Other strings will be interpreted as PHP date formats (e.g. 'Y-m-d').
+ *  - The 'mysql' type will return the time in the format for MySQL DATETIME field.
+ *  - The 'timestamp' or 'U' types will return the current timestamp or a sum of timestamp
+ *    and timezone offset, depending on `$gmt`.
+ *  - Other strings will be interpreted as PHP date formats (e.g. 'Y-m-d').
  *
- * If $gmt is set to either '1' or 'true', then both types will use GMT time.
- * if $gmt is false, the output is adjusted with the GMT offset in the WordPress option.
+ * If `$gmt` is a truthy value then both types will use GMT time, otherwise the
+ * output is adjusted with the GMT offset for the site.
  *
  * @since 1.0.0
+ * @since 5.3.0 Now returns an integer if `$type` is 'U'. Previously a string was returned.
  *
- * @param string   $type Type of time to retrieve. Accepts 'mysql', 'timestamp',
+ * @param string   $type Type of time to retrieve. Accepts 'mysql', 'timestamp', 'U',
  *                       or PHP date format string (e.g. 'Y-m-d').
  * @param int|bool $gmt  Optional. Whether to use GMT timezone. Default false.
- * @return int|string Integer if $type is 'timestamp', string otherwise.
+ * @return int|string Integer if `$type` is 'timestamp' or 'U', string otherwise.
  */
 function current_time( $type, $gmt = 0 ) {
 	// Don't use non-GMT timestamp, unless you know the difference and really need to.
@@ -85,7 +86,7 @@ function current_time( $type, $gmt = 0 ) {
 }
 
 /**
- * Retrieves the current time as an object with the timezone from settings.
+ * Retrieves the current time as an object using the site's timezone.
  *
  * @since 5.3.0
  *
@@ -96,14 +97,23 @@ function current_datetime() {
 }
 
 /**
- * Retrieves the timezone from site settings as a string.
+ * Retrieves the timezone of the site as a string.
  *
- * Uses the `timezone_string` option to get a proper timezone if available,
- * otherwise falls back to an offset.
+ * Uses the `timezone_string` option to get a proper timezone name if available,
+ * otherwise falls back to a manual UTC ± offset.
+ *
+ * Example return values:
+ *
+ *  - 'Europe/Rome'
+ *  - 'America/North_Dakota/New_Salem'
+ *  - 'UTC'
+ *  - '-06:30'
+ *  - '+00:00'
+ *  - '+08:45'
  *
  * @since 5.3.0
  *
- * @return string PHP timezone string or a ±HH:MM offset.
+ * @return string PHP timezone name or a ±HH:MM offset.
  */
 function wp_timezone_string() {
 	$timezone_string = get_option( 'timezone_string' );
@@ -125,7 +135,7 @@ function wp_timezone_string() {
 }
 
 /**
- * Retrieves the timezone from site settings as a `DateTimeZone` object.
+ * Retrieves the timezone of the site as a `DateTimeZone` object.
  *
  * Timezone can be based on a PHP timezone string or a ±HH:MM offset.
  *

From ba6b4c4cd962b18d013a0762b978f22420897c0f Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Fri, 29 Oct 2021 16:51:42 +0000
Subject: [PATCH 243/257] Coding Standards: Correct alignment in
 `WP_Site_Health::get_test_update_temp_backup_writable()`.

This fixes an `Equals sign not aligned with surrounding assignments; expected 1 space but found 6 spaces` WPCS warning.

Follow-up to [51815].

See #51857, #53359.

git-svn-id: https://develop.svn.wordpress.org/trunk@51951 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../includes/class-wp-site-health.php         | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-site-health.php b/src/wp-admin/includes/class-wp-site-health.php
index c1431d2f85874..c45a2ccc63e08 100644
--- a/src/wp-admin/includes/class-wp-site-health.php
+++ b/src/wp-admin/includes/class-wp-site-health.php
@@ -1978,8 +1978,8 @@ public function get_test_update_temp_backup_writable() {
 		$themes_dir_is_writable  = $wp_filesystem->is_writable( "$wp_content/upgrade/temp-backup/themes" );
 
 		if ( $plugins_dir_exists && ! $plugins_dir_is_writable && $themes_dir_exists && ! $themes_dir_is_writable ) {
-			$result['status']      = 'critical';
-			$result['label']       = sprintf(
+			$result['status'] = 'critical';
+			$result['label']  = sprintf(
 				/* translators: %s: temp-backup */
 				__( 'Plugins and themes %s directories exist but are not writable' ),
 				'temp-backup'
@@ -1994,8 +1994,8 @@ public function get_test_update_temp_backup_writable() {
 		}
 
 		if ( $plugins_dir_exists && ! $plugins_dir_is_writable ) {
-			$result['status']      = 'critical';
-			$result['label']       = sprintf(
+			$result['status'] = 'critical';
+			$result['label']  = sprintf(
 				/* translators: %s: temp-backup */
 				__( 'Plugins %s directory exists but is not writable' ),
 				'temp-backup'
@@ -2009,8 +2009,8 @@ public function get_test_update_temp_backup_writable() {
 		}
 
 		if ( $themes_dir_exists && ! $themes_dir_is_writable ) {
-			$result['status']      = 'critical';
-			$result['label']       = sprintf(
+			$result['status'] = 'critical';
+			$result['label']  = sprintf(
 				/* translators: %s: temp-backup */
 				__( 'Themes %s directory exists but is not writable' ),
 				'temp-backup'
@@ -2024,8 +2024,8 @@ public function get_test_update_temp_backup_writable() {
 		}
 
 		if ( ( ! $plugins_dir_exists || ! $themes_dir_exists ) && $backup_dir_exists && ! $backup_dir_is_writable ) {
-			$result['status']      = 'critical';
-			$result['label']       = sprintf(
+			$result['status'] = 'critical';
+			$result['label']  = sprintf(
 				/* translators: %s: temp-backup */
 				__( 'The %s directory exists but is not writable' ),
 				'temp-backup'
@@ -2039,8 +2039,8 @@ public function get_test_update_temp_backup_writable() {
 		}
 
 		if ( ! $backup_dir_exists && $upgrade_dir_exists && ! $upgrade_dir_is_writable ) {
-			$result['status']      = 'critical';
-			$result['label']       = sprintf(
+			$result['status'] = 'critical';
+			$result['label']  = sprintf(
 				/* translators: %s: upgrade */
 				__( 'The %s directory exists but is not writable' ),
 				'upgrade'
@@ -2054,8 +2054,8 @@ public function get_test_update_temp_backup_writable() {
 		}
 
 		if ( ! $upgrade_dir_exists && ! $wp_filesystem->is_writable( $wp_content ) ) {
-			$result['status']      = 'critical';
-			$result['label']       = sprintf(
+			$result['status'] = 'critical';
+			$result['label']  = sprintf(
 				/* translators: %s: upgrade */
 				__( 'The %s directory cannot be created' ),
 				'upgrade'

From 5b1da06715ede7a5f29b7a65bc12bdb4123a4ed2 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Fri, 29 Oct 2021 19:40:26 +0000
Subject: [PATCH 244/257] Build/Test Tools: Escape `$` within commit messages
 for `$variables.

This ensures the variables are preserved in the Slack message.

Props ocean90, desrosj.
See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51952 602fd350-edb4-49c9-b593-d223f7449a82
---
 .github/workflows/slack-notifications.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/slack-notifications.yml b/.github/workflows/slack-notifications.yml
index b75bc5b01d28f..021f10fb175dd 100644
--- a/.github/workflows/slack-notifications.yml
+++ b/.github/workflows/slack-notifications.yml
@@ -110,7 +110,7 @@ jobs:
       - name: Prepare commit message.
         id: commit-message
         run: |
-          COMMIT_MESSAGE=$(cat <<'EOF' | awk 'NR==1' | sed 's/`/\\`/g' | sed 's/\"/\\\\"/g'
+          COMMIT_MESSAGE=$(cat <<'EOF' | awk 'NR==1' | sed 's/`/\\`/g' | sed 's/\"/\\\\"/g' | sed 's/\$/\\$/g'
           ${{ github.event_name == 'workflow_run' && github.event.workflow_run.head_commit.message || github.event.head_commit.message }}
           EOF
           )

From f28310aedaed87a274b8510e8d80c7d732fdf41c Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Fri, 29 Oct 2021 19:59:05 +0000
Subject: [PATCH 245/257] Build/Test Tools: Adjust Slack notifications for
 `scheduled` and `workflow_dispatch` events.

This makes the needed adjustments to fix Slack notifications for `scheduled` and `workflow_dispatch` events. The data needed to send notifications for these events are stored in different locations, or need to be accessed through API requests.

Follow up to [51921], [51937].
See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51953 602fd350-edb4-49c9-b593-d223f7449a82
---
 .github/workflows/slack-notifications.yml | 42 +++++++++++------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/slack-notifications.yml b/.github/workflows/slack-notifications.yml
index 021f10fb175dd..2f8a65c992cb2 100644
--- a/.github/workflows/slack-notifications.yml
+++ b/.github/workflows/slack-notifications.yml
@@ -64,38 +64,25 @@ jobs:
     steps:
       - name: Get the workflow ID
         id: current-workflow-id
-        if: ${{ github.event_name == 'push' }}
+        if: ${{ github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
         uses: actions/github-script@441359b1a30438de65712c2fbca0abe4816fa667 # v5.0.0
         with:
           script: |
             const workflow_run = await github.rest.actions.getWorkflowRun({
-              owner: '${{ github.repository_owner }}',
-              repo: 'wordpress-develop',
+              owner: context.repo.owner,
+              repo: context.repo.repo,
               run_id: ${{ github.run_id }},
             });
             return workflow_run.data.workflow_id;
 
-      - name: Get the workflow URL
-        id: current-workflow-url
-        uses: actions/github-script@441359b1a30438de65712c2fbca0abe4816fa667 # v5.0.0
-        if: ${{ github.event_name == 'push' }}
-        with:
-          script: |
-            const workflow_run = await github.rest.actions.getWorkflowRun({
-              owner: '${{ github.repository_owner }}',
-              repo: 'wordpress-develop',
-              run_id: ${{ github.run_id }},
-            });
-            return workflow_run.data.html_url;
-
       - name: Get details about the previous workflow run
         id: previous-result
         uses: actions/github-script@441359b1a30438de65712c2fbca0abe4816fa667 # v5.0.0
         with:
           script: |
             const previous_runs = await github.rest.actions.listWorkflowRuns({
-              owner: '${{ github.repository_owner }}',
-              repo: 'wordpress-develop',
+              owner: context.repo.owner,
+              repo: context.repo.repo,
               workflow_id: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.workflow_id || steps.current-workflow-id.outputs.result }},
               branch: '${{ env.CURRENT_BRANCH }}',
               per_page: 1,
@@ -107,18 +94,31 @@ jobs:
         id: previous-conclusion
         run: echo "::set-output name=previous_conclusion::${{ steps.previous-result.outputs.result }}"
 
+      - name: Get the commit message
+        id: current-commit-message
+        uses: actions/github-script@441359b1a30438de65712c2fbca0abe4816fa667 # v5.0.0
+        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
+        with:
+          script: |
+            const commit_details = await github.rest.repos.getCommit({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              ref: '${{ github.sha }}'
+            });
+            return commit_details.data.commit.message;
+
       - name: Prepare commit message.
         id: commit-message
         run: |
-          COMMIT_MESSAGE=$(cat <<'EOF' | awk 'NR==1' | sed 's/`/\\`/g' | sed 's/\"/\\\\"/g' | sed 's/\$/\\$/g'
-          ${{ github.event_name == 'workflow_run' && github.event.workflow_run.head_commit.message || github.event.head_commit.message }}
+          COMMIT_MESSAGE=$(cat <<'EOF' | awk 'NR==1' | sed 's/`/\\`/g' | sed 's/\"/\\\\\\"/g' | sed 's/\$/\\$/g'
+          ${{ github.event_name == 'workflow_run' && github.event.workflow_run.head_commit.message || ( github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) && fromJson( steps.current-commit-message.outputs.result ) || github.event.head_commit.message }}
           EOF
           )
           echo "::set-output name=commit_message_escaped::${COMMIT_MESSAGE}"
 
       - name: Construct payload and store as an output
         id: create-payload
-        run: echo "::set-output name=payload::{\"workflow_name\":\"${{ github.event_name == 'workflow_run' && github.event.workflow_run.name || github.workflow }}\",\"ref_name\":\"${{ env.CURRENT_BRANCH }}\",\"run_url\":\"${{ github.event_name == 'workflow_run' && github.event.workflow_run.html_url || steps.current-workflow-url.outputs.result }}\",\"commit_message\":\"${{ steps.commit-message.outputs.commit_message_escaped }}\"}"
+        run: echo "::set-output name=payload::{\"workflow_name\":\"${{ github.event_name == 'workflow_run' && github.event.workflow_run.name || github.workflow }}\",\"ref_name\":\"${{ env.CURRENT_BRANCH }}\",\"run_url\":\"https://github.com/WordPress/wordpress-develop/runs/${{ github.event_name == 'workflow_run' && github.event.workflow_run.id || github.run_id }}\",\"commit_message\":\"${{ steps.commit-message.outputs.commit_message_escaped }}\"}"
 
   # Posts notifications when a workflow fails.
   failure:

From 86c54d872e071fbc146fd6e50568cc49c020ddcb Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Fri, 29 Oct 2021 20:33:19 +0000
Subject: [PATCH 246/257] Build/Test Tools: Use correct URL for a GitHub Action
 workflow run.

Follow up to [51921], [51937], [51953].
Unprops desrosj.
See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51954 602fd350-edb4-49c9-b593-d223f7449a82
---
 .github/workflows/slack-notifications.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/slack-notifications.yml b/.github/workflows/slack-notifications.yml
index 2f8a65c992cb2..0e435eb5b7382 100644
--- a/.github/workflows/slack-notifications.yml
+++ b/.github/workflows/slack-notifications.yml
@@ -118,7 +118,7 @@ jobs:
 
       - name: Construct payload and store as an output
         id: create-payload
-        run: echo "::set-output name=payload::{\"workflow_name\":\"${{ github.event_name == 'workflow_run' && github.event.workflow_run.name || github.workflow }}\",\"ref_name\":\"${{ env.CURRENT_BRANCH }}\",\"run_url\":\"https://github.com/WordPress/wordpress-develop/runs/${{ github.event_name == 'workflow_run' && github.event.workflow_run.id || github.run_id }}\",\"commit_message\":\"${{ steps.commit-message.outputs.commit_message_escaped }}\"}"
+        run: echo "::set-output name=payload::{\"workflow_name\":\"${{ github.event_name == 'workflow_run' && github.event.workflow_run.name || github.workflow }}\",\"ref_name\":\"${{ env.CURRENT_BRANCH }}\",\"run_url\":\"https://github.com/WordPress/wordpress-develop/actions/runs/${{ github.event_name == 'workflow_run' && github.event.workflow_run.id || github.run_id }}\",\"commit_message\":\"${{ steps.commit-message.outputs.commit_message_escaped }}\"}"
 
   # Posts notifications when a workflow fails.
   failure:

From ec5ed03bf62ebf72b36da58d3578d0c98cdda1d2 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Fri, 29 Oct 2021 23:11:32 +0000
Subject: [PATCH 247/257] Docs: Miscellaneous docblock improvements.

See #53399


git-svn-id: https://develop.svn.wordpress.org/trunk@51955 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/plugin.php  | 43 +++++++++++++++++++------------
 src/wp-admin/includes/upgrade.php |  1 -
 src/wp-includes/cron.php          |  4 +--
 src/wp-includes/formatting.php    |  4 +--
 src/wp-includes/theme.php         |  2 +-
 src/wp-login.php                  | 24 ++++++++---------
 6 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/src/wp-admin/includes/plugin.php b/src/wp-admin/includes/plugin.php
index 6e332c247e85e..0934d6b8100f7 100644
--- a/src/wp-admin/includes/plugin.php
+++ b/src/wp-admin/includes/plugin.php
@@ -1278,7 +1278,7 @@ function uninstall_plugin( $plugin ) {
 //
 
 /**
- * Add a top-level menu page.
+ * Adds a top-level menu page.
  *
  * This function takes a capability which will be used to determine whether
  * or not a page is included in the menu.
@@ -1350,7 +1350,7 @@ function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $func
 }
 
 /**
- * Add a submenu page.
+ * Adds a submenu page.
  *
  * This function takes a capability which will be used to determine whether
  * or not a page is included in the menu.
@@ -1474,7 +1474,7 @@ function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability,
 }
 
 /**
- * Add submenu page to the Tools main menu.
+ * Adds a submenu page to the Tools main menu.
  *
  * This function takes a capability which will be used to determine whether
  * or not a page is included in the menu.
@@ -1498,7 +1498,7 @@ function add_management_page( $page_title, $menu_title, $capability, $menu_slug,
 }
 
 /**
- * Add submenu page to the Settings main menu.
+ * Adds a submenu page to the Settings main menu.
  *
  * This function takes a capability which will be used to determine whether
  * or not a page is included in the menu.
@@ -1522,7 +1522,7 @@ function add_options_page( $page_title, $menu_title, $capability, $menu_slug, $f
 }
 
 /**
- * Add submenu page to the Appearance main menu.
+ * Adds a submenu page to the Appearance main menu.
  *
  * This function takes a capability which will be used to determine whether
  * or not a page is included in the menu.
@@ -1546,7 +1546,7 @@ function add_theme_page( $page_title, $menu_title, $capability, $menu_slug, $fun
 }
 
 /**
- * Add submenu page to the Plugins main menu.
+ * Adds a submenu page to the Plugins main menu.
  *
  * This function takes a capability which will be used to determine whether
  * or not a page is included in the menu.
@@ -1570,7 +1570,7 @@ function add_plugins_page( $page_title, $menu_title, $capability, $menu_slug, $f
 }
 
 /**
- * Add submenu page to the Users/Profile main menu.
+ * Adds a submenu page to the Users/Profile main menu.
  *
  * This function takes a capability which will be used to determine whether
  * or not a page is included in the menu.
@@ -1599,7 +1599,7 @@ function add_users_page( $page_title, $menu_title, $capability, $menu_slug, $fun
 }
 
 /**
- * Add submenu page to the Dashboard main menu.
+ * Adds a submenu page to the Dashboard main menu.
  *
  * This function takes a capability which will be used to determine whether
  * or not a page is included in the menu.
@@ -1623,7 +1623,7 @@ function add_dashboard_page( $page_title, $menu_title, $capability, $menu_slug,
 }
 
 /**
- * Add submenu page to the Posts main menu.
+ * Adds a submenu page to the Posts main menu.
  *
  * This function takes a capability which will be used to determine whether
  * or not a page is included in the menu.
@@ -1647,7 +1647,7 @@ function add_posts_page( $page_title, $menu_title, $capability, $menu_slug, $fun
 }
 
 /**
- * Add submenu page to the Media main menu.
+ * Adds a submenu page to the Media main menu.
  *
  * This function takes a capability which will be used to determine whether
  * or not a page is included in the menu.
@@ -1671,7 +1671,7 @@ function add_media_page( $page_title, $menu_title, $capability, $menu_slug, $fun
 }
 
 /**
- * Add submenu page to the Links main menu.
+ * Adds a submenu page to the Links main menu.
  *
  * This function takes a capability which will be used to determine whether
  * or not a page is included in the menu.
@@ -1695,7 +1695,7 @@ function add_links_page( $page_title, $menu_title, $capability, $menu_slug, $fun
 }
 
 /**
- * Add submenu page to the Pages main menu.
+ * Adds a submenu page to the Pages main menu.
  *
  * This function takes a capability which will be used to determine whether
  * or not a page is included in the menu.
@@ -1719,7 +1719,7 @@ function add_pages_page( $page_title, $menu_title, $capability, $menu_slug, $fun
 }
 
 /**
- * Add submenu page to the Comments main menu.
+ * Adds a submenu page to the Comments main menu.
  *
  * This function takes a capability which will be used to determine whether
  * or not a page is included in the menu.
@@ -1743,7 +1743,12 @@ function add_comments_page( $page_title, $menu_title, $capability, $menu_slug, $
 }
 
 /**
- * Remove a top-level admin menu.
+ * Removes a top-level admin menu.
+ *
+ * Example usage:
+ *
+ *  - `remove_menu_page( 'tools.php' )`
+ *  - `remove_menu_page( 'plugin_menu_slug' )`
  *
  * @since 3.1.0
  *
@@ -1766,7 +1771,13 @@ function remove_menu_page( $menu_slug ) {
 }
 
 /**
- * Remove an admin submenu.
+ * Removes an admin submenu.
+ *
+ * Example usage:
+ *
+ *  - `remove_submenu_page( 'themes.php', 'nav-menus.php' )`
+ *  - `remove_submenu_page( 'tools.php', 'plugin_submenu_slug' )`
+ *  - `remove_submenu_page( 'plugin_menu_slug', 'plugin_submenu_slug' )`
  *
  * @since 3.1.0
  *
@@ -1794,7 +1805,7 @@ function remove_submenu_page( $menu_slug, $submenu_slug ) {
 }
 
 /**
- * Get the URL to access a particular menu page based on the slug it was registered with.
+ * Gets the URL to access a particular menu page based on the slug it was registered with.
  *
  * If the slug hasn't been registered properly, no URL will be returned.
  *
diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php
index b5588197715c3..3be073f7af26a 100644
--- a/src/wp-admin/includes/upgrade.php
+++ b/src/wp-admin/includes/upgrade.php
@@ -1878,7 +1878,6 @@ function upgrade_370() {
  *
  * @ignore
  * @since 3.7.2
- * @since 3.8.0
  *
  * @global int $wp_current_db_version The old (current) database version.
  */
diff --git a/src/wp-includes/cron.php b/src/wp-includes/cron.php
index 41efeebc44f18..8e50349f5d652 100644
--- a/src/wp-includes/cron.php
+++ b/src/wp-includes/cron.php
@@ -1040,7 +1040,7 @@ function _wp_cron() {
  * @since 2.1.0
  * @since 5.4.0 The 'weekly' schedule was added.
  *
- * @return array
+ * @return array[]
  */
 function wp_get_schedules() {
 	$schedules = array(
@@ -1067,7 +1067,7 @@ function wp_get_schedules() {
 	 *
 	 * @since 2.1.0
 	 *
-	 * @param array $new_schedules An array of non-default cron schedules. Default empty.
+	 * @param array[] $new_schedules An array of non-default cron schedule arrays. Default empty.
 	 */
 	return array_merge( apply_filters( 'cron_schedules', array() ), $schedules );
 }
diff --git a/src/wp-includes/formatting.php b/src/wp-includes/formatting.php
index 2eccfb0fde3e3..9461297dee7a3 100644
--- a/src/wp-includes/formatting.php
+++ b/src/wp-includes/formatting.php
@@ -3539,8 +3539,8 @@ function get_gmt_from_date( $string, $format = 'Y-m-d H:i:s' ) {
 /**
  * Given a date in UTC or GMT timezone, returns that date in the timezone of the site.
  *
- * Requires and returns a date in the Y-m-d H:i:s format.
- * Return format can be overridden using the $format parameter.
+ * Requires a date in the Y-m-d H:i:s format.
+ * Default return format of 'Y-m-d H:i:s' can be overridden using the `$format` parameter.
  *
  * @since 1.2.0
  *
diff --git a/src/wp-includes/theme.php b/src/wp-includes/theme.php
index 384c056404b2a..e233b4127a7da 100644
--- a/src/wp-includes/theme.php
+++ b/src/wp-includes/theme.php
@@ -3073,7 +3073,7 @@ function require_if_theme_supports( $feature, $include ) {
  *     @type string     $type         The type of data associated with this feature.
  *                                    Valid values are 'string', 'boolean', 'integer',
  *                                    'number', 'array', and 'object'. Defaults to 'boolean'.
- *     @type boolean    $variadic     Does this feature utilize the variadic support
+ *     @type bool       $variadic     Does this feature utilize the variadic support
  *                                    of add_theme_support(), or are all arguments specified
  *                                    as the second parameter. Must be used with the "array" type.
  *     @type string     $description  A short description of the feature. Included in
diff --git a/src/wp-login.php b/src/wp-login.php
index 0d030863ed1f7..b7c14b4c83f60 100644
--- a/src/wp-login.php
+++ b/src/wp-login.php
@@ -434,18 +434,18 @@ function wp_login_viewport_meta() {
  *
  * Possible hook names include:
  *
- *  - 'login_form_checkemail'
- *  - 'login_form_confirm_admin_email'
- *  - 'login_form_confirmaction'
- *  - 'login_form_entered_recovery_mode'
- *  - 'login_form_login'
- *  - 'login_form_logout'
- *  - 'login_form_lostpassword'
- *  - 'login_form_postpass'
- *  - 'login_form_register'
- *  - 'login_form_resetpass'
- *  - 'login_form_retrievepassword'
- *  - 'login_form_rp'
+ *  - `login_form_checkemail`
+ *  - `login_form_confirm_admin_email`
+ *  - `login_form_confirmaction`
+ *  - `login_form_entered_recovery_mode`
+ *  - `login_form_login`
+ *  - `login_form_logout`
+ *  - `login_form_lostpassword`
+ *  - `login_form_postpass`
+ *  - `login_form_register`
+ *  - `login_form_resetpass`
+ *  - `login_form_retrievepassword`
+ *  - `login_form_rp`
  *
  * @since 2.8.0
  */

From 1f1f1d64d8bea6fe718ca9a83de5e3dcf8f1547e Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sat, 30 Oct 2021 13:39:24 +0000
Subject: [PATCH 248/257] Docs: Further update the `debug_information` filter
 description per the documentation standards.

Specifically, this ensures that the DocBlock follows the line wrapping recommendations.

Follow-up to [44986], [45156], [45259], [51949].

See #53399.

git-svn-id: https://develop.svn.wordpress.org/trunk@51956 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-debug-data.php | 56 +++++++++++--------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-debug-data.php b/src/wp-admin/includes/class-wp-debug-data.php
index 4746546b968c6..91c6b837c1069 100644
--- a/src/wp-admin/includes/class-wp-debug-data.php
+++ b/src/wp-admin/includes/class-wp-debug-data.php
@@ -1410,48 +1410,58 @@ public static function debug_data() {
 		/**
 		 * Add to or modify the debug information shown on the Tools -> Site Health -> Info screen.
 		 *
-		 * Plugin or themes may wish to introduce their own debug information without creating additional admin pages
-		 * they can utilize this filter to introduce their own sections or add more data to existing sections.
+		 * Plugin or themes may wish to introduce their own debug information without creating
+		 * additional admin pages. They can utilize this filter to introduce their own sections
+		 * or add more data to existing sections.
 		 *
-		 * Array keys for sections added by core are all prefixed with `wp-`, plugins and themes should use their own slug as
-		 * a prefix, both for consistency as well as avoiding key collisions. Note that the array keys are used as labels
-		 * for the copied data.
+		 * Array keys for sections added by core are all prefixed with `wp-`. Plugins and themes
+		 * should use their own slug as a prefix, both for consistency as well as avoiding
+		 * key collisions. Note that the array keys are used as labels for the copied data.
 		 *
-		 * All strings are expected to be plain text except `$description` that can contain inline HTML tags (see below).
+		 * All strings are expected to be plain text except `$description` that can contain
+		 * inline HTML tags (see below).
 		 *
 		 * @since 5.2.0
 		 *
 		 * @param array $args {
 		 *     The debug information to be added to the core information page.
 		 *
-		 *     This is an associative multi-dimensional array, up to three levels deep. The topmost array holds the sections, keyed by section ID.
+		 *     This is an associative multi-dimensional array, up to three levels deep.
+		 *     The topmost array holds the sections, keyed by section ID.
 		 *
 		 *     @type array ...$0 {
-		 *         Each section has a `$fields` associative array (see below), and each `$value` in `$fields` can be
-		 *         another associative array of name/value pairs when there is more structured data to display.
+		 *         Each section has a `$fields` associative array (see below), and each `$value` in `$fields`
+		 *         can be another associative array of name/value pairs when there is more structured data
+		 *         to display.
 		 *
 		 *         @type string $label       Required. The title for this section of the debug output.
-		 *         @type string $description Optional. A description for your information section which may contain basic HTML
-		 *                                   markup, inline tags only as it is outputted in a paragraph.
-		 *         @type bool   $show_count  Optional. If set to `true` the amount of fields will be included in the title for
-		 *                                   this section.
-		 *         @type bool   $private     Optional. If set to `true` the section and all associated fields will be excluded
-		 *                                   from the copied data. Default false.
+		 *         @type string $description Optional. A description for your information section which
+		 *                                   may contain basic HTML markup, inline tags only as it is
+		 *                                   outputted in a paragraph.
+		 *         @type bool   $show_count  Optional. If set to `true`, the amount of fields will be included
+		 *                                   in the title for this section. Default false.
+		 *         @type bool   $private     Optional. If set to `true`, the section and all associated fields
+		 *                                   will be excluded from the copied data. Default false.
 		 *         @type array  $fields {
-		 *             Required. An associative array containing the fields to be displayed in the section, keyed by field ID.
+		 *             Required. An associative array containing the fields to be displayed in the section,
+		 *             keyed by field ID.
 		 *
 		 *             @type array ...$0 {
 		 *                 An associative array containing the data to be displayed for the field.
 		 *
 		 *                 @type string $label    Required. The label for this piece of information.
-		 *                 @type mixed  $value    Required. The output that is displayed for this field. Text should be translated. Can be
-		 *                                        an associative array that is displayed as name/value pairs.
+		 *                 @type mixed  $value    Required. The output that is displayed for this field.
+		 *                                        Text should be translated. Can be an associative array
+		 *                                        that is displayed as name/value pairs.
 		 *                                        Accepted types: `string|int|float|(string|int|float)[]`.
-		 *                 @type string $debug    Optional. The output that is used for this field when the user copies the data.
-		 *                                        It should be more concise and not translated. If not set, the content of `$value` is used.
-		 *                                        Note that the array keys are used as labels for the copied data.
-		 *                 @type bool   $private  Optional. If set to `true` the field will not be included in the copied data
-		 *                                        allowing you to show, for example, API keys here. Default false.
+		 *                 @type string $debug    Optional. The output that is used for this field when
+		 *                                        the user copies the data. It should be more concise and
+		 *                                        not translated. If not set, the content of `$value`
+		 *                                        is used. Note that the array keys are used as labels
+		 *                                        for the copied data.
+		 *                 @type bool   $private  Optional. If set to `true`, the field will be excluded
+		 *                                        from the copied data, allowing you to show, for example,
+		 *                                        API keys here. Default false.
 		 *             }
 		 *         }
 		 *     }

From 2716cc52afce7c59cb470b8d587ae3e9ab75d76e Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Sat, 30 Oct 2021 20:15:59 +0000
Subject: [PATCH 249/257] Docs: Miscellaneous docblock improvements.

See #53399


git-svn-id: https://develop.svn.wordpress.org/trunk@51957 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/media.php      | 2 +-
 src/wp-includes/functions.php        | 7 ++++++-
 src/wp-includes/general-template.php | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php
index 3cb96b2bb4106..8768c75ee28c3 100644
--- a/src/wp-admin/includes/media.php
+++ b/src/wp-admin/includes/media.php
@@ -1521,7 +1521,7 @@ function get_attachment_fields_to_edit( $post, $errors = null ) {
  *
  * @global WP_Query $wp_the_query WordPress Query object.
  *
- * @param int   $post_id Optional. Post ID.
+ * @param int   $post_id Post ID.
  * @param array $errors  Errors for attachment, if any.
  * @return string
  */
diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index 5101e142bfa51..0950f794659c4 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -565,7 +565,12 @@ function human_readable_duration( $duration = '' ) {
  *
  * @param string     $mysqlstring   Date or datetime field type from MySQL.
  * @param int|string $start_of_week Optional. Start of the week as an integer. Default empty string.
- * @return array Keys are 'start' and 'end'.
+ * @return int[] {
+ *     Week start and end dates as Unix timestamps.
+ *
+ *     @type int $start The week start date as a Unix timestamp.
+ *     @type int $end   The week end date as a Unix timestamp.
+ * }
  */
 function get_weekstartend( $mysqlstring, $start_of_week = '' ) {
 	// MySQL string year.
diff --git a/src/wp-includes/general-template.php b/src/wp-includes/general-template.php
index 4ab79e8ddc48d..4a9835a478f75 100644
--- a/src/wp-includes/general-template.php
+++ b/src/wp-includes/general-template.php
@@ -189,7 +189,7 @@ function get_template_part( $slug, $name = null, $args = array() ) {
 	$templates[] = "{$slug}.php";
 
 	/**
-	 * Fires before a template part is loaded.
+	 * Fires before an attempt is made to locate and load a template part.
 	 *
 	 * @since 5.2.0
 	 * @since 5.5.0 The `$args` parameter was added.

From 9f9c81f5677944bc13b139989d3d3463d618b0ec Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Sat, 30 Oct 2021 20:25:19 +0000
Subject: [PATCH 250/257] Application Passwords: Various docblock improvements.

See #53399, #42790


git-svn-id: https://develop.svn.wordpress.org/trunk@51958 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../class-wp-application-passwords.php        | 50 +++++++++++++++----
 src/wp-includes/rest-api.php                  |  2 +-
 ...-rest-application-passwords-controller.php | 14 +++---
 3 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/src/wp-includes/class-wp-application-passwords.php b/src/wp-includes/class-wp-application-passwords.php
index a86660b27b7be..fd7fac2162c80 100644
--- a/src/wp-includes/class-wp-application-passwords.php
+++ b/src/wp-includes/class-wp-application-passwords.php
@@ -43,7 +43,7 @@ class WP_Application_Passwords {
 	/**
 	 * Checks if Application Passwords are being used by the site.
 	 *
-	 * This returns true if at least one App Password has ever been created.
+	 * This returns true if at least one Application Password has ever been created.
 	 *
 	 * @since 5.6.0
 	 *
@@ -61,7 +61,12 @@ public static function is_in_use() {
 	 * @since 5.7.0 Returns WP_Error if application name already exists.
 	 *
 	 * @param int   $user_id  User ID.
-	 * @param array $args     Information about the application password.
+	 * @param array $args     {
+	 *     Arguments used to create the application password.
+	 *
+	 *     @type string $name   The name of the application password.
+	 *     @type string $app_id A UUID provided by the application to uniquely identify it.
+	 * }
 	 * @return array|WP_Error The first key in the array is the new password, the second is its detailed information.
 	 *                        A WP_Error instance is returned on error.
 	 */
@@ -110,9 +115,24 @@ public static function create_new_application_password( $user_id, $args = array(
 		 * @since 5.6.0
 		 *
 		 * @param int    $user_id      The user ID.
-		 * @param array  $new_item     The details about the created password.
-		 * @param string $new_password The unhashed generated app password.
-		 * @param array  $args         Information used to create the application password.
+		 * @param array  $new_item     {
+		 *     The details about the created password.
+		 *
+		 *     @type string $uuid      The unique identifier for the application password.
+		 *     @type string $app_id    A UUID provided by the application to uniquely identify it.
+		 *     @type string $name      The name of the application password.
+		 *     @type string $password  A one-way hash of the password.
+		 *     @type int    $created   Unix timestamp of when the password was created.
+		 *     @type null   $last_used Null.
+		 *     @type null   $last_ip   Null.
+		 * }
+		 * @param string $new_password The unhashed generated application password.
+		 * @param array  $args         {
+		 *     Arguments used to create the application password.
+		 *
+		 *     @type string $name   The name of the application password.
+		 *     @type string $app_id A UUID provided by the application to uniquely identify it.
+		 * }
 		 */
 		do_action( 'wp_create_application_password', $user_id, $new_item, $new_password, $args );
 
@@ -125,7 +145,19 @@ public static function create_new_application_password( $user_id, $args = array(
 	 * @since 5.6.0
 	 *
 	 * @param int $user_id User ID.
-	 * @return array The list of app passwords.
+	 * @return array {
+	 *     The list of app passwords.
+	 *
+	 *     @type array ...$0 {
+	 *         @type string      $uuid      The unique identifier for the application password.
+	 *         @type string      $app_id    A UUID provided by the application to uniquely identify it.
+	 *         @type string      $name      The name of the application password.
+	 *         @type string      $password  A one-way hash of the password.
+	 *         @type int         $created   Unix timestamp of when the password was created.
+	 *         @type int|null    $last_used The Unix timestamp of the GMT date the application password was last used.
+	 *         @type string|null $last_ip   The IP address the application password was last used by.
+	 *     }
+	 * }
 	 */
 	public static function get_user_application_passwords( $user_id ) {
 		$passwords = get_user_meta( $user_id, static::USERMETA_KEY_APPLICATION_PASSWORDS, true );
@@ -172,13 +204,13 @@ public static function get_user_application_password( $user_id, $uuid ) {
 	}
 
 	/**
-	 * Checks if application name exists for this user.
+	 * Checks if an application password with the given name exists for this user.
 	 *
 	 * @since 5.7.0
 	 *
 	 * @param int    $user_id User ID.
 	 * @param string $name    Application name.
-	 * @return bool Whether provided application name exists or not.
+	 * @return bool Whether the provided application name exists.
 	 */
 	public static function application_name_exists_for_user( $user_id, $name ) {
 		$passwords = static::get_user_application_passwords( $user_id );
@@ -352,7 +384,7 @@ public static function delete_all_application_passwords( $user_id ) {
 	}
 
 	/**
-	 * Sets a users application passwords.
+	 * Sets a user's application passwords.
 	 *
 	 * @since 5.6.0
 	 *
diff --git a/src/wp-includes/rest-api.php b/src/wp-includes/rest-api.php
index 7e66ecd801218..3d89f16009196 100644
--- a/src/wp-includes/rest-api.php
+++ b/src/wp-includes/rest-api.php
@@ -1091,7 +1091,7 @@ function rest_application_password_collect_status( $user_or_error, $app_password
  *
  * @global string|null $wp_rest_application_password_uuid
  *
- * @return string|null The App Password UUID, or null if Application Passwords was not used.
+ * @return string|null The Application Password UUID, or null if Application Passwords was not used.
  */
 function rest_get_authenticated_app_password() {
 	global $wp_rest_application_password_uuid;
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-application-passwords-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-application-passwords-controller.php
index ecdc221b5fcbc..bdf1959c623b3 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-application-passwords-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-application-passwords-controller.php
@@ -356,7 +356,7 @@ public function update_item( $request ) {
 	}
 
 	/**
-	 * Checks if a given request has access to delete all application passwords.
+	 * Checks if a given request has access to delete all application passwords for a user.
 	 *
 	 * @since 5.6.0
 	 *
@@ -382,7 +382,7 @@ public function delete_items_permissions_check( $request ) {
 	}
 
 	/**
-	 * Deletes all application passwords.
+	 * Deletes all application passwords for a user.
 	 *
 	 * @since 5.6.0
 	 *
@@ -411,7 +411,7 @@ public function delete_items( $request ) {
 	}
 
 	/**
-	 * Checks if a given request has access to delete a specific application password.
+	 * Checks if a given request has access to delete a specific application password for a user.
 	 *
 	 * @since 5.6.0
 	 *
@@ -437,7 +437,7 @@ public function delete_item_permissions_check( $request ) {
 	}
 
 	/**
-	 * Deletes one application password.
+	 * Deletes an application password for a user.
 	 *
 	 * @since 5.6.0
 	 *
@@ -474,7 +474,7 @@ public function delete_item( $request ) {
 	}
 
 	/**
-	 * Checks if a given request has access to get the currently used application password.
+	 * Checks if a given request has access to get the currently used application password for a user.
 	 *
 	 * @since 5.7.0
 	 *
@@ -500,7 +500,7 @@ public function get_current_item_permissions_check( $request ) {
 	}
 
 	/**
-	 * Retrieves the application password being currently used for authentication.
+	 * Retrieves the application password being currently used for authentication of a user.
 	 *
 	 * @since 5.7.0
 	 *
@@ -723,7 +723,7 @@ protected function get_user( $request ) {
 	}
 
 	/**
-	 * Gets the requested application password.
+	 * Gets the requested application password for a user.
 	 *
 	 * @since 5.6.0
 	 *

From 57ded3c85da779b5e1bd1c6b01bcb5b97e131d09 Mon Sep 17 00:00:00 2001
From: Timothy Jacobs <timothyblynjacobs@git.wordpress.org>
Date: Sun, 31 Oct 2021 05:17:53 +0000
Subject: [PATCH 251/257] REST API: Add visibility information to the Post
 Types controller.

Props spacedmonkey, peterwilsoncc.
Fixes #54055.


git-svn-id: https://develop.svn.wordpress.org/trunk@51959 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../class-wp-rest-post-types-controller.php   | 23 +++++++++++++++++++
 .../rest-api/rest-post-types-controller.php   |  8 ++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php
index 1301246dea206..e2598ac89d01e 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php
@@ -197,6 +197,13 @@ public function prepare_item_for_response( $item, $request ) {
 			$data['hierarchical'] = $post_type->hierarchical;
 		}
 
+		if ( in_array( 'visibility', $fields, true ) ) {
+			$data['visibility'] = array(
+				'show_in_nav_menus' => (bool) $post_type->show_in_nav_menus,
+				'show_ui'           => (bool) $post_type->show_ui,
+			);
+		}
+
 		if ( in_array( 'viewable', $fields, true ) ) {
 			$data['viewable'] = is_post_type_viewable( $post_type );
 		}
@@ -337,6 +344,22 @@ public function get_item_schema() {
 					'context'     => array( 'view', 'edit', 'embed' ),
 					'readonly'    => true,
 				),
+				'visibility'   => array(
+					'description' => __( 'The visibility settings for the post type.' ),
+					'type'        => 'object',
+					'context'     => array( 'edit' ),
+					'readonly'    => true,
+					'properties'  => array(
+						'show_ui'           => array(
+							'description' => __( 'Whether to generate a default UI for managing this post type.' ),
+							'type'        => 'boolean',
+						),
+						'show_in_nav_menus' => array(
+							'description' => __( 'Whether to make the post type is available for selection in navigation menus.' ),
+							'type'        => 'boolean',
+						),
+					),
+				),
 			),
 		);
 
diff --git a/tests/phpunit/tests/rest-api/rest-post-types-controller.php b/tests/phpunit/tests/rest-api/rest-post-types-controller.php
index 0e06bf9d15410..d93f5814c19a7 100644
--- a/tests/phpunit/tests/rest-api/rest-post-types-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-post-types-controller.php
@@ -144,7 +144,7 @@ public function test_get_item_schema() {
 		$response   = rest_get_server()->dispatch( $request );
 		$data       = $response->get_data();
 		$properties = $data['schema']['properties'];
-		$this->assertCount( 10, $properties );
+		$this->assertCount( 11, $properties );
 		$this->assertArrayHasKey( 'capabilities', $properties );
 		$this->assertArrayHasKey( 'description', $properties );
 		$this->assertArrayHasKey( 'hierarchical', $properties );
@@ -155,6 +155,7 @@ public function test_get_item_schema() {
 		$this->assertArrayHasKey( 'supports', $properties );
 		$this->assertArrayHasKey( 'taxonomies', $properties );
 		$this->assertArrayHasKey( 'rest_base', $properties );
+		$this->assertArrayHasKey( 'visibility', $properties );
 	}
 
 	public function test_get_additional_field_registration() {
@@ -216,6 +217,11 @@ protected function check_post_type_obj( $context, $post_type_obj, $data, $links
 				$viewable = is_post_type_viewable( $post_type_obj );
 			}
 			$this->assertSame( $viewable, $data['viewable'] );
+			$visibility = array(
+				'show_in_nav_menus' => (bool) $post_type_obj->show_in_nav_menus,
+				'show_ui'           => (bool) $post_type_obj->show_ui,
+			);
+			$this->assertSame( $visibility, $data['visibility'] );
 			$this->assertSame( get_all_post_type_supports( $post_type_obj->name ), $data['supports'] );
 		} else {
 			$this->assertArrayNotHasKey( 'capabilities', $data );

From 07ad6efdf7157d22424496d39d8c5635f28ecfbb Mon Sep 17 00:00:00 2001
From: Timothy Jacobs <timothyblynjacobs@git.wordpress.org>
Date: Sun, 31 Oct 2021 06:06:02 +0000
Subject: [PATCH 252/257] REST API: Send a 500 status code when JSON encoding
 fails.

Previously, a 200 status code would be sent despite the 500 status code present in the response body.

Props hermpheus, lalitjalandhar.
Fixes #53056.


git-svn-id: https://develop.svn.wordpress.org/trunk@51960 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../rest-api/class-wp-rest-server.php         |  1 +
 tests/phpunit/includes/spy-rest-server.php    |  9 ++++++++
 tests/phpunit/tests/rest-api/rest-server.php  | 22 +++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/src/wp-includes/rest-api/class-wp-rest-server.php b/src/wp-includes/rest-api/class-wp-rest-server.php
index 55f0ce6fc89ef..e2999f7c8231f 100644
--- a/src/wp-includes/rest-api/class-wp-rest-server.php
+++ b/src/wp-includes/rest-api/class-wp-rest-server.php
@@ -497,6 +497,7 @@ public function serve_request( $path = null ) {
 			$json_error_message = $this->get_json_last_error();
 
 			if ( $json_error_message ) {
+				$this->set_status( 500 );
 				$json_error_obj = new WP_Error(
 					'rest_encode_error',
 					$json_error_message,
diff --git a/tests/phpunit/includes/spy-rest-server.php b/tests/phpunit/includes/spy-rest-server.php
index 596117347ce00..5bfd1d2dba306 100644
--- a/tests/phpunit/includes/spy-rest-server.php
+++ b/tests/phpunit/includes/spy-rest-server.php
@@ -6,6 +6,7 @@ class Spy_REST_Server extends WP_REST_Server {
 	public $sent_body           = '';
 	public $last_request        = null;
 	public $override_by_default = false;
+	public $status              = null;
 
 	/**
 	 * Gets the raw $endpoints data from the server.
@@ -37,6 +38,14 @@ public function send_header( $header, $value ) {
 		$this->sent_headers[ $header ] = $value;
 	}
 
+	/**
+	 * Stores last set status.
+	 * @param int $code HTTP status.
+	 */
+	public function set_status( $status ) {
+		$this->status = $status;
+	}
+
 	/**
 	 * Removes a header from the list of sent headers.
 	 *
diff --git a/tests/phpunit/tests/rest-api/rest-server.php b/tests/phpunit/tests/rest-api/rest-server.php
index 03d1cf21faf19..30977958fa911 100644
--- a/tests/phpunit/tests/rest-api/rest-server.php
+++ b/tests/phpunit/tests/rest-api/rest-server.php
@@ -2022,6 +2022,28 @@ public function test_index_includes_link_to_active_theme_if_authenticated() {
 		$this->assertArrayHasKey( 'https://api.w.org/active-theme', $index->get_links() );
 	}
 
+	/**
+	 * @ticket 53056
+	 */
+	public function test_json_encode_error_results_in_500_status_code() {
+		register_rest_route(
+			'test-ns/v1',
+			'/test',
+			array(
+				array(
+					'methods'             => \WP_REST_Server::READABLE,
+					'callback'            => function() {
+						return new \WP_REST_Response( INF );
+					},
+					'permission_callback' => '__return_true',
+					'args'                => array(),
+				),
+			)
+		);
+		rest_get_server()->serve_request( '/test-ns/v1/test' );
+		$this->assertSame( 500, rest_get_server()->status );
+	}
+
 	public function _validate_as_integer_123( $value, $request, $key ) {
 		if ( ! is_int( $value ) ) {
 			return new WP_Error( 'some-error', 'This is not valid!' );

From 045bec51a4f379ab5b75cdbe7ff18ccac3d38c95 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sun, 31 Oct 2021 20:26:07 +0000
Subject: [PATCH 253/257] Docs: Add a `@since` note to
 `WP_REST_Post_Types_Controller::get_item_schema()` for the `supports` and
 `visibility` properties.

The `taxonomies` and `rest_base` properties were also added after the method was initially introduced, but that happened during the same release cycle, so they don't need a separate `@since` note.

Follow-up to [38832], [39097], [39191], [39647], [51959].

See #53399.

git-svn-id: https://develop.svn.wordpress.org/trunk@51961 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../rest-api/endpoints/class-wp-rest-post-types-controller.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php
index e2598ac89d01e..09b4e68bc04c8 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php
@@ -268,6 +268,8 @@ public function prepare_item_for_response( $item, $request ) {
 	 * Retrieves the post type's schema, conforming to JSON Schema.
 	 *
 	 * @since 4.7.0
+	 * @since 4.8.0 The `supports` property was added.
+	 * @since 5.9.0 The `visibility` property was added.
 	 *
 	 * @return array Item schema data.
 	 */

From bb6c5dbb8d613cb450d3f73983ecca27a75b003b Mon Sep 17 00:00:00 2001
From: Timothy Jacobs <timothyblynjacobs@git.wordpress.org>
Date: Sun, 31 Oct 2021 23:15:10 +0000
Subject: [PATCH 254/257] REST API: Support custom namespaces for custom post
 types.

While a custom post type can define a custom route by using the `rest_base` argument, a namespace of `wp/v2` was assumed. This commit introduces support for a `rest_namespace` argument.

A new `rest_get_route_for_post_type_items` function has been introduced and the `rest_get_route_for_post` function updated to facilitate getting the correct route for custom post types.

While the WordPress Core Block Editor bootstrap code has been updated to use these API functions, for maximum compatibility sticking with the default `wp/v2` namespace is recommended until the API functions see wider use.

Props spacedmonkey, swissspidy.
Fixes #53656.


git-svn-id: https://develop.svn.wordpress.org/trunk@51962 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/edit-form-blocks.php             | 10 ++--
 src/wp-admin/widgets-form-blocks.php          |  2 +-
 src/wp-includes/class-wp-post-type.php        | 14 +++++
 src/wp-includes/post.php                      |  1 +
 src/wp-includes/rest-api.php                  | 51 +++++++++++++------
 .../rest-api/class-wp-rest-server.php         |  2 +-
 .../class-wp-rest-autosaves-controller.php    |  2 +-
 ...class-wp-rest-post-statuses-controller.php |  5 +-
 .../class-wp-rest-post-types-controller.php   | 37 +++++++++-----
 .../class-wp-rest-posts-controller.php        |  6 +--
 .../class-wp-rest-revisions-controller.php    |  2 +-
 .../class-wp-rest-templates-controller.php    |  2 +-
 .../class-wp-rest-terms-controller.php        |  7 ++-
 tests/phpunit/tests/rest-api.php              | 45 +++++++++++++++-
 .../rest-api/rest-post-types-controller.php   | 21 +++++++-
 tests/qunit/fixtures/wp-api-generated.js      |  8 ++-
 16 files changed, 165 insertions(+), 50 deletions(-)

diff --git a/src/wp-admin/edit-form-blocks.php b/src/wp-admin/edit-form-blocks.php
index 7e335fa49b9cb..969d138ecb99d 100644
--- a/src/wp-admin/edit-form-blocks.php
+++ b/src/wp-admin/edit-form-blocks.php
@@ -49,7 +49,7 @@ static function( $classes ) {
 wp_enqueue_script( 'heartbeat' );
 wp_enqueue_script( 'wp-edit-post' );
 
-$rest_base = ! empty( $post_type_object->rest_base ) ? $post_type_object->rest_base : $post_type_object->name;
+$rest_path = rest_get_route_for_post( $post );
 
 // Preload common data.
 $preload_paths = array(
@@ -57,12 +57,12 @@ static function( $classes ) {
 	'/wp/v2/types?context=edit',
 	'/wp/v2/taxonomies?per_page=-1&context=edit',
 	'/wp/v2/themes?status=active',
-	sprintf( '/wp/v2/%s/%s?context=edit', $rest_base, $post->ID ),
+	add_query_arg( 'context', 'edit', $rest_path ),
 	sprintf( '/wp/v2/types/%s?context=edit', $post_type ),
 	sprintf( '/wp/v2/users/me?post_type=%s&context=edit', $post_type ),
-	array( '/wp/v2/media', 'OPTIONS' ),
-	array( '/wp/v2/blocks', 'OPTIONS' ),
-	sprintf( '/wp/v2/%s/%d/autosaves?context=edit', $rest_base, $post->ID ),
+	array( rest_get_route_for_post_type_items( 'attachment' ), 'OPTIONS' ),
+	array( rest_get_route_for_post_type_items( 'wp_block' ), 'OPTIONS' ),
+	sprintf( '%s/autosaves?context=edit', $rest_path ),
 );
 
 block_editor_rest_api_preload( $preload_paths, $block_editor_context );
diff --git a/src/wp-admin/widgets-form-blocks.php b/src/wp-admin/widgets-form-blocks.php
index 95908e1e9e2d8..563bbf2a699d9 100644
--- a/src/wp-admin/widgets-form-blocks.php
+++ b/src/wp-admin/widgets-form-blocks.php
@@ -18,7 +18,7 @@
 $block_editor_context = new WP_Block_Editor_Context();
 
 $preload_paths = array(
-	array( '/wp/v2/media', 'OPTIONS' ),
+	array( rest_get_route_for_post_type_items( 'attachment' ), 'OPTIONS' ),
 	'/wp/v2/sidebars?context=edit&per_page=-1',
 	'/wp/v2/widgets?context=edit&per_page=-1&_embed=about',
 );
diff --git a/src/wp-includes/class-wp-post-type.php b/src/wp-includes/class-wp-post-type.php
index 43e8a61514d57..e284994401dd1 100644
--- a/src/wp-includes/class-wp-post-type.php
+++ b/src/wp-includes/class-wp-post-type.php
@@ -358,6 +358,14 @@ final class WP_Post_Type {
 	 */
 	public $rest_base;
 
+	/**
+	 * The namespace for this post type's REST API endpoints.
+	 *
+	 * @since 5.9
+	 * @var string|bool $rest_namespace
+	 */
+	public $rest_namespace;
+
 	/**
 	 * The controller for this post type's REST API endpoints.
 	 *
@@ -452,6 +460,7 @@ public function set_props( $args ) {
 			'delete_with_user'      => null,
 			'show_in_rest'          => false,
 			'rest_base'             => false,
+			'rest_namespace'        => false,
 			'rest_controller_class' => false,
 			'template'              => array(),
 			'template_lock'         => false,
@@ -473,6 +482,11 @@ public function set_props( $args ) {
 			$args['show_ui'] = $args['public'];
 		}
 
+		// If not set, default rest_namespace to wp/v2 if show_in_rest is true.
+		if ( false === $args['rest_namespace'] && ! empty( $args['show_in_rest'] ) ) {
+			$args['rest_namespace'] = 'wp/v2';
+		}
+
 		// If not set, default to the setting for 'show_ui'.
 		if ( null === $args['show_in_menu'] || ! $args['show_ui'] ) {
 			$args['show_in_menu'] = $args['show_ui'];
diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php
index fb90f626f43b9..5cd73d1bd8197 100644
--- a/src/wp-includes/post.php
+++ b/src/wp-includes/post.php
@@ -1418,6 +1418,7 @@ function get_post_types( $args = array(), $output = 'names', $operator = 'and' )
  *     @type bool         $show_in_rest          Whether to include the post type in the REST API. Set this to true
  *                                               for the post type to be available in the block editor.
  *     @type string       $rest_base             To change the base URL of REST API route. Default is $post_type.
+ *     @type string       $rest_namespace        To change the namespace URL of REST API route. Default is wp/v2.
  *     @type string       $rest_controller_class REST API controller class name. Default is 'WP_REST_Posts_Controller'.
  *     @type int          $menu_position         The position in the menu order the post type should appear. To work,
  *                                               $show_in_menu must be true. Default null (at the bottom).
diff --git a/src/wp-includes/rest-api.php b/src/wp-includes/rest-api.php
index 3d89f16009196..a30a246d95ef6 100644
--- a/src/wp-includes/rest-api.php
+++ b/src/wp-includes/rest-api.php
@@ -3049,24 +3049,12 @@ function rest_get_route_for_post( $post ) {
 		return '';
 	}
 
-	$post_type = get_post_type_object( $post->post_type );
-	if ( ! $post_type ) {
+	$post_type_route = rest_get_route_for_post_type_items( $post->post_type );
+	if ( ! $post_type_route ) {
 		return '';
 	}
 
-	$controller = $post_type->get_rest_controller();
-	if ( ! $controller ) {
-		return '';
-	}
-
-	$route = '';
-
-	// The only two controllers that we can detect are the Attachments and Posts controllers.
-	if ( in_array( get_class( $controller ), array( 'WP_REST_Attachments_Controller', 'WP_REST_Posts_Controller' ), true ) ) {
-		$namespace = 'wp/v2';
-		$rest_base = ! empty( $post_type->rest_base ) ? $post_type->rest_base : $post_type->name;
-		$route     = sprintf( '/%s/%s/%d', $namespace, $rest_base, $post->ID );
-	}
+	$route = sprintf( '%s/%d', $post_type_route, $post->ID );
 
 	/**
 	 * Filters the REST API route for a post.
@@ -3079,6 +3067,39 @@ function rest_get_route_for_post( $post ) {
 	return apply_filters( 'rest_route_for_post', $route, $post );
 }
 
+/**
+ * Gets the REST API route for a post type.
+ *
+ * @since 5.9.0
+ *
+ * @param string $post_type The name of a registered post type.
+ * @return string The route path with a leading slash for the given post type, or an empty string if there is not a route.
+ */
+function rest_get_route_for_post_type_items( $post_type ) {
+	$post_type = get_post_type_object( $post_type );
+	if ( ! $post_type ) {
+		return '';
+	}
+
+	if ( ! $post_type->show_in_rest ) {
+		return '';
+	}
+
+	$namespace = ! empty( $post_type->rest_namespace ) ? $post_type->rest_namespace : 'wp/v2';
+	$rest_base = ! empty( $post_type->rest_base ) ? $post_type->rest_base : $post_type->name;
+	$route     = sprintf( '/%s/%s', $namespace, $rest_base );
+
+	/**
+	 * Filters the REST API route for a post type.
+	 *
+	 * @since 5.9.0
+	 *
+	 * @param string       $route      The route path.
+	 * @param WP_Post_Type $post_type  The post type object.
+	 */
+	return apply_filters( 'rest_route_for_post_type_items', $route, $post_type );
+}
+
 /**
  * Gets the REST API route for a term.
  *
diff --git a/src/wp-includes/rest-api/class-wp-rest-server.php b/src/wp-includes/rest-api/class-wp-rest-server.php
index e2999f7c8231f..3585aa7656b5e 100644
--- a/src/wp-includes/rest-api/class-wp-rest-server.php
+++ b/src/wp-includes/rest-api/class-wp-rest-server.php
@@ -1288,7 +1288,7 @@ protected function add_site_logo_to_index( WP_REST_Response $response ) {
 		if ( $site_logo_id ) {
 			$response->add_link(
 				'https://api.w.org/featuredmedia',
-				rest_url( 'wp/v2/media/' . $site_logo_id ),
+				rest_url( rest_get_route_for_post( $site_logo_id ) ),
 				array(
 					'embeddable' => true,
 				)
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php
index 3cb3d7efe58e8..0a2cf5d49b4b1 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php
@@ -67,8 +67,8 @@ public function __construct( $parent_post_type ) {
 
 		$this->parent_controller    = $parent_controller;
 		$this->revisions_controller = new WP_REST_Revisions_Controller( $parent_post_type );
-		$this->namespace            = 'wp/v2';
 		$this->rest_base            = 'autosaves';
+		$this->namespace            = ! empty( $post_type_object->rest_namespace ) ? $post_type_object->rest_namespace : 'wp/v2';
 		$this->parent_base          = ! empty( $post_type_object->rest_base ) ? $post_type_object->rest_base : $post_type_object->name;
 	}
 
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php
index 8ef94ea21a33e..4801d7943d576 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php
@@ -263,10 +263,11 @@ public function prepare_item_for_response( $item, $request ) {
 
 		$response = rest_ensure_response( $data );
 
+		$rest_url = rest_url( rest_get_route_for_post_type_items( 'post' ) );
 		if ( 'publish' === $status->name ) {
-			$response->add_link( 'archives', rest_url( 'wp/v2/posts' ) );
+			$response->add_link( 'archives', $rest_url );
 		} else {
-			$response->add_link( 'archives', add_query_arg( 'status', $status->name, rest_url( 'wp/v2/posts' ) ) );
+			$response->add_link( 'archives', add_query_arg( 'status', $status->name, $rest_url ) );
 		}
 
 		/**
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php
index 09b4e68bc04c8..088d238883cd0 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php
@@ -180,6 +180,7 @@ public function prepare_item_for_response( $item, $request ) {
 		$taxonomies = wp_list_filter( get_object_taxonomies( $post_type->name, 'objects' ), array( 'show_in_rest' => true ) );
 		$taxonomies = wp_list_pluck( $taxonomies, 'name' );
 		$base       = ! empty( $post_type->rest_base ) ? $post_type->rest_base : $post_type->name;
+		$namespace  = ! empty( $post_type->rest_namespace ) ? $post_type->rest_namespace : 'wp/v2';
 		$supports   = get_all_post_type_supports( $post_type->name );
 
 		$fields = $this->get_fields_for_response( $request );
@@ -232,6 +233,10 @@ public function prepare_item_for_response( $item, $request ) {
 			$data['rest_base'] = $base;
 		}
 
+		if ( in_array( 'rest_namespace', $fields, true ) ) {
+			$data['rest_namespace'] = $namespace;
+		}
+
 		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
 		$data    = $this->add_additional_fields_to_object( $data, $request );
 		$data    = $this->filter_response_by_context( $data, $context );
@@ -245,7 +250,7 @@ public function prepare_item_for_response( $item, $request ) {
 					'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
 				),
 				'https://api.w.org/items' => array(
-					'href' => rest_url( sprintf( 'wp/v2/%s', $base ) ),
+					'href' => rest_url( rest_get_route_for_post_type_items( $post_type->name ) ),
 				),
 			)
 		);
@@ -269,7 +274,7 @@ public function prepare_item_for_response( $item, $request ) {
 	 *
 	 * @since 4.7.0
 	 * @since 4.8.0 The `supports` property was added.
-	 * @since 5.9.0 The `visibility` property was added.
+	 * @since 5.9.0 The `visibility` and `rest_namespace` properties were added.
 	 *
 	 * @return array Item schema data.
 	 */
@@ -283,55 +288,55 @@ public function get_item_schema() {
 			'title'      => 'type',
 			'type'       => 'object',
 			'properties' => array(
-				'capabilities' => array(
+				'capabilities'   => array(
 					'description' => __( 'All capabilities used by the post type.' ),
 					'type'        => 'object',
 					'context'     => array( 'edit' ),
 					'readonly'    => true,
 				),
-				'description'  => array(
+				'description'    => array(
 					'description' => __( 'A human-readable description of the post type.' ),
 					'type'        => 'string',
 					'context'     => array( 'view', 'edit' ),
 					'readonly'    => true,
 				),
-				'hierarchical' => array(
+				'hierarchical'   => array(
 					'description' => __( 'Whether or not the post type should have children.' ),
 					'type'        => 'boolean',
 					'context'     => array( 'view', 'edit' ),
 					'readonly'    => true,
 				),
-				'viewable'     => array(
+				'viewable'       => array(
 					'description' => __( 'Whether or not the post type can be viewed.' ),
 					'type'        => 'boolean',
 					'context'     => array( 'edit' ),
 					'readonly'    => true,
 				),
-				'labels'       => array(
+				'labels'         => array(
 					'description' => __( 'Human-readable labels for the post type for various contexts.' ),
 					'type'        => 'object',
 					'context'     => array( 'edit' ),
 					'readonly'    => true,
 				),
-				'name'         => array(
+				'name'           => array(
 					'description' => __( 'The title for the post type.' ),
 					'type'        => 'string',
 					'context'     => array( 'view', 'edit', 'embed' ),
 					'readonly'    => true,
 				),
-				'slug'         => array(
+				'slug'           => array(
 					'description' => __( 'An alphanumeric identifier for the post type.' ),
 					'type'        => 'string',
 					'context'     => array( 'view', 'edit', 'embed' ),
 					'readonly'    => true,
 				),
-				'supports'     => array(
+				'supports'       => array(
 					'description' => __( 'All features, supported by the post type.' ),
 					'type'        => 'object',
 					'context'     => array( 'edit' ),
 					'readonly'    => true,
 				),
-				'taxonomies'   => array(
+				'taxonomies'     => array(
 					'description' => __( 'Taxonomies associated with post type.' ),
 					'type'        => 'array',
 					'items'       => array(
@@ -340,13 +345,19 @@ public function get_item_schema() {
 					'context'     => array( 'view', 'edit' ),
 					'readonly'    => true,
 				),
-				'rest_base'    => array(
+				'rest_base'      => array(
 					'description' => __( 'REST base route for the post type.' ),
 					'type'        => 'string',
 					'context'     => array( 'view', 'edit', 'embed' ),
 					'readonly'    => true,
 				),
-				'visibility'   => array(
+				'rest_namespace' => array(
+					'description' => __( 'REST route\'s namespace for the post type.' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit', 'embed' ),
+					'readonly'    => true,
+				),
+				'visibility'     => array(
 					'description' => __( 'The visibility settings for the post type.' ),
 					'type'        => 'object',
 					'context'     => array( 'edit' ),
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
index 068cc70bc2a9d..0cc548b0b6e4c 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
@@ -48,9 +48,9 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 */
 	public function __construct( $post_type ) {
 		$this->post_type = $post_type;
-		$this->namespace = 'wp/v2';
 		$obj             = get_post_type_object( $post_type );
 		$this->rest_base = ! empty( $obj->rest_base ) ? $obj->rest_base : $obj->name;
+		$this->namespace = ! empty( $obj->rest_namespace ) ? $obj->rest_namespace : 'wp/v2';
 
 		$this->meta = new WP_REST_Post_Meta_Fields( $this->post_type );
 	}
@@ -2037,7 +2037,7 @@ protected function prepare_links( $post ) {
 		// If we have a featured media, add that.
 		$featured_media = get_post_thumbnail_id( $post->ID );
 		if ( $featured_media ) {
-			$image_url = rest_url( 'wp/v2/media/' . $featured_media );
+			$image_url = rest_url( rest_get_route_for_post( $featured_media ) );
 
 			$links['https://api.w.org/featuredmedia'] = array(
 				'href'       => $image_url,
@@ -2046,7 +2046,7 @@ protected function prepare_links( $post ) {
 		}
 
 		if ( ! in_array( $post->post_type, array( 'attachment', 'nav_menu_item', 'revision' ), true ) ) {
-			$attachments_url = rest_url( 'wp/v2/media' );
+			$attachments_url = rest_url( rest_get_route_for_post_type_items( 'attachment' ) );
 			$attachments_url = add_query_arg( 'parent', $post->ID, $attachments_url );
 
 			$links['https://api.w.org/attachment'] = array(
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
index 5449812e1979a..bea3ddac789c6 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
@@ -49,10 +49,10 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 	 */
 	public function __construct( $parent_post_type ) {
 		$this->parent_post_type  = $parent_post_type;
-		$this->namespace         = 'wp/v2';
 		$this->rest_base         = 'revisions';
 		$post_type_object        = get_post_type_object( $parent_post_type );
 		$this->parent_base       = ! empty( $post_type_object->rest_base ) ? $post_type_object->rest_base : $post_type_object->name;
+		$this->namespace         = ! empty( $post_type_object->rest_namespace ) ? $post_type_object->rest_namespace : 'wp/v2';
 		$this->parent_controller = $post_type_object->get_rest_controller();
 
 		if ( ! $this->parent_controller ) {
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
index 1b4df794e81a1..e7712363f7f33 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
@@ -33,9 +33,9 @@ class WP_REST_Templates_Controller extends WP_REST_Controller {
 	 */
 	public function __construct( $post_type ) {
 		$this->post_type = $post_type;
-		$this->namespace = 'wp/v2';
 		$obj             = get_post_type_object( $post_type );
 		$this->rest_base = ! empty( $obj->rest_base ) ? $obj->rest_base : $obj->name;
+		$this->namespace = ! empty( $obj->rest_namespace ) ? $obj->rest_namespace : 'wp/v2';
 	}
 
 	/**
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
index 093b98a4911ad..183b7c7ffa45c 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
@@ -914,15 +914,14 @@ protected function prepare_links( $term ) {
 		$post_type_links = array();
 
 		foreach ( $taxonomy_obj->object_type as $type ) {
-			$post_type_object = get_post_type_object( $type );
+			$rest_path = rest_get_route_for_post_type_items( $type );
 
-			if ( empty( $post_type_object->show_in_rest ) ) {
+			if ( empty( $rest_path ) ) {
 				continue;
 			}
 
-			$rest_base         = ! empty( $post_type_object->rest_base ) ? $post_type_object->rest_base : $post_type_object->name;
 			$post_type_links[] = array(
-				'href' => add_query_arg( $this->rest_base, $term->term_id, rest_url( sprintf( 'wp/v2/%s', $rest_base ) ) ),
+				'href' => add_query_arg( $this->rest_base, $term->term_id, rest_url( $rest_path ) ),
 			);
 		}
 
diff --git a/tests/phpunit/tests/rest-api.php b/tests/phpunit/tests/rest-api.php
index 4ec818013bda6..5770f68841b42 100644
--- a/tests/phpunit/tests/rest-api.php
+++ b/tests/phpunit/tests/rest-api.php
@@ -1829,6 +1829,48 @@ public function test_rest_get_route_for_post_invalid_post_type() {
 		$this->assertSame( '', rest_get_route_for_post( $post ) );
 	}
 
+	/**
+	 * @ticket 53656
+	 */
+	public function test_rest_get_route_for_post_custom_namespace() {
+		register_post_type(
+			'cpt',
+			array(
+				'show_in_rest'   => true,
+				'rest_base'      => 'cpt',
+				'rest_namespace' => 'wordpress/v1',
+			)
+		);
+		$post = self::factory()->post->create_and_get( array( 'post_type' => 'cpt' ) );
+
+		$this->assertSame( '/wordpress/v1/cpt/' . $post->ID, rest_get_route_for_post( $post ) );
+		unregister_post_type( 'cpt' );
+	}
+
+	/**
+	 * @ticket 53656
+	 */
+	public function test_rest_get_route_for_post_type_items() {
+		$this->assertSame( '/wp/v2/posts', rest_get_route_for_post_type_items( 'post' ) );
+	}
+
+	/**
+	 * @ticket 53656
+	 */
+	public function test_rest_get_route_for_post_type_items_custom_namespace() {
+		register_post_type(
+			'cpt',
+			array(
+				'show_in_rest'   => true,
+				'rest_base'      => 'cpt',
+				'rest_namespace' => 'wordpress/v1',
+			)
+		);
+
+		$this->assertSame( '/wordpress/v1/cpt', rest_get_route_for_post_type_items( 'cpt' ) );
+		unregister_post_type( 'cpt' );
+	}
+
 	/**
 	 * @ticket 49116
 	 */
@@ -1839,10 +1881,11 @@ public function test_rest_get_route_for_post_non_rest() {
 
 	/**
 	 * @ticket 49116
+	 * @ticket 53656
 	 */
 	public function test_rest_get_route_for_post_custom_controller() {
 		$post = self::factory()->post->create_and_get( array( 'post_type' => 'wp_block' ) );
-		$this->assertSame( '', rest_get_route_for_post( $post ) );
+		$this->assertSame( '/wp/v2/blocks/' . $post->ID, rest_get_route_for_post( $post ) );
 	}
 
 	/**
diff --git a/tests/phpunit/tests/rest-api/rest-post-types-controller.php b/tests/phpunit/tests/rest-api/rest-post-types-controller.php
index d93f5814c19a7..22ff225a69a52 100644
--- a/tests/phpunit/tests/rest-api/rest-post-types-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-post-types-controller.php
@@ -62,6 +62,23 @@ public function test_get_item() {
 		$this->assertSame( array( 'category', 'post_tag' ), $data['taxonomies'] );
 	}
 
+	/**
+	 * @ticket 53656
+	 */
+	public function test_get_item_cpt() {
+		register_post_type(
+			'cpt',
+			array(
+				'show_in_rest'   => true,
+				'rest_base'      => 'cpt',
+				'rest_namespace' => 'wordpress/v1',
+			)
+		);
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/types/cpt' );
+		$response = rest_get_server()->dispatch( $request );
+		$this->check_post_type_object_response( 'view', $response, 'cpt' );
+	}
+
 	public function test_get_item_page() {
 		$request  = new WP_REST_Request( 'GET', '/wp/v2/types/page' );
 		$response = rest_get_server()->dispatch( $request );
@@ -144,7 +161,7 @@ public function test_get_item_schema() {
 		$response   = rest_get_server()->dispatch( $request );
 		$data       = $response->get_data();
 		$properties = $data['schema']['properties'];
-		$this->assertCount( 11, $properties );
+		$this->assertCount( 12, $properties );
 		$this->assertArrayHasKey( 'capabilities', $properties );
 		$this->assertArrayHasKey( 'description', $properties );
 		$this->assertArrayHasKey( 'hierarchical', $properties );
@@ -155,6 +172,7 @@ public function test_get_item_schema() {
 		$this->assertArrayHasKey( 'supports', $properties );
 		$this->assertArrayHasKey( 'taxonomies', $properties );
 		$this->assertArrayHasKey( 'rest_base', $properties );
+		$this->assertArrayHasKey( 'rest_namespace', $properties );
 		$this->assertArrayHasKey( 'visibility', $properties );
 	}
 
@@ -204,6 +222,7 @@ protected function check_post_type_obj( $context, $post_type_obj, $data, $links
 		$this->assertSame( $post_type_obj->description, $data['description'] );
 		$this->assertSame( $post_type_obj->hierarchical, $data['hierarchical'] );
 		$this->assertSame( $post_type_obj->rest_base, $data['rest_base'] );
+		$this->assertSame( $post_type_obj->rest_namespace, $data['rest_namespace'] );
 
 		$links = test_rest_expand_compact_links( $links );
 		$this->assertSame( rest_url( 'wp/v2/types' ), $links['collection'][0]['href'] );
diff --git a/tests/qunit/fixtures/wp-api-generated.js b/tests/qunit/fixtures/wp-api-generated.js
index 0d5b2230e0b47..63b70dd2c8d60 100644
--- a/tests/qunit/fixtures/wp-api-generated.js
+++ b/tests/qunit/fixtures/wp-api-generated.js
@@ -8336,6 +8336,7 @@ mockedApiResponse.TypesCollection = {
             "post_tag"
         ],
         "rest_base": "posts",
+        "rest_namespace": "wp/v2",
         "_links": {
             "collection": [
                 {
@@ -8363,6 +8364,7 @@ mockedApiResponse.TypesCollection = {
         "slug": "page",
         "taxonomies": [],
         "rest_base": "pages",
+        "rest_namespace": "wp/v2",
         "_links": {
             "collection": [
                 {
@@ -8390,6 +8392,7 @@ mockedApiResponse.TypesCollection = {
         "slug": "attachment",
         "taxonomies": [],
         "rest_base": "media",
+        "rest_namespace": "wp/v2",
         "_links": {
             "collection": [
                 {
@@ -8417,6 +8420,7 @@ mockedApiResponse.TypesCollection = {
         "slug": "wp_block",
         "taxonomies": [],
         "rest_base": "blocks",
+        "rest_namespace": "wp/v2",
         "_links": {
             "collection": [
                 {
@@ -8444,6 +8448,7 @@ mockedApiResponse.TypesCollection = {
         "slug": "wp_template",
         "taxonomies": [],
         "rest_base": "templates",
+        "rest_namespace": "wp/v2",
         "_links": {
             "collection": [
                 {
@@ -8475,7 +8480,8 @@ mockedApiResponse.TypeModel = {
         "category",
         "post_tag"
     ],
-    "rest_base": "posts"
+    "rest_base": "posts",
+    "rest_namespace": "wp/v2"
 };
 
 mockedApiResponse.StatusesCollection = {

From 9ca3e8f36b07c41e9298c545135a451718f5d805 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <pento@git.wordpress.org>
Date: Mon, 1 Nov 2021 02:12:09 +0000
Subject: [PATCH 255/257] KSES: Add options for restricting tags based upon
 their attributes.

This change adds two now attribute-related config options to KSES:
- An array of allowed values can be defined for attributes. If the attribute value doesn't fall into the list, the attribute will be removed from the tag.
- Attributes can be marked as required. If a required attribute is not present, KSES will remove all attributes from the tag. As KSES doesn't match opening and closing tags, it's not possible to safely remove the tag itself, the safest fallback is to strip all attributes from the tag, instead.

Included with this change is an implementation of these options, allowing the `<object>` tag to be stored in posts, but only when it has a `type` attribute set to `application/pdf`.

Props pento, swissspidy, peterwilsoncc, dd32, jorbin.
Fixes #54261.



git-svn-id: https://develop.svn.wordpress.org/trunk@51963 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/kses.php     |  50 ++++++
 tests/phpunit/tests/kses.php | 294 +++++++++++++++++++++++++++++++++++
 2 files changed, 344 insertions(+)

diff --git a/src/wp-includes/kses.php b/src/wp-includes/kses.php
index 0b24a1ba0c13f..3a7f99dd1a998 100644
--- a/src/wp-includes/kses.php
+++ b/src/wp-includes/kses.php
@@ -271,6 +271,13 @@
 			'lang'     => true,
 			'xml:lang' => true,
 		),
+		'object'     => array(
+			'data' => true,
+			'type' => array(
+				'required' => true,
+				'values'   => array( 'application/pdf' ),
+			),
+		),
 		'p'          => array(
 			'align'    => true,
 			'dir'      => true,
@@ -1165,15 +1172,47 @@ function wp_kses_attr( $element, $attr, $allowed_html, $allowed_protocols ) {
 	// Split it.
 	$attrarr = wp_kses_hair( $attr, $allowed_protocols );
 
+	// Check if there are attributes that are required.
+	$required_attrs = array_filter(
+		$allowed_html[ $element_low ],
+		function( $required_attr_limits ) {
+			return isset( $required_attr_limits['required'] ) && true === $required_attr_limits['required'];
+		}
+	);
+
+	// If a required attribute check fails, we can return nothing for a self-closing tag,
+	// but for a non-self-closing tag the best option is to return the element with attributes,
+	// as KSES doesn't handle matching the relevant closing tag.
+	$stripped_tag = '';
+	if ( empty( $xhtml_slash ) ) {
+		$stripped_tag = "<$element>";
+	}
+
 	// Go through $attrarr, and save the allowed attributes for this element
 	// in $attr2.
 	$attr2 = '';
 	foreach ( $attrarr as $arreach ) {
+		// Check if this attribute is required.
+		$required = isset( $required_attrs[ strtolower( $arreach['name'] ) ] );
+
 		if ( wp_kses_attr_check( $arreach['name'], $arreach['value'], $arreach['whole'], $arreach['vless'], $element, $allowed_html ) ) {
 			$attr2 .= ' ' . $arreach['whole'];
+
+			// If this was a required attribute, we can mark it as found.
+			if ( $required ) {
+				unset( $required_attrs[ strtolower( $arreach['name'] ) ] );
+			}
+		} elseif ( $required ) {
+			// This attribute was required, but didn't pass the check. The entire tag is not allowed.
+			return $stripped_tag;
 		}
 	}
 
+	// If some required attributes weren't set, the entire tag is not allowed.
+	if ( ! empty( $required_attrs ) ) {
+		return $stripped_tag;
+	}
+
 	// Remove any "<" or ">" characters.
 	$attr2 = preg_replace( '/[<>]/', '', $attr2 );
 
@@ -1600,6 +1639,17 @@ function wp_kses_check_attr_val( $value, $vless, $checkname, $checkvalue ) {
 				$ok = false;
 			}
 			break;
+
+		case 'values':
+			/*
+			 * The values check is used when you want to make sure that the attribute
+			 * has one of the given values.
+			 */
+
+			if ( false === array_search( strtolower( $value ), $checkvalue, true ) ) {
+				$ok = false;
+			}
+			break;
 	} // End switch.
 
 	return $ok;
diff --git a/tests/phpunit/tests/kses.php b/tests/phpunit/tests/kses.php
index 961ed71b1652d..11434d37e8ab4 100644
--- a/tests/phpunit/tests/kses.php
+++ b/tests/phpunit/tests/kses.php
@@ -1496,4 +1496,298 @@ function test_wp_kses_main_tag_standard_attributes() {
 
 		$this->assertSame( $html, wp_kses_post( $html ) );
 	}
+
+	/**
+	 * Test that object tags are allowed under limited circumstances.
+	 *
+	 * @ticket 54261
+	 *
+	 * @dataProvider data_wp_kses_object_tag_allowed
+	 *
+	 * @param string $html     A string of HTML to test.
+	 * @param string $expected The expected result from KSES.
+	 */
+	function test_wp_kses_object_tag_allowed( $html, $expected ) {
+		$this->assertSame( $expected, wp_kses_post( $html ) );
+	}
+
+	/**
+	 * Data provider for test_wp_kses_object_tag_allowed().
+	 */
+	function data_wp_kses_object_tag_allowed() {
+		return array(
+			'valid value for type'                    => array(
+				'<object type="application/pdf" data="https://wordpress.org/foo.pdf" />',
+				'<object type="application/pdf" data="https://wordpress.org/foo.pdf" />',
+			),
+			'invalid value for type'                  => array(
+				'<object type="application/exe" data="https://wordpress.org/foo.exe" />',
+				'',
+			),
+			'multiple type attributes, last invalid'  => array(
+				'<object type="application/pdf" type="application/exe" data="https://wordpress.org/foo.pdf" />',
+				'<object type="application/pdf" data="https://wordpress.org/foo.pdf" />',
+			),
+			'multiple type attributes, first uppercase, last invalid' => array(
+				'<object TYPE="application/pdf" type="application/exe" data="https://wordpress.org/foo.pdf" />',
+				'<object TYPE="application/pdf" data="https://wordpress.org/foo.pdf" />',
+			),
+			'multiple type attributes, last upper case and invalid' => array(
+				'<object type="application/pdf" TYPE="application/exe" data="https://wordpress.org/foo.pdf" />',
+				'<object type="application/pdf" data="https://wordpress.org/foo.pdf" />',
+			),
+			'multiple type attributes, first invalid' => array(
+				'<object type="application/exe" type="application/pdf" data="https://wordpress.org/foo.pdf" />',
+				'',
+			),
+			'multiple type attributes, first upper case and invalid' => array(
+				'<object TYPE="application/exe" type="application/pdf" data="https://wordpress.org/foo.pdf" />',
+				'',
+			),
+			'multiple type attributes, first invalid, last uppercase' => array(
+				'<object type="application/exe" TYPE="application/pdf" data="https://wordpress.org/foo.pdf" />',
+				'',
+			),
+			'multiple object tags, last invalid'      => array(
+				'<object type="application/pdf" data="https://wordpress.org/foo.pdf" /><object type="application/exe" data="https://wordpress.org/foo.exe" />',
+				'<object type="application/pdf" data="https://wordpress.org/foo.pdf" />',
+			),
+			'multiple object tags, first invalid'     => array(
+				'<object type="application/exe" data="https://wordpress.org/foo.exe" /><object type="application/pdf" data="https://wordpress.org/foo.pdf" />',
+				'<object type="application/pdf" data="https://wordpress.org/foo.pdf" />',
+			),
+			'type attribute with partially incorrect value' => array(
+				'<object type="application/pdfa" data="https://wordpress.org/foo.pdf" />',
+				'',
+			),
+			'type attribute with empty value'         => array(
+				'<object type="" data="https://wordpress.org/foo.pdf" />',
+				'',
+			),
+			'type attribute with no value'            => array(
+				'<object type data="https://wordpress.org/foo.pdf" />',
+				'',
+			),
+			'no type attribute'                       => array(
+				'<object data="https://wordpress.org/foo.pdf" />',
+				'',
+			),
+		);
+	}
+
+	/**
+	 * Test that object tags will continue to function if they've been added using the
+	 * 'wp_kses_allowed_html' filter.
+	 *
+	 * @ticket 54261
+	 */
+	function test_wp_kses_object_added_in_html_filter() {
+		$html = <<<HTML
+<object type="application/pdf" data="https://wordpress.org/foo.pdf" />
+<object type="application/x-shockwave-flash" data="https://wordpress.org/foo.swf">
+	<param name="foo" value="bar" />
+</object>
+HTML;
+
+		add_filter( 'wp_kses_allowed_html', array( $this, 'filter_wp_kses_object_added_in_html_filter' ), 10, 2 );
+
+		$filtered_html = wp_kses_post( $html );
+
+		remove_filter( 'wp_kses_allowed_html', array( $this, 'filter_wp_kses_object_added_in_html_filter' ) );
+
+		$this->assertSame( $html, $filtered_html );
+	}
+
+	function filter_wp_kses_object_added_in_html_filter( $tags, $context ) {
+		if ( 'post' === $context ) {
+			$tags['object'] = array(
+				'type' => true,
+				'data' => true,
+			);
+
+			$tags['param'] = array(
+				'name'  => true,
+				'value' => true,
+			);
+		}
+
+		return $tags;
+	}
+
+	/**
+	 * Test that attributes with a list of allowed values are filtered correctly.
+	 *
+	 * @ticket 54261
+	 *
+	 * @dataProvider data_wp_kses_allowed_values_list
+	 *
+	 * @param string $html         A string of HTML to test.
+	 * @param string $expected     The expected result from KSES.
+	 * @param array  $allowed_html The allowed HTML to pass to KSES.
+	 */
+	function test_wp_kses_allowed_values_list( $html, $expected, $allowed_html ) {
+		$this->assertSame( $expected, wp_kses( $html, $allowed_html ) );
+	}
+
+	/**
+	 * Data provider for test_wp_kses_allowed_values_list().
+	 */
+	function data_wp_kses_allowed_values_list() {
+		$data = array(
+			'valid dir attribute value'             => array(
+				'<p dir="ltr">foo</p>',
+				'<p dir="ltr">foo</p>',
+			),
+			'valid dir attribute value, upper case' => array(
+				'<p DIR="RTL">foo</p>',
+				'<p DIR="RTL">foo</p>',
+			),
+			'invalid dir attribute value'           => array(
+				'<p dir="up">foo</p>',
+				'<p>foo</p>',
+			),
+			'dir attribute with empty value'        => array(
+				'<p dir="">foo</p>',
+				'<p>foo</p>',
+			),
+			'dir attribute with no value'           => array(
+				'<p dir>foo</p>',
+				'<p>foo</p>',
+			),
+		);
+
+		return array_map(
+			function ( $datum ) {
+				$datum[] = array(
+					'p' => array(
+						'dir' => array(
+							'values' => array( 'ltr', 'rtl' ),
+						),
+					),
+				);
+
+				return $datum;
+			},
+			$data
+		);
+	}
+
+	/**
+	 * Test that attributes with the required flag are handled correctly.
+	 *
+	 * @ticket 54261
+	 *
+	 * @dataProvider data_wp_kses_required_attribute
+	 *
+	 * @param string $html         A string of HTML to test.
+	 * @param string $expected     The expected result from KSES.
+	 * @param array  $allowed_html The allowed HTML to pass to KSES.
+	 */
+	function test_wp_kses_required_attribute( $html, $expected, $allowed_html ) {
+		$this->assertSame( $expected, wp_kses( $html, $allowed_html ) );
+	}
+
+	/**
+	 * Data provider for test_wp_kses_required_attribute().
+	 */
+	function data_wp_kses_required_attribute() {
+		$data = array(
+			'valid dir attribute value'             => array(
+				'<p dir="ltr">foo</p>', // Test HTML.
+				'<p dir="ltr">foo</p>', // Expected result when dir is not required.
+				'<p dir="ltr">foo</p>', // Expected result when dir is required.
+				'<p dir="ltr">foo</p>', // Expected result when dir is required, but has no value filter.
+			),
+			'valid dir attribute value, upper case' => array(
+				'<p DIR="RTL">foo</p>',
+				'<p DIR="RTL">foo</p>',
+				'<p DIR="RTL">foo</p>',
+				'<p DIR="RTL">foo</p>',
+			),
+			'invalid dir attribute value'           => array(
+				'<p dir="up">foo</p>',
+				'<p>foo</p>',
+				'<p>foo</p>',
+				'<p dir="up">foo</p>',
+			),
+			'dir attribute with empty value'        => array(
+				'<p dir="">foo</p>',
+				'<p>foo</p>',
+				'<p>foo</p>',
+				'<p dir="">foo</p>',
+			),
+			'dir attribute with no value'           => array(
+				'<p dir>foo</p>',
+				'<p>foo</p>',
+				'<p>foo</p>',
+				'<p dir>foo</p>',
+			),
+			'dir attribute not set'                 => array(
+				'<p>foo</p>',
+				'<p>foo</p>',
+				'<p>foo</p>',
+				'<p>foo</p>',
+			),
+		);
+
+		$return_data = array();
+
+		foreach ( $data as $description => $datum ) {
+			// Test that the required flag defaults to false.
+			$return_data[ "$description - required flag not set" ] = array(
+				$datum[0],
+				$datum[1],
+				array(
+					'p' => array(
+						'dir' => array(
+							'values' => array( 'ltr', 'rtl' ),
+						),
+					),
+				),
+			);
+
+			// Test when the attribute is not required, but has allowed values.
+			$return_data[ "$description - required flag set to false" ] = array(
+				$datum[0],
+				$datum[1],
+				array(
+					'p' => array(
+						'dir' => array(
+							'required' => false,
+							'values'   => array( 'ltr', 'rtl' ),
+						),
+					),
+				),
+			);
+
+			// Test when the attribute is required, but has allowed values.
+			$return_data[ "$description - required flag set to true" ] = array(
+				$datum[0],
+				$datum[2],
+				array(
+					'p' => array(
+						'dir' => array(
+							'required' => true,
+							'values'   => array( 'ltr', 'rtl' ),
+						),
+					),
+				),
+			);
+
+			// Test when the attribute is required, but has no allowed values.
+			$return_data[ "$description - required flag set to true, no allowed values specified" ] = array(
+				$datum[0],
+				$datum[3],
+				array(
+					'p' => array(
+						'dir' => array(
+							'required' => true,
+						),
+					),
+				),
+			);
+		}
+
+		return $return_data;
+	}
 }

From 2cd084aeb0af3506d34bff67e4ad805c72f31dd1 Mon Sep 17 00:00:00 2001
From: Timothy Jacobs <timothyblynjacobs@git.wordpress.org>
Date: Mon, 1 Nov 2021 03:26:06 +0000
Subject: [PATCH 256/257] REST API: Support custom namespaces for taxonomies.

While a taxonomy can define a custom route by using the rest_base argument, a namespace of wp/v2 was assumed. This commit introduces support for a rest_namespace argument.

A new rest_get_route_for_taxonomy_items function has been introduced and the rest_get_route_for_term function updated to facilitate getting the correct route for taxonomies.

For maximum compatibility sticking with the default wp/v2 namespace is recommended until the API functions see wider use.

Props spacedmonkey.
Fixes #54267.
See [51962].


git-svn-id: https://develop.svn.wordpress.org/trunk@51964 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-taxonomy.php         | 14 +++++
 src/wp-includes/rest-api.php                  | 51 +++++++++++++------
 .../class-wp-rest-posts-controller.php        |  9 ++--
 .../class-wp-rest-taxonomies-controller.php   | 32 ++++++++----
 .../class-wp-rest-terms-controller.php        |  2 +-
 src/wp-includes/taxonomy.php                  |  1 +
 tests/phpunit/tests/rest-api.php              | 44 ++++++++++++++++
 .../rest-api/rest-taxonomies-controller.php   |  4 +-
 tests/qunit/fixtures/wp-api-generated.js      |  5 +-
 9 files changed, 127 insertions(+), 35 deletions(-)

diff --git a/src/wp-includes/class-wp-taxonomy.php b/src/wp-includes/class-wp-taxonomy.php
index 9db7403809306..21c954ad0571b 100644
--- a/src/wp-includes/class-wp-taxonomy.php
+++ b/src/wp-includes/class-wp-taxonomy.php
@@ -199,6 +199,14 @@ final class WP_Taxonomy {
 	 */
 	public $rest_base;
 
+	/**
+	 * The namespace for this taxonomy's REST API endpoints.
+	 *
+	 * @since 5.9
+	 * @var string|bool $rest_namespace
+	 */
+	public $rest_namespace;
+
 	/**
 	 * The controller for this taxonomy's REST API endpoints.
 	 *
@@ -319,6 +327,7 @@ public function set_props( $object_type, $args ) {
 			'update_count_callback' => '',
 			'show_in_rest'          => false,
 			'rest_base'             => false,
+			'rest_namespace'        => false,
 			'rest_controller_class' => false,
 			'default_term'          => null,
 			'sort'                  => null,
@@ -384,6 +393,11 @@ public function set_props( $object_type, $args ) {
 			$args['show_in_quick_edit'] = $args['show_ui'];
 		}
 
+		// If not set, default rest_namespace to wp/v2 if show_in_rest is true.
+		if ( false === $args['rest_namespace'] && ! empty( $args['show_in_rest'] ) ) {
+			$args['rest_namespace'] = 'wp/v2';
+		}
+
 		$default_caps = array(
 			'manage_terms' => 'manage_categories',
 			'edit_terms'   => 'manage_categories',
diff --git a/src/wp-includes/rest-api.php b/src/wp-includes/rest-api.php
index a30a246d95ef6..03860a915cef8 100644
--- a/src/wp-includes/rest-api.php
+++ b/src/wp-includes/rest-api.php
@@ -3115,24 +3115,12 @@ function rest_get_route_for_term( $term ) {
 		return '';
 	}
 
-	$taxonomy = get_taxonomy( $term->taxonomy );
-	if ( ! $taxonomy ) {
-		return '';
-	}
-
-	$controller = $taxonomy->get_rest_controller();
-	if ( ! $controller ) {
+	$taxonomy_route = rest_get_route_for_taxonomy_items( $term->taxonomy );
+	if ( ! $taxonomy_route ) {
 		return '';
 	}
 
-	$route = '';
-
-	// The only controller that works is the Terms controller.
-	if ( $controller instanceof WP_REST_Terms_Controller ) {
-		$namespace = 'wp/v2';
-		$rest_base = ! empty( $taxonomy->rest_base ) ? $taxonomy->rest_base : $taxonomy->name;
-		$route     = sprintf( '/%s/%s/%d', $namespace, $rest_base, $term->term_id );
-	}
+	$route = sprintf( '%s/%d', $taxonomy_route, $term->term_id );
 
 	/**
 	 * Filters the REST API route for a term.
@@ -3145,6 +3133,39 @@ function rest_get_route_for_term( $term ) {
 	return apply_filters( 'rest_route_for_term', $route, $term );
 }
 
+/**
+ * Gets the REST API route for a taxonomy.
+ *
+ * @since 5.9.0
+ *
+ * @param string $taxonomy Name of taxonomy.
+ * @return string The route path with a leading slash for the given taxonomy.
+ */
+function rest_get_route_for_taxonomy_items( $taxonomy ) {
+	$taxonomy = get_taxonomy( $taxonomy );
+	if ( ! $taxonomy ) {
+		return '';
+	}
+
+	if ( ! $taxonomy->show_in_rest ) {
+		return '';
+	}
+
+	$namespace = ! empty( $taxonomy->rest_namespace ) ? $taxonomy->rest_namespace : 'wp/v2';
+	$rest_base = ! empty( $taxonomy->rest_base ) ? $taxonomy->rest_base : $taxonomy->name;
+	$route     = sprintf( '/%s/%s', $namespace, $rest_base );
+
+	/**
+	 * Filters the REST API route for a taxonomy.
+	 *
+	 * @since 5.9.0
+	 *
+	 * @param string      $route    The route path.
+	 * @param WP_Taxonomy $taxonomy The taxonomy object.
+	 */
+	return apply_filters( 'rest_route_for_taxonomy_items', $route, $taxonomy );
+}
+
 /**
  * Gets the REST route for the currently queried object.
  *
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
index 0cc548b0b6e4c..ffb4466892340 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
@@ -2060,19 +2060,16 @@ protected function prepare_links( $post ) {
 			$links['https://api.w.org/term'] = array();
 
 			foreach ( $taxonomies as $tax ) {
-				$taxonomy_obj = get_taxonomy( $tax );
+				$taxonomy_route = rest_get_route_for_taxonomy_items( $tax );
 
 				// Skip taxonomies that are not public.
-				if ( empty( $taxonomy_obj->show_in_rest ) ) {
+				if ( empty( $taxonomy_route ) ) {
 					continue;
 				}
-
-				$tax_base = ! empty( $taxonomy_obj->rest_base ) ? $taxonomy_obj->rest_base : $tax;
-
 				$terms_url = add_query_arg(
 					'post',
 					$post->ID,
-					rest_url( 'wp/v2/' . $tax_base )
+					rest_url( $taxonomy_route )
 				);
 
 				$links['https://api.w.org/term'][] = array(
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php
index 9d43ca2874b71..d05abcbcea2f0 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php
@@ -250,6 +250,10 @@ public function prepare_item_for_response( $item, $request ) {
 			$data['rest_base'] = $base;
 		}
 
+		if ( in_array( 'rest_namespace', $fields, true ) ) {
+			$data['rest_namespace'] = $taxonomy->rest_namespace;
+		}
+
 		if ( in_array( 'visibility', $fields, true ) ) {
 			$data['visibility'] = array(
 				'public'             => (bool) $taxonomy->public,
@@ -274,7 +278,7 @@ public function prepare_item_for_response( $item, $request ) {
 					'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
 				),
 				'https://api.w.org/items' => array(
-					'href' => rest_url( sprintf( 'wp/v2/%s', $base ) ),
+					'href' => rest_url( rest_get_route_for_taxonomy_items( $taxonomy->name ) ),
 				),
 			)
 		);
@@ -310,49 +314,49 @@ public function get_item_schema() {
 			'title'      => 'taxonomy',
 			'type'       => 'object',
 			'properties' => array(
-				'capabilities' => array(
+				'capabilities'   => array(
 					'description' => __( 'All capabilities used by the taxonomy.' ),
 					'type'        => 'object',
 					'context'     => array( 'edit' ),
 					'readonly'    => true,
 				),
-				'description'  => array(
+				'description'    => array(
 					'description' => __( 'A human-readable description of the taxonomy.' ),
 					'type'        => 'string',
 					'context'     => array( 'view', 'edit' ),
 					'readonly'    => true,
 				),
-				'hierarchical' => array(
+				'hierarchical'   => array(
 					'description' => __( 'Whether or not the taxonomy should have children.' ),
 					'type'        => 'boolean',
 					'context'     => array( 'view', 'edit' ),
 					'readonly'    => true,
 				),
-				'labels'       => array(
+				'labels'         => array(
 					'description' => __( 'Human-readable labels for the taxonomy for various contexts.' ),
 					'type'        => 'object',
 					'context'     => array( 'edit' ),
 					'readonly'    => true,
 				),
-				'name'         => array(
+				'name'           => array(
 					'description' => __( 'The title for the taxonomy.' ),
 					'type'        => 'string',
 					'context'     => array( 'view', 'edit', 'embed' ),
 					'readonly'    => true,
 				),
-				'slug'         => array(
+				'slug'           => array(
 					'description' => __( 'An alphanumeric identifier for the taxonomy.' ),
 					'type'        => 'string',
 					'context'     => array( 'view', 'edit', 'embed' ),
 					'readonly'    => true,
 				),
-				'show_cloud'   => array(
+				'show_cloud'     => array(
 					'description' => __( 'Whether or not the term cloud should be displayed.' ),
 					'type'        => 'boolean',
 					'context'     => array( 'edit' ),
 					'readonly'    => true,
 				),
-				'types'        => array(
+				'types'          => array(
 					'description' => __( 'Types associated with the taxonomy.' ),
 					'type'        => 'array',
 					'items'       => array(
@@ -361,13 +365,19 @@ public function get_item_schema() {
 					'context'     => array( 'view', 'edit' ),
 					'readonly'    => true,
 				),
-				'rest_base'    => array(
+				'rest_base'      => array(
 					'description' => __( 'REST base route for the taxonomy.' ),
 					'type'        => 'string',
 					'context'     => array( 'view', 'edit', 'embed' ),
 					'readonly'    => true,
 				),
-				'visibility'   => array(
+				'rest_namespace' => array(
+					'description' => __( 'REST namespace route for the taxonomy.' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit', 'embed' ),
+					'readonly'    => true,
+				),
+				'visibility'     => array(
 					'description' => __( 'The visibility settings for the taxonomy.' ),
 					'type'        => 'object',
 					'context'     => array( 'edit' ),
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
index 183b7c7ffa45c..3a92b774f0fd2 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
@@ -57,9 +57,9 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 */
 	public function __construct( $taxonomy ) {
 		$this->taxonomy  = $taxonomy;
-		$this->namespace = 'wp/v2';
 		$tax_obj         = get_taxonomy( $taxonomy );
 		$this->rest_base = ! empty( $tax_obj->rest_base ) ? $tax_obj->rest_base : $tax_obj->name;
+		$this->namespace = ! empty( $tax_obj->rest_namespace ) ? $tax_obj->rest_namespace : 'wp/v2';
 
 		$this->meta = new WP_REST_Term_Meta_Fields( $taxonomy );
 	}
diff --git a/src/wp-includes/taxonomy.php b/src/wp-includes/taxonomy.php
index f81af0351ec4d..0273a4aac7ed3 100644
--- a/src/wp-includes/taxonomy.php
+++ b/src/wp-includes/taxonomy.php
@@ -387,6 +387,7 @@ function is_taxonomy_hierarchical( $taxonomy ) {
  *     @type bool          $show_in_rest          Whether to include the taxonomy in the REST API. Set this to true
  *                                                for the taxonomy to be available in the block editor.
  *     @type string        $rest_base             To change the base url of REST API route. Default is $taxonomy.
+ *     @type string        $rest_namespace        To change the namespace URL of REST API route. Default is wp/v2.
  *     @type string        $rest_controller_class REST API Controller class name. Default is 'WP_REST_Terms_Controller'.
  *     @type bool          $show_tagcloud         Whether to list the taxonomy in the Tag Cloud Widget controls. If not set,
  *                                                the default is inherited from `$show_ui` (default true).
diff --git a/tests/phpunit/tests/rest-api.php b/tests/phpunit/tests/rest-api.php
index 5770f68841b42..34b414903daf4 100644
--- a/tests/phpunit/tests/rest-api.php
+++ b/tests/phpunit/tests/rest-api.php
@@ -1962,6 +1962,50 @@ public function test_rest_get_route_for_term_id() {
 		$this->assertSame( '/wp/v2/tags/' . $term->term_id, rest_get_route_for_term( $term->term_id ) );
 	}
 
+	/**
+	 * @ticket 54267
+	 */
+	public function test_rest_get_route_for_taxonomy_custom_namespace() {
+		register_taxonomy(
+			'ct',
+			'post',
+			array(
+				'show_in_rest'   => true,
+				'rest_base'      => 'ct',
+				'rest_namespace' => 'wordpress/v1',
+			)
+		);
+		$term = self::factory()->term->create_and_get( array( 'taxonomy' => 'ct' ) );
+
+		$this->assertSame( '/wordpress/v1/ct/' . $term->term_id, rest_get_route_for_term( $term ) );
+		unregister_taxonomy( 'ct' );
+	}
+
+	/**
+	 * @ticket 54267
+	 */
+	public function test_rest_get_route_for_taxonomy_items() {
+		$this->assertSame( '/wp/v2/categories', rest_get_route_for_taxonomy_items( 'category' ) );
+	}
+
+	/**
+	 * @ticket 54267
+	 */
+	public function test_rest_get_route_for_taxonomy_items_custom_namespace() {
+		register_taxonomy(
+			'ct',
+			'post',
+			array(
+				'show_in_rest'   => true,
+				'rest_base'      => 'ct',
+				'rest_namespace' => 'wordpress/v1',
+			)
+		);
+
+		$this->assertSame( '/wordpress/v1/ct', rest_get_route_for_taxonomy_items( 'ct' ) );
+		unregister_post_type( 'ct' );
+	}
+
 	/**
 	 * @ticket 50300
 	 *
diff --git a/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php b/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php
index 357e1c7e17607..17be251c1d352 100644
--- a/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php
@@ -219,7 +219,7 @@ public function test_get_item_schema() {
 		$response   = rest_get_server()->dispatch( $request );
 		$data       = $response->get_data();
 		$properties = $data['schema']['properties'];
-		$this->assertCount( 10, $properties );
+		$this->assertCount( 11, $properties );
 		$this->assertArrayHasKey( 'capabilities', $properties );
 		$this->assertArrayHasKey( 'description', $properties );
 		$this->assertArrayHasKey( 'hierarchical', $properties );
@@ -230,6 +230,7 @@ public function test_get_item_schema() {
 		$this->assertArrayHasKey( 'types', $properties );
 		$this->assertArrayHasKey( 'visibility', $properties );
 		$this->assertArrayHasKey( 'rest_base', $properties );
+		$this->assertArrayHasKey( 'rest_namespace', $properties );
 	}
 
 	/**
@@ -252,6 +253,7 @@ protected function check_taxonomy_object( $context, $tax_obj, $data, $links ) {
 		$this->assertSame( $tax_obj->description, $data['description'] );
 		$this->assertSame( $tax_obj->hierarchical, $data['hierarchical'] );
 		$this->assertSame( $tax_obj->rest_base, $data['rest_base'] );
+		$this->assertSame( $tax_obj->rest_namespace, $data['rest_namespace'] );
 		$this->assertSame( rest_url( 'wp/v2/taxonomies' ), $links['collection'][0]['href'] );
 		$this->assertArrayHasKey( 'https://api.w.org/items', $links );
 		if ( 'edit' === $context ) {
diff --git a/tests/qunit/fixtures/wp-api-generated.js b/tests/qunit/fixtures/wp-api-generated.js
index 63b70dd2c8d60..7852fd34aff37 100644
--- a/tests/qunit/fixtures/wp-api-generated.js
+++ b/tests/qunit/fixtures/wp-api-generated.js
@@ -8589,6 +8589,7 @@ mockedApiResponse.TaxonomiesCollection = {
         ],
         "hierarchical": true,
         "rest_base": "categories",
+        "rest_namespace": "wp/v2",
         "_links": {
             "collection": [
                 {
@@ -8618,6 +8619,7 @@ mockedApiResponse.TaxonomiesCollection = {
         ],
         "hierarchical": false,
         "rest_base": "tags",
+        "rest_namespace": "wp/v2",
         "_links": {
             "collection": [
                 {
@@ -8648,7 +8650,8 @@ mockedApiResponse.TaxonomyModel = {
         "post"
     ],
     "hierarchical": true,
-    "rest_base": "categories"
+    "rest_base": "categories",
+    "rest_namespace": "wp/v2"
 };
 
 mockedApiResponse.CategoriesCollection = [

From 175ad4c91c68c1f3df89f4efcbf2c12a1b410cf0 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 1 Nov 2021 14:29:42 +0000
Subject: [PATCH 257/257] Docs: Add a `@since` note for the `rest_namespace`
 argument of `register_post_type()` and `register_taxonomy()`.

Use 3-digit, x.x.x-style semantic versioning for `@since` tags of the `$rest_namespace` property in `WP_Post_Type` and `WP_Taxonomy`.

Add a `@since` note to `WP_REST_Taxonomies_Controller::get_item_schema()` for the `visibility` and `rest_namespace` properties.

The `rest_base` property was also added after the method was initially introduced, but that happened during the same release cycle, so it doesn't need a separate `@since` note.

Follow-up to [38832], [39191], [42729], [51959], [51961], [51962], [51964].

See #53399.

git-svn-id: https://develop.svn.wordpress.org/trunk@51965 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-post-type.php                          | 2 +-
 src/wp-includes/class-wp-taxonomy.php                           | 2 +-
 src/wp-includes/post.php                                        | 1 +
 .../rest-api/endpoints/class-wp-rest-taxonomies-controller.php  | 2 ++
 src/wp-includes/taxonomy.php                                    | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/class-wp-post-type.php b/src/wp-includes/class-wp-post-type.php
index e284994401dd1..029bd26fe76b4 100644
--- a/src/wp-includes/class-wp-post-type.php
+++ b/src/wp-includes/class-wp-post-type.php
@@ -361,7 +361,7 @@ final class WP_Post_Type {
 	/**
 	 * The namespace for this post type's REST API endpoints.
 	 *
-	 * @since 5.9
+	 * @since 5.9.0
 	 * @var string|bool $rest_namespace
 	 */
 	public $rest_namespace;
diff --git a/src/wp-includes/class-wp-taxonomy.php b/src/wp-includes/class-wp-taxonomy.php
index 21c954ad0571b..9ef1fdce4a6d3 100644
--- a/src/wp-includes/class-wp-taxonomy.php
+++ b/src/wp-includes/class-wp-taxonomy.php
@@ -202,7 +202,7 @@ final class WP_Taxonomy {
 	/**
 	 * The namespace for this taxonomy's REST API endpoints.
 	 *
-	 * @since 5.9
+	 * @since 5.9.0
 	 * @var string|bool $rest_namespace
 	 */
 	public $rest_namespace;
diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php
index 5cd73d1bd8197..0f75bf537e246 100644
--- a/src/wp-includes/post.php
+++ b/src/wp-includes/post.php
@@ -1371,6 +1371,7 @@ function get_post_types( $args = array(), $output = 'names', $operator = 'and' )
  *              arguments to register the post type in REST API.
  * @since 5.0.0 The `template` and `template_lock` arguments were added.
  * @since 5.3.0 The `supports` argument will now accept an array of arguments for a feature.
+ * @since 5.9.0 The `rest_namespace` argument was added.
  *
  * @global array $wp_post_types List of post types.
  *
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php
index d05abcbcea2f0..ede47585b10ea 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php
@@ -301,6 +301,8 @@ public function prepare_item_for_response( $item, $request ) {
 	 * Retrieves the taxonomy's schema, conforming to JSON Schema.
 	 *
 	 * @since 4.7.0
+	 * @since 5.0.0 The `visibility` property was added.
+	 * @since 5.9.0 The `rest_namespace` property was added.
 	 *
 	 * @return array Item schema data.
 	 */
diff --git a/src/wp-includes/taxonomy.php b/src/wp-includes/taxonomy.php
index 0273a4aac7ed3..5b1acb4fc6eeb 100644
--- a/src/wp-includes/taxonomy.php
+++ b/src/wp-includes/taxonomy.php
@@ -355,6 +355,7 @@ function is_taxonomy_hierarchical( $taxonomy ) {
  * @since 5.1.0 Introduced `meta_box_sanitize_cb` argument.
  * @since 5.4.0 Added the registered taxonomy object as a return value.
  * @since 5.5.0 Introduced `default_term` argument.
+ * @since 5.9.0 Introduced `rest_namespace` argument.
  *
  * @global WP_Taxonomy[] $wp_taxonomies Registered taxonomies.
  *