Skip to content

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
{

0 commit comments

Comments
 (0)