PHP-CS-Fixer run

src/User/Bootstrap.php

@@ -27,9 +27,9 @@ use yii\base\Event as YiiEvent;
 use yii\base\Exception;
 use yii\base\InvalidConfigException;
 use yii\console\Application as ConsoleApplication;
+use yii\helpers\ArrayHelper;
 use yii\i18n\PhpMessageSource;
 use yii\web\Application as WebApplication;
-use yii\helpers\ArrayHelper;
 
 /**
  * Bootstrap class of the yii2-usuario extension. Configures container services, initializes translations,
@@ -195,7 +195,9 @@ class Bootstrap implements BootstrapInterface
                 ];
 
             $app->getModule('user')->twoFactorAuthenticationValidators = ArrayHelper::merge(
-                        $defaultTwoFactorAuthenticationValidators, $app->getModule('user')->twoFactorAuthenticationValidators); 
+                $defaultTwoFactorAuthenticationValidators,
+                $app->getModule('user')->twoFactorAuthenticationValidators
+            );
 
             if ($app instanceof WebApplication) {
                 // override Yii
@@ -208,11 +210,6 @@ class Bootstrap implements BootstrapInterface
                     ]
                 );
             }
-
-
-
-
-
         } catch (Exception $e) {
             die($e);
         }

src/User/Controller/AdminController.php

@@ -357,6 +357,7 @@ class AdminController extends Controller
 
     /**
      * Display list session history
+     * @param mixed $id
      */
     public function actionSessionHistory($id)
     {
@@ -376,6 +377,7 @@ class AdminController extends Controller
 
     /**
      * Terminate all session user
+     * @param mixed $id
      */
     public function actionTerminateSessions($id)
     {

src/User/Controller/SecurityController.php

@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the 2amigos/yii2-usuario project.
  *
  * (c) 2amigOS! <http://2amigos.us/>
@@ -15,6 +15,7 @@ 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;
@@ -22,7 +23,6 @@ use Da\User\Traits\ContainerAwareTrait;
 use Da\User\Traits\ModuleAwareTrait;
 use Da\User\Validator\TwoFactorEmailValidator;
 use Da\User\Validator\TwoFactorTextMessageValidator;
-use Da\User\Model\User;
 use Yii;
 use yii\authclient\AuthAction;
 use yii\base\InvalidConfigException;
@@ -30,10 +30,10 @@ use yii\base\InvalidParamException;
 use yii\base\Module;
 use yii\filters\AccessControl;
 use yii\filters\VerbFilter;
+use yii\helpers\ArrayHelper;
 use yii\web\Controller;
 use yii\web\Response;
 use yii\widgets\ActiveForm;
-use yii\helpers\ArrayHelper;
 
 class SecurityController extends Controller
 {
@@ -216,8 +216,7 @@ class SecurityController extends Controller
 
                 return $this->goBack();
             }
-        }    
+        } else {
-        else{           
             $module = Yii::$app->getModule('user');
             $validators = $module->twoFactorAuthenticationValidators;
             $credentials = Yii::$app->session->get('credentials');
@@ -233,7 +232,6 @@ class SecurityController extends Controller
                 ->make($class, [$user, null, $this->module->twoFactorAuthenticationCycles]);
 
             $object->generateCode();
-
         }
 
         return $this->render(
@@ -273,5 +271,4 @@ class SecurityController extends Controller
 
         $this->make(SocialNetworkAccountConnectService::class, [$this, $client])->run();
     }
-
 }

src/User/Controller/SettingsController.php

@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the 2amigos/yii2-usuario project.
  *
  * (c) 2amigOS! <http://2amigos.us/>
@@ -29,8 +29,8 @@ 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\TwoFactorQrCodeUriGeneratorService;
 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;
@@ -564,36 +564,6 @@ class SettingsController extends Controller
         return $this->redirect(['session-history']);
     }
 
-    /**
-     * @param $id
-     * @throws ForbiddenHttpException
-     * @throws NotFoundHttpException
-     * @throws \Exception
-     * @throws \Throwable
-     * @throws \yii\db\StaleObjectException
-     */
-    protected function disconnectSocialNetwork($id)
-    {
-        /**
-        *
-        *
-        * @var SocialNetworkAccount $account
-        */
-        $account = $this->socialNetworkAccountQuery->whereId($id)->one();
-
-        if ($account === null) {
-            throw new NotFoundHttpException();
-        }
-        if ($account->user_id !== Yii::$app->user->id) {
-            throw new ForbiddenHttpException();
-        }
-        $event = $this->make(SocialNetworkConnectEvent::class, [Yii::$app->user->identity, $account]);
-
-        $this->trigger(SocialNetworkConnectEvent::EVENT_BEFORE_DISCONNECT, $event);
-        $account->delete();
-        $this->trigger(SocialNetworkConnectEvent::EVENT_AFTER_DISCONNECT, $event);
-    }
-
     public function actionTwoFactorMobilePhone($id)
     {
         Yii::$app->response->format = Response::FORMAT_JSON;
@@ -628,4 +598,34 @@ class SettingsController extends Controller
                     : Yii::t('usuario', 'Error while enabling SMS two factor authentication. Please reload the page.'),
                 ];
     }
+
+    /**
+     * @param $id
+     * @throws ForbiddenHttpException
+     * @throws NotFoundHttpException
+     * @throws \Exception
+     * @throws \Throwable
+     * @throws \yii\db\StaleObjectException
+     */
+    protected function disconnectSocialNetwork($id)
+    {
+        /**
+        *
+        *
+        * @var SocialNetworkAccount $account
+        */
+        $account = $this->socialNetworkAccountQuery->whereId($id)->one();
+
+        if ($account === null) {
+            throw new NotFoundHttpException();
+        }
+        if ($account->user_id !== Yii::$app->user->id) {
+            throw new ForbiddenHttpException();
+        }
+        $event = $this->make(SocialNetworkConnectEvent::class, [Yii::$app->user->identity, $account]);
+
+        $this->trigger(SocialNetworkConnectEvent::EVENT_BEFORE_DISCONNECT, $event);
+        $account->delete();
+        $this->trigger(SocialNetworkConnectEvent::EVENT_AFTER_DISCONNECT, $event);
+    }
 }

src/User/Filter/TwoFactorAuthenticationEnforceFilter.php

@@ -13,10 +13,9 @@ namespace Da\User\Filter;
 
 use Da\User\Model\User;
 use Da\User\Module;
+use Da\User\Traits\AuthManagerAwareTrait;
 use Yii;
 use yii\base\ActionFilter;
-use Da\User\Traits\AuthManagerAwareTrait;
-
 
 class TwoFactorAuthenticationEnforceFilter extends ActionFilter
 {

src/User/Form/LoginForm.php

@@ -14,8 +14,8 @@ namespace Da\User\Form;
 use Da\User\Helper\SecurityHelper;
 use Da\User\Model\User;
 use Da\User\Query\UserQuery;
-use Da\User\Traits\ModuleAwareTrait;
 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;
@@ -112,7 +112,6 @@ class LoginForm extends Model
             'twoFactorAuthenticationCodeValidate' => [
                 'twoFactorAuthenticationCode',
                 function ($attribute) {
-
                     if ($this->user === null) {
                         $this->addError($attribute, Yii::t('usuario', 'Invalid two factor authentication code'));
                     } else {

src/User/Migration/Session/m000000_000001_create_session_history_table.php

@@ -14,7 +14,6 @@ namespace Da\User\Migration\Session;
 use Da\User\Helper\MigrationHelper;
 use yii\db\Migration;
 
-
 class m000000_000001_create_session_history_table extends Migration
 {
     const SESSION_HISTORY_TABLE = '{{%session_history}}';

src/User/Migration/m000000_000010_add_auth_tf_type_auth_tf_mobile_phone_columns_to_user_table.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the 2amigos/yii2-usuario project.
+ *
+ * (c) 2amigOS! <http://2amigos.us/>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Da\User\Migration;
 
 use yii\db\Migration;
@@ -16,7 +25,6 @@ class m000000_000010_add_auth_tf_type_auth_tf_mobile_phone_columns_to_user_table
     {
         $this->addColumn('{{%user}}', 'auth_tf_type', $this->string(20)->after('auth_tf_enabled')->null());
         $this->addColumn('{{%user}}', 'auth_tf_mobile_phone', $this->string(20)->after('auth_tf_type')->null());
-   
     }
 
     /**

src/User/Model/SessionHistory.php

@@ -16,8 +16,8 @@ use Da\User\Query\SessionHistoryQuery;
 use Da\User\Traits\ModuleAwareTrait;
 use Yii;
 use yii\behaviors\TimestampBehavior;
-use yii\db\ActiveRecord;
 use yii\db\ActiveQuery;
+use yii\db\ActiveRecord;
 
 /**
  * @property int    $user_id

src/User/Query/SessionHistoryCondition.php

@@ -12,8 +12,8 @@
 namespace Da\User\Query;
 
 use Da\User\Traits\ModuleAwareTrait;
-use yii\web\Session;
 use Yii;
+use yii\web\Session;
 
 class SessionHistoryCondition
 {

src/User/Query/SessionHistoryQuery.php

@@ -12,8 +12,8 @@
 namespace Da\User\Query;
 
 use Da\User\Traits\ModuleAwareTrait;
-use yii\db\ActiveQuery;
 use Yii;
+use yii\db\ActiveQuery;
 
 class SessionHistoryQuery extends ActiveQuery
 {
@@ -34,7 +34,6 @@ class SessionHistoryQuery extends ActiveQuery
         return $this->andWhere($this->getCondition()->inactive($userId));
     }
 
-
     public function whereExpired($userId)
     {
         return $this->andWhere($this->getCondition()->expired($userId));

src/User/Search/SessionHistorySearch.php

@@ -17,7 +17,6 @@ use yii\base\InvalidConfigException;
 use yii\base\InvalidParamException;
 use yii\data\ActiveDataProvider;
 
-
 class SessionHistorySearch extends SessionHistory
 {
     use ContainerAwareTrait;

src/User/Service/SessionHistory/DBTerminateSessionsService.php

@@ -11,7 +11,6 @@
 
 namespace Da\User\Service\SessionHistory;
 
-
 use yii\web\DbSession;
 
 class DBTerminateSessionsService implements TerminateSessionsServiceInterface

src/User/Service/SessionHistory/SessionHistoryDecorator.php

@@ -16,9 +16,9 @@ use Da\User\Query\SessionHistoryCondition;
 use Da\User\Query\SessionHistoryQuery;
 use Da\User\Traits\ModuleAwareTrait;
 use Yii;
+use yii\base\InvalidArgumentException as BaseInvalidArgumentException;
 use yii\db\Exception;
 use yii\web\Session;
-use yii\base\InvalidArgumentException as BaseInvalidArgumentException;
 
 /**
  * Decorator for the {@see Session} class for storing the 'session history'
@@ -255,7 +255,6 @@ class SessionHistoryDecorator extends Session
                     return $result;
                 })
             );
-
     }
 
     /** @inheritdoc */
@@ -405,8 +404,8 @@ class SessionHistoryDecorator extends Session
 
     /**
      * @param  string    $id
-     * @return bool
      * @throws Exception
+     * @return bool
      */
     protected function unbindSessionHistory($id)
     {
@@ -420,8 +419,8 @@ class SessionHistoryDecorator extends Session
     /**
      *
      * @param  int       $userId
-     * @return bool
      * @throws Exception
+     * @return bool
      */
     protected function displacementHistory($userId)
     {

src/User/Service/SessionHistory/TerminateSessionsService.php

@@ -11,7 +11,6 @@
 
 namespace Da\User\Service\SessionHistory;
 
-
 class TerminateSessionsService implements TerminateSessionsServiceInterface
 {
     protected $sessionIds;

src/User/Service/SessionHistory/TerminateSessionsServiceInterface.php

@@ -11,7 +11,6 @@
 
 namespace Da\User\Service\SessionHistory;
 
-
 use Da\User\Contracts\ServiceInterface;
 
 interface TerminateSessionsServiceInterface extends ServiceInterface

src/User/Service/SessionHistory/TerminateUserSessionsService.php

@@ -11,15 +11,14 @@
 
 namespace Da\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 yii\web\Session;
 use Yii;
+use yii\web\Session;
 
 class TerminateUserSessionsService implements ServiceInterface
 {

src/User/Service/TwoFactorEmailCodeGeneratorService.php

@@ -13,9 +13,8 @@ namespace Da\User\Service;
 
 use Da\TwoFA\Manager;
 use Da\User\Contracts\ServiceInterface;
-use Da\User\Model\User;
 use Da\User\Factory\MailFactory;
-
+use Da\User\Model\User;
 use Yii;
 
 class TwoFactorEmailCodeGeneratorService implements ServiceInterface
@@ -54,11 +53,11 @@ class TwoFactorEmailCodeGeneratorService implements ServiceInterface
         if (!$mailService->run()) {
             Yii::$app->session->addFlash('error', Yii::t('usuario', 'The email sending failed, please check your configuration.'));
             return false;
-        }else{
+        }
         // put key in session
         Yii::$app->session->set("email_code_time", date('Y-m-d H:i:s'));
         Yii::$app->session->set("email_code", $code);
-        }        
+
         return $code;
     }
 }

src/User/Service/TwoFactorSmsCodeGeneratorService.php

@@ -13,13 +13,12 @@ namespace Da\User\Service;
 
 use Da\TwoFA\Manager;
 use Da\User\Contracts\ServiceInterface;
-use Da\User\Model\User;
 use Da\User\Factory\MailFactory;
-use yii\di\Instance;
+use Da\User\Model\User;
 use yetopen\smssender\SmsSenderInterface;
-use yii\helpers\ArrayHelper;
-
 use Yii;
+use yii\di\Instance;
+use yii\helpers\ArrayHelper;
 
 class TwoFactorSmsCodeGeneratorService implements ServiceInterface
 {

src/User/Validator/TwoFactorCodeValidator.php

@@ -15,8 +15,8 @@ use Da\TwoFA\Exception\InvalidSecretKeyException;
 use Da\TwoFA\Manager;
 use Da\User\Contracts\ValidatorInterface;
 use Da\User\Model\User;
-use Da\User\Traits\ContainerAwareTrait;
 use Da\User\Service\TwoFactorQrCodeUriGeneratorService;
+use Da\User\Traits\ContainerAwareTrait;
 use Yii;
 
 class TwoFactorCodeValidator implements ValidatorInterface
@@ -71,8 +71,9 @@ class TwoFactorCodeValidator implements ValidatorInterface
     }
 
     /**
-     * @return string
      *
+     * @param  mixed  $codeDurationTime
+     * @return string
      */
     public function getUnsuccessMessage($codeDurationTime)
     {
@@ -80,8 +81,9 @@ class TwoFactorCodeValidator implements ValidatorInterface
     }
 
     /**
-     * @return string
      *
+     * @param  mixed  $codeDurationTime
+     * @return string
      */
     public function getUnsuccessLoginMessage($codeDurationTime)
     {

src/User/Validator/TwoFactorEmailValidator.php

@@ -13,11 +13,10 @@ namespace Da\User\Validator;
 
 use Da\TwoFA\Exception\InvalidSecretKeyException;
 use Da\User\Model\User;
+use Da\User\Service\TwoFactorEmailCodeGeneratorService;
+use Da\User\Traits\ContainerAwareTrait;
 use Yii;
 use yii\helpers\ArrayHelper;
-use Da\User\Traits\ContainerAwareTrait;
-use Da\User\Service\TwoFactorEmailCodeGeneratorService;
-
 
 class TwoFactorEmailValidator extends TwoFactorCodeValidator
 {
@@ -50,8 +49,9 @@ class TwoFactorEmailValidator extends TwoFactorCodeValidator
      */
     public function validate()
     {
-        if(is_null($this->code) ||  $this->code == '' )
+        if (is_null($this->code) || $this->code == '') {
             return false;
+        }
         $emailCodeTime = new \DateTime(Yii::$app->session->get("email_code_time"));
         $currentTime = new \DateTime('now');
         $interval = $currentTime->getTimestamp() - $emailCodeTime->getTimestamp();
@@ -86,8 +86,9 @@ class TwoFactorEmailValidator extends TwoFactorCodeValidator
     }
 
     /**
-     * @return string
      *
+     * @param  mixed  $codeDurationTime
+     * @return string
      */
     public function getUnsuccessMessage($codeDurationTime)
     {
@@ -95,8 +96,9 @@ class TwoFactorEmailValidator extends TwoFactorCodeValidator
     }
 
     /**
-     * @return string
     *
+    * @param mixed $codeDurationTime
+    * @return string
     */
     public function getUnsuccessLoginMessage($codeDurationTime)
     {

src/User/Validator/TwoFactorTextMessageValidator.php

@@ -13,11 +13,10 @@ namespace Da\User\Validator;
 
 use Da\TwoFA\Exception\InvalidSecretKeyException;
 use Da\User\Model\User;
+use Da\User\Service\TwoFactorSmsCodeGeneratorService;
+use Da\User\Traits\ContainerAwareTrait;
 use Yii;
 use yii\helpers\ArrayHelper;
-use Da\User\Traits\ContainerAwareTrait;
-use Da\User\Service\TwoFactorSmsCodeGeneratorService;
-
 
 class TwoFactorTextMessageValidator extends TwoFactorCodeValidator
 {
@@ -51,8 +50,9 @@ class TwoFactorTextMessageValidator extends TwoFactorCodeValidator
      */
     public function validate()
     {
-        if(is_null($this->code) ||  $this->code == '' )
+        if (is_null($this->code) || $this->code == '') {
             return false;
+        }
         $smsCodeTime = new \DateTime(Yii::$app->session->get("sms_code_time"));
         $currentTime = new \DateTime('now');
         $interval = $currentTime->getTimestamp() - $smsCodeTime->getTimestamp();
@@ -77,8 +77,9 @@ class TwoFactorTextMessageValidator extends TwoFactorCodeValidator
     }
 
     /**
-     * @return string
      *
+     * @param  mixed  $codeDurationTime
+     * @return string
      */
     public function getUnsuccessMessage($codeDurationTime)
     {
@@ -86,8 +87,9 @@ class TwoFactorTextMessageValidator extends TwoFactorCodeValidator
     }
 
     /**
-     * @return string
      *
+     * @param  mixed  $codeDurationTime
+     * @return string
      */
     public function getUnsuccessLoginMessage($codeDurationTime)
     {

src/User/Widget/SessionStatusWidget.php

@@ -69,6 +69,7 @@ class SessionStatusWidget extends Widget
      * Returns available auth items to be attached to the user.
      *
      * @param int|null type of auth items or null to return all
+     * @param null|mixed $type
      *
      * @return array
      */