Eliminates try/catch

hellofromtonya · hellofromtonya · commit 0e6c026c8793 · 2023-08-23T13:17:24.000-05:00
diff --git a/lib/experimental/fonts/font-library/class-wp-font-collection.php b/lib/experimental/fonts/font-library/class-wp-font-collection.php
@@ -36,20 +36,29 @@ class WP_Font_Collection {
 	 *
 	 * @param string $id     Font collection id.
 	 * @param array  $config Font collection config options.
-	 * @throws Exception If the required parameters are missing.
+	 * @throws WP_Error When passed an invalid argument.
 	 */
 	public function __construct( $id, $config ) {
 
 		if ( empty( $id ) && is_string( $id ) ) {
-			throw new Exception( 'Font Collection ID is required as a non-empty string.' );
+			return new WP_Error(
+				'font_collection_id_required',
+				__( 'Font Collection ID is required as a non-empty string.', 'gutenberg' )
+			);
 		}
 
 		if ( empty( $config ) ) {
-			throw new Exception( 'Font Collection config options is required as a non-empty array.' );
+			return new WP_Error(
+				'font_collection_config_required',
+				__( 'Font Collection config options is required as a non-empty array.', 'gutenberg' )
+			);
 		}
 
 		if ( empty( $config['data_json_file'] ) && is_string( $config['data_json_file'] ) ) {
-			throw new Exception( 'Font Collection config "data_json_file" option is required as a non-empty string.' );
+			return new WP_Error(
+				'font_collection_data_json_file_required',
+				__( 'Font Collection config "data_json_file" option is required as a non-empty string.', 'gutenberg' )
+			);
 		}
 
 		$config['id'] = $id;
diff --git a/lib/experimental/fonts/font-library/class-wp-font-library.php b/lib/experimental/fonts/font-library/class-wp-font-library.php
@@ -50,13 +50,13 @@ public static function register_font_collection( $id, $config ) {
 			return new WP_Error( 'font_collection_registration_error', 'Font collection already registered.' );
 		}
 
-		try {
-			$new_collection           = new WP_Font_Collection( $id, $config );
-			self::$collections[ $id ] = $new_collection;
+		$new_collection = new WP_Font_Collection( $id, $config );
+		if ( is_wp_error( $new_collection ) ) {
 			return $new_collection;
-		} catch ( Exception $e ) {
-			return new WP_Error( 'font_collection_error', $e->getMessage() );
 		}
+
+		self::$collections[ $id ] = $new_collection;
+		return $new_collection;
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -50,13 +50,13 @@ public static function register_font_collection( $id, $config ) {`
`50`	`50`	`return new WP_Error( 'font_collection_registration_error', 'Font collection already registered.' );`
`51`	`51`	`}`
`52`	`52`
`53`		`- try {`
`54`		`- $new_collection = new WP_Font_Collection( $id, $config );`
`55`		`- self::$collections[ $id ] = $new_collection;`
	`53`	`+ $new_collection = new WP_Font_Collection( $id, $config );`
	`54`	`+ if ( is_wp_error( $new_collection ) ) {`
`56`	`55`	`return $new_collection;`
`57`		`- } catch ( Exception $e ) {`
`58`		`- return new WP_Error( 'font_collection_error', $e->getMessage() );`
`59`	`56`	`}`
	`57`	`+`
	`58`	`+ self::$collections[ $id ] = $new_collection;`
	`59`	`+ return $new_collection;`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`/**`