Skip to content

Commit 27bcc0a

Browse files
author
Stanislav Idolov
committed
Merge remote-tracking branch 'mainline/develop' into eav_batching
2 parents fd8d435 + a9e8595 commit 27bcc0a

File tree

80 files changed

+180
-51
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+180
-51
lines changed

‎app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@
424424
</settings>
425425
<container name="assign_products_container" sortOrder="160">
426426
<htmlContent name="html_content">
427-
<argument name="block" xsi:type="object">Magento\Catalog\Block\Adminhtml\Category\AssignProducts</argument>
427+
<block name="gallery" class="Magento\Catalog\Block\Adminhtml\Category\AssignProducts"/>
428428
</htmlContent>
429429
</container>
430430
</fieldset>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
/**
1313
* Export entity product model
1414
*
15-
* @author Magento Core Team <core@magentocommerce.com>
15+
* @api
16+
*
1617
* @SuppressWarnings(PHPMD.TooManyFields)
1718
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
1819
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)

‎app/code/Magento/CatalogImportExport/Model/Export/Product/Type/AbstractType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/**
1111
* Export entity product type abstract model
1212
*
13-
* @author Magento Core Team <core@magentocommerce.com>
13+
* @api
1414
*/
1515
abstract class AbstractType
1616
{

‎app/code/Magento/CatalogImportExport/Model/Export/Product/Type/Simple.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Export entity product type simple model
1010
*
11-
* @author Magento Core Team <core@magentocommerce.com>
11+
* @api
1212
*/
1313
class Simple extends \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType
1414
{

‎app/code/Magento/CatalogImportExport/Model/Export/RowCustomizer/Composite.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
use Magento\CatalogImportExport\Model\Export\RowCustomizerInterface;
99
use Magento\Framework\ObjectManagerInterface;
1010

11+
/**
12+
* Class Composite
13+
*
14+
* @api
15+
*/
1116
class Composite implements RowCustomizerInterface
1217
{
1318
/**

‎app/code/Magento/CatalogImportExport/Model/Export/RowCustomizerInterface.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
/**
99
* Interface RowCustomizerInterface
10+
*
11+
* @api
1012
*/
1113
interface RowCustomizerInterface
1214
{

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121

2222
/**
2323
* Import entity product model
24+
*
25+
* @api
26+
*
2427
* @SuppressWarnings(PHPMD.TooManyFields)
2528
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
2629
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
*/
66
namespace Magento\CatalogImportExport\Model\Import\Product;
77

8+
/**
9+
* Class CategoryProcessor
10+
*
11+
* @api
12+
*/
813
class CategoryProcessor
914
{
1015
/**

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@
1616
/**
1717
* Entity class which provide possibility to import product custom options
1818
*
19-
* @author Magento Core Team <core@magentocommerce.com>
19+
* @api
2020
*
2121
* @SuppressWarnings(PHPMD.TooManyFields)
2222
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
2323
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
24-
* @todo Need to explode this class because of several responsibilities
2524
*/
2625
class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
2726
{

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
*/
66
namespace Magento\CatalogImportExport\Model\Import\Product;
77

8+
/**
9+
* Interface RowValidatorInterface
10+
*
11+
* @api
12+
*/
813
interface RowValidatorInterface extends \Magento\Framework\Validator\ValidatorInterface
914
{
1015
const ERROR_INVALID_SCOPE = 'invalidScope';

0 commit comments

Comments
 (0)