Merge branch 'trunk' into html-api/improve-adoption-agency-algorithm

Author: dmsnell

.github/workflows/phpunit-tests.yml

@@ -36,7 +36,7 @@ jobs:
   #
   test-with-mysql:
     name: PHP ${{ matrix.php }}
-    uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests.yml@trunk
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests-v3.yml@trunk
     permissions:
       contents: read
     secrets: inherit
@@ -108,7 +108,7 @@ jobs:
   #
   test-with-mariadb:
     name: PHP ${{ matrix.php }}
-    uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests.yml@trunk
+    uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests-v3.yml@trunk
     permissions:
       contents: read
     secrets: inherit

…hub/workflows/reusable-phpunit-tests.yml …/workflows/reusable-phpunit-tests-v3.yml.github/workflows/reusable-phpunit-tests.yml renamed to .github/workflows/reusable-phpunit-tests-v3.yml .github/workflows/reusable-phpunit-tests.yml renamed to .github/workflows/reusable-phpunit-tests-v3.yml

@@ -7,6 +7,8 @@ on:
       - trunk
     paths:
       - '.github/workflows/test-old-branches.yml'
+      - '.github/workflows/reusable-phpunit-tests-v1.yml'
+      - '.github/workflows/reusable-phpunit-tests-v2.yml'
   # Run twice a month on the 1st and 15th at 00:00 UTC.
   schedule:
     - cron: '0 0 1 * *'
@@ -34,7 +36,7 @@ jobs:
             'coding-standards.yml',
             'javascript-tests.yml',
             'phpunit-tests.yml',
-            'test-npm.yml'
+            'test-build-processes.yml'
         ]
         branch: [
             '6.6', '6.5', '6.4', '6.3', '6.2', '6.1','6.0',
@@ -102,10 +104,6 @@ jobs:
           - branch: '6.2'
             workflow: 'performance.yml'
 
-          # Build Process testing was introduced in 6.5.
-          - branch: '6.5'
-            workflow: 'test-build-processes.yml'
-
     # Run all branches monthly, but only the currently supported one twice per month.
     steps:
       - name: Dispatch workflow run

.github/workflows/test-old-branches.yml

@@ -124,8 +124,9 @@
 				<p>
 					<?php
 					printf(
-						/* translators: %s: code-formatted "data-wp-on-async", %%: escaped percent sign, leave as %%. */
-						__( '6.6 includes important updates like removing redundant WP_Theme_JSON calls, disabling autoload for large options, eliminating unnecessary polyfill dependencies, lazy loading post embeds, introducing the %s directive, and a 40%% reduction in template loading time in the editor.' ),
+						/* translators: %1$s: code-formatted "WP_Theme_JSON", %2$s: code-formatted "data-wp-on-async", %%: escaped percent sign, leave as %%. */
+						__( 'WordPress 6.6 includes important updates like removing redundant %1$s calls, disabling autoload for large options, eliminating unnecessary polyfill dependencies, lazy loading post embeds, introducing the %2$s directive, and a 33%% reduction in template loading time in the editor.' ),
+						'<code>WP_Theme_JSON</code>',
 						'<code>data-wp-on-async</code>'
 					);
 					?>

src/wp-admin/about.php

@@ -5,7 +5,7 @@
  * @package WordPress
  * @subpackage Administration
  *
- * @link https://codex.wordpress.org/AJAX_in_Plugins
+ * @link https://developer.wordpress.org/plugins/javascript/ajax
  */
 
 /**

src/wp-admin/admin-ajax.php

@@ -1402,30 +1402,6 @@ function verify_file_signature( $filename, $signatures, $filename_for_errors = f
 		);
 	}
 
-	// Check for an edge-case affecting PHP Maths abilities.
-	if (
-		! extension_loaded( 'sodium' ) &&
-		in_array( PHP_VERSION_ID, array( 70200, 70201, 70202 ), true ) &&
-		extension_loaded( 'opcache' )
-	) {
-		/*
-		 * Sodium_Compat isn't compatible with PHP 7.2.0~7.2.2 due to a bug in the PHP Opcache extension, bail early as it'll fail.
-		 * https://bugs.php.net/bug.php?id=75938
-		 */
-		return new WP_Error(
-			'signature_verification_unsupported',
-			sprintf(
-				/* translators: %s: The filename of the package. */
-				__( 'The authenticity of %s could not be verified as signature verification is unavailable on this system.' ),
-				'<span class="code">' . esc_html( $filename_for_errors ) . '</span>'
-			),
-			array(
-				'php'    => PHP_VERSION,
-				'sodium' => defined( 'SODIUM_LIBRARY_VERSION' ) ? SODIUM_LIBRARY_VERSION : ( defined( 'ParagonIE_Sodium_Compat::VERSION_STRING' ) ? ParagonIE_Sodium_Compat::VERSION_STRING : false ),
-			)
-		);
-	}
-
 	// Verify runtime speed of Sodium_Compat is acceptable.
 	if ( ! extension_loaded( 'sodium' ) && ! ParagonIE_Sodium_Compat::polyfill_is_fast() ) {
 		$sodium_compat_is_fast = false;

src/wp-admin/includes/file.php

@@ -30,7 +30,7 @@ figure[class^="wp-block-"] {
 	font-size: 12px;
 }
 
-[class^="wp-block-"]:not(.wp-block-gallery) figcaption {
+[class^="wp-block-"]:not(.wp-block-gallery) > figcaption {
 	color: #666;
 	margin-bottom: 1.625em;
 	max-width: 96%;
@@ -40,7 +40,7 @@ figure[class^="wp-block-"] {
 	text-align: left;
 }
 
-[class^="wp-block-"]:not(.wp-block-gallery) figcaption:before {
+[class^="wp-block-"]:not(.wp-block-gallery) > figcaption:before {
 	color: #666;
 	content: '\2014';
 	font-size: 14px;
@@ -52,13 +52,13 @@ figure[class^="wp-block-"] {
 	top: 0;
 }
 
-.rtl [class^="wp-block-"]:not(.wp-block-gallery) figcaption {
+.rtl [class^="wp-block-"]:not(.wp-block-gallery) > figcaption {
 	padding-left: 0;
 	padding-right: 40px;
 	text-align: right;
 }
 
-.rtl [class^="wp-block-"]:not(.wp-block-gallery) figcaption:before {
+.rtl [class^="wp-block-"]:not(.wp-block-gallery) > figcaption:before {
 	left: 0;
 	margin-left: 5px;
 	margin-right: 0;

src/wp-content/themes/twentyeleven/blocks.css

@@ -20,13 +20,13 @@ Description: Used to style blocks.
 
 /* Captions */
 
-[class^="wp-block-"]:not(.wp-block-gallery) figcaption {
+[class^="wp-block-"]:not(.wp-block-gallery) > figcaption {
 	font-style: italic;
 	margin-bottom: 1.5em;
 	text-align: left;
 }
 
-.rtl [class^="wp-block-"]:not(.wp-block-gallery) figcaption {
+.rtl [class^="wp-block-"]:not(.wp-block-gallery) > figcaption {
 	text-align: right;
 }
 

src/wp-content/themes/twentyseventeen/assets/css/blocks.css

@@ -27,6 +27,10 @@ Description: Used to style blocks in the editor.
 	line-height: 1.75;
 }
 
+.rtl .editor-styles-wrapper {
+	font-family: Arial, Tahoma, sans-serif;
+}
+
 .edit-post-visual-editor .editor-block-list__block {
 	color: #1a1a1a;
 }
@@ -262,16 +266,12 @@ Description: Used to style blocks in the editor.
 
 /* Captions */
 
-[class^="wp-block-"] figcaption {
+figure[class*="wp-block-"] > figcaption {
 	color: #686868;
 	font-style: italic;
 	line-height: 1.6153846154;
 	padding-top: 0.5384615385em;
-	text-align: left;
-}
-
-.rtl [class^="wp-block-"] figcaption {
-	text-align: right;
+	text-align: start;
 }
 
 /*--------------------------------------------------------------

src/wp-content/themes/twentysixteen/css/editor-blocks.css

@@ -313,19 +313,22 @@ table th,
 .mce-item-table th,
 table caption {
 	border-width: 0 1px 1px 0;
-	font-size: 16px;
 	font-weight: 700;
 	padding: 7px;
-	text-align: left;
+	text-align: start;
 	vertical-align: baseline;
 }
 
+table caption {
+	font-weight: normal;
+}
+
 table td,
 .mce-item-table td {
 	border-width: 0 1px 1px 0;
-	font-size: 16px;
 	padding: 7px;
 	vertical-align: baseline;
+	text-align: start;
 }
 
 img {
@@ -502,6 +505,11 @@ fieldset {
  * 8.0 - RTL
  */
 
+body.rtl,
+[dir="rtl"] body {
+	font-family: Arial, Tahoma, sans-serif;
+}
+
 .rtl blockquote {
 	border: 0 solid #1a1a1a;
 	border-right-width: 4px;
@@ -533,9 +541,3 @@ fieldset {
 	margin-right: 24px;
 	margin-left: auto;
 }
-
-.rtl table th,
-.rtl .mce-item-table th,
-.rtl table caption {
-	text-align: right;
-}