Changeset 36649

Timestamp:

02/23/2016 08:40:43 PM (9 years ago)

Author:

ocean90

Message:

Styles: Clarify the allowed values for the $media parameter of wp_register_style()/wp_enqueue_style().

Adds unit test.

Fixes #35921.

Location:

trunk

Files:

• src/wp-includes/functions.wp-styles.php (modified) (2 diffs)
• tests/phpunit/tests/dependencies/styles.php (modified) (1 diff)

trunk/src/wp-includes/functions.wp-styles.php

@@ -107 +107 @@
  *                            is sent to the client regardless of caching. Default 'false'. Accepts 'false', 'null', or 'string'.
  * @param string      $media  Optional. The media for which this stylesheet has been defined.
- *                            Default 'all'. Accepts 'all', 'aural', 'braille', 'handheld', 'projection', 'print',
- *                            'screen', 'tty', or 'tv'.
+ *                            Default 'all'. Accepts media types like 'all', 'print' and 'screen', or media queries like
+ *                            '(orientation: portrait)' and '(max-width: 640px)'.
+ *
  * @return bool Whether the style has been registered. True on success, false on failure.
  */
@@ -150 +151 @@
  *                            should be included if a version number is available and makes sense for the stylesheet.
  * @param string      $media  Optional. The media for which this stylesheet has been defined.
- *                            Default 'all'. Accepts 'all', 'aural', 'braille', 'handheld', 'projection', 'print',
- *                            'screen', 'tty', or 'tv'.
+ *                            Default 'all'. Accepts media types like 'all', 'print' and 'screen', or media queries like
+ *                            '(orientation: portrait)' and '(max-width: 640px)'.
  */
 function wp_enqueue_style( $handle, $src = false, $deps = array(), $ver = false, $media = 'all' ) {

trunk/tests/phpunit/tests/dependencies/styles.php

@@ -262 +262 @@
     }
 
+    /**
+     * @ticket 35921
+     * @dataProvider data_styles_with_media
+     */
+    function test_wp_enqueue_style_with_media( $expected, $media ) {
+        wp_enqueue_style( 'handle', 'http://example.com', array(), 1, $media );
+        $this->assertContains( $expected, get_echo( 'wp_print_styles' ) );
+    }
+
+    function data_styles_with_media() {
+        return array(
+            array(
+                "media='all'",
+                'all'
+            ),
+            array(
+                "media='(orientation: portrait)'",
+                '(orientation: portrait)'
+            ),
+            array(
+                "media='(max-width: 640px)'",
+                '(max-width: 640px)'
+            ),
+            array(
+                "media='print and (min-width: 25cm)'",
+                'print and (min-width: 25cm)'
+            ),
+            array(
+                "media='screen and (color), projection and (color)'",
+                'screen and (color), projection and (color)'
+            ),
+            array(
+                "media='not screen and (color)'",
+                'not screen and (color)'
+            ),
+        );
+    }
 }