Merge branch 'spm-131-PRs-stabilization' into 'PR2'

Spm 131 p rs stabilization

See merge request !180

Author: Vadim Zubovich

app/code/Magento/Customer/Api/PasswordStrengthInterface.php

@@ -5,31 +5,31 @@
  */
 namespace Magento\Customer\Block\Account;
 
-use Magento\Customer\Helper\Config as CustomerConfigHelper;
+use Magento\Customer\Helper\AccountManagement as AccountManagementHelper;
 
 /**
  * Customer reset password form
  */
 class Resetpassword extends \Magento\Framework\View\Element\Template
 {
     /**
-     * @var CustomerConfigHelper
+     * @var AccountManagementHelper
      */
-    protected $customerConfigHelper;
+    protected $accountManagementHelper;
 
     /**
      * Constructor
      *
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param CustomerConfigHelper $customerConfigHelper
+     * @param AccountManagementHelper $accountManagementHelper
      * @param array $data
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
-        CustomerConfigHelper $customerConfigHelper,
+        AccountManagementHelper $accountManagementHelper,
         array $data = []
     ) {
-        $this->customerConfigHelper = $customerConfigHelper;
+        $this->accountManagementHelper = $accountManagementHelper;
         parent::__construct($context, $data);
     }
 
@@ -55,7 +55,7 @@ public function isAutocompleteDisabled()
      */
     public function getMinimumPasswordLength()
     {
-        return $this->customerConfigHelper->getMinimumPasswordLength();
+        return $this->accountManagementHelper->getMinimumPasswordLength();
     }
 
     /**
@@ -65,6 +65,6 @@ public function getMinimumPasswordLength()
      */
     public function getRequiredCharacterClassesNumber()
     {
-        return $this->customerConfigHelper->getRequiredCharacterClassesNumber();
+        return $this->accountManagementHelper->getRequiredCharacterClassesNumber();
     }
 }

app/code/Magento/Customer/Block/Account/Resetpassword.php

@@ -7,7 +7,7 @@
 
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Customer\Helper\Config as CustomerConfigHelper;
+use Magento\Customer\Helper\AccountManagement as AccountManagementHelper;
 
 /**
  * Customer edit form block
@@ -17,9 +17,9 @@
 class Edit extends \Magento\Customer\Block\Account\Dashboard
 {
     /**
-     * @var CustomerConfigHelper
+     * @var AccountManagementHelper
      */
-    protected $customerConfigHelper;
+    protected $accountManagementHelper;
 
     /**
      * Constructor
@@ -29,7 +29,7 @@ class Edit extends \Magento\Customer\Block\Account\Dashboard
      * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
      * @param CustomerRepositoryInterface $customerRepository
      * @param AccountManagementInterface $customerAccountManagement
-     * @param CustomerConfigHelper $customerConfigHelper
+     * @param AccountManagementHelper $accountManagementHelper
      * @param array $data
      */
     public function __construct(
@@ -38,10 +38,10 @@ public function __construct(
         \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory,
         CustomerRepositoryInterface $customerRepository,
         AccountManagementInterface $customerAccountManagement,
-        CustomerConfigHelper $customerConfigHelper,
+        AccountManagementHelper $accountManagementHelper,
         array $data = []
     ) {
-        $this->customerConfigHelper = $customerConfigHelper;
+        $this->accountManagementHelper = $accountManagementHelper;
         parent::__construct(
             $context,
             $customerSession,
@@ -110,7 +110,7 @@ public function getChangePassword()
      */
     public function getMinimumPasswordLength()
     {
-        return $this->customerConfigHelper->getMinimumPasswordLength();
+        return $this->accountManagementHelper->getMinimumPasswordLength();
     }
 
     /**
@@ -120,6 +120,6 @@ public function getMinimumPasswordLength()
      */
     public function getRequiredCharacterClassesNumber()
     {
-        return $this->customerConfigHelper->getRequiredCharacterClassesNumber();
+        return $this->accountManagementHelper->getRequiredCharacterClassesNumber();
     }
 }

app/code/Magento/Customer/Block/Form/Edit.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\Customer\Block\Form;
 
-use Magento\Customer\Helper\Config as CustomerConfigHelper;
+use Magento\Customer\Helper\AccountManagement as AccountManagementHelper;
 
 /**
  * Customer register form block
@@ -30,9 +30,9 @@ class Register extends \Magento\Directory\Block\Data
     protected $_customerUrl;
 
     /**
-     * @var CustomerConfigHelper
+     * @var AccountManagementHelper
      */
-    protected $customerConfigHelper;
+    protected $accountManagementHelper;
 
     /**
      * Constructor
@@ -46,7 +46,7 @@ class Register extends \Magento\Directory\Block\Data
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\Url $customerUrl
-     * @param CustomerConfigHelper $customerConfigHelper
+     * @param AccountManagementHelper $accountManagementHelper
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -61,13 +61,13 @@ public function __construct(
         \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Customer\Model\Url $customerUrl,
-        CustomerConfigHelper $customerConfigHelper,
+        AccountManagementHelper $accountManagementHelper,
         array $data = []
     ) {
         $this->_customerUrl = $customerUrl;
         $this->_moduleManager = $moduleManager;
         $this->_customerSession = $customerSession;
-        $this->customerConfigHelper = $customerConfigHelper;
+        $this->accountManagementHelper = $accountManagementHelper;
         parent::__construct(
             $context,
             $directoryHelper,
@@ -212,7 +212,7 @@ public function restoreSessionData(\Magento\Customer\Model\Metadata\Form $form,
      */
     public function getMinimumPasswordLength()
     {
-        return $this->customerConfigHelper->getMinimumPasswordLength();
+        return $this->accountManagementHelper->getMinimumPasswordLength();
     }
 
     /**
@@ -222,6 +222,6 @@ public function getMinimumPasswordLength()
      */
     public function getRequiredCharacterClassesNumber()
     {
-        return $this->customerConfigHelper->getRequiredCharacterClassesNumber();
+        return $this->accountManagementHelper->getRequiredCharacterClassesNumber();
     }
 }

app/code/Magento/Customer/Block/Form/Register.php

@@ -30,6 +30,16 @@ class AccountManagement extends \Magento\Framework\App\Helper\AbstractHelper
      */
     const MAX_FAILURES_PATH = 'customer/password/lockout_failures';
 
+    /**
+     * Configuration path to customer password minimum length
+     */
+    const XML_PATH_MINIMUM_PASSWORD_LENGTH = 'customer/password/minimum_password_length';
+
+    /**
+     * Configuration path to customer password required character classes number
+     */
+    const XML_PATH_REQUIRED_CHARACTER_CLASSES_NUMBER = 'customer/password/required_character_classes_number';
+
     /**
      * @var CustomerRegistry
      */
@@ -191,4 +201,24 @@ public function checkIfLocked(\Magento\Customer\Api\Data\CustomerInterface $cust
             );
         }
     }
+
+    /**
+     * Get Email of a customer service
+     *
+     * @return string
+     */
+    public function getMinimumPasswordLength()
+    {
+        return $this->scopeConfig->getValue(self::XML_PATH_MINIMUM_PASSWORD_LENGTH);
+    }
+
+    /**
+     * Get Email of a customer service
+     *
+     * @return string
+     */
+    public function getRequiredCharacterClassesNumber()
+    {
+        return $this->scopeConfig->getValue(self::XML_PATH_REQUIRED_CHARACTER_CLASSES_NUMBER);
+    }
 }