ENGCOM-4654: Fixed inactive admin user token #20772

magento-engcom-team · magento-engcom-team · commit 76bf8db41e46 · 2019-04-10T07:03:12.000-05:00
- Merge Pull Request #20772 from mage2pratik/magento2:patch-6 - Merged commits: 1. 4c71a22 2. b159dfb 3. ce4af9e
diff --git a/app/code/Magento/Integration/Model/AdminTokenService.php b/app/code/Magento/Integration/Model/AdminTokenService.php
@@ -72,7 +72,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function createAdminAccessToken($username, $password)
     {
diff --git a/app/code/Magento/Integration/Test/Unit/Model/AdminTokenServiceTest.php b/app/code/Magento/Integration/Test/Unit/Model/AdminTokenServiceTest.php
@@ -8,6 +8,9 @@
 
 use Magento\Integration\Model\Oauth\Token;
 
+/**
+ * Test for Magento\Integration\Model\AdminTokenService class.
+ */
 class AdminTokenServiceTest extends \PHPUnit\Framework\TestCase
 {
     /** \Magento\Integration\Model\AdminTokenService */

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function __construct(`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/**`
`75`		`- * {@inheritdoc}`
	`75`	`+ * @inheritdoc`
`76`	`76`	`*/`
`77`	`77`	`public function createAdminAccessToken($username, $password)`
`78`	`78`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,9 @@`
`8`	`8`
`9`	`9`	`use Magento\Integration\Model\Oauth\Token;`
`10`	`10`
	`11`	`+/**`
	`12`	`+ * Test for Magento\Integration\Model\AdminTokenService class.`
	`13`	`+ */`
`11`	`14`	`class AdminTokenServiceTest extends \PHPUnit\Framework\TestCase`
`12`	`15`	`{`
`13`	`16`	`/** \Magento\Integration\Model\AdminTokenService */`