Merge pull request #542 from TonisOrmisson/php80

V2: dump php 7.4 support

.github/workflows/php.yml

@@ -14,7 +14,7 @@ jobs:
             fail-fast: false
             matrix:
                 operating-system: ['ubuntu-latest']
-                php-versions: ['8.3', '8.2','8.1', '8.0','7.4']
+                php-versions: ['8.3', '8.2','8.1', '8.0']
 
         services:
             mariadb:
@@ -38,7 +38,7 @@ jobs:
                   ini-values: post_max_size=256M, max_execution_time=180
                   coverage: xdebug
 
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
 
 
             - name: Verify MariaDB connection
@@ -52,7 +52,7 @@ jobs:
 
             - name: Cache Composer packages
               id: composer-cache
-              uses: actions/cache@v2
+              uses: actions/cache@v4
               with:
                   path: vendor
                   key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}

CHANGELOG.md

@@ -4,6 +4,9 @@
 
 - Enh: Keycloak auth client (e.luhr)
 - Fix: Social Network Auth (eluhr)
+- Enh: Added Bootstrap 5 UI, UI related dependencies are suggested not required (you may choose your UI frmawork)  (TonisOrmisson)
+- Enh: Raised phpstan static code analyzer level 1=>5 with fixes (TonisOrmisson)
+- Enh: Raised minimum PHP version 7.4=>8.0 (TonisOrmisson)
 
 ## 1.6.2 Jan 4th, 2024
 

codeception.dist.yml

@@ -1,7 +1,7 @@
 actor: Tester
 paths:
     tests: tests
-    log: tests/_output
+    output: tests/_output
     data: tests/_data
     helpers: tests/_support
 bootstrap: _bootstrap.php

composer.json

@@ -40,7 +40,7 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=5.5",
+        "php": ">=8.0",
         "yiisoft/yii2-authclient": "^2.1",
         "yiisoft/yii2-httpclient": "^2.0",
         "yetopen/yii2-sms-sender-interface": "^0.1.1"
@@ -54,7 +54,6 @@
         "2amigos/qrcode-library": "Needed if you want to enable 2FA with QR Code generation. Require version ^1.1"
     },
     "require-dev": {
-        "php": ">=7.4",
         "kartik-v/yii2-widget-select2": "^2.2",
         "yiisoft/yii2-bootstrap5": "^2.0",
         "2amigos/2fa-library": "^2.0",
@@ -63,7 +62,7 @@
         "yiisoft/yii2-symfonymailer": "^2|^3",
         "squizlabs/php_codesniffer": "*",
         "phpmd/phpmd": "@stable",
-        "codeception/codeception": "^4|^5",
+        "codeception/codeception": "^5",
         "roave/security-advisories": "dev-master",
         "codeception/module-filesystem": "^2|^3",
         "codeception/module-yii2": "^1.1",
@@ -83,7 +82,7 @@
     },
     "config": {
         "platform": {
-            "php": "7.4"
+            "php": "8.0"
         },
         "preferred-install": {
             "*": "auto"

src/User/Controller/RegistrationController.php

@@ -17,7 +17,6 @@
 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;

src/User/Controller/SecurityController.php

@@ -21,8 +21,6 @@
 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 Yii;
 use yii\authclient\AuthAction;
 use yii\base\InvalidConfigException;

src/User/Controller/SettingsController.php

@@ -35,13 +35,9 @@
 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 http\Exception\InvalidArgumentException;
 use Yii;
 use yii\base\DynamicModel;
-use yii\base\InvalidParamException;
 use yii\filters\AccessControl;
 use yii\filters\VerbFilter;
 use yii\helpers\ArrayHelper;

src/User/Factory/MailFactory.php

@@ -47,12 +47,11 @@ public static function makeWelcomeMailerService(User $user, $showPassword = fals
 
     /**
      * @param string $email
-     * @param Token  $token
      *
      * @throws InvalidConfigException
      * @return MailService
      */
-    public static function makeRecoveryMailerService($email, Token $token = null)
+    public static function makeRecoveryMailerService($email, ?Token $token = null)
     {
         /** @var Module $module */
         $module = Yii::$app->getModule('user');

src/User/Filter/AccessRuleFilter.php

@@ -11,7 +11,6 @@
 
 namespace Da\User\Filter;
 
-use Closure;
 use Da\User\Model\User;
 use Da\User\Traits\ModuleAwareTrait;
 use Yii;

src/User/Filter/TwoFactorAuthenticationEnforceFilter.php

@@ -12,7 +12,6 @@
 namespace Da\User\Filter;
 
 use Da\User\Model\User;
-use Da\User\Module;
 use Da\User\Traits\AuthManagerAwareTrait;
 use Da\User\Traits\ModuleAwareTrait;
 use Yii;

src/User/Form/LoginForm.php

@@ -16,14 +16,10 @@
 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 Yii;
 use yii\base\InvalidParamException;
 use yii\base\Model;
 use yii\helpers\ArrayHelper;
-use yii\web\IdentityInterface;
 
 class LoginForm extends Model
 {

src/User/Form/RegistrationForm.php

@@ -16,7 +16,6 @@
 use Da\User\Traits\ModuleAwareTrait;
 use Yii;
 use yii\base\Model;
-use yii\helpers\Html;
 
 class RegistrationForm extends Model
 {

src/User/Helper/AuthHelper.php

@@ -12,7 +12,6 @@
 namespace Da\User\Helper;
 
 use Da\User\Model\AbstractAuthItem;
-use Da\User\Module;
 use Da\User\Traits\AuthManagerAwareTrait;
 use Da\User\Traits\ModuleAwareTrait;
 use Yii;

src/User/Service/MailService.php

@@ -15,7 +15,6 @@
 use Da\User\Traits\ModuleAwareTrait;
 use Yii;
 use yii\mail\BaseMailer;
-use yii\mail\MailerInterface;
 
 class MailService implements ServiceInterface
 {

src/User/Service/SessionHistory/SessionHistoryDecorator.php

@@ -73,9 +73,9 @@ public function getHasSessionId()
     }
 
     /** @inheritdoc */
-    public function setHasSessionId($value)
+    public function setHasSessionId($value) : void
     {
-        return $this->session->setHasSessionId($value);
+        $this->session->setHasSessionId($value);
     }
 
     /** @inheritdoc */
@@ -85,9 +85,9 @@ public function getId()
     }
 
     /** @inheritdoc */
-    public function setId($value)
+    public function setId($value) : void
     {
-        return $this->session->setId($value);
+        $this->session->setId($value);
     }
 
     /** @inheritdoc */
@@ -125,9 +125,9 @@ public function getName()
     }
 
     /** @inheritdoc */
-    public function setName($value)
+    public function setName($value) : void
     {
-        return $this->session->setName($value);
+        $this->session->setName($value);
     }
 
     /** @inheritdoc */
@@ -137,9 +137,9 @@ public function getSavePath()
     }
 
     /** @inheritdoc */
-    public function setSavePath($value)
+    public function setSavePath($value) : void
     {
-        return $this->session->setSavePath($value);
+        $this->session->setSavePath($value);
     }
 
     /** @inheritdoc */
@@ -149,9 +149,9 @@ public function getCookieParams()
     }
 
     /** @inheritdoc */
-    public function setCookieParams(array $value)
+    public function setCookieParams(array $value) : void
     {
-        return $this->session->setCookieParams($value);
+        $this->session->setCookieParams($value);
     }
 
     /** @inheritdoc */
@@ -161,9 +161,9 @@ public function getUseCookies()
     }
 
     /** @inheritdoc */
-    public function setUseCookies($value)
+    public function setUseCookies($value) : void
     {
-        return $this->session->setUseCookies($value);
+        $this->session->setUseCookies($value);
     }
 
     /** @inheritdoc */
@@ -173,9 +173,9 @@ public function getGCProbability()
     }
 
     /** @inheritdoc */
-    public function setGCProbability($value)
+    public function setGCProbability($value) : void
     {
-        return $this->session->setGCProbability($value);
+        $this->session->setGCProbability($value);
     }
 
     /** @inheritdoc */
@@ -185,9 +185,9 @@ public function getUseTransparentSessionID()
     }
 
     /** @inheritdoc */
-    public function setUseTransparentSessionID($value)
+    public function setUseTransparentSessionID($value) : void
     {
-        return $this->session->setUseTransparentSessionID($value);
+        $this->session->setUseTransparentSessionID($value);
     }
 
     /** @inheritdoc */
@@ -197,9 +197,9 @@ public function getTimeout()
     }
 
     /** @inheritdoc */
-    public function setTimeout($value)
+    public function setTimeout($value) : void
     {
-        return $this->session->setTimeout($value);
+        $this->session->setTimeout($value);
     }
 
     /** @inheritdoc */
@@ -313,9 +313,9 @@ public function remove($key)
     }
 
     /** @inheritdoc */
-    public function removeAll()
+    public function removeAll() : void
     {
-        return $this->session->removeAll();
+        $this->session->removeAll();
     }
 
     /** @inheritdoc */
@@ -337,15 +337,15 @@ public function getAllFlashes($delete = false)
     }
 
     /** @inheritdoc */
-    public function setFlash($key, $value = true, $removeAfterAccess = true)
+    public function setFlash($key, $value = true, $removeAfterAccess = true) : void
     {
-        return $this->session->setFlash($key, $value, $removeAfterAccess);
+        $this->session->setFlash($key, $value, $removeAfterAccess);
     }
 
     /** @inheritdoc */
-    public function addFlash($key, $value = true, $removeAfterAccess = true)
+    public function addFlash($key, $value = true, $removeAfterAccess = true) : void
     {
-        return $this->session->addFlash($key, $value, $removeAfterAccess);
+        $this->session->addFlash($key, $value, $removeAfterAccess);
     }
 
     /** @inheritdoc */
@@ -355,9 +355,9 @@ public function removeFlash($key)
     }
 
     /** @inheritdoc */
-    public function removeAllFlashes()
+    public function removeAllFlashes() : void
     {
-        return $this->session->removeAllFlashes();
+        $this->session->removeAllFlashes();
     }
 
     /** @inheritdoc */

src/User/Validator/TwoFactorEmailValidator.php

@@ -38,9 +38,7 @@ class TwoFactorEmailValidator extends TwoFactorCodeValidator
      */
     public function __construct(User $user, $code, $cycles = 0)
     {
-        $this->user = $user;
-        $this->code = $code;
-        $this->cycles = $cycles;
+        parent::__construct($user, $code, $cycles);
         $this->type = 'email';
     }
 

src/User/Validator/TwoFactorTextMessageValidator.php

@@ -38,10 +38,7 @@ class TwoFactorTextMessageValidator extends TwoFactorCodeValidator
      */
     public function __construct(User $user, $code, $cycles = 0)
     {
-        $this->user = $user;
-
-        $this->code = $code;
-        $this->cycles = $cycles;
+        parent::__construct($user, $code, $cycles);
         $this->type = 'sms';
     }
 

src/User/resources/views/bootstrap3/admin/index.php

@@ -11,7 +11,6 @@
 
 use yii\grid\GridView;
 use yii\helpers\Html;
-use yii\web\View;
 use yii\widgets\Pjax;
 
 /**

src/User/resources/views/bootstrap3/rule/index.php

@@ -3,7 +3,6 @@
 use yii\grid\ActionColumn;
 use yii\grid\GridView;
 use yii\helpers\Url;
-use yii\rbac\Rule;
 
 /**
  * @var \yii\data\ActiveDataProvider $dataProvider

src/User/resources/views/bootstrap3/security/confirm.php

@@ -9,7 +9,6 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use Da\User\Widget\ConnectWidget;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 

src/User/resources/views/bootstrap3/settings/profile.php

@@ -71,7 +71,7 @@
                     ->hint(
                         Html::a(
                             Yii::t('usuario', 'Change your avatar at Gravatar.com'),
-                            'http://gravatar.com',
+                            'https://gravatar.com',
                             ['target' => '_blank']
                         )
                     ) ?>

src/User/resources/views/bootstrap5/admin/index.php

@@ -11,7 +11,6 @@
 
 use yii\grid\GridView;
 use yii\helpers\Html;
-use yii\web\View;
 use yii\widgets\Pjax;
 
 /**