[PHP-5.3-COMPAT] Backport r17064 to trunk

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@17065 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Validate/File/MimeType.php

@@ -256,15 +256,24 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract
         }
 
         $mimetype = $this->getMimeType(true);
+        foreach ($mimetype as $type) {
+            if (0 === strpos($type, $this->_type)) {
+                return true;
+            }
+        }
+        /*
         if (in_array($this->_type, $mimetype)) {
             return true;
         }
+         */
 
         $types = explode('/', $this->_type);
         $types = array_merge($types, explode('-', $this->_type));
-        foreach($mimetype as $mime) {
-            if (in_array($mime, $types)) {
-                return true;
+        foreach ($mimetype as $mime) {
+            foreach ($types as $type) {
+                if (0 === strpos($type, $mime)) {
+                    return true;
+                }
             }
         }
 

tests/Zend/File/Transfer/Adapter/AbstractTest.php

@@ -710,7 +710,7 @@ class Zend_File_Transfer_Adapter_AbstractTest extends PHPUnit_Framework_TestCase
 
     public function testMimeTypeByTmpName()
     {
-        $this->assertEquals('text/plain', $this->adapter->getMimeType('baz.text'));
+        $this->assertRegexp('#^text/plain#', $this->adapter->getMimeType('baz.text'));
     }
 
     public function testSetOwnErrorMessage()

tests/Zend/Form/Element/FileTest.php

@@ -379,7 +379,7 @@ class Zend_Form_Element_FileTest extends PHPUnit_Framework_TestCase
         $adapter = new Zend_Form_Element_FileTest_MockAdapter();
         $element->setTransferAdapter($adapter);
 
-        $this->assertEquals('text/plain', $element->getMimeType('baz.text'));
+        $this->assertRegexp('#^text/plain#', $element->getMimeType('baz.text'));
     }
 
     public function testAddedErrorsAreDisplayed()