From ecb8b619236579efd6da194d609e9f8d13d7f5dc Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Fri, 30 Sep 2022 21:06:30 +0200 Subject: [PATCH] apply PHP-CS-Fixer rule sets --- .gitignore | 1 + .php-cs-fixer.php | 13 +++++ composer.json | 3 + .../Controller/Admin/d3user_totp.php | 2 +- .../Controller/d3_account_totp.php | 4 +- src/Application/Controller/d3totplogin.php | 2 +- src/Application/Model/d3RandomGenerator.php | 4 +- src/Application/Model/d3backupcode.php | 2 +- src/Application/Model/d3backupcodelist.php | 2 +- src/Application/Model/d3totp.php | 10 ++-- .../views/admin/de/d3totp_lang.php | 2 +- .../views/admin/en/d3totp_lang.php | 2 +- src/IntelliSenseHelper.php | 30 +++++++--- .../Component/d3_totp_UserComponent.php | 5 +- .../Admin/d3_totp_LoginController.php | 4 +- .../Controller/d3_totp_OrderController.php | 2 +- .../Controller/d3_totp_PaymentController.php | 2 +- .../Controller/d3_totp_UserController.php | 2 +- .../Controller/d3_totp_getUserTrait.php | 2 +- .../Application/Model/d3_totp_user.php | 2 +- src/Setup/Events.php | 11 ++-- src/metadata.php | 4 +- src/tests/additional.inc.php | 3 +- src/tests/d3totp_config.php | 1 - .../Controller/Admin/d3force_2faTest.php | 4 +- .../Controller/Admin/d3user_totpTest.php | 50 ++++++++-------- .../Controller/d3_account_totpTest.php | 30 +++++----- .../Controller/d3totploginTest.php | 6 +- .../Factory/BaconQrCodeFactoryTest.php | 2 +- .../d3totp_wrongOtpExceptionTest.php | 2 +- .../Model/d3RandomGeneratorTest.php | 2 +- .../Application/Model/d3backupcodeTest.php | 12 ++-- .../Model/d3backupcodelistTest.php | 28 ++++----- .../unit/Application/Model/d3totpTest.php | 28 ++++----- .../Component/d3_totp_UserComponentTest.php | 50 ++++++++-------- .../Admin/d3_totp_LoginControllerTest.php | 58 +++++++++---------- .../d3_totp_OrderControllerTest.php | 2 +- .../d3_totp_PaymentControllerTest.php | 2 +- .../Controller/d3_totp_UserControllerTest.php | 2 +- .../Controller/d3_totp_getUserTestTrait.php | 14 ++--- .../Application/Model/d3_totp_userTest.php | 2 +- .../unit/Modules/Core/d3_totp_utilsTest.php | 14 ++--- src/tests/unit/d3TotpUnitTestCase.php | 2 +- 43 files changed, 229 insertions(+), 196 deletions(-) create mode 100644 .php-cs-fixer.php diff --git a/.gitignore b/.gitignore index 1b3f958..7729667 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ src/tests/.phpunit.result.cache src/tests/reports/ +.php_cs.cache diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php new file mode 100644 index 0000000..f0512a0 --- /dev/null +++ b/.php-cs-fixer.php @@ -0,0 +1,13 @@ +in(__DIR__) +; + +$config = new PhpCsFixer\Config(); +return $config->setRules([ + '@PHP73Migration' => true, + '@PSR12' => true + ]) + ->setFinder($finder) +; \ No newline at end of file diff --git a/composer.json b/composer.json index 80f9932..add5e2a 100644 --- a/composer.json +++ b/composer.json @@ -45,6 +45,9 @@ "bacon/bacon-qr-code": "^2.0", "laminas/laminas-math": "^3.2" }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.19" + }, "suggest": { "d3/modcfg": "Provides automatic installation routines" }, diff --git a/src/Application/Controller/Admin/d3user_totp.php b/src/Application/Controller/Admin/d3user_totp.php index 2009025..c5b9ce5 100644 --- a/src/Application/Controller/Admin/d3user_totp.php +++ b/src/Application/Controller/Admin/d3user_totp.php @@ -162,4 +162,4 @@ class d3user_totp extends AdminDetailsController $oBackupCodeList = $this->getBackupcodeListObject(); return $oBackupCodeList->getAvailableCodeCount($this->getEditObjectId()); } -} \ No newline at end of file +} diff --git a/src/Application/Controller/d3_account_totp.php b/src/Application/Controller/d3_account_totp.php index 51cf458..98f38c4 100644 --- a/src/Application/Controller/d3_account_totp.php +++ b/src/Application/Controller/d3_account_totp.php @@ -100,7 +100,7 @@ class d3_account_totp extends AccountController $aParams = [ 'd3totp__usetotp' => 1, - 'd3totp__oxuserid' => $oUser->getId() + 'd3totp__oxuserid' => $oUser->getId(), ]; $seed = Registry::getRequest()->getRequestEscapedParameter("secret"); $otp = Registry::getRequest()->getRequestEscapedParameter("otp"); @@ -133,4 +133,4 @@ class d3_account_totp extends AccountController } } } -} \ No newline at end of file +} diff --git a/src/Application/Controller/d3totplogin.php b/src/Application/Controller/d3totplogin.php index 2b81409..e403f6d 100644 --- a/src/Application/Controller/d3totplogin.php +++ b/src/Application/Controller/d3totplogin.php @@ -118,4 +118,4 @@ class d3totplogin extends FrontendController return $aPaths; } -} \ No newline at end of file +} diff --git a/src/Application/Model/d3RandomGenerator.php b/src/Application/Model/d3RandomGenerator.php index 3108c84..2ee0ce8 100644 --- a/src/Application/Model/d3RandomGenerator.php +++ b/src/Application/Model/d3RandomGenerator.php @@ -19,7 +19,7 @@ use Laminas\Math\Rand; class d3RandomGenerator extends Rand { - const CHAR_DIGITS = '0123456789'; + public const CHAR_DIGITS = '0123456789'; /** * @return string @@ -28,4 +28,4 @@ class d3RandomGenerator extends Rand { return self::getString(6, self::CHAR_DIGITS); } -} \ No newline at end of file +} diff --git a/src/Application/Model/d3backupcode.php b/src/Application/Model/d3backupcode.php index c08125f..5a53a60 100644 --- a/src/Application/Model/d3backupcode.php +++ b/src/Application/Model/d3backupcode.php @@ -84,4 +84,4 @@ class d3backupcode extends BaseModel { return oxNew(User::class); } -} \ No newline at end of file +} diff --git a/src/Application/Model/d3backupcodelist.php b/src/Application/Model/d3backupcodelist.php index 0fdbba1..0011874 100644 --- a/src/Application/Model/d3backupcodelist.php +++ b/src/Application/Model/d3backupcodelist.php @@ -163,4 +163,4 @@ class d3backupcodelist extends ListModel { return $this->getBaseObject()->d3GetUser(); } -} \ No newline at end of file +} diff --git a/src/Application/Model/d3totp.php b/src/Application/Model/d3totp.php index 8dd6ed8..47275df 100644 --- a/src/Application/Model/d3totp.php +++ b/src/Application/Model/d3totp.php @@ -29,10 +29,10 @@ use OxidEsales\Eshop\Core\Registry; class d3totp extends BaseModel { - const TOTP_SESSION_VARNAME = 'totp_auth'; - const TOTP_SESSION_CURRENTUSER = 'd3totpCurrentUser'; - const TOTP_SESSION_CURRENTCLASS = 'd3totpCurrentClass'; - const TOTP_SESSION_NAVFORMPARAMS = 'd3totpNavFormParams'; + public const TOTP_SESSION_VARNAME = 'totp_auth'; + public const TOTP_SESSION_CURRENTUSER = 'd3totpCurrentUser'; + public const TOTP_SESSION_CURRENTCLASS = 'd3totpCurrentClass'; + public const TOTP_SESSION_NAVFORMPARAMS = 'd3totpNavFormParams'; public $tableName = 'd3totp'; public $userId; @@ -189,7 +189,7 @@ class d3totp extends BaseModel { $this->assign( [ - 'seed' => $this->encrypt($seed) + 'seed' => $this->encrypt($seed), ] ); } diff --git a/src/Application/views/admin/de/d3totp_lang.php b/src/Application/views/admin/de/d3totp_lang.php index 0a06db7..b9c196d 100644 --- a/src/Application/views/admin/de/d3totp_lang.php +++ b/src/Application/views/admin/de/d3totp_lang.php @@ -51,5 +51,5 @@ $aLang = [ 'D3_TOTP_ERROR_UNVALID' => 'Das Einmalpasswort ist ungültig.', 'D3_TOTP_ALREADY_EXIST' => 'Die Registrierung wurde schon gespeichert.', - 'SHOP_MODULE_D3_TOTP_ADMIN_FORCE_2FA' => 'Administratoren sind verpflichtet 2FA zu aktivieren' + 'SHOP_MODULE_D3_TOTP_ADMIN_FORCE_2FA' => 'Administratoren sind verpflichtet 2FA zu aktivieren', ]; diff --git a/src/Application/views/admin/en/d3totp_lang.php b/src/Application/views/admin/en/d3totp_lang.php index b337f2e..807e9c2 100644 --- a/src/Application/views/admin/en/d3totp_lang.php +++ b/src/Application/views/admin/en/d3totp_lang.php @@ -51,5 +51,5 @@ $aLang = [ 'D3_TOTP_ERROR_UNVALID' => 'The one-time password is invalid.', 'D3_TOTP_ALREADY_EXIST' => 'The registration has already been saved.', - 'SHOP_MODULE_D3_TOTP_ADMIN_FORCE_2FA' => 'Administrators are required to activate 2FA' + 'SHOP_MODULE_D3_TOTP_ADMIN_FORCE_2FA' => 'Administrators are required to activate 2FA', ]; diff --git a/src/IntelliSenseHelper.php b/src/IntelliSenseHelper.php index 2b01b73..bab0639 100644 --- a/src/IntelliSenseHelper.php +++ b/src/IntelliSenseHelper.php @@ -16,7 +16,9 @@ namespace D3\Totp\Modules\Application\Component use OxidEsales\Eshop\Application\Component\UserComponent; - class d3_totp_UserComponent_parent extends UserComponent { } + class d3_totp_UserComponent_parent extends UserComponent + { + } } namespace D3\Totp\Modules\Application\Controller @@ -26,11 +28,17 @@ namespace D3\Totp\Modules\Application\Controller use OxidEsales\Eshop\Application\Controller\PaymentController; use OxidEsales\Eshop\Application\Controller\UserController; - class d3_totp_UserController_parent extends UserController { } + class d3_totp_UserController_parent extends UserController + { + } - class d3_totp_PaymentController_parent extends PaymentController { } + class d3_totp_PaymentController_parent extends PaymentController + { + } - class d3_totp_OrderController_parent extends OrderController { } + class d3_totp_OrderController_parent extends OrderController + { + } } namespace D3\Totp\Modules\Application\Controller\Admin @@ -38,7 +46,9 @@ namespace D3\Totp\Modules\Application\Controller\Admin use OxidEsales\Eshop\Application\Controller\Admin\LoginController; - class d3_totp_LoginController_parent extends LoginController { } + class d3_totp_LoginController_parent extends LoginController + { + } } namespace D3\Totp\Modules\Application\Model @@ -46,7 +56,9 @@ namespace D3\Totp\Modules\Application\Model use OxidEsales\Eshop\Application\Model\User; - class d3_totp_user_parent extends User { } + class d3_totp_user_parent extends User + { + } } namespace D3\Totp\Modules\Core @@ -54,5 +66,7 @@ namespace D3\Totp\Modules\Core use OxidEsales\Eshop\Core\Utils; - class d3_totp_utils_parent extends Utils { } -} \ No newline at end of file + class d3_totp_utils_parent extends Utils + { + } +} diff --git a/src/Modules/Application/Component/d3_totp_UserComponent.php b/src/Modules/Application/Component/d3_totp_UserComponent.php index 26dd849..b9b4efc 100644 --- a/src/Modules/Application/Component/d3_totp_UserComponent.php +++ b/src/Modules/Application/Component/d3_totp_UserComponent.php @@ -46,7 +46,8 @@ class d3_totp_UserComponent extends d3_totp_UserComponent_parent ) { Registry::getSession()->setVariable( d3totp::TOTP_SESSION_CURRENTCLASS, - $this->getParent()->getClassKey() != 'd3totplogin' ? $this->getParent()->getClassKey() : 'start'); + $this->getParent()->getClassKey() != 'd3totplogin' ? $this->getParent()->getClassKey() : 'start' + ); Registry::getSession()->setVariable(d3totp::TOTP_SESSION_CURRENTUSER, $oUser->getId()); Registry::getSession()->setVariable( d3totp::TOTP_SESSION_NAVFORMPARAMS, @@ -164,4 +165,4 @@ class d3_totp_UserComponent extends d3_totp_UserComponent_parent { return Registry::getSession(); } -} \ No newline at end of file +} diff --git a/src/Modules/Application/Controller/Admin/d3_totp_LoginController.php b/src/Modules/Application/Controller/Admin/d3_totp_LoginController.php index 3f5a27a..c45d5dc 100644 --- a/src/Modules/Application/Controller/Admin/d3_totp_LoginController.php +++ b/src/Modules/Application/Controller/Admin/d3_totp_LoginController.php @@ -142,7 +142,7 @@ class d3_totp_LoginController extends d3_totp_LoginController_parent protected function hasLoginCredentials() { - return Registry::getRequest()->getRequestEscapedParameter( 'user') && + return Registry::getRequest()->getRequestEscapedParameter('user') && Registry::getRequest()->getRequestEscapedParameter('pwd'); } @@ -174,4 +174,4 @@ class d3_totp_LoginController extends d3_totp_LoginController_parent { return oxNew(User::class); } -} \ No newline at end of file +} diff --git a/src/Modules/Application/Controller/d3_totp_OrderController.php b/src/Modules/Application/Controller/d3_totp_OrderController.php index 24aa8a9..74208af 100644 --- a/src/Modules/Application/Controller/d3_totp_OrderController.php +++ b/src/Modules/Application/Controller/d3_totp_OrderController.php @@ -18,4 +18,4 @@ namespace D3\Totp\Modules\Application\Controller; class d3_totp_OrderController extends d3_totp_OrderController_parent { use d3_totp_getUserTrait; -} \ No newline at end of file +} diff --git a/src/Modules/Application/Controller/d3_totp_PaymentController.php b/src/Modules/Application/Controller/d3_totp_PaymentController.php index 56cf88e..64d5a28 100644 --- a/src/Modules/Application/Controller/d3_totp_PaymentController.php +++ b/src/Modules/Application/Controller/d3_totp_PaymentController.php @@ -18,4 +18,4 @@ namespace D3\Totp\Modules\Application\Controller; class d3_totp_PaymentController extends d3_totp_PaymentController_parent { use d3_totp_getUserTrait; -} \ No newline at end of file +} diff --git a/src/Modules/Application/Controller/d3_totp_UserController.php b/src/Modules/Application/Controller/d3_totp_UserController.php index 5bdc3c1..f01879c 100644 --- a/src/Modules/Application/Controller/d3_totp_UserController.php +++ b/src/Modules/Application/Controller/d3_totp_UserController.php @@ -18,4 +18,4 @@ namespace D3\Totp\Modules\Application\Controller; class d3_totp_UserController extends d3_totp_UserController_parent { use d3_totp_getUserTrait; -} \ No newline at end of file +} diff --git a/src/Modules/Application/Controller/d3_totp_getUserTrait.php b/src/Modules/Application/Controller/d3_totp_getUserTrait.php index dcf1bd6..cd0f068 100644 --- a/src/Modules/Application/Controller/d3_totp_getUserTrait.php +++ b/src/Modules/Application/Controller/d3_totp_getUserTrait.php @@ -60,4 +60,4 @@ trait d3_totp_getUserTrait { return Registry::getSession(); } -} \ No newline at end of file +} diff --git a/src/Modules/Application/Model/d3_totp_user.php b/src/Modules/Application/Model/d3_totp_user.php index faf9d53..3f4fed5 100644 --- a/src/Modules/Application/Model/d3_totp_user.php +++ b/src/Modules/Application/Model/d3_totp_user.php @@ -45,4 +45,4 @@ class d3_totp_user extends d3_totp_user_parent { return Registry::getSession(); } -} \ No newline at end of file +} diff --git a/src/Setup/Events.php b/src/Setup/Events.php index f6ad43f..fd3713d 100644 --- a/src/Setup/Events.php +++ b/src/Setup/Events.php @@ -18,6 +18,7 @@ namespace D3\Totp\Setup; use OxidEsales\Eshop\Core\DatabaseProvider; use OxidEsales\Eshop\Core\Exception\DatabaseConnectionException; use OxidEsales\Eshop\Core\Exception\DatabaseErrorException; + // @codeCoverageIgnoreStart class Events { @@ -58,7 +59,7 @@ class Events UNIQUE KEY `OXUSERID` (`OXUSERID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='totp setting';"; - DatabaseProvider::getDb()->execute( $query ); + DatabaseProvider::getDb()->execute($query); } /** @@ -78,7 +79,7 @@ class Events KEY `BACKUPCODE` (`BACKUPCODE`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='totp backup codes';"; - DatabaseProvider::getDb()->execute( $query ); + DatabaseProvider::getDb()->execute($query); } /** @@ -102,7 +103,7 @@ class Events '', NOW() );"; - DatabaseProvider::getDb()->execute( $query ); + DatabaseProvider::getDb()->execute($query); } } @@ -127,8 +128,8 @@ class Events '', NOW() );"; - DatabaseProvider::getDb()->execute( $query ); + DatabaseProvider::getDb()->execute($query); } } } -// @codeCoverageIgnoreEnd \ No newline at end of file +// @codeCoverageIgnoreEnd diff --git a/src/metadata.php b/src/metadata.php index 5be3299..4dcab15 100644 --- a/src/metadata.php +++ b/src/metadata.php @@ -84,7 +84,7 @@ $aModule = [ 'name' => 'D3_TOTP_ADMIN_FORCE_2FA', 'type' => 'bool', 'value' => false, - ] + ], ], 'events' => [ 'onActivate' => ModuleSetup\Events::class.'::onActivate', @@ -101,5 +101,5 @@ $aModule = [ 'block' => 'account_menu', 'file' => 'Application/views/blocks/page/account/inc/account_menu.tpl', ], - ] + ], ]; diff --git a/src/tests/additional.inc.php b/src/tests/additional.inc.php index 0b4e875..73c7ae4 100644 --- a/src/tests/additional.inc.php +++ b/src/tests/additional.inc.php @@ -12,6 +12,7 @@ */ // Include totp test config + namespace D3\Totp\tests; use D3\ModCfg\Tests\additional_abstract; @@ -33,4 +34,4 @@ class additional extends additional_abstract } } -oxNew(additional::class); \ No newline at end of file +oxNew(additional::class); diff --git a/src/tests/d3totp_config.php b/src/tests/d3totp_config.php index f7c3a5c..635d4ca 100644 --- a/src/tests/d3totp_config.php +++ b/src/tests/d3totp_config.php @@ -12,4 +12,3 @@ */ const D3TOTP_REQUIRE_MODCFG = true; - diff --git a/src/tests/unit/Application/Controller/Admin/d3force_2faTest.php b/src/tests/unit/Application/Controller/Admin/d3force_2faTest.php index 83f6ccf..07c3a05 100644 --- a/src/tests/unit/Application/Controller/Admin/d3force_2faTest.php +++ b/src/tests/unit/Application/Controller/Admin/d3force_2faTest.php @@ -84,7 +84,7 @@ class d3force_2faTest extends d3user_totpTest 'noAdmin' => [false, false, true, 'userId'], 'dont force' => [false, true, false, 'userId'], 'no user id' => [false, true, true, null], - 'passed' => [true, true, true, 'userId'] + 'passed' => [true, true, true, 'userId'], ]; } @@ -104,4 +104,4 @@ class d3force_2faTest extends d3user_totpTest ) ); } -} \ No newline at end of file +} diff --git a/src/tests/unit/Application/Controller/Admin/d3user_totpTest.php b/src/tests/unit/Application/Controller/Admin/d3user_totpTest.php index 0588632..ccd5e4d 100644 --- a/src/tests/unit/Application/Controller/Admin/d3user_totpTest.php +++ b/src/tests/unit/Application/Controller/Admin/d3user_totpTest.php @@ -56,7 +56,7 @@ class d3user_totpTest extends d3TotpUnitTestCase $oControllerMock = $this->getMockBuilder(d3user_totp::class) ->onlyMethods([ 'getEditObjectId', - 'getUserObject' + 'getUserObject', ]) ->getMock(); $oControllerMock->method('getEditObjectId')->willReturn('-1'); @@ -65,7 +65,7 @@ class d3user_totpTest extends d3TotpUnitTestCase $this->_oController = $oControllerMock; $sTpl = $this->callMethod($this->_oController, 'render'); - $tplUser = $this->callMethod($this->_oController, 'getViewDataElement', array('edit')); + $tplUser = $this->callMethod($this->_oController, 'getViewDataElement', ['edit']); $this->assertSame('d3user_totp.tpl', $sTpl); $this->assertSame($tplUser, null); @@ -93,7 +93,7 @@ class d3user_totpTest extends d3TotpUnitTestCase $oControllerMock = $this->getMockBuilder(d3user_totp::class) ->onlyMethods([ 'getEditObjectId', - 'getUserObject' + 'getUserObject', ]) ->getMock(); $oControllerMock->method('getEditObjectId')->willReturn('foobar'); @@ -102,8 +102,8 @@ class d3user_totpTest extends d3TotpUnitTestCase $this->_oController = $oControllerMock; $sTpl = $this->callMethod($this->_oController, 'render'); - $tplUser = $this->callMethod($this->_oController, 'getViewDataElement', array('edit')); - $oxid = $this->callMethod($this->_oController, 'getViewDataElement', array('oxid')); + $tplUser = $this->callMethod($this->_oController, 'getViewDataElement', ['edit']); + $oxid = $this->callMethod($this->_oController, 'getViewDataElement', ['oxid']); $this->assertSame('d3user_totp.tpl', $sTpl); $this->assertSame($tplUser, $oUserMock); @@ -133,7 +133,7 @@ class d3user_totpTest extends d3TotpUnitTestCase ->onlyMethods([ 'getEditObjectId', 'getUserObject', - 'addTplParam' + 'addTplParam', ]) ->getMock(); $oControllerMock->method('getEditObjectId')->willReturn('foobar'); @@ -151,8 +151,8 @@ class d3user_totpTest extends d3TotpUnitTestCase $this->setValue($this->_oController, '_sSaveError', 'foo'); $sTpl = $this->callMethod($this->_oController, 'render'); - $tplUser = $this->callMethod($this->_oController, 'getViewDataElement', array('edit')); - $oxid = $this->callMethod($this->_oController, 'getViewDataElement', array('oxid')); + $tplUser = $this->callMethod($this->_oController, 'getViewDataElement', ['edit']); + $oxid = $this->callMethod($this->_oController, 'getViewDataElement', ['oxid']); $this->assertSame('d3user_totp.tpl', $sTpl); $this->assertNull($tplUser); @@ -228,7 +228,7 @@ class d3user_totpTest extends d3TotpUnitTestCase 'verify', 'saveSecret', 'assign', - 'checkIfAlreadyExist' + 'checkIfAlreadyExist', ]) ->disableOriginalConstructor() ->getMock(); @@ -245,7 +245,7 @@ class d3user_totpTest extends d3TotpUnitTestCase 'getEditObjectId', 'getUserObject', 'getTotpObject', - 'getBackupcodeListObject' + 'getBackupcodeListObject', ]) ->getMock(); $oControllerMock->method('getEditObjectId')->willReturn('foobar'); @@ -279,7 +279,7 @@ class d3user_totpTest extends d3TotpUnitTestCase 'verify', 'saveSecret', 'assign', - 'checkIfAlreadyExist' + 'checkIfAlreadyExist', ]) ->getMock(); $oTotpMock->method('load')->willReturn(true); @@ -295,7 +295,7 @@ class d3user_totpTest extends d3TotpUnitTestCase 'getEditObjectId', 'getUserObject', 'getTotpObject', - 'getBackupcodeListObject' + 'getBackupcodeListObject', ]) ->getMock(); $oControllerMock->method('getEditObjectId')->willReturn('foobar'); @@ -318,7 +318,7 @@ class d3user_totpTest extends d3TotpUnitTestCase $oBackupCodeListMock = $this->getMockBuilder(d3backupcodelist::class) ->onlyMethods([ 'save', - 'generateBackupCodes' + 'generateBackupCodes', ]) ->getMock(); $oBackupCodeListMock->expects($this->once())->method('save')->willReturn(true); @@ -332,7 +332,7 @@ class d3user_totpTest extends d3TotpUnitTestCase 'verify', 'saveSecret', 'assign', - 'checkIfAlreadyExist' + 'checkIfAlreadyExist', ]) ->disableOriginalConstructor() ->getMock(); @@ -349,7 +349,7 @@ class d3user_totpTest extends d3TotpUnitTestCase 'getEditObjectId', 'getUserObject', 'getTotpObject', - 'getBackupcodeListObject' + 'getBackupcodeListObject', ]) ->getMock(); $oControllerMock->method('getEditObjectId')->willReturn('foobar'); @@ -369,7 +369,7 @@ class d3user_totpTest extends d3TotpUnitTestCase public function canSaveWithKnownOXID() { $aEditval = [ - 'd3totp__oxid' => 'foo' + 'd3totp__oxid' => 'foo', ]; $_GET['editval'] = $aEditval; @@ -377,7 +377,7 @@ class d3user_totpTest extends d3TotpUnitTestCase $oBackupCodeListMock = $this->getMockBuilder(d3backupcodelist::class) ->onlyMethods([ 'save', - 'generateBackupCodes' + 'generateBackupCodes', ]) ->getMock(); $oBackupCodeListMock->expects($this->once())->method('save')->willReturn(true); @@ -391,7 +391,7 @@ class d3user_totpTest extends d3TotpUnitTestCase 'verify', 'saveSecret', 'assign', - 'checkIfAlreadyExist' + 'checkIfAlreadyExist', ]) ->disableOriginalConstructor() ->getMock(); @@ -408,7 +408,7 @@ class d3user_totpTest extends d3TotpUnitTestCase 'getEditObjectId', 'getUserObject', 'getTotpObject', - 'getBackupcodeListObject' + 'getBackupcodeListObject', ]) ->getMock(); $oControllerMock->method('getEditObjectId')->willReturn('foobar'); @@ -430,10 +430,10 @@ class d3user_totpTest extends d3TotpUnitTestCase { $aBackupList = [ 'foo1', - 'bar2' + 'bar2', ]; - $this->callMethod($this->_oController, 'setBackupCodes', array($aBackupList)); + $this->callMethod($this->_oController, 'setBackupCodes', [$aBackupList]); $aReturn = $this->callMethod($this->_oController, 'getBackupCodes'); @@ -476,7 +476,7 @@ class d3user_totpTest extends d3TotpUnitTestCase public function canDelete() { $editval = [ - 'd3totp__oxid' => 'foo' + 'd3totp__oxid' => 'foo', ]; $_GET['editval'] = $editval; @@ -485,7 +485,7 @@ class d3user_totpTest extends d3TotpUnitTestCase ->disableOriginalConstructor() ->onlyMethods([ 'delete', - 'load' + 'load', ]) ->getMock(); $oTotpMock->expects($this->once())->method('delete')->willReturn(true); @@ -522,7 +522,7 @@ class d3user_totpTest extends d3TotpUnitTestCase $oControllerMock = $this->getMockBuilder(d3user_totp::class) ->onlyMethods([ 'getBackupCodeListObject', - 'getUser' + 'getUser', ]) ->getMock(); $oControllerMock->method('getBackupCodeListObject')->willReturn($oBackupCodeListMock); @@ -535,4 +535,4 @@ class d3user_totpTest extends d3TotpUnitTestCase $this->callMethod($this->_oController, 'getAvailableBackupCodeCount') ); } -} \ No newline at end of file +} diff --git a/src/tests/unit/Application/Controller/d3_account_totpTest.php b/src/tests/unit/Application/Controller/d3_account_totpTest.php index bb2d64e..2d66d66 100644 --- a/src/tests/unit/Application/Controller/d3_account_totpTest.php +++ b/src/tests/unit/Application/Controller/d3_account_totpTest.php @@ -56,7 +56,7 @@ class d3_account_totpTest extends d3TotpUnitTestCase $oUser->setId('foo'); $oUser->assign( [ - 'oxpassword' => 'foo' + 'oxpassword' => 'foo', ] ); @@ -69,7 +69,7 @@ class d3_account_totpTest extends d3TotpUnitTestCase $this->_oController = $oControllerMock; $sTpl = $this->callMethod($this->_oController, 'render'); - $tplUser = $this->callMethod($this->_oController, 'getViewDataElement', array('user')); + $tplUser = $this->callMethod($this->_oController, 'getViewDataElement', ['user']); $this->assertSame('d3_account_totp.tpl', $sTpl); $this->assertSame($tplUser, $oUser); @@ -94,7 +94,7 @@ class d3_account_totpTest extends d3TotpUnitTestCase $this->_oController = $oControllerMock; $sTpl = $this->callMethod($this->_oController, 'render'); - $tplUser = $this->callMethod($this->_oController, 'getViewDataElement', array('user')); + $tplUser = $this->callMethod($this->_oController, 'getViewDataElement', ['user']); $this->assertSame('page/account/login.tpl', $sTpl); $this->assertNull($tplUser); @@ -110,10 +110,10 @@ class d3_account_totpTest extends d3TotpUnitTestCase { $aBackupList = [ 'foo1', - 'bar2' + 'bar2', ]; - $this->callMethod($this->_oController, 'setBackupCodes', array($aBackupList)); + $this->callMethod($this->_oController, 'setBackupCodes', [$aBackupList]); $aReturn = $this->callMethod($this->_oController, 'getBackupCodes'); @@ -156,7 +156,7 @@ class d3_account_totpTest extends d3TotpUnitTestCase $oControllerMock = $this->getMockBuilder(d3_account_totp::class) ->onlyMethods([ 'getBackupCodeListObject', - 'getUser' + 'getUser', ]) ->getMock(); $oControllerMock->method('getBackupCodeListObject')->willReturn($oBackupCodeListMock); @@ -203,7 +203,7 @@ class d3_account_totpTest extends d3TotpUnitTestCase $oBackupCodeListMock = $this->getMockBuilder(d3backupcodelist::class) ->onlyMethods([ 'generateBackupCodes', - 'save' + 'save', ]) ->getMock(); $oBackupCodeListMock->expects($this->never())->method('generateBackupCodes'); @@ -216,7 +216,7 @@ class d3_account_totpTest extends d3TotpUnitTestCase 'saveSecret', 'assign', 'verify', - 'save' + 'save', ]) ->getMock(); $oTotpMock->method('saveSecret')->willReturn(true); @@ -232,7 +232,7 @@ class d3_account_totpTest extends d3TotpUnitTestCase ->onlyMethods([ 'getTotpObject', 'getUser', - 'getBackupCodeListObject' + 'getBackupCodeListObject', ]) ->getMock(); $oControllerMock->method('getTotpObject')->willReturn($oTotpMock); @@ -257,7 +257,7 @@ class d3_account_totpTest extends d3TotpUnitTestCase $oBackupCodeListMock = $this->getMockBuilder(d3backupcodelist::class) ->onlyMethods([ 'generateBackupCodes', - 'save' + 'save', ]) ->getMock(); $oBackupCodeListMock->method('generateBackupCodes')->willReturn(['0123', '1234']); @@ -289,7 +289,7 @@ class d3_account_totpTest extends d3TotpUnitTestCase ->onlyMethods([ 'getTotpObject', 'getUser', - 'getBackupCodeListObject' + 'getBackupCodeListObject', ]) ->getMock(); $oControllerMock->method('getTotpObject')->willReturn($oTotpMock); @@ -341,7 +341,7 @@ class d3_account_totpTest extends d3TotpUnitTestCase $oControllerMock = $this->getMockBuilder(d3_account_totp::class) ->onlyMethods([ 'getTotpObject', - 'getUser' + 'getUser', ]) ->getMock(); $oControllerMock->method('getTotpObject')->willReturn($oTotpMock); @@ -366,7 +366,7 @@ class d3_account_totpTest extends d3TotpUnitTestCase ->disableOriginalConstructor() ->onlyMethods([ 'delete', - 'loadByUserId' + 'loadByUserId', ]) ->getMock(); $oTotpMock->expects($this->once())->method('delete')->willReturn(true); @@ -379,7 +379,7 @@ class d3_account_totpTest extends d3TotpUnitTestCase $oControllerMock = $this->getMockBuilder(d3_account_totp::class) ->onlyMethods([ 'getTotpObject', - 'getUser' + 'getUser', ]) ->getMock(); $oControllerMock->method('getTotpObject')->willReturn($oTotpMock); @@ -405,4 +405,4 @@ class d3_account_totpTest extends d3TotpUnitTestCase ) ); } -} \ No newline at end of file +} diff --git a/src/tests/unit/Application/Controller/d3totploginTest.php b/src/tests/unit/Application/Controller/d3totploginTest.php index 04bea71..a9ba979 100644 --- a/src/tests/unit/Application/Controller/d3totploginTest.php +++ b/src/tests/unit/Application/Controller/d3totploginTest.php @@ -67,7 +67,7 @@ class d3totploginTest extends d3TotpUnitTestCase $oControllerMock->method('getUtils')->willReturn($oUtilsMock); $this->_oController = $oControllerMock; - + $this->callMethod($this->_oController, 'render'); } @@ -128,7 +128,7 @@ class d3totploginTest extends d3TotpUnitTestCase ->onlyMethods(['getAvailableCodeCount']) ->getMock(); $oBackupCodesListMock->method('getAvailableCodeCount')->willReturn(1); - + /** @var d3totplogin|MockObject $oControllerMock */ $oControllerMock = $this->getMockBuilder(d3totplogin::class) ->onlyMethods(['getBackupCodeListObject']) @@ -264,4 +264,4 @@ class d3totploginTest extends d3TotpUnitTestCase $this->assertIsString($aBreadCrumb[0]['link']); $this->assertTrue(strlen($aBreadCrumb[0]['link']) > 1); } -} \ No newline at end of file +} diff --git a/src/tests/unit/Application/Factory/BaconQrCodeFactoryTest.php b/src/tests/unit/Application/Factory/BaconQrCodeFactoryTest.php index d2a09b0..19c9a31 100644 --- a/src/tests/unit/Application/Factory/BaconQrCodeFactoryTest.php +++ b/src/tests/unit/Application/Factory/BaconQrCodeFactoryTest.php @@ -41,4 +41,4 @@ class BaconQrCodeFactoryTest extends d3TotpUnitTestCase BaconQrCodeFactory::renderer(200) ); } -} \ No newline at end of file +} diff --git a/src/tests/unit/Application/Model/Exceptions/d3totp_wrongOtpExceptionTest.php b/src/tests/unit/Application/Model/Exceptions/d3totp_wrongOtpExceptionTest.php index 2b38b61..9274d7d 100644 --- a/src/tests/unit/Application/Model/Exceptions/d3totp_wrongOtpExceptionTest.php +++ b/src/tests/unit/Application/Model/Exceptions/d3totp_wrongOtpExceptionTest.php @@ -52,4 +52,4 @@ class d3totp_wrongOtpExceptionTest extends d3TotpUnitTestCase $this->callMethod($this->_oModel, 'getMessage') ); } -} \ No newline at end of file +} diff --git a/src/tests/unit/Application/Model/d3RandomGeneratorTest.php b/src/tests/unit/Application/Model/d3RandomGeneratorTest.php index 6f4c9f5..be45a75 100644 --- a/src/tests/unit/Application/Model/d3RandomGeneratorTest.php +++ b/src/tests/unit/Application/Model/d3RandomGeneratorTest.php @@ -51,4 +51,4 @@ class d3RandomGeneratorTest extends d3TotpUnitTestCase $this->callMethod($this->_oModel, 'getRandomTotpBackupCode') ); } -} \ No newline at end of file +} diff --git a/src/tests/unit/Application/Model/d3backupcodeTest.php b/src/tests/unit/Application/Model/d3backupcodeTest.php index e7b14ba..150cd62 100644 --- a/src/tests/unit/Application/Model/d3backupcodeTest.php +++ b/src/tests/unit/Application/Model/d3backupcodeTest.php @@ -57,7 +57,7 @@ class d3backupcodeTest extends d3TotpUnitTestCase $oModelMock = $this->getMockBuilder(d3backupcode::class) ->onlyMethods([ 'getRandomTotpBackupCode', - 'd3EncodeBC' + 'd3EncodeBC', ]) ->getMock(); $oModelMock->method('getRandomTotpBackupCode')->willReturn($sBackupCode); @@ -69,7 +69,7 @@ class d3backupcodeTest extends d3TotpUnitTestCase $this->_oModel = $oModelMock; - $this->callMethod($this->_oModel, 'generateCode', array($sTestUserId)); + $this->callMethod($this->_oModel, 'generateCode', [$sTestUserId]); $this->assertSame($sTestUserId, $this->_oModel->getFieldData('oxuserid')); $this->assertSame($sBackupCode, $this->_oModel->getFieldData('backupcode')); @@ -103,10 +103,10 @@ class d3backupcodeTest extends d3TotpUnitTestCase $oUserMock->method('load')->willReturn(true); $oUserMock->assign( [ - 'oxpasssalt' => '6162636465666768696A6B' + 'oxpasssalt' => '6162636465666768696A6B', ] ); - + /** @var d3backupcode|MockObject $oModelMock */ $oModelMock = $this->getMockBuilder(d3backupcode::class) ->onlyMethods(['d3GetUserObject']) @@ -134,7 +134,7 @@ class d3backupcodeTest extends d3TotpUnitTestCase ->getMock(); $oUserMock->assign( [ - 'oxid' => 'foobar' + 'oxid' => 'foobar', ] ); @@ -178,4 +178,4 @@ class d3backupcodeTest extends d3TotpUnitTestCase $this->callMethod($this->_oModel, 'd3GetUserObject') ); } -} \ No newline at end of file +} diff --git a/src/tests/unit/Application/Model/d3backupcodelistTest.php b/src/tests/unit/Application/Model/d3backupcodelistTest.php index 7aa0cc6..e4dd359 100644 --- a/src/tests/unit/Application/Model/d3backupcodelistTest.php +++ b/src/tests/unit/Application/Model/d3backupcodelistTest.php @@ -75,7 +75,7 @@ class d3backupcodelistTest extends d3TotpUnitTestCase ->onlyMethods([ 'deleteAllFromUser', 'getD3BackupCodeObject', - 'd3GetConfig' + 'd3GetConfig', ]) ->getMock(); $oModelMock->expects($this->once())->method('deleteAllFromUser')->willReturn(true); @@ -84,7 +84,7 @@ class d3backupcodelistTest extends d3TotpUnitTestCase $this->_oModel = $oModelMock; - $this->callMethod($this->_oModel, 'generateBackupCodes', array('123456')); + $this->callMethod($this->_oModel, 'generateBackupCodes', ['123456']); } /** @@ -127,7 +127,7 @@ class d3backupcodelistTest extends d3TotpUnitTestCase $oBackupCodeMock->expects($this->once())->method('save')->willReturn(true); $aBackupCodeArray = [ - $oBackupCodeMock + $oBackupCodeMock, ]; /** @var d3backupcodelist|MockObject $oModelMock */ @@ -178,7 +178,7 @@ class d3backupcodelistTest extends d3TotpUnitTestCase ->onlyMethods([ 'getOne', 'quoteIdentifier', - 'quote' + 'quote', ]) ->disableOriginalConstructor() ->getMock(); @@ -191,7 +191,7 @@ class d3backupcodelistTest extends d3TotpUnitTestCase ->onlyMethods([ 'd3GetDb', 'getBaseObject', - 'd3GetUser' + 'd3GetUser', ]) ->getMock(); $oModelMock->method('d3GetDb')->willReturn($oDbMock); @@ -201,7 +201,7 @@ class d3backupcodelistTest extends d3TotpUnitTestCase $this->_oModel = $oModelMock; $this->assertTrue( - $this->callMethod($this->_oModel, 'verify', array('123456')) + $this->callMethod($this->_oModel, 'verify', ['123456']) ); } @@ -217,7 +217,7 @@ class d3backupcodelistTest extends d3TotpUnitTestCase ->onlyMethods(['getId']) ->getMock(); $oUserMock->method('getId')->willReturn('foobar'); - + /** @var d3backupcode|MockObject $oBackupCodeMock */ $oBackupCodeMock = $this->getMockBuilder(d3backupcode::class) ->onlyMethods(['delete']) @@ -242,7 +242,7 @@ class d3backupcodelistTest extends d3TotpUnitTestCase ->onlyMethods([ 'd3GetDb', 'getBaseObject', - 'd3GetUser' + 'd3GetUser', ]) ->getMock(); $oModelMock->method('d3GetDb')->willReturn($oDbMock); @@ -252,7 +252,7 @@ class d3backupcodelistTest extends d3TotpUnitTestCase $this->_oModel = $oModelMock; $this->assertFalse( - $this->callMethod($this->_oModel, 'verify', array('123456')) + $this->callMethod($this->_oModel, 'verify', ['123456']) ); } @@ -294,7 +294,7 @@ class d3backupcodelistTest extends d3TotpUnitTestCase $oBackupCodeMock->expects($this->once())->method('delete')->willReturn(true); $aBackupCodeArray = [ - $oBackupCodeMock + $oBackupCodeMock, ]; /** @var d3backupcodelist|MockObject $oModelMock */ @@ -302,7 +302,7 @@ class d3backupcodelistTest extends d3TotpUnitTestCase ->onlyMethods([ 'getArray', 'selectString', - 'd3GetDb' + 'd3GetDb', ]) ->getMock(); $oModelMock->expects($this->once())->method('getArray')->willReturn($aBackupCodeArray); @@ -345,7 +345,7 @@ class d3backupcodelistTest extends d3TotpUnitTestCase ->onlyMethods([ 'getArray', 'selectString', - 'd3GetDb' + 'd3GetDb', ]) ->getMock(); $oModelMock->expects($this->once())->method('getArray')->willReturn($aBackupCodeArray); @@ -369,7 +369,7 @@ class d3backupcodelistTest extends d3TotpUnitTestCase ->onlyMethods([ 'getOne', 'quoteIdentifier', - 'quote' + 'quote', ]) ->disableOriginalConstructor() ->getMock(); @@ -403,4 +403,4 @@ class d3backupcodelistTest extends d3TotpUnitTestCase $this->callMethod($this->_oModel, 'd3GetUser') ); } -} \ No newline at end of file +} diff --git a/src/tests/unit/Application/Model/d3totpTest.php b/src/tests/unit/Application/Model/d3totpTest.php index 5ee4f9a..a2729ef 100644 --- a/src/tests/unit/Application/Model/d3totpTest.php +++ b/src/tests/unit/Application/Model/d3totpTest.php @@ -85,7 +85,7 @@ class d3totpTest extends d3TotpUnitTestCase $oModelMock = $this->getMockBuilder(d3totp::class) ->onlyMethods([ 'd3GetDb', - 'load' + 'load', ]) ->getMock(); $oModelMock->method('d3GetDb')->willReturn($oDbMock); @@ -108,7 +108,7 @@ class d3totpTest extends d3TotpUnitTestCase ->disableOriginalConstructor() ->onlyMethods([ 'getOne', - 'quote' + 'quote', ])->getMock(); $oDbMock->expects($this->exactly(2))->method('getOne')->willReturnOnConsecutiveCalls(true, true); $oDbMock->method('quote')->willReturn(true); @@ -117,7 +117,7 @@ class d3totpTest extends d3TotpUnitTestCase $oModelMock = $this->getMockBuilder(d3totp::class) ->onlyMethods([ 'd3GetDb', - 'load' + 'load', ]) ->getMock(); $oModelMock->method('d3GetDb')->willReturn($oDbMock); @@ -205,7 +205,7 @@ class d3totpTest extends d3TotpUnitTestCase $oDbMock = $this->getMockBuilder(Database::class) ->onlyMethods([ 'getOne', - 'quote' + 'quote', ]) ->disableOriginalConstructor() ->getMock(); @@ -221,7 +221,7 @@ class d3totpTest extends d3TotpUnitTestCase $this->_oModel = $oModelMock; $this->assertTrue( - $this->callMethod($this->_oModel, 'checkIfAlreadyExist', array('testUserId')) + $this->callMethod($this->_oModel, 'checkIfAlreadyExist', ['testUserId']) ); } @@ -430,7 +430,7 @@ class d3totpTest extends d3TotpUnitTestCase $oModelMock = $this->getMockBuilder(d3totp::class) ->onlyMethods([ 'getFieldData', - 'decrypt' + 'decrypt', ]) ->getMock(); $oModelMock->method('getFieldData')->willReturn('seed'); @@ -455,7 +455,7 @@ class d3totpTest extends d3TotpUnitTestCase $oModelMock = $this->getMockBuilder(d3totp::class) ->onlyMethods([ 'getFieldData', - 'decrypt' + 'decrypt', ]) ->getMock(); $oModelMock->method('getFieldData')->willReturn(null); @@ -479,7 +479,7 @@ class d3totpTest extends d3TotpUnitTestCase $oModelMock = $this->getMockBuilder(d3totp::class) ->onlyMethods([ 'getFieldData', - 'decrypt' + 'decrypt', ]) ->getMock(); $oModelMock->method('getFieldData')->willReturn('seed'); @@ -529,7 +529,7 @@ class d3totpTest extends d3TotpUnitTestCase $oModelMock = $this->getMockBuilder(d3totp::class) ->onlyMethods([ 'getUser', - 'getSavedSecret' + 'getSavedSecret', ]) ->getMock(); $oModelMock->method('getUser')->willReturn($oUserMock); @@ -564,7 +564,7 @@ class d3totpTest extends d3TotpUnitTestCase $oModelMock = $this->getMockBuilder(d3totp::class) ->onlyMethods([ 'getUser', - 'getSavedSecret' + 'getSavedSecret', ]) ->getMock(); $oModelMock->method('getUser')->willReturn($oUserMock); @@ -720,7 +720,7 @@ class d3totpTest extends d3TotpUnitTestCase $oModelMock = $this->getMockBuilder(d3totp::class) ->onlyMethods([ 'getTotp', - 'd3GetBackupCodeListObject' + 'd3GetBackupCodeListObject', ]) ->getMock(); $oModelMock->method('getTotp')->willReturn($oTotpMock); @@ -758,7 +758,7 @@ class d3totpTest extends d3TotpUnitTestCase $oModelMock = $this->getMockBuilder(d3totp::class) ->onlyMethods([ 'getTotp', - 'd3GetBackupCodeListObject' + 'd3GetBackupCodeListObject', ]) ->getMock(); $oModelMock->method('getTotp')->willReturn($oTotpMock); @@ -794,7 +794,7 @@ class d3totpTest extends d3TotpUnitTestCase $oModelMock = $this->getMockBuilder(d3totp::class) ->onlyMethods([ 'getTotp', - 'd3GetBackupCodeListObject' + 'd3GetBackupCodeListObject', ]) ->getMock(); $oModelMock->method('getTotp')->willReturn($oTotpMock); @@ -907,7 +907,7 @@ class d3totpTest extends d3TotpUnitTestCase ->onlyMethods([ 'd3GetBackupCodeListObject', 'getFieldData', - 'canDelete' + 'canDelete', ]) ->getMock(); $oModelMock->method('d3GetBackupCodeListObject')->willReturn($oBackupCodeListMock); diff --git a/src/tests/unit/Modules/Application/Component/d3_totp_UserComponentTest.php b/src/tests/unit/Modules/Application/Component/d3_totp_UserComponentTest.php index 783fc98..cf372ee 100644 --- a/src/tests/unit/Modules/Application/Component/d3_totp_UserComponentTest.php +++ b/src/tests/unit/Modules/Application/Component/d3_totp_UserComponentTest.php @@ -71,13 +71,13 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase ->disableOriginalConstructor() ->getMock(); $oTotpMock->expects($this->never())->method('isActive')->willReturn(false); - + /** @var UserComponent|MockObject $oControllerMock */ $oControllerMock = $this->getMockBuilder(UserComponent::class) ->onlyMethods([ 'getUser', 'd3GetTotpObject', - 'getParent' + 'getParent', ]) ->getMock(); $oControllerMock->method('getUser')->willReturn($oUser); @@ -102,7 +102,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase $oUserMock = $this->getMockBuilder(User::class) ->onlyMethods([ 'logout', - 'getId' + 'getId', ]) ->getMock(); $oUserMock->expects($this->never())->method('logout')->willReturn(false); @@ -118,7 +118,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase $oTotpMock = $this->getMockBuilder(d3totp::class) ->onlyMethods([ 'isActive', - 'loadByUserId' + 'loadByUserId', ]) ->disableOriginalConstructor() ->getMock(); @@ -130,7 +130,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase ->onlyMethods([ 'getUser', 'd3GetTotpObject', - 'getParent' + 'getParent', ]) ->getMock(); $oControllerMock->method('getUser')->willReturn($oUserMock); @@ -171,7 +171,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase $oTotpMock = $this->getMockBuilder(d3totp::class) ->onlyMethods([ 'isActive', - 'loadByUserId' + 'loadByUserId', ]) ->disableOriginalConstructor() ->getMock(); @@ -183,7 +183,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase ->onlyMethods([ 'getUser', 'd3GetTotpObject', - 'getParent' + 'getParent', ]) ->getMock(); $oControllerMock->method('getUser')->willReturn($oUserMock); @@ -218,7 +218,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase * @throws ReflectionException * @covers \D3\Totp\Modules\Application\Component\d3_totp_UserComponent::checkTotplogin */ - public function checkTotploginNoTotpLogin() + public function checkTotploginNoTotpLogin() { /** @var d3totp|MockObject $oTotpMock */ $oTotpMock = $this->getMockBuilder(d3totp::class) @@ -233,7 +233,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase 'isNoTotpOrNoLogin', 'hasValidTotp', 'd3TotpRelogin', - 'd3GetTotpObject' + 'd3GetTotpObject', ]) ->getMock(); $oControllerMock->method('isNoTotpOrNoLogin')->willReturn(true); @@ -254,7 +254,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase * @throws ReflectionException * @covers \D3\Totp\Modules\Application\Component\d3_totp_UserComponent::checkTotplogin */ - public function checkTotploginUnvalidTotp() + public function checkTotploginUnvalidTotp() { /** @var d3totp|MockObject $oTotpMock */ $oTotpMock = $this->getMockBuilder(d3totp::class) @@ -273,7 +273,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase ->onlyMethods(['addErrorToDisplay']) ->getMock(); $oUtilsViewMock->expects($this->atLeast(1))->method('addErrorToDisplay')->willReturn(true); - + /** @var UserComponent|MockObject $oControllerMock */ $oControllerMock = $this->getMockBuilder(UserComponent::class) ->onlyMethods([ @@ -281,7 +281,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase 'hasValidTotp', 'd3TotpRelogin', 'd3GetUtilsView', - 'd3GetTotpObject' + 'd3GetTotpObject', ]) ->getMock(); $oControllerMock->method('isNoTotpOrNoLogin')->willReturn(false); @@ -303,7 +303,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase * @throws ReflectionException * @covers \D3\Totp\Modules\Application\Component\d3_totp_UserComponent::checkTotplogin */ - public function checkTotploginValidTotp() + public function checkTotploginValidTotp() { /** @var d3totp|MockObject $oTotpMock */ $oTotpMock = $this->getMockBuilder(d3totp::class) @@ -325,7 +325,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase 'hasValidTotp', 'd3TotpRelogin', 'd3GetUtilsView', - 'd3GetTotpObject' + 'd3GetTotpObject', ]) ->getMock(); $oControllerMock->method('isNoTotpOrNoLogin')->willReturn(false); @@ -389,7 +389,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase $oTotpMock->method('isActive')->willReturn(true); $this->assertTrue( - $this->callMethod($this->_oController, 'isNoTotpOrNoLogin', array($oTotpMock)) + $this->callMethod($this->_oController, 'isNoTotpOrNoLogin', [$oTotpMock]) ); } @@ -410,7 +410,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase $oTotpMock->method('isActive')->willReturn(false); $this->assertTrue( - $this->callMethod($this->_oController, 'isNoTotpOrNoLogin', array($oTotpMock)) + $this->callMethod($this->_oController, 'isNoTotpOrNoLogin', [$oTotpMock]) ); } @@ -431,7 +431,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase $oTotpMock->method('isActive')->willReturn(true); $this->assertFalse( - $this->callMethod($this->_oController, 'isNoTotpOrNoLogin', array($oTotpMock)) + $this->callMethod($this->_oController, 'isNoTotpOrNoLogin', [$oTotpMock]) ); } @@ -452,7 +452,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase $oTotpMock->method('verify')->willReturn(false); $this->assertTrue( - $this->callMethod($this->_oController, 'hasValidTotp', array('123456', $oTotpMock)) + $this->callMethod($this->_oController, 'hasValidTotp', ['123456', $oTotpMock]) ); } @@ -473,7 +473,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase $oTotpMock->method('verify')->willReturn(true); $this->assertTrue( - $this->callMethod($this->_oController, 'hasValidTotp', array('123456', $oTotpMock)) + $this->callMethod($this->_oController, 'hasValidTotp', ['123456', $oTotpMock]) ); } @@ -494,7 +494,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase $oTotpMock->method('verify')->willReturn(true); $this->assertFalse( - $this->callMethod($this->_oController, 'hasValidTotp', array(null, $oTotpMock)) + $this->callMethod($this->_oController, 'hasValidTotp', [null, $oTotpMock]) ); } @@ -515,7 +515,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase $oTotpMock->method('verify')->willReturn(false); $this->assertFalse( - $this->callMethod($this->_oController, 'hasValidTotp', array('123456', $oTotpMock)) + $this->callMethod($this->_oController, 'hasValidTotp', ['123456', $oTotpMock]) ); } @@ -531,7 +531,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase ->onlyMethods(['setVariable']) ->getMock(); $oSessionMock->expects($this->atLeast(2))->method('setVariable')->willReturn(false); - + /** @var User|MockObject $oUserMock */ $oUserMock = $this->getMockBuilder(User::class) ->onlyMethods(['getId']) @@ -544,7 +544,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase 'd3GetSession', 'setUser', 'setLoginStatus', - '_afterLogin' + '_afterLogin', ]) ->getMock(); $oControllerMock->method('d3GetSession')->willReturn($oSessionMock); @@ -554,7 +554,7 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase $this->_oController = $oControllerMock; - $this->callMethod($this->_oController, 'd3TotpRelogin', array($oUserMock, '123456')); + $this->callMethod($this->_oController, 'd3TotpRelogin', [$oUserMock, '123456']); } /** @@ -593,4 +593,4 @@ class d3_totp_UserComponentTest extends d3TotpUnitTestCase $this->callMethod($this->_oController, 'd3GetSession') ); } -} \ No newline at end of file +} diff --git a/src/tests/unit/Modules/Application/Controller/Admin/d3_totp_LoginControllerTest.php b/src/tests/unit/Modules/Application/Controller/Admin/d3_totp_LoginControllerTest.php index 6f0d8d7..097189c 100644 --- a/src/tests/unit/Modules/Application/Controller/Admin/d3_totp_LoginControllerTest.php +++ b/src/tests/unit/Modules/Application/Controller/Admin/d3_totp_LoginControllerTest.php @@ -60,7 +60,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase $oTotpMock = $this->getMockBuilder(d3totp::class) ->onlyMethods([ 'isActive', - 'loadByUserId' + 'loadByUserId', ]) ->disableOriginalConstructor() ->getMock(); @@ -71,7 +71,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase $oSessionMock = $this->getMockBuilder(Session::class) ->onlyMethods([ 'getVariable', - 'setVariable' + 'setVariable', ]) ->getMock(); $oSessionMock->method('getVariable')->will($this->onConsecutiveCalls(false, true)); @@ -81,7 +81,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase $oControllerMock = $this->getMockBuilder(d3_totp_LoginController::class) ->onlyMethods([ 'd3GetSession', - 'd3GetTotpObject' + 'd3GetTotpObject', ]) ->getMock(); $oControllerMock->method('d3GetSession')->willReturn($oSessionMock); @@ -90,7 +90,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase $this->_oController = $oControllerMock; $this->assertSame('login.tpl', $this->callMethod($this->_oController, 'render')); - $this->assertNotTrue($this->callMethod($this->_oController, 'getViewDataElement', array('request_totp'))); + $this->assertNotTrue($this->callMethod($this->_oController, 'getViewDataElement', ['request_totp'])); } /** @@ -106,7 +106,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase ->disableOriginalConstructor() ->onlyMethods([ 'isActive', - 'loadByUserId' + 'loadByUserId', ]) ->getMock(); $oTotpMock->expects($this->once())->method('isActive')->willReturn(false); @@ -126,7 +126,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase $oControllerMock = $this->getMockBuilder(d3_totp_LoginController::class) ->onlyMethods([ 'd3GetSession', - 'd3GetTotpObject' + 'd3GetTotpObject', ]) ->getMock(); $oControllerMock->method('d3GetSession')->willReturn($oSessionMock); @@ -135,7 +135,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase $this->_oController = $oControllerMock; $this->assertSame('login.tpl', $this->callMethod($this->_oController, 'render')); - $this->assertNotTrue($this->callMethod($this->_oController, 'getViewDataElement', array('request_totp'))); + $this->assertNotTrue($this->callMethod($this->_oController, 'getViewDataElement', ['request_totp'])); } /** @@ -150,7 +150,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase $oTotpMock = $this->getMockBuilder(d3totp::class) ->onlyMethods([ 'isActive', - 'loadByUserId' + 'loadByUserId', ]) ->disableOriginalConstructor() ->getMock(); @@ -171,7 +171,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase $oControllerMock = $this->getMockBuilder(d3_totp_LoginController::class) ->onlyMethods([ 'd3GetSession', - 'd3GetTotpObject' + 'd3GetTotpObject', ]) ->getMock(); $oControllerMock->method('d3GetSession')->willReturn($oSessionMock); @@ -180,7 +180,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase $this->_oController = $oControllerMock; $this->assertSame('login.tpl', $this->callMethod($this->_oController, 'render')); - $this->assertNotTrue($this->callMethod($this->_oController, 'getViewDataElement', array('request_totp'))); + $this->assertNotTrue($this->callMethod($this->_oController, 'getViewDataElement', ['request_totp'])); } /** @@ -195,7 +195,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase $oTotpMock = $this->getMockBuilder(d3totp::class) ->onlyMethods([ 'isActive', - 'loadByUserId' + 'loadByUserId', ]) ->disableOriginalConstructor() ->getMock(); @@ -216,7 +216,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase $oControllerMock = $this->getMockBuilder(d3_totp_LoginController::class) ->onlyMethods([ 'd3GetSession', - 'd3GetTotpObject' + 'd3GetTotpObject', ]) ->getMock(); $oControllerMock->method('d3GetSession')->willReturn($oSessionMock); @@ -225,7 +225,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase $this->_oController = $oControllerMock; $this->assertSame('login.tpl', $this->callMethod($this->_oController, 'render')); - $this->assertTrue($this->callMethod($this->_oController, 'getViewDataElement', array('request_totp'))); + $this->assertTrue($this->callMethod($this->_oController, 'getViewDataElement', ['request_totp'])); } /** @@ -301,7 +301,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase 'd3GetTotpObject', 'isNoTotpOrNoLogin', 'hasValidTotp', - 'hasLoginCredentials' + 'hasLoginCredentials', ]) ->getMock(); $oControllerMock->method('d3GetTotpObject')->willReturn($oTotpMock); @@ -339,7 +339,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase { return [ 'no totp, no login credentials' => [false], - 'no totp, given login credentials' => [true] + 'no totp, given login credentials' => [true], ]; } @@ -360,7 +360,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase ->onlyMethods(['addErrorToDisplay']) ->getMock(); $utilsViewMock->expects($this->once())->method('addErrorToDisplay')->willReturn(true); - + /** @var d3totp|MockObject $oTotpMock */ $oTotpMock = $this->getMockBuilder(d3totp::class) ->disableOriginalConstructor() @@ -374,7 +374,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase 'd3GetTotpObject', 'isNoTotpOrNoLogin', 'hasValidTotp', - 'd3GetUtilsView' + 'd3GetUtilsView', ]) ->getMock(); $oControllerMock->method('d3GetTotpObject')->willReturn($oTotpMock); @@ -423,7 +423,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase 'isNoTotpOrNoLogin', 'hasValidTotp', 'd3GetUtilsView', - 'd3GetSession' + 'd3GetSession', ]) ->getMock(); $oControllerMock->method('d3GetTotpObject')->willReturn($oTotpMock); @@ -449,7 +449,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase ->onlyMethods(['getAvailableCodeCount']) ->getMock(); $oBackupCodeListMock->method('getAvailableCodeCount')->willReturn(2); - + /** @var d3_totp_LoginController|MockObject $oControllerMock */ $oControllerMock = $this->getMockBuilder(d3_totp_LoginController::class) ->onlyMethods(['d3GetBackupCodeListObject']) @@ -522,7 +522,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase $this->_oController = $oControllerMock; $this->assertFalse( - $this->callMethod($this->_oController, 'isNoTotpOrNoLogin', array($oTotpMock)) + $this->callMethod($this->_oController, 'isNoTotpOrNoLogin', [$oTotpMock]) ); } @@ -555,7 +555,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase $this->_oController = $oControllerMock; $this->assertFalse( - $this->callMethod($this->_oController, 'isNoTotpOrNoLogin', array($oTotpMock)) + $this->callMethod($this->_oController, 'isNoTotpOrNoLogin', [$oTotpMock]) ); } @@ -588,7 +588,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase $this->_oController = $oControllerMock; $this->assertTrue( - $this->callMethod($this->_oController, 'isNoTotpOrNoLogin', array($oTotpMock)) + $this->callMethod($this->_oController, 'isNoTotpOrNoLogin', [$oTotpMock]) ); } @@ -609,7 +609,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase $oTotpMock->method('verify')->willReturn(false); $this->assertTrue( - $this->callMethod($this->_oController, 'hasValidTotp', array('123456', $oTotpMock)) + $this->callMethod($this->_oController, 'hasValidTotp', ['123456', $oTotpMock]) ); } @@ -630,7 +630,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase $oTotpMock->method('verify')->willReturn(true); $this->assertTrue( - $this->callMethod($this->_oController, 'hasValidTotp', array('123456', $oTotpMock)) + $this->callMethod($this->_oController, 'hasValidTotp', ['123456', $oTotpMock]) ); } @@ -651,7 +651,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase $oTotpMock->method('verify')->willReturn(true); $this->assertFalse( - $this->callMethod($this->_oController, 'hasValidTotp', array(null, $oTotpMock)) + $this->callMethod($this->_oController, 'hasValidTotp', [null, $oTotpMock]) ); } @@ -672,7 +672,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase $oTotpMock->method('verify')->willReturn(false); $this->assertFalse( - $this->callMethod($this->_oController, 'hasValidTotp', array('123456', $oTotpMock)) + $this->callMethod($this->_oController, 'hasValidTotp', ['123456', $oTotpMock]) ); } @@ -688,7 +688,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase ->onlyMethods(['logout']) ->getMock(); $oUserMock->expects($this->once())->method('logout')->willReturn(true); - + /** @var d3_totp_LoginController|MockObject $oControllerMock */ $oControllerMock = $this->getMockBuilder(d3_totp_LoginController::class) ->onlyMethods(['d3GetUserObject']) @@ -696,7 +696,7 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase $oControllerMock->method('d3GetUserObject')->willReturn($oUserMock); $this->_oController = $oControllerMock; - + $this->callMethod($this->_oController, 'd3CancelLogin'); } @@ -745,4 +745,4 @@ class d3_totp_LoginControllerTest extends d3TotpUnitTestCase 'both' => ['user', 'password', true], ]; } -} \ No newline at end of file +} diff --git a/src/tests/unit/Modules/Application/Controller/d3_totp_OrderControllerTest.php b/src/tests/unit/Modules/Application/Controller/d3_totp_OrderControllerTest.php index f29ba95..61b9d9b 100644 --- a/src/tests/unit/Modules/Application/Controller/d3_totp_OrderControllerTest.php +++ b/src/tests/unit/Modules/Application/Controller/d3_totp_OrderControllerTest.php @@ -43,4 +43,4 @@ class d3_totp_OrderControllerTest extends d3TotpUnitTestCase unset($this->_oController); } -} \ No newline at end of file +} diff --git a/src/tests/unit/Modules/Application/Controller/d3_totp_PaymentControllerTest.php b/src/tests/unit/Modules/Application/Controller/d3_totp_PaymentControllerTest.php index 83a3163..8f57dcd 100644 --- a/src/tests/unit/Modules/Application/Controller/d3_totp_PaymentControllerTest.php +++ b/src/tests/unit/Modules/Application/Controller/d3_totp_PaymentControllerTest.php @@ -42,4 +42,4 @@ class d3_totp_PaymentControllerTest extends d3TotpUnitTestCase unset($this->_oController); } -} \ No newline at end of file +} diff --git a/src/tests/unit/Modules/Application/Controller/d3_totp_UserControllerTest.php b/src/tests/unit/Modules/Application/Controller/d3_totp_UserControllerTest.php index 72556dc..f8e6a81 100644 --- a/src/tests/unit/Modules/Application/Controller/d3_totp_UserControllerTest.php +++ b/src/tests/unit/Modules/Application/Controller/d3_totp_UserControllerTest.php @@ -42,4 +42,4 @@ class d3_totp_UserControllerTest extends d3TotpUnitTestCase unset($this->_oController); } -} \ No newline at end of file +} diff --git a/src/tests/unit/Modules/Application/Controller/d3_totp_getUserTestTrait.php b/src/tests/unit/Modules/Application/Controller/d3_totp_getUserTestTrait.php index 93e4a36..51e5061 100644 --- a/src/tests/unit/Modules/Application/Controller/d3_totp_getUserTestTrait.php +++ b/src/tests/unit/Modules/Application/Controller/d3_totp_getUserTestTrait.php @@ -70,7 +70,7 @@ trait d3_totp_getUserTestTrait ->disableOriginalConstructor() ->onlyMethods([ 'isActive', - 'loadByUserId' + 'loadByUserId', ]) ->getMock(); $oTotpMock->method('isActive')->willReturn(false); @@ -80,7 +80,7 @@ trait d3_totp_getUserTestTrait $oControllerMock = $this->getMockBuilder($this->sControllerClass) ->onlyMethods([ 'd3GetTotpObject', - 'd3GetSessionObject' + 'd3GetSessionObject', ]) ->getMock(); $oControllerMock->expects($this->once())->method('d3GetTotpObject')->willReturn($oTotpMock); @@ -121,7 +121,7 @@ trait d3_totp_getUserTestTrait $oTotpMock = $this->getMockBuilder(d3totp::class) ->onlyMethods([ 'isActive', - 'loadByUserId' + 'loadByUserId', ]) ->getMock(); $oTotpMock->method('isActive')->willReturn(true); @@ -131,7 +131,7 @@ trait d3_totp_getUserTestTrait $oControllerMock = $this->getMockBuilder($this->sControllerClass) ->onlyMethods([ 'd3GetTotpObject', - 'd3GetSessionObject' + 'd3GetSessionObject', ]) ->getMock(); $oControllerMock->expects($this->once())->method('d3GetTotpObject')->willReturn($oTotpMock); @@ -173,7 +173,7 @@ trait d3_totp_getUserTestTrait ->disableOriginalConstructor() ->onlyMethods([ 'isActive', - 'loadByUserId' + 'loadByUserId', ]) ->getMock(); $oTotpMock->method('isActive')->willReturn(true); @@ -183,7 +183,7 @@ trait d3_totp_getUserTestTrait $oControllerMock = $this->getMockBuilder($this->sControllerClass) ->onlyMethods([ 'd3GetTotpObject', - 'd3GetSessionObject' + 'd3GetSessionObject', ]) ->getMock(); $oControllerMock->expects($this->once())->method('d3GetTotpObject')->willReturn($oTotpMock); @@ -230,4 +230,4 @@ trait d3_totp_getUserTestTrait ) ); } -} \ No newline at end of file +} diff --git a/src/tests/unit/Modules/Application/Model/d3_totp_userTest.php b/src/tests/unit/Modules/Application/Model/d3_totp_userTest.php index 07d9f41..1aa5bde 100644 --- a/src/tests/unit/Modules/Application/Model/d3_totp_userTest.php +++ b/src/tests/unit/Modules/Application/Model/d3_totp_userTest.php @@ -97,4 +97,4 @@ class d3_totp_userTest extends d3TotpUnitTestCase $this->callMethod($this->_oModel, 'd3GetSession') ); } -} \ No newline at end of file +} diff --git a/src/tests/unit/Modules/Core/d3_totp_utilsTest.php b/src/tests/unit/Modules/Core/d3_totp_utilsTest.php index 9c8c950..723b60d 100644 --- a/src/tests/unit/Modules/Core/d3_totp_utilsTest.php +++ b/src/tests/unit/Modules/Core/d3_totp_utilsTest.php @@ -128,7 +128,7 @@ class d3_totp_utilsTest extends d3TotpUnitTestCase $oTotpMock = $this->getMockBuilder(d3totp::class) ->onlyMethods([ 'loadByUserId', - 'isActive' + 'isActive', ]) ->disableOriginalConstructor() ->getMock(); @@ -139,7 +139,7 @@ class d3_totp_utilsTest extends d3TotpUnitTestCase $oCoreMock = $this->getMockBuilder(Utils::class) ->onlyMethods([ 'd3GetTotpObject', - 'fetchRightsForUser' + 'fetchRightsForUser', ]) ->getMock(); $oCoreMock->method('d3GetTotpObject')->willReturn($oTotpMock); @@ -171,7 +171,7 @@ class d3_totp_utilsTest extends d3TotpUnitTestCase $oTotpMock = $this->getMockBuilder(d3totp::class) ->onlyMethods([ 'loadByUserId', - 'isActive' + 'isActive', ]) ->disableOriginalConstructor() ->getMock(); @@ -184,7 +184,7 @@ class d3_totp_utilsTest extends d3TotpUnitTestCase 'd3GetTotpObject', 'd3GetSessionObject', 'fetchRightsForUser', - 'redirect' + 'redirect', ]) ->getMock(); $oCoreMock->method('d3GetTotpObject')->willReturn($oTotpMock); @@ -237,7 +237,7 @@ class d3_totp_utilsTest extends d3TotpUnitTestCase 'd3GetTotpObject', 'd3GetSessionObject', 'fetchRightsForUser', - 'redirect' + 'redirect', ]) ->getMock(); $oCoreMock->method('d3GetTotpObject')->willReturn($oTotpMock); @@ -366,7 +366,7 @@ class d3_totp_utilsTest extends d3TotpUnitTestCase { return [ [true], - [false] + [false], ]; } -} \ No newline at end of file +} diff --git a/src/tests/unit/d3TotpUnitTestCase.php b/src/tests/unit/d3TotpUnitTestCase.php index f2c370c..eaf65b7 100644 --- a/src/tests/unit/d3TotpUnitTestCase.php +++ b/src/tests/unit/d3TotpUnitTestCase.php @@ -16,4 +16,4 @@ use D3\ModCfg\Tests\unit\d3ModCfgUnitTestCase; abstract class d3TotpUnitTestCase extends d3ModCfgUnitTestCase { -} \ No newline at end of file +}