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

fix bootstrap

Browse Source
This commit is contained in:
Antonio Ramirez
2016-12-14 02:35:05 +01:00
parent 9f1a60b542
commit f3f4b31bb4
1 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/User/Bootstrap.php
View File

@ -83,6 +83,8 @@ class Bootstrap implements BootstrapInterface
$di->set(Service\UserCreateService::class); $di->set(Service\UserCreateService::class);
$di->set(Service\UserRegisterService::class); $di->set(Service\UserRegisterService::class);
$di->set(Service\UserConfirmationService::class); $di->set(Service\UserConfirmationService::class);
$di->set(Service\AuthItemEditionService::class);
$di->set(Service\UpdateAuthAssignmentsService::class);
// email change strategy // email change strategy
$di->set(Strategy\DefaultEmailChangeStrategy::class); $di->set(Strategy\DefaultEmailChangeStrategy::class);
@ -111,11 +113,18 @@ class Bootstrap implements BootstrapInterface
} }
$di->setSingleton(ClassMapHelper::class, ClassMapHelper::class, [$modelClassMap]); $di->setSingleton(ClassMapHelper::class, ClassMapHelper::class, [$modelClassMap]);
// search class // search classes
$di->set(Search\UserSearch::class, [$di->get(Query\UserQuery::class)]); if (!$di->has(Search\UserSearch::class)) {
$di->set(Search\UserSearch::class, [$di->get(Query\UserQuery::class)]);
}
if (!$di->has(Search\PermissionSearch::class)) {
$di->set(Search\PermissionSearch::class);
}
if (!$di->has(Search\RoleSearch::class)) {
$di->set(Search\RoleSearch::class);
}
if ($app instanceof WebApplication) { if ($app instanceof WebApplication) {
// override Yii // override Yii
$di->set( $di->set(
'yii\web\User', 'yii\web\User',
@ -152,7 +161,7 @@ class Bootstrap implements BootstrapInterface
* *
* @param Application $app * @param Application $app
*/ */
protected function initAuthModule(Application $app) protected function initAuthManager(Application $app)
{ {
if (!($app->getAuthManager() instanceof AuthManagerInterface)) { if (!($app->getAuthManager() instanceof AuthManagerInterface)) {
$app->set( $app->set(
@ -256,8 +265,13 @@ class Bootstrap implements BootstrapInterface
'SocialNetworkAccount' => 'Da\User\Model\SocialNetworkAccount', 'SocialNetworkAccount' => 'Da\User\Model\SocialNetworkAccount',
'Profile' => 'Da\User\Model\Profile', 'Profile' => 'Da\User\Model\Profile',
'Token' => 'Da\User\Model\Token', 'Token' => 'Da\User\Model\Token',
'Assignment' => 'Da\User\Model\Assignment',
'Permission' => 'Da\User\Model\Permission',
'Role' => 'Da\User\Model\Role',
// --- search // --- search
'UserSearch' => 'Da\User\Search\UserSearch', 'UserSearch' => 'Da\User\Search\UserSearch',
'PermissionSearch' => 'Da\User\Search\PermissionSearch',
'RoleSearch' => 'Da\User\Search\RoleSearch',
// --- forms // --- forms
'RegistrationForm' => 'Da\User\Form\RegistrationForm', 'RegistrationForm' => 'Da\User\Form\RegistrationForm',
'ResendForm' => 'Da\User\Form\ResendForm', 'ResendForm' => 'Da\User\Form\ResendForm',
@ -271,10 +285,15 @@ class Bootstrap implements BootstrapInterface
'User', 'User',
'SocialNetworkAccount', 'SocialNetworkAccount',
'Profile', 'Profile',
'Token' 'Token',
'Assignment',
'Permission',
'Role'
], ],
'Da\User\Search' => [ 'Da\User\Search' => [
'UserSearch' 'UserSearch',
'PermissionSearch',
'RoleSearch'
], ],
'Da\UserForm' => [ 'Da\UserForm' => [
'RegistrationForm', 'RegistrationForm',