magento-commerce/magento2ce#7192: Fixed static tests failures

Author: Stanislav Idolov

app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php

@@ -79,7 +79,7 @@ class DefaultStock extends AbstractIndexer implements StockInterface
      * @param StrategyInterface $tableStrategy
      * @param Config $eavConfig
      * @param ScopeConfigInterface $scopeConfig
-     * @param null $connectionName
+     * @param string $connectionName
      * @param GetStatusExpression|null $getStatusExpression
      * @param StockConfigurationInterface|null $stockConfiguration
      * @param QueryProcessorComposite|null $queryProcessorComposite

app/code/Magento/Customer/Model/AccountManagement.php

@@ -424,6 +424,8 @@ class AccountManagement implements AccountManagementInterface
      * @param AllowedCountries|null $allowedCountriesReader
      * @param SessionCleanerInterface|null $sessionCleaner
      * @param AuthorizationInterface|null $authorization
+     * @param AuthenticationInterface|null $authentication
+     * @param Backend|null $eavValidator
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -465,7 +467,9 @@ public function __construct(
         GetCustomerByToken $getByToken = null,
         AllowedCountries $allowedCountriesReader = null,
         SessionCleanerInterface $sessionCleaner = null,
-        AuthorizationInterface $authorization = null
+        AuthorizationInterface $authorization = null,
+        AuthenticationInterface $authentication = null,
+        Backend $eavValidator = null
     ) {
         $this->customerFactory = $customerFactory;
         $this->eventManager = $eventManager;
@@ -506,22 +510,8 @@ public function __construct(
             ?: $objectManager->get(AllowedCountries::class);
         $this->sessionCleaner = $sessionCleaner ?? $objectManager->get(SessionCleanerInterface::class);
         $this->authorization = $authorization ?? $objectManager->get(AuthorizationInterface::class);
-    }
-
-    /**
-     * Get authentication
-     *
-     * @return AuthenticationInterface
-     */
-    private function getAuthentication()
-    {
-        if (!($this->authentication instanceof AuthenticationInterface)) {
-            return \Magento\Framework\App\ObjectManager::getInstance()->get(
-                \Magento\Customer\Model\AuthenticationInterface::class
-            );
-        } else {
-            return $this->authentication;
-        }
+        $this->authentication = $authentication ?? $objectManager->get(AuthenticationInterface::class);
+        $this->eavValidator = $eavValidator ?? $objectManager->get(Backend::class);
     }
 
     /**
@@ -617,11 +607,11 @@ public function authenticate($username, $password)
         }
 
         $customerId = $customer->getId();
-        if ($this->getAuthentication()->isLocked($customerId)) {
+        if ($this->authentication->isLocked($customerId)) {
             throw new UserLockedException(__('The account is locked.'));
         }
         try {
-            $this->getAuthentication()->authenticate($customerId, $password);
+            $this->authentication->authenticate($customerId, $password);
         } catch (InvalidEmailOrPasswordException $e) {
             throw new InvalidEmailOrPasswordException(__('Invalid login or password.'));
         }
@@ -1053,7 +1043,7 @@ public function changePasswordById($customerId, $currentPassword, $newPassword)
     private function changePasswordForCustomer($customer, $currentPassword, $newPassword)
     {
         try {
-            $this->getAuthentication()->authenticate($customer->getId(), $currentPassword);
+            $this->authentication->authenticate($customer->getId(), $currentPassword);
         } catch (InvalidEmailOrPasswordException $e) {
             throw new InvalidEmailOrPasswordException(
                 __("The password doesn't match this account. Verify the password and try again.")
@@ -1084,19 +1074,6 @@ protected function createPasswordHash($password)
         return $this->encryptor->getHash($password, true);
     }
 
-    /**
-     * Get EAV validator
-     *
-     * @return Backend
-     */
-    private function getEavValidator()
-    {
-        if ($this->eavValidator === null) {
-            $this->eavValidator = ObjectManager::getInstance()->get(Backend::class);
-        }
-        return $this->eavValidator;
-    }
-
     /**
      * @inheritdoc
      */
@@ -1110,13 +1087,13 @@ public function validate(CustomerInterface $customer)
         );
         $customer->setAddresses($oldAddresses);
 
-        $result = $this->getEavValidator()->isValid($customerModel);
-        if ($result === false && is_array($this->getEavValidator()->getMessages())) {
+        $result = $this->eavValidator->isValid($customerModel);
+        if ($result === false && is_array($this->eavValidator->getMessages())) {
             return $validationResults->setIsValid(false)->setMessages(
                 // phpcs:ignore Magento2.Functions.DiscouragedFunction
                 call_user_func_array(
                     'array_merge',
-                    array_values($this->getEavValidator()->getMessages())
+                    array_values($this->eavValidator->getMessages())
                 )
             );
         }