diff --git a/src/Block/Frontend/DaemonCollector.php b/src/Block/Frontend/DaemonCollector.php index 27f45d5..2775cf7 100644 --- a/src/Block/Frontend/DaemonCollector.php +++ b/src/Block/Frontend/DaemonCollector.php @@ -6,7 +6,6 @@ class DaemonCollector extends \Magento\Framework\View\Element\Template { private $customer; private $helper; - private $storeManager; private $storeResolver; private $js = ''; @@ -23,7 +22,6 @@ EOT; * * @param \Magento\Framework\View\Element\Template\Context $context * @param \Magento\Customer\Model\Session $customerSession - * @param \Magento\Store\Model\StoreManagerInterface $storeManager * @param \Magento\Store\Api\StoreResolverInterface $storeResolver * @param \Retailcrm\Retailcrm\Helper\Data $helper * @param array $data @@ -31,14 +29,12 @@ EOT; public function __construct( \Magento\Framework\View\Element\Template\Context $context, \Magento\Customer\Model\Session $customerSession, - \Magento\Store\Model\StoreManagerInterface $storeManager, \Magento\Store\Api\StoreResolverInterface $storeResolver, \Retailcrm\Retailcrm\Helper\Data $helper, array $data = [] ) { parent::__construct($context, $data); $this->customer = $customerSession->getCustomer(); - $this->storeManager = $storeManager; $this->storeResolver = $storeResolver; $this->helper = $helper; } @@ -64,7 +60,7 @@ EOT; try { $siteKey = $this->helper->getSiteKey( - $this->storeManager->getStore( + $this->_storeManager->getStore( $this->storeResolver->getCurrentStoreId() )->getWebsiteId() ); diff --git a/src/Test/Unit/Block/Frontend/DaemonCollectorTest.php b/src/Test/Unit/Block/Frontend/DaemonCollectorTest.php index a1f9809..fb7e5f3 100644 --- a/src/Test/Unit/Block/Frontend/DaemonCollectorTest.php +++ b/src/Test/Unit/Block/Frontend/DaemonCollectorTest.php @@ -11,8 +11,7 @@ class DaemonCollectorTest extends \PHPUnit\Framework\TestCase public function setUp() { - $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); - $context = $objectManager->getObject(\Magento\Framework\View\Element\Template\Context::class); + $context = $this->createMock(\Magento\Framework\View\Element\Template\Context::class); $customerSession = $this->createMock(\Magento\Customer\Model\Session::class); $storeManager = $this->createMock(\Magento\Store\Model\StoreManager::class); $storeResolver = $this->createMock(\Magento\Store\Model\StoreResolver::class); @@ -36,10 +35,13 @@ class DaemonCollectorTest extends \PHPUnit\Framework\TestCase ->method('getSiteKey') ->willReturn(self::SITE_KEY); + $context->expects($this->any()) + ->method('getStoreManager') + ->willReturn($storeManager); + $this->unit = new \Retailcrm\Retailcrm\Block\Frontend\DaemonCollector( $context, $customerSession, - $storeManager, $storeResolver, $helper );