diff -r c7c34916027a -r 177826044cd9 wp/wp-includes/widgets/class-wp-widget-media-video.php
--- a/wp/wp-includes/widgets/class-wp-widget-media-video.php	Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-includes/widgets/class-wp-widget-media-video.php	Mon Oct 14 18:28:13 2019 +0200
@@ -19,36 +19,43 @@
 	/**
 	 * Constructor.
 	 *
-	 * @since  4.8.0
+	 * @since 4.8.0
 	 */
 	public function __construct() {
-		parent::__construct( 'media_video', __( 'Video' ), array(
-			'description' => __( 'Displays a video from the media library or from YouTube, Vimeo, or another provider.' ),
-			'mime_type'   => 'video',
-		) );
+		parent::__construct(
+			'media_video',
+			__( 'Video' ),
+			array(
+				'description' => __( 'Displays a video from the media library or from YouTube, Vimeo, or another provider.' ),
+				'mime_type'   => 'video',
+			)
+		);
 
-		$this->l10n = array_merge( $this->l10n, array(
-			'no_media_selected' => __( 'No video selected' ),
-			'add_media' => _x( 'Add Video', 'label for button in the video widget' ),
-			'replace_media' => _x( 'Replace Video', 'label for button in the video widget; should preferably not be longer than ~13 characters long' ),
-			'edit_media' => _x( 'Edit Video', 'label for button in the video widget; should preferably not be longer than ~13 characters long' ),
-			'missing_attachment' => sprintf(
-				/* translators: %s: URL to media library */
-				__( 'We can&#8217;t find that video. Check your <a href="%s">media library</a> and make sure it wasn&#8217;t deleted.' ),
-				esc_url( admin_url( 'upload.php' ) )
-			),
-			/* translators: %d: widget count */
-			'media_library_state_multi' => _n_noop( 'Video Widget (%d)', 'Video Widget (%d)' ),
-			'media_library_state_single' => __( 'Video Widget' ),
-			/* translators: %s: a list of valid video file extensions */
-			'unsupported_file_type' => sprintf( __( 'Sorry, we can&#8217;t load the video at the supplied URL. Please check that the URL is for a supported video file (%s) or stream (e.g. YouTube and Vimeo).' ), '<code>.' . implode( '</code>, <code>.', wp_get_video_extensions() ) . '</code>' ),
-		) );
+		$this->l10n = array_merge(
+			$this->l10n,
+			array(
+				'no_media_selected'          => __( 'No video selected' ),
+				'add_media'                  => _x( 'Add Video', 'label for button in the video widget' ),
+				'replace_media'              => _x( 'Replace Video', 'label for button in the video widget; should preferably not be longer than ~13 characters long' ),
+				'edit_media'                 => _x( 'Edit Video', 'label for button in the video widget; should preferably not be longer than ~13 characters long' ),
+				'missing_attachment'         => sprintf(
+					/* translators: %s: URL to media library */
+					__( 'We can&#8217;t find that video. Check your <a href="%s">media library</a> and make sure it wasn&#8217;t deleted.' ),
+					esc_url( admin_url( 'upload.php' ) )
+				),
+				/* translators: %d: widget count */
+				'media_library_state_multi'  => _n_noop( 'Video Widget (%d)', 'Video Widget (%d)' ),
+				'media_library_state_single' => __( 'Video Widget' ),
+				/* translators: %s: a list of valid video file extensions */
+				'unsupported_file_type'      => sprintf( __( 'Sorry, we can&#8217;t load the video at the supplied URL. Please check that the URL is for a supported video file (%s) or stream (e.g. YouTube and Vimeo).' ), '<code>.' . implode( '</code>, <code>.', wp_get_video_extensions() ) . '</code>' ),
+			)
+		);
 	}
 
 	/**
 	 * Get schema for properties of a widget instance (item).
 	 *
-	 * @since  4.8.0
+	 * @since 4.8.0
 	 *
 	 * @see WP_REST_Controller::get_item_schema()
 	 * @see WP_REST_Controller::get_additional_fields()
@@ -56,56 +63,54 @@
 	 * @return array Schema for properties.
 	 */
 	public function get_instance_schema() {
-		$schema = array_merge(
-			parent::get_instance_schema(),
-			array(
-				'preload' => array(
-					'type' => 'string',
-					'enum' => array( 'none', 'auto', 'metadata' ),
-					'default' => 'metadata',
-					'description' => __( 'Preload' ),
-					'should_preview_update' => false,
-				),
-				'loop' => array(
-					'type' => 'boolean',
-					'default' => false,
-					'description' => __( 'Loop' ),
-					'should_preview_update' => false,
-				),
-				'content' => array(
-					'type' => 'string',
-					'default' => '',
-					'sanitize_callback' => 'wp_kses_post',
-					'description' => __( 'Tracks (subtitles, captions, descriptions, chapters, or metadata)' ),
-					'should_preview_update' => false,
-				),
-			)
+
+		$schema = array(
+			'preload' => array(
+				'type'                  => 'string',
+				'enum'                  => array( 'none', 'auto', 'metadata' ),
+				'default'               => 'metadata',
+				'description'           => __( 'Preload' ),
+				'should_preview_update' => false,
+			),
+			'loop'    => array(
+				'type'                  => 'boolean',
+				'default'               => false,
+				'description'           => __( 'Loop' ),
+				'should_preview_update' => false,
+			),
+			'content' => array(
+				'type'                  => 'string',
+				'default'               => '',
+				'sanitize_callback'     => 'wp_kses_post',
+				'description'           => __( 'Tracks (subtitles, captions, descriptions, chapters, or metadata)' ),
+				'should_preview_update' => false,
+			),
 		);
 
 		foreach ( wp_get_video_extensions() as $video_extension ) {
 			$schema[ $video_extension ] = array(
-				'type' => 'string',
-				'default' => '',
-				'format' => 'uri',
+				'type'        => 'string',
+				'default'     => '',
+				'format'      => 'uri',
 				/* translators: %s: video extension */
 				'description' => sprintf( __( 'URL to the %s video source file' ), $video_extension ),
 			);
 		}
 
-		return $schema;
+		return array_merge( $schema, parent::get_instance_schema() );
 	}
 
 	/**
 	 * Render the media on the frontend.
 	 *
-	 * @since  4.8.0
+	 * @since 4.8.0
 	 *
 	 * @param array $instance Widget instance props.
 	 *
 	 * @return void
 	 */
 	public function render_media( $instance ) {
-		$instance = array_merge( wp_list_pluck( $this->get_instance_schema(), 'default' ), $instance );
+		$instance   = array_merge( wp_list_pluck( $this->get_instance_schema(), 'default' ), $instance );
 		$attachment = null;
 
 		if ( $this->is_attachment_with_mime_type( $instance['attachment_id'], $this->widget_options['mime_type'] ) ) {
@@ -243,7 +248,7 @@
 					<span class="dashicons dashicons-format-video"></span>
 				</a>
 			<# } else if ( data.model.src ) { #>
-				<?php wp_underscore_video_template() ?>
+				<?php wp_underscore_video_template(); ?>
 			<# } #>
 		</script>
 		<?php