Merge branch 'trunk' into toolbar-command-palette-icon-link

Author: sabernhardt

.github/workflows/javascript-type-checking.yml

@@ -27,7 +27,7 @@ on:
       - 'typings/**'
       # Confirm any changes to relevant workflow files.
       - '.github/workflows/javascript-type-checking.yml'
-      - '.github/workflows/reusable-javascript-type-checking.yml'
+      - '.github/workflows/reusable-javascript-type-checking-v1.yml'
   workflow_dispatch:
 
 # Cancels all previous workflow runs for pull requests that have not completed.
@@ -45,10 +45,10 @@ jobs:
   # Runs JavaScript type checking.
   typecheck:
     name: JavaScript type checking
-    uses: ./.github/workflows/reusable-javascript-type-checking.yml
+    uses: ./.github/workflows/reusable-javascript-type-checking-v1.yml
     permissions:
       contents: read
-    if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
+    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
 
   slack-notifications:
     name: Slack Notifications

.github/workflows/phpstan-static-analysis.yml

@@ -24,7 +24,7 @@ on:
       - 'tests/phpstan/baseline.php'
       # Confirm any changes to relevant workflow files.
       - '.github/workflows/phpstan-static-analysis.yml'
-      - '.github/workflows/reusable-phpstan-static-analysis.yml'
+      - '.github/workflows/reusable-phpstan-static-analysis-v1.yml'
   workflow_dispatch:
 
 # Cancels all previous workflow runs for pull requests that have not completed.
@@ -42,10 +42,10 @@ jobs:
   # Runs PHPStan Static Analysis.
   phpstan:
     name: PHP static analysis
-    uses: ./.github/workflows/reusable-phpstan-static-analysis.yml
+    uses: ./.github/workflows/reusable-phpstan-static-analysis-v1.yml
     permissions:
       contents: read
-    if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
+    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
 
   slack-notifications:
     name: Slack Notifications

…ws/reusable-javascript-type-checking.yml …reusable-javascript-type-checking-v1.yml.github/workflows/reusable-javascript-type-checking.yml renamed to .github/workflows/reusable-javascript-type-checking-v1.yml .github/workflows/reusable-javascript-type-checking.yml renamed to .github/workflows/reusable-javascript-type-checking-v1.yml

@@ -120,7 +120,7 @@ jobs:
   phpunit-tests:
     name: ${{ ( inputs.phpunit-test-groups || inputs.coverage-report ) && format( 'PHP {0} with ', inputs.php ) || '' }} ${{ 'mariadb' == inputs.db-type && 'MariaDB' || 'MySQL' }} ${{ inputs.db-version }}${{ inputs.multisite && ' multisite' || '' }}${{ inputs.db-innovation && ' (innovation release)' || '' }}${{ inputs.memcached && ' with memcached' || '' }}${{ inputs.report && ' (test reporting enabled)' || '' }} ${{ 'example.org' != inputs.tests-domain && inputs.tests-domain || '' }}
     runs-on: ${{ inputs.os }}
-    timeout-minutes: ${{ inputs.coverage-report && 120 || inputs.php == '8.4' && 30 || 20 }}
+    timeout-minutes: ${{ inputs.coverage-report && 120 || 40 }}
     permissions:
       contents: read
 

…ows/reusable-phpstan-static-analysis.yml …/reusable-phpstan-static-analysis-v1.yml.github/workflows/reusable-phpstan-static-analysis.yml renamed to .github/workflows/reusable-phpstan-static-analysis-v1.yml .github/workflows/reusable-phpstan-static-analysis.yml renamed to .github/workflows/reusable-phpstan-static-analysis-v1.yml

@@ -7,7 +7,7 @@
 		"url": "https://develop.svn.wordpress.org/trunk"
 	},
 	"gutenberg": {
-		"ref": "022d8dd3d461f91b15c1f0410649d3ebb027207f"
+		"ref": "f4d8a5803aa2fbe26e7d9af4d17e80a622b7bab8"
 	},
 	"engines": {
 		"node": ">=20.10.0",

.github/workflows/reusable-phpunit-tests-v3.yml

@@ -1907,6 +1907,11 @@ p.customize-section-description {
 	bottom: 0;
 }
 
+.themes-filter-bar .feature-filter-toggle {
+	min-height: 32px;
+	line-height: 2.30769231;
+}
+
 .themes-filter-bar .feature-filter-toggle:before {
 	content: "\f111";
 	content: "\f111" / '';

package.json

@@ -536,7 +536,7 @@
 }
 
 .community-events li.event-none {
-	border-left: 4px solid #72aee6;
+	border-left: 4px solid var(--wp-admin-theme-color, #3858e9);
 }
 
 #dashboard-widgets .community-events li.event-none a {

src/wp-admin/css/customize-controls.css

@@ -813,7 +813,7 @@ function wp_exif_date2ts( $str ) {
  * created_timestamp, focal_length, shutter_speed, and title.
  *
  * The IPTC metadata that is retrieved is APP13, credit, byline, created date
- * and time, caption, copyright, and title. Also includes FNumber, Model,
+ * and time, caption, copyright, alt, and title. Also includes FNumber, Model,
  * DateTimeDigitized, FocalLength, ISOSpeedRatings, and ExposureTime.
  *
  * @todo Try other exif libraries if available.
@@ -854,6 +854,7 @@ function wp_read_image_metadata( $file ) {
 		'title'             => '',
 		'orientation'       => 0,
 		'keywords'          => array(),
+		'alt'               => '',
 	);
 
 	$iptc = array();
@@ -926,6 +927,8 @@ function wp_read_image_metadata( $file ) {
 		}
 	}
 
+	$meta['alt'] = wp_get_image_alttext( $file );
+
 	$exif = array();
 
 	/**
@@ -1074,6 +1077,72 @@ function wp_read_image_metadata( $file ) {
 	return apply_filters( 'wp_read_image_metadata', $meta, $file, $image_type, $iptc, $exif );
 }
 
+/**
+ * Gets the alt text from image meta data.
+ *
+ * @since 7.0.0
+ *
+ * @param string $file File path to the image.
+ * @return string Embedded alternative text.
+ */
+function wp_get_image_alttext( $file ) {
+	$alt_text     = '';
+	$img_contents = file_get_contents( $file );
+	// Find the start and end positions of the XMP metadata.
+	$xmp_start = strpos( $img_contents, '<x:xmpmeta' );
+	$xmp_end   = strpos( $img_contents, '</x:xmpmeta>' );
+
+	if ( ! $xmp_start || ! $xmp_end ) {
+		// No XMP metadata found.
+		return $alt_text;
+	}
+
+	// Extract the XMP metadata from the JPEG contents
+	$xmp_data = substr( $img_contents, $xmp_start, $xmp_end - $xmp_start + 12 );
+
+	// Parse the XMP metadata using DOMDocument.
+	$doc = new DOMDocument();
+	if ( false === $doc->loadXML( $xmp_data ) ) {
+		// Invalid XML in metadata.
+		return $alt_text;
+	}
+
+	// Instantiate an XPath object, used to extract portions of the XMP.
+	$xpath = new DOMXPath( $doc );
+
+	// Register the relevant XML namespaces.
+	$xpath->registerNamespace( 'x', 'adobe:ns:meta/' );
+	$xpath->registerNamespace( 'rdf', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#' );
+	$xpath->registerNamespace( 'Iptc4xmpCore', 'http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/' );
+
+	$node_list = $xpath->query( '/x:xmpmeta/rdf:RDF/rdf:Description/Iptc4xmpCore:AltTextAccessibility' );
+	if ( $node_list && $node_list->count() ) {
+
+		$node = $node_list->item( 0 );
+
+		// Get the site's locale.
+		$locale = get_locale();
+
+		// Get the alt text accessibility alternative most appropriate for the site language.
+		// There are 3 possibilities:
+		//
+		// 1. there is an rdf:li with an exact match on the site locale.
+		// 2. there is an rdf:li with a partial match on the site locale (e.g., site locale is en_US and rdf:li has @xml:lang="en").
+		// 3. there is an rdf:li with an "x-default" lang.
+		//
+		// Evaluate in that order, stopping when we have a match.
+		$alt_text = $xpath->evaluate( "string( rdf:Alt/rdf:li[ @xml:lang = '{$locale}' ] )", $node );
+		if ( ! $alt_text ) {
+			$alt_text = $xpath->evaluate( 'string( rdf:Alt/rdf:li[ @xml:lang = "' . substr( $locale, 0, 2 ) . '" ] )', $node );
+			if ( ! $alt_text ) {
+				$alt_text = $xpath->evaluate( 'string( rdf:Alt/rdf:li[ @xml:lang = "x-default" ] )', $node );
+			}
+		}
+	}
+
+	return $alt_text;
+}
+
 /**
  * Validates that file is an image.
  *

src/wp-admin/css/dashboard.css

@@ -319,6 +319,7 @@ function media_handle_upload( $file_id, $post_id, $post_data = array(), $overrid
 	$title   = sanitize_text_field( $name );
 	$content = '';
 	$excerpt = '';
+	$alt     = '';
 
 	if ( preg_match( '#^audio#', $type ) ) {
 		$meta = wp_read_audio_metadata( $file );
@@ -399,6 +400,10 @@ function media_handle_upload( $file_id, $post_id, $post_data = array(), $overrid
 			if ( trim( $image_meta['caption'] ) ) {
 				$excerpt = $image_meta['caption'];
 			}
+
+			if ( trim( $image_meta['alt'] ) ) {
+				$alt = $image_meta['alt'];
+			}
 		}
 	}
 
@@ -421,6 +426,10 @@ function media_handle_upload( $file_id, $post_id, $post_data = array(), $overrid
 	// Save the data.
 	$attachment_id = wp_insert_attachment( $attachment, $file, $post_id, true );
 
+	if ( trim( $alt ) ) {
+		update_post_meta( $attachment_id, '_wp_attachment_image_alt', sanitize_text_field( $alt ) );
+	}
+
 	if ( ! is_wp_error( $attachment_id ) ) {
 		/*
 		 * Set a custom header with the attachment_id.
@@ -477,6 +486,7 @@ function media_handle_sideload( $file_array, $post_id = 0, $desc = null, $post_d
 	$file    = $file['file'];
 	$title   = preg_replace( '/\.[^.]+$/', '', wp_basename( $file ) );
 	$content = '';
+	$alt     = '';
 
 	// Use image exif/iptc data for title and caption defaults if possible.
 	$image_meta = wp_read_image_metadata( $file );
@@ -489,6 +499,9 @@ function media_handle_sideload( $file_array, $post_id = 0, $desc = null, $post_d
 		if ( trim( $image_meta['caption'] ) ) {
 			$content = $image_meta['caption'];
 		}
+		if ( trim( $image_meta['alt'] ) ) {
+			$alt = $image_meta['alt'];
+		}
 	}
 
 	if ( isset( $desc ) ) {
@@ -513,6 +526,10 @@ function media_handle_sideload( $file_array, $post_id = 0, $desc = null, $post_d
 	// Save the attachment metadata.
 	$attachment_id = wp_insert_attachment( $attachment, $file, $post_id, true );
 
+	if ( trim( $alt ) ) {
+		update_post_meta( $attachment_id, '_wp_attachment_image_alt', sanitize_text_field( $alt ) );
+	}
+
 	if ( ! is_wp_error( $attachment_id ) ) {
 		wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
 	}