Skip to content

Commit

Permalink
clean up code style issues (#22833)
Browse files Browse the repository at this point in the history
  • Loading branch information
lfolco committed Jun 1, 2019
1 parent d5855ba commit 439f565
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 19 deletions.
5 changes: 3 additions & 2 deletions app/code/Magento/Security/Model/AdminSessionsManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,8 @@ protected function createNewSession()
}

/**
* Create admin session info collection.
*
* @return \Magento\Security\Model\ResourceModel\AdminSessionInfo\Collection
* @since 100.1.0
*/
Expand All @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ public function setUp()
);

$this->currentSessionMock = $this->createPartialMock(
\Magento\Security\Model\AdminSessionInfo::class, [
\Magento\Security\Model\AdminSessionInfo::class,
[
'isActive',
'getStatus',
'load',
Expand Down
17 changes: 1 addition & 16 deletions app/code/Magento/User/Block/User/Edit/Tab/Main.php
Original file line number Diff line number Diff line change
Expand Up @@ -181,22 +181,7 @@ protected function _prepareForm()
'time_format' => 'hh:mm:ss',
'class' => 'validate-date',
]
)
// ->setAfterElementHtml("<script type=\"text/javascript\">
// //<![CDATA[
// require([
// 'jquery',
// 'mage/calendar'
// ], function($){
// $('#expires_at').calendar({
// hideIfNoPrevNext: true,
// minDate: new Date(),
// showOn: 'button',
// dateFormat: 'yyyy-MM-dd'
// }); });
// //]]>
// </script>")
;
);

$baseFieldset->addField('user_roles', 'hidden', ['name' => 'user_roles', 'id' => '_user_roles']);

Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/User/Model/Validator/ExpiresAt.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

/**
* Class ExpiresAt
*
* @package Magento\User\Model\Validator
*/
class ExpiresAt extends AbstractValidator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@

use Magento\User\Model\UserValidationRules;

/**
* Class UserValidationRulesTest
*
* @package Magento\User\Test\Unit\Model
*/
class UserValidationRulesTest extends \PHPUnit\Framework\TestCase
{
/**
Expand Down

0 comments on commit 439f565

Please sign in to comment.