php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 06:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Missing files for #4071

Browse Source
This commit is contained in:
Alexander Makarov
2014-06-26 18:28:57 +04:00
parent 2457e24795
commit 0ff0f9d32e
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/advanced/backend/tests/_config.php
View File

@ -4,7 +4,7 @@
*/
return [
'components' => [
'mail' => [
'mailer' => [
'useFileTransport' => true,
],
'urlManager' => [

2
apps/advanced/common/tests/_config.php
View File

@ -4,7 +4,7 @@
*/
return [
'components' => [
'mail' => [
'mailer' => [
'useFileTransport' => true,
],
'urlManager' => [

2
apps/advanced/console/tests/_config.php
View File

@ -4,7 +4,7 @@
*/
return [
'components' => [
'mail' => [
'mailer' => [
'useFileTransport' => true,
],
'urlManager' => [

2
apps/advanced/frontend/tests/_config.php
View File

@ -4,7 +4,7 @@
*/
return [
'components' => [
'mail' => [
'mailer' => [
'useFileTransport' => true,
],
'urlManager' => [

2
apps/basic/tests/_config.php
View File

@ -4,7 +4,7 @@
*/
return [
'components' => [
'mail' => [
'mailer' => [
'useFileTransport' => true,
],
'urlManager' => [

8
framework/base/Application.php
View File

@ -24,7 +24,7 @@ use Yii;
* @property \yii\base\Formatter|\yii\i18n\Formatter $formatter The formatter application component. This property is read-only.
* @property \yii\i18n\I18N $i18n The internationalization component. This property is read-only.
* @property \yii\log\Dispatcher $log The log dispatcher component. This property is read-only.
* @property \yii\mail\MailerInterface $mail The mailer interface. This property is read-only.
* @property \yii\mail\MailerInterface $mailer The mailer interface. This property is read-only.
* @property \yii\web\Request|\yii\console\Request $request The request component. This property is read-only.
* @property \yii\web\Response|\yii\console\Response $response The response component. This property is
* read-only.
@ -566,9 +566,9 @@ abstract class Application extends Module
* Returns the mailer component.
* @return \yii\mail\MailerInterface the mailer interface
*/
public function getMail()
public function getMailer()
{
return $this->get('mail');
return $this->get('mailer');
}
/**
@ -601,7 +601,7 @@ abstract class Application extends Module
'view' => ['class' => 'yii\web\View'],
'formatter' => ['class' => 'yii\base\Formatter'],
'i18n' => ['class' => 'yii\i18n\I18N'],
'mail' => ['class' => 'yii\swiftmailer\Mailer'],
'mailer' => ['class' => 'yii\swiftmailer\Mailer'],
'urlManager' => ['class' => 'yii\web\UrlManager'],
'assetManager' => ['class' => 'yii\web\AssetManager'],
];

4
tests/unit/framework/mail/BaseMailerTest.php
View File

@ -18,7 +18,7 @@ class BaseMailerTest extends TestCase
{
$this->mockApplication([
'components' => [
'mail' => $this->createTestMailComponent(),
'mailer' => $this->createTestMailComponent(),
]
]);
$filePath = $this->getTestFilePath();
@ -59,7 +59,7 @@ class BaseMailerTest extends TestCase
*/
protected function getTestMailComponent()
{
return Yii::$app->get('mail');
return Yii::$app->get('mailer');
}
// Tests :