From 439f56576a772764f3f88ee112348bc92ad27cea Mon Sep 17 00:00:00 2001 From: lfolco Date: Sat, 1 Jun 2019 17:23:37 -0400 Subject: [PATCH] clean up code style issues (#22833) --- .../Security/Model/AdminSessionsManager.php | 5 +++-- .../Unit/Model/AdminSessionsManagerTest.php | 3 ++- .../Magento/User/Block/User/Edit/Tab/Main.php | 17 +---------------- .../Magento/User/Model/Validator/ExpiresAt.php | 1 + .../Test/Unit/Model/UserValidationRulesTest.php | 5 +++++ 5 files changed, 12 insertions(+), 19 deletions(-) diff --git a/app/code/Magento/Security/Model/AdminSessionsManager.php b/app/code/Magento/Security/Model/AdminSessionsManager.php index dcf6b7c2365f3..2a9024c54ee95 100644 --- a/app/code/Magento/Security/Model/AdminSessionsManager.php +++ b/app/code/Magento/Security/Model/AdminSessionsManager.php @@ -324,6 +324,8 @@ protected function createNewSession() } /** + * Create admin session info collection. + * * @return \Magento\Security\Model\ResourceModel\AdminSessionInfo\Collection * @since 100.1.0 */ @@ -334,8 +336,7 @@ protected function createAdminSessionInfoCollection() /** * Calculates diff between now and last session updated_at - * and decides whether new prolong must be triggered or not - * + * and decides whether new prolong must be triggered or not. * This is done to limit amount of session prolongs and updates to database * within some period of time - X * X - is calculated in getIntervalBetweenConsecutiveProlongs() diff --git a/app/code/Magento/Security/Test/Unit/Model/AdminSessionsManagerTest.php b/app/code/Magento/Security/Test/Unit/Model/AdminSessionsManagerTest.php index d729fe78f0f57..d7495cd9ce173 100644 --- a/app/code/Magento/Security/Test/Unit/Model/AdminSessionsManagerTest.php +++ b/app/code/Magento/Security/Test/Unit/Model/AdminSessionsManagerTest.php @@ -92,7 +92,8 @@ public function setUp() ); $this->currentSessionMock = $this->createPartialMock( - \Magento\Security\Model\AdminSessionInfo::class, [ + \Magento\Security\Model\AdminSessionInfo::class, + [ 'isActive', 'getStatus', 'load', diff --git a/app/code/Magento/User/Block/User/Edit/Tab/Main.php b/app/code/Magento/User/Block/User/Edit/Tab/Main.php index b69e50b7a6de7..9cdec228eb382 100644 --- a/app/code/Magento/User/Block/User/Edit/Tab/Main.php +++ b/app/code/Magento/User/Block/User/Edit/Tab/Main.php @@ -181,22 +181,7 @@ protected function _prepareForm() 'time_format' => 'hh:mm:ss', 'class' => 'validate-date', ] - ) -// ->setAfterElementHtml("") - ; + ); $baseFieldset->addField('user_roles', 'hidden', ['name' => 'user_roles', 'id' => '_user_roles']); diff --git a/app/code/Magento/User/Model/Validator/ExpiresAt.php b/app/code/Magento/User/Model/Validator/ExpiresAt.php index 09ff78ae53063..1aeba4b3e1aaf 100644 --- a/app/code/Magento/User/Model/Validator/ExpiresAt.php +++ b/app/code/Magento/User/Model/Validator/ExpiresAt.php @@ -10,6 +10,7 @@ /** * Class ExpiresAt + * * @package Magento\User\Model\Validator */ class ExpiresAt extends AbstractValidator diff --git a/app/code/Magento/User/Test/Unit/Model/UserValidationRulesTest.php b/app/code/Magento/User/Test/Unit/Model/UserValidationRulesTest.php index be23fde541eb2..146476cd25e42 100644 --- a/app/code/Magento/User/Test/Unit/Model/UserValidationRulesTest.php +++ b/app/code/Magento/User/Test/Unit/Model/UserValidationRulesTest.php @@ -7,6 +7,11 @@ use Magento\User\Model\UserValidationRules; +/** + * Class UserValidationRulesTest + * + * @package Magento\User\Test\Unit\Model + */ class UserValidationRulesTest extends \PHPUnit\Framework\TestCase { /**