Browse Source

"yii\swiftmailer\Mailer::createSwiftObject()" simplified.

tags/2.0.0-beta
Paul Klimov 11 years ago
parent
commit
b20e57688a
  1. 2
      extensions/swiftmailer/Mailer.php
  2. 4
      tests/unit/extensions/swiftmailer/MailerTest.php

2
extensions/swiftmailer/Mailer.php

@ -192,7 +192,7 @@ class Mailer extends BaseMailer
}
}
unset($config['constructArgs']);
array_unshift($args, ['class' => $className]);
array_unshift($args, $className);
$object = call_user_func_array(['Yii', 'createObject'], $args);
} else {
$object = new $className;

4
tests/unit/extensions/swiftmailer/MailerTest.php

@ -70,10 +70,11 @@ class MailerTest extends VendorTestCase
{
$mailer = new Mailer();
$class = 'Swift_SmtpTransport';
$host = 'some.test.host';
$port = 999;
$transportConfig = [
'class' => 'Swift_SmtpTransport',
'class' => $class,
'constructArgs' => [
$host,
$port,
@ -82,6 +83,7 @@ class MailerTest extends VendorTestCase
$mailer->setTransport($transportConfig);
$transport = $mailer->getTransport();
$this->assertTrue(is_object($transport), 'Unable to setup transport via config!');
$this->assertEquals($class, get_class($transport), 'Invalid transport class!');
$this->assertEquals($host, $transport->getHost(), 'Invalid transport host!');
$this->assertEquals($port, $transport->getPort(), 'Invalid transport host!');
}

Loading…
Cancel
Save