Merge remote-tracking branch 'origin/MAGETWO-51352-exception' into develop

Joan He · Joan He · commit 442fc5191464 · 2016-04-02T11:58:21.000-05:00
diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php b/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php
@@ -6,6 +6,8 @@
  */
 namespace Magento\User\Controller\Adminhtml\Auth;
 
+use Magento\Security\Model\SecurityManager;
+
 class Forgotpassword extends \Magento\User\Controller\Adminhtml\Auth
 {
     /**
@@ -31,6 +33,7 @@ public function __construct(
      * Forgot administrator password action
      *
      * @return void
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function execute()
     {

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`	`*/`
`7`	`7`	`namespace Magento\User\Controller\Adminhtml\Auth;`
`8`	`8`
	`9`	`+use Magento\Security\Model\SecurityManager;`
	`10`	`+`
`9`	`11`	`class Forgotpassword extends \Magento\User\Controller\Adminhtml\Auth`
`10`	`12`	`{`
`11`	`13`	`/**`
`@@ -31,6 +33,7 @@ public function __construct(`
`31`	`33`	`* Forgot administrator password action`
`32`	`34`	`*`
`33`	`35`	`* @return void`
	`36`	`+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)`
`34`	`37`	`*/`
`35`	`38`	`public function execute()`
`36`	`39`	`{`