Changeset 43993 for branches/4.5/tests/phpunit/tests/functions.php

Timestamp:

12/12/2018 11:10:04 PM (7 years ago)

Author:

jeremyfelt

Message:

Media: Improve verification of MIME file types.

Merges [43988] to the 4.5 branch.

Location:

branches/4.5

Files:

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

branches/4.5/tests/phpunit/tests/functions.php

@@ -462 +462 @@
                 true,
             ),
-            // Android 2.2, Android Webkit Browser 
+            // Android 2.2, Android Webkit Browser
             array(
                 'Mozilla/5.0 (Android 2.2; Windows; U; Windows NT 6.1; en-US) AppleWebKit/533.19.4 (KHTML, like Gecko) Version/5.0.3 Safari/533.19.4',
                 true,
             ),
-            // BlackBerry 9900, BlackBerry browser 
+            // BlackBerry 9900, BlackBerry browser
             array(
                 'Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en) AppleWebKit/534.11+ (KHTML, like Gecko) Version/7.1.0.346 Mobile Safari/534.11+',
@@ -481 +481 @@
                 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:41.0) Gecko/20100101 Firefox/41.0',
                 true,
+            ),
+            // 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,
+                    'type' => false,
+                    'proper_filename' => false,
+                ),
             ),
         );