Merge branch 'trunk' into fix/65466-space-separated-tokens

Author: Sabbir345

phpstan.neon.dist

@@ -34,7 +34,6 @@ includes:
 	- tests/phpstan/baselines/booleanNot.alwaysTrue.neon
 	- tests/phpstan/baselines/booleanOr.alwaysFalse.neon
 	- tests/phpstan/baselines/booleanOr.alwaysTrue.neon
-	- tests/phpstan/baselines/booleanOr.rightAlwaysTrue.neon
 	- tests/phpstan/baselines/catch.neverThrown.neon
 	- tests/phpstan/baselines/class.notFound.neon
 	- tests/phpstan/baselines/deadCode.unreachable.neon

src/wp-admin/includes/image.php

@@ -1083,10 +1083,15 @@ function wp_read_image_metadata( $file ) {
  * @since 7.0.0
  *
  * @param string $file File path to the image.
- * @return string Embedded alternative text.
+ * @return string Embedded alternative text, empty when there is no alt text or DOM extension is not installed.
  */
 function wp_get_image_alttext( $file ) {
-	$alt_text     = '';
+	$alt_text = '';
+
+	if ( ! class_exists( 'DOMDocument', false ) ) {
+		return $alt_text;
+	}
+
 	$img_contents = file_get_contents( $file );
 
 	if ( false === $img_contents ) {

src/wp-admin/user-edit.php

@@ -890,9 +890,10 @@
 								<p>
 									<?php
 									printf(
-										/* translators: %s: Documentation URL. */
-										__( 'If this is a development website, you can <a href="%s">set the environment type accordingly</a> to enable application passwords.' ),
-										__( 'https://developer.wordpress.org/apis/wp-config-php/#wp-environment-type' )
+										/* translators: 1: Documentation URL, 2: local */
+										__( 'If this is a local website, you can <a href="%1$s">set the environment type</a> as %2$s to enable application passwords.' ),
+										__( 'https://developer.wordpress.org/apis/wp-config-php/#wp-environment-type' ),
+										'<code>local</code>'
 									);
 									?>
 								</p>

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

@@ -78,7 +78,7 @@ Description: Used to style blocks in the editor.
 }
 
 .wp-block {
-	max-width: 614px; /* 584px + 30px to account for padding */
+	max-width: 584px;
 }
 
 /* Link styles */

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

@@ -336,7 +336,7 @@ Description: Used to style blocks in the editor.
 }
 
 .wp-block {
-	max-width: 690px; /* 660px + 30px to account for padding. */
+	max-width: 660px;
 }
 
 /* Link styles */

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

@@ -75,7 +75,7 @@ Description: Used to style blocks in the editor.
 /* Main column width */
 
 .wp-block {
-	max-width: 504px; /* 474px + 30px to account for padding */
+	max-width: 474px;
 }
 
 /* Link styles */

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

@@ -182,7 +182,7 @@ Description: Used to style blocks in the editor.
 }
 
 .wp-block {
-	max-width: 630px; /* 600px + 30px to account for padding. */
+	max-width: 600px;
 }
 
 /* Link styles */

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

@@ -77,7 +77,7 @@ Description: Used to style blocks in the editor.
 /* Main column width */
 
 .wp-block {
-	max-width: 670px; /* 640px + 30px to account for padding */
+	max-width: 640px;
 }
 
 /* Link styles */

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

@@ -56,7 +56,7 @@ Description: Used to style blocks in the editor.
 /* Main content width */
 
 .wp-block {
-	max-width: 634px; /* 604px + 30px to account for padding */
+	max-width: 604px;
 }
 
 .wp-block.alignwide,
@@ -382,7 +382,7 @@ p.has-drop-cap:not(:focus)::first-letter {
 .wp-block[data-type="core/group"] > .editor-block-list__block-edit > div > .wp-block-group > .wp-block-group__inner-container > .editor-inner-blocks > .editor-block-list__layout > .wp-block,
 [data-align="wide"] .wp-block,
 [data-align="full"] .wp-block {
-	max-width: 634px;
+	max-width: 604px;
 }
 
 .wp-block[data-type="core/group"] > .editor-block-list__block-edit > div > .wp-block-group > .wp-block-group__inner-container > .editor-inner-blocks > .editor-block-list__layout > .wp-block[data-align="wide"] {

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

@@ -76,7 +76,7 @@ Description: Used to style blocks in the editor.
 /* Main column width */
 
 .wp-block {
-	max-width: 655px; /* 625px + 30px for padding */
+	max-width: 625px;
 }
 
 /* Link styles */