Просмотр исходного кода

ZF-11022 Unsetting Zend_App_Resource_Mail::register option.

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24109 44c647ce-9c0f-0410-b52a-842ac1e357ba
freak 14 лет назад
Родитель
Сommit
a12ac8fa4f

+ 1 - 0
library/Zend/Application/Resource/Mail.php

@@ -124,6 +124,7 @@ class Zend_Application_Resource_Mail extends Zend_Application_Resource_ResourceA
         }
 
         unset($options['type']);
+        unset($options['register']); //@see ZF-11022
 
         switch($transportName) {
             case 'Zend_Mail_Transport_Smtp':

+ 17 - 1
tests/Zend/Application/Resource/MailTest.php

@@ -203,7 +203,7 @@ class Zend_Application_Resource_MailTest extends PHPUnit_Framework_TestCase
     /**
      * @group ZF-9136
      */
-    public function testCustomMailTransportWithWrontCasesAsShouldBe() {
+    public function testCustomMailTransportWithWrongCasesAsShouldBe() {
         $options = array('transport' => array('type' => 'Zend_Application_Resource_mailTestCAsE'));
         $resource = new Zend_Application_Resource_Mail(array());
         $resource->setBootstrap($this->bootstrap);
@@ -211,6 +211,22 @@ class Zend_Application_Resource_MailTest extends PHPUnit_Framework_TestCase
 
         $this->assertTrue($resource->init() instanceof Zend_Application_Resource_mailTestCAsE);
     }
+    
+    /**
+     * @group ZF-11022
+     */
+    public function testOptionRegisterIsUnset()
+    {
+        $options = array('transport' => 
+                        array('register' => 1,
+                              'type' => 'Zend_Mail_Transport_Sendmail'));
+
+        $resource = new Zend_Application_Resource_Mail(array());
+        $resource->setBootstrap($this->bootstrap);
+        $resource->setOptions($options);
+
+        $this->assertEmpty($resource->getMail()->parameters);
+    }
 
 }