Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 36098f4

Browse files
committed
MSI: Update Magento 2 core to support MSI
1 parent 1b8cc6a commit 36098f4

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -845,7 +845,8 @@ public function __construct(
845845
$this->catalogConfig = $catalogConfig ?: ObjectManager::getInstance()->get(CatalogConfig::class);
846846
$this->imageTypeProcessor = $imageTypeProcessor ?: ObjectManager::getInstance()->get(ImageTypeProcessor::class);
847847
$this->mediaProcessor = $mediaProcessor ?: ObjectManager::getInstance()->get(MediaGalleryProcessor::class);
848-
$this->stockItemImporter = $stockItemImporter ?: ObjectManager::getInstance()->get(StockItemImporterInterface::class);
848+
$this->stockItemImporter = $stockItemImporter ?: ObjectManager::getInstance()
849+
->get(StockItemImporterInterface::class);
849850

850851
parent::__construct(
851852
$jsonHelper,

dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,12 @@ public function testCopyPaste()
278278
*/
279279
public function testStrictTypes()
280280
{
281+
$directories = Files::init()->readLists(__DIR__ . '/_files/whitelist/strict_type.txt');
282+
283+
if (empty($directories)) {
284+
return;
285+
}
286+
281287
$toBeTestedFiles = array_diff(
282288
self::getWhitelist(['php'], '', '', '/_files/whitelist/strict_type.txt'),
283289
Files::init()->readLists(self::getBaseFilesFolder() . '/_files/blacklist/strict_type.txt')
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Format: <componentType=module|library|theme|language|*> <componentName> <globPattern> or simply <globPattern>

0 commit comments

Comments
 (0)