Merge branch 'hotfix/2728' into develop

Forward port zendframework/zendframework#2737
zendframework · Oct 16, 2012 · 730f592 · 730f592
4 parents b9d3f85 + de6ba8b + 19c92ef + a6996cb
commit 730f592
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/src/Header/ContentType.php b/src/Header/ContentType.php
@@ -102,7 +102,7 @@ public function toString()
      */
     public function setType($type)
     {
-        if (!preg_match('/^[a-z_-]+\/[a-z_-]+$/i', $type)) {
+        if (!preg_match('/^[a-z-]+\/[a-z0-9.+-]+$/i', $type)) {
             throw new Exception\InvalidArgumentException(sprintf(
                 '%s expects a value in the format "type/subtype"; received "%s"',
                 __METHOD__,

diff --git a/test/Header/ContentTypeTest.php b/test/Header/ContentTypeTest.php
@@ -68,4 +68,25 @@ public function testExtractsExtraInformationFromContentType()
         $this->assertEquals($params,array('boundary' => 'Apple-Mail=_1B852F10-F9C6-463D-AADD-CD503A5428DD'));
     }
 
+    /**
+     * @group #2728
+     *
+     * Tests setting different MIME types
+     */
+    public function testSetContentType()
+    {
+        $header = new ContentType();
+
+        $header->setType('application/vnd.ms-excel');
+        $this->assertEquals('Content-Type: application/vnd.ms-excel', $header->toString());
+
+        $header->setType('application/rss+xml');
+        $this->assertEquals('Content-Type: application/rss+xml', $header->toString());
+
+        $header->setType('video/mp4');
+        $this->assertEquals('Content-Type: video/mp4', $header->toString());
+
+        $header->setType('message/rfc822');
+        $this->assertEquals('Content-Type: message/rfc822', $header->toString());
+    }
 }
diff --git a/test/Storage/MaildirFolderTest.php b/test/Storage/MaildirFolderTest.php
@@ -89,6 +89,9 @@ public function tearDown()
                 if (!file_exists($this->_tmpdir . $dir . '/' . $subdir)) {
                     continue;
                 }
+                if (!is_dir($this->_tmpdir . $dir . '/' . $subdir)) {
+                    continue;
+                }
                 $dh = opendir($this->_tmpdir . $dir . '/' . $subdir);
                 while (($entry = readdir($dh)) !== false) {
                     $entry = $this->_tmpdir . $dir . '/' . $subdir . '/' . $entry;
@@ -100,7 +103,7 @@ public function tearDown()
                 closedir($dh);
                 rmdir($this->_tmpdir . $dir . '/' . $subdir);
             }
-            if ($dir != '.') {
+            if ($dir != '.' && is_dir($this->_tmpdir . $dir)) {
                 rmdir($this->_tmpdir . $dir);
             }
         }

diff --git a/test/Storage/MaildirMessageOldTest.php b/test/Storage/MaildirMessageOldTest.php
@@ -89,6 +89,9 @@ public function setUp()
     public function tearDown()
     {
         foreach (array('cur', 'new') as $dir) {
+            if (!is_dir($this->_tmpdir . $dir)) {
+                continue;
+            }
             $dh = opendir($this->_tmpdir . $dir);
             while (($entry = readdir($dh)) !== false) {
                 $entry = $this->_tmpdir . $dir . '/' . $entry;

diff --git a/test/Storage/MaildirTest.php b/test/Storage/MaildirTest.php
@@ -74,6 +74,9 @@ public function setUp()
     public function tearDown()
     {
         foreach (array('cur', 'new') as $dir) {
+            if (!is_dir($this->_tmpdir . $dir)) {
+                continue;
+            }
             $dh = opendir($this->_tmpdir . $dir);
             while (($entry = readdir($dh)) !== false) {
                 $entry = $this->_tmpdir . $dir . '/' . $entry;