MAGETWO-38635: Security - password management 2

Joan He · Joan He · commit 6f77707d94df · 2016-02-17T19:37:51.000-06:00
diff --git a/app/code/Magento/Customer/Block/Form/Register.php b/app/code/Magento/Customer/Block/Form/Register.php
@@ -208,7 +208,7 @@ public function getMinimumPasswordLength()
     }
 
     /**
-     * Get required character classes number
+     * Get number of password required character classes
      *
      * @return string
      */
diff --git a/app/code/Magento/Customer/Controller/Account/EditPost.php b/app/code/Magento/Customer/Controller/Account/EditPost.php
@@ -95,7 +95,6 @@ public function __construct(
      */
     public function setAccountManagementHelper(AccountManagement $accountManagementHelper)
     {
-
         $this->accountManagementHelper = $accountManagementHelper;
     }
 
@@ -107,7 +106,6 @@ public function setAccountManagementHelper(AccountManagement $accountManagementH
      */
     public function getAccountManagementHelper()
     {
-
         if (!($this->accountManagementHelper instanceof \Magento\Customer\Helper\AccountManagement)) {
             return \Magento\Framework\App\ObjectManager::getInstance()->get(
                 'Magento\Customer\Helper\AccountManagement'
@@ -138,7 +136,6 @@ public function setEmailNotification(\Magento\Customer\Helper\EmailNotification
      */
     public function getEmailNotification()
     {
-
         if (!($this->emailNotification instanceof \Magento\Customer\Helper\EmailNotification)) {
             return \Magento\Framework\App\ObjectManager::getInstance()->get(
                 'Magento\Customer\Helper\EmailNotification'
diff --git a/app/code/Magento/Customer/Controller/Account/LoginPost.php b/app/code/Magento/Customer/Controller/Account/LoginPost.php
@@ -75,7 +75,6 @@ public function __construct(
      */
     public function setScopeConfig(ScopeConfigInterface $scopeConfig)
     {
-
         $this->scopeConfig = $scopeConfig;
     }
 
@@ -87,7 +86,6 @@ public function setScopeConfig(ScopeConfigInterface $scopeConfig)
      */
     public function getScopeConfig()
     {
-
         if (!($this->scopeConfig instanceof \Magento\Framework\App\Config\ScopeConfigInterface)) {
             return \Magento\Framework\App\ObjectManager::getInstance()->get(
                 'Magento\Framework\App\Config\ScopeConfigInterface'

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ public function getMinimumPasswordLength()`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`/**`
`211`		`- * Get required character classes number`
	`211`	`+ * Get number of password required character classes`
`212`	`212`	`*`
`213`	`213`	`* @return string`
`214`	`214`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,6 @@ public function __construct(`
`95`	`95`	`*/`
`96`	`96`	`public function setAccountManagementHelper(AccountManagement $accountManagementHelper)`
`97`	`97`	`{`
`98`		`-`
`99`	`98`	`$this->accountManagementHelper = $accountManagementHelper;`
`100`	`99`	`}`
`101`	`100`
`@@ -107,7 +106,6 @@ public function setAccountManagementHelper(AccountManagement $accountManagementH`
`107`	`106`	`*/`
`108`	`107`	`public function getAccountManagementHelper()`
`109`	`108`	`{`
`110`		`-`
`111`	`109`	`if (!($this->accountManagementHelper instanceof \Magento\Customer\Helper\AccountManagement)) {`
`112`	`110`	`return \Magento\Framework\App\ObjectManager::getInstance()->get(`
`113`	`111`	`'Magento\Customer\Helper\AccountManagement'`
`@@ -138,7 +136,6 @@ public function setEmailNotification(\Magento\Customer\Helper\EmailNotification`
`138`	`136`	`*/`
`139`	`137`	`public function getEmailNotification()`
`140`	`138`	`{`
`141`		`-`
`142`	`139`	`if (!($this->emailNotification instanceof \Magento\Customer\Helper\EmailNotification)) {`
`143`	`140`	`return \Magento\Framework\App\ObjectManager::getInstance()->get(`
`144`	`141`	`'Magento\Customer\Helper\EmailNotification'`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,6 @@ public function __construct(`
`75`	`75`	`*/`
`76`	`76`	`public function setScopeConfig(ScopeConfigInterface $scopeConfig)`
`77`	`77`	`{`
`78`		`-`
`79`	`78`	`$this->scopeConfig = $scopeConfig;`
`80`	`79`	`}`
`81`	`80`
`@@ -87,7 +86,6 @@ public function setScopeConfig(ScopeConfigInterface $scopeConfig)`
`87`	`86`	`*/`
`88`	`87`	`public function getScopeConfig()`
`89`	`88`	`{`
`90`		`-`
`91`	`89`	`if (!($this->scopeConfig instanceof \Magento\Framework\App\Config\ScopeConfigInterface)) {`
`92`	`90`	`return \Magento\Framework\App\ObjectManager::getInstance()->get(`
`93`	`91`	`'Magento\Framework\App\Config\ScopeConfigInterface'`