fix formatting
This commit is contained in:
@ -1,4 +1,5 @@
|
||||
<?php
|
||||
|
||||
namespace Da\User\Factory;
|
||||
|
||||
use Yii;
|
||||
@ -9,7 +10,7 @@ class AuthItemFactory
|
||||
{
|
||||
protected static $map = [
|
||||
Item::TYPE_ROLE => 'makeRole',
|
||||
Item::TYPE_PERMISSION => 'makePermission'
|
||||
Item::TYPE_PERMISSION => 'makePermission',
|
||||
];
|
||||
|
||||
/**
|
||||
@ -37,6 +38,7 @@ class AuthItemFactory
|
||||
* @param $name
|
||||
*
|
||||
* @return \yii\rbac\Role|\yii\rbac\Permission
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public static function makeByType($type, $name)
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<?php
|
||||
|
||||
namespace Da\User\Factory;
|
||||
|
||||
use Da\User\Contracts\MailChangeStrategyInterface;
|
||||
use Da\User\Contracts\StrategyInterface;
|
||||
use Da\User\Form\SettingsForm;
|
||||
use Da\User\Strategy\DefaultEmailChangeStrategy;
|
||||
use Da\User\Strategy\InsecureEmailChangeStrategy;
|
||||
@ -12,11 +12,10 @@ use Exception;
|
||||
|
||||
class EmailChangeStrategyFactory
|
||||
{
|
||||
|
||||
protected static $map = [
|
||||
MailChangeStrategyInterface::TYPE_INSECURE => InsecureEmailChangeStrategy::class,
|
||||
MailChangeStrategyInterface::TYPE_DEFAULT => DefaultEmailChangeStrategy::class,
|
||||
MailChangeStrategyInterface::TYPE_SECURE => SecureEmailChangeStrategy::class
|
||||
MailChangeStrategyInterface::TYPE_SECURE => SecureEmailChangeStrategy::class,
|
||||
];
|
||||
|
||||
/**
|
||||
@ -24,6 +23,7 @@ class EmailChangeStrategyFactory
|
||||
* @param SettingsForm $form
|
||||
*
|
||||
* @return MailChangeStrategyInterface
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public static function makeByStrategyType($strategy, SettingsForm $form)
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
<?php
|
||||
|
||||
namespace Da\User\Factory;
|
||||
|
||||
use Da\User\Model\Token;
|
||||
@ -25,7 +26,7 @@ class MailFactory
|
||||
'user' => $user,
|
||||
'token' => null,
|
||||
'module' => $module,
|
||||
'showPassword' => false
|
||||
'showPassword' => false,
|
||||
];
|
||||
|
||||
return static::makeMailerService($from, $to, $subject, 'welcome', $params);
|
||||
@ -33,7 +34,7 @@ class MailFactory
|
||||
|
||||
/**
|
||||
* @param string $email
|
||||
* @param Token $token
|
||||
* @param Token $token
|
||||
*
|
||||
* @return MailService
|
||||
*/
|
||||
@ -46,14 +47,14 @@ class MailFactory
|
||||
$subject = $module->mailParams['recoveryMailSubject'];
|
||||
$params = [
|
||||
'user' => $token && $token->user ? $token->user : null,
|
||||
'token' => $token
|
||||
'token' => $token,
|
||||
];
|
||||
|
||||
return static::makeMailerService($from, $to, $subject, 'recovery', $params);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param User $user
|
||||
* @param User $user
|
||||
* @param Token|null $token
|
||||
*
|
||||
* @return MailService
|
||||
@ -67,19 +68,20 @@ class MailFactory
|
||||
$subject = $module->mailParams['confirmationMailSubject'];
|
||||
$params = [
|
||||
'user' => $token && $token->user ? $token->user : null,
|
||||
'token' => $token
|
||||
'token' => $token,
|
||||
];
|
||||
|
||||
return static::makeMailerService($from, $to, $subject, 'recovery', $params);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param User $user
|
||||
* @param User $user
|
||||
* @param Token $token
|
||||
*
|
||||
* @return MailService
|
||||
*/
|
||||
public static function makeReconfirmationMailerService(User $user, Token $token) {
|
||||
public static function makeReconfirmationMailerService(User $user, Token $token)
|
||||
{
|
||||
/** @var Module $module */
|
||||
$module = Yii::$app->getModule('user');
|
||||
$to = $token->type === Token::TYPE_CONFIRM_NEW_EMAIL
|
||||
@ -90,20 +92,20 @@ class MailFactory
|
||||
$subject = $module->mailParams['reconfirmationMailSubject'];
|
||||
$params = [
|
||||
'user' => $token && $token->user ? $token->user : null,
|
||||
'token' => $token
|
||||
'token' => $token,
|
||||
];
|
||||
|
||||
return static::makeMailerService($from, $to, $subject, 'recovery', $params);
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds a MailerService
|
||||
* Builds a MailerService.
|
||||
*
|
||||
* @param string $from
|
||||
* @param string $to
|
||||
* @param string $subject
|
||||
* @param string $view
|
||||
* @param array $params
|
||||
* @param array $params
|
||||
*
|
||||
* @return MailService
|
||||
*/
|
||||
|
||||
@ -1,13 +1,12 @@
|
||||
<?php
|
||||
|
||||
namespace Da\User\Factory;
|
||||
|
||||
use Da\User\Model\Token;
|
||||
use Yii;
|
||||
|
||||
|
||||
class TokenFactory
|
||||
{
|
||||
|
||||
/**
|
||||
* @param $userId
|
||||
*
|
||||
@ -20,7 +19,6 @@ class TokenFactory
|
||||
$token->save(false);
|
||||
|
||||
return $token;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@ -75,5 +73,4 @@ class TokenFactory
|
||||
{
|
||||
return Yii::createObject(['class' => Token::class, 'user_id' => $userId, 'type' => $type]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user