Harmonize catch blocks

Author: westonruter

src/wp-includes/template.php

@@ -1076,15 +1076,17 @@ static function ( int $level, string $message, ?string $file = null, ?int $line
 		 */
 		do_action( 'wp_finalized_template_enhancement_output_buffer', $filtered_output );
 	} catch ( Exception $exception ) {
-		// Emit to the error log.
+		// Emit to the error log as a warning not as an error to prevent halting execution.
+		$did_just_catch_exception = true;
 		trigger_error(
 			sprintf(
-				/* translators: %s is wp_finalized_template_enhancement_output_buffer */
-				__( 'Exception thrown during %s action: ' ) . $exception->getMessage(),
-				'wp_finalized_template_enhancement_output_buffer'
-			),
+				/* translators: %s is the exception class name */
+				__( 'Uncaught exception "%s" thrown:' ),
+				get_class( $exception )
+			) . ' ' . $exception->getMessage(),
 			E_USER_WARNING
 		);
+		$did_just_catch_exception = false;
 
 		// TODO: Should this also append the error to $filtered output if $display_errors? But it could make a sent header incorrect.
 	}

tests/phpunit/tests/template.php

@@ -1058,7 +1058,7 @@ public function data_provider_to_test_wp_finalize_template_enhancement_output_bu
 				'expected_processed'        => false,
 				'expected_error_log'        => array(
 					'PHP Warning:  Uncaught exception "Exception" thrown: User error triggered: ERROR: Can this mistake be rectified during filter? in __FILE__ on line __LINE__',
-					'PHP Warning:  Exception thrown during wp_finalized_template_enhancement_output_buffer action: User error triggered: ERROR: Can this mistake be rectified during action? in __FILE__ on line __LINE__',
+					'PHP Warning:  Uncaught exception "Exception" thrown: User error triggered: ERROR: Can this mistake be rectified during action? in __FILE__ on line __LINE__',
 				),
 				'expected_displayed_errors' => array(
 					'<b>Error</b>: Uncaught exception "Exception" thrown: User error triggered: ERROR: Can this mistake be rectified during filter? in <b>__FILE__</b> on line <b>__LINE__</b>',
@@ -1075,7 +1075,7 @@ public function data_provider_to_test_wp_finalize_template_enhancement_output_bu
 				'expected_processed'        => false,
 				'expected_error_log'        => array(
 					'PHP Warning:  Uncaught exception "Exception" thrown: I take exception to this filter! in __FILE__ on line __LINE__',
-					'PHP Warning:  Exception thrown during wp_finalized_template_enhancement_output_buffer action: I take exception to this action! in __FILE__ on line __LINE__',
+					'PHP Warning:  Uncaught exception "Exception" thrown: I take exception to this action! in __FILE__ on line __LINE__',
 				),
 				'expected_displayed_errors' => array(
 					'<b>Error</b>: Uncaught exception "Exception" thrown: I take exception to this filter! in <b>__FILE__</b> on line <b>__LINE__</b>',