Rename _strip_php_suffix to _strip_template_file_suffix

ockham · ockham · commit bf8d81ef8930 · 2021-05-25T15:14:24.000+02:00
diff --git a/src/wp-includes/block-template.php b/src/wp-includes/block-template.php
@@ -104,7 +104,7 @@ function resolve_block_template( $template_type, $template_hierarchy ) {
 	}
 
 	$slugs = array_map(
-		'_strip_php_suffix',
+		'_strip_template_file_suffix',
 		$template_hierarchy
 	);
 
@@ -189,15 +189,15 @@ function _block_template_viewport_meta_tag() {
 }
 
 /**
- * Strips .php suffix from template file names.
+ * Strips .php or .html suffix from template file names.
  *
  * @access private
  * @since 5.8.0
  *
  * @param string $template_file Template file name.
  * @return string Template file name without extension.
  */
-function _strip_php_suffix( $template_file ) {
+function _strip_template_file_suffix( $template_file ) {
 	return preg_replace( '/\.(php|html)$/', '', $template_file );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ function resolve_block_template( $template_type, $template_hierarchy ) {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`$slugs = array_map(`
`107`		`- '_strip_php_suffix',`
	`107`	`+ '_strip_template_file_suffix',`
`108`	`108`	`$template_hierarchy`
`109`	`109`	`);`
`110`	`110`
`@@ -189,15 +189,15 @@ function _block_template_viewport_meta_tag() {`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`/**`
`192`		`- * Strips .php suffix from template file names.`
	`192`	`+ * Strips .php or .html suffix from template file names.`
`193`	`193`	`*`
`194`	`194`	`* @access private`
`195`	`195`	`* @since 5.8.0`
`196`	`196`	`*`
`197`	`197`	`* @param string $template_file Template file name.`
`198`	`198`	`* @return string Template file name without extension.`
`199`	`199`	`*/`
`200`		`-function _strip_php_suffix( $template_file ) {`
	`200`	`+function _strip_template_file_suffix( $template_file ) {`
`201`	`201`	`return preg_replace( '/\.(php\|html)$/', '', $template_file );`
`202`	`202`	`}`
`203`	`203`