From 1c1ce6ccff4198dbc3bd943c81adb1e2c5bbed99 Mon Sep 17 00:00:00 2001 From: Leonardo Forconi Date: Wed, 15 Oct 2025 10:22:32 +0200 Subject: [PATCH] refactor: renamed namespace from Da\User to pcrt\User All PHP namespaces and related references have been updated from Da\User to pcrt\User throughout the codebase, including composer.json autoload settings and all source files. This change standardizes the project under the new pcrt\User namespace for improved clarity and maintainability. --- composer.json | 6 +- src/User/AuthClient/Facebook.php | 6 +- src/User/AuthClient/GitHub.php | 6 +- src/User/AuthClient/Google.php | 6 +- src/User/AuthClient/Keycloak.php | 4 +- src/User/AuthClient/LinkedIn.php | 6 +- src/User/AuthClient/Microsoft365.php | 6 +- src/User/AuthClient/Twitter.php | 6 +- src/User/AuthClient/VKontakte.php | 6 +- src/User/AuthClient/Yandex.php | 6 +- src/User/Bootstrap.php | 68 +++++++++---------- src/User/Command/ConfirmController.php | 8 +-- src/User/Command/CreateController.php | 10 +-- src/User/Command/DeleteController.php | 4 +- src/User/Command/PasswordController.php | 10 +-- src/User/Component/AuthDbManagerComponent.php | 4 +- src/User/Component/ReCaptchaComponent.php | 2 +- src/User/Contracts/AuthClientInterface.php | 2 +- src/User/Contracts/AuthManagerInterface.php | 2 +- .../Contracts/MailChangeStrategyInterface.php | 2 +- src/User/Contracts/ServiceInterface.php | 2 +- src/User/Contracts/StrategyInterface.php | 2 +- src/User/Contracts/ValidatorInterface.php | 2 +- .../Controller/AbstractAuthItemController.php | 16 ++--- src/User/Controller/AdminController.php | 38 +++++------ src/User/Controller/PermissionController.php | 6 +- src/User/Controller/ProfileController.php | 56 +++++++-------- src/User/Controller/RecoveryController.php | 28 ++++---- .../Controller/RegistrationController.php | 40 +++++------ src/User/Controller/RoleController.php | 6 +- src/User/Controller/RuleController.php | 16 ++--- src/User/Controller/SecurityController.php | 26 +++---- .../Controller/api/v1/AdminController.php | 30 ++++---- src/User/Event/FormEvent.php | 2 +- src/User/Event/GdprEvent.php | 4 +- src/User/Event/MailEvent.php | 6 +- src/User/Event/ProfileEvent.php | 4 +- src/User/Event/ResetPasswordEvent.php | 6 +- src/User/Event/SessionEvent.php | 4 +- src/User/Event/SocialNetworkAuthEvent.php | 4 +- src/User/Event/SocialNetworkConnectEvent.php | 6 +- src/User/Event/UserEvent.php | 4 +- src/User/Factory/AuthItemFactory.php | 2 +- .../Factory/EmailChangeStrategyFactory.php | 12 ++-- src/User/Factory/MailFactory.php | 12 ++-- src/User/Factory/TokenFactory.php | 4 +- src/User/Filter/AccessRuleFilter.php | 6 +- src/User/Filter/PasswordAgeEnforceFilter.php | 6 +- .../TwoFactorAuthenticationEnforceFilter.php | 8 +-- src/User/Form/GdprDeleteForm.php | 10 +-- src/User/Form/LoginForm.php | 20 +++--- src/User/Form/RecoveryForm.php | 6 +- src/User/Form/RegistrationForm.php | 8 +-- src/User/Form/ResendForm.php | 4 +- src/User/Form/SettingsForm.php | 12 ++-- src/User/Helper/AuthHelper.php | 8 +-- src/User/Helper/ClassMapHelper.php | 2 +- src/User/Helper/GravatarHelper.php | 2 +- src/User/Helper/MigrationHelper.php | 2 +- src/User/Helper/SecurityHelper.php | 2 +- src/User/Helper/TimezoneHelper.php | 2 +- ...00_000001_create_session_history_table.php | 4 +- .../m000000_000001_create_user_table.php | 4 +- .../m000000_000002_create_profile_table.php | 4 +- ...000_000003_create_social_account_table.php | 4 +- .../m000000_000004_create_token_table.php | 4 +- .../m000000_000005_add_last_login_at.php | 2 +- .../m000000_000006_add_two_factor_fields.php | 4 +- ...0000_000007_enable_password_expiration.php | 2 +- .../m000000_000008_add_last_login_ip.php | 2 +- ...m000000_000009_add_gdpr_consent_fields.php | 4 +- ..._tf_mobile_phone_columns_to_user_table.php | 2 +- src/User/Model/AbstractAuthItem.php | 8 +-- src/User/Model/Assignment.php | 6 +- src/User/Model/Permission.php | 2 +- src/User/Model/Profile.php | 12 ++-- src/User/Model/Role.php | 2 +- src/User/Model/Rule.php | 8 +-- src/User/Model/SessionHistory.php | 8 +-- src/User/Model/SocialNetworkAccount.php | 8 +-- src/User/Model/Token.php | 10 +-- src/User/Model/User.php | 10 +-- src/User/Module.php | 14 ++-- src/User/Query/ProfileQuery.php | 2 +- src/User/Query/SessionHistoryCondition.php | 4 +- src/User/Query/SessionHistoryQuery.php | 4 +- src/User/Query/SocialNetworkAccountQuery.php | 4 +- src/User/Query/TokenQuery.php | 4 +- src/User/Query/UserQuery.php | 2 +- src/User/Search/AbstractAuthItemSearch.php | 6 +- src/User/Search/PermissionSearch.php | 2 +- src/User/Search/RoleSearch.php | 2 +- src/User/Search/RuleSearch.php | 6 +- src/User/Search/SessionHistorySearch.php | 6 +- src/User/Search/UserSearch.php | 8 +-- .../Service/AccountConfirmationService.php | 10 +-- src/User/Service/AuthItemEditionService.php | 12 ++-- src/User/Service/AuthRuleEditionService.php | 10 +-- src/User/Service/EmailChangeService.php | 16 ++--- src/User/Service/MailService.php | 6 +- src/User/Service/PasswordExpireService.php | 6 +- src/User/Service/PasswordRecoveryService.php | 14 ++-- .../Service/ResendConfirmationService.php | 10 +-- src/User/Service/ResetPasswordService.php | 8 +-- .../DBTerminateSessionsService.php | 2 +- .../SessionHistoryDecorator.php | 10 +-- .../TerminateSessionsService.php | 2 +- .../TerminateSessionsServiceInterface.php | 4 +- .../TerminateUserSessionsService.php | 14 ++-- .../SocialNetworkAccountConnectService.php | 18 ++--- .../SocialNetworkAuthenticateService.php | 20 +++--- src/User/Service/SwitchIdentityService.php | 16 ++--- .../TwoFactorEmailCodeGeneratorService.php | 10 +-- .../TwoFactorQrCodeUriGeneratorService.php | 12 ++-- .../TwoFactorSmsCodeGeneratorService.php | 10 +-- .../Service/UpdateAuthAssignmentsService.php | 8 +-- src/User/Service/UserBlockService.php | 14 ++-- src/User/Service/UserConfirmationService.php | 10 +-- src/User/Service/UserCreateService.php | 14 ++-- src/User/Service/UserRegisterService.php | 16 ++--- .../Strategy/DefaultEmailChangeStrategy.php | 12 ++-- .../Strategy/InsecureEmailChangeStrategy.php | 6 +- .../Strategy/SecureEmailChangeStrategy.php | 14 ++-- src/User/Traits/AuthClientUserIdTrait.php | 4 +- src/User/Traits/AuthManagerAwareTrait.php | 4 +- src/User/Traits/ContainerAwareTrait.php | 14 ++-- src/User/Traits/MailAwareTrait.php | 8 +-- src/User/Traits/ModuleAwareTrait.php | 4 +- .../Validator/AjaxRequestModelValidator.php | 4 +- src/User/Validator/RbacItemsValidator.php | 4 +- .../Validator/RbacRuleExistsValidator.php | 4 +- src/User/Validator/RbacRuleNameValidator.php | 4 +- src/User/Validator/RbacRuleValidator.php | 4 +- src/User/Validator/ReCaptchaValidator.php | 4 +- src/User/Validator/TimeZoneValidator.php | 4 +- src/User/Validator/TwoFactorCodeValidator.php | 14 ++-- .../Validator/TwoFactorEmailValidator.php | 10 +-- .../TwoFactorTextMessageValidator.php | 10 +-- src/User/Widget/AssignmentsWidget.php | 10 +-- src/User/Widget/ConnectWidget.php | 2 +- src/User/Widget/LoginWidget.php | 6 +- src/User/Widget/ReCaptchaWidget.php | 2 +- src/User/Widget/SessionStatusWidget.php | 8 +-- src/User/resources/views/admin/_account.php | 4 +- .../resources/views/admin/_assignments.php | 6 +- src/User/resources/views/admin/_info.php | 4 +- src/User/resources/views/admin/_profile.php | 6 +- .../views/admin/_session-history.php | 10 +-- src/User/resources/views/admin/_user.php | 2 +- src/User/resources/views/admin/create.php | 2 +- src/User/resources/views/admin/index.php | 4 +- src/User/resources/views/admin/update.php | 4 +- .../resources/views/mail/confirmation.php | 4 +- .../resources/views/mail/reconfirmation.php | 2 +- src/User/resources/views/mail/recovery.php | 4 +- .../views/mail/text/confirmation.php | 2 +- .../views/mail/text/reconfirmation.php | 2 +- .../resources/views/mail/text/recovery.php | 2 +- .../resources/views/mail/text/welcome.php | 6 +- .../resources/views/mail/twofactorcode.php | 2 +- src/User/resources/views/mail/welcome.php | 6 +- src/User/resources/views/permission/_form.php | 2 +- .../resources/views/permission/create.php | 4 +- src/User/resources/views/permission/index.php | 4 +- .../resources/views/permission/update.php | 4 +- src/User/resources/views/profile/_menu.php | 22 +++--- src/User/resources/views/profile/account.php | 4 +- .../resources/views/profile/gdpr-delete.php | 2 +- src/User/resources/views/profile/networks.php | 4 +- src/User/resources/views/profile/privacy.php | 2 +- src/User/resources/views/profile/profile.php | 4 +- .../views/profile/session-history.php | 6 +- .../resources/views/profile/two-factor.php | 2 +- src/User/resources/views/recovery/request.php | 2 +- src/User/resources/views/recovery/reset.php | 2 +- .../resources/views/registration/connect.php | 4 +- .../resources/views/registration/register.php | 6 +- .../resources/views/registration/resend.php | 2 +- src/User/resources/views/role/_form.php | 4 +- src/User/resources/views/role/create.php | 4 +- src/User/resources/views/role/index.php | 4 +- src/User/resources/views/role/update.php | 4 +- src/User/resources/views/rule/_form.php | 2 +- src/User/resources/views/rule/create.php | 4 +- src/User/resources/views/rule/index.php | 4 +- src/User/resources/views/rule/update.php | 4 +- src/User/resources/views/security/confirm.php | 6 +- src/User/resources/views/security/login.php | 6 +- src/User/resources/views/shared/_alert.php | 2 +- src/User/resources/views/shared/message.php | 2 +- .../views/widgets/assignments/form.php | 2 +- .../resources/views/widgets/login/form.php | 2 +- tests/_app/config/console.php | 6 +- tests/_app/config/test.php | 8 +-- tests/_app/controllers/SiteController.php | 2 +- tests/_fixtures/AssignmentFixture.php | 2 +- tests/_fixtures/PermissionFixture.php | 2 +- tests/_fixtures/ProfileFixture.php | 2 +- tests/_fixtures/TokenFixture.php | 2 +- tests/_fixtures/UserFixture.php | 2 +- tests/_fixtures/data/token.php | 2 +- tests/functional/GdprCest.php | 6 +- tests/functional/ProfileCept.php | 8 +-- tests/functional/RecoveryCept.php | 4 +- tests/functional/RegistrationCest.php | 6 +- tests/functional/SettingsCept.php | 6 +- tests/unit/GeneratePasswordTest.php | 2 +- tests/unit/TimeZoneTest.php | 4 +- 208 files changed, 736 insertions(+), 734 deletions(-) diff --git a/composer.json b/composer.json index 9f4428f..3890aa5 100644 --- a/composer.json +++ b/composer.json @@ -70,12 +70,12 @@ }, "autoload": { "psr-4": { - "Da\\User\\": "./src/User" + "pcrt\\User\\": "./src/User" } }, "autoload-dev": { "psr-4": { - "Da\\User\\": "./src/User" + "pcrt\\User\\": "./src/User" } }, "config": { @@ -97,7 +97,7 @@ "dektrium/yii2-user": "*" }, "extra": { - "bootstrap": "Da\\User\\Bootstrap" + "bootstrap": "pcrt\\User\\Bootstrap" }, "repositories": [ { diff --git a/src/User/AuthClient/Facebook.php b/src/User/AuthClient/Facebook.php index 6a2cf7e..6c8de9e 100644 --- a/src/User/AuthClient/Facebook.php +++ b/src/User/AuthClient/Facebook.php @@ -9,10 +9,10 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\AuthClient; +namespace pcrt\User\AuthClient; -use Da\User\Contracts\AuthClientInterface; -use Da\User\Traits\AuthClientUserIdTrait; +use pcrt\User\Contracts\AuthClientInterface; +use pcrt\User\Traits\AuthClientUserIdTrait; use yii\authclient\clients\Facebook as BaseFacebook; class Facebook extends BaseFacebook implements AuthClientInterface diff --git a/src/User/AuthClient/GitHub.php b/src/User/AuthClient/GitHub.php index 19ccae6..b9d8a36 100644 --- a/src/User/AuthClient/GitHub.php +++ b/src/User/AuthClient/GitHub.php @@ -9,10 +9,10 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\AuthClient; +namespace pcrt\User\AuthClient; -use Da\User\Contracts\AuthClientInterface; -use Da\User\Traits\AuthClientUserIdTrait; +use pcrt\User\Contracts\AuthClientInterface; +use pcrt\User\Traits\AuthClientUserIdTrait; use yii\authclient\clients\GitHub as BaseGitHub; class GitHub extends BaseGitHub implements AuthClientInterface diff --git a/src/User/AuthClient/Google.php b/src/User/AuthClient/Google.php index 13fb6fe..4cadfb4 100644 --- a/src/User/AuthClient/Google.php +++ b/src/User/AuthClient/Google.php @@ -9,10 +9,10 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\AuthClient; +namespace pcrt\User\AuthClient; -use Da\User\Contracts\AuthClientInterface; -use Da\User\Traits\AuthClientUserIdTrait; +use pcrt\User\Contracts\AuthClientInterface; +use pcrt\User\Traits\AuthClientUserIdTrait; use yii\authclient\clients\Google as BaseGoogle; class Google extends BaseGoogle implements AuthClientInterface diff --git a/src/User/AuthClient/Keycloak.php b/src/User/AuthClient/Keycloak.php index 78943dc..302fbf9 100644 --- a/src/User/AuthClient/Keycloak.php +++ b/src/User/AuthClient/Keycloak.php @@ -1,8 +1,8 @@ set( - "Da\\User\\Query\\{$name}Query", + "pcrt\\User\\Query\\{$name}Query", function () use ($model) { return $model::find(); } @@ -171,13 +171,13 @@ class Bootstrap implements BootstrapInterface $defaultTwoFactorAuthenticationValidators = [ 'google-authenticator' => [ - 'class' => \Da\User\Validator\TwoFactorCodeValidator::class, + 'class' => \pcrt\User\Validator\TwoFactorCodeValidator::class, 'description' => Yii::t('usuario', 'Google Authenticator'), 'configurationUrl' => 'user/settings/two-factor', 'enabled' => true ], 'email' => [ - 'class' => \Da\User\Validator\TwoFactorEmailValidator::class, + 'class' => \pcrt\User\Validator\TwoFactorEmailValidator::class, 'description' => Yii::t('usuario', 'Email'), 'configurationUrl' => 'user/settings/two-factor-email', // Time duration of the code in seconds @@ -185,7 +185,7 @@ class Bootstrap implements BootstrapInterface 'enabled' => true ], 'sms' => [ - 'class' => \Da\User\Validator\TwoFactorTextMessageValidator::class, + 'class' => \pcrt\User\Validator\TwoFactorTextMessageValidator::class, 'description' => Yii::t('usuario', 'Text message'), 'configurationUrl' => 'user/settings/two-factor-sms', // component for sending sms @@ -373,31 +373,31 @@ class Bootstrap implements BootstrapInterface $defaults = [ // --- models - 'User' => 'Da\User\Model\User', - 'SocialNetworkAccount' => 'Da\User\Model\SocialNetworkAccount', - 'Profile' => 'Da\User\Model\Profile', - 'Token' => 'Da\User\Model\Token', - 'Assignment' => 'Da\User\Model\Assignment', - 'Permission' => 'Da\User\Model\Permission', - 'Role' => 'Da\User\Model\Role', + 'User' => 'pcrt\User\Model\User', + 'SocialNetworkAccount' => 'pcrt\User\Model\SocialNetworkAccount', + 'Profile' => 'pcrt\User\Model\Profile', + 'Token' => 'pcrt\User\Model\Token', + 'Assignment' => 'pcrt\User\Model\Assignment', + 'Permission' => 'pcrt\User\Model\Permission', + 'Role' => 'pcrt\User\Model\Role', 'SessionHistory' => SessionHistory::class, // --- search - 'UserSearch' => 'Da\User\Search\UserSearch', - 'PermissionSearch' => 'Da\User\Search\PermissionSearch', - 'RoleSearch' => 'Da\User\Search\RoleSearch', + 'UserSearch' => 'pcrt\User\Search\UserSearch', + 'PermissionSearch' => 'pcrt\User\Search\PermissionSearch', + 'RoleSearch' => 'pcrt\User\Search\RoleSearch', 'SessionHistorySearch' => SessionHistorySearch::class, // --- forms - 'RegistrationForm' => 'Da\User\Form\RegistrationForm', - 'ResendForm' => 'Da\User\Form\ResendForm', - 'LoginForm' => 'Da\User\Form\LoginForm', - 'SettingsForm' => 'Da\User\Form\SettingsForm', - 'RecoveryForm' => 'Da\User\Form\RecoveryForm', + 'RegistrationForm' => 'pcrt\User\Form\RegistrationForm', + 'ResendForm' => 'pcrt\User\Form\ResendForm', + 'LoginForm' => 'pcrt\User\Form\LoginForm', + 'SettingsForm' => 'pcrt\User\Form\SettingsForm', + 'RecoveryForm' => 'pcrt\User\Form\RecoveryForm', // --- services - 'MailService' => 'Da\User\Service\MailService', + 'MailService' => 'pcrt\User\Service\MailService', ]; $routes = [ - 'Da\User\Model' => [ + 'pcrt\User\Model' => [ 'User', 'SocialNetworkAccount', 'Profile', @@ -409,7 +409,7 @@ class Bootstrap implements BootstrapInterface 'AbstractAuthItem', 'Rule', ], - 'Da\User\Search' => [ + 'pcrt\User\Search' => [ 'UserSearch', 'PermissionSearch', 'RoleSearch', @@ -417,7 +417,7 @@ class Bootstrap implements BootstrapInterface 'RuleSearch', 'AbstractAuthItemSearch', ], - 'Da\User\Form' => [ + 'pcrt\User\Form' => [ 'RegistrationForm', 'ResendForm', 'LoginForm', @@ -425,7 +425,7 @@ class Bootstrap implements BootstrapInterface 'RecoveryForm', 'GdprDeleteForm', ], - 'Da\User\Service' => [ + 'pcrt\User\Service' => [ 'AccountConfirmationService', 'AuthItemEditionService', 'AuthRuleEditionService', @@ -447,7 +447,7 @@ class Bootstrap implements BootstrapInterface 'UserCreateService', 'UserRegisterService', ], - 'Da\User\Helper' => [ + 'pcrt\User\Helper' => [ 'AuthHelper', 'ClassMapHelper', 'MigrationHelper', diff --git a/src/User/Command/ConfirmController.php b/src/User/Command/ConfirmController.php index f0e5978..a5cccac 100644 --- a/src/User/Command/ConfirmController.php +++ b/src/User/Command/ConfirmController.php @@ -9,11 +9,11 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Command; +namespace pcrt\User\Command; -use Da\User\Query\UserQuery; -use Da\User\Service\UserConfirmationService; -use Da\User\Traits\ContainerAwareTrait; +use pcrt\User\Query\UserQuery; +use pcrt\User\Service\UserConfirmationService; +use pcrt\User\Traits\ContainerAwareTrait; use Yii; use yii\base\Module; use yii\console\Controller; diff --git a/src/User/Command/CreateController.php b/src/User/Command/CreateController.php index 0af7d66..7eaf6f6 100644 --- a/src/User/Command/CreateController.php +++ b/src/User/Command/CreateController.php @@ -9,12 +9,12 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Command; +namespace pcrt\User\Command; -use Da\User\Factory\MailFactory; -use Da\User\Model\User; -use Da\User\Service\UserCreateService; -use Da\User\Traits\ContainerAwareTrait; +use pcrt\User\Factory\MailFactory; +use pcrt\User\Model\User; +use pcrt\User\Service\UserCreateService; +use pcrt\User\Traits\ContainerAwareTrait; use Yii; use yii\console\Controller; use yii\helpers\Console; diff --git a/src/User/Command/DeleteController.php b/src/User/Command/DeleteController.php index 50e4621..c4a5caa 100644 --- a/src/User/Command/DeleteController.php +++ b/src/User/Command/DeleteController.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Command; +namespace pcrt\User\Command; -use Da\User\Query\UserQuery; +use pcrt\User\Query\UserQuery; use Throwable; use Yii; use yii\base\Module; diff --git a/src/User/Command/PasswordController.php b/src/User/Command/PasswordController.php index 9e97fcb..587a31a 100644 --- a/src/User/Command/PasswordController.php +++ b/src/User/Command/PasswordController.php @@ -9,12 +9,12 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Command; +namespace pcrt\User\Command; -use Da\User\Model\User; -use Da\User\Query\UserQuery; -use Da\User\Service\ResetPasswordService; -use Da\User\Traits\ContainerAwareTrait; +use pcrt\User\Model\User; +use pcrt\User\Query\UserQuery; +use pcrt\User\Service\ResetPasswordService; +use pcrt\User\Traits\ContainerAwareTrait; use Yii; use yii\base\InvalidConfigException; use yii\base\Module; diff --git a/src/User/Component/AuthDbManagerComponent.php b/src/User/Component/AuthDbManagerComponent.php index b2ddf75..b2319e0 100644 --- a/src/User/Component/AuthDbManagerComponent.php +++ b/src/User/Component/AuthDbManagerComponent.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Component; +namespace pcrt\User\Component; -use Da\User\Contracts\AuthManagerInterface; +use pcrt\User\Contracts\AuthManagerInterface; use yii\base\InvalidArgumentException; use yii\db\Expression; use yii\db\Query; diff --git a/src/User/Component/ReCaptchaComponent.php b/src/User/Component/ReCaptchaComponent.php index 3853105..4858fbe 100644 --- a/src/User/Component/ReCaptchaComponent.php +++ b/src/User/Component/ReCaptchaComponent.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Component; +namespace pcrt\User\Component; use Yii; use yii\base\Component; diff --git a/src/User/Contracts/AuthClientInterface.php b/src/User/Contracts/AuthClientInterface.php index 84e284b..d1fbe28 100644 --- a/src/User/Contracts/AuthClientInterface.php +++ b/src/User/Contracts/AuthClientInterface.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Contracts; +namespace pcrt\User\Contracts; use yii\authclient\ClientInterface; diff --git a/src/User/Contracts/AuthManagerInterface.php b/src/User/Contracts/AuthManagerInterface.php index 915d911..dd83d99 100644 --- a/src/User/Contracts/AuthManagerInterface.php +++ b/src/User/Contracts/AuthManagerInterface.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Contracts; +namespace pcrt\User\Contracts; use yii\rbac\ManagerInterface; diff --git a/src/User/Contracts/MailChangeStrategyInterface.php b/src/User/Contracts/MailChangeStrategyInterface.php index f1e1ff9..ffe9298 100644 --- a/src/User/Contracts/MailChangeStrategyInterface.php +++ b/src/User/Contracts/MailChangeStrategyInterface.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Contracts; +namespace pcrt\User\Contracts; interface MailChangeStrategyInterface extends StrategyInterface { diff --git a/src/User/Contracts/ServiceInterface.php b/src/User/Contracts/ServiceInterface.php index e31c053..1a4517e 100644 --- a/src/User/Contracts/ServiceInterface.php +++ b/src/User/Contracts/ServiceInterface.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Contracts; +namespace pcrt\User\Contracts; interface ServiceInterface { diff --git a/src/User/Contracts/StrategyInterface.php b/src/User/Contracts/StrategyInterface.php index 56fe3cc..22b5179 100644 --- a/src/User/Contracts/StrategyInterface.php +++ b/src/User/Contracts/StrategyInterface.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Contracts; +namespace pcrt\User\Contracts; interface StrategyInterface { diff --git a/src/User/Contracts/ValidatorInterface.php b/src/User/Contracts/ValidatorInterface.php index c79d700..81a7294 100644 --- a/src/User/Contracts/ValidatorInterface.php +++ b/src/User/Contracts/ValidatorInterface.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Contracts; +namespace pcrt\User\Contracts; interface ValidatorInterface { diff --git a/src/User/Controller/AbstractAuthItemController.php b/src/User/Controller/AbstractAuthItemController.php index 76b01af..386a8c0 100644 --- a/src/User/Controller/AbstractAuthItemController.php +++ b/src/User/Controller/AbstractAuthItemController.php @@ -9,15 +9,15 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Controller; +namespace pcrt\User\Controller; -use Da\User\Filter\AccessRuleFilter; -use Da\User\Helper\AuthHelper; -use Da\User\Model\AbstractAuthItem; -use Da\User\Module; -use Da\User\Service\AuthItemEditionService; -use Da\User\Traits\ContainerAwareTrait; -use Da\User\Validator\AjaxRequestModelValidator; +use pcrt\User\Filter\AccessRuleFilter; +use pcrt\User\Helper\AuthHelper; +use pcrt\User\Model\AbstractAuthItem; +use pcrt\User\Module; +use pcrt\User\Service\AuthItemEditionService; +use pcrt\User\Traits\ContainerAwareTrait; +use pcrt\User\Validator\AjaxRequestModelValidator; use Yii; use yii\filters\AccessControl; use yii\web\Controller; diff --git a/src/User/Controller/AdminController.php b/src/User/Controller/AdminController.php index dd56b13..f53f1d9 100755 --- a/src/User/Controller/AdminController.php +++ b/src/User/Controller/AdminController.php @@ -9,26 +9,26 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Controller; +namespace pcrt\User\Controller; -use Da\User\Event\UserEvent; -use Da\User\Factory\MailFactory; -use Da\User\Filter\AccessRuleFilter; -use Da\User\Model\Profile; -use Da\User\Model\User; -use Da\User\Query\UserQuery; -use Da\User\Search\SessionHistorySearch; -use Da\User\Search\UserSearch; -use Da\User\Service\PasswordExpireService; -use Da\User\Service\PasswordRecoveryService; -use Da\User\Service\SessionHistory\TerminateUserSessionsService; -use Da\User\Service\SwitchIdentityService; -use Da\User\Service\UserBlockService; -use Da\User\Service\UserConfirmationService; -use Da\User\Service\UserCreateService; -use Da\User\Traits\ContainerAwareTrait; -use Da\User\Traits\ModuleAwareTrait; -use Da\User\Validator\AjaxRequestModelValidator; +use pcrt\User\Event\UserEvent; +use pcrt\User\Factory\MailFactory; +use pcrt\User\Filter\AccessRuleFilter; +use pcrt\User\Model\Profile; +use pcrt\User\Model\User; +use pcrt\User\Query\UserQuery; +use pcrt\User\Search\SessionHistorySearch; +use pcrt\User\Search\UserSearch; +use pcrt\User\Service\PasswordExpireService; +use pcrt\User\Service\PasswordRecoveryService; +use pcrt\User\Service\SessionHistory\TerminateUserSessionsService; +use pcrt\User\Service\SwitchIdentityService; +use pcrt\User\Service\UserBlockService; +use pcrt\User\Service\UserConfirmationService; +use pcrt\User\Service\UserCreateService; +use pcrt\User\Traits\ContainerAwareTrait; +use pcrt\User\Traits\ModuleAwareTrait; +use pcrt\User\Validator\AjaxRequestModelValidator; use Yii; use yii\base\Module; use yii\db\ActiveRecord; diff --git a/src/User/Controller/PermissionController.php b/src/User/Controller/PermissionController.php index 40fd707..2de8fa0 100644 --- a/src/User/Controller/PermissionController.php +++ b/src/User/Controller/PermissionController.php @@ -9,10 +9,10 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Controller; +namespace pcrt\User\Controller; -use Da\User\Model\Permission; -use Da\User\Search\PermissionSearch; +use pcrt\User\Model\Permission; +use pcrt\User\Search\PermissionSearch; use yii\web\NotFoundHttpException; class PermissionController extends AbstractAuthItemController diff --git a/src/User/Controller/ProfileController.php b/src/User/Controller/ProfileController.php index 9d5e519..5ef7e1d 100644 --- a/src/User/Controller/ProfileController.php +++ b/src/User/Controller/ProfileController.php @@ -9,35 +9,35 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Controller; +namespace pcrt\User\Controller; -use Da\User\Contracts\MailChangeStrategyInterface; -use Da\User\Event\GdprEvent; -use Da\User\Event\ProfileEvent; -use Da\User\Event\SocialNetworkConnectEvent; -use Da\User\Event\UserEvent; -use Da\User\Form\GdprDeleteForm; -use Da\User\Form\SettingsForm; -use Da\User\Helper\SecurityHelper; -use Da\User\Model\Profile; -use Da\User\Model\SocialNetworkAccount; -use Da\User\Model\User; -use Da\User\Module; -use Da\User\Query\ProfileQuery; -use Da\User\Query\SocialNetworkAccountQuery; -use Da\User\Query\UserQuery; -use Da\User\Search\SessionHistorySearch; -use Da\User\Service\EmailChangeService; -use Da\User\Service\SessionHistory\TerminateUserSessionsService; -use Da\User\Service\TwoFactorEmailCodeGeneratorService; -use Da\User\Service\TwoFactorQrCodeUriGeneratorService; -use Da\User\Service\TwoFactorSmsCodeGeneratorService; -use Da\User\Traits\ContainerAwareTrait; -use Da\User\Traits\ModuleAwareTrait; -use Da\User\Validator\AjaxRequestModelValidator; -use Da\User\Validator\TwoFactorCodeValidator; -use Da\User\Validator\TwoFactorEmailValidator; -use Da\User\Validator\TwoFactorTextMessageValidator; +use pcrt\User\Contracts\MailChangeStrategyInterface; +use pcrt\User\Event\GdprEvent; +use pcrt\User\Event\ProfileEvent; +use pcrt\User\Event\SocialNetworkConnectEvent; +use pcrt\User\Event\UserEvent; +use pcrt\User\Form\GdprDeleteForm; +use pcrt\User\Form\SettingsForm; +use pcrt\User\Helper\SecurityHelper; +use pcrt\User\Model\Profile; +use pcrt\User\Model\SocialNetworkAccount; +use pcrt\User\Model\User; +use pcrt\User\Module; +use pcrt\User\Query\ProfileQuery; +use pcrt\User\Query\SocialNetworkAccountQuery; +use pcrt\User\Query\UserQuery; +use pcrt\User\Search\SessionHistorySearch; +use pcrt\User\Service\EmailChangeService; +use pcrt\User\Service\SessionHistory\TerminateUserSessionsService; +use pcrt\User\Service\TwoFactorEmailCodeGeneratorService; +use pcrt\User\Service\TwoFactorQrCodeUriGeneratorService; +use pcrt\User\Service\TwoFactorSmsCodeGeneratorService; +use pcrt\User\Traits\ContainerAwareTrait; +use pcrt\User\Traits\ModuleAwareTrait; +use pcrt\User\Validator\AjaxRequestModelValidator; +use pcrt\User\Validator\TwoFactorCodeValidator; +use pcrt\User\Validator\TwoFactorEmailValidator; +use pcrt\User\Validator\TwoFactorTextMessageValidator; use Yii; use yii\base\DynamicModel; use yii\base\InvalidParamException; diff --git a/src/User/Controller/RecoveryController.php b/src/User/Controller/RecoveryController.php index f02b217..efa6fb9 100644 --- a/src/User/Controller/RecoveryController.php +++ b/src/User/Controller/RecoveryController.php @@ -9,21 +9,21 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Controller; +namespace pcrt\User\Controller; -use Da\User\Event\FormEvent; -use Da\User\Event\ResetPasswordEvent; -use Da\User\Factory\MailFactory; -use Da\User\Form\RecoveryForm; -use Da\User\Model\Token; -use Da\User\Module; -use Da\User\Query\TokenQuery; -use Da\User\Query\UserQuery; -use Da\User\Service\PasswordRecoveryService; -use Da\User\Service\ResetPasswordService; -use Da\User\Traits\ContainerAwareTrait; -use Da\User\Traits\ModuleAwareTrait; -use Da\User\Validator\AjaxRequestModelValidator; +use pcrt\User\Event\FormEvent; +use pcrt\User\Event\ResetPasswordEvent; +use pcrt\User\Factory\MailFactory; +use pcrt\User\Form\RecoveryForm; +use pcrt\User\Model\Token; +use pcrt\User\Module; +use pcrt\User\Query\TokenQuery; +use pcrt\User\Query\UserQuery; +use pcrt\User\Service\PasswordRecoveryService; +use pcrt\User\Service\ResetPasswordService; +use pcrt\User\Traits\ContainerAwareTrait; +use pcrt\User\Traits\ModuleAwareTrait; +use pcrt\User\Validator\AjaxRequestModelValidator; use Yii; use yii\base\InvalidConfigException; use yii\base\InvalidParamException; diff --git a/src/User/Controller/RegistrationController.php b/src/User/Controller/RegistrationController.php index 17bc990..afde2da 100644 --- a/src/User/Controller/RegistrationController.php +++ b/src/User/Controller/RegistrationController.php @@ -9,27 +9,27 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Controller; +namespace pcrt\User\Controller; -use Da\User\Event\FormEvent; -use Da\User\Event\SocialNetworkConnectEvent; -use Da\User\Event\UserEvent; -use Da\User\Factory\MailFactory; -use Da\User\Form\RegistrationForm; -use Da\User\Form\ResendForm; -use Da\User\Helper\SecurityHelper; -use Da\User\Model\SocialNetworkAccount; -use Da\User\Model\User; -use Da\User\Query\SocialNetworkAccountQuery; -use Da\User\Query\UserQuery; -use Da\User\Service\AccountConfirmationService; -use Da\User\Service\ResendConfirmationService; -use Da\User\Service\UserConfirmationService; -use Da\User\Service\UserCreateService; -use Da\User\Service\UserRegisterService; -use Da\User\Traits\ContainerAwareTrait; -use Da\User\Traits\ModuleAwareTrait; -use Da\User\Validator\AjaxRequestModelValidator; +use pcrt\User\Event\FormEvent; +use pcrt\User\Event\SocialNetworkConnectEvent; +use pcrt\User\Event\UserEvent; +use pcrt\User\Factory\MailFactory; +use pcrt\User\Form\RegistrationForm; +use pcrt\User\Form\ResendForm; +use pcrt\User\Helper\SecurityHelper; +use pcrt\User\Model\SocialNetworkAccount; +use pcrt\User\Model\User; +use pcrt\User\Query\SocialNetworkAccountQuery; +use pcrt\User\Query\UserQuery; +use pcrt\User\Service\AccountConfirmationService; +use pcrt\User\Service\ResendConfirmationService; +use pcrt\User\Service\UserConfirmationService; +use pcrt\User\Service\UserCreateService; +use pcrt\User\Service\UserRegisterService; +use pcrt\User\Traits\ContainerAwareTrait; +use pcrt\User\Traits\ModuleAwareTrait; +use pcrt\User\Validator\AjaxRequestModelValidator; use Yii; use yii\base\Module; use yii\filters\AccessControl; diff --git a/src/User/Controller/RoleController.php b/src/User/Controller/RoleController.php index 938ce80..7fb9ab2 100644 --- a/src/User/Controller/RoleController.php +++ b/src/User/Controller/RoleController.php @@ -9,10 +9,10 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Controller; +namespace pcrt\User\Controller; -use Da\User\Model\Role; -use Da\User\Search\RoleSearch; +use pcrt\User\Model\Role; +use pcrt\User\Search\RoleSearch; use yii\web\NotFoundHttpException; class RoleController extends AbstractAuthItemController diff --git a/src/User/Controller/RuleController.php b/src/User/Controller/RuleController.php index f3a5f2c..2429746 100644 --- a/src/User/Controller/RuleController.php +++ b/src/User/Controller/RuleController.php @@ -9,15 +9,15 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Controller; +namespace pcrt\User\Controller; -use Da\User\Filter\AccessRuleFilter; -use Da\User\Model\Rule; -use Da\User\Search\RuleSearch; -use Da\User\Service\AuthRuleEditionService; -use Da\User\Traits\AuthManagerAwareTrait; -use Da\User\Traits\ContainerAwareTrait; -use Da\User\Validator\AjaxRequestModelValidator; +use pcrt\User\Filter\AccessRuleFilter; +use pcrt\User\Model\Rule; +use pcrt\User\Search\RuleSearch; +use pcrt\User\Service\AuthRuleEditionService; +use pcrt\User\Traits\AuthManagerAwareTrait; +use pcrt\User\Traits\ContainerAwareTrait; +use pcrt\User\Validator\AjaxRequestModelValidator; use Yii; use yii\filters\AccessControl; use yii\filters\VerbFilter; diff --git a/src/User/Controller/SecurityController.php b/src/User/Controller/SecurityController.php index c49cf79..065c2ae 100644 --- a/src/User/Controller/SecurityController.php +++ b/src/User/Controller/SecurityController.php @@ -9,20 +9,20 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Controller; +namespace pcrt\User\Controller; -use Da\User\Contracts\AuthClientInterface; -use Da\User\Event\FormEvent; -use Da\User\Event\UserEvent; -use Da\User\Form\LoginForm; -use Da\User\Model\User; -use Da\User\Query\SocialNetworkAccountQuery; -use Da\User\Service\SocialNetworkAccountConnectService; -use Da\User\Service\SocialNetworkAuthenticateService; -use Da\User\Traits\ContainerAwareTrait; -use Da\User\Traits\ModuleAwareTrait; -use Da\User\Validator\TwoFactorEmailValidator; -use Da\User\Validator\TwoFactorTextMessageValidator; +use pcrt\User\Contracts\AuthClientInterface; +use pcrt\User\Event\FormEvent; +use pcrt\User\Event\UserEvent; +use pcrt\User\Form\LoginForm; +use pcrt\User\Model\User; +use pcrt\User\Query\SocialNetworkAccountQuery; +use pcrt\User\Service\SocialNetworkAccountConnectService; +use pcrt\User\Service\SocialNetworkAuthenticateService; +use pcrt\User\Traits\ContainerAwareTrait; +use pcrt\User\Traits\ModuleAwareTrait; +use pcrt\User\Validator\TwoFactorEmailValidator; +use pcrt\User\Validator\TwoFactorTextMessageValidator; use Yii; use yii\authclient\AuthAction; use yii\base\InvalidConfigException; diff --git a/src/User/Controller/api/v1/AdminController.php b/src/User/Controller/api/v1/AdminController.php index 4579585..65cc5ec 100644 --- a/src/User/Controller/api/v1/AdminController.php +++ b/src/User/Controller/api/v1/AdminController.php @@ -9,20 +9,20 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Controller\api\v1; +namespace pcrt\User\Controller\api\v1; -use Da\User\Event\UserEvent; -use Da\User\Factory\MailFactory; -use Da\User\Model\Assignment; -use Da\User\Model\Profile; -use Da\User\Model\User; -use Da\User\Query\UserQuery; -use Da\User\Service\PasswordExpireService; -use Da\User\Service\PasswordRecoveryService; -use Da\User\Service\UserBlockService; -use Da\User\Service\UserConfirmationService; -use Da\User\Service\UserCreateService; -use Da\User\Traits\ContainerAwareTrait; +use pcrt\User\Event\UserEvent; +use pcrt\User\Factory\MailFactory; +use pcrt\User\Model\Assignment; +use pcrt\User\Model\Profile; +use pcrt\User\Model\User; +use pcrt\User\Query\UserQuery; +use pcrt\User\Service\PasswordExpireService; +use pcrt\User\Service\PasswordRecoveryService; +use pcrt\User\Service\UserBlockService; +use pcrt\User\Service\UserConfirmationService; +use pcrt\User\Service\UserCreateService; +use pcrt\User\Traits\ContainerAwareTrait; use Yii; use yii\base\Module; use yii\db\ActiveRecord; @@ -35,7 +35,7 @@ use yii\web\ServerErrorHttpException; /** * Controller that provides REST APIs to manage users. - * This controller is equivalent to `Da\User\Controller\AdminController`. + * This controller is equivalent to `pcrt\User\Controller\AdminController`. * * TODO: * - `Info` and `SwitchIdentity` actions were not developed yet. @@ -48,7 +48,7 @@ class AdminController extends ActiveController /** * {@inheritdoc} */ - public $modelClass = 'Da\User\Model\User'; + public $modelClass = 'pcrt\User\Model\User'; /** * {@inheritdoc} diff --git a/src/User/Event/FormEvent.php b/src/User/Event/FormEvent.php index 51dcc7e..ad38e27 100644 --- a/src/User/Event/FormEvent.php +++ b/src/User/Event/FormEvent.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Event; +namespace pcrt\User\Event; use yii\base\Event; use yii\base\Model; diff --git a/src/User/Event/GdprEvent.php b/src/User/Event/GdprEvent.php index 703c191..8d0b04e 100644 --- a/src/User/Event/GdprEvent.php +++ b/src/User/Event/GdprEvent.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Event; +namespace pcrt\User\Event; -use Da\User\Model\User; +use pcrt\User\Model\User; use yii\base\Event; /** diff --git a/src/User/Event/MailEvent.php b/src/User/Event/MailEvent.php index b16199a..99944d1 100644 --- a/src/User/Event/MailEvent.php +++ b/src/User/Event/MailEvent.php @@ -9,10 +9,10 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Event; +namespace pcrt\User\Event; -use Da\User\Model\User; -use Da\User\Service\MailService; +use pcrt\User\Model\User; +use pcrt\User\Service\MailService; use yii\base\Event; /** diff --git a/src/User/Event/ProfileEvent.php b/src/User/Event/ProfileEvent.php index 872d767..c9d9259 100644 --- a/src/User/Event/ProfileEvent.php +++ b/src/User/Event/ProfileEvent.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Event; +namespace pcrt\User\Event; -use Da\User\Model\Profile; +use pcrt\User\Model\Profile; use yii\base\Event; /** diff --git a/src/User/Event/ResetPasswordEvent.php b/src/User/Event/ResetPasswordEvent.php index 9e19a39..4fce9af 100644 --- a/src/User/Event/ResetPasswordEvent.php +++ b/src/User/Event/ResetPasswordEvent.php @@ -9,10 +9,10 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Event; +namespace pcrt\User\Event; -use Da\User\Form\RecoveryForm; -use Da\User\Model\Token; +use pcrt\User\Form\RecoveryForm; +use pcrt\User\Model\Token; use yii\base\Event; /** diff --git a/src/User/Event/SessionEvent.php b/src/User/Event/SessionEvent.php index 196d8e1..4ca646a 100755 --- a/src/User/Event/SessionEvent.php +++ b/src/User/Event/SessionEvent.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Event; +namespace pcrt\User\Event; -use Da\User\Model\User; +use pcrt\User\Model\User; use yii\base\Event; /** diff --git a/src/User/Event/SocialNetworkAuthEvent.php b/src/User/Event/SocialNetworkAuthEvent.php index b9a88f6..37c5cd9 100644 --- a/src/User/Event/SocialNetworkAuthEvent.php +++ b/src/User/Event/SocialNetworkAuthEvent.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Event; +namespace pcrt\User\Event; -use Da\User\Model\SocialNetworkAccount; +use pcrt\User\Model\SocialNetworkAccount; use yii\authclient\ClientInterface; use yii\base\Event; diff --git a/src/User/Event/SocialNetworkConnectEvent.php b/src/User/Event/SocialNetworkConnectEvent.php index 2c7f614..c492170 100644 --- a/src/User/Event/SocialNetworkConnectEvent.php +++ b/src/User/Event/SocialNetworkConnectEvent.php @@ -9,10 +9,10 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Event; +namespace pcrt\User\Event; -use Da\User\Model\SocialNetworkAccount; -use Da\User\Model\User; +use pcrt\User\Model\SocialNetworkAccount; +use pcrt\User\Model\User; use yii\base\Event; /** diff --git a/src/User/Event/UserEvent.php b/src/User/Event/UserEvent.php index 249fbe8..b15d594 100644 --- a/src/User/Event/UserEvent.php +++ b/src/User/Event/UserEvent.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Event; +namespace pcrt\User\Event; -use Da\User\Model\User; +use pcrt\User\Model\User; use yii\base\Event; /** diff --git a/src/User/Factory/AuthItemFactory.php b/src/User/Factory/AuthItemFactory.php index e46a7f3..cdc3079 100644 --- a/src/User/Factory/AuthItemFactory.php +++ b/src/User/Factory/AuthItemFactory.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Factory; +namespace pcrt\User\Factory; use Exception; use Yii; diff --git a/src/User/Factory/EmailChangeStrategyFactory.php b/src/User/Factory/EmailChangeStrategyFactory.php index 3253df6..c1eb266 100644 --- a/src/User/Factory/EmailChangeStrategyFactory.php +++ b/src/User/Factory/EmailChangeStrategyFactory.php @@ -9,13 +9,13 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Factory; +namespace pcrt\User\Factory; -use Da\User\Contracts\MailChangeStrategyInterface; -use Da\User\Form\SettingsForm; -use Da\User\Strategy\DefaultEmailChangeStrategy; -use Da\User\Strategy\InsecureEmailChangeStrategy; -use Da\User\Strategy\SecureEmailChangeStrategy; +use pcrt\User\Contracts\MailChangeStrategyInterface; +use pcrt\User\Form\SettingsForm; +use pcrt\User\Strategy\DefaultEmailChangeStrategy; +use pcrt\User\Strategy\InsecureEmailChangeStrategy; +use pcrt\User\Strategy\SecureEmailChangeStrategy; use Exception; use Yii; use yii\base\InvalidParamException; diff --git a/src/User/Factory/MailFactory.php b/src/User/Factory/MailFactory.php index 6af0024..45c8c0e 100644 --- a/src/User/Factory/MailFactory.php +++ b/src/User/Factory/MailFactory.php @@ -9,13 +9,13 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Factory; +namespace pcrt\User\Factory; -use Da\User\Event\MailEvent; -use Da\User\Model\Token; -use Da\User\Model\User; -use Da\User\Module; -use Da\User\Service\MailService; +use pcrt\User\Event\MailEvent; +use pcrt\User\Model\Token; +use pcrt\User\Model\User; +use pcrt\User\Module; +use pcrt\User\Service\MailService; use Yii; use yii\base\InvalidConfigException; diff --git a/src/User/Factory/TokenFactory.php b/src/User/Factory/TokenFactory.php index 8f91e21..7162d73 100644 --- a/src/User/Factory/TokenFactory.php +++ b/src/User/Factory/TokenFactory.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Factory; +namespace pcrt\User\Factory; -use Da\User\Model\Token; +use pcrt\User\Model\Token; use Yii; use yii\base\InvalidConfigException; diff --git a/src/User/Filter/AccessRuleFilter.php b/src/User/Filter/AccessRuleFilter.php index cb65826..3cbf64e 100644 --- a/src/User/Filter/AccessRuleFilter.php +++ b/src/User/Filter/AccessRuleFilter.php @@ -9,11 +9,11 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Filter; +namespace pcrt\User\Filter; use Closure; -use Da\User\Model\User; -use Da\User\Traits\ModuleAwareTrait; +use pcrt\User\Model\User; +use pcrt\User\Traits\ModuleAwareTrait; use Yii; use yii\filters\AccessRule; diff --git a/src/User/Filter/PasswordAgeEnforceFilter.php b/src/User/Filter/PasswordAgeEnforceFilter.php index a0334a7..2740f93 100644 --- a/src/User/Filter/PasswordAgeEnforceFilter.php +++ b/src/User/Filter/PasswordAgeEnforceFilter.php @@ -9,10 +9,10 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Filter; +namespace pcrt\User\Filter; -use Da\User\Model\User; -use Da\User\Module; +use pcrt\User\Model\User; +use pcrt\User\Module; use Yii; use yii\base\ActionFilter; diff --git a/src/User/Filter/TwoFactorAuthenticationEnforceFilter.php b/src/User/Filter/TwoFactorAuthenticationEnforceFilter.php index f0d0709..60fcf95 100644 --- a/src/User/Filter/TwoFactorAuthenticationEnforceFilter.php +++ b/src/User/Filter/TwoFactorAuthenticationEnforceFilter.php @@ -9,11 +9,11 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Filter; +namespace pcrt\User\Filter; -use Da\User\Model\User; -use Da\User\Module; -use Da\User\Traits\AuthManagerAwareTrait; +use pcrt\User\Model\User; +use pcrt\User\Module; +use pcrt\User\Traits\AuthManagerAwareTrait; use Yii; use yii\base\ActionFilter; diff --git a/src/User/Form/GdprDeleteForm.php b/src/User/Form/GdprDeleteForm.php index a720907..d4402ea 100644 --- a/src/User/Form/GdprDeleteForm.php +++ b/src/User/Form/GdprDeleteForm.php @@ -9,17 +9,17 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Form; +namespace pcrt\User\Form; -use Da\User\Helper\SecurityHelper; -use Da\User\Model\User; -use Da\User\Traits\ContainerAwareTrait; +use pcrt\User\Helper\SecurityHelper; +use pcrt\User\Model\User; +use pcrt\User\Traits\ContainerAwareTrait; use Yii; use yii\base\Model; /** * Class GdprDeleteForm - * @package Da\User\Form + * @package pcrt\User\Form */ class GdprDeleteForm extends Model { diff --git a/src/User/Form/LoginForm.php b/src/User/Form/LoginForm.php index 1810615..e9315bf 100644 --- a/src/User/Form/LoginForm.php +++ b/src/User/Form/LoginForm.php @@ -9,16 +9,16 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Form; +namespace pcrt\User\Form; -use Da\User\Helper\SecurityHelper; -use Da\User\Model\User; -use Da\User\Query\UserQuery; -use Da\User\Traits\ContainerAwareTrait; -use Da\User\Traits\ModuleAwareTrait; -use Da\User\Validator\TwoFactorCodeValidator; -use Da\User\Validator\TwoFactorEmailValidator; -use Da\User\Validator\TwoFactorTextMessageValidator; +use pcrt\User\Helper\SecurityHelper; +use pcrt\User\Model\User; +use pcrt\User\Query\UserQuery; +use pcrt\User\Traits\ContainerAwareTrait; +use pcrt\User\Traits\ModuleAwareTrait; +use pcrt\User\Validator\TwoFactorCodeValidator; +use pcrt\User\Validator\TwoFactorEmailValidator; +use pcrt\User\Validator\TwoFactorTextMessageValidator; use Yii; use yii\base\InvalidParamException; use yii\base\Model; @@ -87,7 +87,7 @@ class LoginForm extends Model /** * {@inheritdoc} * - * @throws \Da\TwoFA\Exception\InvalidSecretKeyException (only if package is being used) + * @throws \pcrt\TwoFA\Exception\InvalidSecretKeyException (only if package is being used) */ public function rules() { diff --git a/src/User/Form/RecoveryForm.php b/src/User/Form/RecoveryForm.php index 6264d38..223fbce 100644 --- a/src/User/Form/RecoveryForm.php +++ b/src/User/Form/RecoveryForm.php @@ -9,10 +9,10 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Form; +namespace pcrt\User\Form; -use Da\User\Query\UserQuery; -use Da\User\Traits\ContainerAwareTrait; +use pcrt\User\Query\UserQuery; +use pcrt\User\Traits\ContainerAwareTrait; use Yii; use yii\base\Model; diff --git a/src/User/Form/RegistrationForm.php b/src/User/Form/RegistrationForm.php index b727c4b..e3c35e1 100644 --- a/src/User/Form/RegistrationForm.php +++ b/src/User/Form/RegistrationForm.php @@ -9,11 +9,11 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Form; +namespace pcrt\User\Form; -use Da\User\Model\User; -use Da\User\Traits\ContainerAwareTrait; -use Da\User\Traits\ModuleAwareTrait; +use pcrt\User\Model\User; +use pcrt\User\Traits\ContainerAwareTrait; +use pcrt\User\Traits\ModuleAwareTrait; use Yii; use yii\base\Model; use yii\helpers\Html; diff --git a/src/User/Form/ResendForm.php b/src/User/Form/ResendForm.php index 601b080..ea529f0 100644 --- a/src/User/Form/ResendForm.php +++ b/src/User/Form/ResendForm.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Form; +namespace pcrt\User\Form; -use Da\User\Query\UserQuery; +use pcrt\User\Query\UserQuery; use Yii; use yii\base\Model; diff --git a/src/User/Form/SettingsForm.php b/src/User/Form/SettingsForm.php index 803a6d6..d7836e0 100644 --- a/src/User/Form/SettingsForm.php +++ b/src/User/Form/SettingsForm.php @@ -9,13 +9,13 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Form; +namespace pcrt\User\Form; -use Da\User\Factory\EmailChangeStrategyFactory; -use Da\User\Helper\SecurityHelper; -use Da\User\Model\User; -use Da\User\Traits\ContainerAwareTrait; -use Da\User\Traits\ModuleAwareTrait; +use pcrt\User\Factory\EmailChangeStrategyFactory; +use pcrt\User\Helper\SecurityHelper; +use pcrt\User\Model\User; +use pcrt\User\Traits\ContainerAwareTrait; +use pcrt\User\Traits\ModuleAwareTrait; use Yii; use yii\base\InvalidConfigException; use yii\base\InvalidParamException; diff --git a/src/User/Helper/AuthHelper.php b/src/User/Helper/AuthHelper.php index e85e191..053dd23 100644 --- a/src/User/Helper/AuthHelper.php +++ b/src/User/Helper/AuthHelper.php @@ -9,11 +9,11 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Helper; +namespace pcrt\User\Helper; -use Da\User\Model\AbstractAuthItem; -use Da\User\Module; -use Da\User\Traits\AuthManagerAwareTrait; +use pcrt\User\Model\AbstractAuthItem; +use pcrt\User\Module; +use pcrt\User\Traits\AuthManagerAwareTrait; use Yii; use yii\helpers\ArrayHelper; use yii\rbac\Permission; diff --git a/src/User/Helper/ClassMapHelper.php b/src/User/Helper/ClassMapHelper.php index d1043c6..8dabf09 100644 --- a/src/User/Helper/ClassMapHelper.php +++ b/src/User/Helper/ClassMapHelper.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Helper; +namespace pcrt\User\Helper; use yii\base\InvalidArgumentException; diff --git a/src/User/Helper/GravatarHelper.php b/src/User/Helper/GravatarHelper.php index 6ecaf5d..a27abf9 100644 --- a/src/User/Helper/GravatarHelper.php +++ b/src/User/Helper/GravatarHelper.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Helper; +namespace pcrt\User\Helper; class GravatarHelper { diff --git a/src/User/Helper/MigrationHelper.php b/src/User/Helper/MigrationHelper.php index f0392d1..ffe9a7b 100644 --- a/src/User/Helper/MigrationHelper.php +++ b/src/User/Helper/MigrationHelper.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Helper; +namespace pcrt\User\Helper; use RuntimeException; diff --git a/src/User/Helper/SecurityHelper.php b/src/User/Helper/SecurityHelper.php index 372ec5b..29f5373 100644 --- a/src/User/Helper/SecurityHelper.php +++ b/src/User/Helper/SecurityHelper.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Helper; +namespace pcrt\User\Helper; use Yii; use yii\base\Exception; diff --git a/src/User/Helper/TimezoneHelper.php b/src/User/Helper/TimezoneHelper.php index 7f8e9b7..a514ec1 100644 --- a/src/User/Helper/TimezoneHelper.php +++ b/src/User/Helper/TimezoneHelper.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Helper; +namespace pcrt\User\Helper; use DateTime; use DateTimeZone; diff --git a/src/User/Migration/Session/m000000_000001_create_session_history_table.php b/src/User/Migration/Session/m000000_000001_create_session_history_table.php index d0f0b7a..3703977 100755 --- a/src/User/Migration/Session/m000000_000001_create_session_history_table.php +++ b/src/User/Migration/Session/m000000_000001_create_session_history_table.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Migration\Session; +namespace pcrt\User\Migration\Session; -use Da\User\Helper\MigrationHelper; +use pcrt\User\Helper\MigrationHelper; use yii\db\Migration; class m000000_000001_create_session_history_table extends Migration diff --git a/src/User/Migration/m000000_000001_create_user_table.php b/src/User/Migration/m000000_000001_create_user_table.php index 2f1b921..5fa3e23 100644 --- a/src/User/Migration/m000000_000001_create_user_table.php +++ b/src/User/Migration/m000000_000001_create_user_table.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Migration; +namespace pcrt\User\Migration; -use Da\User\Helper\MigrationHelper; +use pcrt\User\Helper\MigrationHelper; use yii\db\Migration; class m000000_000001_create_user_table extends Migration diff --git a/src/User/Migration/m000000_000002_create_profile_table.php b/src/User/Migration/m000000_000002_create_profile_table.php index e92105d..95dcd80 100644 --- a/src/User/Migration/m000000_000002_create_profile_table.php +++ b/src/User/Migration/m000000_000002_create_profile_table.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Migration; +namespace pcrt\User\Migration; -use Da\User\Helper\MigrationHelper; +use pcrt\User\Helper\MigrationHelper; use yii\db\Migration; class m000000_000002_create_profile_table extends Migration diff --git a/src/User/Migration/m000000_000003_create_social_account_table.php b/src/User/Migration/m000000_000003_create_social_account_table.php index 8561325..5292976 100644 --- a/src/User/Migration/m000000_000003_create_social_account_table.php +++ b/src/User/Migration/m000000_000003_create_social_account_table.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Migration; +namespace pcrt\User\Migration; -use Da\User\Helper\MigrationHelper; +use pcrt\User\Helper\MigrationHelper; use yii\db\Migration; class m000000_000003_create_social_account_table extends Migration diff --git a/src/User/Migration/m000000_000004_create_token_table.php b/src/User/Migration/m000000_000004_create_token_table.php index e28c7d5..8e54a5f 100644 --- a/src/User/Migration/m000000_000004_create_token_table.php +++ b/src/User/Migration/m000000_000004_create_token_table.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Migration; +namespace pcrt\User\Migration; -use Da\User\Helper\MigrationHelper; +use pcrt\User\Helper\MigrationHelper; use yii\db\Migration; class m000000_000004_create_token_table extends Migration diff --git a/src/User/Migration/m000000_000005_add_last_login_at.php b/src/User/Migration/m000000_000005_add_last_login_at.php index 2a0c031..d160aba 100644 --- a/src/User/Migration/m000000_000005_add_last_login_at.php +++ b/src/User/Migration/m000000_000005_add_last_login_at.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Migration; +namespace pcrt\User\Migration; use yii\db\Migration; diff --git a/src/User/Migration/m000000_000006_add_two_factor_fields.php b/src/User/Migration/m000000_000006_add_two_factor_fields.php index 1aa13ed..095b3d4 100644 --- a/src/User/Migration/m000000_000006_add_two_factor_fields.php +++ b/src/User/Migration/m000000_000006_add_two_factor_fields.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Migration; +namespace pcrt\User\Migration; -use Da\User\Helper\MigrationHelper; +use pcrt\User\Helper\MigrationHelper; use yii\db\Migration; class m000000_000006_add_two_factor_fields extends Migration diff --git a/src/User/Migration/m000000_000007_enable_password_expiration.php b/src/User/Migration/m000000_000007_enable_password_expiration.php index 2761688..434c3f2 100644 --- a/src/User/Migration/m000000_000007_enable_password_expiration.php +++ b/src/User/Migration/m000000_000007_enable_password_expiration.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Migration; +namespace pcrt\User\Migration; use yii\db\Migration; diff --git a/src/User/Migration/m000000_000008_add_last_login_ip.php b/src/User/Migration/m000000_000008_add_last_login_ip.php index 8d3f790..9f71c26 100644 --- a/src/User/Migration/m000000_000008_add_last_login_ip.php +++ b/src/User/Migration/m000000_000008_add_last_login_ip.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Migration; +namespace pcrt\User\Migration; use yii\db\Migration; diff --git a/src/User/Migration/m000000_000009_add_gdpr_consent_fields.php b/src/User/Migration/m000000_000009_add_gdpr_consent_fields.php index 9dc5590..45612ff 100644 --- a/src/User/Migration/m000000_000009_add_gdpr_consent_fields.php +++ b/src/User/Migration/m000000_000009_add_gdpr_consent_fields.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Migration; +namespace pcrt\User\Migration; -use Da\User\Helper\MigrationHelper; +use pcrt\User\Helper\MigrationHelper; use yii\db\Migration; class m000000_000009_add_gdpr_consent_fields extends Migration diff --git a/src/User/Migration/m000000_000010_add_auth_tf_type_auth_tf_mobile_phone_columns_to_user_table.php b/src/User/Migration/m000000_000010_add_auth_tf_type_auth_tf_mobile_phone_columns_to_user_table.php index 405c324..0c37e90 100644 --- a/src/User/Migration/m000000_000010_add_auth_tf_type_auth_tf_mobile_phone_columns_to_user_table.php +++ b/src/User/Migration/m000000_000010_add_auth_tf_type_auth_tf_mobile_phone_columns_to_user_table.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Migration; +namespace pcrt\User\Migration; use yii\db\Migration; diff --git a/src/User/Model/AbstractAuthItem.php b/src/User/Model/AbstractAuthItem.php index aee8d6e..cfdc947 100644 --- a/src/User/Model/AbstractAuthItem.php +++ b/src/User/Model/AbstractAuthItem.php @@ -9,11 +9,11 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Model; +namespace pcrt\User\Model; -use Da\User\Traits\AuthManagerAwareTrait; -use Da\User\Validator\RbacItemsValidator; -use Da\User\Validator\RbacRuleExistsValidator; +use pcrt\User\Traits\AuthManagerAwareTrait; +use pcrt\User\Validator\RbacItemsValidator; +use pcrt\User\Validator\RbacRuleExistsValidator; use Yii; use yii\base\Model; use yii\rbac\Item; diff --git a/src/User/Model/Assignment.php b/src/User/Model/Assignment.php index 282499f..341f8c7 100644 --- a/src/User/Model/Assignment.php +++ b/src/User/Model/Assignment.php @@ -9,10 +9,10 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Model; +namespace pcrt\User\Model; -use Da\User\Traits\AuthManagerAwareTrait; -use Da\User\Validator\RbacItemsValidator; +use pcrt\User\Traits\AuthManagerAwareTrait; +use pcrt\User\Validator\RbacItemsValidator; use Yii; use yii\base\InvalidConfigException; use yii\base\Model; diff --git a/src/User/Model/Permission.php b/src/User/Model/Permission.php index 9234738..2d98794 100644 --- a/src/User/Model/Permission.php +++ b/src/User/Model/Permission.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Model; +namespace pcrt\User\Model; use yii\rbac\Item; diff --git a/src/User/Model/Profile.php b/src/User/Model/Profile.php index 7166a5f..42c83f7 100644 --- a/src/User/Model/Profile.php +++ b/src/User/Model/Profile.php @@ -9,13 +9,13 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Model; +namespace pcrt\User\Model; -use Da\User\Helper\GravatarHelper; -use Da\User\Query\ProfileQuery; -use Da\User\Traits\ContainerAwareTrait; -use Da\User\Traits\ModuleAwareTrait; -use Da\User\Validator\TimeZoneValidator; +use pcrt\User\Helper\GravatarHelper; +use pcrt\User\Query\ProfileQuery; +use pcrt\User\Traits\ContainerAwareTrait; +use pcrt\User\Traits\ModuleAwareTrait; +use pcrt\User\Validator\TimeZoneValidator; use DateTime; use DateTimeZone; use Exception; diff --git a/src/User/Model/Role.php b/src/User/Model/Role.php index a0b01b0..fd3566d 100644 --- a/src/User/Model/Role.php +++ b/src/User/Model/Role.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Model; +namespace pcrt\User\Model; use yii\rbac\Item; diff --git a/src/User/Model/Rule.php b/src/User/Model/Rule.php index a406b35..efc158b 100644 --- a/src/User/Model/Rule.php +++ b/src/User/Model/Rule.php @@ -9,11 +9,11 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Model; +namespace pcrt\User\Model; -use Da\User\Traits\AuthManagerAwareTrait; -use Da\User\Validator\RbacRuleNameValidator; -use Da\User\Validator\RbacRuleValidator; +use pcrt\User\Traits\AuthManagerAwareTrait; +use pcrt\User\Validator\RbacRuleNameValidator; +use pcrt\User\Validator\RbacRuleValidator; use Yii; use yii\base\Model; diff --git a/src/User/Model/SessionHistory.php b/src/User/Model/SessionHistory.php index 1713c8c..247cd00 100755 --- a/src/User/Model/SessionHistory.php +++ b/src/User/Model/SessionHistory.php @@ -9,11 +9,11 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Model; +namespace pcrt\User\Model; -use Da\User\Module; -use Da\User\Query\SessionHistoryQuery; -use Da\User\Traits\ModuleAwareTrait; +use pcrt\User\Module; +use pcrt\User\Query\SessionHistoryQuery; +use pcrt\User\Traits\ModuleAwareTrait; use Yii; use yii\behaviors\TimestampBehavior; use yii\db\ActiveQuery; diff --git a/src/User/Model/SocialNetworkAccount.php b/src/User/Model/SocialNetworkAccount.php index e076327..98d6aa4 100644 --- a/src/User/Model/SocialNetworkAccount.php +++ b/src/User/Model/SocialNetworkAccount.php @@ -9,11 +9,11 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Model; +namespace pcrt\User\Model; -use Da\User\Query\SocialNetworkAccountQuery; -use Da\User\Traits\ContainerAwareTrait; -use Da\User\Traits\ModuleAwareTrait; +use pcrt\User\Query\SocialNetworkAccountQuery; +use pcrt\User\Traits\ContainerAwareTrait; +use pcrt\User\Traits\ModuleAwareTrait; use Yii; use yii\base\Exception; use yii\base\InvalidParamException; diff --git a/src/User/Model/Token.php b/src/User/Model/Token.php index 54c4abd..a96dd45 100644 --- a/src/User/Model/Token.php +++ b/src/User/Model/Token.php @@ -9,12 +9,12 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Model; +namespace pcrt\User\Model; -use Da\User\Helper\SecurityHelper; -use Da\User\Query\TokenQuery; -use Da\User\Traits\ContainerAwareTrait; -use Da\User\Traits\ModuleAwareTrait; +use pcrt\User\Helper\SecurityHelper; +use pcrt\User\Query\TokenQuery; +use pcrt\User\Traits\ContainerAwareTrait; +use pcrt\User\Traits\ModuleAwareTrait; use RuntimeException; use yii\base\InvalidConfigException; use yii\base\InvalidParamException; diff --git a/src/User/Model/User.php b/src/User/Model/User.php index 2764b17..8ad3c38 100644 --- a/src/User/Model/User.php +++ b/src/User/Model/User.php @@ -9,12 +9,12 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Model; +namespace pcrt\User\Model; -use Da\User\Helper\SecurityHelper; -use Da\User\Query\UserQuery; -use Da\User\Traits\ContainerAwareTrait; -use Da\User\Traits\ModuleAwareTrait; +use pcrt\User\Helper\SecurityHelper; +use pcrt\User\Query\UserQuery; +use pcrt\User\Traits\ContainerAwareTrait; +use pcrt\User\Traits\ModuleAwareTrait; use Yii; use yii\base\Exception; use yii\base\InvalidConfigException; diff --git a/src/User/Module.php b/src/User/Module.php index ed5a639..1094863 100755 --- a/src/User/Module.php +++ b/src/User/Module.php @@ -9,11 +9,11 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User; +namespace pcrt\User; -use Da\User\Contracts\MailChangeStrategyInterface; -use Da\User\Controller\ProfileController; -use Da\User\Filter\AccessRuleFilter; +use pcrt\User\Contracts\MailChangeStrategyInterface; +use pcrt\User\Controller\ProfileController; +use pcrt\User\Filter\AccessRuleFilter; use Yii; use yii\base\Module as BaseModule; use yii\helpers\Html; @@ -207,11 +207,11 @@ class Module extends BaseModule /** * @var string Web controller namespace */ - public $controllerNamespace = 'Da\User\Controller'; + public $controllerNamespace = 'pcrt\User\Controller'; /** * @var string Console controller namespace */ - public $consoleControllerNamespace = 'Da\User\Command'; + public $consoleControllerNamespace = 'pcrt\User\Command'; /** * @var array the class map. How the container should load specific classes * @see Bootstrap::buildClassMap() for more details @@ -232,7 +232,7 @@ class Module extends BaseModule /** * @var string */ - public $viewPath = '@Da/User/resources/views'; + public $viewPath = '@pcrt/User/resources/views'; /** * @var string the session key name to impersonate users. Please, modify it for security reasons! */ diff --git a/src/User/Query/ProfileQuery.php b/src/User/Query/ProfileQuery.php index 33d9b1c..8eeb67a 100644 --- a/src/User/Query/ProfileQuery.php +++ b/src/User/Query/ProfileQuery.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Query; +namespace pcrt\User\Query; use yii\db\ActiveQuery; diff --git a/src/User/Query/SessionHistoryCondition.php b/src/User/Query/SessionHistoryCondition.php index e4dea01..b0e32d4 100755 --- a/src/User/Query/SessionHistoryCondition.php +++ b/src/User/Query/SessionHistoryCondition.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Query; +namespace pcrt\User\Query; -use Da\User\Traits\ModuleAwareTrait; +use pcrt\User\Traits\ModuleAwareTrait; use Yii; use yii\web\Session; diff --git a/src/User/Query/SessionHistoryQuery.php b/src/User/Query/SessionHistoryQuery.php index 7fe322d..9cf67dd 100755 --- a/src/User/Query/SessionHistoryQuery.php +++ b/src/User/Query/SessionHistoryQuery.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Query; +namespace pcrt\User\Query; -use Da\User\Traits\ModuleAwareTrait; +use pcrt\User\Traits\ModuleAwareTrait; use Yii; use yii\db\ActiveQuery; diff --git a/src/User/Query/SocialNetworkAccountQuery.php b/src/User/Query/SocialNetworkAccountQuery.php index d90ae72..b868b04 100644 --- a/src/User/Query/SocialNetworkAccountQuery.php +++ b/src/User/Query/SocialNetworkAccountQuery.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Query; +namespace pcrt\User\Query; -use Da\User\Contracts\AuthClientInterface; +use pcrt\User\Contracts\AuthClientInterface; use yii\db\ActiveQuery; class SocialNetworkAccountQuery extends ActiveQuery diff --git a/src/User/Query/TokenQuery.php b/src/User/Query/TokenQuery.php index 2acc05e..e762ca6 100644 --- a/src/User/Query/TokenQuery.php +++ b/src/User/Query/TokenQuery.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Query; +namespace pcrt\User\Query; -use Da\User\Model\Token; +use pcrt\User\Model\Token; use yii\db\ActiveQuery; class TokenQuery extends ActiveQuery diff --git a/src/User/Query/UserQuery.php b/src/User/Query/UserQuery.php index 68c8ad7..720ba4b 100644 --- a/src/User/Query/UserQuery.php +++ b/src/User/Query/UserQuery.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Query; +namespace pcrt\User\Query; use yii\db\ActiveQuery; diff --git a/src/User/Search/AbstractAuthItemSearch.php b/src/User/Search/AbstractAuthItemSearch.php index 7501077..50d2ee1 100644 --- a/src/User/Search/AbstractAuthItemSearch.php +++ b/src/User/Search/AbstractAuthItemSearch.php @@ -9,10 +9,10 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Search; +namespace pcrt\User\Search; -use Da\User\Traits\AuthManagerAwareTrait; -use Da\User\Traits\ContainerAwareTrait; +use pcrt\User\Traits\AuthManagerAwareTrait; +use pcrt\User\Traits\ContainerAwareTrait; use yii\base\Model; use yii\data\ArrayDataProvider; use yii\db\Query; diff --git a/src/User/Search/PermissionSearch.php b/src/User/Search/PermissionSearch.php index 93026bb..4a57180 100644 --- a/src/User/Search/PermissionSearch.php +++ b/src/User/Search/PermissionSearch.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Search; +namespace pcrt\User\Search; use yii\rbac\Item; diff --git a/src/User/Search/RoleSearch.php b/src/User/Search/RoleSearch.php index 3418e48..b0eab0a 100644 --- a/src/User/Search/RoleSearch.php +++ b/src/User/Search/RoleSearch.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Search; +namespace pcrt\User\Search; use yii\rbac\Item; diff --git a/src/User/Search/RuleSearch.php b/src/User/Search/RuleSearch.php index d56b855..01c8d64 100644 --- a/src/User/Search/RuleSearch.php +++ b/src/User/Search/RuleSearch.php @@ -9,10 +9,10 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Search; +namespace pcrt\User\Search; -use Da\User\Model\Rule; -use Da\User\Traits\ContainerAwareTrait; +use pcrt\User\Model\Rule; +use pcrt\User\Traits\ContainerAwareTrait; use yii\base\InvalidConfigException; use yii\base\InvalidParamException; use yii\base\Model; diff --git a/src/User/Search/SessionHistorySearch.php b/src/User/Search/SessionHistorySearch.php index f8d3f97..ee00c76 100755 --- a/src/User/Search/SessionHistorySearch.php +++ b/src/User/Search/SessionHistorySearch.php @@ -9,10 +9,10 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Search; +namespace pcrt\User\Search; -use Da\User\Model\SessionHistory; -use Da\User\Traits\ContainerAwareTrait; +use pcrt\User\Model\SessionHistory; +use pcrt\User\Traits\ContainerAwareTrait; use yii\base\InvalidConfigException; use yii\base\InvalidParamException; use yii\data\ActiveDataProvider; diff --git a/src/User/Search/UserSearch.php b/src/User/Search/UserSearch.php index b936766..2caae3b 100644 --- a/src/User/Search/UserSearch.php +++ b/src/User/Search/UserSearch.php @@ -9,11 +9,11 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Search; +namespace pcrt\User\Search; -use Da\User\Model\User; -use Da\User\Query\UserQuery; -use Da\User\Traits\ContainerAwareTrait; +use pcrt\User\Model\User; +use pcrt\User\Query\UserQuery; +use pcrt\User\Traits\ContainerAwareTrait; use Yii; use yii\base\InvalidParamException; use yii\base\Model; diff --git a/src/User/Service/AccountConfirmationService.php b/src/User/Service/AccountConfirmationService.php index 0764a14..6cead4d 100644 --- a/src/User/Service/AccountConfirmationService.php +++ b/src/User/Service/AccountConfirmationService.php @@ -9,12 +9,12 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service; +namespace pcrt\User\Service; -use Da\User\Contracts\ServiceInterface; -use Da\User\Model\Token; -use Da\User\Model\User; -use Da\User\Query\TokenQuery; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Model\Token; +use pcrt\User\Model\User; +use pcrt\User\Query\TokenQuery; class AccountConfirmationService implements ServiceInterface { diff --git a/src/User/Service/AuthItemEditionService.php b/src/User/Service/AuthItemEditionService.php index 3ba8bf4..c09cf98 100644 --- a/src/User/Service/AuthItemEditionService.php +++ b/src/User/Service/AuthItemEditionService.php @@ -9,13 +9,13 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service; +namespace pcrt\User\Service; -use Da\User\Contracts\ServiceInterface; -use Da\User\Factory\AuthItemFactory; -use Da\User\Model\AbstractAuthItem; -use Da\User\Traits\AuthManagerAwareTrait; -use Da\User\Traits\ContainerAwareTrait; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Factory\AuthItemFactory; +use pcrt\User\Model\AbstractAuthItem; +use pcrt\User\Traits\AuthManagerAwareTrait; +use pcrt\User\Traits\ContainerAwareTrait; use Exception; class AuthItemEditionService implements ServiceInterface diff --git a/src/User/Service/AuthRuleEditionService.php b/src/User/Service/AuthRuleEditionService.php index 55983d7..ef80e1d 100644 --- a/src/User/Service/AuthRuleEditionService.php +++ b/src/User/Service/AuthRuleEditionService.php @@ -9,12 +9,12 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service; +namespace pcrt\User\Service; -use Da\User\Contracts\ServiceInterface; -use Da\User\Model\Rule; -use Da\User\Traits\AuthManagerAwareTrait; -use Da\User\Traits\ContainerAwareTrait; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Model\Rule; +use pcrt\User\Traits\AuthManagerAwareTrait; +use pcrt\User\Traits\ContainerAwareTrait; use Exception; class AuthRuleEditionService implements ServiceInterface diff --git a/src/User/Service/EmailChangeService.php b/src/User/Service/EmailChangeService.php index 3b6db9a..e290493 100644 --- a/src/User/Service/EmailChangeService.php +++ b/src/User/Service/EmailChangeService.php @@ -9,15 +9,15 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service; +namespace pcrt\User\Service; -use Da\User\Contracts\MailChangeStrategyInterface; -use Da\User\Contracts\ServiceInterface; -use Da\User\Model\Token; -use Da\User\Model\User; -use Da\User\Query\TokenQuery; -use Da\User\Query\UserQuery; -use Da\User\Traits\ModuleAwareTrait; +use pcrt\User\Contracts\MailChangeStrategyInterface; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Model\Token; +use pcrt\User\Model\User; +use pcrt\User\Query\TokenQuery; +use pcrt\User\Query\UserQuery; +use pcrt\User\Traits\ModuleAwareTrait; use Yii; class EmailChangeService implements ServiceInterface diff --git a/src/User/Service/MailService.php b/src/User/Service/MailService.php index 4e99d44..0e1c420 100644 --- a/src/User/Service/MailService.php +++ b/src/User/Service/MailService.php @@ -9,10 +9,10 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service; +namespace pcrt\User\Service; -use Da\User\Contracts\ServiceInterface; -use Da\User\Traits\ModuleAwareTrait; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Traits\ModuleAwareTrait; use Yii; use yii\mail\BaseMailer; use yii\mail\MailerInterface; diff --git a/src/User/Service/PasswordExpireService.php b/src/User/Service/PasswordExpireService.php index 38190e5..862b9dc 100644 --- a/src/User/Service/PasswordExpireService.php +++ b/src/User/Service/PasswordExpireService.php @@ -9,10 +9,10 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service; +namespace pcrt\User\Service; -use Da\User\Contracts\ServiceInterface; -use Da\User\Model\User; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Model\User; class PasswordExpireService implements ServiceInterface { diff --git a/src/User/Service/PasswordRecoveryService.php b/src/User/Service/PasswordRecoveryService.php index a9e388a..dad19f2 100644 --- a/src/User/Service/PasswordRecoveryService.php +++ b/src/User/Service/PasswordRecoveryService.php @@ -9,14 +9,14 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service; +namespace pcrt\User\Service; -use Da\User\Contracts\ServiceInterface; -use Da\User\Factory\TokenFactory; -use Da\User\Model\User; -use Da\User\Query\UserQuery; -use Da\User\Traits\MailAwareTrait; -use Da\User\Traits\ModuleAwareTrait; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Factory\TokenFactory; +use pcrt\User\Model\User; +use pcrt\User\Query\UserQuery; +use pcrt\User\Traits\MailAwareTrait; +use pcrt\User\Traits\ModuleAwareTrait; use Exception; use Yii; use yii\web\NotFoundHttpException; diff --git a/src/User/Service/ResendConfirmationService.php b/src/User/Service/ResendConfirmationService.php index 7c131d9..713f1ca 100644 --- a/src/User/Service/ResendConfirmationService.php +++ b/src/User/Service/ResendConfirmationService.php @@ -9,12 +9,12 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service; +namespace pcrt\User\Service; -use Da\User\Contracts\ServiceInterface; -use Da\User\Factory\TokenFactory; -use Da\User\Model\User; -use Da\User\Traits\MailAwareTrait; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Factory\TokenFactory; +use pcrt\User\Model\User; +use pcrt\User\Traits\MailAwareTrait; class ResendConfirmationService implements ServiceInterface { diff --git a/src/User/Service/ResetPasswordService.php b/src/User/Service/ResetPasswordService.php index 93ca756..8f77755 100644 --- a/src/User/Service/ResetPasswordService.php +++ b/src/User/Service/ResetPasswordService.php @@ -9,11 +9,11 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service; +namespace pcrt\User\Service; -use Da\User\Contracts\ServiceInterface; -use Da\User\Helper\SecurityHelper; -use Da\User\Model\User; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Helper\SecurityHelper; +use pcrt\User\Model\User; class ResetPasswordService implements ServiceInterface { diff --git a/src/User/Service/SessionHistory/DBTerminateSessionsService.php b/src/User/Service/SessionHistory/DBTerminateSessionsService.php index 148d8c1..111f4df 100755 --- a/src/User/Service/SessionHistory/DBTerminateSessionsService.php +++ b/src/User/Service/SessionHistory/DBTerminateSessionsService.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service\SessionHistory; +namespace pcrt\User\Service\SessionHistory; use yii\web\DbSession; diff --git a/src/User/Service/SessionHistory/SessionHistoryDecorator.php b/src/User/Service/SessionHistory/SessionHistoryDecorator.php index d999a9a..72830a0 100755 --- a/src/User/Service/SessionHistory/SessionHistoryDecorator.php +++ b/src/User/Service/SessionHistory/SessionHistoryDecorator.php @@ -9,12 +9,12 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service\SessionHistory; +namespace pcrt\User\Service\SessionHistory; -use Da\User\Model\SessionHistory; -use Da\User\Query\SessionHistoryCondition; -use Da\User\Query\SessionHistoryQuery; -use Da\User\Traits\ModuleAwareTrait; +use pcrt\User\Model\SessionHistory; +use pcrt\User\Query\SessionHistoryCondition; +use pcrt\User\Query\SessionHistoryQuery; +use pcrt\User\Traits\ModuleAwareTrait; use Yii; use yii\base\InvalidArgumentException as BaseInvalidArgumentException; use yii\db\Exception; diff --git a/src/User/Service/SessionHistory/TerminateSessionsService.php b/src/User/Service/SessionHistory/TerminateSessionsService.php index 8a7100a..715182f 100755 --- a/src/User/Service/SessionHistory/TerminateSessionsService.php +++ b/src/User/Service/SessionHistory/TerminateSessionsService.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service\SessionHistory; +namespace pcrt\User\Service\SessionHistory; class TerminateSessionsService implements TerminateSessionsServiceInterface { diff --git a/src/User/Service/SessionHistory/TerminateSessionsServiceInterface.php b/src/User/Service/SessionHistory/TerminateSessionsServiceInterface.php index a8d9ff7..2dd1d99 100755 --- a/src/User/Service/SessionHistory/TerminateSessionsServiceInterface.php +++ b/src/User/Service/SessionHistory/TerminateSessionsServiceInterface.php @@ -9,9 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service\SessionHistory; +namespace pcrt\User\Service\SessionHistory; -use Da\User\Contracts\ServiceInterface; +use pcrt\User\Contracts\ServiceInterface; interface TerminateSessionsServiceInterface extends ServiceInterface { diff --git a/src/User/Service/SessionHistory/TerminateUserSessionsService.php b/src/User/Service/SessionHistory/TerminateUserSessionsService.php index 5c182a5..23edbeb 100755 --- a/src/User/Service/SessionHistory/TerminateUserSessionsService.php +++ b/src/User/Service/SessionHistory/TerminateUserSessionsService.php @@ -9,14 +9,14 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service\SessionHistory; +namespace pcrt\User\Service\SessionHistory; -use Da\User\Contracts\ServiceInterface; -use Da\User\Event\SessionEvent; -use Da\User\Model\SessionHistory; -use Da\User\Model\User; -use Da\User\Traits\ContainerAwareTrait; -use Da\User\Traits\ModuleAwareTrait; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Event\SessionEvent; +use pcrt\User\Model\SessionHistory; +use pcrt\User\Model\User; +use pcrt\User\Traits\ContainerAwareTrait; +use pcrt\User\Traits\ModuleAwareTrait; use Yii; use yii\web\Session; diff --git a/src/User/Service/SocialNetworkAccountConnectService.php b/src/User/Service/SocialNetworkAccountConnectService.php index 2c903ff..e54bc03 100644 --- a/src/User/Service/SocialNetworkAccountConnectService.php +++ b/src/User/Service/SocialNetworkAccountConnectService.php @@ -9,16 +9,16 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service; +namespace pcrt\User\Service; -use Da\User\Contracts\AuthClientInterface; -use Da\User\Contracts\ServiceInterface; -use Da\User\Controller\SecurityController; -use Da\User\Event\SocialNetworkAuthEvent; -use Da\User\Model\SocialNetworkAccount; -use Da\User\Model\User; -use Da\User\Query\SocialNetworkAccountQuery; -use Da\User\Traits\ContainerAwareTrait; +use pcrt\User\Contracts\AuthClientInterface; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Controller\SecurityController; +use pcrt\User\Event\SocialNetworkAuthEvent; +use pcrt\User\Model\SocialNetworkAccount; +use pcrt\User\Model\User; +use pcrt\User\Query\SocialNetworkAccountQuery; +use pcrt\User\Traits\ContainerAwareTrait; use Yii; class SocialNetworkAccountConnectService implements ServiceInterface diff --git a/src/User/Service/SocialNetworkAuthenticateService.php b/src/User/Service/SocialNetworkAuthenticateService.php index 5d7c669..0e91282 100644 --- a/src/User/Service/SocialNetworkAuthenticateService.php +++ b/src/User/Service/SocialNetworkAuthenticateService.php @@ -9,17 +9,17 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service; +namespace pcrt\User\Service; -use Da\User\Contracts\AuthClientInterface; -use Da\User\Contracts\ServiceInterface; -use Da\User\Controller\SecurityController; -use Da\User\Event\SocialNetworkAuthEvent; -use Da\User\Model\SocialNetworkAccount; -use Da\User\Model\User; -use Da\User\Query\SocialNetworkAccountQuery; -use Da\User\Query\UserQuery; -use Da\User\Traits\ModuleAwareTrait; +use pcrt\User\Contracts\AuthClientInterface; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Controller\SecurityController; +use pcrt\User\Event\SocialNetworkAuthEvent; +use pcrt\User\Model\SocialNetworkAccount; +use pcrt\User\Model\User; +use pcrt\User\Query\SocialNetworkAccountQuery; +use pcrt\User\Query\UserQuery; +use pcrt\User\Traits\ModuleAwareTrait; use Yii; use yii\authclient\AuthAction; use yii\helpers\Url; diff --git a/src/User/Service/SwitchIdentityService.php b/src/User/Service/SwitchIdentityService.php index 4038c33..be52e87 100644 --- a/src/User/Service/SwitchIdentityService.php +++ b/src/User/Service/SwitchIdentityService.php @@ -9,15 +9,15 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service; +namespace pcrt\User\Service; -use Da\User\Contracts\ServiceInterface; -use Da\User\Controller\AdminController; -use Da\User\Event\UserEvent; -use Da\User\Model\User; -use Da\User\Module; -use Da\User\Query\UserQuery; -use Da\User\Traits\ContainerAwareTrait; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Controller\AdminController; +use pcrt\User\Event\UserEvent; +use pcrt\User\Model\User; +use pcrt\User\Module; +use pcrt\User\Query\UserQuery; +use pcrt\User\Traits\ContainerAwareTrait; use Yii; use yii\web\ForbiddenHttpException; use yii\web\IdentityInterface; diff --git a/src/User/Service/TwoFactorEmailCodeGeneratorService.php b/src/User/Service/TwoFactorEmailCodeGeneratorService.php index c60e707..174111b 100644 --- a/src/User/Service/TwoFactorEmailCodeGeneratorService.php +++ b/src/User/Service/TwoFactorEmailCodeGeneratorService.php @@ -9,12 +9,12 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service; +namespace pcrt\User\Service; -use Da\TwoFA\Manager; -use Da\User\Contracts\ServiceInterface; -use Da\User\Factory\MailFactory; -use Da\User\Model\User; +use pcrt\TwoFA\Manager; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Factory\MailFactory; +use pcrt\User\Model\User; use Yii; class TwoFactorEmailCodeGeneratorService implements ServiceInterface diff --git a/src/User/Service/TwoFactorQrCodeUriGeneratorService.php b/src/User/Service/TwoFactorQrCodeUriGeneratorService.php index 0492bdc..97437e6 100644 --- a/src/User/Service/TwoFactorQrCodeUriGeneratorService.php +++ b/src/User/Service/TwoFactorQrCodeUriGeneratorService.php @@ -9,13 +9,13 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service; +namespace pcrt\User\Service; -use Da\TwoFA\Manager; -use Da\TwoFA\Service\QrCodeDataUriGeneratorService; -use Da\TwoFA\Service\TOTPSecretKeyUriGeneratorService; -use Da\User\Contracts\ServiceInterface; -use Da\User\Model\User; +use pcrt\TwoFA\Manager; +use pcrt\TwoFA\Service\QrCodeDataUriGeneratorService; +use pcrt\TwoFA\Service\TOTPSecretKeyUriGeneratorService; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Model\User; use Yii; class TwoFactorQrCodeUriGeneratorService implements ServiceInterface diff --git a/src/User/Service/TwoFactorSmsCodeGeneratorService.php b/src/User/Service/TwoFactorSmsCodeGeneratorService.php index 9fd92ac..fbfd1e7 100644 --- a/src/User/Service/TwoFactorSmsCodeGeneratorService.php +++ b/src/User/Service/TwoFactorSmsCodeGeneratorService.php @@ -9,12 +9,12 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service; +namespace pcrt\User\Service; -use Da\TwoFA\Manager; -use Da\User\Contracts\ServiceInterface; -use Da\User\Factory\MailFactory; -use Da\User\Model\User; +use pcrt\TwoFA\Manager; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Factory\MailFactory; +use pcrt\User\Model\User; use yetopen\smssender\SmsSenderInterface; use Yii; use yii\di\Instance; diff --git a/src/User/Service/UpdateAuthAssignmentsService.php b/src/User/Service/UpdateAuthAssignmentsService.php index 20cbd9a..f5c705e 100644 --- a/src/User/Service/UpdateAuthAssignmentsService.php +++ b/src/User/Service/UpdateAuthAssignmentsService.php @@ -9,11 +9,11 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service; +namespace pcrt\User\Service; -use Da\User\Contracts\ServiceInterface; -use Da\User\Model\Assignment; -use Da\User\Traits\AuthManagerAwareTrait; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Model\Assignment; +use pcrt\User\Traits\AuthManagerAwareTrait; class UpdateAuthAssignmentsService implements ServiceInterface { diff --git a/src/User/Service/UserBlockService.php b/src/User/Service/UserBlockService.php index 2ed2804..cfdea26 100644 --- a/src/User/Service/UserBlockService.php +++ b/src/User/Service/UserBlockService.php @@ -9,14 +9,14 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service; +namespace pcrt\User\Service; -use Da\User\Contracts\ServiceInterface; -use Da\User\Controller\AdminController; -use Da\User\Controller\api\v1\AdminController as AdminControllerRest; -use Da\User\Event\UserEvent; -use Da\User\Helper\SecurityHelper; -use Da\User\Model\User; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Controller\AdminController; +use pcrt\User\Controller\api\v1\AdminController as AdminControllerRest; +use pcrt\User\Event\UserEvent; +use pcrt\User\Helper\SecurityHelper; +use pcrt\User\Model\User; use TypeError; class UserBlockService implements ServiceInterface diff --git a/src/User/Service/UserConfirmationService.php b/src/User/Service/UserConfirmationService.php index ab52ed4..ef0661e 100644 --- a/src/User/Service/UserConfirmationService.php +++ b/src/User/Service/UserConfirmationService.php @@ -9,12 +9,12 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service; +namespace pcrt\User\Service; -use Da\User\Contracts\ServiceInterface; -use Da\User\Event\UserEvent; -use Da\User\Model\User; -use Da\User\Traits\MailAwareTrait; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Event\UserEvent; +use pcrt\User\Model\User; +use pcrt\User\Traits\MailAwareTrait; class UserConfirmationService implements ServiceInterface { diff --git a/src/User/Service/UserCreateService.php b/src/User/Service/UserCreateService.php index 491873e..72ce938 100644 --- a/src/User/Service/UserCreateService.php +++ b/src/User/Service/UserCreateService.php @@ -9,14 +9,14 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service; +namespace pcrt\User\Service; -use Da\User\Contracts\ServiceInterface; -use Da\User\Event\UserEvent; -use Da\User\Helper\SecurityHelper; -use Da\User\Model\User; -use Da\User\Traits\MailAwareTrait; -use Da\User\Traits\ModuleAwareTrait; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Event\UserEvent; +use pcrt\User\Helper\SecurityHelper; +use pcrt\User\Model\User; +use pcrt\User\Traits\MailAwareTrait; +use pcrt\User\Traits\ModuleAwareTrait; use Exception; use Yii; use yii\base\InvalidCallException; diff --git a/src/User/Service/UserRegisterService.php b/src/User/Service/UserRegisterService.php index a48932e..c25cc4e 100644 --- a/src/User/Service/UserRegisterService.php +++ b/src/User/Service/UserRegisterService.php @@ -9,15 +9,15 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Service; +namespace pcrt\User\Service; -use Da\User\Contracts\ServiceInterface; -use Da\User\Event\UserEvent; -use Da\User\Factory\TokenFactory; -use Da\User\Helper\SecurityHelper; -use Da\User\Model\User; -use Da\User\Traits\MailAwareTrait; -use Da\User\Traits\ModuleAwareTrait; +use pcrt\User\Contracts\ServiceInterface; +use pcrt\User\Event\UserEvent; +use pcrt\User\Factory\TokenFactory; +use pcrt\User\Helper\SecurityHelper; +use pcrt\User\Model\User; +use pcrt\User\Traits\MailAwareTrait; +use pcrt\User\Traits\ModuleAwareTrait; use Exception; use Yii; use yii\base\InvalidCallException; diff --git a/src/User/Strategy/DefaultEmailChangeStrategy.php b/src/User/Strategy/DefaultEmailChangeStrategy.php index 721e440..8581c5a 100644 --- a/src/User/Strategy/DefaultEmailChangeStrategy.php +++ b/src/User/Strategy/DefaultEmailChangeStrategy.php @@ -9,13 +9,13 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Strategy; +namespace pcrt\User\Strategy; -use Da\User\Contracts\MailChangeStrategyInterface; -use Da\User\Factory\MailFactory; -use Da\User\Factory\TokenFactory; -use Da\User\Form\SettingsForm; -use Da\User\Traits\ContainerAwareTrait; +use pcrt\User\Contracts\MailChangeStrategyInterface; +use pcrt\User\Factory\MailFactory; +use pcrt\User\Factory\TokenFactory; +use pcrt\User\Form\SettingsForm; +use pcrt\User\Traits\ContainerAwareTrait; use Yii; class DefaultEmailChangeStrategy implements MailChangeStrategyInterface diff --git a/src/User/Strategy/InsecureEmailChangeStrategy.php b/src/User/Strategy/InsecureEmailChangeStrategy.php index 3e67bb0..a264d8e 100644 --- a/src/User/Strategy/InsecureEmailChangeStrategy.php +++ b/src/User/Strategy/InsecureEmailChangeStrategy.php @@ -9,10 +9,10 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Strategy; +namespace pcrt\User\Strategy; -use Da\User\Contracts\MailChangeStrategyInterface; -use Da\User\Form\SettingsForm; +use pcrt\User\Contracts\MailChangeStrategyInterface; +use pcrt\User\Form\SettingsForm; class InsecureEmailChangeStrategy implements MailChangeStrategyInterface { diff --git a/src/User/Strategy/SecureEmailChangeStrategy.php b/src/User/Strategy/SecureEmailChangeStrategy.php index 94539db..7f8024b 100644 --- a/src/User/Strategy/SecureEmailChangeStrategy.php +++ b/src/User/Strategy/SecureEmailChangeStrategy.php @@ -9,14 +9,14 @@ * the LICENSE file that was distributed with this source code. */ -namespace Da\User\Strategy; +namespace pcrt\User\Strategy; -use Da\User\Contracts\MailChangeStrategyInterface; -use Da\User\Factory\MailFactory; -use Da\User\Factory\TokenFactory; -use Da\User\Form\SettingsForm; -use Da\User\Model\User; -use Da\User\Traits\ContainerAwareTrait; +use pcrt\User\Contracts\MailChangeStrategyInterface; +use pcrt\User\Factory\MailFactory; +use pcrt\User\Factory\TokenFactory; +use pcrt\User\Form\SettingsForm; +use pcrt\User\Model\User; +use pcrt\User\Traits\ContainerAwareTrait; use Yii; class SecureEmailChangeStrategy implements MailChangeStrategyInterface diff --git a/src/User/Traits/AuthClientUserIdTrait.php b/src/User/Traits/AuthClientUserIdTrait.php index c1166fe..56104e1 100644 --- a/src/User/Traits/AuthClientUserIdTrait.php +++ b/src/User/Traits/AuthClientUserIdTrait.php @@ -1,11 +1,11 @@ diff --git a/src/User/resources/views/admin/_assignments.php b/src/User/resources/views/admin/_assignments.php index ae6ac81..9101a6d 100644 --- a/src/User/resources/views/admin/_assignments.php +++ b/src/User/resources/views/admin/_assignments.php @@ -9,12 +9,12 @@ * the LICENSE file that was distributed with this source code. */ -use Da\User\Widget\AssignmentsWidget; +use pcrt\User\Widget\AssignmentsWidget; /** @var yii\web\View $this */ -/** @var Da\User\Model\User $user */ +/** @var pcrt\User\Model\User $user */ /** @var string[] $params */ -/** @var \Da\User\Module $module */ +/** @var \pcrt\User\Module $module */ ?> diff --git a/src/User/resources/views/admin/_info.php b/src/User/resources/views/admin/_info.php index a2de143..caa2c6b 100644 --- a/src/User/resources/views/admin/_info.php +++ b/src/User/resources/views/admin/_info.php @@ -10,8 +10,8 @@ */ /** @var yii\web\View $this */ -/** @var Da\User\Model\User $user */ -/** @var \Da\User\Module $module */ +/** @var pcrt\User\Model\User $user */ +/** @var \pcrt\User\Module $module */ ?> diff --git a/src/User/resources/views/admin/_profile.php b/src/User/resources/views/admin/_profile.php index ef25b90..a055cb1 100644 --- a/src/User/resources/views/admin/_profile.php +++ b/src/User/resources/views/admin/_profile.php @@ -14,9 +14,9 @@ use yii\helpers\Html; /** * @var yii\web\View $this - * @var \Da\User\Model\User $user - * @var \Da\User\Model\Profile $profile - * @var \Da\User\Module $module + * @var \pcrt\User\Model\User $user + * @var \pcrt\User\Model\Profile $profile + * @var \pcrt\User\Module $module */ ?> diff --git a/src/User/resources/views/admin/_session-history.php b/src/User/resources/views/admin/_session-history.php index f29f7f3..c6d6f82 100755 --- a/src/User/resources/views/admin/_session-history.php +++ b/src/User/resources/views/admin/_session-history.php @@ -9,12 +9,12 @@ * the LICENSE file that was distributed with this source code. */ -use Da\User\Widget\SessionStatusWidget; +use pcrt\User\Widget\SessionStatusWidget; use yii\helpers\Html; use yii\grid\GridView; use yii\widgets\Pjax; -use Da\User\Model\SessionHistory; -use Da\User\Search\SessionHistorySearch; +use pcrt\User\Model\SessionHistory; +use pcrt\User\Search\SessionHistorySearch; use yii\web\View; use yii\data\ActiveDataProvider; @@ -22,8 +22,8 @@ use yii\data\ActiveDataProvider; * @var View $this * @var SessionHistorySearch $searchModel * @var ActiveDataProvider $dataProvider - * @var \Da\User\Model\User $user - * @var \Da\User\Module $module + * @var \pcrt\User\Model\User $user + * @var \pcrt\User\Module $module */ ?> diff --git a/src/User/resources/views/admin/_user.php b/src/User/resources/views/admin/_user.php index 5e7303e..7fed839 100644 --- a/src/User/resources/views/admin/_user.php +++ b/src/User/resources/views/admin/_user.php @@ -11,7 +11,7 @@ /** * @var yii\widgets\ActiveForm $form - * @var \Da\User\Model\User $user + * @var \pcrt\User\Model\User $user */ ?> diff --git a/src/User/resources/views/admin/create.php b/src/User/resources/views/admin/create.php index fe61b37..1eb718d 100644 --- a/src/User/resources/views/admin/create.php +++ b/src/User/resources/views/admin/create.php @@ -15,7 +15,7 @@ use yii\helpers\Html; /** * @var yii\web\View $this - * @var \Da\User\Model\User $user + * @var \pcrt\User\Model\User $user */ use yii\helpers\Url; diff --git a/src/User/resources/views/admin/index.php b/src/User/resources/views/admin/index.php index 92a31f2..df4a79d 100644 --- a/src/User/resources/views/admin/index.php +++ b/src/User/resources/views/admin/index.php @@ -17,8 +17,8 @@ use yii\widgets\Pjax; /** * @var yii\web\View $this * @var yii\data\ActiveDataProvider $dataProvider - * @var Da\User\Search\UserSearch $searchModel - * @var Da\User\Module $module + * @var pcrt\User\Search\UserSearch $searchModel + * @var pcrt\User\Module $module */ $this->title = Yii::t('usuario', 'Manage users'); diff --git a/src/User/resources/views/admin/update.php b/src/User/resources/views/admin/update.php index 2de77eb..a9efee8 100755 --- a/src/User/resources/views/admin/update.php +++ b/src/User/resources/views/admin/update.php @@ -9,11 +9,11 @@ * the LICENSE file that was distributed with this source code. */ -use Da\User\Model\User; +use pcrt\User\Model\User; use yii\bootstrap4\Nav; use yii\helpers\Html; use yii\web\View; -use Da\User\Module as UserModule; +use pcrt\User\Module as UserModule; /** * @var View $this diff --git a/src/User/resources/views/mail/confirmation.php b/src/User/resources/views/mail/confirmation.php index 20eb842..5bcca9a 100644 --- a/src/User/resources/views/mail/confirmation.php +++ b/src/User/resources/views/mail/confirmation.php @@ -12,8 +12,8 @@ use yii\helpers\Html; /** - * @var \Da\User\Model\User $user - * @var \Da\User\Model\Token $token + * @var \pcrt\User\Model\User $user + * @var \pcrt\User\Model\Token $token */ ?>

diff --git a/src/User/resources/views/mail/reconfirmation.php b/src/User/resources/views/mail/reconfirmation.php index f41e543..2995584 100644 --- a/src/User/resources/views/mail/reconfirmation.php +++ b/src/User/resources/views/mail/reconfirmation.php @@ -12,7 +12,7 @@ use yii\helpers\Html; /** - * @var \Da\User\Model\Token $token + * @var \pcrt\User\Model\Token $token */ ?>

diff --git a/src/User/resources/views/mail/recovery.php b/src/User/resources/views/mail/recovery.php index c06e276..1b73b30 100644 --- a/src/User/resources/views/mail/recovery.php +++ b/src/User/resources/views/mail/recovery.php @@ -12,8 +12,8 @@ use yii\helpers\Html; /** - * @var \Da\User\Model\User $user - * @var \Da\User\Model\Token $token + * @var \pcrt\User\Model\User $user + * @var \pcrt\User\Model\Token $token */ ?>

diff --git a/src/User/resources/views/mail/text/confirmation.php b/src/User/resources/views/mail/text/confirmation.php index 20a6928..410cb06 100644 --- a/src/User/resources/views/mail/text/confirmation.php +++ b/src/User/resources/views/mail/text/confirmation.php @@ -10,7 +10,7 @@ */ /** - * @var \Da\User\Model\Token $token + * @var \pcrt\User\Model\Token $token */ ?> , diff --git a/src/User/resources/views/mail/text/reconfirmation.php b/src/User/resources/views/mail/text/reconfirmation.php index 808139c..6592ff1 100644 --- a/src/User/resources/views/mail/text/reconfirmation.php +++ b/src/User/resources/views/mail/text/reconfirmation.php @@ -10,7 +10,7 @@ */ /** - * @var \Da\User\Model\Token $token + * @var \pcrt\User\Model\Token $token */ ?> , diff --git a/src/User/resources/views/mail/text/recovery.php b/src/User/resources/views/mail/text/recovery.php index 08a7210..6628790 100644 --- a/src/User/resources/views/mail/text/recovery.php +++ b/src/User/resources/views/mail/text/recovery.php @@ -10,7 +10,7 @@ */ /** - * @var \Da\User\Model\Token $token + * @var \pcrt\User\Model\Token $token */ ?> , diff --git a/src/User/resources/views/mail/text/welcome.php b/src/User/resources/views/mail/text/welcome.php index 0d4516b..6d4423e 100644 --- a/src/User/resources/views/mail/text/welcome.php +++ b/src/User/resources/views/mail/text/welcome.php @@ -10,9 +10,9 @@ */ /** - * @var \Da\User\Model\User $user - * @var \Da\User\Model\Token $token - * @var \Da\User\Module $module + * @var \pcrt\User\Model\User $user + * @var \pcrt\User\Model\Token $token + * @var \pcrt\User\Module $module * @var bool $showPassword */ diff --git a/src/User/resources/views/mail/twofactorcode.php b/src/User/resources/views/mail/twofactorcode.php index 210f84c..7773cfe 100644 --- a/src/User/resources/views/mail/twofactorcode.php +++ b/src/User/resources/views/mail/twofactorcode.php @@ -13,7 +13,7 @@ use yii\helpers\Html; /** * @var String $code - * @var \Da\User\Model\Token $token + * @var \pcrt\User\Model\Token $token */ ?>

diff --git a/src/User/resources/views/mail/welcome.php b/src/User/resources/views/mail/welcome.php index 8efa10a..683fbfb 100644 --- a/src/User/resources/views/mail/welcome.php +++ b/src/User/resources/views/mail/welcome.php @@ -13,9 +13,9 @@ use yii\helpers\Html; use yii\helpers\Url; /** - * @var \Da\User\Module $module - * @var \Da\User\Model\User $user - * @var \Da\User\Model\Token $token + * @var \pcrt\User\Module $module + * @var \pcrt\User\Model\User $user + * @var \pcrt\User\Model\Token $token * @var bool $showPassword */ diff --git a/src/User/resources/views/permission/_form.php b/src/User/resources/views/permission/_form.php index 334cb49..f9525b9 100644 --- a/src/User/resources/views/permission/_form.php +++ b/src/User/resources/views/permission/_form.php @@ -16,7 +16,7 @@ use yii\widgets\ActiveForm; /** * @var yii\web\View $this - * @var Da\User\Model\Permission $model + * @var pcrt\User\Model\Permission $model * @var string[] $unassignedItems */ diff --git a/src/User/resources/views/permission/create.php b/src/User/resources/views/permission/create.php index 8cc0236..fdb61a6 100644 --- a/src/User/resources/views/permission/create.php +++ b/src/User/resources/views/permission/create.php @@ -11,9 +11,9 @@ /** * @var yii\web\View $this - * @var Da\User\Model\Permission $model + * @var pcrt\User\Model\Permission $model * @var string[] $unassignedItems - * @var \Da\User\Module $module + * @var \pcrt\User\Module $module */ $this->title = Yii::t('usuario', 'Create new permission'); diff --git a/src/User/resources/views/permission/index.php b/src/User/resources/views/permission/index.php index 57ee3be..bfdbedf 100644 --- a/src/User/resources/views/permission/index.php +++ b/src/User/resources/views/permission/index.php @@ -12,8 +12,8 @@ /** * @var \yii\data\ActiveDataProvider $dataProvider * @var yii\web\View $this - * @var \Da\User\Search\PermissionSearch $searchModel - * @var \Da\User\Module $module + * @var \pcrt\User\Search\PermissionSearch $searchModel + * @var \pcrt\User\Module $module */ use yii\grid\ActionColumn; use yii\grid\GridView; diff --git a/src/User/resources/views/permission/update.php b/src/User/resources/views/permission/update.php index 7b1ab44..d6e02f6 100644 --- a/src/User/resources/views/permission/update.php +++ b/src/User/resources/views/permission/update.php @@ -11,9 +11,9 @@ /** * @var yii\web\View $this - * @var Da\User\Model\Permission $model + * @var pcrt\User\Model\Permission $model * @var string[] $unassignedItems - * @var \Da\User\Module $module + * @var \pcrt\User\Module $module */ $this->title = Yii::t('usuario', 'Update permission'); diff --git a/src/User/resources/views/profile/_menu.php b/src/User/resources/views/profile/_menu.php index 5242b77..10e5d39 100644 --- a/src/User/resources/views/profile/_menu.php +++ b/src/User/resources/views/profile/_menu.php @@ -10,8 +10,8 @@ */ use yii\helpers\Html; -use Da\User\Module as UserModule; -use Da\User\Model\User; +use pcrt\User\Module as UserModule; +use pcrt\User\Model\User; use yii\bootstrap4\Nav; /** @var User $user */ @@ -25,14 +25,16 @@ $networksVisible = count(Yii::$app->authClientCollection->clients) > 0;

- profile->getAvatarUrl(48), - [ - 'class' => 'rounded-lg', - 'alt' => $user->username, - ] - ) ?> - username ?> +
+ profile->getAvatarUrl(36), + [ + 'class' => 'rounded-lg mr-2 mb-1', + 'alt' => $user->username, + ] + ) ?> + username ?> +

diff --git a/src/User/resources/views/profile/account.php b/src/User/resources/views/profile/account.php index 20c71fe..5219c6d 100644 --- a/src/User/resources/views/profile/account.php +++ b/src/User/resources/views/profile/account.php @@ -17,13 +17,13 @@ use dmstr\widgets\Alert; /** * @var yii\web\View $this * @var yii\widgets\ActiveForm $form - * @var \Da\User\Form\SettingsForm $model + * @var \pcrt\User\Form\SettingsForm $model */ $this->title = Yii::t('usuario', 'Account settings'); $this->params['breadcrumbs'][] = $this->title; -/** @var \Da\User\Module $module */ +/** @var \pcrt\User\Module $module */ $module = Yii::$app->getModule('user'); ?>
diff --git a/src/User/resources/views/profile/gdpr-delete.php b/src/User/resources/views/profile/gdpr-delete.php index 735458c..c8a5a55 100644 --- a/src/User/resources/views/profile/gdpr-delete.php +++ b/src/User/resources/views/profile/gdpr-delete.php @@ -11,7 +11,7 @@ use yii\widgets\ActiveForm; use yii\helpers\Html; -/** @var \Da\User\Form\GdprDeleteForm $model */ +/** @var \pcrt\User\Form\GdprDeleteForm $model */ $this->title = Yii::t('usuario', 'Delete personal data'); ?> diff --git a/src/User/resources/views/profile/networks.php b/src/User/resources/views/profile/networks.php index 8629987..d9ec4ba 100644 --- a/src/User/resources/views/profile/networks.php +++ b/src/User/resources/views/profile/networks.php @@ -9,13 +9,13 @@ * the LICENSE file that was distributed with this source code. */ -use Da\User\Widget\ConnectWidget; +use pcrt\User\Widget\ConnectWidget; use yii\helpers\Html; /** * @var yii\web\View $this * @var yii\widgets\ActiveForm $form - * @var \Da\User\Model\User $user + * @var \pcrt\User\Model\User $user */ $this->title = Yii::t('usuario', 'Networks'); diff --git a/src/User/resources/views/profile/privacy.php b/src/User/resources/views/profile/privacy.php index 4892c2a..73aff59 100644 --- a/src/User/resources/views/profile/privacy.php +++ b/src/User/resources/views/profile/privacy.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /** @var \yii\web\View $this */ -/** @var \Da\User\Module $module */ +/** @var \pcrt\User\Module $module */ $this->title = Yii::t('usuario', 'Privacy settings'); diff --git a/src/User/resources/views/profile/profile.php b/src/User/resources/views/profile/profile.php index c20ef4b..fc680fc 100644 --- a/src/User/resources/views/profile/profile.php +++ b/src/User/resources/views/profile/profile.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -use Da\User\Helper\TimezoneHelper; +use pcrt\User\Helper\TimezoneHelper; use yii\helpers\ArrayHelper; use yii\helpers\Html; use yii\widgets\ActiveForm; @@ -17,7 +17,7 @@ use yii\widgets\ActiveForm; /** * @var yii\web\View $this * @var yii\widgets\ActiveForm $form - * @var \Da\User\Model\Profile $model + * @var \pcrt\User\Model\Profile $model * @var TimezoneHelper $timezoneHelper */ diff --git a/src/User/resources/views/profile/session-history.php b/src/User/resources/views/profile/session-history.php index cad394d..8ca3504 100644 --- a/src/User/resources/views/profile/session-history.php +++ b/src/User/resources/views/profile/session-history.php @@ -12,11 +12,11 @@ use yii\helpers\Html; use yii\grid\GridView; use yii\widgets\Pjax; -use Da\User\Model\SessionHistory; -use Da\User\Search\SessionHistorySearch; +use pcrt\User\Model\SessionHistory; +use pcrt\User\Search\SessionHistorySearch; use yii\web\View; use yii\data\ActiveDataProvider; -use Da\User\Widget\SessionStatusWidget; +use pcrt\User\Widget\SessionStatusWidget; /** * @var View $this diff --git a/src/User/resources/views/profile/two-factor.php b/src/User/resources/views/profile/two-factor.php index 439b82e..c37a603 100644 --- a/src/User/resources/views/profile/two-factor.php +++ b/src/User/resources/views/profile/two-factor.php @@ -10,7 +10,7 @@ /** @var string $id */ /** @var string $uri */ -/** @var Da\User\Model\User $user */ +/** @var pcrt\User\Model\User $user */ ?>
diff --git a/src/User/resources/views/recovery/request.php b/src/User/resources/views/recovery/request.php index 4b9ff9a..5c9c1b8 100644 --- a/src/User/resources/views/recovery/request.php +++ b/src/User/resources/views/recovery/request.php @@ -15,7 +15,7 @@ use yii\widgets\ActiveForm; /** * @var yii\web\View $this * @var yii\widgets\ActiveForm $form - * @var \Da\User\Form\RecoveryForm $model + * @var \pcrt\User\Form\RecoveryForm $model */ $this->title = Yii::t('usuario', 'Recover your password'); diff --git a/src/User/resources/views/recovery/reset.php b/src/User/resources/views/recovery/reset.php index bb6097a..e280769 100644 --- a/src/User/resources/views/recovery/reset.php +++ b/src/User/resources/views/recovery/reset.php @@ -15,7 +15,7 @@ use yii\widgets\ActiveForm; /** * @var yii\web\View $this * @var yii\widgets\ActiveForm $form - * @var \Da\User\Form\RecoveryForm $model + * @var \pcrt\User\Form\RecoveryForm $model */ $this->title = Yii::t('usuario', 'Reset your password'); diff --git a/src/User/resources/views/registration/connect.php b/src/User/resources/views/registration/connect.php index 927c58d..5a6fbed 100644 --- a/src/User/resources/views/registration/connect.php +++ b/src/User/resources/views/registration/connect.php @@ -15,8 +15,8 @@ use yii\widgets\ActiveForm; /** * @var yii\web\View $this * @var yii\widgets\ActiveForm $form - * @var \Da\User\Model\User $model - * @var \Da\User\Model\SocialNetworkAccount $account + * @var \pcrt\User\Model\User $model + * @var \pcrt\User\Model\SocialNetworkAccount $account */ $this->title = Yii::t('usuario', 'Sign in'); diff --git a/src/User/resources/views/registration/register.php b/src/User/resources/views/registration/register.php index 6705341..ba8d3d4 100644 --- a/src/User/resources/views/registration/register.php +++ b/src/User/resources/views/registration/register.php @@ -14,9 +14,9 @@ use yii\widgets\ActiveForm; /** * @var yii\web\View $this - * @var \Da\User\Form\RegistrationForm $model - * @var \Da\User\Model\User $user - * @var \Da\User\Module $module + * @var \pcrt\User\Form\RegistrationForm $model + * @var \pcrt\User\Model\User $user + * @var \pcrt\User\Module $module */ $this->title = Yii::t('usuario', 'Sign up'); diff --git a/src/User/resources/views/registration/resend.php b/src/User/resources/views/registration/resend.php index 71bdbde..d4bd817 100644 --- a/src/User/resources/views/registration/resend.php +++ b/src/User/resources/views/registration/resend.php @@ -14,7 +14,7 @@ use yii\widgets\ActiveForm; /** * @var yii\web\View $this - * @var \Da\User\Form\ResendForm $model + * @var \pcrt\User\Form\ResendForm $model */ $this->title = Yii::t('usuario', 'Request new confirmation message'); diff --git a/src/User/resources/views/role/_form.php b/src/User/resources/views/role/_form.php index 3ebd20e..5c580a8 100644 --- a/src/User/resources/views/role/_form.php +++ b/src/User/resources/views/role/_form.php @@ -11,10 +11,10 @@ /** * @var yii\web\View $this - * @var \Da\User\Model\Role $model + * @var \pcrt\User\Model\Role $model */ -use Da\User\Helper\AuthHelper; +use pcrt\User\Helper\AuthHelper; use pcrt\widgets\select2\Select2; use yii\helpers\ArrayHelper; use yii\helpers\Html; diff --git a/src/User/resources/views/role/create.php b/src/User/resources/views/role/create.php index 77bb661..cd7ddda 100644 --- a/src/User/resources/views/role/create.php +++ b/src/User/resources/views/role/create.php @@ -11,9 +11,9 @@ /** * @var yii\web\View $this - * @var \Da\User\Model\Role $model + * @var \pcrt\User\Model\Role $model * @var string[] $unassignedItems - * @var \Da\User\Module $module + * @var \pcrt\User\Module $module */ $this->title = Yii::t('usuario', 'Create new role'); $this->params['breadcrumbs'][] = $this->title; diff --git a/src/User/resources/views/role/index.php b/src/User/resources/views/role/index.php index 882baab..bcbc65a 100644 --- a/src/User/resources/views/role/index.php +++ b/src/User/resources/views/role/index.php @@ -15,9 +15,9 @@ use yii\helpers\Url; /** * @var \yii\data\DataProviderInterface $dataProvider - * @var \Da\User\Search\RoleSearch $searchModel + * @var \pcrt\User\Search\RoleSearch $searchModel * @var yii\web\View $this - * @var \Da\User\Module $module + * @var \pcrt\User\Module $module */ $this->title = Yii::t('usuario', 'Roles'); diff --git a/src/User/resources/views/role/update.php b/src/User/resources/views/role/update.php index b5121c9..03c5e1b 100644 --- a/src/User/resources/views/role/update.php +++ b/src/User/resources/views/role/update.php @@ -11,9 +11,9 @@ /** * @var yii\web\View $this - * @var \Da\User\Model\Role $model + * @var \pcrt\User\Model\Role $model * @var string[] $unassignedItems - * @var \Da\User\Module $module + * @var \pcrt\User\Module $module */ $this->title = Yii::t('usuario', 'Update role'); $this->params['breadcrumbs'][] = $this->title; diff --git a/src/User/resources/views/rule/_form.php b/src/User/resources/views/rule/_form.php index a1d6d7e..364c311 100644 --- a/src/User/resources/views/rule/_form.php +++ b/src/User/resources/views/rule/_form.php @@ -2,7 +2,7 @@ /** * @var yii\web\View $this - * @var \Da\User\Model\Rule $model + * @var \pcrt\User\Model\Rule $model */ use yii\helpers\Html; diff --git a/src/User/resources/views/rule/create.php b/src/User/resources/views/rule/create.php index a03f96c..e3aec2a 100644 --- a/src/User/resources/views/rule/create.php +++ b/src/User/resources/views/rule/create.php @@ -11,9 +11,9 @@ /** * @var yii\web\View $this - * @var \Da\User\Model\Rule $model + * @var \pcrt\User\Model\Rule $model * @var string[] $unassignedItems - * @var \Da\User\Module $module + * @var \pcrt\User\Module $module */ $this->title = Yii::t('usuario', 'Create new rule'); $this->params['breadcrumbs'][] = $this->title; diff --git a/src/User/resources/views/rule/index.php b/src/User/resources/views/rule/index.php index e31d2e1..580420c 100644 --- a/src/User/resources/views/rule/index.php +++ b/src/User/resources/views/rule/index.php @@ -7,9 +7,9 @@ use yii\rbac\Rule; /** * @var \yii\data\ActiveDataProvider $dataProvider - * @var \Da\User\Search\RuleSearch $searchModel + * @var \pcrt\User\Search\RuleSearch $searchModel * @var yii\web\View $this - * @var \Da\User\Module $module + * @var \pcrt\User\Module $module */ $this->title = Yii::t('usuario', 'Rules'); diff --git a/src/User/resources/views/rule/update.php b/src/User/resources/views/rule/update.php index 53e086a..3d8ae99 100644 --- a/src/User/resources/views/rule/update.php +++ b/src/User/resources/views/rule/update.php @@ -11,9 +11,9 @@ /** * @var yii\web\View $this - * @var \Da\User\Model\Rule $model + * @var \pcrt\User\Model\Rule $model * @var string[] $unassignedItems - * @var \Da\User\Module $module + * @var \pcrt\User\Module $module */ $this->title = Yii::t('usuario', 'Update rule'); diff --git a/src/User/resources/views/security/confirm.php b/src/User/resources/views/security/confirm.php index ed06474..99c6287 100644 --- a/src/User/resources/views/security/confirm.php +++ b/src/User/resources/views/security/confirm.php @@ -9,14 +9,14 @@ * the LICENSE file that was distributed with this source code. */ -use Da\User\Widget\ConnectWidget; +use pcrt\User\Widget\ConnectWidget; use yii\helpers\Html; use yii\widgets\ActiveForm; /** * @var yii\web\View $this - * @var \Da\User\Form\LoginForm $model - * @var \Da\User\Module $module + * @var \pcrt\User\Form\LoginForm $model + * @var \pcrt\User\Module $module */ $this->title = Yii::t('usuario', 'Sign in'); diff --git a/src/User/resources/views/security/login.php b/src/User/resources/views/security/login.php index 2c5f2ef..3c7a907 100644 --- a/src/User/resources/views/security/login.php +++ b/src/User/resources/views/security/login.php @@ -9,14 +9,14 @@ * the LICENSE file that was distributed with this source code. */ -use Da\User\Widget\ConnectWidget; +use pcrt\User\Widget\ConnectWidget; use yii\helpers\Html; use yii\widgets\ActiveForm; /** * @var yii\web\View $this - * @var \Da\User\Form\LoginForm $model - * @var \Da\User\Module $module + * @var \pcrt\User\Form\LoginForm $model + * @var \pcrt\User\Module $module */ $this->title = Yii::t('usuario', 'Sign in'); diff --git a/src/User/resources/views/shared/_alert.php b/src/User/resources/views/shared/_alert.php index aaeaee8..8cf5ed6 100644 --- a/src/User/resources/views/shared/_alert.php +++ b/src/User/resources/views/shared/_alert.php @@ -11,7 +11,7 @@ use yii\bootstrap4\Alert; -/** @var \Da\User\Module $module */ +/** @var \pcrt\User\Module $module */ ?> diff --git a/src/User/resources/views/shared/message.php b/src/User/resources/views/shared/message.php index 8cb23e6..7020331 100644 --- a/src/User/resources/views/shared/message.php +++ b/src/User/resources/views/shared/message.php @@ -12,7 +12,7 @@ /** @var \yii\web\View $this */ /** @var string $content */ /** @var string $title */ -/** @var \Da\User\Module $module */ +/** @var \pcrt\User\Module $module */ $this->title = $title; diff --git a/src/User/resources/views/widgets/assignments/form.php b/src/User/resources/views/widgets/assignments/form.php index 3960f94..b3884d7 100644 --- a/src/User/resources/views/widgets/assignments/form.php +++ b/src/User/resources/views/widgets/assignments/form.php @@ -16,7 +16,7 @@ use yii\widgets\ActiveForm; /** @var \yii\web\View $this */ /** @var string[] $availableItems */ -/** @var Da\User\Model\Assignment $model */ +/** @var pcrt\User\Model\Assignment $model */ ?> diff --git a/src/User/resources/views/widgets/login/form.php b/src/User/resources/views/widgets/login/form.php index 90032da..2c96add 100644 --- a/src/User/resources/views/widgets/login/form.php +++ b/src/User/resources/views/widgets/login/form.php @@ -16,7 +16,7 @@ use yii\widgets\ActiveForm; /** * @var yii\web\View $this * @var yii\widgets\ActiveForm $form - * @var Da\User\Form\LoginForm $model + * @var pcrt\User\Form\LoginForm $model * @var string $action */ diff --git a/tests/_app/config/console.php b/tests/_app/config/console.php index 1264cd0..e6837c4 100644 --- a/tests/_app/config/console.php +++ b/tests/_app/config/console.php @@ -4,7 +4,7 @@ return [ 'id' => 'yii2-test-console', 'basePath' => dirname(__DIR__), 'aliases' => [ - '@Da/User' => dirname(dirname(dirname(__DIR__))) . '/src/User', + '@pcrt/User' => dirname(dirname(dirname(__DIR__))) . '/src/User', '@tests' => dirname(dirname(__DIR__)), '@bower' => '@vendor/bower-asset', '@npm' => '@vendor/npm-asset', @@ -14,7 +14,7 @@ return [ 'cache' => null, 'db' => require __DIR__ . '/db.php', 'authManager' => [ - 'class' => Da\User\Component\AuthDbManagerComponent::class, + 'class' => pcrt\User\Component\AuthDbManagerComponent::class, ], 'i18n' => [ 'translations' => [ @@ -34,7 +34,7 @@ return [ 'class' => yii\console\controllers\MigrateController::class, 'migrationPath' => null, 'migrationNamespaces' => [ - 'Da\User\Migration', + 'pcrt\User\Migration', ], ], ], diff --git a/tests/_app/config/test.php b/tests/_app/config/test.php index 4a1eacf..cf92718 100644 --- a/tests/_app/config/test.php +++ b/tests/_app/config/test.php @@ -1,22 +1,22 @@ 'yii2-user-tests', 'basePath' => dirname(__DIR__), 'language' => 'en-US', 'aliases' => [ - '@Da/User' => dirname(dirname(dirname(__DIR__))) . '/src/User', + '@pcrt/User' => dirname(dirname(dirname(__DIR__))) . '/src/User', '@tests' => dirname(dirname(__DIR__)), '@vendor' => VENDOR_DIR, '@bower' => '@vendor/bower-asset', '@npm' => '@vendor/npm-asset', ], - 'bootstrap' => ['Da\User\Bootstrap'], + 'bootstrap' => ['pcrt\User\Bootstrap'], 'modules' => [ 'user' => [ - 'class' => 'Da\User\Module', + 'class' => 'pcrt\User\Module', 'administrators' => ['user'], ], ], diff --git a/tests/_app/controllers/SiteController.php b/tests/_app/controllers/SiteController.php index d0357eb..407228c 100644 --- a/tests/_app/controllers/SiteController.php +++ b/tests/_app/controllers/SiteController.php @@ -2,7 +2,7 @@ namespace app\controllers; -use Da\User\Filter\AccessRuleFilter; +use pcrt\User\Filter\AccessRuleFilter; use yii\filters\AccessControl; use yii\web\Controller; diff --git a/tests/_fixtures/AssignmentFixture.php b/tests/_fixtures/AssignmentFixture.php index fa03a7f..7436ae4 100644 --- a/tests/_fixtures/AssignmentFixture.php +++ b/tests/_fixtures/AssignmentFixture.php @@ -6,6 +6,6 @@ use yii\test\ActiveFixture; class AssignmentFixture extends ActiveFixture { - public $modelClass = 'Da\User\Model\Assignment'; + public $modelClass = 'pcrt\User\Model\Assignment'; public $tableName = 'auth_assignment'; } diff --git a/tests/_fixtures/PermissionFixture.php b/tests/_fixtures/PermissionFixture.php index 26e0364..f1c50b1 100644 --- a/tests/_fixtures/PermissionFixture.php +++ b/tests/_fixtures/PermissionFixture.php @@ -6,6 +6,6 @@ use yii\test\ActiveFixture; class PermissionFixture extends ActiveFixture { - public $modelClass = 'Da\User\Model\Permission'; + public $modelClass = 'pcrt\User\Model\Permission'; public $tableName = 'auth_item'; } diff --git a/tests/_fixtures/ProfileFixture.php b/tests/_fixtures/ProfileFixture.php index 241c530..8fc7811 100644 --- a/tests/_fixtures/ProfileFixture.php +++ b/tests/_fixtures/ProfileFixture.php @@ -6,7 +6,7 @@ use yii\test\ActiveFixture; class ProfileFixture extends ActiveFixture { - public $modelClass = 'Da\User\Model\Profile'; + public $modelClass = 'pcrt\User\Model\Profile'; public $depends = [ 'tests\_fixtures\UserFixture', diff --git a/tests/_fixtures/TokenFixture.php b/tests/_fixtures/TokenFixture.php index 6aecd62..897901b 100644 --- a/tests/_fixtures/TokenFixture.php +++ b/tests/_fixtures/TokenFixture.php @@ -6,7 +6,7 @@ use yii\test\ActiveFixture; class TokenFixture extends ActiveFixture { - public $modelClass = 'Da\User\Model\Token'; + public $modelClass = 'pcrt\User\Model\Token'; public $depends = [ 'tests\_fixtures\UserFixture', diff --git a/tests/_fixtures/UserFixture.php b/tests/_fixtures/UserFixture.php index e071e33..2b9733a 100644 --- a/tests/_fixtures/UserFixture.php +++ b/tests/_fixtures/UserFixture.php @@ -6,5 +6,5 @@ use yii\test\ActiveFixture; class UserFixture extends ActiveFixture { - public $modelClass = 'Da\User\Model\User'; + public $modelClass = 'pcrt\User\Model\User'; } diff --git a/tests/_fixtures/data/token.php b/tests/_fixtures/data/token.php index fdbf3b5..ad8e3c4 100644 --- a/tests/_fixtures/data/token.php +++ b/tests/_fixtures/data/token.php @@ -1,6 +1,6 @@ grabFixture('user', 'seconduser'); $adminUser = $I->grabFixture('user', 'admin'); $I->wantTo('Ensure that profile profile pages are shown only to when user has correct permissions and else forbidden'); -Yii::$app->getModule('user')->profileVisibility = \Da\User\Controller\ProfileController::PROFILE_VISIBILITY_OWNER; +Yii::$app->getModule('user')->profileVisibility = \pcrt\User\Controller\ProfileController::PROFILE_VISIBILITY_OWNER; Yii::$app->getModule('user')->administrators = ['admin']; $I->amLoggedInAs($user); @@ -42,7 +42,7 @@ $I->see('Forbidden'); $I->dontSee('Joined on'); -Yii::$app->getModule('user')->profileVisibility = \Da\User\Controller\ProfileController::PROFILE_VISIBILITY_ADMIN; +Yii::$app->getModule('user')->profileVisibility = \pcrt\User\Controller\ProfileController::PROFILE_VISIBILITY_ADMIN; $I->amLoggedInAs($user); $I->amGoingTo('Profile visibility::PROFILE_VISIBILITY_ADMIN: try to open users own profile page'); $I->amOnRoute('/user/profile/show', ['id' => $user->id]); @@ -71,7 +71,7 @@ $I->see('Forbidden'); $I->dontSee('Joined on'); -Yii::$app->getModule('user')->profileVisibility = \Da\User\Controller\ProfileController::PROFILE_VISIBILITY_USERS; +Yii::$app->getModule('user')->profileVisibility = \pcrt\User\Controller\ProfileController::PROFILE_VISIBILITY_USERS; $I->amLoggedInAs($user); $I->amGoingTo('Profile visibility::PROFILE_VISIBILITY_USERS: try to open users own profile page'); $I->amOnRoute('/user/profile/show', ['id' => $user->id]); @@ -99,7 +99,7 @@ $I->expectTo('See the profile page'); $I->see('Forbidden'); $I->dontSee('Joined on'); -Yii::$app->getModule('user')->profileVisibility = \Da\User\Controller\ProfileController::PROFILE_VISIBILITY_PUBLIC; +Yii::$app->getModule('user')->profileVisibility = \pcrt\User\Controller\ProfileController::PROFILE_VISIBILITY_PUBLIC; Yii::$app->user->logout(); $I->amGoingTo('Profile visibility::PROFILE_VISIBILITY_PUBLIC: try to open users profile page as guest'); diff --git a/tests/functional/RecoveryCept.php b/tests/functional/RecoveryCept.php index 16101a6..e1db5f4 100644 --- a/tests/functional/RecoveryCept.php +++ b/tests/functional/RecoveryCept.php @@ -4,8 +4,8 @@ * @var Codeception\Scenario */ -use Da\User\Model\Token; -use Da\User\Model\User; +use pcrt\User\Model\Token; +use pcrt\User\Model\User; use tests\_fixtures\TokenFixture; use tests\_fixtures\UserFixture; use yii\helpers\Html; diff --git a/tests/functional/RegistrationCest.php b/tests/functional/RegistrationCest.php index d78dceb..34f69f6 100644 --- a/tests/functional/RegistrationCest.php +++ b/tests/functional/RegistrationCest.php @@ -1,9 +1,9 @@ see('Invalid login or password'); $I->amGoingTo('log in using new email address after clicking the confirmation link'); -$emailChangeService = Yii::createObject(\Da\User\Service\EmailChangeService::class, [$token->code, $user]); +$emailChangeService = Yii::createObject(\pcrt\User\Service\EmailChangeService::class, [$token->code, $user]); $emailChangeService->run(); $I->fillField('#loginform-login', 'new_user@example.com'); diff --git a/tests/unit/GeneratePasswordTest.php b/tests/unit/GeneratePasswordTest.php index 2e4168f..439b4b7 100644 --- a/tests/unit/GeneratePasswordTest.php +++ b/tests/unit/GeneratePasswordTest.php @@ -1,6 +1,6 @@