Changeset 43991 for branches/4.7/tests/phpunit/tests/functions.php

Timestamp:

12/12/2018 11:04:17 PM (6 years ago)

Author:

jeremyfelt

Message:

Media: Improve verification of MIME file types.

Merges [43988] to the 4.7 branch.

Location:

branches/4.7

Files:

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

branches/4.7/tests/phpunit/tests/functions.php

@@ -1062 +1062 @@
                 'big5.jpg',
                 array(
-                    'ext' => 'jpg',
-                    'type' => 'image/jpeg',
+                    'ext' => false,
+                    'type' => false,
                     'proper_filename' => false,
                 ),
@@ -1071 +1071 @@
                 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,