Changeset 37189

Timestamp:

04/13/2016 03:11:25 AM (10 years ago)

Author:

boonebgorges

Message:

Improve testability and coverage of wp_ext2type().

• Following pattern of wp_get_mime_types(), introduce wp_get_ext_types() function. New function returns a filtered list of file types with their extensions.
• Use this function in new tests for wp_ext2type().

Props borgesbruno.
Fixes #35987.

Location:

trunk

Files:

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

trunk/src/wp-includes/functions.php

@@ -2186 +2186 @@
         $ext = strtolower( $ext );
 
-        /**
-         * Filter file type based on the extension name.
-         *
-         * @since 2.5.0
-         *
-         * @see wp_ext2type()
-         *
-         * @param array $ext2type Multi-dimensional array with extensions for a default set
-         *                        of file types.
-         */
-        $ext2type = apply_filters( 'ext2type', array(
-                'image'       => array( 'jpg', 'jpeg', 'jpe',  'gif',  'png',  'bmp',   'tif',  'tiff', 'ico' ),
-                'audio'       => array( 'aac', 'ac3',  'aif',  'aiff', 'm3a',  'm4a',   'm4b',  'mka',  'mp1',  'mp2',  'mp3', 'ogg', 'oga', 'ram', 'wav', 'wma' ),
-                'video'       => array( '3g2',  '3gp', '3gpp', 'asf', 'avi',  'divx', 'dv',   'flv',  'm4v',   'mkv',  'mov',  'mp4',  'mpeg', 'mpg', 'mpv', 'ogm', 'ogv', 'qt',  'rm', 'vob', 'wmv' ),
-                'document'    => array( 'doc', 'docx', 'docm', 'dotm', 'odt',  'pages', 'pdf',  'xps',  'oxps', 'rtf',  'wp', 'wpd', 'psd', 'xcf' ),
-                'spreadsheet' => array( 'numbers',     'ods',  'xls',  'xlsx', 'xlsm',  'xlsb' ),
-                'interactive' => array( 'swf', 'key',  'ppt',  'pptx', 'pptm', 'pps',   'ppsx', 'ppsm', 'sldx', 'sldm', 'odp' ),
-                'text'        => array( 'asc', 'csv',  'tsv',  'txt' ),
-                'archive'     => array( 'bz2', 'cab',  'dmg',  'gz',   'rar',  'sea',   'sit',  'sqx',  'tar',  'tgz',  'zip', '7z' ),
-                'code'        => array( 'css', 'htm',  'html', 'php',  'js' ),
-        ) );
-
+        $ext2type = wp_get_ext_types();
         foreach ( $ext2type as $type => $exts )
                 if ( in_array( $ext, $exts ) )
@@ -2452 +2431 @@
         ) );
 }
+
+/**
+ * Retrieve list of common file extensions and their types.
+ *
+ * @since 4.6.0
+ *
+ * @return array Array of file extensions types keyed by the type of file.
+ */
+function wp_get_ext_types() {
+
+        /**
+         * Filter file type based on the extension name.
+         *
+         * @since 2.5.0
+         *
+         * @see wp_ext2type()
+         *
+         * @param array $ext2type Multi-dimensional array with extensions for a default set
+         *                        of file types.
+         */
+        return apply_filters( 'ext2type', array(
+                'image'       => array( 'jpg', 'jpeg', 'jpe',  'gif',  'png',  'bmp',   'tif',  'tiff', 'ico' ),
+                'audio'       => array( 'aac', 'ac3',  'aif',  'aiff', 'm3a',  'm4a',   'm4b',  'mka',  'mp1',  'mp2',  'mp3', 'ogg', 'oga', 'ram', 'wav', 'wma' ),
+                'video'       => array( '3g2',  '3gp', '3gpp', 'asf', 'avi',  'divx', 'dv',   'flv',  'm4v',   'mkv',  'mov',  'mp4',  'mpeg', 'mpg', 'mpv', 'ogm', 'ogv', 'qt',  'rm', 'vob', 'wmv' ),
+                'document'    => array( 'doc', 'docx', 'docm', 'dotm', 'odt',  'pages', 'pdf',  'xps',  'oxps', 'rtf',  'wp', 'wpd', 'psd', 'xcf' ),
+                'spreadsheet' => array( 'numbers',     'ods',  'xls',  'xlsx', 'xlsm',  'xlsb' ),
+                'interactive' => array( 'swf', 'key',  'ppt',  'pptx', 'pptm', 'pps',   'ppsx', 'ppsm', 'sldx', 'sldm', 'odp' ),
+                'text'        => array( 'asc', 'csv',  'tsv',  'txt' ),
+                'archive'     => array( 'bz2', 'cab',  'dmg',  'gz',   'rar',  'sea',   'sit',  'sqx',  'tar',  'tgz',  'zip', '7z' ),
+                'code'        => array( 'css', 'htm',  'html', 'php',  'js' ),
+        ) );
+}
+
 /**
  * Retrieve list of allowed mime types and file extensions.

trunk/tests/phpunit/tests/functions.php

@@ -814 +814 @@
                 );
         }
+
+        /**
+         * @ticket 35987
+         */
+        public function test_wp_get_ext_types() {
+                $extensions = wp_get_ext_types();
+
+                $this->assertInternalType( 'array', $extensions );
+                $this->assertNotEmpty( $extensions );
+
+                add_filter( 'ext2type', '__return_empty_array' );
+                $extensions = wp_get_ext_types();
+                $this->assertSame( array(), $extensions );
+
+                remove_filter( 'ext2type', '__return_empty_array' );
+                $extensions = wp_get_ext_types();
+                $this->assertInternalType( 'array', $extensions );
+                $this->assertNotEmpty( $extensions );
+        }
+
+        /**
+         * @ticket 35987
+         */
+        public function test_wp_ext2type() {
+                $extensions = wp_get_ext_types();
+
+                foreach ( $extensions as $type => $extensionList ) {
+                        foreach ( $extensionList as $extension ) {
+                                $this->assertEquals( $type, wp_ext2type( $extension ) );
+                                $this->assertEquals( $type, wp_ext2type( strtoupper( $extension ) ) );
+                        }
+                }
+
+                $this->assertNull( wp_ext2type( 'unknown_format' ) );
+        }
 }