Skip to content

Commit b3da48a

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - #19868: Fix travis tests on 2.3-develop branch (by @ihor-sviziev) - #19788: [Forwardport] Fixed - Shipping issue on PayPal Express #14712 (by @ssp58bleuciel) - #19824: magento/magento2#?: Mark not used blocks, controllers and layout updates which are related to deprecated way of rendering grid for related/coross-sell/upsell products. (by @swnsma) - #19751: Fixed #19605 Don't static compile disabled modules (by @shikhamis11) - #19784: Fixed Incorrect class name on Orders and returns page. (by @shikhamis11) - #19768: fixed Typo error assoctiated -> associated (by @jitendra-cedcoss) - #19770: Typo taax -> tax (by @akshayadixit) - #19764: Correct location of transparent.js (by @pmclain) - #19707: PaymentTokenRepositoryInterface: missing setTotalCount in getList() method (by @textarea) - #19341: [Forwardport] Creating custom customer attribute with default value 0 will cause not saving value for customer entity. (by @nmalevanec) - #19709: Add useful debug info for which website has not been found (by @craigcarnell) - #19663: Fixed Click for price in home page not work #15922 (by @ravi-chandra3197) - #18895: added config for catalog review in frontend (by @torhoehn) - #19387: [Forwardport]Fixed - Default tax region/state appears in customer & order data (by @ssp58bleuciel) - #19402: make sure that the removal of the custom_price is properly persisted into database (by @godvsdeity) - #19094: 19085-Translation-in-tier-price-phtml-not-working (by @agorbulin) - #19124: bug-fix #16074 - Fix theme change in middle of product page. (by @drew7721) - #19104: fix cipherMethod detection for openssl 1.1.1 (by @BlackIkeEagle) - #18179: Fix the issue with reset password when customer has address from not allowed country (by @dmytro-ch) Fixed GitHub Issues: - #14712: Shipping issue on PayPal Express (reported by @raymond62) has been fixed in #19788 by @ssp58bleuciel in 2.3-develop branch Related commits: 1. 0e8ffeb 2. a390390 - #19605: Don't static compile disabled modules (reported by @joshuaadickerson) has been fixed in #19751 by @shikhamis11 in 2.3-develop branch Related commits: 1. 83f8e98 - #19780: Incorrect class name on Orders and returns page. (reported by @denis-g) has been fixed in #19784 by @shikhamis11 in 2.3-develop branch Related commits: 1. 05f335f - #19763: Admin Sales Order Create Fails with PayflowPro (reported by @pmclain) has been fixed in #19764 by @pmclain in 2.3-develop branch Related commits: 1. 8e5c631 2. fd2200a - #19706: PaymentTokenRepositoryInterface: missing setTotalCount in getList() method (reported by @textarea) has been fixed in #19707 by @textarea in 2.3-develop branch Related commits: 1. 0a2330a 2. eb62681 - #14510: Creating custom customer attribute with default value 0 will cause not saving value for customer entity (reported by @victortodoran) has been fixed in #19341 by @nmalevanec in 2.3-develop branch Related commits: 1. fb19f3f - #15922: Click for price in home page can`t work (reported by @michaeldyl520) has been fixed in #19663 by @ravi-chandra3197 in 2.3-develop branch Related commits: 1. f073859 2. d116aec 3. 37b2eb6 4. 68636ec - #16684: Default tax region/state appears in customer & order data (reported by @Detzler) has been fixed in #19387 by @ssp58bleuciel in 2.3-develop branch Related commits: 1. 350b56c 2. 2854a1e 3. 01d4bd6 4. 5638333 5. 60005f2 - #19085: Translation in tier_price.phtml not working (reported by @DanieliMi) has been fixed in #19094 by @agorbulin in 2.3-develop branch Related commits: 1. 425514b 2. 345393d 3. 63bbc39 4. 1a006b3 - #7503: Category design / theme update not inheriting correctly on product pages (reported by @pascaladriaansen) has been fixed in #19124 by @drew7721 in 2.3-develop branch Related commits: 1. 1becee9 2. b8940db 3. fd26b94 4. 47e42a9 5. 4b6100d 6. b8442a1 - #7710: Custom theme doesn't apply XML layout updates when applied to a product (reported by @chickenland) has been fixed in #19124 by @drew7721 in 2.3-develop branch Related commits: 1. 1becee9 2. b8940db 3. fd26b94 4. 47e42a9 5. 4b6100d 6. b8442a1 - #8333: Magento v2.1.2 - Choosing a child theme for product page (reported by @ChevCheusov) has been fixed in #19124 by @drew7721 in 2.3-develop branch Related commits: 1. 1becee9 2. b8940db 3. fd26b94 4. 47e42a9 5. 4b6100d 6. b8442a1 - #14932: Invalid Template with Custom Theme Applied by User Agent (reported by @C0D31GN1T3R) has been fixed in #19124 by @drew7721 in 2.3-develop branch Related commits: 1. 1becee9 2. b8940db 3. fd26b94 4. 47e42a9 5. 4b6100d 6. b8442a1 - #16074: User agent exception not setting the correct templates for product pages. (reported by @drew7721) has been fixed in #19124 by @drew7721 in 2.3-develop branch Related commits: 1. 1becee9 2. b8940db 3. fd26b94 4. 47e42a9 5. 4b6100d 6. b8442a1 - #18170: Unable to reset password if customer has address from not allowed country (reported by @ihor-sviziev) has been fixed in #18179 by @dmytro-ch in 2.3-develop branch Related commits: 1. 030b223 2. 54b6382 3. 406d000 4. ebd39d3 5. 91275d6 6. 33e42ac 7. 97632b3 8. 338d568
2 parents 21c719e + 864869d commit b3da48a

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)