Merge branch 'trunk' into issue-734/query-loop-filters-get-removed

Author: pbking

.distignore

@@ -30,7 +30,7 @@ composer.json
 composer.lock
 package-lock.json
 webpack.config.js
-.phpcs.xml.dist
+phpcs.xml.dist
 phpunit.xml.dist
 tests/
 bin/

.github/workflows/pr-checks.yml

@@ -78,6 +78,9 @@ jobs:
             - name: Run JavaScript unit tests
               run: npm run test:unit
 
+            - name: Install Subversion
+              run: sudo apt-get update -y && sudo apt-get install -y subversion
+
             - name: Run PHP tests
               run: |
                   mysql -uroot -h127.0.0.1 -e 'SELECT version()' \

.gitignore

@@ -35,3 +35,5 @@ build/
 
 # phpunit
 *.result.*
+
+dev-env/

.phpcs.xml.dist

@@ -1,10 +1,21 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/wp-env.json",
 	"core": "WordPress/WordPress",
 	"port": 8988,
 	"testsPort": 8989,
 	"plugins": [ "." ],
 	"config": {
 		"WP_UPLOAD_MAX_FILESIZE": "128M",
-		"WP_MEMORY_LIMIT": "256M"
+		"WP_MEMORY_LIMIT": "256M",
+		"WP_ENVIRONMENT_TYPE": "development",
+		"WP_DEVELOPMENT_MODE": "all"
+	},
+	"env": {
+		"development": {
+			"phpmyadminPort": 9000
+		},
+		"tests": {
+			"phpmyadminPort": 9001
+		}
 	}
 }

.wp-env.json

@@ -5,7 +5,7 @@
  * Plugin Name: Create Block Theme
  * Plugin URI: https://wordpress.org/plugins/create-block-theme
  * Description: Generates a block theme
- * Version: 2.6.0
+ * Version: 2.7.0
  * Author: WordPress.org
  * Author URI: https://wordpress.org/
  * License: GNU General Public License v2 or later

create-block-theme.php

@@ -101,10 +101,6 @@ private static function get_text_replacement_patterns_for_html( $block_name ) {
 				return array( '/(<pre[^>]*>)(.*?)(<\/pre>)/' );
 			case 'core/button':
 				return array( '/(<a[^>]*>)(.*?)(<\/a>)/' );
-			case 'core/image':
-			case 'core/cover':
-			case 'core/media-text':
-				return array( '/alt="(.*?)"/' );
 			case 'core/quote':
 			case 'core/pullquote':
 				return array(
@@ -117,6 +113,16 @@ private static function get_text_replacement_patterns_for_html( $block_name ) {
 					'/(<th[^>]*>)(.*?)(<\/th>)/',
 					'/(<figcaption[^>]*>)(.*?)(<\/figcaption>)/',
 				);
+			case 'core/video':
+				return array( '/(<figcaption[^>]*>)(.*?)(<\/figcaption>)/' );
+			case 'core/image':
+				return array(
+					'/(<figcaption[^>]*>)(.*?)(<\/figcaption>)/',
+					'/(alt=")(.*?)(")/',
+				);
+			case 'core/cover':
+			case 'core/media-text':
+				return array( '/(alt=")(.*?)(")/' );
 			default:
 				return null;
 		}
@@ -158,19 +164,7 @@ public static function escape_text_content_of_blocks( $blocks ) {
 				case 'core/quote':
 				case 'core/pullquote':
 				case 'core/table':
-					$replace_content_callback = function ( $content, $pattern ) {
-						if ( empty( $content ) ) {
-							return;
-						}
-						return preg_replace_callback(
-							$pattern,
-							function( $matches ) {
-								return $matches[1] . self::escape_text_content( $matches[2] ) . $matches[3];
-							},
-							$content
-						);
-					};
-					break;
+				case 'core/video':
 				case 'core/image':
 				case 'core/cover':
 				case 'core/media-text':
@@ -181,7 +175,11 @@ function( $matches ) {
 						return preg_replace_callback(
 							$pattern,
 							function( $matches ) {
-								return 'alt="' . self::escape_attribute( $matches[1] ) . '"';
+								// If the pattern is for attribute like alt="".
+								if ( str_ends_with( $matches[1], '="' ) ) {
+									return $matches[1] . self::escape_attribute( $matches[2] ) . $matches[3];
+								}
+								return $matches[1] . self::escape_text_content( $matches[2] ) . $matches[3];
 							},
 							$content
 						);