Improve error handling by following register from the WP_Block_Type_R…

…egistry
WordPress · May 22, 2020 · d69772f · d69772f
1 parent fd11fa0
commit d69772f
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/lib/compat.php b/lib/compat.php
@@ -34,6 +34,7 @@ function register_block_type_from_metadata( $path, $args = array() ) {
 			return false;
 		}
 
+		$settings          = array();
 		$property_mappings = array(
 			'title'           => 'title',
 			'category'        => 'category',
@@ -47,15 +48,14 @@ function register_block_type_from_metadata( $path, $args = array() ) {
 			// Alias recommended in documentation to distinguish from assets.
 			'styleVariations' => 'styles',
 		);
-		$settings          = array();
 
 		foreach ( $property_mappings as $key => $mapped_key ) {
 			if ( isset( $metadata[ $key ] ) ) {
 				$settings[ $mapped_key ] = $metadata[ $key ];
 			}
 		}
 
-		$block_name        = $metadata['name'];
+		$block_name          = $metadata['name'];
 		$block_dir           = dirname( $metadata_file );
 		$asset_handle_prefix = str_replace( '/', '-', $block_name );
 
@@ -66,9 +66,10 @@ function register_block_type_from_metadata( $path, $args = array() ) {
 				$block_dir . '/' . substr_replace( $editor_script, '.asset.php', -3 )
 			);
 			if ( ! file_exists( $editor_script_asset_path ) ) {
-				throw new Error(
-					"The asset file for the \"editorScript\" defined in \"$block_name\" block definition is missing."
-				);
+				/* translators: %s: Block name. */
+				$message = sprintf( __( 'The asset file for the "editorScript" defined in "%s" block definition is missing.' ), $block_name );
+				_doing_it_wrong( __METHOD__, $message, '5.5.0' );
+				return false;
 			}
 			$editor_script_asset  = require( $editor_script_asset_path );
 			wp_register_script(
@@ -87,9 +88,10 @@ function register_block_type_from_metadata( $path, $args = array() ) {
 				$block_dir . '/' . substr_replace( $script, '.asset.php', -3 )
 			);
 			if ( ! file_exists( $script_asset_path ) ) {
-				throw new Error(
-					"The asset file for the \"script\" defined in \"$block_name\" block definition is missing."
-				);
+				/* translators: %s: Block name. */
+				$message = sprintf( __( 'The asset file for the "script" defined in "%s" block definition is missing.' ), $block_name );
+				_doing_it_wrong( __METHOD__, $message, '5.5.0' );
+				return false;
 			}
 			$script_asset  = require( $script_asset_path );
 			wp_register_script(