Changeset 36240

Timestamp:

01/09/2016 02:17:02 PM (9 years ago)

Author:

swissspidy

Message:

Media: Fix wp_audio_shortcode and wp_video_shortcode attributes handling.

Although documented, the class and style attributes were simply ignored.
Adds unit tests.

Fixes #35367.

Location:

trunk

Files:

• src/wp-includes/media.php (modified) (5 diffs)
• tests/phpunit/tests/media.php (modified) (1 diff)

trunk/src/wp-includes/media.php

@@ -2164 +2164 @@
  *     @type string $loop     The 'loop' attribute for the `<audio>` element. Default empty.
  *     @type string $autoplay The 'autoplay' attribute for the `<audio>` element. Default empty.
- *     @type string $preload  The 'preload' attribute for the `<audio>` element. Default empty.
+ *     @type string $preload  The 'preload' attribute for the `<audio>` element. Default 'none'.
  *     @type string $class    The 'class' attribute for the `<audio>` element. Default 'wp-audio-shortcode'.
- *     @type string $style    The 'style' attribute for the `<audio>` element. Default 'width: 100%'.
+ *     @type string $style    The 'style' attribute for the `<audio>` element. Default 'width: 100%; visibility: hidden;'.
  * }
  * @param string $content Shortcode content.
@@ -2201 +2201 @@
         'loop'     => '',
         'autoplay' => '',
-        'preload'  => 'none'
+        'preload'  => 'none',
+        'class'    => 'wp-audio-shortcode',
+        'style'    => 'width: 100%; visibility: hidden;'
     );
     foreach ( $default_types as $type ) {
@@ -2263 +2265 @@
      * @param string $class CSS class or list of space-separated classes.
      */
+     $atts['class'] = apply_filters( 'wp_audio_shortcode_class', $atts['class'] );
+
     $html_atts = array(
-        'class'    => apply_filters( 'wp_audio_shortcode_class', 'wp-audio-shortcode' ),
+        'class'    => $atts['class'],
         'id'       => sprintf( 'audio-%d-%d', $post_id, $instance ),
         'loop'     => wp_validate_boolean( $atts['loop'] ),
         'autoplay' => wp_validate_boolean( $atts['autoplay'] ),
         'preload'  => $atts['preload'],
-        'style'    => 'width: 100%; visibility: hidden;',
+        'style'    => $atts['style'],
     );
 
@@ -2408 +2412 @@
         'width'    => 640,
         'height'   => 360,
+        'class'    => 'wp-video-shortcode',
     );
 
@@ -2497 +2502 @@
      * @param string $class CSS class or list of space-separated classes.
      */
+     $atts['class'] = apply_filters( 'wp_video_shortcode_class', $atts['class'] );
+
     $html_atts = array(
-        'class'    => apply_filters( 'wp_video_shortcode_class', 'wp-video-shortcode' ),
+        'class'    => $atts['class'],
         'id'       => sprintf( 'video-%d-%d', $post_id, $instance ),
         'width'    => absint( $atts['width'] ),

trunk/tests/phpunit/tests/media.php

@@ -416 +416 @@
         $matches2 = get_media_embedded_in_content( $reversed, array( 'audio', 'video' ) );
         $this->assertEquals( array( $video, $audio ), $matches2 );
+    }
+
+    /**
+     * @ticket 35367
+     */
+    function test_wp_audio_shortcode_with_empty_params() {
+        $this->assertNull( wp_audio_shortcode( array() ) );
+    }
+
+    /**
+     * @ticket 35367
+     */
+    function test_wp_audio_shortcode_with_bad_attr() {
+        $this->assertSame(
+            '<a class="wp-embedded-audio" href="https://example.com/foo.php">https://example.com/foo.php</a>',
+            wp_audio_shortcode( array(
+                'src' => 'https://example.com/foo.php',
+            ) )
+        );
+    }
+
+    /**
+     * @ticket 35367
+     */
+    function test_wp_audio_shortcode_attributes() {
+        $actual = wp_audio_shortcode( array(
+            'src' => 'https://example.com/foo.mp3',
+        ) );
+
+        $this->assertContains( 'src="https://example.com/foo.mp3', $actual );
+        $this->assertNotContains( 'loop', $actual );
+        $this->assertNotContains( 'autoplay', $actual );
+        $this->assertContains( 'preload="none"', $actual );
+        $this->assertContains( 'class="wp-audio-shortcode"', $actual );
+        $this->assertContains( 'style="width: 100%; visibility: hidden;"', $actual );
+
+        $actual = wp_audio_shortcode( array(
+            'src'      => 'https://example.com/foo.mp3',
+            'loop'     => true,
+            'autoplay' => true,
+            'preload'  => true,
+            'class'    => 'foobar',
+            'style'    => 'padding:0;',
+        ) );
+
+        $this->assertContains( 'src="https://example.com/foo.mp3', $actual );
+        $this->assertContains( 'loop="1"', $actual );
+        $this->assertContains( 'autoplay="1"', $actual );
+        $this->assertContains( 'preload="1"', $actual );
+        $this->assertContains( 'class="foobar"', $actual );
+        $this->assertContains( 'style="padding:0;"', $actual );
+    }
+
+    /**
+     * @ticket  35367
+     * @depends test_video_shortcode_body
+     */
+    function test_wp_video_shortcode_with_empty_params() {
+        $this->assertNull( wp_video_shortcode( array() ) );
+    }
+
+    /**
+     * @ticket  35367
+     * @depends test_video_shortcode_body
+     */
+    function test_wp_video_shortcode_with_bad_attr() {
+        $this->assertSame(
+            '<a class="wp-embedded-video" href="https://example.com/foo.php">https://example.com/foo.php</a>',
+            wp_video_shortcode( array(
+                'src' => 'https://example.com/foo.php',
+            ) )
+        );
+    }
+
+    /**
+     * @ticket  35367
+     * @depends test_video_shortcode_body
+     */
+    function test_wp_video_shortcode_attributes() {
+        $actual = wp_video_shortcode( array(
+            'src' => 'https://example.com/foo.mp4',
+        ) );
+
+        $this->assertContains( 'src="https://example.com/foo.mp4', $actual );
+        $this->assertNotContains( 'loop', $actual );
+        $this->assertNotContains( 'autoplay', $actual );
+        $this->assertContains( 'preload="metadata"', $actual );
+        $this->assertContains( 'width="640"', $actual );
+        $this->assertContains( 'height="360"', $actual );
+        $this->assertContains( 'class="wp-video-shortcode"', $actual );
+
+        $actual = wp_video_shortcode( array(
+            'src'      => 'https://example.com/foo.mp4',
+            'poster'   => 'https://example.com/foo.png',
+            'loop'     => true,
+            'autoplay' => true,
+            'preload'  => true,
+            'width'    => 123,
+            'height'   => 456,
+            'class'    => 'foobar',
+        ) );
+
+        $this->assertContains( 'src="https://example.com/foo.mp4', $actual );
+        $this->assertContains( 'poster="https://example.com/foo.png', $actual );
+        $this->assertContains( 'loop="1"', $actual );
+        $this->assertContains( 'autoplay="1"', $actual );
+        $this->assertContains( 'preload="1"', $actual );
+        $this->assertContains( 'width="123"', $actual );
+        $this->assertContains( 'height="456"', $actual );
+        $this->assertContains( 'class="foobar"', $actual );
     }