Skip to content

Commit d6adb47

Browse files
committed
MAGETWO-32953: Fix Bamboo builds
- Updated references to Magento\Framework\Store\StoreManagerInterface after merging with mainline
1 parent 73e22e4 commit d6adb47

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
class StoreResolver
99
{
1010
/**
11-
* @var \Magento\Store\Model\StoreManagerInterface
11+
* @var \Magento\Framework\Store\StoreManagerInterface
1212
*/
1313
protected $storeManager;
1414

@@ -40,9 +40,9 @@ class StoreResolver
4040
protected $storeIdToWebsiteStoreIds = [];
4141

4242
/**
43-
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
43+
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
4444
*/
45-
public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
45+
public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
4646
{
4747
$this->storeManager = $storeManager;
4848
}

dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/AdvancedTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ protected function getStoreManager()
7474
->method('getId')
7575
->willReturn(1);
7676

77-
$storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
77+
$storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
7878
->setMethods(['getStore'])
7979
->disableOriginalConstructor()
8080
->getMockForAbstractClass();

dev/tests/unit/testsuite/Magento/GoogleShopping/Helper/DataTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
2222
/** @var \Magento\Framework\Stdlib\String|\PHPUnit_Framework_MockObject_MockObject */
2323
protected $string;
2424

25-
/** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
25+
/** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
2626
protected $storeManagerInterface;
2727

2828
protected function setUp()

dev/tests/unit/testsuite/Magento/Review/Controller/Product/PostTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public function setUp()
148148
$this->messageManager = $this->getMock('\Magento\Framework\Message\ManagerInterface');
149149

150150
$this->store = $this->getMock('\Magento\Store\Model\Store', ['getId'], [], '', false);
151-
$storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
151+
$storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
152152
$storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->store));
153153
$this->model = (new \Magento\TestFramework\Helper\ObjectManager($this))
154154
->getObject(

dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Product/CollectionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function setUp()
5555
$universalFactory->expects($this->any())->method('create')->will($this->returnValue($entity));
5656
$store = $this->getMock('\Magento\Store\Model\Store', ['getId'], [], '', false);
5757
$store->expects($this->any())->method('getId')->will($this->returnValue(1));
58-
$storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
58+
$storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
5959
$storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
6060
$fetchStrategy = $this->getMock(
6161
'\Magento\Framework\Data\Collection\Db\FetchStrategy\Query',

0 commit comments

Comments
 (0)