leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed all tests

Browse Source
This commit is contained in:
Antonio Ramirez
2016-12-11 21:34:22 +01:00
parent 4588d77129
commit 4c9b9671b5
37 changed files with 214 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/User/Factory/EmailChangeStrategyFactory.php
View File

@ -29,7 +29,7 @@ class EmailChangeStrategyFactory
public static function makeByStrategyType($strategy, SettingsForm $form)
{
if (array_key_exists($strategy, static::$map)) {
return Yii::createObject(static::$map[$strategy], [$form]);
return Yii::$container->get(static::$map[$strategy], [$form]);
}
throw new Exception('Unknown strategy type');
@ -42,7 +42,7 @@ class EmailChangeStrategyFactory
*/
public static function makeDefaultEmailChangeStrategy(SettingsForm $form)
{
return Yii::createObject(static::$map[MailChangeStrategyInterface::TYPE_DEFAULT], [$form]);
return Yii::$container->get(static::$map[MailChangeStrategyInterface::TYPE_DEFAULT], [$form]);
}
/**
@ -52,7 +52,7 @@ class EmailChangeStrategyFactory
*/
public static function makeInsecureEmailChangeStrategy(SettingsForm $form)
{
return Yii::createObject(static::$map[MailChangeStrategyInterface::TYPE_INSECURE], [$form]);
return Yii::$container->get(static::$map[MailChangeStrategyInterface::TYPE_INSECURE], [$form]);
}
/**
@ -62,6 +62,6 @@ class EmailChangeStrategyFactory
*/
public static function makeSecureEmailChangeStrategy(SettingsForm $form)
{
return Yii::createObject(static::$map[MailChangeStrategyInterface::TYPE_SECURE], [$form]);
return Yii::$container->get(static::$map[MailChangeStrategyInterface::TYPE_SECURE], [$form]);
}
}

2
lib/User/Factory/MailFactory.php
View File

@ -109,6 +109,6 @@ class MailFactory
*/
public static function makeMailerService($from, $to, $subject, $view, array $params = [])
{
return Yii::$container->get(MailService::class, [$from, $to, $subject, $view, $params]);
return Yii::$container->get(MailService::class, [$from, $to, $subject, $view, $params, Yii::$app->getMailer()]);
}
}

2
lib/User/Factory/TokenFactory.php
View File

@ -73,7 +73,7 @@ class TokenFactory
*/
protected static function make($userId, $type)
{
return Yii::$container->get(Token::class, ['user_id' => $userId, 'type' => $type]);
return Yii::createObject(['class' => Token::class, 'user_id' => $userId, 'type' => $type]);
}
}