From a768eb6b5700ea84af0dc155cf0c2ccae33d047f Mon Sep 17 00:00:00 2001 From: Igor Melnikov <imelnikov@magento.com> Date: Fri, 28 Oct 2016 17:55:36 -0500 Subject: [PATCH] MAGETWO-58638: Refactor Framework_App, Framework_Config Removing CouplingBetweenObjects annotation --- lib/internal/Magento/Framework/Validator/Factory.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/internal/Magento/Framework/Validator/Factory.php b/lib/internal/Magento/Framework/Validator/Factory.php index 3b8608239be..f646748b158 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; -- GitLab