Include 4 6.8-branch commits

Commit list:
e382a52cdef22a091381634deb84d7ef2310ec52
c9d7937947fe5103f16d9676a7419d5ad81a70de
2a39b722ba22456af2fbcfe4a37fec9ea86865f0
a3890730649d580aba96c43b618020a38c688af1

See #60

Author: imath

wp-includes/block-template.php

@@ -105,7 +105,7 @@ function locate_block_template( $template, $type, array $templates ) {
 			} else {
 				if ( $block_template->has_theme_file ) {
 					// Show contents from theme template if user is not logged in.
-					$theme_template = _get_block_template_file( 'wp_template', $block_template->slug );
+					$theme_template               = _get_block_template_file( 'wp_template', $block_template->slug );
 					$_wp_current_template_content = file_get_contents( $theme_template['path'] );
 				} else {
 					$_wp_current_template_content = $block_template->content;

wp-includes/class-wp-image-editor-imagick.php

@@ -503,7 +503,7 @@ protected function thumbnail_image( $dst_w, $dst_h, $filter_name = 'FILTER_TRIAN
 						$max_colors = pow( 2, $indexed_pixel_depth );
 						if ( is_callable( array( $this->image, 'getImageColors' ) ) ) {
 							$current_colors = $this->image->getImageColors();
-							$max_colors = min( $max_colors, $current_colors );
+							$max_colors     = min( $max_colors, $current_colors );
 						}
 						$this->image->quantizeImage( $max_colors, $this->image->getColorspace(), 0, false, false );
 

wp-includes/class-wp-query.php

@@ -1230,7 +1230,7 @@ public function parse_tax_query( &$q ) {
 		if ( ! empty( $q['category__not_in'] ) ) {
 			$q['category__not_in'] = array_map( 'absint', array_unique( (array) $q['category__not_in'] ) );
 			sort( $q['category__not_in'] );
-			$tax_query[]           = array(
+			$tax_query[] = array(
 				'taxonomy'         => 'category',
 				'terms'            => $q['category__not_in'],
 				'operator'         => 'NOT IN',
@@ -1299,7 +1299,7 @@ public function parse_tax_query( &$q ) {
 		if ( ! empty( $q['tag__not_in'] ) ) {
 			$q['tag__not_in'] = array_map( 'absint', array_unique( (array) $q['tag__not_in'] ) );
 			sort( $q['tag__not_in'] );
-			$tax_query[]      = array(
+			$tax_query[] = array(
 				'taxonomy' => 'post_tag',
 				'terms'    => $q['tag__not_in'],
 				'operator' => 'NOT IN',

wp-includes/functions.php

@@ -2933,22 +2933,22 @@ function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) {
 			$mime_to_ext = apply_filters(
 				'getimagesize_mimes_to_exts',
 				array(
-					'image/jpeg' => 'jpg',
-					'image/png'  => 'png',
-					'image/gif'  => 'gif',
-					'image/bmp'  => 'bmp',
-					'image/tiff' => 'tif',
-					'image/webp' => 'webp',
-					'image/avif' => 'avif',
+					'image/jpeg'          => 'jpg',
+					'image/png'           => 'png',
+					'image/gif'           => 'gif',
+					'image/bmp'           => 'bmp',
+					'image/tiff'          => 'tif',
+					'image/webp'          => 'webp',
+					'image/avif'          => 'avif',
 
 					/*
 					 * In theory there are/should be file extensions that correspond to the
 					 * mime types: .heif, .heics and .heifs. However it seems that HEIC images
 					 * with any of the mime types commonly have a .heic file extension.
 					 * Seems keeping the status quo here is best for compatibility.
 					 */
-					'image/heic' => 'heic',
-					'image/heif' => 'heic',
+					'image/heic'          => 'heic',
+					'image/heif'          => 'heic',
 					'image/heic-sequence' => 'heic',
 					'image/heif-sequence' => 'heic',
 				)