Merge pull request #232 from magento-borg/tfa-static-fix-1.0.0

nathanjosiah · web-flow · commit 5d0800d77dfa · 2020-05-26T14:38:56.000-05:00
2fa static fix
diff --git a/TwoFactorAuth/Model/AdminAccessTokenService.php b/TwoFactorAuth/Model/AdminAccessTokenService.php
@@ -90,16 +90,16 @@ public function createAdminAccessToken($username, $password): string
         }
 
         if (!$this->configRequestManager->isConfigurationRequiredFor($userId)) {
-            // @codingStandardsIgnoreStart
             throw new LocalizedException(
-                __(
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
+                call_user_func(
+                    '__',
                     'Please use the 2fa provider-specific endpoints to obtain a token.',
                     [
                         'active_providers' => $activeProviderCodes
                     ]
                 )
             );
-            // @codingStandardsIgnoreEnd
         } elseif (empty($this->tfa->getUserProviders($userId))) {
             // It is expected that available 2fa providers are selected via db or admin ui
             throw new LocalizedException(
@@ -116,7 +116,9 @@ public function createAdminAccessToken($username, $password): string
         }
 
         throw new LocalizedException(
-            __(
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            call_user_func(
+                '__',
                 'You are required to configure personal Two-Factor Authorization in order to login. '
                 . 'Please check your email.',
                 [

Original file line number	Diff line number	Diff line change
`@@ -90,16 +90,16 @@ public function createAdminAccessToken($username, $password): string`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`if (!$this->configRequestManager->isConfigurationRequiredFor($userId)) {`
`93`		`- // @codingStandardsIgnoreStart`
`94`	`93`	`throw new LocalizedException(`
`95`		`- __(`
	`94`	`+ // phpcs:ignore Magento2.Functions.DiscouragedFunction`
	`95`	`+ call_user_func(`
	`96`	`+ '__',`
`96`	`97`	`'Please use the 2fa provider-specific endpoints to obtain a token.',`
`97`	`98`	`[`
`98`	`99`	`'active_providers' => $activeProviderCodes`
`99`	`100`	`]`
`100`	`101`	`)`
`101`	`102`	`);`
`102`		`- // @codingStandardsIgnoreEnd`
`103`	`103`	`} elseif (empty($this->tfa->getUserProviders($userId))) {`
`104`	`104`	`// It is expected that available 2fa providers are selected via db or admin ui`
`105`	`105`	`throw new LocalizedException(`
`@@ -116,7 +116,9 @@ public function createAdminAccessToken($username, $password): string`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`throw new LocalizedException(`
`119`		`- __(`
	`119`	`+ // phpcs:ignore Magento2.Functions.DiscouragedFunction`
	`120`	`+ call_user_func(`
	`121`	`+ '__',`
`120`	`122`	`'You are required to configure personal Two-Factor Authorization in order to login. '`
`121`	`123`	`. 'Please check your email.',`
`122`	`124`	`[`