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

Commit d630168

Browse files
slavvkaslavvka
committed
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-96760
2 parents 63150a4 + b3da48a commit d630168

File tree

73 files changed

+2911
-97
lines changed

Some content is hidden

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

73 files changed

+2911
-97
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ script:
6464

6565
# The scripts for grunt/phpunit type tests
6666
- if [ $TEST_SUITE == "functional" ]; then dev/tests/functional/vendor/phpunit/phpunit/phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
67-
- if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js"] && [ $TEST_SUITE != "graphql-api-functional" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
67+
- if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js" ] && [ $TEST_SUITE != "graphql-api-functional" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
6868
- if [ $TEST_SUITE == "js" ]; then grunt $GRUNT_COMMAND; fi
6969
- if [ $TEST_SUITE == "graphql-api-functional" ]; then phpunit -c dev/tests/api-functional; fi

‎app/code/Magento/Analytics/Model/Cryptographer.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,12 @@ private function getInitializationVector()
129129
*/
130130
private function validateCipherMethod($cipherMethod)
131131
{
132-
$methods = openssl_get_cipher_methods();
132+
$methods = array_map(
133+
'strtolower',
134+
openssl_get_cipher_methods()
135+
);
136+
$cipherMethod = strtolower($cipherMethod);
137+
133138
return (false !== array_search($cipherMethod, $methods));
134139
}
135140
}

‎app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@
66
*/
77
namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
88

9-
class Crosssell extends \Magento\Catalog\Controller\Adminhtml\Product\Crosssell
9+
use Magento\Catalog\Controller\Adminhtml\Product\Crosssell as CatalogCrossel;
10+
use Magento\Framework\App\Action\HttpPostActionInterface;
11+
12+
/**
13+
* Class Crosssell
14+
*
15+
* @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
16+
* @deprecated Not used since cross-sell products grid moved to UI components.
17+
* @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
18+
*/
19+
class Crosssell extends CatalogCrossel implements HttpPostActionInterface
1020
{
1121
}

‎app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@
66
*/
77
namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
88

9-
class CrosssellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid
9+
use Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid as CatalogCrosssellGrid;
10+
use Magento\Framework\App\Action\HttpPostActionInterface;
11+
12+
/**
13+
* Class CrosssellGrid
14+
*
15+
* @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
16+
* @deprecated Not used since cross-sell products grid moved to UI components.
17+
* @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
18+
*/
19+
class CrosssellGrid extends CatalogCrosssellGrid implements HttpPostActionInterface
1020
{
1121
}

‎app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@
66
*/
77
namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
88

9-
class Related extends \Magento\Catalog\Controller\Adminhtml\Product\Related
9+
use Magento\Catalog\Controller\Adminhtml\Product\Related as CatalogRelated;
10+
use Magento\Framework\App\Action\HttpPostActionInterface;
11+
12+
/**
13+
* Class Related
14+
*
15+
* @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
16+
* @deprecated Not used since related products grid moved to UI components.
17+
* @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
18+
*/
19+
class Related extends CatalogRelated implements HttpPostActionInterface
1020
{
1121
}

‎app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@
66
*/
77
namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
88

9-
class RelatedGrid extends \Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid
9+
use Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid as CatalogRelatedGrid;
10+
use Magento\Framework\App\Action\HttpPostActionInterface;
11+
12+
/**
13+
* Class RelatedGrid
14+
*
15+
* @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
16+
* @deprecated Not used since related products grid moved to UI components.
17+
* @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
18+
*/
19+
class RelatedGrid extends CatalogRelatedGrid implements HttpPostActionInterface
1020
{
1121
}

‎app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@
66
*/
77
namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
88

9-
class Upsell extends \Magento\Catalog\Controller\Adminhtml\Product\Upsell
9+
use Magento\Catalog\Controller\Adminhtml\Product\Upsell as CatalogUpsell;
10+
use Magento\Framework\App\Action\HttpPostActionInterface;
11+
12+
/**
13+
* Class Upsell
14+
*
15+
* @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
16+
* @deprecated Not used since upsell products grid moved to UI components.
17+
* @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
18+
*/
19+
class Upsell extends CatalogUpsell implements HttpPostActionInterface
1020
{
1121
}

‎app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/UpsellGrid.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@
66
*/
77
namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
88

9+
/**
10+
* Class UpsellGrid
11+
*
12+
* @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
13+
* @deprecated Not used since upsell products grid moved to UI components.
14+
* @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
15+
*/
916
class UpsellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\UpsellGrid
1017
{
1118
}

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@
1010
use Magento\Catalog\Model\Product;
1111

1212
/**
13+
* Crossel product edit tab
14+
*
1315
* @api
1416
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1517
* @since 100.0.2
18+
* @deprecated Not used since cross-sell products grid moved to UI components.
19+
* @see \Magento\Catalog\Ui\DataProvider\Product\Related\CrossSellDataProvider
1620
*/
1721
class Crosssell extends Extended
1822
{

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@
99
use Magento\Backend\Block\Widget\Grid\Extended;
1010

1111
/**
12+
* Related product edit tab
13+
*
1214
* @api
1315
* @since 100.0.2
16+
* @deprecated Not used since related products grid moved to UI components.
17+
* @see \Magento\Catalog\Ui\DataProvider\Product\Related\RelatedDataProvider
1418
*/
1519
class Related extends Extended
1620
{

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@
66
namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
77

88
/**
9+
* Upsell product edit tab
10+
*
911
* @api
1012
* @since 100.0.2
13+
* @deprecated Not used since upsell products grid moved to UI components.
14+
* @see \Magento\Catalog\Ui\DataProvider\Product\Related\CrossSellDataProvider
1115
*/
1216
class Upsell extends \Magento\Backend\Block\Widget\Grid\Extended
1317
{

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,17 @@
66
*/
77
namespace Magento\Catalog\Controller\Adminhtml\Product;
88

9-
class Crosssell extends \Magento\Catalog\Controller\Adminhtml\Product
9+
use Magento\Catalog\Controller\Adminhtml\Product;
10+
use Magento\Framework\App\Action\HttpPostActionInterface;
11+
12+
/**
13+
* Class Crosssell
14+
*
15+
* @package Magento\Catalog\Controller\Adminhtml\Product
16+
* @deprecated Not used since cross-sell products grid moved to UI components.
17+
* @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
18+
*/
19+
class Crosssell extends Product implements HttpPostActionInterface
1020
{
1121
/**
1222
* @var \Magento\Framework\View\Result\LayoutFactory

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,17 @@
66
*/
77
namespace Magento\Catalog\Controller\Adminhtml\Product;
88

9-
class CrosssellGrid extends \Magento\Catalog\Controller\Adminhtml\Product
9+
use Magento\Catalog\Controller\Adminhtml\Product;
10+
use Magento\Framework\App\Action\HttpPostActionInterface;
11+
12+
/**
13+
* Class CrosssellGrid
14+
*
15+
* @package Magento\Catalog\Controller\Adminhtml\Product
16+
* @deprecated Not used since cross-sell products grid moved to UI components.
17+
* @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
18+
*/
19+
class CrosssellGrid extends Product implements HttpPostActionInterface
1020
{
1121
/**
1222
* @var \Magento\Framework\View\Result\LayoutFactory

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,17 @@
77
*/
88
namespace Magento\Catalog\Controller\Adminhtml\Product;
99

10-
class Related extends \Magento\Catalog\Controller\Adminhtml\Product
10+
use Magento\Catalog\Controller\Adminhtml\Product;
11+
use Magento\Framework\App\Action\HttpPostActionInterface;
12+
13+
/**
14+
* Class Related
15+
*
16+
* @package Magento\Catalog\Controller\Adminhtml\Product
17+
* @deprecated Not used since related products grid moved to UI components.
18+
* @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
19+
*/
20+
class Related extends Product implements HttpPostActionInterface
1121
{
1222
/**
1323
* @var \Magento\Framework\View\Result\LayoutFactory
@@ -29,6 +39,8 @@ public function __construct(
2939
}
3040

3141
/**
42+
* Execute
43+
*
3244
* @return \Magento\Framework\View\Result\Layout
3345
*/
3446
public function execute()

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,15 @@
77
*/
88
namespace Magento\Catalog\Controller\Adminhtml\Product;
99

10-
class RelatedGrid extends Related
10+
use Magento\Framework\App\Action\HttpPostActionInterface;
11+
12+
/**
13+
* Class RelatedGrid
14+
*
15+
* @package Magento\Catalog\Controller\Adminhtml\Product
16+
* @deprecated Not used since related products grid moved to UI components.
17+
* @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
18+
*/
19+
class RelatedGrid extends Related implements HttpPostActionInterface
1120
{
1221
}

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,17 @@
66
*/
77
namespace Magento\Catalog\Controller\Adminhtml\Product;
88

9-
class Upsell extends \Magento\Catalog\Controller\Adminhtml\Product
9+
use Magento\Catalog\Controller\Adminhtml\Product;
10+
use Magento\Framework\App\Action\HttpPostActionInterface;
11+
12+
/**
13+
* Class Upsell
14+
*
15+
* @package Magento\Catalog\Controller\Adminhtml\Product
16+
* @deprecated Not used since upsell products grid moved to UI components.
17+
* @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
18+
*/
19+
class Upsell extends Product implements HttpPostActionInterface
1020
{
1121
/**
1222
* @var \Magento\Framework\View\Result\LayoutFactory

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,17 @@
66
*/
77
namespace Magento\Catalog\Controller\Adminhtml\Product;
88

9-
class UpsellGrid extends \Magento\Catalog\Controller\Adminhtml\Product
9+
use Magento\Catalog\Controller\Adminhtml\Product;
10+
use Magento\Framework\App\Action\HttpPostActionInterface;
11+
12+
/**
13+
* Class UpsellGrid
14+
*
15+
* @package Magento\Catalog\Controller\Adminhtml\Product
16+
* @deprecated Not used since upsell products grid moved to UI components.
17+
* @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
18+
*/
19+
class UpsellGrid extends Product implements HttpPostActionInterface
1020
{
1121
/**
1222
* @var \Magento\Framework\View\Result\LayoutFactory

‎app/code/Magento/Catalog/Model/Product/Attribute/Backend/Boolean.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Catalog\Model\Product\Attribute\Backend;
79

810
use Magento\Catalog\Model\Product\Attribute\Source\Boolean as BooleanSource;
@@ -25,7 +27,9 @@ public function beforeSave($object)
2527
$attributeCode = $this->getAttribute()->getName();
2628
if ($object->getData('use_config_' . $attributeCode)) {
2729
$object->setData($attributeCode, BooleanSource::VALUE_USE_CONFIG);
30+
return $this;
2831
}
29-
return $this;
32+
33+
return parent::beforeSave($object);
3034
}
3135
}

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Magento\Catalog\Model\Product\Image\NotLoadInfoImageException;
1515
use Magento\Catalog\Ui\DataProvider\Product\ProductRenderCollectorInterface;
1616
use Magento\Framework\App\State;
17+
use Magento\Framework\View\Design\ThemeInterface;
1718
use Magento\Framework\View\DesignInterface;
1819
use Magento\Store\Model\StoreManager;
1920
use Magento\Store\Model\StoreManagerInterface;
@@ -104,6 +105,8 @@ public function __construct(
104105
public function collect(ProductInterface $product, ProductRenderInterface $productRender)
105106
{
106107
$images = [];
108+
/** @var ThemeInterface $currentTheme */
109+
$currentTheme = $this->design->getDesignTheme();
107110

108111
foreach ($this->imageCodes as $imageCode) {
109112
/** @var ImageInterface $image */
@@ -132,6 +135,7 @@ public function collect(ProductInterface $product, ProductRenderInterface $produ
132135
$images[] = $image;
133136
}
134137

138+
$this->design->setDesignTheme($currentTheme);
135139
$productRender->setImages($images);
136140
}
137141

‎app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8+
<!--
9+
@deprecated Not used since cross-sell products grid moved to UI components.
10+
@see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
11+
-->
812
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
913
<container name="root" label="Root">
1014
<block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Crosssell" name="catalog.product.edit.tab.crosssell"/>

‎app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8+
<!--
9+
@deprecated Not used since cross-sell products grid moved to UI components.
10+
@see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
11+
-->
812
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
913
<container name="root" label="Root">
1014
<block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Crosssell" name="catalog.product.edit.tab.crosssell"/>

‎app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_related.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8+
<!--
9+
@deprecated Not used since related products grid moved to UI components.
10+
@see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
11+
-->
812
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
913
<container name="root" label="Root">
1014
<block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Related" name="catalog.product.edit.tab.related"/>

‎app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8+
<!--
9+
@deprecated Not used since related products grid moved to UI components.
10+
@see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
11+
-->
812
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
913
<container name="root" label="Root">
1014
<block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Related" name="catalog.product.edit.tab.related"/>

‎app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsell.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8+
<!--
9+
@deprecated Not used since upsell products grid moved to UI components.
10+
@see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
11+
-->
812
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
913
<container name="root" label="Root">
1014
<block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Upsell" name="catalog.product.edit.tab.upsell"/>

‎app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8+
<!--
9+
@deprecated Not used since upsell products grid moved to UI components.
10+
@see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
11+
-->
812
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
913
<container name="root" label="Root">
1014
<block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Upsell" name="catalog.product.edit.tab.upsell"/>

0 commit comments

Comments
 (0)