Skip to content

Commit 8c705bf

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - magento-engcom/magento2ce#1296: [EngCom Team] Batch 11. Forwardports to 2.3-develop (by @magento-engcom-team) - magento-engcom/magento2ce#1285: [EngCom Team] Batch 4. Forwardports to 2.3-develop (by @magento-engcom-team) - magento-engcom/magento2ce#1283: [EngCom Team] Batch 2. Forwardports to 2.3-develop (by @magento-engcom-team) Fixed GitHub Issues: - #9633: Web Setup Wizard 500 error when session storage is configured to use memcache (reported by @dotsoa) has been fixed in magento-engcom/magento2ce#1296 by @magento-engcom-team in 2.3-develop branch Related commits: 1. aefd089 2. 0c799d2 3. 0a28295 4. d0d8d03 5. 1623007 6. 64f63b3 7. eceb5eb 8. e1db353 9. 7b12d50 10. 60285c4 11. 2d910df 12. 57c355a 13. 4f9f40e 14. ebd663b 15. bdb62bb 16. 76f6eed 17. cd5c72e 18. b035660 19. 6217c00 20. e07d040 21. 47ea318 - #9742: Default welcome message returns after being deleted (reported by @robgt) has been fixed in magento-engcom/magento2ce#1296 by @magento-engcom-team in 2.3-develop branch Related commits: 1. aefd089 2. 0c799d2 3. 0a28295 4. d0d8d03 5. 1623007 6. 64f63b3 7. eceb5eb 8. e1db353 9. 7b12d50 10. 60285c4 11. 2d910df 12. 57c355a 13. 4f9f40e 14. ebd663b 15. bdb62bb 16. 76f6eed 17. cd5c72e 18. b035660 19. 6217c00 20. e07d040 21. 47ea318 - #11669: API salesRefundInvoiceV1 does no save invoice ID on credit memo (reported by @ajpevers) has been fixed in magento-engcom/magento2ce#1296 by @magento-engcom-team in 2.3-develop branch Related commits: 1. aefd089 2. 0c799d2 3. 0a28295 4. d0d8d03 5. 1623007 6. 64f63b3 7. eceb5eb 8. e1db353 9. 7b12d50 10. 60285c4 11. 2d910df 12. 57c355a 13. 4f9f40e 14. ebd663b 15. bdb62bb 16. 76f6eed 17. cd5c72e 18. b035660 19. 6217c00 20. e07d040 21. 47ea318 - #12058: Can't save emoji in custom product options (reported by @archonkulis) has been fixed in magento-engcom/magento2ce#1296 by @magento-engcom-team in 2.3-develop branch Related commits: 1. aefd089 2. 0c799d2 3. 0a28295 4. d0d8d03 5. 1623007 6. 64f63b3 7. eceb5eb 8. e1db353 9. 7b12d50 10. 60285c4 11. 2d910df 12. 57c355a 13. 4f9f40e 14. ebd663b 15. bdb62bb 16. 76f6eed 17. cd5c72e 18. b035660 19. 6217c00 20. e07d040 21. 47ea318 - #5015: Report error csv doesn't work when trying to import a csv file with semicolon delimiter (reported by @agoeurysky) has been fixed in magento-engcom/magento2ce#1285 by @magento-engcom-team in 2.3-develop branch Related commits: 1. ad6c0af 2. 6d3d70a 3. 6b0c02c 4. c8abb13 5. c6a9b5f 6. c867b81 7. 88a3ad0 8. d87e316 9. c76b04c 10. 5ae2109 11. 931133a 12. 4c927a0 13. 060a8f9 14. 4da2a7d 15. 008ef55 16. d3642e8 17. d37ce08 18. b22b232 19. 6c02a2d 20. f2ec2ea - #8970: Cannot assign products to categories not under tree root (reported by @marius-bica) has been fixed in magento-engcom/magento2ce#1285 by @magento-engcom-team in 2.3-develop branch Related commits: 1. ad6c0af 2. 6d3d70a 3. 6b0c02c 4. c8abb13 5. c6a9b5f 6. c867b81 7. 88a3ad0 8. d87e316 9. c76b04c 10. 5ae2109 11. 931133a 12. 4c927a0 13. 060a8f9 14. 4da2a7d 15. 008ef55 16. d3642e8 17. d37ce08 18. b22b232 19. 6c02a2d 20. f2ec2ea - #9566: Status label is wrong in admin (reported by @darkogoles1) has been fixed in magento-engcom/magento2ce#1285 by @magento-engcom-team in 2.3-develop branch Related commits: 1. ad6c0af 2. 6d3d70a 3. 6b0c02c 4. c8abb13 5. c6a9b5f 6. c867b81 7. 88a3ad0 8. d87e316 9. c76b04c 10. 5ae2109 11. 931133a 12. 4c927a0 13. 060a8f9 14. 4da2a7d 15. 008ef55 16. d3642e8 17. d37ce08 18. b22b232 19. 6c02a2d 20. f2ec2ea - #10291: Magento 2 Loading custom option dropdown issue (reported by @NagarajuKasa) has been fixed in magento-engcom/magento2ce#1285 by @magento-engcom-team in 2.3-develop branch Related commits: 1. ad6c0af 2. 6d3d70a 3. 6b0c02c 4. c8abb13 5. c6a9b5f 6. c867b81 7. 88a3ad0 8. d87e316 9. c76b04c 10. 5ae2109 11. 931133a 12. 4c927a0 13. 060a8f9 14. 4da2a7d 15. 008ef55 16. d3642e8 17. d37ce08 18. b22b232 19. 6c02a2d 20. f2ec2ea - #10908: [2.2.0-rc3.0] Language switcher is broken when using multiple times (reported by @hostep) has been fixed in magento-engcom/magento2ce#1285 by @magento-engcom-team in 2.3-develop branch Related commits: 1. ad6c0af 2. 6d3d70a 3. 6b0c02c 4. c8abb13 5. c6a9b5f 6. c867b81 7. 88a3ad0 8. d87e316 9. c76b04c 10. 5ae2109 11. 931133a 12. 4c927a0 13. 060a8f9 14. 4da2a7d 15. 008ef55 16. d3642e8 17. d37ce08 18. b22b232 19. 6c02a2d 20. f2ec2ea - #11211: Store View switcher not working on front-end and it throws an error (reported by @latypatil) has been fixed in magento-engcom/magento2ce#1285 by @magento-engcom-team in 2.3-develop branch Related commits: 1. ad6c0af 2. 6d3d70a 3. 6b0c02c 4. c8abb13 5. c6a9b5f 6. c867b81 7. 88a3ad0 8. d87e316 9. c76b04c 10. 5ae2109 11. 931133a 12. 4c927a0 13. 060a8f9 14. 4da2a7d 15. 008ef55 16. d3642e8 17. d37ce08 18. b22b232 19. 6c02a2d 20. f2ec2ea - #11365: "Ignore this notification" isn't working (reported by @sigismund) has been fixed in magento-engcom/magento2ce#1285 by @magento-engcom-team in 2.3-develop branch Related commits: 1. ad6c0af 2. 6d3d70a 3. 6b0c02c 4. c8abb13 5. c6a9b5f 6. c867b81 7. 88a3ad0 8. d87e316 9. c76b04c 10. 5ae2109 11. 931133a 12. 4c927a0 13. 060a8f9 14. 4da2a7d 15. 008ef55 16. d3642e8 17. d37ce08 18. b22b232 19. 6c02a2d 20. f2ec2ea - #11868: "Add Products" button has been duplicated after the customer group was changed (reported by @OleksiyOleksiyovych) has been fixed in magento-engcom/magento2ce#1285 by @magento-engcom-team in 2.3-develop branch Related commits: 1. ad6c0af 2. 6d3d70a 3. 6b0c02c 4. c8abb13 5. c6a9b5f 6. c867b81 7. 88a3ad0 8. d87e316 9. c76b04c 10. 5ae2109 11. 931133a 12. 4c927a0 13. 060a8f9 14. 4da2a7d 15. 008ef55 16. d3642e8 17. d37ce08 18. b22b232 19. 6c02a2d 20. f2ec2ea - #9783: Multiple <depends> parameters in widget.xml not allowed (reported by @milansimek) has been fixed in magento-engcom/magento2ce#1283 by @magento-engcom-team in 2.3-develop branch Related commits: 1. 0742857 2. fde512e 3. e7d90de 4. 6d4f36d 5. 2e83a36 6. 23b4aa1 7. b50bfa8 8. 04cd60d 9. 75d5a05 10. 5e02b15 11. aad5ba6 12. 3e32140 13. 7898946 14. a173e1c 15. 41d0075 16. dda19b2 17. cba48cd 18. 0c62caa 19. 736f783 20. 7569b70 - #10941: Responsive Design Issue on Mobile with Magento 2.1.9 (reported by @rishabhchd19) has been fixed in magento-engcom/magento2ce#1283 by @magento-engcom-team in 2.3-develop branch Related commits: 1. 0742857 2. fde512e 3. e7d90de 4. 6d4f36d 5. 2e83a36 6. 23b4aa1 7. b50bfa8 8. 04cd60d 9. 75d5a05 10. 5e02b15 11. aad5ba6 12. 3e32140 13. 7898946 14. a173e1c 15. 41d0075 16. dda19b2 17. cba48cd 18. 0c62caa 19. 736f783 20. 7569b70 - #11166: ReindexAll -> getState() is not correct if the Indexer broke with PHP fatal error (reported by @larsroettig) has been fixed in magento-engcom/magento2ce#1283 by @magento-engcom-team in 2.3-develop branch Related commits: 1. 0742857 2. fde512e 3. e7d90de 4. 6d4f36d 5. 2e83a36 6. 23b4aa1 7. b50bfa8 8. 04cd60d 9. 75d5a05 10. 5e02b15 11. aad5ba6 12. 3e32140 13. 7898946 14. a173e1c 15. 41d0075 16. dda19b2 17. cba48cd 18. 0c62caa 19. 736f783 20. 7569b70 - #11176: Configured table prefix is not recognized in CLI admin:user:create (reported by @crtl) has been fixed in magento-engcom/magento2ce#1283 by @magento-engcom-team in 2.3-develop branch Related commits: 1. 0742857 2. fde512e 3. e7d90de 4. 6d4f36d 5. 2e83a36 6. 23b4aa1 7. b50bfa8 8. 04cd60d 9. 75d5a05 10. 5e02b15 11. aad5ba6 12. 3e32140 13. 7898946 14. a173e1c 15. 41d0075 16. dda19b2 17. cba48cd 18. 0c62caa 19. 736f783 20. 7569b70 - #11275: Call to a member function addCrumb() (reported by @lano-vargas) has been fixed in magento-engcom/magento2ce#1283 by @magento-engcom-team in 2.3-develop branch Related commits: 1. 0742857 2. fde512e 3. e7d90de 4. 6d4f36d 5. 2e83a36 6. 23b4aa1 7. b50bfa8 8. 04cd60d 9. 75d5a05 10. 5e02b15 11. aad5ba6 12. 3e32140 13. 7898946 14. a173e1c 15. 41d0075 16. dda19b2 17. cba48cd 18. 0c62caa 19. 736f783 20. 7569b70 - #11310: Method "getChildren" sort ordering (reported by @EliasKotlyar) has been fixed in magento-engcom/magento2ce#1283 by @magento-engcom-team in 2.3-develop branch Related commits: 1. 0742857 2. fde512e 3. e7d90de 4. 6d4f36d 5. 2e83a36 6. 23b4aa1 7. b50bfa8 8. 04cd60d 9. 75d5a05 10. 5e02b15 11. aad5ba6 12. 3e32140 13. 7898946 14. a173e1c 15. 41d0075 16. dda19b2 17. cba48cd 18. 0c62caa 19. 736f783 20. 7569b70
2 parents b48ec86 + 4ba9235 commit 8c705bf

File tree

116 files changed

+1030
-207
lines changed

Some content is hidden

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

116 files changed

+1030
-207
lines changed

‎app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ protected function saveAndReplaceAdvancedPrices()
394394
? $rowData[self::COL_TIER_PRICE] : 0,
395395
'percentage_value' => $rowData[self::COL_TIER_PRICE_TYPE] === self::TIER_PRICE_TYPE_PERCENT
396396
? $rowData[self::COL_TIER_PRICE] : null,
397-
'website_id' => $this->getWebsiteId($rowData[self::COL_TIER_PRICE_WEBSITE])
397+
'website_id' => $this->getWebSiteId($rowData[self::COL_TIER_PRICE_WEBSITE])
398398
];
399399
}
400400
}

‎app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class WebsiteTest extends \PHPUnit\Framework\TestCase
2727

2828
protected function setUp()
2929
{
30-
$this->webSiteModel = $this->getMockBuilder(\Magento\Store\Model\WebSite::class)
30+
$this->webSiteModel = $this->getMockBuilder(\Magento\Store\Model\Website::class)
3131
->setMethods(['getBaseCurrency'])
3232
->disableOriginalConstructor()
3333
->getMock();

‎app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected function _prepareForm()
3737
['data' => ['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']]
3838
);
3939

40-
$this->_prepareStoreFieldSet($form);
40+
$this->_prepareStoreFieldset($form);
4141

4242
$form->addField(
4343
'store_type',

‎app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ public function execute()
5454
$user = $this->_objectManager->create(\Magento\User\Model\User::class)->load($userId);
5555

5656
$user->setId($userId)
57-
->setUsername($this->getRequest()->getParam('username', false))
58-
->setFirstname($this->getRequest()->getParam('firstname', false))
59-
->setLastname($this->getRequest()->getParam('lastname', false))
57+
->setUserName($this->getRequest()->getParam('username', false))
58+
->setFirstName($this->getRequest()->getParam('firstname', false))
59+
->setLastName($this->getRequest()->getParam('lastname', false))
6060
->setEmail(strtolower($this->getRequest()->getParam('email', false)));
6161

6262
if ($this->_objectManager->get(\Magento\Framework\Validator\Locale::class)->isValid($interfaceLocale)) {

‎app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public function testSetFilterTypePropagatesFilterTypeToColumns()
117117

118118
public function testGetRowUrlIfUrlPathNotSet()
119119
{
120-
$this->assertEquals('#', $this->_block->getRowUrl(new \StdClass()));
120+
$this->assertEquals('#', $this->_block->getRowUrl(new \stdClass()));
121121
}
122122

123123
public function testGetRowUrl()

‎app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ public function testSetGetGrid()
351351

352352
$this->_block->setFilter('StdClass');
353353

354-
$grid = new \StdClass();
354+
$grid = new \stdClass();
355355
$this->_block->setGrid($grid);
356356
$this->assertEquals($grid, $this->_block->getGrid());
357357
}

‎app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
data-mage-init='{"dropdown":{}}'
3030
data-toggle="dropdown">
3131
<span class="admin__action-dropdown-text">
32-
<span class="admin-user-account-text"><?= $block->escapeHtml($block->getUser()->getUsername()) ?></span>
32+
<span class="admin-user-account-text"><?= $block->escapeHtml($block->getUser()->getUserName()) ?></span>
3333
</span>
3434
</a>
3535
<ul class="admin__action-dropdown-menu">
@@ -39,7 +39,7 @@
3939
href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/system_account/index') ?>"
4040
<?= /* @escapeNotVerified */ $block->getUiId('user', 'account', 'settings') ?>
4141
title="<?= $block->escapeHtml(__('Account Setting')) ?>">
42-
<?= /* @escapeNotVerified */ __('Account Setting') ?> (<span class="admin-user-name"><?= $block->escapeHtml($block->getUser()->getUsername()) ?></span>)
42+
<?= /* @escapeNotVerified */ __('Account Setting') ?> (<span class="admin-user-name"><?= $block->escapeHtml($block->getUser()->getUserName()) ?></span>)
4343
</a>
4444
</li>
4545
<?php endif; ?>

‎app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@
2828
<script data-template="search-suggest" type="text/x-magento-template">
2929
<ul class="search-global-menu">
3030
<li class="item">
31-
<a id="searchPreviewProducts" href="<?= /* @escapeNotVerified */ $block->getURL('catalog/product/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
31+
<a id="searchPreviewProducts" href="<?= /* @escapeNotVerified */ $block->getUrl('catalog/product/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
3232
</li>
3333
<li class="item">
34-
<a id="searchPreviewOrders" href="<?= /* @escapeNotVerified */ $block->getURL('sales/order/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
34+
<a id="searchPreviewOrders" href="<?= /* @escapeNotVerified */ $block->getUrl('sales/order/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
3535
</li>
3636
<li class="item">
37-
<a id="searchPreviewCustomers" href="<?= /* @escapeNotVerified */ $block->getURL('customer/index/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
37+
<a id="searchPreviewCustomers" href="<?= /* @escapeNotVerified */ $block->getUrl('customer/index/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
3838
</li>
3939
<li class="item">
40-
<a id="searchPreviewPages" href="<?= /* @escapeNotVerified */ $block->getURL('cms/page/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
40+
<a id="searchPreviewPages" href="<?= /* @escapeNotVerified */ $block->getUrl('cms/page/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
4141
</li>
4242
<% if (data.items.length) { %>
4343
<% _.each(data.items, function(value){ %>

‎app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ $numColumns = sizeof($block->getColumns());
7272
<?php if ($block->getPagerVisibility()): ?>
7373
<div class="admin__data-grid-pager-wrap">
7474
<select name="<?= /* @escapeNotVerified */ $block->getVarNameLimit() ?>"
75-
id="<?= $block->escapeHTML($block->getHtmlId()) ?>_page-limit"
75+
id="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
7676
onchange="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.loadByElement(this)"
7777
class="admin__control-select">
7878
<option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
@@ -91,7 +91,7 @@ $numColumns = sizeof($block->getColumns());
9191
selected="selected"<?php endif; ?>>200
9292
</option>
9393
</select>
94-
<label for="<?= $block->escapeHTML($block->getHtmlId()) ?><?= $block->escapeHTML($block->getHtmlId()) ?>_page-limit"
94+
<label for="<?= $block->escapeHtml($block->getHtmlId()) ?><?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
9595
class="admin__control-support-text"><?= /* @escapeNotVerified */ __('per page') ?></label>
9696

9797
<div class="admin__data-grid-pager">
@@ -107,12 +107,12 @@ $numColumns = sizeof($block->getColumns());
107107
<button type="button" class="action-previous disabled"><span><?= /* @escapeNotVerified */ __('Previous page') ?></span></button>
108108
<?php endif; ?>
109109
<input type="text"
110-
id="<?= $block->escapeHTML($block->getHtmlId()) ?>_page-current"
110+
id="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-current"
111111
name="<?= /* @escapeNotVerified */ $block->getVarNamePage() ?>"
112112
value="<?= /* @escapeNotVerified */ $_curPage ?>"
113113
class="admin__control-text"
114114
onkeypress="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.inputPage(event, '<?= /* @escapeNotVerified */ $_lastPage ?>')" <?= /* @escapeNotVerified */ $block->getUiId('current-page') ?> />
115-
<label class="admin__control-support-text" for="<?= $block->escapeHTML($block->getHtmlId()) ?>_page-current">
115+
<label class="admin__control-support-text" for="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-current">
116116
<?= /* @escapeNotVerified */ __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
117117
</label>
118118
<?php if ($_curPage < $_lastPage): ?>

‎app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ public function getValuesHtml()
4444
]
4545
);
4646
if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN) {
47-
$select->setName('options[' . $_option->getid() . ']')->addOption('', __('-- Please Select --'));
47+
$select->setName('options[' . $_option->getId() . ']')->addOption('', __('-- Please Select --'));
4848
} else {
49-
$select->setName('options[' . $_option->getid() . '][]');
49+
$select->setName('options[' . $_option->getId() . '][]');
5050
$select->setClass('multiselect admin__control-multiselect' . $require . ' product-custom-option');
5151
}
5252
foreach ($_option->getValues() as $_value) {

‎app/code/Magento/Catalog/Model/Category.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -780,11 +780,14 @@ public function getAllChildren($asArray = false)
780780
/**
781781
* Retrieve children ids comma separated
782782
*
783+
* @param boolean $recursive
784+
* @param boolean $isActive
785+
* @param boolean $sortByPosition
783786
* @return string
784787
*/
785-
public function getChildren()
788+
public function getChildren($recursive = false, $isActive = true, $sortByPosition = false)
786789
{
787-
return implode(',', $this->getResource()->getChildren($this, false));
790+
return implode(',', $this->getResource()->getChildren($this, $recursive, $isActive, $sortByPosition));
788791
}
789792

790793
/**

‎app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,9 +602,10 @@ public function isInRootCategoryList($category)
602602
* @param \Magento\Catalog\Model\Category $category
603603
* @param bool $recursive
604604
* @param bool $isActive
605+
* @param bool $sortByPosition
605606
* @return array
606607
*/
607-
public function getChildren($category, $recursive = true, $isActive = true)
608+
public function getChildren($category, $recursive = true, $isActive = true, $sortByPosition = false)
608609
{
609610
$select = $this->getConnection()->select()->from(
610611
$this->getMainStoreTable($category->getStoreId()),
@@ -619,6 +620,9 @@ public function getChildren($category, $recursive = true, $isActive = true)
619620
if ($isActive) {
620621
$select->where('is_active = ?', '1');
621622
}
623+
if ($sortByPosition) {
624+
$select->order('position ASC');
625+
}
622626
$_categories = $this->getConnection()->fetchAll($select);
623627
$categoriesIds = [];
624628
foreach ($_categories as $_category) {

‎app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected function setUp()
4747
'scopeOverriddenValue' => $scopeOverriddenValue
4848
]
4949
);
50-
$resource = $this->createPartialMock(\StdClass::class, ['getMainTable']);
50+
$resource = $this->createPartialMock(\stdClass::class, ['getMainTable']);
5151
$resource->expects($this->any())->method('getMainTable')->will($this->returnValue('table'));
5252

5353
$this->_model->expects($this->any())->method('_getResource')->will($this->returnValue($resource));

0 commit comments

Comments
 (0)