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

Close #109 provide better error classes + phpdoc fixes

Browse Source
This commit is contained in:
Antonio Ramirez
2017-11-12 23:13:42 +01:00
parent c418ad967c
commit 83458a13e4
26 changed files with 109 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/User/Form/SettingsForm.php
View File

@ -18,7 +18,9 @@ use Da\User\Traits\ContainerAwareTrait;
use Da\User\Traits\ModuleAwareTrait;
use Yii;
use yii\base\InvalidConfigException;
use yii\base\InvalidParamException;
use yii\base\Model;
use yii\helpers\ArrayHelper;
class SettingsForm extends Model
{
@ -49,19 +51,28 @@ class SettingsForm extends Model
/** @var User */
protected $user;
/**
* SettingsForm constructor.
*
* @param SecurityHelper $securityHelper
* @param array $config
*/
public function __construct(SecurityHelper $securityHelper, array $config = [])
{
$this->securityHelper = $securityHelper;
$config = [
'username' => $this->getUser()->username,
'email' => $this->getUser()->unconfirmed_email? : $this->getUser()->email
];
$config = ArrayHelper::merge(
[
'username' => $this->getUser()->username,
'email' => $this->getUser()->unconfirmed_email ?: $this->getUser()->email
],
$config
);
parent::__construct($config);
}
/**
* @throws InvalidConfigException
* @throws \Exception
* @throws InvalidParamException
* @return array
*
*/