diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index b85b8c6..4f018a4 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -11,7 +11,7 @@ jobs: fail-fast: false matrix: operating-system: ['ubuntu-latest'] - php-versions: ['8.1', '8.0','7.4','7.3', '7.2','7.1','7.0', '5.6'] + php-versions: ['8.1', '8.0','7.4'] services: mariadb: diff --git a/composer.json b/composer.json index dcebae9..a6e4d86 100644 --- a/composer.json +++ b/composer.json @@ -78,7 +78,7 @@ }, "config": { "platform": { - "php": "7.3" + "php": "7.4" }, "preferred-install": { "*": "auto" diff --git a/src/User/Service/UserCreateService.php b/src/User/Service/UserCreateService.php index 1d66720..5dc41ac 100644 --- a/src/User/Service/UserCreateService.php +++ b/src/User/Service/UserCreateService.php @@ -57,7 +57,7 @@ class UserCreateService implements ServiceInterface $model->confirmed_at = time(); $model->password = !empty($model->password) ? $model->password - : $this->securityHelper->generatePassword(8, $this->getModule('user')->minPasswordRequirements); + : $this->securityHelper->generatePassword(8, $this->getModule()->minPasswordRequirements); /** @var UserEvent $event */ $event = $this->make(UserEvent::class, [$model]); diff --git a/src/User/Service/UserRegisterService.php b/src/User/Service/UserRegisterService.php index 747d9eb..a48932e 100644 --- a/src/User/Service/UserRegisterService.php +++ b/src/User/Service/UserRegisterService.php @@ -51,7 +51,7 @@ class UserRegisterService implements ServiceInterface try { $model->confirmed_at = $this->getModule()->enableEmailConfirmation ? null : time(); $model->password = $this->getModule()->generatePasswords - ? $this->securityHelper->generatePassword(8, $this->getModule('user')->minPasswordRequirements) + ? $this->securityHelper->generatePassword(8, $this->getModule()->minPasswordRequirements) : $model->password; $event = $this->make(UserEvent::class, [$model]); diff --git a/src/User/resources/views/admin/_account.php b/src/User/resources/views/admin/_account.php index db1d14a..e9d49e8 100644 --- a/src/User/resources/views/admin/_account.php +++ b/src/User/resources/views/admin/_account.php @@ -12,8 +12,8 @@ use yii\bootstrap\ActiveForm; use yii\helpers\Html; -/* @var yii\web\View $this */ -/* @var Da\User\Model\User $user */ +/** @var yii\web\View $this */ +/** @var Da\User\Model\User $user */ ?> diff --git a/src/User/resources/views/admin/_assignments.php b/src/User/resources/views/admin/_assignments.php index 4bf779b..293285c 100644 --- a/src/User/resources/views/admin/_assignments.php +++ b/src/User/resources/views/admin/_assignments.php @@ -11,9 +11,9 @@ use Da\User\Widget\AssignmentsWidget; -/* @var yii\web\View $this */ -/* @var Da\User\Model\User $user */ -/* @var string[] $params */ +/** @var yii\web\View $this */ +/** @var Da\User\Model\User $user */ +/** @var string[] $params */ ?> diff --git a/src/User/resources/views/admin/_info.php b/src/User/resources/views/admin/_info.php index cf64366..1b929e7 100644 --- a/src/User/resources/views/admin/_info.php +++ b/src/User/resources/views/admin/_info.php @@ -9,10 +9,9 @@ * the LICENSE file that was distributed with this source code. */ -/** - * @var yii\web\View - * @var \Da\User\Model\User $user - */ +/** @var yii\web\View $this */ +/** @var Da\User\Model\User $user */ + ?> beginContent('@Da/User/resources/views/admin/update.php', ['user' => $user]) ?> diff --git a/src/User/resources/views/admin/_user.php b/src/User/resources/views/admin/_user.php index 4dbf4d9..5e7303e 100644 --- a/src/User/resources/views/admin/_user.php +++ b/src/User/resources/views/admin/_user.php @@ -10,8 +10,8 @@ */ /** - * @var yii\widgets\ActiveForm - * @var \Da\User\Model\User $user + * @var yii\widgets\ActiveForm $form + * @var \Da\User\Model\User $user */ ?> diff --git a/src/User/resources/views/admin/index.php b/src/User/resources/views/admin/index.php index 552b460..d507e78 100644 --- a/src/User/resources/views/admin/index.php +++ b/src/User/resources/views/admin/index.php @@ -15,10 +15,10 @@ use yii\web\View; use yii\widgets\Pjax; /** - * @var $this yii\web\View - * @var $dataProvider yii\data\ActiveDataProvider - * @var $searchModel Da\User\Search\UserSearch - * @var $module Da\User\Module + * @var yii\web\View $this + * @var yii\data\ActiveDataProvider $dataProvider + * @var Da\User\Search\UserSearch $searchModel + * @var Da\User\Module $module */ $this->title = Yii::t('usuario', 'Manage users'); diff --git a/src/User/resources/views/settings/gdpr-delete.php b/src/User/resources/views/settings/gdpr-delete.php index 5aa0e60..adea4b4 100644 --- a/src/User/resources/views/settings/gdpr-delete.php +++ b/src/User/resources/views/settings/gdpr-delete.php @@ -11,7 +11,7 @@ use yii\widgets\ActiveForm; use yii\helpers\Html; -/* @var $model \Da\User\Form\GdprDeleteForm */ +/** @var $model \Da\User\Form\GdprDeleteForm */ ?>