Automattic · jeherve · Nov 7, 2019 · Oct 31, 2019 · Oct 31, 2019 · Oct 31, 2019
diff --git a/3rd-party/class.jetpack-amp-support.php b/3rd-party/class.jetpack-amp-support.php
@@ -10,7 +10,7 @@
 class Jetpack_AMP_Support {
 
 	/**
-	 * Apply custom AMP changes onthe frontend.
+	 * Apply custom AMP changes on the front-end.
 	 */
 	public static function init() {
 

diff --git a/modules/shortcodes/vimeo.php b/modules/shortcodes/vimeo.php
@@ -37,74 +37,70 @@ function jetpack_shortcode_get_vimeo_id( $atts ) {
 }
 
 /**
- * Convert a Vimeo shortcode into an embed code.
+ * Get video dimensions.
  *
- * @param array $atts An array of shortcode attributes.
+ * @since 8.0.0
  *
- * @return string The embed code for the Vimeo video.
+ * @param array $attr     The attributes of the shortcode.
+ * @param array $old_attr Optional array of attributes from the old shortcode format.
+ *
+ * @return array Width and height.
  */
-function vimeo_shortcode( $atts ) {
+function jetpack_shortcode_get_vimeo_dimensions( $attr, $old_attr = array() ) {
 	global $content_width;
 
-	$attr = array_map(
-		'intval',
-		shortcode_atts(
-			array(
-				'id'       => 0,
-				'width'    => 0,
-				'height'   => 0,
-				'autoplay' => 0,
-				'loop'     => 0,
-			),
-			$atts
-		)
-	);
-
-	if ( isset( $atts[0] ) ) {
-		$attr['id'] = jetpack_shortcode_get_vimeo_id( $atts );
-	}
-
-	if ( ! $attr['id'] ) {
-		return '<!-- vimeo error: not a vimeo video -->';
-	}
-
-	// Handle old shortcode params such as h=500&w=350.
-	$params = shortcode_new_to_old_params( $atts );
-	$params = str_replace( array( '&amp;', '&#038;' ), '&', $params );
-	parse_str( $params, $args );
-
-	$width  = intval( $attr['width'] );
-	$height = intval( $attr['height'] );
+	$default_width  = 600;
+	$default_height = 338;
+	$aspect_ratio   = $default_height / $default_width;
+	$width          = ( ! empty( $attr['width'] ) ? absint( $attr['width'] ) : $default_width );
+	$height         = ( ! empty( $attr['height'] ) ? absint( $attr['height'] ) : $default_height );
 
-	// Support w and h argument as fallback.
-	if ( empty( $width ) && isset( $args['w'] ) ) {
-		$width = intval( $args['w'] );
+	/*
+	 * Support w and h argument as fallbacks.
+	 */
+	if (
+		$default_width === $width
+		&& ! empty( $old_attr['w'] )
+	) {
+		$width = absint( $old_attr['w'] );
 
-		if ( empty( $height ) && ! isset( $args['h'] ) ) {
-			// The case where w=300 is specified without h=200, otherwise $height
-			// will always equal the default of 300, no matter what w was set to.
-			$height = round( ( $width / 640 ) * 360 );
+		if (
+			$default_width === $width
+			&& empty( $old_attr['h'] )
+		) {
+			$height = round( $width * $aspect_ratio );
 		}
 	}
 
-	if ( empty( $height ) && isset( $args['h'] ) ) {
-		$height = (int) $args['h'];
+	if (
+		$default_height === $height
+		&& ! empty( $old_attr['h'] )
+	) {
+		$height = absint( $old_attr['h'] );
 
-		if ( ! isset( $args['w'] ) ) {
-			$width = round( ( $height / 360 ) * 640 );
+		if ( empty( $old_attr['w'] ) ) {
+			$width = round( $height * $aspect_ratio );
 		}
 	}
 
-	if ( ! $width && ! empty( $content_width ) ) {
+	/*
+	 * If we have a content width defined, let it be the new default.
+	 */
+	if (
+		$default_width === $width
+		&& ! empty( $content_width )
+	) {
 		$width = absint( $content_width );
 	}
 
-	// If setting the width with content_width has failed, defaulting.
-	if ( ! $width ) {
-		$width = 640;
-	}
-
-	if ( ! $height ) {
+	/*
+	 * If we have a custom width, we need a custom height as well
+	 * to maintain aspect ratio.
+	 */
+	if (
+		$default_width !== $width
+		&& $default_height === $height
+	) {
 		$height = round( ( $width / 640 ) * 360 );
 	}
 
@@ -130,6 +126,46 @@ function vimeo_shortcode( $atts ) {
 	 */
 	$height = (int) apply_filters( 'vimeo_height', $height );
 
+	return array( $width, $height );
+}
+
+/**
+ * Convert a Vimeo shortcode into an embed code.
+ *
+ * @param array $atts An array of shortcode attributes.
+ *
+ * @return string The embed code for the Vimeo video.
+ */
+function vimeo_shortcode( $atts ) {
+	$attr = array_map(
+		'intval',
+		shortcode_atts(
+			array(
+				'id'       => 0,
+				'width'    => 0,
+				'height'   => 0,
+				'autoplay' => 0,
+				'loop'     => 0,
+			),
+			$atts
+		)
+	);
+
+	if ( isset( $atts[0] ) ) {
+		$attr['id'] = jetpack_shortcode_get_vimeo_id( $atts );
+	}
+
+	if ( ! $attr['id'] ) {
+		return '<!-- vimeo error: not a vimeo video -->';
+	}
+
+	// Handle old shortcode params such as h=500&w=350.
+	$params = shortcode_new_to_old_params( $atts );
+	$params = str_replace( array( '&amp;', '&#038;' ), '&', $params );
+	parse_str( $params, $args );
+
+	list( $width, $height ) = jetpack_shortcode_get_vimeo_dimensions( $attr, $args );
+
 	$url = esc_url( 'https://player.vimeo.com/video/' . $attr['id'] );
 
 	// Handle autoplay and loop arguments.
@@ -149,12 +185,24 @@ function vimeo_shortcode( $atts ) {
 		$url = add_query_arg( 'loop', 1, $url );
 	}
 
-	$html = sprintf(
-		'<div class="embed-vimeo" style="text-align: center;"><iframe src="%1$s" width="%2$u" height="%3$u" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe></div>',
-		esc_url( $url ),
-		esc_attr( $width ),
-		esc_attr( $height )
-	);
+	if (
+		class_exists( 'Jetpack_AMP_Support' )
+		&& Jetpack_AMP_Support::is_amp_request()
+	) {
+		$html = sprintf(
+			'<amp-vimeo data-videoid="%1$s" layout="responsive" width="%2$d" height="%3$d"></amp-vimeo>',
+			esc_attr( $attr['id'] ),
+			absint( $width ),
+			absint( $height )
+		);
+	} else {
+		$html = sprintf(
+			'<div class="embed-vimeo" style="text-align: center;"><iframe src="%1$s" width="%2$u" height="%3$u" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe></div>',
+			esc_url( $url ),
+			esc_attr( $width ),
+			esc_attr( $height )
+		);
+	}
 
 	/**
 	 * Filter the Vimeo player HTML.
@@ -169,7 +217,6 @@ function vimeo_shortcode( $atts ) {
 
 	return $html;
 }
-
 add_shortcode( 'vimeo', 'vimeo_shortcode' );
 
 /**

diff --git a/tests/php/modules/shortcodes/test-class.vimeo.php b/tests/php/modules/shortcodes/test-class.vimeo.php
@@ -2,6 +2,16 @@
 
 class WP_Test_Jetpack_Shortcodes_Vimeo extends WP_UnitTestCase {
 
+	/**
+	 * Tear down each test.
+	 *
+	 * @inheritDoc
+	 */
+	public function tearDown() {
+		unset( $GLOBALS['content_width'] );
+		parent::tearDown();
+	}
+
 	/**
 	 * @author scotchfield
 	 * @covers ::vimeo_shortcode
@@ -95,6 +105,11 @@ public function test_shortcodes_vimeo_width_height() {
 	 * @since 3.9
 	 */
 	public function test_replace_url_with_iframe_in_the_content() {
+		if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) {
+			self::markTestSkipped( 'Embeds are handled by core on WordPress.com. See D27860-code' );
+			return;
+		}
+
 		global $post;
 
 		$video_id = '141358';
@@ -223,4 +238,139 @@ function test_vimeo_embed_to_shortcode_5() {
 
 		$this->assertEquals( $expected_shortcode, $shortcode );
 	}
+
+	/**
+	 * Gets the test data for the Vimeo shortcodes.
+	 *
+	 * @return array An associative array of test data.
+	 */
+	public function get_vimeo_shortcode_data() {
+		return array(
+			'empty_attr_array'           => array(
+				array(),
+				'<!-- vimeo error: not a vimeo video -->',
+			),
+			'no_width_or_height_in_attr' => array(
+				array( 'id' => '24246' ),
+				'<amp-vimeo data-videoid="24246" layout="responsive" width="600" height="338"></amp-vimeo>'
+			),
+			'normal_attributes_present'  => array(
+				array(
+					'id'     => '623422',
+					'width'  => '900',
+					'height' => '1200',
+				),
+				'<amp-vimeo data-videoid="623422" layout="responsive" width="900" height="1200"></amp-vimeo>'
+			),
+		);
+	}
+
+	/**
+	 * Tests that the Vimeo shortcode filter produces the right HTML.
+	 *
+	 * @dataProvider get_vimeo_shortcode_data
+	 *
+	 * @param array  $attr The shortcode attributes.
+	 * @param string $expected The expected return value.
+	 */
+	public function test_jetpack_amp_vimeo_shortcode( $attr, $expected ) {
+		// Test AMP version. On AMP views, we only show a link.
+		if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) {
+			self::markTestSkipped( 'WordPress.com does not run the latest version of the AMP plugin yet.' );
+			return;
+		}
+
+		unset( $GLOBALS['content_width'] );
+		add_filter( 'jetpack_is_amp_request', '__return_true' );
+
+		$this->assertEquals( $expected, vimeo_shortcode( $attr ) );
+	}
+
+	/**
+	 * Tests the Vimeo shortcode filter in an AMP view when there is a global $content_width value.
+	 */
+	public function test_jetpack_amp_vimeo_shortcode_global_content_width() {
+		// Test AMP version. On AMP views, we only show a link.
+		if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) {
+			self::markTestSkipped( 'WordPress.com does not run the latest version of the AMP plugin yet.' );
+			return;
+		}
+
+		add_filter( 'jetpack_is_amp_request', '__return_true' );
+
+		$video_id                 = '624432';
+		$content_width            = 650;
+		$expected_height          = 366;
+		$GLOBALS['content_width'] = $content_width;
+
+		$this->assertEquals(
+			'<amp-vimeo data-videoid="' . $video_id .'" layout="responsive" width="' . $content_width . '" height="' . $expected_height .'"></amp-vimeo>',
+			vimeo_shortcode( array( 'id' => $video_id ) )
+		);
+	}
+
+	/**
+	 * Gets the testing data for jetpack_shortcode_get_vimeo_dimensions().
+	 *
+	 * @return array The testing data.
+	 */
+	public function get_vimeo_dimensions_data() {
+		return array(
+			'no_width_or_height'          => array(
+				array(),
+				array( 600, 338 ),
+			),
+			'only_width'                  => array(
+				array( 'width' => 800 ),
+				array( 800, 450 ),
+			),
+			'only_height'                 => array(
+				array( 'height' => 400 ),
+				array( 600, 400 ),
+			),
+			'width_and_height'            => array(
+				array(
+					'width'  => 600,
+					'height' => 400,
+				),
+				array( 600, 400 ),
+			),
+			'width_and_height_as_strings' => array(
+				array(
+					'width'  => '600',
+					'height' => '400',
+				),
+				array( 600, 400 ),
+			),
+		);
+	}
+
+	/**
+	 * Tests jetpack_shortcode_get_vimeo_dimensions, when there is no global $content_width.
+	 *
+	 * @dataProvider get_vimeo_dimensions_data
+	 * @covers ::jetpack_shortcode_get_vimeo_dimensions()
+	 *
+	* @param array $attr The shortcode attributes.
+	* @param array $expected The expected dimensions.
+	 */
+	function test_jetpack_shortcode_get_vimeo_dimensions_no_global_content_width( $attr, $expected ) {
+		unset( $GLOBALS['content_width'] );
+		$this->assertEquals( $expected, jetpack_shortcode_get_vimeo_dimensions( $attr ) );
+	}
+
+	/**
+	 * Tests jetpack_shortcode_get_vimeo_dimensions, when there is a global $content_width.
+	 *
+	 * @covers ::jetpack_shortcode_get_vimeo_dimensions()
+	 */
+	function test_jetpack_shortcode_get_vimeo_dimensions_with_global_content_width() {
+		$width                    = 500;
+		$height                   = 281;
+		$GLOBALS['content_width'] = $width;
+		$this->assertEquals(
+			array( $width, $height ),
+			jetpack_shortcode_get_vimeo_dimensions( array() )
+		);
+	}
 }