Skip to content

Commit f783440

Browse files
ishakhsuvarovishakhsuvarov
authored
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - magento-engcom/magento2ce#1197: Admin product search - Pressing enter does not submit[forwardport] (by @nmalevanec) - magento-engcom/magento2ce#1201: Improve error reporting for products images import[forwardport]. (by @nmalevanec) - #13137: Remove zend json from json result controller (by @dmanners) - #13187: Fix a misspelled method name in Bundle (by @akiojalehto) Fixed GitHub Issues: - #4696: Admin product search - Pressing enter does not submit (reported by @BenSpace48) has been fixed in magento-engcom/magento2ce#1197 by @nmalevanec in 2.3-develop branch Related commits: 1. 0be044e - #4711: Improve error reporting for products images import (reported by @leoquijano) has been fixed in magento-engcom/magento2ce#1201 by @nmalevanec in 2.3-develop branch Related commits: 1. 0d01f54 - #9236: Upgrade ZF components. Zend_Json (reported by @okorshenko) has been fixed in #13137 by @dmanners in 2.3-develop branch Related commits: 1. 41a4cf6 2. 9263b1d
2 parents d1ebc31 + 6484de5 commit f783440

File tree

7 files changed

+143
-11
lines changed

7 files changed

+143
-11
lines changed

‎app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,12 +318,21 @@ protected function populateSelectionTemplate($selection, $optionId, $parentId, $
318318
return $populatedSelection;
319319
}
320320

321+
/**
322+
* @deprecated Misspelled method
323+
* @see retrieveProductsByCachedSkus
324+
*/
325+
protected function retrieveProducsByCachedSkus()
326+
{
327+
return $this->retrieveProductsByCachedSkus();
328+
}
329+
321330
/**
322331
* Retrieve mapping between skus and products.
323332
*
324333
* @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
325334
*/
326-
protected function retrieveProducsByCachedSkus()
335+
protected function retrieveProductsByCachedSkus()
327336
{
328337
$this->_cachedSkuToProducts = $this->connection->fetchPairs(
329338
$this->connection->select()->from(
@@ -368,7 +377,7 @@ public function saveData()
368377
$this->parseSelections($rowData, $productData[$this->getProductEntityLinkField()]);
369378
}
370379
if (!empty($this->_cachedOptions)) {
371-
$this->retrieveProducsByCachedSkus();
380+
$this->retrieveProductsByCachedSkus();
372381
$this->populateExistingOptions();
373382
$this->insertOptions();
374383
$this->insertSelections();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2047,6 +2047,7 @@ protected function uploadMediaFiles($fileName, $renameFileOff = false)
20472047
$res = $this->_getUploader()->move($fileName, $renameFileOff);
20482048
return $res['file'];
20492049
} catch (\Exception $e) {
2050+
$this->_logger->critical($e);
20502051
return '';
20512052
}
20522053
}

‎app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,6 +1194,65 @@ public function testParseAttributesWithWrappedValuesWillReturnsLowercasedAttribu
11941194
$this->assertArrayNotHasKey('PARAM2', $attributes);
11951195
}
11961196

1197+
/**
1198+
* Test that errors occurred during importing images are logged.
1199+
*
1200+
* @param string $fileName
1201+
* @param bool $throwException
1202+
* @dataProvider uploadMediaFilesDataProvider
1203+
*/
1204+
public function testUploadMediaFiles(string $fileName, bool $throwException)
1205+
{
1206+
$exception = new \Exception();
1207+
$expectedFileName = $fileName;
1208+
if ($throwException) {
1209+
$expectedFileName = '';
1210+
$this->_logger->expects($this->once())->method('critical')->with($exception);
1211+
}
1212+
$fileUploaderMock = $this
1213+
->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Uploader::class)
1214+
->disableOriginalConstructor()
1215+
->getMock();
1216+
$fileUploaderMock
1217+
->expects($this->once())
1218+
->method('move')
1219+
->willReturnCallback(
1220+
function ($name) use ($throwException, $exception) {
1221+
if ($throwException) {
1222+
throw $exception;
1223+
}
1224+
return ['file' => $name];
1225+
}
1226+
);
1227+
$this->setPropertyValue(
1228+
$this->importProduct,
1229+
'_fileUploader',
1230+
$fileUploaderMock
1231+
);
1232+
$actualFileName = $this->invokeMethod(
1233+
$this->importProduct,
1234+
'uploadMediaFiles',
1235+
[$fileName]
1236+
);
1237+
$this->assertEquals(
1238+
$expectedFileName,
1239+
$actualFileName
1240+
);
1241+
}
1242+
1243+
/**
1244+
* Data provider for testUploadMediaFiles.
1245+
*
1246+
* @return array
1247+
*/
1248+
public function uploadMediaFilesDataProvider()
1249+
{
1250+
return [
1251+
['test1.jpg', false],
1252+
['test2.jpg', true],
1253+
];
1254+
}
1255+
11971256
public function getImagesFromRowDataProvider()
11981257
{
11991258
return [

‎app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<scope args="chips" render=""/>
1616

17-
<div class="admin__data-grid-filters-wrap" data-part="filter-form" css="_show: hasVisible() && $collapsible.opened()">
17+
<div class="admin__data-grid-filters-wrap" data-part="filter-form" css="_show: hasVisible() && $collapsible.opened()" keyboard="{ 13: apply }">
1818
<fieldset class="admin__fieldset admin__data-grid-filters">
1919
<legend class="admin__filters-legend">
2020
<span translate="'Advanced filter'"/>

‎dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php

Lines changed: 54 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
use Magento\Framework\Filesystem;
2525
use Magento\ImportExport\Model\Import;
2626
use Magento\Store\Model\Store;
27-
use Magento\UrlRewrite\Model\UrlRewrite;
27+
use Psr\Log\LoggerInterface;
2828

2929
/**
3030
* Class ProductTest
@@ -60,11 +60,20 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
6060
*/
6161
protected $objectManager;
6262

63+
/**
64+
* @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
65+
*/
66+
private $logger;
67+
6368
protected function setUp()
6469
{
6570
$this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
71+
$this->logger = $this->getMockBuilder(LoggerInterface::class)
72+
->disableOriginalConstructor()
73+
->getMock();
6674
$this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
67-
\Magento\CatalogImportExport\Model\Import\Product::class
75+
\Magento\CatalogImportExport\Model\Import\Product::class,
76+
['logger' => $this->logger]
6877
);
6978
parent::setUp();
7079
}
@@ -657,6 +666,21 @@ public function testSaveMediaImage()
657666
$this->assertEquals('Additional Image Label Two', $additionalImageTwoItem->getLabel());
658667
}
659668

669+
/**
670+
* Test that errors occurred during importing images are logged.
671+
*
672+
* @magentoDataIsolation enabled
673+
* @magentoAppIsolation enabled
674+
* @magentoDataFixture mediaImportImageFixture
675+
* @magentoDataFixture mediaImportImageFixtureError
676+
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
677+
*/
678+
public function testSaveMediaImageError()
679+
{
680+
$this->logger->expects(self::once())->method('critical');
681+
$this->importDataForMediaTest('import_media.csv', 1);
682+
}
683+
660684
/**
661685
* Copy fixture images into media import directory
662686
*/
@@ -715,6 +739,29 @@ public static function mediaImportImageFixtureRollback()
715739
$mediaDirectory->delete('catalog');
716740
}
717741

742+
/**
743+
* Copy incorrect fixture image into media import directory.
744+
*/
745+
public static function mediaImportImageFixtureError()
746+
{
747+
/** @var \Magento\Framework\Filesystem\Directory\Write $mediaDirectory */
748+
$mediaDirectory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
749+
\Magento\Framework\Filesystem::class
750+
)->getDirectoryWrite(
751+
DirectoryList::MEDIA
752+
);
753+
$dirPath = $mediaDirectory->getAbsolutePath('import');
754+
$items = [
755+
[
756+
'source' => __DIR__ . '/_files/magento_additional_image_error.jpg',
757+
'dest' => $dirPath . '/magento_additional_image_two.jpg',
758+
],
759+
];
760+
foreach ($items as $item) {
761+
copy($item['source'], $item['dest']);
762+
}
763+
}
764+
718765
/**
719766
* Export CSV string to array
720767
*
@@ -1563,11 +1610,13 @@ public function testProductWithWrappedAdditionalAttributes()
15631610
}
15641611

15651612
/**
1566-
* Import and check data from file
1613+
* Import and check data from file.
15671614
*
15681615
* @param string $fileName
1616+
* @param int $expectedErrors
1617+
* @return void
15691618
*/
1570-
private function importDataForMediaTest($fileName)
1619+
private function importDataForMediaTest(string $fileName, int $expectedErrors = 0)
15711620
{
15721621
$filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
15731622
$directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
@@ -1605,7 +1654,7 @@ private function importDataForMediaTest($fileName)
16051654
$this->assertTrue($errors->getErrorsCount() == 0);
16061655

16071656
$this->_model->importData();
1608-
$this->assertTrue($this->_model->getErrorAggregator()->getErrorsCount() == 0);
1657+
$this->assertTrue($this->_model->getErrorAggregator()->getErrorsCount() == $expectedErrors);
16091658
}
16101659

16111660
/**

‎dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/magento_additional_image_error.jpg

Loading

‎lib/internal/Magento/Framework/Controller/Result/Json.php

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,22 @@ class Json extends AbstractResult
2828
*/
2929
protected $json;
3030

31+
/**
32+
* @var \Magento\Framework\Serialize\Serializer\Json
33+
*/
34+
private $serializer;
35+
3136
/**
3237
* @param \Magento\Framework\Translate\InlineInterface $translateInline
38+
* @param \Magento\Framework\Serialize\Serializer\Json $serializer
3339
*/
34-
public function __construct(InlineInterface $translateInline)
35-
{
40+
public function __construct(
41+
InlineInterface $translateInline,
42+
\Magento\Framework\Serialize\Serializer\Json $serializer = null
43+
) {
3644
$this->translateInline = $translateInline;
45+
$this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
46+
->get(\Magento\Framework\Serialize\Serializer\Json::class);
3747
}
3848

3949
/**
@@ -43,10 +53,14 @@ public function __construct(InlineInterface $translateInline)
4353
* @param boolean $cycleCheck Optional; whether or not to check for object recursion; off by default
4454
* @param array $options Additional options used during encoding
4555
* @return $this
56+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
4657
*/
4758
public function setData($data, $cycleCheck = false, $options = [])
4859
{
49-
$this->json = \Zend_Json::encode($data, $cycleCheck, $options);
60+
if ($data instanceof \Magento\Framework\DataObject) {
61+
$data = $data->toArray();
62+
}
63+
$this->json = $this->serializer->serialize($data);
5064
return $this;
5165
}
5266

0 commit comments

Comments
 (0)