Changeset 44292 for trunk/tests/phpunit/tests/functions.php

Timestamp:

12/18/2018 04:34:17 PM (8 years ago)

Author:

desrosj

Message:

Media: Improve verification of MIME file types.

Merges [43988] to trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/functions.php (modified) (2 diffs)

trunk/tests/phpunit/tests/functions.php

@@ -1302 +1302 @@
                                 'big5.jpg',
                                 array(
-                                        'ext'             => 'jpg',
-                                        'type'            => 'image/jpeg',
+                                        'ext'             => false,
+                                        'type'            => false,
                                         'proper_filename' => false,
                                 ),
@@ -1311 +1311 @@
                                 DIR_TESTDATA . '/export/crazy-cdata.xml',
                                 'crazy-cdata.xml',
+                                array(
+                                        'ext'             => false,
+                                        'type'            => false,
+                                        'proper_filename' => false,
+                                ),
+                        ),
+                        // Non-image file not allowed even if it's named like one.
+                        array(
+                                DIR_TESTDATA . '/export/crazy-cdata.xml',
+                                'crazy-cdata.jpg',
+                                array(
+                                        'ext'             => false,
+                                        'type'            => false,
+                                        'proper_filename' => false,
+                                ),
+                        ),
+                        // Non-image file not allowed if it's named like something else.
+                        array(
+                                DIR_TESTDATA . '/export/crazy-cdata.xml',
+                                'crazy-cdata.doc',
                                 array(
                                         'ext'             => false,