[PHP-5.3-COMPAT] Backport r17190 to trunk

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

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()

tests/Zend/Translate/Adapter/IniTest.php

@@ -63,7 +63,11 @@ class Zend_Translate_Adapter_IniTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('Message 1 (en)', $adapter->_('Message_1'));
         $this->assertEquals('Message_6', $adapter->translate('Message_6'));
         $this->assertEquals('Küchen Möbel (en)', $adapter->translate('Cooking_furniture'));
-        $this->assertEquals('Cooking furniture (en)', $adapter->translate('Küchen_Möbel'), var_export($adapter->getMessages('en'), 1));
+        if (0 > version_compare(PHP_VERSION, '5.3.0')) {
+            $this->assertEquals('Cooking furniture (en)', $adapter->translate('Küchen_Möbel'), var_export($adapter->getMessages('en'), 1));
+        } else {
+            $this->markTestSkipped('PHP 5.3 cannot utilize non-ASCII characters for INI option keys');
+        }
     }
 
     public function testIsTranslated()