diff --git a/lib/internal/Magento/Framework/Validator/Factory.php b/lib/internal/Magento/Framework/Validator/Factory.php index 3b8608239be124cce802ae743459337732989fb4..f646748b15840bb51dbfb06866f077c19a49edc7 100644 --- a/lib/internal/Magento/Framework/Validator/Factory.php +++ b/lib/internal/Magento/Framework/Validator/Factory.php @@ -82,8 +82,8 @@ class Factory $this->_configFiles = $this->moduleReader->getConfigurationFiles('validation.xml'); $this->cache->save($this->getSerializer()->serialize($this->_configFiles->toArray()), self::CACHE_KEY); } else { - $filesArray = $this->getSerializer()->unserialize($this->_configFiles); - $this->_configFiles = $this->getFileIteratorFactory()->create(array_keys($filesArray)); + $files = $this->getSerializer()->unserialize($this->_configFiles); + $this->_configFiles = $this->getFileIteratorFactory()->create(array_keys($files)); } } } @@ -161,8 +161,7 @@ class Factory private function getSerializer() { if ($this->serializer === null) { - $this->serializer = \Magento\Framework\App\ObjectManager::getInstance() - ->get(\Magento\Framework\Serialize\SerializerInterface::class); + $this->serializer = $this->_objectManager->get(\Magento\Framework\Serialize\SerializerInterface::class); } return $this->serializer; } @@ -176,7 +175,7 @@ class Factory private function getFileIteratorFactory() { if ($this->fileIteratorFactory === null) { - $this->fileIteratorFactory = \Magento\Framework\App\ObjectManager::getInstance() + $this->fileIteratorFactory = $this->_objectManager ->get(\Magento\Framework\Config\FileIteratorFactory::class); } return $this->fileIteratorFactory;